Menu
▾
▴
[Ogoglio-commits] SF.net SVN: ogoglio: [676] maven/trunk/ogoglio-common/src
|
From: <tre...@us...> - 2008-01-11 21:20:35
|
Revision: 676
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=676&view=rev
Author: trevorolio
Date: 2008-01-11 13:20:38 -0800 (Fri, 11 Jan 2008)
Log Message:
-----------
Added private tells among space cohabitants.
Modified Paths:
--------------
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/SpaceClient.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/bvh/Bvh.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/bvh/BvhParser.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/xml/SpaceEvent.java
maven/trunk/ogoglio-common/src/test/java/com/ogoglio/loadtest/Bot.java
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/SpaceClient.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/SpaceClient.java 2008-01-10 19:03:50 UTC (rev 675)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/SpaceClient.java 2008-01-11 21:20:38 UTC (rev 676)
@@ -321,6 +321,14 @@
sendSpaceEvent(event);
}
+ public void userSentPrivateMessage(User user, String messageText) {
+ SpaceEvent event = new SpaceEvent(SpaceEvent.TEXT_TELL_EVENT);
+ event.setProperty(SpaceEvent.USERNAME, accountDoc.getUsername());
+ event.setProperty(SpaceEvent.TTE_RECIPIENT, user.getUsername());
+ event.setProperty(SpaceEvent.TTE_MESSAGE, messageText);
+ sendSpaceEvent(event);
+ }
+
public void userRequestedSeat(Thing seatThing) {
User user = space.getUser(accountDoc.getUsername());
if (user == null || user.getSeat() == seatThing) {
@@ -587,6 +595,14 @@
listener.receivedChatMessage(user.getUsername(), event.getStringProperty(SpaceEvent.TSE_MESSAGE));
+ } else if(SpaceEvent.TEXT_TELL_EVENT.equals(event.getName())){
+ User user = space.getUser(event.getStringProperty(SpaceEvent.USERNAME));
+ if(user == null){
+ Log.error("Got a text tell event for an unknown user: " + event.getStringProperty(SpaceEvent.USERNAME));
+ return;
+ }
+ listener.receivedTellMessage(user.getUsername(), event.getStringProperty(SpaceEvent.TTE_MESSAGE));
+
} else if (SpaceEvent.PLAY_ANIMATION_EVENT.equals(event.getName())) {
User user = space.getUser(event.getStringProperty(SpaceEvent.USERNAME));
if (user == null) {
@@ -744,6 +760,8 @@
public interface Listener {
public void receivedChatMessage(String username, String message);
+ public void receivedTellMessage(String username, String message);
+
public void receivedUserContextMenuRequest(User user, int x, int y);
public void receivedInfoPanel(long sourceThingID, String nonce);
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/bvh/Bvh.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/bvh/Bvh.java 2008-01-10 19:03:50 UTC (rev 675)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/bvh/Bvh.java 2008-01-11 21:20:38 UTC (rev 676)
@@ -297,4 +297,8 @@
return result;
}
+ public void printInfo(){
+ System.out.println("BVH: " + name + ": " + frames.size() + " frames, " + frameTime + " frame time");
+ printJoint(rootJoint);
+ }
}
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/bvh/BvhParser.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/bvh/BvhParser.java 2008-01-10 19:03:50 UTC (rev 675)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/bvh/BvhParser.java 2008-01-11 21:20:38 UTC (rev 676)
@@ -14,6 +14,8 @@
package com.ogoglio.viewer.j3d.bvh;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
@@ -205,4 +207,30 @@
}
return buffer.toString().trim();
}
+
+ public static void main(String[] args){
+ if(args.length < 2){
+ printUsage();
+ return;
+ }
+ try {
+ String name = args[0];
+ FileInputStream input = new FileInputStream(args[1]);
+ BvhParser parser = new BvhParser(name, input);
+ Bvh bvh = parser.parse();
+ bvh.printInfo();
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ } catch (BvhParseException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+
+ private static void printUsage(){
+ System.out.println("Usage: java ... BvhParser <animationName> <path to bvh>");
+ }
}
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/xml/SpaceEvent.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/xml/SpaceEvent.java 2008-01-10 19:03:50 UTC (rev 675)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/xml/SpaceEvent.java 2008-01-11 21:20:38 UTC (rev 676)
@@ -120,6 +120,12 @@
public static final String TSE_MESSAGE = "message";
+ public static final String TEXT_TELL_EVENT = "textTell";
+
+ public static final String TTE_MESSAGE = "message";
+
+ public static final String TTE_RECIPIENT = "recipient";
+
public static final String ADD_THING_EVENT = "addThing";
public static final String REMOVE_THING_EVENT = "removeThing";
Modified: maven/trunk/ogoglio-common/src/test/java/com/ogoglio/loadtest/Bot.java
===================================================================
--- maven/trunk/ogoglio-common/src/test/java/com/ogoglio/loadtest/Bot.java 2008-01-10 19:03:50 UTC (rev 675)
+++ maven/trunk/ogoglio-common/src/test/java/com/ogoglio/loadtest/Bot.java 2008-01-11 21:20:38 UTC (rev 676)
@@ -131,4 +131,9 @@
}
+ public void receivedTellMessage(String username, String message) {
+ // TODO Auto-generated method stub
+
+ }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
