Menu
▾
▴
[Ogoglio-commits] SF.net SVN: ogoglio: [264] maven/trunk/ogoglio-common
|
From: <ian...@us...> - 2007-08-27 16:25:43
|
Revision: 264
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=264&view=rev
Author: iansmith
Date: 2007-08-26 15:55:01 -0700 (Sun, 26 Aug 2007)
Log Message:
-----------
Figured out the incantations for getting java3d properly integrated into the build of common.
Modified Paths:
--------------
maven/trunk/ogoglio-common/.classpath
maven/trunk/ogoglio-common/pom.xml
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/SpaceClient.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/model/Space.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/model/User.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/WebConstants.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DUserRenderable.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/bvh/BvhParser.java
Added Paths:
-----------
maven/trunk/ogoglio-common/src/main/resources/testing_constants/
maven/trunk/ogoglio-common/src/main/resources/testing_constants/bootstrapUser.properties
Modified: maven/trunk/ogoglio-common/.classpath
===================================================================
--- maven/trunk/ogoglio-common/.classpath 2007-08-26 22:52:45 UTC (rev 263)
+++ maven/trunk/ogoglio-common/.classpath 2007-08-26 22:55:01 UTC (rev 264)
@@ -2,7 +2,8 @@
<classpath>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" path="src/test/java"/>
- <classpathentry excluding="**" kind="src" output="src/main/resources" path="src/main/resources"/>
+ <classpathentry excluding="**" kind="src" output="src/main/resources/testing_constants" path="src/main/resources/testing_constants"/>
+ <classpathentry excluding="**" kind="src" output="src/main/resources/avatar" path="src/main/resources/avatar"/>
<classpathentry excluding="**" kind="src" output="src/test/resources" path="src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
Modified: maven/trunk/ogoglio-common/pom.xml
===================================================================
--- maven/trunk/ogoglio-common/pom.xml 2007-08-26 22:52:45 UTC (rev 263)
+++ maven/trunk/ogoglio-common/pom.xml 2007-08-26 22:55:01 UTC (rev 264)
@@ -10,9 +10,46 @@
<version>0.0.1</version>
+ <build>
+ <resources>
+ <!-- FILTER RESOURCES FOR SOME CONSTANTS-->
+ <resource>
+ <directory>src/main/resources/testing_constants</directory>
+ <filtering>true</filtering>
+ </resource>
+
+ <resource>
+ <targetPath>avatar</targetPath>
+ <directory>src/main/resources/avatar</directory>
+ </resource>
+
+ </resources>
+ </build>
+
<!-- things we need to build/run -->
<dependencies>
+ <!-- jav3d stuff -->
<dependency>
+ <groupId>java3d</groupId>
+ <artifactId>j3d-core</artifactId>
+ <version>1.5.1</version>
+ <scope>supplied</scope>
+ </dependency>
+ <dependency>
+ <groupId>java3d</groupId>
+ <artifactId>j3d-core-utils</artifactId>
+ <version>1.5.1</version>
+ <scope>supplied</scope>
+ </dependency>
+ <dependency>
+ <groupId>java3d</groupId>
+ <artifactId>vecmath</artifactId>
+ <version>1.5.1</version>
+ <scope>supplied</scope>
+ </dependency>
+
+ <!-- rmock for testing -->
+ <dependency>
<groupId>com.agical.rmock</groupId>
<artifactId>rmock</artifactId>
<version>2.0.0-rc-6</version>
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 2007-08-26 22:52:45 UTC (rev 263)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/SpaceClient.java 2007-08-26 22:55:01 UTC (rev 264)
@@ -714,14 +714,15 @@
}
public InputStream getUserAnimationStream(String username, long animationID) throws IOException {
+ System.out.println("trying to FART: "+username+","+animationID);
if (animationID == 1) {
- return SpaceClient.class.getClassLoader().getResourceAsStream("/avatar/avatar.bvh");
+ return SpaceClient.class.getClassLoader().getResourceAsStream("avatar/avatar.bvh");
} else if (animationID == 2) {
- return SpaceClient.class.getClassLoader().getResourceAsStream("/avatar/avatar-walk.bvh");
+ return SpaceClient.class.getClassLoader().getResourceAsStream("avatar/avatar-walk.bvh");
} else if (animationID == 3) {
- return SpaceClient.class.getClassLoader().getResourceAsStream("/avatar/avatar-wave.bvh");
+ return SpaceClient.class.getClassLoader().getResourceAsStream("avatar/avatar-wave.bvh");
} else if (animationID == 4) {
- return SpaceClient.class.getClassLoader().getResourceAsStream("/avatar/avatar-point.bvh");
+ return SpaceClient.class.getClassLoader().getResourceAsStream("avatar/avatar-point.bvh");
}
return null;
}
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/model/Space.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/model/Space.java 2007-08-26 22:52:45 UTC (rev 263)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/model/Space.java 2007-08-26 22:55:01 UTC (rev 264)
@@ -530,6 +530,7 @@
}
protected InputStream getUserGeometryStream(String username) throws IOException {
+ System.out.println("FART: Trying to get Geometry stream for user "+username+" from spaceContext");
return spaceContext.getUserGeometryStream(username, null);
}
@@ -542,6 +543,7 @@
}
public InputStream getUserAnimationStream(String username, long animationID) throws IOException {
+ System.out.println("FART GET USER ANIM:"+spaceContext.getClass().getName()+"..."+username);
return spaceContext.getUserAnimationStream(username, animationID);
}
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/model/User.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/model/User.java 2007-08-26 22:52:45 UTC (rev 263)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/model/User.java 2007-08-26 22:55:01 UTC (rev 264)
@@ -88,7 +88,7 @@
}
public InputStream getGeometryStream(int lodIndex) throws IOException {
- //System.err.println("Handle user lod index");
+ //System.out.println("FART:Handle user lod index:"+lodIndex+":"+space+","+username);
return space.getUserGeometryStream(username);
}
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/WebConstants.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/WebConstants.java 2007-08-26 22:52:45 UTC (rev 263)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/WebConstants.java 2007-08-26 22:55:01 UTC (rev 264)
@@ -1,5 +1,9 @@
package com.ogoglio.util;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
public class WebConstants {
public static final String AUTH_USERNAME_PARAM = "username";
@@ -8,11 +12,41 @@
public static final String AUTH_COOKIE = "loginCookie";
public static final String SPACE_INCLUDE_CHILDREN_PARAM = "children";
+
+ public static final String GUEST_COOKIE_PREFIX = "guest";
- public static final String TEST_LIBRARY_USERNAME="library";
+
+ private static Properties bootstrapProps=null;
- public static final String TEST_DEFAULT_LIBRARY_PASSWORD="og1234";
+ public static String getBootstrapUsername() {
+ if (bootstrapProps==null) {
+ fetchBootstrapProps();
+ }
+ return bootstrapProps.getProperty("bootstrapUser");
+ }
- public static final String GUEST_COOKIE_PREFIX = "guest";
+ public static String getBootstrapUserPW() {
+ if (bootstrapProps==null) {
+ fetchBootstrapProps();
+ }
+ return bootstrapProps.getProperty("bootstrapUserPW");
+ }
+ private static void fetchBootstrapProps() {
+ InputStream str=(new WebConstants().getClass()).getResourceAsStream("/bootstrapUser.properties");
+ if (str==null) {
+ System.out.println("Unable to load bootstrapUser.properties!");
+ bootstrapProps=new Properties();
+ } else {
+ try {
+ bootstrapProps=new Properties();
+ bootstrapProps.load(str);
+ //System.out.println("FART---------->");
+ //bootstrapProps.list(System.out);
+ } catch (IOException e) {
+ System.out.println("Unable to load bootstrapUser.properties due to IOException:"+e.getMessage());
+ bootstrapProps=new Properties();
+ }
+ }
+ }
}
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DUserRenderable.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DUserRenderable.java 2007-08-26 22:52:45 UTC (rev 263)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DUserRenderable.java 2007-08-26 22:55:01 UTC (rev 264)
@@ -75,7 +75,7 @@
public J3DUserRenderable(User user, boolean setVisible) throws IOException, ObjParseException, BvhParseException, SkinMapParseException {
this.user = user;
- BvhParser bvhParser = new BvhParser(user /*not used!*/, 1);
+ BvhParser bvhParser = new BvhParser(user, 1);
Bvh bvh = bvhParser.parse();
skeleton = new SkeletonLoader(bvh).generateSkeleton();
//skeleton.addDebugAttachments();
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 2007-08-26 22:52:45 UTC (rev 263)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/bvh/BvhParser.java 2007-08-26 22:55:01 UTC (rev 264)
@@ -36,9 +36,12 @@
private boolean inMotion = false;
- public BvhParser(GeometryProvider NOT_USED, long animationID) throws IOException {
- //this.geoProvider = geoProvider;
- inputStream = geoProvider.getAnimationStream(animationID);
+ public BvhParser(GeometryProvider geoProvider, long animationID) throws IOException {
+ this.geoProvider = geoProvider;
+ inputStream = this.geoProvider.getAnimationStream(animationID);
+ if (inputStream==null) {
+ System.out.println("FART: BvhParser: Can't get a stream from "+geoProvider+","+geoProvider.getClass().getName());
+ }
tokenizer = new LineTokenizer(inputStream);
}
Added: maven/trunk/ogoglio-common/src/main/resources/testing_constants/bootstrapUser.properties
===================================================================
--- maven/trunk/ogoglio-common/src/main/resources/testing_constants/bootstrapUser.properties (rev 0)
+++ maven/trunk/ogoglio-common/src/main/resources/testing_constants/bootstrapUser.properties 2007-08-26 22:55:01 UTC (rev 264)
@@ -0,0 +1,2 @@
+bootstrapUser=${ogoglio.bootstrapUser}
+bootstrapUserPW=${ogoglio.bootstrapUserPW}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
