Menu
▾
▴
ogoglio-commits
|
From: <ian...@us...> - 2007-08-21 16:08:44
|
Revision: 251
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=251&view=rev
Author: iansmith
Date: 2007-08-21 09:08:47 -0700 (Tue, 21 Aug 2007)
Log Message:
-----------
Moved integration tests to server.
Fixed the code that handles TemplateSupportFiles to be compatible now.
Modified Paths:
--------------
maven/trunk/ogoglio-common/pom.xml
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/xml/TemplateSupportFileDocument.java
Removed Paths:
-------------
maven/trunk/ogoglio-common/src/test/java/com/ogoglio/client/
Property Changed:
----------------
maven/trunk/ogoglio-common/
Property changes on: maven/trunk/ogoglio-common
___________________________________________________________________
Name: svn:ignore
+ target
Modified: maven/trunk/ogoglio-common/pom.xml
===================================================================
--- maven/trunk/ogoglio-common/pom.xml 2007-08-21 03:19:54 UTC (rev 250)
+++ maven/trunk/ogoglio-common/pom.xml 2007-08-21 16:08:47 UTC (rev 251)
@@ -10,12 +10,13 @@
<version>0.0.1</version>
- <!-- things we need to build -->
+ <!-- things we need to build/run -->
<dependencies>
<dependency>
<groupId>com.agical.rmock</groupId>
<artifactId>rmock</artifactId>
<version>2.0.0-rc-6</version>
+ <scope>compile</scope>
</dependency>
</dependencies>
</project>
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/xml/TemplateSupportFileDocument.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/xml/TemplateSupportFileDocument.java 2007-08-21 03:19:54 UTC (rev 250)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/xml/TemplateSupportFileDocument.java 2007-08-21 16:08:47 UTC (rev 251)
@@ -1,31 +1,40 @@
package com.ogoglio.xml;
import java.text.DateFormat;
+import java.util.Date;
import java.util.Locale;
public class TemplateSupportFileDocument {
public static final DateFormat fmt=DateFormat.getDateTimeInstance(DateFormat.FULL,
DateFormat.FULL, Locale.US);
public static final int NO_LOD = -299;
+ private int levelOfDetail=NO_LOD;
+ private Date lastChanged=null;
+ private boolean script=false;
+ private String supportFile=null;
+ public TemplateSupportFileDocument(int levelOfDetail, Date lastChanged,
+ boolean script, String supportFile) {
+ this.levelOfDetail=levelOfDetail;
+ this.lastChanged=lastChanged;
+ this.script=script;
+ this.supportFile=supportFile;
+ }
+
public boolean getScript() {
- // TODO Auto-generated method stub
- return false;
+ return script;
}
public String getLastChangedAsUTC() {
- // TODO Auto-generated method stub
- return null;
+ return fmt.format(lastChanged);
}
public int getLevelOfDetail() {
- // TODO Auto-generated method stub
- return 0;
+ return levelOfDetail;
}
public String getSupportFile() {
- // TODO Auto-generated method stub
- return "NYI";
+ return supportFile;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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.
|
|
From: <tre...@us...> - 2007-08-27 21:05:19
|
Revision: 271
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=271&view=rev
Author: trevorolio
Date: 2007-08-27 14:05:20 -0700 (Mon, 27 Aug 2007)
Log Message:
-----------
Made body editor applet work, including refs to avatar resources.
Modified Paths:
--------------
maven/trunk/ogoglio-common/pom.xml
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/BodyConstants.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/render/UIConstants.java
Added Paths:
-----------
maven/trunk/ogoglio-common/src/main/resources/avatar/avatar.obj
maven/trunk/ogoglio-common/src/main/resources/avatar/loading.obj
Modified: maven/trunk/ogoglio-common/pom.xml
===================================================================
--- maven/trunk/ogoglio-common/pom.xml 2007-08-27 17:39:06 UTC (rev 270)
+++ maven/trunk/ogoglio-common/pom.xml 2007-08-27 21:05:20 UTC (rev 271)
@@ -32,19 +32,19 @@
<dependency>
<groupId>java3d</groupId>
<artifactId>j3d-core</artifactId>
- <version>1.5.1</version>
+ <version>1.3</version>
<scope>supplied</scope>
</dependency>
<dependency>
<groupId>java3d</groupId>
<artifactId>j3d-core-utils</artifactId>
- <version>1.5.1</version>
+ <version>1.3</version>
<scope>supplied</scope>
</dependency>
<dependency>
<groupId>java3d</groupId>
<artifactId>vecmath</artifactId>
- <version>1.5.1</version>
+ <version>1.3</version>
<scope>supplied</scope>
</dependency>
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/BodyConstants.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/BodyConstants.java 2007-08-27 17:39:06 UTC (rev 270)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/BodyConstants.java 2007-08-27 21:05:20 UTC (rev 271)
@@ -4,16 +4,16 @@
public class BodyConstants {
- public static Image BASE_SKIN_TEXTURE1 = UIConstants.loadImageFromResource("com/ogoglio/viewer/applet/resources/avatar1.jpg");
+ public static final String TEXTURE_RESOURCE_PATH = "avatar/";
+ public static Image BASE_SKIN_TEXTURE1 = UIConstants.loadImageFromResource(TEXTURE_RESOURCE_PATH + "avatar1.jpg");
+
public static final int BASE_SKIN_TEXTURE_WIDTH = BASE_SKIN_TEXTURE1.getWidth(null);
public static final int BASE_SKIN_TEXTURE_HEIGHT = BASE_SKIN_TEXTURE1.getHeight(null);
public static final Image[] BASE_SKIN_TEXTURES = { BASE_SKIN_TEXTURE1 };
- public static final String TEXTURE_RESOURCE_PATH = "com/ogoglio/viewer/applet/resources/";
-
public static final Image EYES_1 = UIConstants.loadImageFromResource(TEXTURE_RESOURCE_PATH + "Eyes1.gif");
public static final Image EYES_2 = UIConstants.loadImageFromResource(TEXTURE_RESOURCE_PATH + "Eyes2.gif");
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/render/UIConstants.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/render/UIConstants.java 2007-08-27 17:39:06 UTC (rev 270)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/render/UIConstants.java 2007-08-27 21:05:20 UTC (rev 271)
@@ -57,14 +57,9 @@
public static ImageIcon loadIconFromResource(String resourcePath) {
try {
byte[] buffer = null;
- InputStream resource = null;
+ InputStream resource = getResource(resourcePath);
- resource = UIConstants.class.getClassLoader().getResourceAsStream(resourcePath);
if (resource == null) {
- resource = UIConstants.class.getResourceAsStream(resourcePath);
- }
-
- if (resource == null) {
throw new IllegalStateException("Could not find resource: " + resourcePath);
}
@@ -89,4 +84,12 @@
}
}
+ public static InputStream getResource(String resourcePath) {
+ InputStream resource = UIConstants.class.getClassLoader().getResourceAsStream(resourcePath);
+ if (resource == null) {
+ resource = UIConstants.class.getResourceAsStream(resourcePath);
+ }
+ return resource;
+
+ }
}
Added: maven/trunk/ogoglio-common/src/main/resources/avatar/avatar.obj
===================================================================
--- maven/trunk/ogoglio-common/src/main/resources/avatar/avatar.obj (rev 0)
+++ maven/trunk/ogoglio-common/src/main/resources/avatar/avatar.obj 2007-08-27 21:05:20 UTC (rev 271)
@@ -0,0 +1,5014 @@
+# Wavefront OBJ (1.0) exported by lynx's OBJ import/export script
+
+# Meshname: lHand_lambert3SG_mik
+# Total number of Faces: 1784
+# Total number of Vertices: 894
+
+# UV Texture: 1
+
+mtllib avatar.mtl
+
+g lHand_lambert3SG_mik
+
+v 0.343355174189 1.47511989521 -0.106217229663
+v 0.283691423605 1.47009974659 -0.123079932959
+v 0.254977426164 1.5281764079 -0.123393525038
+v 0.281692352655 1.58887499782 -0.10246919614
+v 0.258296980076 1.45254660725 -0.100581150479
+v 0.235947062141 1.45095622684 -0.117817012909
+v 0.221188175461 1.45399008343 -0.0118269063457
+v 0.250385445712 1.45269630197 -0.0359525429019
+v 0.263191434542 1.46557976953 0.0245384693031
+v 0.246624602231 1.50794201904 0.0261693163131
+v 0.333633556943 1.47297649413 0.0141261518063
+v 0.276242509005 1.5756729112 0.00278851416444
+v 0.365962874302 1.47673511185 -0.0506124684577
+v 0.287224702684 1.60061281462 -0.0511701669842
+v 0.0316988889523 1.6317063225 0.0187973697828
+v 2.75899153729e-05 1.62696784627 0.0278623368879
+v 2.75899153729e-05 1.57280517729 0.0232990859265
+v 0.0479338097809 1.58185552441 0.0144208300306
+v 0.0311844249645 1.63211081723 0.0409902529506
+v 2.75899153729e-05 1.62523209486 0.0605296430782
+v 0.0215104925006 1.64245834671 0.0705538014202
+v 2.75899153729e-05 1.63798746772 0.0796173818465
+v 0.0156792763918 1.66272162261 0.075167604418
+v 2.75899153729e-05 1.66242430154 0.0797441826594
+v 0.0121505032633 1.6833318171 0.0816255420592
+v 2.75899153729e-05 1.68238986172 0.0854430566585
+v 0.00892779224581 1.68937694366 0.0776208516903
+v 2.75899153729e-05 1.68938879659 0.079846630206
+v 0.0118297105155 1.69479641333 0.0856477087666
+v 2.75899153729e-05 1.69448560031 0.0875556184329
+v 0.0201558240924 1.71538567824 0.0790199791259
+v 2.75899153729e-05 1.71126038856 0.0881919055968
+v 0.0145395419682 1.72256754152 0.094597572792
+v 2.75899153729e-05 1.71636725245 0.100730573789
+v 0.0133908300294 1.73159267695 0.0915471274126
+v 2.75899153729e-05 1.72737124077 0.103264116478
+v 0.00678246106977 1.75009878736 0.0871202952777
+v 2.75899153729e-05 1.75114410597 0.0926591449485
+v 0.0145899406375 1.81336113767 0.0852902593768
+v 2.75899153729e-05 1.81336113767 0.0852902593768
+v 2.75899153729e-05 1.78043882962 0.0885492126408
+v 0.0103507356614 1.77601865074 0.0828540037675
+v 0.0294127702897 1.87744634103 0.03267998912
+v 2.75899153729e-05 1.88097263196 0.0367307912246
+v 2.75899153729e-05 1.84822462814 0.0739688858507
+v 0.0215411401078 1.84608385035 0.071436835915
+v 0.0294127702897 1.87620614557 -0.057265214399
+v 2.75899153729e-05 1.87916218585 -0.0592382726677
+v 0.0379310936814 1.80900888215 -0.123248115337
+v 2.75899153729e-05 1.81044288346 -0.125912213446
+v 0.0372555105424 1.74680339818 -0.116905630997
+v 2.75899153729e-05 1.74674176579 -0.119887975017
+v 0.0301050811263 1.66494457321 -0.0798853452841
+v 2.75899153729e-05 1.6649421628 -0.0803379812621
+v 2.75899153729e-05 1.70091673735 -0.0944580326077
+v 0.0367345924778 1.69939265343 -0.0901844570618
+v 0.0315343099927 1.63060149266 -0.0791792104509
+v 2.75899153729e-05 1.62730876968 -0.0826675217988
+v 0.0091012687058 1.76409290229 0.0803961327997
+v 2.75899153729e-05 1.76357136119 0.0857364386186
+v 0.0262241733005 1.77474659055 0.0699758401444
+v 0.0396342187566 1.77298686711 0.0655889067946
+v 0.0488025338146 1.7865239531 0.0690474436901
+v 0.0273975747283 1.7883325277 0.0800725676313
+v 0.0469014378675 1.7649032064 0.0580954698684
+v 0.0559017062222 1.7625051037 0.0471939031893
+v 0.0385600672761 1.76004025717 0.0656578512758
+v 0.0471323774336 1.7470535352 0.061317775476
+v 0.0262784907054 1.7603345681 0.0713086383124
+v 0.0253303127535 1.74468552197 0.0709202589937
+v 0.0180991240557 1.76218017677 0.0746966438723
+v 0.0130735883464 1.74790905565 0.0770247497478
+v 0.0218343879666 1.72989901386 0.0772885515055
+v 0.0317956895245 1.72938876083 0.0678364252633
+v 0.0519853829723 1.7299916337 0.0444452554822
+v 0.0676821157904 1.76367734196 0.0320366406451
+v 0.0579379145649 1.79924542033 0.0567894881847
+v 0.0314696660648 1.81049128542 0.0776982837378
+v 0.0217744827595 1.69380112471 0.0787905033638
+v 0.0374640407073 1.70566614682 0.0653467431309
+v 0.032142641122 1.68997396285 0.0692796486705
+v 0.0455115524187 1.68667189358 0.0604917054542
+v 0.020256782783 1.6861014242 0.0757815310671
+v 0.03548251215 1.66685500248 0.0682222012718
+v 0.0187932335694 1.76793672423 0.0747484220596
+v 0.0101225761096 1.77555304686 0.082755819379
+v 0.0527566927675 1.70395191319 0.0439510246216
+v 0.0552782741402 1.68517370151 0.040364879246
+v 0.0451413370483 1.65504295645 0.0477997639437
+v 0.0479407875902 1.83867390054 0.0526543540337
+v 0.0718287649401 1.81440171784 0.0255332943303
+v 0.0778149741173 1.77181437482 0.0108564057979
+v 0.0659904969588 1.73215839965 0.0134872253984
+v 0.0635115124932 1.70486565808 0.0115977557445
+v 0.062024170484 1.68164506599 0.0127388179221
+v 0.0517531367201 1.64808985538 0.0122361633027
+v 0.0527063350974 1.64656709874 0.00152374734525
+v 0.0760398596341 1.60490049752 -0.0217727938992
+v 0.0820292429475 1.625612205 -0.0433648276692
+v 0.0594207651715 1.66425252742 -0.0245295151486
+v 0.0578565032628 1.86428316819 0.0251195643182
+v 0.0572632783765 1.86222202858 -0.0529790667454
+v 0.0686153224001 1.79975529142 -0.103134319695
+v 0.0623956078967 1.74527338334 -0.098057543584
+v 0.057438019862 1.70043118136 -0.0738327336848
+v 0.0568206292192 1.66649576895 -0.0562030095353
+v 0.0647200859948 1.62696581517 -0.0582480529516
+v 0.0799981343835 1.82339568687 -0.00458137933152
+v 0.0807125636588 1.82430716836 -0.0504491034754
+v 0.0860548093833 1.79025563382 -0.0768302904728
+v 0.0763177182228 1.74640110593 -0.0687157048594
+v 0.0675743432875 1.70444017924 -0.0427966695874
+v 0.0696239782262 1.70837774714 -0.0124262648601
+v 0.0738282485275 1.73717009491 -0.0167285885275
+v 0.0896549569309 1.74452591153 -0.0283932610632
+v 0.0901622579515 1.76236461409 -0.0245834259933
+v 0.0753513789219 1.73764879425 -0.00394294869589
+v 0.0680211928851 1.71267466127 -0.00574968058287
+v 0.0823872537643 1.71592523137 -0.013999686113
+v 0.0752380569709 1.74304445527 -0.0307382098548
+v 0.0909615689178 1.74431751736 -0.0371113333404
+v 0.0796651410498 1.70888612599 -0.0177665667149
+v 0.0833178522921 1.76196882367 -0.0358989180934
+v 0.0922718311612 1.76668926165 -0.0383930291374
+v 0.0858293875239 1.77183709754 -0.0215222754919
+v 0.0848422417605 1.7690443059 -0.0139918797774
+v 0.0922718311612 1.77736369087 -0.0215927986367
+v 0.0858895426942 1.79235887457 -0.0147793446446
+v 2.75899153729e-05 1.50243987349 0.0763933666337
+v 0.09625876836 1.51194700441 0.0568333745205
+v 2.75899153729e-05 1.58510972525 -0.121379252506
+v 0.064656307019 1.58706050374 -0.11604438338
+v 0.124488339722 1.60016694288 -0.00161886442604
+v 0.130205001257 1.6256692352 -0.0479543307522
+v 0.103154759022 1.61467283081 -0.0925441583441
+v 0.172320582436 1.51776346316 0.03839617801
+v 0.178504593198 1.59754600374 -0.00651384470123
+v 0.179250705642 1.62352555243 -0.0549261294398
+v 0.163498790467 1.6051828078 -0.0944483771826
+v 0.152823345306 1.55293295873 -0.12324035118
+v 0.0702293653442 1.48465631599 -0.139732400711
+v 2.75899153729e-05 1.48519960348 -0.145574771474
+v 0.157849822676 1.4775470554 -0.132385883892
+v 2.75899153729e-05 1.43278280747 0.099373558889
+v 0.0865465148149 1.43836294152 0.0916184045486
+v 0.179154994857 1.44550222944 0.0729943964813
+v 0.214723475839 1.36425687059 0.00888010099833
+v 0.215389113352 1.36152023659 -0.101871971332
+v 0.073390048451 1.3798662656 -0.151308517007
+v 2.75899153729e-05 1.38087331064 -0.157741152281
+v 0.159049159441 1.37430365875 -0.140305760807
+v 2.75899153729e-05 1.32302186775 0.126264030855
+v 0.0793310843805 1.33823186499 0.119766679892
+v 0.165847450192 1.37457645987 0.0791410759649
+v 0.36262558755 1.35515117114 -0.101050814947
+v 0.318808098048 1.35875826818 -0.116198647333
+v 0.274146542259 1.38550060202 -0.0960468567593
+v 0.26706085464 1.38485283288 -0.0379477713425
+v 0.300280432547 1.37688438221 -0.00314337667591
+v 0.357990121432 1.35443340881 0.0126103090787
+v 0.384815634827 1.35392891424 -0.0510746268901
+v 0.356945999925 1.269277297 -0.106558432711
+v 0.315053750966 1.272526206 -0.11374545812
+v 0.257974995704 1.27444178024 -0.094326231712
+v 0.25117290657 1.27381989963 -0.0385501975453
+v 0.296953726249 1.27088887901 0.00360642731089
+v 0.350186909755 1.26863200103 -0.00245612218975
+v 0.376914659757 1.26812912573 -0.0511580746735
+v 0.356815648734 1.21625626109 -0.100886045494
+v 0.314163469257 1.21968816735 -0.110605243281
+v 0.253162920651 1.22173528984 -0.0903774387573
+v 0.255227230679 1.22089413406 -0.0374629964882
+v 0.294737100007 1.22002757242 -0.0083057682748
+v 0.350505275612 1.21554922149 -0.00689595057564
+v 0.380233240266 1.21498996452 -0.0508866153891
+v 0.343034099737 1.13857136072 -0.0925593498371
+v 0.303665923847 1.14165474129 -0.100784540801
+v 0.247264994781 1.14351745566 -0.0876674753996
+v 0.249457391783 1.14276125482 -0.0393321281235
+v 0.285641782145 1.14011085299 -0.013181634346
+v 0.338251903886 1.13792565629 -0.0118753601358
+v 0.364692923588 1.13742808605 -0.0513118029012
+v 0.32056267587 1.05733100559 -0.0834381991135
+v 0.295548091794 1.05929698006 -0.0928732197218
+v 0.261507005129 1.06044901158 -0.0803551096969
+v 0.257463790496 1.06006907092 -0.0443595173218
+v 0.278485692186 1.05841664078 -0.0171065884874
+v 0.316532475195 1.05693729049 -0.0210389564925
+v 0.332462469989 1.05663777129 -0.0524637679174
+v 0.303779071221 1.00187254235 -0.0761127589293
+v 0.29094743537 1.00349679934 -0.0943090222387
+v 0.267339607277 1.00441336451 -0.0792557359176
+v 0.263822050752 1.00405781077 -0.0475907611549
+v 0.282115697775 1.00255027507 -0.0241360196866
+v 0.302909273271 1.00145404041 -0.0311525101888
+v 0.30804718398 1.00135852058 -0.0548365113448
+v 0.286726299826 0.950449218395 -0.100629989049
+v 0.279232799193 0.951281888549 -0.102482156437
+v 0.264863950365 0.952023681486 -0.0861725243024
+v 0.273179002077 0.951444272404 -0.0440122500119
+v 0.267080618928 0.967401650744 -0.0136952855869
+v 0.28612725569 0.966726632689 -0.0120455711491
+v 0.296284300934 0.966146233687 -0.0189022164873
+v 0.307232594839 0.948190105118 -0.0537989081656
+v 0.299507636198 0.948906506537 -0.0924513890276
+v 0.293089194321 0.902321205004 -0.105583117113
+v 0.278992390121 0.903040118963 -0.108685792801
+v 0.27067738073 0.903667579235 -0.0888512214361
+v 0.279536458219 0.919578465881 -0.0650949625342
+v 0.276864851301 0.918644992083 -0.050580962846
+v 0.292092219316 0.939852727707 -0.00329278961002
+v 0.281371468651 0.940999903671 0.00703399211442
+v 0.276570439592 0.901620881632 0.0220579442615
+v 0.28949643193 0.901024957857 0.012564168728
+v 0.296910071296 0.932494455969 -0.0167261970524
+v 0.30131534906 0.935144286087 -0.0303853776306
+v 0.306093968718 0.915634123157 -0.0683672077431
+v 0.302994953786 0.900845274579 -0.0824599919486
+v 0.301001194224 0.901242288899 -0.0924641414545
+v 0.294532516352 0.880967651149 -0.108760351904
+v 0.2788119299 0.881464040364 -0.110820690001
+v 0.270978965987 0.88188341085 -0.0925102362864
+v 0.275748528776 0.881673298886 -0.079814646404
+v 0.272178831775 0.904063386994 -0.0770079411332
+v 0.264191054661 0.902206690482 -0.00985439326463
+v 0.27191808707 0.903049223174 -0.0204842371761
+v 0.274761689846 0.876534705176 -0.025544922093
+v 0.272798232704 0.880265351801 -0.00990242677447
+v 0.297498027117 0.90087360296 -0.0146815059632
+v 0.279595433669 0.899965463457 -0.011404366819
+v 0.285680104549 0.879735179873 -0.00640139923513
+v 0.297005189576 0.874826145393 -0.0146815047116
+v 0.303133367283 0.8792806604 -0.0797280152578
+v 0.305126851753 0.873669955264 -0.0692336813228
+v 0.285034083198 0.88074939176 -0.0857172689512
+v 0.278391272216 0.876655772615 -0.0666005899462
+v 0.28577873554 0.875050056449 -0.0623573586614
+v 0.279616721542 0.875940603066 -0.053476409437
+v 0.284903943616 0.875963900812 -0.032153580074
+v 0.277738183122 0.877047128708 -0.0391539874109
+v 0.297216354274 0.879535525347 -0.0995490390109
+v 0.306699128356 0.873553682519 -0.0555307833529
+v 0.30829334882 0.874614163389 -0.041827882932
+v 0.302975274142 0.874714093926 -0.0253514761038
+v 0.26008238934 0.93765901141 -0.0110152167305
+v 0.265364151901 0.902184467175 0.0170707591002
+v 0.27159100292 0.941489572897 0.0014824978797
+v 0.271017838574 0.849026678806 -0.00121405129267
+v 0.28114646472 0.848231766063 0.00338504714388
+v 0.269796325178 0.839211298629 0.0114049921417
+v 0.259572538431 0.849737717497 0.00537057728079
+v 0.259839843017 0.849732659286 0.0176770527063
+v 0.285773297187 0.853672964793 -0.111372654251
+v 0.271854413899 0.854102848737 -0.110265112227
+v 0.290734768248 0.852132926082 -0.0999621383676
+v 0.279863457725 0.853376201266 -0.0904865595313
+v 0.267845289488 0.854449853535 -0.0974254081797
+v 0.270598196614 0.819485417377 -0.0993814883664
+v 0.259119039018 0.813469780423 -0.102944467441
+v 0.267217212587 0.822179798472 -0.109616065235
+v 0.273023532888 0.796376537822 -0.0697523708832
+v 0.265823258954 0.789862746305 -0.072722997763
+v 0.272634045221 0.796512985947 -0.0770320980056
+v 0.308953611461 0.916725965983 -0.0541753435975
+v 0.304212383127 0.917290666699 -0.036998328034
+v 0.300737296544 0.902850016878 -0.0258398107299
+v 0.2761598545 0.79530026927 -0.0540818173463
+v 0.266729749918 0.787374888257 -0.0468895471189
+v 0.263962538019 0.790518914589 -0.0563668840248
+v 0.269741920484 0.797318460552 -0.0127066094786
+v 0.261706764098 0.789559793087 -0.0174185545312
+v 0.268583593558 0.797658296265 -0.0229096370047
+v 0.265065402206 0.935006072819 -0.0272677782201
+v 0.273858584628 0.91366866558 -0.0295170345537
+v 0.287615438845 0.900129819188 -0.00541660704541
+v 0.273518317232 0.865688561322 0.0297198249549
+v 0.286686326871 0.86489075413 0.020654178843
+v 0.262754440638 0.874379768116 0.0222497086467
+v 0.257984602756 0.874470013316 0.0074939146809
+v 0.271051251648 0.873728319069 -0.00250281655189
+v 0.274991285695 0.847856771479 -0.064918588815
+v 0.285244041724 0.84679055433 -0.0623573617736
+v 0.274661916166 0.847968840299 -0.0798122584604
+v 0.28471123123 0.846936351039 -0.0821631241187
+v 0.297144110935 0.845668794211 -0.079699510177
+v 0.29694350553 0.845555010713 -0.0691929412471
+v 0.277700220454 0.847608949364 -0.0388873673837
+v 0.29178506874 0.846538197119 -0.0357790063912
+v 0.276975184273 0.847720965357 -0.0513709629919
+v 0.286224193808 0.846701433469 -0.0581989479219
+v 0.30016182566 0.845407690096 -0.0554988132581
+v 0.301199620056 0.845301526414 -0.0417930673912
+v 0.275037903174 0.846475129466 -0.010392286449
+v 0.285051879522 0.846019248778 -0.00712678993721
+v 0.271328819274 0.84711140467 -0.022714782982
+v 0.284590148516 0.846345102212 -0.0263213491389
+v 0.294696259455 0.845450384952 -0.0241914808014
+v 0.295378825694 0.845436692858 -0.0118373413903
+v 0.286667155089 0.872829664543 0.00335813225635
+v 0.278857425852 0.848275087818 0.0147626952654
+v 0.269521127573 0.849000559842 0.022643016501
+v 0.270635714903 0.831079660863 -0.0909061862241
+v 0.280654092719 0.828092302759 -0.099956077644
+v 0.258752743706 0.834284971972 -0.0973790320546
+v 0.262638732794 0.833232984683 -0.110218145465
+v 0.276242255075 0.830356584988 -0.110857735433
+v 0.267378924244 0.817571660299 -0.0669124167568
+v 0.276112030849 0.81476007051 -0.0623119639213
+v 0.267867677729 0.817710415333 -0.0797791276508
+v 0.275610961715 0.814978089527 -0.0821178939689
+v 0.283067282633 0.81165272685 -0.0784313822103
+v 0.283603711643 0.811571042614 -0.0691253061147
+v 0.271518928868 0.812685325799 -0.0388579738845
+v 0.282811024041 0.809225254829 -0.0357349872081
+v 0.270019699719 0.81292549495 -0.0513374298356
+v 0.277361349678 0.81033392898 -0.0581554243922
+v 0.285722066629 0.806731654757 -0.055425823807
+v 0.286726934653 0.806459016672 -0.0417199241221
+v 0.266546284848 0.818423051294 -0.00987537043414
+v 0.276203890349 0.816083326812 -0.00635735826927
+v 0.265514119253 0.819449687449 -0.0226866059185
+v 0.27576260078 0.816496066205 -0.0270026926331
+v 0.280491026765 0.810454722177 -0.0246798834566
+v 0.282058224749 0.810308579431 -0.0113963923311
+v 0.261741616113 0.813918360122 -0.0918569656027
+v 0.251856975233 0.818867874916 -0.0976758123515
+v 0.25508712431 0.817231663863 -0.109208538137
+v 0.258449423255 0.796748709387 -0.0679346159072
+v 0.264570723667 0.793306651182 -0.0644094241434
+v 0.258711606901 0.796842705203 -0.0780759692739
+v 0.264218965898 0.793535617086 -0.0799026419625
+v 0.260908659303 0.791525932221 -0.0400352652833
+v 0.268299127476 0.788696349937 -0.0373789872383
+v 0.259703884185 0.791967914348 -0.0506036374743
+v 0.276948860104 0.79491629786 -0.0424748313596
+v 0.255335003182 0.797925028105 -0.0110927741968
+v 0.26280438038 0.79442054433 -0.00831464269478
+v 0.254967734468 0.798747577593 -0.0216365151888
+v 0.26235818148 0.794878638956 -0.0250088312349
+v 0.207278793421 1.26228916073 0.00942310885069
+v 0.207944430934 1.25963199399 -0.0863646302291
+v 0.073390048451 1.27004732982 -0.153714983924
+v 2.75899153729e-05 1.27273604576 -0.157165289745
+v 0.159049159441 1.26804360134 -0.131834734316
+v 2.75899153729e-05 1.22103007817 0.122269378712
+v 0.0793310843805 1.23622604979 0.113130305525
+v 0.157171403975 1.24983173305 0.0618375764676
+v 0.189642002135 1.14509243135 0.0100472156823
+v 0.190257107399 1.14248928438 -0.0755975141376
+v 0.0721252451275 1.15011763901 -0.141909215371
+v 2.75899153729e-05 1.15404723409 -0.145366139817
+v 0.151282312784 1.14469656756 -0.120010777994
+v 2.75899153729e-05 1.11963676968 0.113262343032
+v 0.0776152997923 1.12651473138 0.107446399592
+v 0.14954704429 1.14015385426 0.0624216432227
+v 0.202119764126 1.0243959018 0.00625436384738
+v 0.202769150061 1.02179779958 -0.0784758312291
+v 0.0714867888011 1.02347473353 -0.160001960554
+v 2.75899153729e-05 1.02545504382 -0.172709506024
+v 0.15506286765 1.02019887243 -0.13769059077
+v 2.75899153729e-05 1.02336058809 0.101139483661
+v 0.0772833592138 1.02106206547 0.0987120060027
+v 0.153230819744 1.01895588925 0.0596471526982
+v 0.21286825674 0.893112713561 0.00827156986743
+v 0.213526868831 0.890552404799 -0.0693457569555
+v 0.0764414513403 0.874148386236 -0.153218724842
+v 0.00904797231466 0.900586285531 -0.16130593937
+v 0.16041456701 0.886372765939 -0.123575847045
+v -0.00161698348361 0.944486233875 0.0842572468792
+v 0.0823202054282 0.882676426963 0.0726294945037
+v 0.158556480608 0.885041549969 0.057199229766
+v 0.225137647273 0.781896653591 0.00495156496115
+v 0.22585864172 0.779285605198 -0.065269744779
+v 0.00647517493254 0.834195498226 -0.119823370439
+v 0.082086208111 0.771190531608 -0.132787500355
+v 0.0302761511943 0.774393838356 -0.116744143899
+v 0.161426799029 0.774970129541 -0.114330592314
+v -0.00275945196269 0.878070061352 0.0330007517554
+v 0.0175651100343 0.783412465203 0.00773563482799
+v 0.0885215099419 0.770975543301 0.0631861292678
+v 0.159392812582 0.773451074272 0.0492240336822
+v 0.217958703534 0.66196116722 0.00861468241288
+v 0.227124508379 0.661441791795 -0.0534299578572
+v 0.110670605573 0.660475272669 -0.112177798475
+v 0.0475792640627 0.6619605837 -0.0993733798686
+v 0.17890563472 0.66085134737 -0.0999868614115
+v 0.0302199584039 0.661963998804 0.0202410256867
+v 0.0997549312072 0.661245536558 0.0524287169785
+v 0.161020848176 0.66143251195 0.0470791466693
+v 0.00436053037905 0.782227718244 -0.0414460210392
+v 0.0150673161669 0.661963914074 -0.0437835291292
+v 0.0021001195742 0.830725285808 -0.042353108549
+v 0.202083219238 0.547624963169 0.0183109530822
+v 0.209724592293 0.547099401395 -0.0448715366902
+v 0.112638305477 0.54612735639 -0.104696781353
+v 0.061107088486 0.547613876426 -0.0916573845542
+v 0.169525057242 0.546504494829 -0.0922822500533
+v 0.0459600737279 0.547628929994 0.0301504755915
+v 0.103538025382 0.546913695589 0.0629284058744
+v 0.154614711366 0.547100063924 0.057480735439
+v 0.0333275091166 0.547622550615 -0.0350481607666
+v 0.194043978796 0.430189017476 0.0179129275465
+v 0.201075875388 0.429672366728 -0.0436200644398
+v 0.111733306357 0.428708554465 -0.101883444201
+v 0.0643122888524 0.430193345511 -0.089184617253
+v 0.164082725715 0.42908400915 -0.0897930407346
+v 0.0516217750954 0.430191380936 0.0294434176712
+v 0.103358866557 0.429471590365 0.0613657769754
+v 0.150361644012 0.429658758105 0.0560602738571
+v 0.0405444895875 0.430193980804 -0.0340531726951
+v 0.179259783671 0.31369297162 0.010370839969
+v 0.185455803248 0.313197549018 -0.0471838118639
+v 0.106733301283 0.312253713084 -0.101680079288
+v 0.0649491845619 0.313734087153 -0.089802738644
+v 0.152859995998 0.312625004457 -0.0903714756313
+v 0.0577233852827 0.313691492154 0.021155851129
+v 0.0993543023223 0.312960627838 0.0510146429738
+v 0.140769933577 0.313149537287 0.0460520982097
+v 0.044006668017 0.313715995149 -0.0382356490277
+v 0.179259783671 0.206280587614 0.00735913159447
+v 0.185455803248 0.205792858941 -0.0487507301559
+v 0.106733301283 0.204856223373 -0.101878995585
+v 0.0649491845619 0.206335008677 -0.0902999983488
+v 0.152859995998 0.205225918302 -0.0908542821903
+v 0.0577233852827 0.206277497868 0.0178735490793
+v 0.0993543023223 0.205542643016 0.0469829856156
+v 0.140769933577 0.205732215709 0.0421449868979
+v 0.044006668017 0.206309939523 -0.0400272047839
+v 0.169448020958 0.104158479382 0.0079029616633
+v 0.183629701558 0.103611999109 -0.0592394589995
+v 0.106733301283 0.1026755326 -0.112367767652
+v 0.0649491845619 0.104154233205 -0.100788780545
+v 0.152859995998 0.103045312397 -0.101343012386
+v 0.061859184177 0.104155474278 0.0184173786974
+v 0.100353552125 0.103420619426 0.0475268152336
+v 0.139357400667 0.103610192119 0.0426888165159
+v 0.0478589689406 0.10412924875 -0.0505159768503
+v 0.172974242874 0.0419348660709 0.0271650947082
+v 0.183536043381 0.0149426533824 -0.0579186144568
+v 0.106733301283 0.0166113630897 -0.111909450799
+v 0.0649491845619 0.0180898097675 -0.10033046234
+v 0.152859995998 0.0145938031318 -0.100871982252
+v 0.0993543023223 0.0669909955661 0.178307515354
+v 0.0642410400762 0.052159938124 0.149280967882
+v 0.0642410400762 0.0200181600964 0.149452132242
+v 0.0993543023223 0.0145451912853 0.178586804588
+v 0.140769933577 0.0671804835744 0.173469509152
+v 0.140769933577 0.0147347639361 0.173748797935
+v 0.168785906737 0.052162943904 0.138766677811
+v 0.168785906737 0.0118915989867 0.138981134491
+v 0.0478589689406 0.0154524213345 -0.0500437468308
+v 0.0600527250993 0.0418783555113 0.0276320902093
+v 0.0591703258289 0.0883326579141 0.0738766810346
+v 0.0993543023223 0.0984211892211 0.0737593778086
+v 0.0591703258289 0.0139137244903 0.086631906596
+v 0.0940562670242 0.0255519571239 0.024894651945
+v 0.0993543023223 0.00592525673296 0.0866109057047
+v 0.140769933577 0.0986366014594 0.0737736095832
+v 0.139357400667 0.0257661441791 0.0246788150129
+v 0.140769933577 0.00614083825613 0.0866251365778
+v 0.173856652725 0.0883916760283 0.0738805619553
+v 0.173856652725 0.0139729965318 0.0866357861645
+v 0.14914816118 0.0054999045104 -0.0599897295548
+v 0.104143491854 0.00521553482738 -0.0596013142615
+v 0.0186454246291 1.6893436157 0.0713624221124
+v 0.0280316930687 1.76644994315 0.0730407317181
+v 0.0362964347231 1.76631253402 0.069204328114
+v -0.358367335773 1.42386593993 -0.107637289798
+v -0.312122139975 1.56809299346 -0.104774977108
+v -0.265829205169 1.52060606505 -0.12569930095
+v -0.298932905945 1.43111345107 -0.124500039642
+v -0.232298794689 1.4318865506 -0.117817003366
+v -0.24353864358 1.43297111153 -0.102425535059
+v -0.230190956674 1.44680581106 -0.0118269101046
+v -0.235626305102 1.43287834096 -0.0377969588584
+v -0.25091506091 1.50458241773 0.0238635002403
+v -0.288333767018 1.42555192405 0.0226940562749
+v -0.302391211929 1.55763805469 0.000482705725462
+v -0.348412800415 1.42374918988 0.0127060609584
+v -0.321417174483 1.57714756913 -0.0534759480151
+v -0.380829596967 1.42083847198 -0.0520325794251
+v -0.0316437118855 1.6317063225 0.0187973697828
+v -0.0478786274239 1.58185552441 0.0144208300306
+v -0.0311292399623 1.63211081723 0.0409902529506
+v -0.0214553127887 1.64245834671 0.0705538014202
+v -0.0156240966799 1.66272162261 0.075167604418
+v -0.012095324874 1.6833318171 0.0816255420592
+v -0.00887261319516 1.68937694366 0.0776208516903
+v -0.0117745308036 1.69479641333 0.0856477087666
+v -0.0201006404128 1.71538567824 0.0790199791259
+v -0.014484321257 1.72256775313 0.0945975716651
+v -0.0133356503175 1.73159267695 0.0915471274126
+v -0.00672728069657 1.7500986604 0.0871202959538
+v -0.014534759603 1.81336113767 0.0852902593768
+v -0.0102955559495 1.77601877771 0.0828540030914
+v -0.0293575852876 1.87744634103 0.03267998912
+v -0.0214859603958 1.84608385012 0.0714367935938
+v -0.0293575852876 1.87620614557 -0.057265214399
+v -0.0378759086793 1.80900888215 -0.123248115337
+v -0.0371640530994 1.74462217415 -0.116025601698
+v -0.0300499040594 1.66498161744 -0.0729290653167
+v -0.0366794127659 1.69939252672 -0.0901844087743
+v -0.0314791329259 1.63060149266 -0.0791792104509
+v -0.00904608833259 1.76409290229 0.0803961327997
+v -0.0261689935886 1.77474659055 0.0699758401444
+v -0.0273423976615 1.78833257002 0.0800725674059
+v -0.0487473567478 1.7865239531 0.0690474436901
+v -0.0395790416898 1.77298686711 0.0655889067946
+v -0.0558465185749 1.7625051037 0.0471939031893
+v -0.0468462660909 1.7649032064 0.0580954698684
+v -0.0470772003668 1.7470535352 0.061317775476
+v -0.0385048928544 1.76004025717 0.0656578512758
+v -0.0252751330416 1.74468552197 0.0709202589937
+v -0.0262233136386 1.7603345681 0.0713086383124
+v -0.0180439469889 1.76218017677 0.0746966438723
+v -0.0130184059893 1.74790905587 0.077024792069
+v -0.0317405098126 1.72938876083 0.06783642526...
[truncated message content] |
|
From: <tre...@us...> - 2007-08-28 23:50:41
|
Revision: 285
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=285&view=rev
Author: trevorolio
Date: 2007-08-28 16:50:41 -0700 (Tue, 28 Aug 2007)
Log Message:
-----------
Added the XML tests by matching maven's singular test name filter.
Added a templates resource dir for the loading object.
Removed the body applet specific image resources.
Moved the bootstrap user info out of the commons (so the world doesn't get it.. whoops).
Added the sample art to the test resources instead of the main resources.
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/MotionInputHandler.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/bvh/BvhParser.java
Added Paths:
-----------
maven/trunk/ogoglio-common/src/main/resources/templates/
maven/trunk/ogoglio-common/src/main/resources/templates/loading.obj
maven/trunk/ogoglio-common/src/test/java/com/ogoglio/xml/test/XMLTest.java
maven/trunk/ogoglio-common/src/test/resources/sample-art3d/
maven/trunk/ogoglio-common/src/test/resources/sample-art3d/Grid.gif
maven/trunk/ogoglio-common/src/test/resources/sample-art3d/TestCube.gif
maven/trunk/ogoglio-common/src/test/resources/sample-art3d/TestCube.js
maven/trunk/ogoglio-common/src/test/resources/sample-art3d/TestCube.mtl
maven/trunk/ogoglio-common/src/test/resources/sample-art3d/TestCube.obj
maven/trunk/ogoglio-common/src/test/resources/sample-art3d/defaultLand.mtl
maven/trunk/ogoglio-common/src/test/resources/testing_constants/
maven/trunk/ogoglio-common/src/test/resources/testing_constants/bootstrapUser.properties
Removed Paths:
-------------
maven/trunk/ogoglio-common/src/main/resources/avatar/LeftArrow.gif
maven/trunk/ogoglio-common/src/main/resources/avatar/LeftArrowDisabled.gif
maven/trunk/ogoglio-common/src/main/resources/avatar/RightArrow.gif
maven/trunk/ogoglio-common/src/main/resources/avatar/RightArrowDisabled.gif
maven/trunk/ogoglio-common/src/main/resources/avatar/license.txt
maven/trunk/ogoglio-common/src/main/resources/avatar/loading.obj
maven/trunk/ogoglio-common/src/main/resources/sample-art3d/
maven/trunk/ogoglio-common/src/main/resources/testing_constants/
maven/trunk/ogoglio-common/src/test/java/com/ogoglio/xml/test/XMLTests.java
maven/trunk/ogoglio-common/src/test/resources/sample-art3d/Grid.gif
maven/trunk/ogoglio-common/src/test/resources/sample-art3d/TestCube.gif
maven/trunk/ogoglio-common/src/test/resources/sample-art3d/TestCube.js
maven/trunk/ogoglio-common/src/test/resources/sample-art3d/TestCube.mtl
maven/trunk/ogoglio-common/src/test/resources/sample-art3d/defaultLand.mtl
maven/trunk/ogoglio-common/src/test/resources/sample-art3d/door.mtl
maven/trunk/ogoglio-common/src/test/resources/testing_constants/bootstrapUser.properties
Modified: maven/trunk/ogoglio-common/.classpath
===================================================================
--- maven/trunk/ogoglio-common/.classpath 2007-08-28 23:47:54 UTC (rev 284)
+++ maven/trunk/ogoglio-common/.classpath 2007-08-28 23:50:41 UTC (rev 285)
@@ -2,9 +2,9 @@
<classpath>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" path="src/test/java"/>
- <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 excluding="**" output="src/main/resources/avatar" kind="src" path="src/main/resources/avatar"/>
+ <classpathentry excluding="**" output="src/main/resources/templates" kind="src" path="src/main/resources/templates"/>
+ <classpathentry excluding="**" output="src/test/resources" kind="src" 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"/>
<classpathentry kind="output" path="target/classes"/>
Modified: maven/trunk/ogoglio-common/pom.xml
===================================================================
--- maven/trunk/ogoglio-common/pom.xml 2007-08-28 23:47:54 UTC (rev 284)
+++ maven/trunk/ogoglio-common/pom.xml 2007-08-28 23:50:41 UTC (rev 285)
@@ -13,16 +13,22 @@
<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>
+ <resource>
+ <targetPath>templates</targetPath>
+ <directory>src/main/resources/templates</directory>
+ </resource>
</resources>
</build>
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-28 23:47:54 UTC (rev 284)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/SpaceClient.java 2007-08-28 23:50:41 UTC (rev 285)
@@ -689,7 +689,7 @@
try {
return webClient.getTemplateResourceStream(ownerUsername, templateID, name);
} catch (IOException e) {
- return SpaceClient.class.getClassLoader().getResourceAsStream("/avatar/loading.obj");
+ return UIConstants.getResource("/templates/loading.obj");
}
}
@@ -715,7 +715,6 @@
}
public InputStream getUserAnimationStream(String username, long animationID) throws IOException {
- System.out.println("trying to FART: "+username+","+animationID);
if (animationID == 1) {
return UIConstants.getResource("avatar/avatar.bvh");
} else if (animationID == 2) {
@@ -754,7 +753,7 @@
if (lodIndex != 0) {
return null;
}
- return SpaceClient.class.getClassLoader().getResourceAsStream("/avatar/loading.obj");
+ return UIConstants.getResource("/template/loading.obj");
}
public InputStream getSkinMapStream() throws IOException {
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-28 23:47:54 UTC (rev 284)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/model/Space.java 2007-08-28 23:50:41 UTC (rev 285)
@@ -530,7 +530,6 @@
}
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);
}
@@ -543,7 +542,6 @@
}
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-28 23:47:54 UTC (rev 284)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/model/User.java 2007-08-28 23:50:41 UTC (rev 285)
@@ -88,7 +88,6 @@
}
public InputStream getGeometryStream(int lodIndex) throws IOException {
- //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-28 23:47:54 UTC (rev 284)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/WebConstants.java 2007-08-28 23:50:41 UTC (rev 285)
@@ -14,39 +14,4 @@
public static final String SPACE_INCLUDE_CHILDREN_PARAM = "children";
public static final String GUEST_COOKIE_PREFIX = "guest";
-
- private static Properties bootstrapProps=null;
-
- public static String getBootstrapUsername() {
- if (bootstrapProps==null) {
- fetchBootstrapProps();
- }
- return bootstrapProps.getProperty("bootstrapUser");
- }
-
- 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/MotionInputHandler.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/MotionInputHandler.java 2007-08-28 23:47:54 UTC (rev 284)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/MotionInputHandler.java 2007-08-28 23:50:41 UTC (rev 285)
@@ -40,7 +40,6 @@
// right now we only support arrow key based walking and turning
// TODO add a full motion set: walk, fun, strafe, jump
-
public double maxRadiansPerSecond = Math.PI / 60;
private boolean strafeLeft = false;
@@ -110,7 +109,6 @@
}
}
-
// called from within PhysicsBehavior
public void keyPressed(KeyEvent e) {
System.out.println("Key down");
@@ -204,7 +202,7 @@
}
public void mouseClicked(MouseEvent event) {
- if (event.isControlDown() || event.getButton()!=MouseEvent.BUTTON1) {
+ if (event.isControlDown() || event.getButton() != MouseEvent.BUTTON1) {
return;
}
ClickTarget clickTarget = renderer.getClickTarget(event.getX(), event.getY());
@@ -255,8 +253,6 @@
}
public void mousePressed(MouseEvent event) {
- System.out.println("POPUP TRIGGER FART:"+event.isPopupTrigger()+","+new JPopupMenu().isPopupTrigger(event)+","+
- event.isControlDown()+","+event.paramString()+","+event.getButton());
ClickTarget clickTarget = renderer.getClickTarget(event.getX(), event.getY());
if (clickTarget == null) {
return;
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-28 23:47:54 UTC (rev 284)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/bvh/BvhParser.java 2007-08-28 23:50:41 UTC (rev 285)
@@ -40,7 +40,7 @@
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());
+ throw new IllegalArgumentException("No such animation: " + animationID);
}
tokenizer = new LineTokenizer(inputStream);
}
Deleted: maven/trunk/ogoglio-common/src/main/resources/avatar/LeftArrow.gif
===================================================================
(Binary files differ)
Deleted: maven/trunk/ogoglio-common/src/main/resources/avatar/LeftArrowDisabled.gif
===================================================================
(Binary files differ)
Deleted: maven/trunk/ogoglio-common/src/main/resources/avatar/RightArrow.gif
===================================================================
(Binary files differ)
Deleted: maven/trunk/ogoglio-common/src/main/resources/avatar/RightArrowDisabled.gif
===================================================================
(Binary files differ)
Deleted: maven/trunk/ogoglio-common/src/main/resources/avatar/license.txt
===================================================================
--- maven/trunk/ogoglio-common/src/main/resources/avatar/license.txt 2007-08-28 23:47:54 UTC (rev 284)
+++ maven/trunk/ogoglio-common/src/main/resources/avatar/license.txt 2007-08-28 23:50:41 UTC (rev 285)
@@ -1,10 +0,0 @@
-The art in this directory is:
-
-Copyright 2007 METACRASHER.com Licensed under the Apache License,
-Version 2.0 (the "License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
-or agreed to in writing, software distributed under the License is distributed
-on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-or implied. See the License for the specific language governing permissions
-and limitations under the License.
Deleted: maven/trunk/ogoglio-common/src/main/resources/avatar/loading.obj
===================================================================
--- maven/trunk/ogoglio-common/src/main/resources/avatar/loading.obj 2007-08-28 23:47:54 UTC (rev 284)
+++ maven/trunk/ogoglio-common/src/main/resources/avatar/loading.obj 2007-08-28 23:50:41 UTC (rev 285)
@@ -1,1935 +0,0 @@
-# Blender3D v243 OBJ File: loading.blend
-# www.blender3d.org
-o Font_Text
-v 0.053322 0.042887 0.080000
-v 0.051720 0.035097 0.080000
-v 0.049138 0.027703 0.080000
-v 0.045650 0.020778 0.080000
-v 0.041329 0.014394 0.080000
-v 0.036248 0.008625 0.080000
-v 0.030478 0.003543 0.080000
-v 0.024095 -0.000778 0.080000
-v 0.017169 -0.004266 0.080000
-v 0.009775 -0.006847 0.080000
-v 0.001985 -0.008450 0.080000
-v -0.006127 -0.009000 0.080000
-v -0.014240 -0.008450 0.080000
-v -0.022030 -0.006847 0.080000
-v -0.029424 -0.004266 0.080000
-v -0.036350 -0.000778 0.080000
-v -0.042733 0.003543 0.080000
-v -0.048502 0.008625 0.080000
-v -0.053584 0.014394 0.080000
-v -0.057905 0.020778 0.080000
-v -0.061393 0.027703 0.080000
-v -0.063975 0.035097 0.080000
-v -0.065577 0.042887 0.080000
-v -0.066127 0.051000 0.080000
-v -0.065577 0.059113 0.080000
-v -0.063975 0.066903 0.080000
-v -0.061393 0.074297 0.080000
-v -0.057905 0.081222 0.080000
-v -0.053584 0.087606 0.080000
-v -0.048502 0.093375 0.080000
-v -0.042733 0.098457 0.080000
-v -0.036350 0.102778 0.080000
-v -0.029424 0.106266 0.080000
-v -0.022030 0.108847 0.080000
-v -0.014240 0.110450 0.080000
-v -0.006127 0.111000 0.080000
-v 0.001985 0.110450 0.080000
-v 0.009775 0.108847 0.080000
-v 0.017169 0.106266 0.080000
-v 0.024095 0.102778 0.080000
-v 0.030478 0.098457 0.080000
-v 0.036248 0.093375 0.080000
-v 0.041329 0.087606 0.080000
-v 0.045650 0.081222 0.080000
-v 0.049138 0.074297 0.080000
-v 0.051720 0.066903 0.080000
-v 0.053322 0.059113 0.080000
-v 0.053873 0.051000 0.080000
-v -0.003171 0.689560 0.080000
-v 0.021771 0.684982 0.080000
-v 0.043810 0.677625 0.080000
-v 0.063058 0.667852 0.080000
-v 0.079625 0.656023 0.080000
-v 0.093623 0.642500 0.080000
-v 0.105162 0.627644 0.080000
-v 0.114354 0.611815 0.080000
-v 0.121310 0.595375 0.080000
-v 0.126141 0.578685 0.080000
-v 0.128958 0.562106 0.080000
-v 0.129873 0.546000 0.080000
-v 0.126634 0.509157 0.080000
-v 0.117715 0.473588 0.080000
-v 0.104310 0.439234 0.080000
-v 0.087613 0.406037 0.080000
-v 0.068819 0.373937 0.080000
-v 0.049123 0.342875 0.080000
-v 0.029718 0.312792 0.080000
-v 0.011799 0.283630 0.080000
-v -0.003440 0.255328 0.080000
-v -0.014803 0.227829 0.080000
-v -0.021097 0.201072 0.080000
-v -0.021127 0.175000 0.080000
-v -0.031111 0.180362 0.080000
-v -0.040081 0.185982 0.080000
-v -0.048065 0.191906 0.080000
-v -0.055090 0.198185 0.080000
-v -0.061185 0.204867 0.080000
-v -0.066377 0.212000 0.080000
-v -0.070695 0.219633 0.080000
-v -0.074164 0.227815 0.080000
-v -0.076815 0.236594 0.080000
-v -0.078674 0.246019 0.080000
-v -0.079769 0.256138 0.080000
-v -0.080127 0.267000 0.080000
-v -0.077924 0.292783 0.080000
-v -0.071831 0.317264 0.080000
-v -0.062627 0.340641 0.080000
-v -0.051090 0.363111 0.080000
-v -0.037998 0.384873 0.080000
-v -0.024127 0.406125 0.080000
-v -0.010257 0.427064 0.080000
-v 0.002836 0.447889 0.080000
-v 0.014373 0.468797 0.080000
-v 0.023576 0.489986 0.080000
-v 0.029669 0.511655 0.080000
-v 0.031873 0.534000 0.080000
-v 0.031338 0.543721 0.080000
-v 0.029761 0.552852 0.080000
-v 0.027185 0.561344 0.080000
-v 0.023650 0.569148 0.080000
-v 0.019199 0.576216 0.080000
-v 0.013873 0.582500 0.080000
-v 0.007713 0.587950 0.080000
-v 0.000761 0.592519 0.080000
-v -0.006940 0.596156 0.080000
-v -0.015350 0.598815 0.080000
-v -0.024426 0.600446 0.080000
-v -0.034127 0.601000 0.080000
-v -0.038984 0.600920 0.080000
-v -0.043567 0.600694 0.080000
-v -0.047893 0.600344 0.080000
-v -0.051979 0.599889 0.080000
-v -0.055843 0.599351 0.080000
-v -0.059502 0.598750 0.080000
-v -0.062974 0.598108 0.080000
-v -0.066276 0.597444 0.080000
-v -0.069424 0.596781 0.080000
-v -0.072438 0.596139 0.080000
-v -0.075333 0.595538 0.080000
-v -0.078127 0.595000 0.080000
-v -0.031127 0.691000 0.080000
-v 0.053322 0.042887 -0.080000
-v 0.051720 0.035097 -0.080000
-v 0.049138 0.027703 -0.080000
-v 0.045650 0.020778 -0.080000
-v 0.041329 0.014394 -0.080000
-v 0.036248 0.008625 -0.080000
-v 0.030478 0.003543 -0.080000
-v 0.024095 -0.000778 -0.080000
-v 0.017169 -0.004266 -0.080000
-v 0.009775 -0.006847 -0.080000
-v 0.001985 -0.008450 -0.080000
-v -0.006127 -0.009000 -0.080000
-v -0.014240 -0.008450 -0.080000
-v -0.022030 -0.006847 -0.080000
-v -0.029424 -0.004266 -0.080000
-v -0.036350 -0.000778 -0.080000
-v -0.042733 0.003543 -0.080000
-v -0.048502 0.008625 -0.080000
-v -0.053584 0.014394 -0.080000
-v -0.057905 0.020778 -0.080000
-v -0.061393 0.027703 -0.080000
-v -0.063975 0.035097 -0.080000
-v -0.065577 0.042887 -0.080000
-v -0.066127 0.051000 -0.080000
-v -0.065577 0.059113 -0.080000
-v -0.063975 0.066903 -0.080000
-v -0.061393 0.074297 -0.080000
-v -0.057905 0.081222 -0.080000
-v -0.053584 0.087606 -0.080000
-v -0.048502 0.093375 -0.080000
-v -0.042733 0.098457 -0.080000
-v -0.036350 0.102778 -0.080000
-v -0.029424 0.106266 -0.080000
-v -0.022030 0.108847 -0.080000
-v -0.014240 0.110450 -0.080000
-v -0.006127 0.111000 -0.080000
-v 0.001985 0.110450 -0.080000
-v 0.009775 0.108847 -0.080000
-v 0.017169 0.106266 -0.080000
-v 0.024095 0.102778 -0.080000
-v 0.030478 0.098457 -0.080000
-v 0.036248 0.093375 -0.080000
-v 0.041329 0.087606 -0.080000
-v 0.045650 0.081222 -0.080000
-v 0.049138 0.074297 -0.080000
-v 0.051720 0.066903 -0.080000
-v 0.053322 0.059113 -0.080000
-v 0.053873 0.051000 -0.080000
-v -0.003171 0.689560 -0.080000
-v 0.021771 0.684982 -0.080000
-v 0.043810 0.677625 -0.080000
-v 0.063058 0.667852 -0.080000
-v 0.079625 0.656023 -0.080000
-v 0.093623 0.642500 -0.080000
-v 0.105162 0.627644 -0.080000
-v 0.114354 0.611815 -0.080000
-v 0.121310 0.595375 -0.080000
-v 0.126141 0.578685 -0.080000
-v 0.128958 0.562106 -0.080000
-v 0.129873 0.546000 -0.080000
-v 0.126634 0.509157 -0.080000
-v 0.117715 0.473588 -0.080000
-v 0.104310 0.439234 -0.080000
-v 0.087613 0.406037 -0.080000
-v 0.068819 0.373937 -0.080000
-v 0.049123 0.342875 -0.080000
-v 0.029718 0.312792 -0.080000
-v 0.011799 0.283630 -0.080000
-v -0.003440 0.255328 -0.080000
-v -0.014803 0.227829 -0.080000
-v -0.021097 0.201072 -0.080000
-v -0.021127 0.175000 -0.080000
-v -0.031111 0.180362 -0.080000
-v -0.040081 0.185982 -0.080000
-v -0.048065 0.191906 -0.080000
-v -0.055090 0.198185 -0.080000
-v -0.061185 0.204867 -0.080000
-v -0.066377 0.212000 -0.080000
-v -0.070695 0.219633 -0.080000
-v -0.074164 0.227815 -0.080000
-v -0.076815 0.236594 -0.080000
-v -0.078674 0.246019 -0.080000
-v -0.079769 0.256138 -0.080000
-v -0.080127 0.267000 -0.080000
-v -0.077924 0.292783 -0.080000
-v -0.071831 0.317264 -0.080000
-v -0.062627 0.340641 -0.080000
-v -0.051090 0.363111 -0.080000
-v -0.037998 0.384873 -0.080000
-v -0.024127 0.406125 -0.080000
-v -0.010257 0.427064 -0.080000
-v 0.002836 0.447889 -0.080000
-v 0.014373 0.468797 -0.080000
-v 0.023576 0.489986 -0.080000
-v 0.029669 0.511655 -0.080000
-v 0.031873 0.534000 -0.080000
-v 0.031338 0.543721 -0.080000
-v 0.029761 0.552852 -0.080000
-v 0.027185 0.561344 -0.080000
-v 0.023650 0.569148 -0.080000
-v 0.019199 0.576216 -0.080000
-v 0.013873 0.582500 -0.080000
-v 0.007713 0.587950 -0.080000
-v 0.000761 0.592519 -0.080000
-v -0.006940 0.596156 -0.080000
-v -0.015350 0.598815 -0.080000
-v -0.024426 0.600446 -0.080000
-v -0.034127 0.601000 -0.080000
-v -0.038984 0.600920 -0.080000
-v -0.043567 0.600694 -0.080000
-v -0.047893 0.600344 -0.080000
-v -0.051979 0.599889 -0.080000
-v -0.055843 0.599351 -0.080000
-v -0.059502 0.598750 -0.080000
-v -0.062974 0.598108 -0.080000
-v -0.066276 0.597444 -0.080000
-v -0.069424 0.596781 -0.080000
-v -0.072438 0.596139 -0.080000
-v -0.075333 0.595538 -0.080000
-v -0.078127 0.595000 -0.080000
-v -0.031127 0.691000 -0.080000
-v -0.003171 0.689560 -0.080000
-v 0.000323 0.719420 -0.050000
-v 0.021771 0.684982 -0.080000
-v 0.029265 0.714107 -0.050000
-v 0.043810 0.677625 -0.080000
-v 0.055414 0.705379 -0.050000
-v 0.063058 0.667852 -0.080000
-v 0.078653 0.693579 -0.050000
-v 0.079625 0.656023 -0.080000
-v 0.098869 0.679145 -0.050000
-v 0.093623 0.642500 -0.080000
-v 0.116004 0.662591 -0.050000
-v 0.105162 0.627644 -0.080000
-v 0.130092 0.644453 -0.050000
-v 0.114354 0.611815 -0.080000
-v 0.141246 0.625246 -0.050000
-v 0.121310 0.595375 -0.080000
-v 0.149632 0.605426 -0.050000
-v 0.126141 0.578685 -0.080000
-v 0.155432 0.585390 -0.050000
-v 0.128958 0.562106 -0.080000
-v 0.158815 0.565480 -0.050000
-v 0.129873 0.546000 -0.080000
-v 0.159947 0.545534 -0.050000
-v 0.126634 0.509157 -0.080000
-v 0.156311 0.504164 -0.050000
-v 0.117715 0.473588 -0.080000
-v 0.146353 0.464451 -0.050000
-v 0.104310 0.439234 -0.080000
-v 0.131745 0.427015 -0.050000
-v 0.087613 0.406037 -0.080000
-v 0.113985 0.391704 -0.050000
-v 0.068819 0.373937 -0.080000
-v 0.094440 0.358320 -0.050000
-v 0.049123 0.342875 -0.080000
-v 0.074396 0.326711 -0.050000
-v 0.029718 0.312792 -0.080000
-v 0.055106 0.296807 -0.050000
-v 0.011799 0.283630 -0.080000
-v 0.037807 0.268653 -0.050000
-v -0.003440 0.255328 -0.080000
-v 0.023701 0.242455 -0.050000
-v -0.014803 0.227829 -0.080000
-v 0.013846 0.218606 -0.050000
-v -0.021097 0.201072 -0.080000
-v 0.008899 0.197574 -0.050000
-v -0.021127 0.175000 -0.080000
-v 0.008815 0.124865 -0.050000
-v -0.031111 0.180362 -0.080000
-v -0.046189 0.154407 -0.050000
-v -0.040081 0.185982 -0.080000
-v -0.057010 0.161186 -0.050000
-v -0.048065 0.191906 -0.080000
-v -0.067039 0.168629 -0.050000
-v -0.055090 0.198185 -0.080000
-v -0.076223 0.176837 -0.050000
-v -0.061185 0.204867 -0.080000
-v -0.084466 0.185873 -0.050000
-v -0.066377 0.212000 -0.080000
-v -0.091644 0.195735 -0.050000
-v -0.070695 0.219633 -0.080000
-v -0.097647 0.206349 -0.050000
-v -0.074164 0.227815 -0.080000
-v -0.102416 0.217593 -0.050000
-v -0.076815 0.236594 -0.080000
-v -0.105962 0.229338 -0.050000
-v -0.078674 0.246019 -0.080000
-v -0.108359 0.241494 -0.050000
-v -0.079769 0.256138 -0.080000
-v -0.109715 0.254026 -0.050000
-v -0.080127 0.267000 -0.080000
-v -0.110170 0.267785 -0.050000
-v -0.077924 0.292783 -0.080000
-v -0.107612 0.297714 -0.050000
-v -0.071831 0.317264 -0.080000
-v -0.100467 0.326421 -0.050000
-v -0.062627 0.340641 -0.080000
-v -0.089996 0.353017 -0.050000
-v -0.051090 0.363111 -0.080000
-v -0.077317 0.377712 -0.050000
-v -0.037998 0.384873 -0.080000
-v -0.063421 0.400810 -0.050000
-v -0.024127 0.406125 -0.080000
-v -0.049194 0.422607 -0.050000
-v -0.010257 0.427064 -0.080000
-v -0.035465 0.443334 -0.050000
-v 0.002836 0.447889 -0.080000
-v -0.023017 0.463132 -0.050000
-v 0.014373 0.468797 -0.080000
-v -0.012579 0.482049 -0.050000
-v 0.023576 0.489986 -0.080000
-v -0.004752 0.500069 -0.050000
-v 0.029669 0.511655 -0.080000
-v 0.000073 0.517230 -0.050000
-v 0.031873 0.534000 -0.080000
-v 0.001791 0.534652 -0.050000
-v 0.031338 0.543721 -0.080000
-v 0.001479 0.540334 -0.050000
-v 0.029761 0.552852 -0.080000
-v 0.000515 0.545919 -0.050000
-v 0.027185 0.561344 -0.080000
-v -0.000953 0.550755 -0.050000
-v 0.023650 0.569148 -0.080000
-v -0.002830 0.554900 -0.050000
-v 0.019199 0.576216 -0.080000
-v -0.005057 0.558435 -0.050000
-v 0.013873 0.582500 -0.080000
-v -0.007620 0.561459 -0.050000
-v 0.007713 0.587950 -0.080000
-v -0.010558 0.564059 -0.050000
-v 0.000761 0.592519 -0.080000
-v -0.013955 0.566292 -0.050000
-v -0.006940 0.596156 -0.080000
-v -0.017918 0.568163 -0.050000
-v -0.015350 0.598815 -0.080000
-v -0.022553 0.569629 -0.050000
-v -0.024426 0.600446 -0.080000
-v -0.027947 0.570598 -0.050000
-v -0.034127 0.601000 -0.080000
-v -0.034738 0.570986 -0.050000
-v -0.038984 0.600920 -0.080000
-v -0.038000 0.570932 -0.050000
-v -0.043567 0.600694 -0.080000
-v -0.041617 0.570754 -0.050000
-v -0.047893 0.600344 -0.080000
-v -0.045021 0.570478 -0.050000
-v -0.051979 0.599889 -0.080000
-v -0.048250 0.570119 -0.050000
-v -0.055843 0.599351 -0.080000
-v -0.051343 0.569688 -0.050000
-v -0.059502 0.598750 -0.080000
-v -0.054343 0.569196 -0.050000
-v -0.062974 0.598108 -0.080000
-v -0.057290 0.568650 -0.050000
-v -0.066276 0.597444 -0.080000
-v -0.060230 0.568060 -0.050000
-v -0.069424 0.596781 -0.080000
-v -0.063205 0.567433 -0.050000
-v -0.072438 0.596139 -0.080000
-v -0.066263 0.566781 -0.050000
-v -0.075333 0.595538 -0.080000
-v -0.069449 0.566120 -0.050000
-v -0.078127 0.595000 -0.080000
-v -0.131521 0.554166 -0.050000
-v -0.031127 0.691000 -0.080000
-v -0.049363 0.721979 -0.050000
-v 0.000323 0.719420 -0.050000
-v 0.000323 0.719420 0.050000
-v 0.029265 0.714107 -0.050000
-v 0.029265 0.714107 0.050000
-v 0.055414 0.705379 -0.050000
-v 0.055414 0.705379 0.050000
-v 0.078653 0.693579 -0.050000
-v 0.078653 0.693579 0.050000
-v 0.098869 0.679145 -0.050000
-v 0.098869 0.679145 0.050000
-v 0.116004 0.662591 -0.050000
-v 0.116004 0.662591 0.050000
-v 0.130092 0.644453 -0.050000
-v 0.130092 0.644453 0.050000
-v 0.141246 0.625246 -0.050000
-v 0.141246 0.625246 0.050000
-v 0.149632 0.605426 -0.050000
-v 0.149632 0.605426 0.050000
-v 0.155432 0.585390 -0.050000
-v 0.155432 0.585390 0.050000
-v 0.158815 0.565480 -0.050000
-v 0.158815 0.565480 0.050000
-v 0.159947 0.545534 -0.050000
-v 0.159947 0.545534 0.050000
-v 0.156311 0.504164 -0.050000
-v 0.156311 0.504164 0.050000
-v 0.146353 0.464451 -0.050000
-v 0.146353 0.464451 0.050000
-v 0.131745 0.427015 -0.050000
-v 0.131745 0.427015 0.050000
-v 0.113985 0.391704 -0.050000
-v 0.113985 0.391704 0.050000
-v 0.094440 0.358320 -0.050000
-v 0.094440 0.358320 0.050000
-v 0.074396 0.326711 -0.050000
-v 0.074396 0.326711 0.050000
-v 0.055106 0.296807 -0.050000
-v 0.055106 0.296807 0.050000
-v 0.037807 0.268653 -0.050000
-v 0.037807 0.268653 0.050000
-v 0.023701 0.242455 -0.050000
-v 0.023701 0.242455 0.050000
-v 0.013846 0.218606 -0.050000
-v 0.013846 0.218606 0.050000
-v 0.008899 0.197574 -0.050000
-v 0.008899 0.197574 0.050000
-v 0.008815 0.124865 -0.050000
-v 0.008815 0.124865 0.050000
-v -0.046189 0.154407 -0.050000
-v -0.046189 0.154407 0.050000
-v -0.057010 0.161186 -0.050000
-v -0.057010 0.161186 0.050000
-v -0.067039 0.168629 -0.050000
-v -0.067039 0.168629 0.050000
-v -0.076223 0.176837 -0.050000
-v -0.076223 0.176837 0.050000
-v -0.084466 0.185873 -0.050000
-v -0.084466 0.185873 0.050000
-v -0.091644 0.195735 -0.050000
-v -0.091644 0.195735 0.050000
-v -0.097647 0.206349 -0.050000
-v -0.097647 0.206349 0.050000
-v -0.102416 0.217593 -0.050000
-v -0.102416 0.217593 0.050000
-v -0.105962 0.229338 -0.050000
-v -0.105962 0.229338 0.050000
-v -0.108359 0.241494 -0.050000
-v -0.108359 0.241494 0.050000
-v -0.109715 0.254026 -0.050000
-v -0.109715 0.254026 0.050000
-v -0.110170 0.267785 -0.050000
-v -0.110170 0.267785 0.050000
-v -0.107612 0.297714 -0.050000
-v -0.107612 0.297714 0.050000
-v -0.100467 0.326421 -0.050000
-v -0.100467 0.326421 0.050000
-v -0.089996 0.353017 -0.050000
-v -0.089996 0.353017 0.050000
-v -0.077317 0.377712 -0.050000
-v -0.077317 0.377712 0.050000
-v -0.063421 0.400810 -0.050000
-v -0.063421 0.400810 0.050000
-v -0.049194 0.422607 -0.050000
-v -0.049194 0.422607 0.050000
-v -0.035465 0.443334 -0.050000
-v -0.035465 0.443334 0.050000
-v -0.023017 0.463132 -0.050000
-v -0.023017 0.463132 0.050000
-v -0.012579 0.482049 -0.050000
-v -0.012579 0.482049 0.050000
-v -0.004752 0.500069 -0.050000
-v -0.004752 0.500069 0.050000
-v 0.000073 0.517230 -0.050000
-v 0.000073 0.517230 0.050000
-v 0.001791 0.534652 -0.050000
-v 0.001791 0.534652 0.050000
-v 0.001479 0.540334 -0.050000
-v 0.001479 0.540334 0.050000
-v 0.000515 0.545919 -0.050000
-v 0.000515 0.545919 0.050000
-v -0.000953 0.550755 -0.050000
-v -0.000953 0.550755 0.050000
-v -0.002830 0.554900 -0.050000
-v -0.002830 0.554900 0.050000
-v -0.005057 0.558435 -0.050000
-v -0.005057 0.558435 0.050000
-v -0.007620 0.561459 -0.050000
-v -0.007620 0.561459 0.050000
-v -0.010558 0.564059 -0.050000
-v -0.010558 0.564059 0.050000
-v -0.013955 0.566292 -0.050000
-v -0.013955 0.566292 0.050000
-v -0.017918 0.568163 -0.050000
-v -0.017918 0.568163 0.050000
-v -0.022553 0.569629 -0.050000
-v -...
[truncated message content] |
|
From: <tre...@us...> - 2007-08-31 23:08:53
|
Revision: 313
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=313&view=rev
Author: trevorolio
Date: 2007-08-31 16:08:53 -0700 (Fri, 31 Aug 2007)
Log Message:
-----------
Tweaked the loading.obj to suck less.
Modified Paths:
--------------
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/viewer/j3d/J3DRenderer.java
maven/trunk/ogoglio-common/src/main/resources/templates/loading.obj
Added Paths:
-----------
maven/trunk/ogoglio-common/src/main/resources/templates/loading.mtl
Modified: maven/trunk/ogoglio-common/pom.xml
===================================================================
--- maven/trunk/ogoglio-common/pom.xml 2007-08-31 20:56:20 UTC (rev 312)
+++ maven/trunk/ogoglio-common/pom.xml 2007-08-31 23:08:53 UTC (rev 313)
@@ -31,19 +31,19 @@
<dependency>
<groupId>java3d</groupId>
<artifactId>j3d-core</artifactId>
- <version>[1.3],[1.5.1]</version>
+ <version>1.3</version>
<scope>supplied</scope>
</dependency>
<dependency>
<groupId>java3d</groupId>
<artifactId>j3d-core-utils</artifactId>
- <version>[1.3],[1.5.1]</version>
+ <version>1.3</version>
<scope>supplied</scope>
</dependency>
<dependency>
<groupId>java3d</groupId>
<artifactId>vecmath</artifactId>
- <version>[1.3],[1.5.1]</version>
+ <version>1.3</version>
<scope>supplied</scope>
</dependency>
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-31 20:56:20 UTC (rev 312)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/SpaceClient.java 2007-08-31 23:08:53 UTC (rev 313)
@@ -688,7 +688,7 @@
try {
return webClient.getTemplateGeometryStream(ownerUsername, templateID, lodIndex);
} catch (IOException e) {
- return null;
+ return UIConstants.getResource("templates/loading.obj");
}
}
@@ -696,7 +696,10 @@
try {
return webClient.getTemplateResourceStream(ownerUsername, templateID, name);
} catch (IOException e) {
- return UIConstants.getResource("/templates/loading.obj");
+ if("loading.mtl".equals(name)){
+ return UIConstants.getResource("templates/loading.mtl");
+ }
+ return null;
}
}
@@ -760,7 +763,7 @@
if (lodIndex != 0) {
return null;
}
- return UIConstants.getResource("/template/loading.obj");
+ return UIConstants.getResource("templates/loading.obj");
}
public InputStream getSkinMapStream() throws IOException {
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DRenderer.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DRenderer.java 2007-08-31 20:56:20 UTC (rev 312)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DRenderer.java 2007-08-31 23:08:53 UTC (rev 313)
@@ -726,6 +726,9 @@
if (!gotObj) {
objs[0] = getObj(errorGeometryProvider, 0);
}
+ if (objs[0] == null) {
+ throw new IllegalStateException("Where's my error template?");
+ }
J3DRenderableLoader loader = new J3DRenderableLoader(objs, !offScreen);
J3DThingRenderable renderable = loader.loadThing(thing);
renderable.setPosition(thing.getPosition());
Added: maven/trunk/ogoglio-common/src/main/resources/templates/loading.mtl
===================================================================
--- maven/trunk/ogoglio-common/src/main/resources/templates/loading.mtl (rev 0)
+++ maven/trunk/ogoglio-common/src/main/resources/templates/loading.mtl 2007-08-31 23:08:53 UTC (rev 313)
@@ -0,0 +1,12 @@
+# Blender3D MTL File: TomorrowHall1-Architecture.blend
+# Material Count: 1
+newmtl Material
+Ns 96.078431
+Ka 0.000000 0.000000 0.000000
+Kd 0.800000 0.186246 0.186246
+Ks 0.500000 0.500000 0.500000
+Ni 1.000000
+d 1.000000
+illum 2
+
+
Modified: maven/trunk/ogoglio-common/src/main/resources/templates/loading.obj
===================================================================
--- maven/trunk/ogoglio-common/src/main/resources/templates/loading.obj 2007-08-31 20:56:20 UTC (rev 312)
+++ maven/trunk/ogoglio-common/src/main/resources/templates/loading.obj 2007-08-31 23:08:53 UTC (rev 313)
@@ -1,1935 +1,1571 @@
-# Blender3D v243 OBJ File: loading.blend
+# Blender3D v243 OBJ File: TomorrowHall1-Architecture.blend
# www.blender3d.org
-o Font_Text
-v 0.053322 0.042887 0.080000
-v 0.051720 0.035097 0.080000
-v 0.049138 0.027703 0.080000
-v 0.045650 0.020778 0.080000
-v 0.041329 0.014394 0.080000
-v 0.036248 0.008625 0.080000
-v 0.030478 0.003543 0.080000
-v 0.024095 -0.000778 0.080000
-v 0.017169 -0.004266 0.080000
-v 0.009775 -0.006847 0.080000
-v 0.001985 -0.008450 0.080000
-v -0.006127 -0.009000 0.080000
-v -0.014240 -0.008450 0.080000
-v -0.022030 -0.006847 0.080000
-v -0.029424 -0.004266 0.080000
-v -0.036350 -0.000778 0.080000
-v -0.042733 0.003543 0.080000
-v -0.048502 0.008625 0.080000
-v -0.053584 0.014394 0.080000
-v -0.057905 0.020778 0.080000
-v -0.061393 0.027703 0.080000
-v -0.063975 0.035097 0.080000
-v -0.065577 0.042887 0.080000
-v -0.066127 0.051000 0.080000
-v -0.065577 0.059113 0.080000
-v -0.063975 0.066903 0.080000
-v -0.061393 0.074297 0.080000
-v -0.057905 0.081222 0.080000
-v -0.053584 0.087606 0.080000
-v -0.048502 0.093375 0.080000
-v -0.042733 0.098457 0.080000
-v -0.036350 0.102778 0.080000
-v -0.029424 0.106266 0.080000
-v -0.022030 0.108847 0.080000
-v -0.014240 0.110450 0.080000
-v -0.006127 0.111000 0.080000
-v 0.001985 0.110450 0.080000
-v 0.009775 0.108847 0.080000
-v 0.017169 0.106266 0.080000
-v 0.024095 0.102778 0.080000
-v 0.030478 0.098457 0.080000
-v 0.036248 0.093375 0.080000
-v 0.041329 0.087606 0.080000
-v 0.045650 0.081222 0.080000
-v 0.049138 0.074297 0.080000
-v 0.051720 0.066903 0.080000
-v 0.053322 0.059113 0.080000
-v 0.053873 0.051000 0.080000
+mtllib loading.mtl
+o Font_Text_(null)
+v -0.078127 0.595000 0.080000
+v -0.031127 0.691000 0.080000
v -0.003171 0.689560 0.080000
v 0.021771 0.684982 0.080000
v 0.043810 0.677625 0.080000
v 0.063058 0.667852 0.080000
v 0.079625 0.656023 0.080000
v 0.093623 0.642500 0.080000
+v -0.066276 0.597444 0.080000
+v -0.062974 0.598108 0.080000
+v -0.059502 0.598750 0.080000
+v -0.055843 0.599351 0.080000
+v -0.051979 0.599889 0.080000
v 0.105162 0.627644 0.080000
+v -0.047893 0.600344 0.080000
+v -0.043567 0.600694 0.080000
+v -0.038984 0.600920 0.080000
v 0.114354 0.611815 0.080000
+v -0.034127 0.601000 0.080000
v 0.121310 0.595375 0.080000
+v -0.024426 0.600446 0.080000
+v -0.015350 0.598815 0.080000
+v -0.006940 0.596156 0.080000
+v -0.069424 0.596781 0.080000
+v -0.072438 0.596139 0.080000
+v 0.000761 0.592519 0.080000
+v -0.075333 0.595538 0.080000
v 0.126141 0.578685 0.080000
+v 0.007713 0.587950 0.080000
+v 0.013873 0.582500 0.080000
+v 0.019199 0.576216 0.080000
v 0.128958 0.562106 0.080000
+v 0.023650 0.569148 0.080000
+v 0.027185 0.561344 0.080000
v 0.129873 0.546000 0.080000
+v 0.029761 0.552852 0.080000
+v 0.031338 0.543721 0.080000
v 0.126634 0.509157 0.080000
+v 0.031873 0.534000 0.080000
+v 0.029669 0.511655 0.080000
+v 0.023576 0.489986 0.080000
v 0.117715 0.473588 0.080000
+v 0.014373 0.468797 0.080000
v 0.104310 0.439234 0.080000
+v 0.002836 0.447889 0.080000
+v -0.010257 0.427064 0.080000
v 0.087613 0.406037 0.080000
+v -0.024127 0.406125 0.080000
+v -0.037998 0.384873 0.080000
v 0.068819 0.373937 0.080000
+v -0.051090 0.363111 0.080000
v 0.049123 0.342875 0.080000
+v -0.062627 0.340641 0.080000
v 0.029718 0.312792 0.080000
+v -0.071831 0.317264 0.080000
+v -0.077924 0.292783 0.080000
v 0.011799 0.283630 0.080000
+v -0.080127 0.267000 0.080000
v -0.003440 0.255328 0.080000
+v -0.079769 0.256138 0.080000
+v -0.078674 0.246019 0.080000
v -0.014803 0.227829 0.080000
+v -0.076815 0.236594 0.080000
+v -0.074164 0.227815 0.080000
v -0.021097 0.201072 0.080000
+v -0.070695 0.219633 0.080000
+v -0.066377 0.212000 0.080000
+v -0.061185 0.204867 0.080000
+v -0.055090 0.198185 0.080000
v -0.021127 0.175000 0.080000
-v -0.031111 0.180362 0.080000
-v -0.040081 0.185982 0.080000
v -0.048065 0.191906 0.080000
-v -0.055090 0.198185 0.080000
-v -0.061185 0.204867 0.080000
-v -0.066377 0.212000 0.080000
-v -0.070695 0.219633 0.080000
-v -0.074164 0.227815 0.080000
-v -0.076815 0.236594 0.080000
-v -0.078674 0.246019 0.080000
-v -0.079769 0.256138 0.080000
-v -0.080127 0.267000 0.080000
-v -0.077924 0.292783 0.080000
-v -0.071831 0.317264 0.080000
-v -0.062627 0.340641 0.080000
-v -0.051090 0.363111 0.080000
-v -0.037998 0.384873 0.080000
-v -0.024127 0.406125 0.080000
-v -0.010257 0.427064 0.080000
-v 0.002836 0.447889 0.080000
-v 0.014373 0.468797 0.080000
-v 0.023576 0.489986 0.080000
-v 0.029669 0.511655 0.080000
-v 0.031873 0.534000 0.080000
-v 0.031338 0.543721 0.080000
-v 0.029761 0.552852 0.080000
-v 0.027185 0.561344 0.080000
-v 0.023650 0.569148 0.080000
-v 0.019199 0.576216 0.080000
-v 0.013873 0.582500 0.080000
-v 0.007713 0.587950 0.080000
-v 0.000761 0.592519 0.080000
-v -0.006940 0.596156 0.080000
-v -0.015350 0.598815 0.080000
-v -0.024426 0.600446 0.080000
-v -0.034127 0.601000 0.080000
-v -0.038984 0.600920 0.080000
-v -0.043567 0.600694 0.080000
-v -0.047893 0.600344 0.080000
-v -0.051979 0.599889 0.080000
-v -0.055843 0.599351 0.080000
-v -0.059502 0.598750 0.080000
-v -0.062974 0.598108 0.080000
-v -0.066276 0.597444 0.080000
-v -0.069424 0.596781 0.080000
-v -0.072438 0.596139 0.080000
-v -0.075333 0.595538 0.080000
-v -0.078127 0.595000 0.080000
-v -0.031127 0.691000 0.080000
-v 0.053322 0.042887 -0.080000
-v 0.051720 0.035097 -0.080000
-v 0.049138 0.027703 -0.080000
-v 0.045650 0.020778 -0.080000
-v 0.041329 0.014394 -0.080000
-v 0.036248 0.008625 -0.080000
-v 0.030478 0.003543 -0.080000
-v 0.024095 -0.000778 -0.080000
-v 0.017169 -0.004266 -0.080000
-v 0.009775 -0.006847 -0.080000
-v 0.001985 -0.008450 -0.080000
-v -0.006127 -0.009000 -0.080000
-v -0.014240 -0.008450 -0.080000
-v -0.022030 -0.006847 -0.080000
-v -0.029424 -0.004266 -0.080000
-v -0.036350 -0.000778 -0.080000
-v -0.042733 0.003543 -0.080000
-v -0.048502 0.008625 -0.080000
-v -0.053584 0.014394 -0.080000
-v -0.057905 0.020778 -0.080000
-v -0.061393 0.027703 -0.080000
-v -0.063975 0.035097 -0.080000
-v -0.065577 0.042887 -0.080000
-v -0.066127 0.051000 -0.080000
-v -0.065577 0.059113 -0.080000
-v -0.063975 0.066903 -0.080000
-v -0.061393 0.074297 -0.080000
-v -0.057905 0.081222 -0.080000
-v -0.053584 0.087606 -0.080000
-v -0.048502 0.093375 -0.080000
-v -0.042733 0.098457 -0.080000
-v -0.036350 0.102778 -0.080000
-v -0.029424 0.106266 -0.080000
-v -0.022030 0.108847 -0.080000
-v -0.014240 0.110450 -0.080000
-v -0.006127 0.111000 -0.080000
-v 0.001985 0.110450 -0.080000
-v 0.009775 0.108847 -0.080000
-v 0.017169 0.106266 -0.080000
-v 0.024095 0.102778 -0.080000
-v 0.030478 0.098457 -0.080000
-v 0.036248 0.093375 -0.080000
-v 0.041329 0.087606 -0.080000
-v 0.045650 0.081222 -0.080000
-v 0.049138 0.074297 -0.080000
-v 0.051720 0.066903 -0.080000
-v 0.053322 0.059113 -0.080000
-v 0.053873 0.051000 -0.080000
+v -0.040081 0.185982 0.080000
+v -0.031111 0.180362 0.080000
+v -0.014240 0.110450 0.080000
+v -0.006127 0.111000 0.080000
+v 0.001985 0.110450 0.080000
+v -0.022030 0.108847 0.080000
+v 0.009775 0.108847 0.080000
+v -0.029424 0.106266 0.080000
+v 0.017169 0.106266 0.080000
+v -0.036350 0.102778 0.080000
+v 0.024095 0.102778 0.080000
+v -0.042733 0.098457 0.080000
+v 0.030478 0.098457 0.080000
+v -0.048502 0.093375 0.080000
+v 0.036248 0.093375 0.080000
+v -0.053584 0.087606 0.080000
+v 0.041329 0.087606 0.080000
+v -0.057905 0.081222 0.080000
+v 0.045650 0.081222 0.080000
+v -0.061393 0.074297 0.080000
+v 0.049138 0.074297 0.080000
+v -0.063975 0.066903 0.080000
+v 0.051720 0.066903 0.080000
+v -0.065577 0.059113 0.080000
+v 0.053322 0.059113 0.080000
+v 0.053873 0.051000 0.080000
+v -0.066127 0.051000 0.080000
+v -0.065577 0.042887 0.080000
+v 0.053322 0.042887 0.080000
+v -0.063975 0.035097 0.080000
+v 0.051720 0.035097 0.080000
+v -0.061393 0.027703 0.080000
+v 0.049138 0.027703 0.080000
+v -0.057905 0.020778 0.080000
+v 0.045650 0.020778 0.080000
+v -0.053584 0.014394 0.080000
+v 0.041329 0.014394 0.080000
+v -0.048502 0.008625 0.080000
+v 0.036248 0.008625 0.080000
+v -0.042733 0.003543 0.080000
+v 0.030478 0.003543 0.080000
+v -0.036350 -0.000778 0.080000
+v 0.024095 -0.000778 0.080000
+v -0.029424 -0.004266 0.080000
+v 0.017169 -0.004266 0.080000
+v -0.022030 -0.006847 0.080000
+v 0.009775 -0.006847 0.080000
+v -0.014240 -0.008450 0.080000
+v 0.001985 -0.008450 0.080000
+v -0.006127 -0.009000 0.080000
+v -0.078127 0.595000 -0.080000
+v -0.031127 0.691000 -0.080000
v -0.003171 0.689560 -0.080000
v 0.021771 0.684982 -0.080000
v 0.043810 0.677625 -0.080000
v 0.063058 0.667852 -0.080000
v 0.079625 0.656023 -0.080000
v 0.093623 0.642500 -0.080000
+v -0.066276 0.597444 -0.080000
+v -0.062974 0.598108 -0.080000
+v -0.059502 0.598750 -0.080000
+v -0.055843 0.599351 -0.080000
+v -0.051979 0.599889 -0.080000
v 0.105162 0.627644 -0.080000
+v -0.047893 0.600344 -0.080000
+v -0.043567 0.600694 -0.080000
+v -0.038984 0.600920 -0.080000
v 0.114354 0.611815 -0.080000
+v -0.034127 0.601000 -0.080000
v 0.121310 0.595375 -0.080000
+v -0.024426 0.600446 -0.080000
+v -0.015350 0.598815 -0.080000
+v -0.006940 0.596156 -0.080000
+v -0.069424 0.596781 -0.080000
+v -0.072438 0.596139 -0.080000
+v 0.000761 0.592519 -0.080000
+v -0.075333 0.595538 -0.080000
v 0.126141 0.578685 -0.080000
+v 0.007713 0.587950 -0.080000
+v 0.013873 0.582500 -0.080000
+v 0.019199 0.576216 -0.080000
v 0.128958 0.562106 -0.080000
+v 0.023650 0.569148 -0.080000
+v 0.027185 0.561344 -0.080000
v 0.129873 0.546000 -0.080000
+v 0.029761 0.552852 -0.080000
+v 0.031338 0.543721 -0.080000
v 0.126634 0.509157 -0.080000
+v 0.031873 0.534000 -0.080000
+v 0.029669 0.511655 -0.080000
+v 0.023576 0.489986 -0.080000
v 0.117715 0.473588 -0.080000
+v 0.014373 0.468797 -0.080000
v 0.104310 0.439234 -0.080000
+v 0.002836 0.447889 -0.080000
+v -0.010257 0.427064 -0.080000
v 0.087613 0.406037 -0.080000
+v -0.024127 0.406125 -0.080000
+v -0.037998 0.384873 -0.080000
v 0.068819 0.373937 -0.080000
+v -0.051090 0.363111 -0.080000
v 0.049123 0.342875 -0.080000
+v -0.062627 0.340641 -0.080000
v 0.029718 0.312792 -0.080000
+v -0.071831 0.317264 -0.080000
+v -0.077924 0.292783 -0.080000
v 0.011799 0.283630 -0.080000
+v -0.080127 0.267000 -0.080000
v -0.003440 0.255328 -0.080000
+v -0.079769 0.256138 -0.080000
+v -0.078674 0.246019 -0.080000
v -0.014803 0.227829 -0.080000
+v -0.076815 0.236594 -0.080000
+v -0.074164 0.227815 -0.080000
v -0.021097 0.201072 -0.080000
+v -0.070695 0.219633 -0.080000
+v -0.066377 0.212000 -0.080000
+v -0.061185 0.204867 -0.080000
+v -0.055090 0.198185 -0.080000
v -0.021127 0.175000 -0.080000
-v -0.031111 0.180362 -0.080000
-v -0.040081 0.185982 -0.080000
v -0.048065 0.191906 -0.080000
-v -0.055090 0.198185 -0.080000
-v -0.061185 0.204867 -0.080000
-v -0.066377 0.212000 -0.080000
-v -0.070695 0.219633 -0.080000
-v -0.074164 0.227815 -0.080000
-v -0.076815 0.236594 -0.080000
-v -0.078674 0.246019 -0.080000
-v -0.079769 0.256138 -0.080000
-v -0.080127 0.267000 -0.080000
-v -0.077924 0.292783 -0.080000
-v -0.071831 0.317264 -0.080000
-v -0.062627 0.340641 -0.080000
-v -0.051090 0.363111 -0.080000
-v -0.037998 0.384873 -0.080000
-v -0.024127 0.406125 -0.080000
-v -0.010257 0.427064 -0.080000
-v 0.002836 0.447889 -0.080000
-v 0.014373 0.468797 -0.080000
-v 0.023576 0.489986 -0.080000
-v 0.029669 0.511655 -0.080000
-v 0.031873 0.534000 -0.080000
-v 0.031338 0.543721 -0.080000
-v 0.029761 0.552852 -0.080000
-v 0.027185 0.561344 -0.080000
-v 0.023650 0.569148 -0.080000
-v 0.019199 0.576216 -0.080000
-v 0.013873 0.582500 -0.080000
-v 0.007713 0.587950 -0.080000
-v 0.000761 0.592519 -0.080000
-v -0.006940 0.596156 -0.080000
-v -0.015350 0.598815 -0.080000
-v -0.024426 0.600446 -0.080000
-v -0.034127 0.601000 -0.080000
-v -0.038984 0.600920 -0.080000
-v -0.043567 0.600694 -0.080000
-v -0.047893 0.600344 -0.080000
-v -0.051979 0.599889 -0.080000
-v -0.055843 0.599351 -0.080000
-v -0.059502 0.598750 -0.080000
-v -0.062974 0.598108 -0.080000
-v -0.066276 0.597444 -0.080000
-v -0.069424 0.596781 -0.080000
-v -0.072438 0.596139 -0.080000
-v -0.075333 0.595538 -0.080000
-v -0.078127 0.595000 -0.080000
-v -0.031127 0.691000 -0.080000
-v -0.003171 0.689560 -0.080000
+v -0.040081 0.185982 -0.080000
+v -0.031111 0.180362 -0.080000
+v -0.014240 0.110450 -0.080000
+v -0.006127 0.111000 -0.080000
+v 0.001985 0.110450 -0.080000
+v -0.022030 0.108847 -0.080000
+v 0.009775 0.108847 -0.080000
+v -0.029424 0.106266 -0.080000
+v 0.017169 0.106266 -0.080000
+v -0.036350 0.102778 -0.080000
+v 0.024095 0.102778 -0.080000
+v -0.042733 0.098457 -0.080000
+v 0.030478 0.098457 -0.080000
+v -0.048502 0.093375 -0.080000
+v 0.036248 0.093375 -0.080000
+v -0.053584 0.087606 -0.080000
+v 0.041329 0.087606 -0.080000
+v -0.057905 0.081222 -0.080000
+v 0.045650 0.081222 -0.080000
+v -0.061393 0.074297 -0.080000
+v 0.049138 0.074297 -0.080000
+v -0.063975 0.066903 -0.080000
+v 0.051720 0.066903 -0.080000
+v -0.065577 0.059113 -0.080000
+v 0.053322 0.059113 -0.080000
+v 0.053873 0.051000 -0.080000
+v -0.066127 0.051000 -0.080000
+v -0.065577 0.042887 -0.080000
+v 0.053322 0.042887 -0.080000
+v -0.063975 0.035097 -0.080000
+v 0.051720 0.035097 -0.080000
+v -0.061393 0.027703 -0.080000
+v 0.049138 0.027703 -0.080000
+v -0.057905 0.020778 -0.080000
+v 0.045650 0.020778 -0.080000
+v -0.053584 0.014394 -0.080000
+v 0.041329 0.014394 -0.080000
+v -0.048502 0.008625 -0.080000
+v 0.036248 0.008625 -0.080000
+v -0.042733 0.003543 -0.080000
+v 0.030478 0.003543 -0.080000
+v -0.036350 -0.000778 -0.080000
+v 0.024095 -0.000778 -0.080000
+v -0.029424 -0.004266 -0.080000
+v 0.017169 -0.004266 -0.080000
+v -0.022030 -0.006847 -0.080000
+v 0.009775 -0.006847 -0.080000
+v -0.014240 -0.008450 -0.080000
+v 0.001985 -0.008450 -0.080000
+v -0.006127 -0.009000 -0.080000
v 0.000323 0.719420 -0.050000
-v 0.021771 0.684982 -0.080000
v 0.029265 0.714107 -0.050000
-v 0.043810 0.677625 -0.080000
+v 0.021771 0.684982 -0.080000
+v -0.003171 0.689560 -0.080000
v 0.055414 0.705379 -0.050000
-v 0.063058 0.667852 -0.080000
+v 0.043810 0.677625 -0.080000
v 0.078653 0.693579 -0.050000
-v 0.079625 0.656023 -0.080000
+v 0.063058 0.667852 -0.080000
v 0.098869 0.679145 -0.050000
-v 0.093623 0.642500 -0.080000
+v 0.079625 0.656023 -0.080000
v 0.116004 0.662591 -0.050000
-v 0.105162 0.627644 -0.080000
+v 0.093623 0.642500 -0.080000
v 0.130092 0.644453 -0.050000
-v 0.114354 0.611815 -0.080000
+v 0.105162 0.627644 -0.080000
v 0.141246 0.625246 -0.050000
-v 0.121310 0.595375 -0.080000
+v 0.114354 0.611815 -0.080000
v 0.149632 0.605426 -0.050000
-v 0.126141 0.578685 -0.080000
+v 0.121310 0.595375 -0.080000
v 0.155432 0.585390 -0.050000
-v 0.128958 0.562106 -0.080000
+v 0.126141 0.578685 -0.080000
v 0.158815 0.565480 -0.050000
-v 0.129873 0.546000 -0.080000
+v 0.128958 0.562106 -0.080000
v 0.159947 0.545534 -0.050000
-v 0.126634 0.509157 -0.080000
+v 0.129873 0.546000 -0.080000
v 0.156311 0.504164 -0.050000
-v 0.117715 0.473588 -0.080000
+v 0.126634 0.509157 -0.080000
v 0.146353 0.464451 -0.050000
-v 0.104310 0.439234 -0.080000
+v 0.117715 0.473588 -0.080000
v 0.131745 0.427015 -0.050000
-v 0.087613 0.406037 -0.080000
+v 0.104310 0.439234 -0.080000
v 0.113985 0.391704 -0.050000
-v 0.068819 0.373937 -0.080000
+v 0.087613 0.406037 -0.080000
v 0.094440 0.358320 -0.050000
-v 0.049123 0.342875 -0.080000
+v 0.068819 0.373937 -0.080000
v 0.074396 0.326711 -0.050000
-v 0.029718 0.312792 -0.080000
+v 0.049123 0.342875 -0.080000
v 0.055106 0.296807 -0.050000
-v 0.011799 0.283630 -0.080000
+v 0.029718 0.312792 -0.080000
v 0.037807 0.268653 -0.050000
-v -0.003440 0.255328 -0.080000
+v 0.011799 0.283630 -0.080000
v 0.023701 0.242455 -0.050000
-v -0.014803 0.227829 -0.080000
+v -0.003440 0.255328 -0.080000
v 0.013846 0.218606 -0.050000
-v -0.021097 0.201072 -0.080000
+v -0.014803 0.227829 -0.080000
v 0.008899 0.197574 -0.050000
-v -0.021127 0.175000 -0.080000
+v -0.021097 0.201072 -0.080000
v 0.008815 0.124865 -0.050000
-v -0.031111 0.180362 -0.080000
+v -0.021127 0.175000 -0.080000
v -0.046189 0.154407 -0.050000
-v -0.040081 0.185982 -0.080000
+v -0.031111 0.180362 -0.080000
v -0.057010 0.161186 -0.050000
-v -0.048065 0.191906 -0.080000
+v -0.040081 0.185982 -0.080000
v -0.067039 0.168629 -0.050000
-v -0.055090 0.198185 -0.080000
+v -0.048065 0.191906 -0.080000
v -0.076223 0.176837 -0.050000
-v -0.061185 0.204867 -0.080000
+v -0.055090 0.198185 -0.080000
v -0.084466 0.185873 -0.050000
-v -0.066377 0.212000 -0.080000
+v -0.061185 0.204867 -0.080000
v -0.091644 0.195735 -0.050000
-v -0.070695 0.219633 -0.080000
+v -0.066377 0.212000 -0.080000
v -0.097647 0.206349 -0.050000
-v -0.074164 0.227815 -0.080000
+v -0.070695 0.219633 -0.080000
v -0.102416 0.217593 -0.050000
-v -0.076815 0.236594 -0.080000
+v -0.074164 0.227815 -0.080000
v -0.105962 0.229338 -0.050000
-v -0.078674 0.246019 -0.080000
+v -0.076815 0.236594 -0.080000
v -0.108359 0.241494 -0.050000
-v -0.079769 0.256138 -0.080000
+v -0.078674 0.246019 -0.080000
v -0.109715 0.254026 -0.050000
-v -0.080127 0.267000 -0.080000
+v -0.079769 0.256138 -0.080000
v -0.110170 0.267785 -0.050000
-v -0.077924 0.292783 -0.080000
+v -0.080127 0.267000 -0.080000
v -0.107612 0.297714 -0.050000
-v -0.071831 0.317264 -0.080000
+v -0.077924 0.292783 -0.080000
v -0.100467 0.326421 -0.050000
-v -0.062627 0.340641 -0.080000
+v -0.071831 0.317264 -0.080000
v -0.089996 0.353017 -0.050000
-v -0.051090 0.363111 -0.080000
+v -0.062627 0.340641 -0.080000
v -0.077317 0.377712 -0.050000
-v -0.037998 0.384873 -0.080000
+v -0.051090 0.363111 -0.080000
v -0.063421 0.400810 -0.050000
-v -0.024127 0.406125 -0.080000
+v -0.037998 0.384873 -0.080000
v -0.049194 0.422607 -0.050000
-v -0.010257 0.427064 -0.080000
+v -0.024127 0.406125 -0.080000
v -0.035465 0.443334 -0.050000
-v 0.002836 0.447889 -0.080000
+v -0.010257 0.427064 -0.080000
v -0.023017 0.463132 -0.050000
-v 0.014373 0.468797 -0.080000
+v 0.002836 0.447889 -0.080000
v -0.012579 0.482049 -0.050000
-v 0.023576 0.489986 -0.080000
+v 0.014373 0.468797 -0.080000
v -0.004752 0.500069 -0.050000
-v 0.029669 0.511655 -0.080000
+v 0.023576 0.489986 -0.080000
v 0.000073 0.517230 -0.050000
-v 0.031873 0.534000 -0.080000
+v 0.029669 0.511655 -0.080000
v 0.001791 0.534652 -0.050000
-v 0.031338 0.543721 -0.080000
+v 0.031873 0.534000 -0.080000
v 0.001479 0.540334 -0.050000
-v 0.029761 0.552852 -0.080000
+v 0.031338 0.543721 -0.080000
v 0.000515 0.545919 -0.050000
-v 0.027185 0.561344 -0.080000
+v 0.029761 0.552852 -0.080000
v -0.000953 0.550755 -0.050000
-v 0.023650 0.569148 -0.080000
+v 0.027185 0.561344 -0.080000
v -0.002830 0.554900 -0.050000
-v 0.019199 0.576216 -0.080000
+v 0.023650 0.569148 -0.080000
v -0.005057 0.558435 -0.050000
-v 0.013873 0.582500 -0.080000
+v 0.019199 0.576216 -0.080000
v -0.007620 0.561459 -0.050000
-v 0.007713 0.587950 -0.080000
+v 0.013873 0.582500 -0.080000
v -0.010558 0.564059 -0.050000
-v 0.000761 0.592519 -0.080000
+v 0.007713 0.587950 -0.080000
v -0.013955 0.566292 -0.050000
-v -0.006940 0.596156 -0.080000
+v 0.000761 0.592519 -0.080000
v -0.017918 0.568163 -0.050000
-v -0.015350 0.598815 -0.080000
+v -0.006940 0.596156 -0.080000
v -0.022553 0.569629 -0.050000
-v -0.024426 0.600446 -0.080000
+v -0.015350 0.598815 -0.080000
v -0.027947 0.570598 -0.050000
-v -0.034127 0.601000 -0.080000
+v -0.024426 0.600446 -0.080000
v -0.034738 0.570986 -0.050000
-v -0.038984 0.600920 -0.080000
+v -0.034127 0.601000 -0.080000
v -0.038000 0.570932 -0.050000
-v -0.043567 0.600694 -0.080000
+v -0.038984 0.600920 -0.080000
v -0.041617 0.570754 -0.050000
-v -0.047893 0.600344 -0.080000
+v -0.043567 0.600694 -0.080000
v -0.045021 0.570478 -0.050000
-v -0.051979 0.599889 -0.080000
+v -0.047893 0.600344 -0.080000
v -0.048250 0.570119 -0.050000
-v -0.055843 0.599351 -0.080000
+v -0.051979 0.599889 -0.080000
v -0.051343 0.569688 -0.050000
-v -0.059502 0.598750 -0.080000
+v -0.055843 0.599351 -0.080000
v -0.054343 0.569196 -0.050000
-v -0.062974 0.598108 -0.080000
+v -0.059502 0.598750 -0.080000
v -0.057290 0.568650 -0.050000
-v -0.066276 0.597444 -0.080000
+v -0.062974 0.598108 -0.080000
v -0.060230 0.568060 -0.050000
-v -0.069424 0.596781 -0.080000
+v -0.066276 0.597444 -0.080000
v -0.063205 0.567433 -0.050000
-v -0.072438 0.596139 -0.080000
+v -0.069424 0.596781 -0.080000
v -0.066263 0.566781 -0.050000
-v -0.075333 0.595538 -0.080000
+v -0.072438 0.596139 -0.080000
v -0.069449 0.566120 -0.050000
-v -0.078127 0.595000 -0.080000
+v -0.075333 0.595538 -0.080000
v -0.131521 0.554166 -0.050000
-v -0.031127 0.691000 -0.080000
+v -0.078127 0.595000 -0.080000
v -0.049363 0.721979 -0.050000
-v 0.000323 0.719420 -0.050000
+v -0.031127 0.691000 -0.080000
v 0.000323 0.719420 0.050000
-v 0.029265 0.714107 -0.050000
v 0.029265 0.714107 0.050000
-v 0.055414 0.705379 -0.050000
+v 0.029265 0.714107 -0.050000
+v 0.000323 0.719420 -0.050000
v 0.055414 0.705379 0.050000
-v 0.078653 0.693579 -0.050000
+v 0.055414 0.705379 -0.050000
v 0.078653 0.693579 0.050000
-v 0.098869 0.679145 -0.050000
+v 0.078653 0.693579 -0.050000
v 0.098869 0.679145 0.050000
-v 0.116004 0.662591 -0.050000
+v 0.098869 0.679145 -0.050000
v 0.116004 0.662591 0.050000
-v 0.130092 0.644453 -0.050000
+v 0.116004 0.662591 -0.050000
v 0.130092 0.644453 0.050000
-v 0.141246 0.625246 -0.050000
+v 0.130092 0.644453 -0.050000
v 0.141246 0.625246 0.050000
-v 0.149632 0.605426 -0.050000
+v 0.141246 0.625246 -0.050000
v 0.149632 0.605426 0.050000
-v 0.155432 0.585390 -0.050000
+v 0.149632 0.605426 -0.050000
v 0.155432 0.585390 0.050000
-v 0.158815 0.565480 -0.050000
+v 0.155432 0.585390 -0.050000
v 0.158815 0.565480 0.050000
-v 0.159947 0.545534 -0.050000
+v 0.158815 0.565480 -0.050000
v 0.159947 0.545534 0.050000
-v 0.156311 0.504164 -0.050000
+v 0.159947 0.545534 -0.050000
v 0.156311 0.504164 0.050000
-v 0.146353 0.464451 -0.050000
+v 0.156311 0.504164 -0.050000
v 0.146353 0.464451 0.050000
-v 0.131745 0.427015 -0.050000
+v 0.146353 0.464451 -0.050000
v 0.131745 0.427015 0.050000
-v 0.113985 0.391704 -0.050000
+v 0.131745 0.427015 -0.050000
v 0.113985 0.391704 0.050000
-v 0.094440 0.358320 -0.050000
+v 0.113985 0.391704 -0.050000
v 0.094440 0.358320 0.050000
-v 0.074396 0.326711 -0.050000
+v 0.094440 0.358320 -0.050000
v 0.074396 0.326711 0.050000
-v 0.055106 0.296807 -0.050000
+v 0.074396 0.326711 -0.050000
v 0.055106 0.296807 0.050000
-v 0.037807 0.268653 -0.050000
+v 0.055106 0.296807 -0.050000
v 0.037807 0.268653 0.050000
-v 0.023701 0.242455 -0.050000
+v 0.037807 0.268653 -0.050000
v 0.023701 0.242455 0.050000
-v 0.013846 0.218606 -0.050000
+v 0.023701 0.242455 -0.050000
v 0.013846 0.218606 0.050000
-v 0.008899 0.197574 -0.050000
+v 0.013846 0.218606 -0.050000
v 0.008899 0.197574 0.050000
-v 0.008815 0.124865 -0.050000
+v 0.008899 0.197574 -0.050000
v 0.008815 0.124865 0.050000
-v -0.046189 0.154407 -0.050000
+v 0.008815 0.124865 -0.050000
v -0.046189 0.154407 0.050000
-v -0.057010 0.161186 -0.050000
+v -0.046189 0.154407 -0.050000
v -0.057010 0.161186 0.050000
-v -0.067039 0.168629 -0.050000
+v -0.057010 0.161186 -0.050000
v -0.067039 0.168629 0.050000
-v -0.076223 0.176837 -0.050000
+v -0.067039 0.168629 -0.050000
v -0.076223 0.176837 0.050000
-v -0.084466 0.185873 -0.050000
+v -0.076223 0.176837 -0.050000
v -0.084466 0.185873 0.050000
-v -0.091644 0.195735 -0.050000
+v -0.084466 0.185873 -0.050000
v -0.091644 0.195735 0.050000
-v -0.097647 0.206349 -0.050000
+v -0.091644 0.195735 -0.050000
v -0.097647 0.206349 0.050000
-v -0.102416 0.217593 -0.050000
+v -0.097647 0.206349 -0.050000
v -0.102416 0.217593 0.050000
-v -0.105962 0.229338 -0.050000
+v -0.102416 0.217593 -0.050000
v -0.105962 0.229338 0.050000
-v -0.108359 0.241494 -0.050000
+v -0.105962 0.229338 -0.050000
v -0.108359 0.241494 0.050000
-v -0.109715 0.254026 -0.050000
+v -0.108359 0.241494 -0.050000
v -0.109715 0.254026 0.050000
-v -0.110170 0.267785 -0.050000
+v -0.109715 0.254026 -0.050000
v -0.110170 0.267785 0.050000
-v -0.107612 0.297714 -0.050000
+v -0.110170 0.267785 -0.050000
v -0.107612 0.297714 0.050000
-v -0.100467 0.326421 -0.050000
+v -0.107612 0.297714 -0.050000
v -0.100467 0.326421 0.050000
-v -0.089996 0.353017 -0.050000
+v -0.100467 0.326421 -0.050000
v -0.089996 0.353017 0.050000
-v -0.077317 0.377712 -0.050000
+v -0.089996 0.353017 -0.050000
v -0.077317 0.377712 0.050000
-v -0.063421 0.400810 -0.050000
+v -0.077317 0.377712 -0.050000
v -0.063421 0.400810 0.050000
-v -0.049194 0.422607 -0.050000
+v -0.063421 0.400810 -0.050000
v -0.049194 0.422607 0.050000
-v -0.035465 0.443334 -0.050000
+v -0.049194 0.422607 -0.050000
v -0.035465 0.443334 0.050000
-v -0.023017 0.463132 -0.050000
+v -0.035465 0.443334 -0.050000
v -0.023017 0.463132 0.050000
-v -0.012579 0.482049 -0.050000
+v -0.023017 0.463132 -0.050000
v -0.012579 0.482049 0.050000
-v -0.004752 0.500069 -0.050000
+v -0.012579 0.482049 -0.050000
v -0.004752 0.500069 0.050000
-v 0.000073 0.517230 -0.050000
+v -0.004752 0.500069 -0.050000
v 0.000073 0.517230 0.050000
-v 0.001791 0.534652 -0.050000
+v 0.000073 0.517230 -0.050000
v 0.001791 0.534652 0.050000
-v 0.001479 0.540334 -0.050000
+v 0.001791 0.534652 -0.050000
v 0.001479 0.540334 0.050000
-v 0.000515 0.545919 -0.050000
+v 0.001479 0.540334 -0.050000
v 0.000515 0.545919 0.050000
-v -0.000953 0.550755 -0.050000
+v 0.000515 0.545919 -0.050000
v -0.000953 0.550755 0.050000
-v -0.002830 0.554900 -0.050000
+v -0.000953 0.550755 -0.050000
v -0.002830 0.554900 0.050000
-v -0.005057 0.558435 -0.050000
+v -0.002830 0.554900 -0.050000
v -0.005057 0.558435 0.050000
-v -0.007620 0.561459 -0.050000
+v -0.005057 0.558435 -0.050000
v -...
[truncated message content] |
|
From: <tre...@us...> - 2007-09-05 17:43:51
|
Revision: 366
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=366&view=rev
Author: trevorolio
Date: 2007-09-05 10:43:54 -0700 (Wed, 05 Sep 2007)
Log Message:
-----------
Fixed up the poms so that mvn clean install might actually clean install.
Modified Paths:
--------------
maven/trunk/ogoglio-common/pom.xml
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIAuthenticator.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/Log.java
Modified: maven/trunk/ogoglio-common/pom.xml
===================================================================
--- maven/trunk/ogoglio-common/pom.xml 2007-09-05 17:43:47 UTC (rev 365)
+++ maven/trunk/ogoglio-common/pom.xml 2007-09-05 17:43:54 UTC (rev 366)
@@ -12,7 +12,6 @@
<relativePath>../ogoglio</relativePath>
</parent>
<artifactId>ogoglio-common</artifactId>
-
<build>
<resources>
<!-- FILTER RESOURCES FOR SOME CONSTANTS-->
@@ -31,8 +30,12 @@
<!-- things we need to build/run -->
<dependencies>
- <!-- used by some code in the project -->
- <dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIAuthenticator.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIAuthenticator.java 2007-09-05 17:43:47 UTC (rev 365)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIAuthenticator.java 2007-09-05 17:43:54 UTC (rev 366)
@@ -31,7 +31,6 @@
ArgumentUtils.assertNotEmpty(username);
this.username = username;
ArgumentUtils.assertNotEmpty(password);
-
String body = WebConstants.AUTH_USERNAME_PARAM + "=" + username + "&" + WebConstants.AUTH_PASS_PARAM + "=" + password;
authCookie = wire.getAuthCookieViaPost(serviceDescriptor.getAuthURI(), body, "application/x-www-form-urlencoded");
if(authCookie == null) {
@@ -88,15 +87,4 @@
public String getUsername() {
return username;
}
-
- /*
- public static String requestGuestCookie(URI serviceURI) throws IOException {
- InputStream input = WebAPIClient.performPOST(getAuthGuestURI(serviceURI), "", "text/plain", null);
- if (input == null) {
- return null;
- }
- return StreamUtils.readInput(input);
- }
- */
-
}
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/Log.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/Log.java 2007-09-05 17:43:47 UTC (rev 365)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/Log.java 2007-09-05 17:43:54 UTC (rev 366)
@@ -3,32 +3,38 @@
import org.apache.log4j.Logger;
public class Log {
-
- static Logger log = Logger.getLogger("com.ogoglio");
-
- public static void debug(Object msg) {
- log.debug(msg);
- }
- public static void info(Object msg) {
- log.info(msg);
- }
- public static void info(Object msg,Throwable t) {
- log.info(msg,t);
- }
- public static void warn(Object msg) {
- log.warn(msg);
- }
- public static void error(Object msg) {
- log.error(msg);
- }
- public static void error(Object msg, Throwable t) {
- log.error(msg,t);
- }
- public static void trace(Object msg) {
- log.trace(msg);
- }
- public static void test(Object msg) {
- log.debug("TEST:"+msg);
- }
+ static Logger log = Logger.getLogger("com.ogoglio");
+
+ public static void debug(Object msg) {
+ log.debug(msg);
+ }
+
+ public static void info(Object msg) {
+ log.info(msg);
+ }
+
+ public static void info(Object msg, Throwable t) {
+ log.info(msg, t);
+ }
+
+ public static void warn(Object msg) {
+ log.warn(msg);
+ }
+
+ public static void error(Object msg) {
+ log.error(msg);
+ }
+
+ public static void error(Object msg, Throwable t) {
+ log.error(msg, t);
+ }
+
+ public static void trace(Object msg) {
+ log.trace(msg);
+ }
+
+ public static void test(Object msg) {
+ log.debug("TEST:" + msg);
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tre...@us...> - 2007-09-27 18:06:39
|
Revision: 446
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=446&view=rev
Author: trevorolio
Date: 2007-09-27 11:06:43 -0700 (Thu, 27 Sep 2007)
Log Message:
-----------
Halfway through a grand avatar rewhack.
In this half I switch over to using downloadable wadges of avatar data instead of in-jar resources for avatar data.
Removed the GeomtryProvider interface, which is now replaced by TemplateDataProvider and BodyDataProvider interfaces which are used to fill the J3DDataManager with cached versions of all network accessed resources. This allows us to control memory usage, but also (eventually) reduces our memory footprint as we only make copies of data which is avatar specific.
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/WebAPIClient.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIDescriptor.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/model/Door.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/Template.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/model/Thing.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/model/User.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/BodyConstants.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/StreamUtils.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DDataCache.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DDataManager.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DRenderableLoader.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DRenderer.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/body/Skin.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/body/SkinLoader.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/viewer/j3d/obj/MtlParser.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/obj/ObjParser.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/smap/SkinMapParser.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/xml/SpaceEvent.java
maven/trunk/ogoglio-common/src/main/resources/sourceArt/Emily/Emily.blend
Added Paths:
-----------
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/model/BodyDataProvider.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/model/TemplateDataProvider.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DBodyData.java
Removed Paths:
-------------
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/model/GeometryProvider.java
maven/trunk/ogoglio-common/src/main/resources/avatar/
Modified: maven/trunk/ogoglio-common/.classpath
===================================================================
--- maven/trunk/ogoglio-common/.classpath 2007-09-27 18:06:34 UTC (rev 445)
+++ maven/trunk/ogoglio-common/.classpath 2007-09-27 18:06:43 UTC (rev 446)
@@ -2,7 +2,6 @@
<classpath>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" path="src/test/java"/>
- <classpathentry excluding="**" kind="src" output="src/main/resources/avatar" path="src/main/resources/avatar"/>
<classpathentry excluding="**" kind="src" output="src/main/resources/templates" path="src/main/resources/templates"/>
<classpathentry excluding="**" kind="src" output="src/test/resources" path="src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
Modified: maven/trunk/ogoglio-common/pom.xml
===================================================================
--- maven/trunk/ogoglio-common/pom.xml 2007-09-27 18:06:34 UTC (rev 445)
+++ maven/trunk/ogoglio-common/pom.xml 2007-09-27 18:06:43 UTC (rev 446)
@@ -14,12 +14,6 @@
<artifactId>ogoglio-common</artifactId>
<build>
<resources>
- <!-- FILTER RESOURCES FOR SOME CONSTANTS-->
- <resource>
- <targetPath>avatar</targetPath>
- <directory>src/main/resources/avatar</directory>
- </resource>
-
<!-- for loading indicator -->
<resource>
<targetPath>templates</targetPath>
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-09-27 18:06:34 UTC (rev 445)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/SpaceClient.java 2007-09-27 18:06:43 UTC (rev 446)
@@ -18,17 +18,19 @@
import java.net.URI;
import java.net.URISyntaxException;
import java.util.Vector;
+import java.util.zip.ZipInputStream;
import javax.media.j3d.Transform3D;
import javax.vecmath.Point3d;
+import com.ogoglio.client.model.BodyDataProvider;
import com.ogoglio.client.model.Door;
-import com.ogoglio.client.model.GeometryProvider;
import com.ogoglio.client.model.Page;
import com.ogoglio.client.model.Shape;
import com.ogoglio.client.model.Space;
import com.ogoglio.client.model.SplinePath;
import com.ogoglio.client.model.Template;
+import com.ogoglio.client.model.TemplateDataProvider;
import com.ogoglio.client.model.Thing;
import com.ogoglio.client.model.User;
import com.ogoglio.message.Message;
@@ -37,7 +39,6 @@
import com.ogoglio.message.PayloadFactory;
import com.ogoglio.message.TCPChannel;
import com.ogoglio.util.ArgumentUtils;
-import com.ogoglio.util.BodyConstants;
import com.ogoglio.util.Log;
import com.ogoglio.util.UIConstants;
import com.ogoglio.xml.AccountDocument;
@@ -67,31 +68,33 @@
private Messenger messenger = new Messenger();
- private ErrorGeometryProvider errorGeometryProvider = new ErrorGeometryProvider();
+ private SpaceClientTemplateDataProvider templateDataProvider = new SpaceClientTemplateDataProvider();
private boolean cleanedUp = false;
+ private BodyDataProvider bodyDataProvider = new NetworkBodyDataProvider();
+
public SpaceClient(long spaceID, URI serviceURI, String authCookie, Listener listener) throws IOException {
ArgumentUtils.assertNotNegative(spaceID);
ArgumentUtils.assertNotNull(serviceURI);
ArgumentUtils.assertNotNull(authCookie);
-
+
WebAPIDescriptor descriptor = new WebAPIDescriptor(serviceURI);
WebAPIClientWire wire = new WebAPIClientWire();
-
+
WebAPIAuthenticator authenticator = null;
- if(authCookie.startsWith("guest")){
+ if (authCookie.startsWith("guest")) {
authenticator = new WebAPIGuestAuthenticator(descriptor, authCookie);
} else {
authenticator = new WebAPIAuthenticator(wire, descriptor, authCookie);
}
-
+
webClient = new WebAPIClient(descriptor, authenticator, wire);
ArgumentUtils.assertNotNull(listener);
this.listener = listener;
accountDoc = authenticator.getAccountDocument(true);
- if(accountDoc == null) {
+ if (accountDoc == null) {
throw new IOException("Could not get account document.");
}
@@ -114,7 +117,7 @@
Log.error("No auth, message " + messenger.errorMessage);
messenger.cleanup();
- if(messenger.errorMessage == null) {
+ if (messenger.errorMessage == null) {
throw new IOException("This viewer could not get the go-ahead.");
} else {
throw new IOException(messenger.errorMessage);
@@ -190,7 +193,7 @@
}
public void mouseClickedThing(Thing thing, String shapeName, Point3d intersection) {
- SpaceEvent event = createSpaceEventForThing(thing, shapeName,SpaceEvent.THING_CLICKED_EVENT);
+ SpaceEvent event = createSpaceEventForThing(thing, shapeName, SpaceEvent.THING_CLICKED_EVENT);
attemptToSendSpaceEventToServer(event);
}
@@ -212,26 +215,24 @@
}
return event;
}
-
+
public void mouseContextClickedThing(Thing thing, String shapeName, int x, int y) {
// we should be asking the thing for the info about it's menu
- long now=System.currentTimeMillis();
- listener.receivedContextMenuRequest(thing,shapeName,x,y,now);
- SpaceEvent event = createSpaceEventForThing(thing, shapeName,SpaceEvent.THING_CONTEXT_CLICKED_EVENT);
- event.setProperty(SpaceEvent.NONCE,new Long(now));
+ long now = System.currentTimeMillis();
+ listener.receivedContextMenuRequest(thing, shapeName, x, y, now);
+ SpaceEvent event = createSpaceEventForThing(thing, shapeName, SpaceEvent.THING_CONTEXT_CLICKED_EVENT);
+ event.setProperty(SpaceEvent.NONCE, new Long(now));
attemptToSendSpaceEventToServer(event);
}
-
+
public void mouseContextItemChosen(Thing thing, long nonce, String id) {
- listener.contextItemChosen(thing,nonce,id);
+ listener.contextItemChosen(thing, nonce, id);
SpaceEvent event = createSpaceEventForThing(thing, null, SpaceEvent.THING_CONTEXT_SELECTION_MADE_EVENT);
- event.setProperty(SpaceEvent.NONCE,new Long(nonce));
+ event.setProperty(SpaceEvent.NONCE, new Long(nonce));
event.setProperty(SpaceEvent.CONTEXT_MENU_DATA_ITEM_ID, id);
attemptToSendSpaceEventToServer(event);
}
-
-
public void mouseClickedPage(Page page, Point3d intersection) {
Log.info("User clicked the page. Ignoring");
}
@@ -311,12 +312,12 @@
if (template == null) {
try {
TemplateDocument templateDoc = webClient.getTemplateDocument(event.getStringProperty(SpaceEvent.TEMPLATE_OWNER), templateID);
- //is it true that event.getStringProperty(SpaceEvent.TEMPLATE_OWNER) is the same as the authenticated user?
+ //is it true that event.getStringProperty(SpaceEvent.TEMPLATE_OWNER) is the same as the authenticated user?
//TemplateDocument templateDoc = webClient.getTemplateDocument(templateID);
template = new Template(templateDoc);
space.addTemplate(template);
} catch (IOException e) {
- Log.error("Could not add the template",e);
+ Log.error("Could not add the template", e);
}
}
Thing thing = new Thing(space, event.getLongProperty(SpaceEvent.THING_ID).longValue(), template, event.getStringProperty(SpaceEvent.DISPLAY_NAME), event.getStringProperty(SpaceEvent.OWNER_USERNAME), event.getLongProperty(SpaceEvent.POSSESSION_ID).longValue(), event.getTransform());
@@ -399,19 +400,19 @@
if (template == null) {
try {
TemplateDocument templateDoc = webClient.getTemplateDocument(event.getStringProperty(SpaceEvent.TEMPLATE_OWNER), templateID);
- //note: always true that event.getStringProperty(SpaceEvent.TEMPLATE_OWNER) is the same as authenticated user?
+ //note: always true that event.getStringProperty(SpaceEvent.TEMPLATE_OWNER) is the same as authenticated user?
//TemplateDocument templateDoc = webClient.getTemplateDocument(templateID);
template = new Template(templateDoc);
space.addTemplate(template);
} catch (IOException e) {
- Log.error("Could not add the template",e);
+ Log.error("Could not add the template", e);
}
}
try {
Door door = new Door(space, template, event.getLongProperty(SpaceEvent.DOOR_ID).longValue(), event.getStringProperty(SpaceEvent.DISPLAY_NAME), new URI(event.getStringProperty(SpaceEvent.LINK)), event.getTransform());
space.addDoor(door);
} catch (URISyntaxException e) {
- Log.error("Could not parse the door link: " + event.getStringProperty(SpaceEvent.LINK),e);
+ Log.error("Could not parse the door link: " + event.getStringProperty(SpaceEvent.LINK), e);
}
} else if (SpaceEvent.UPDATE_DOOR_EVENT.equals(event.getName())) {
@@ -515,8 +516,8 @@
Log.error("Got an animation event for an unknown user: " + event.getStringProperty(SpaceEvent.USERNAME));
return;
}
- user.playAnimation(event.getLongProperty(SpaceEvent.ANIMATION_ID).longValue());
-
+ user.playAnimation(event.getStringProperty(SpaceEvent.ANIMATION_NAME));
+
} else if (SpaceEvent.SHOW_LINK_EVENT.equals(event.getName())) {
String displayName = event.getStringProperty(SpaceEvent.DISPLAY_NAME);
String link = event.getStringProperty(SpaceEvent.LINK);
@@ -547,9 +548,7 @@
thing.stopMotion(position);
thing.setName(displayName);
} else if (SpaceEvent.CONTEXT_MENU_DATA_EVENT.equals(event.getName())) {
- listener.receivedContextMenuData(event.getLongProperty(SpaceEvent.NONCE).longValue(),
- event.getStringProperty(SpaceEvent.CONTEXT_MENU_DATA_GENERATION_ERROR),
- event.getContextMenu());
+ listener.receivedContextMenuData(event.getLongProperty(SpaceEvent.NONCE).longValue(), event.getStringProperty(SpaceEvent.CONTEXT_MENU_DATA_GENERATION_ERROR), event.getContextMenu());
} else if (SpaceEvent.MESSAGE_BROWSER_EVENT.equals(event.getName())) {
long thingID = event.getLongProperty(SpaceEvent.THING_ID).longValue();
@@ -590,7 +589,7 @@
private Vector waitingMessages = new Vector();
private String errorMessage = null;
-
+
public void handleMessage(Message message, TCPChannel sourceChannel) throws NoSuchDestinationException {
synchronized (this) {
if (waiting) {
@@ -599,7 +598,7 @@
return;
} else if (message.getPayload() instanceof PayloadFactory.AuthenticationFailurePayload) {
authStatus = FAILED_STATUS;
- errorMessage = ((PayloadFactory.AuthenticationFailurePayload)message.getPayload()).getMessage();
+ errorMessage = ((PayloadFactory.AuthenticationFailurePayload) message.getPayload()).getMessage();
return;
}
waitingMessages.add(message);
@@ -662,7 +661,7 @@
public void receivedContextMenuData(long nonce, String errorIfAny, Vector contextMenu);
- public void receivedContextMenuRequest(Thing thing, String shapeName, int x, int y,long nonce);
+ public void receivedContextMenuRequest(Thing thing, String shapeName, int x, int y, long nonce);
public void receivedLink(String displayName, String link);
@@ -685,25 +684,6 @@
messenger.cleanup();
}
- public InputStream getTemplateGeometryStream(String ownerUsername, long templateID, int lodIndex) {
- try {
- return webClient.getTemplateGeometryStream(ownerUsername, templateID, lodIndex);
- } catch (IOException e) {
- return UIConstants.getResource("templates/loading.obj");
- }
- }
-
- public InputStream getTemplateResourceStream(String ownerUsername, long templateID, String name) throws IOException {
- try {
- return webClient.getTemplateResourceStream(ownerUsername, templateID, name);
- } catch (IOException e) {
- if("loading.mtl".equals(name)){
- return UIConstants.getResource("templates/loading.mtl");
- }
- return null;
- }
- }
-
public InputStream getPageContentStream(long thingID, long pageID) {
try {
return webClient.getPageContents(space.getSpaceID(), thingID, pageID);
@@ -713,75 +693,57 @@
}
}
- public InputStream getThingAnimationStream(long thingID, long animationID) throws IOException {
- throw new IllegalStateException("this isn't implemented");
+ public BodyDocument getBodyDocument(String username, long bodyID) throws IOException {
+ return webClient.getBodyDocument(username, bodyID);
}
- public String getThingScript(long thingID) throws IOException {
- throw new IllegalStateException("this isn't implemented");
+ public WebAPIClient getWebClient() {
+ return webClient;
}
- public InputStream getUserGeometryStream(String username, String name) throws IOException {
- User user = space.getUser(username);
- if(user == null){
- return null;
- }
- if(user.getBody().isMale()){
- return UIConstants.getResource(BodyConstants.MALE_AVATAR_PATH);
- } else {
- return UIConstants.getResource(BodyConstants.FEMALE_AVATAR_PATH);
- }
+ public BodyDataProvider getBodyDataProvider() {
+ return bodyDataProvider;
}
- public InputStream getUserAnimationStream(String username, long animationID) throws IOException {
- return BodyConstants.getUserAnimation((int) animationID);
- }
+ private class NetworkBodyDataProvider implements BodyDataProvider {
- public InputStream getUserSkinMapStream(String username) throws IOException {
- User user = space.getUser(username);
- if(user == null){
- return null;
+ public ZipInputStream getBodyData(String bodyName) {
+ try {
+ return webClient.getBodyData(bodyName);
+ } catch (IOException e) {
+ Log.warn("Requested an unknown body: " + bodyName);
+ return null;
+ }
}
- if(user.getBody().isMale()){
- return UIConstants.getResource(BodyConstants.MALE_SMAP_PATH);
- } else {
- return UIConstants.getResource(BodyConstants.FEMALE_SMAP_PATH);
- }
- }
- public BodyDocument getBodyDocument(String username, long bodyID) throws IOException {
- return webClient.getBodyDocument(username, bodyID);
}
- public WebAPIClient getWebClient() {
- return webClient;
+ public TemplateDataProvider getTemplateDataProvider() {
+ return templateDataProvider;
}
- public GeometryProvider getErrorGeometryProvider() {
- return errorGeometryProvider;
- }
+ private class SpaceClientTemplateDataProvider implements TemplateDataProvider {
- private class ErrorGeometryProvider implements GeometryProvider {
-
- public InputStream getAnimationStream(long animationID) throws IOException {
- return null;
+ public InputStream getTemplateGeometry(String username, long templateID, int lod) {
+ try {
+ return webClient.getTemplateGeometryStream(username, templateID, lod);
+ } catch (IOException e) {
+ return null;
+ }
}
- public InputStream getGeometryStream(int lodIndex) throws IOException {
- if (lodIndex != 0) {
+ public InputStream getTemplateResource(String username, long templateID, String resourceName) {
+ try {
+ return webClient.getTemplateResourceStream(username, templateID, resourceName);
+ } catch (IOException e) {
return null;
}
- return UIConstants.getResource("templates/loading.obj");
}
- public InputStream getSkinMapStream() throws IOException {
- return null;
+ public String getTemplateScript(String username, long templateID) {
+ return webClient.getTemplateScript(username, templateID);
}
- public InputStream getSubGeometryStream(String name) throws IOException {
- return null;
- }
-
}
}
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIClient.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIClient.java 2007-09-27 18:06:34 UTC (rev 445)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIClient.java 2007-09-27 18:06:43 UTC (rev 446)
@@ -16,10 +16,10 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
-import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.Vector;
+import java.util.zip.ZipInputStream;
import javax.media.j3d.Transform3D;
@@ -38,7 +38,6 @@
import com.ogoglio.xml.SpaceDocument;
import com.ogoglio.xml.SpaceMemberDocument;
import com.ogoglio.xml.TemplateDocument;
-import com.ogoglio.xml.TemplateSupportFileDocument;
import com.ogoglio.xml.ThingDocument;
import com.ogoglio.xml.UserDocument;
@@ -509,6 +508,14 @@
return wire.sendDelete(descriptor.getBodyURI(authenticator.getUsername(), bodyID), authenticator.getAuthCookie());
}
+ public ZipInputStream getBodyData(String bodyName) throws IOException {
+ InputStream stream = wire.fetchAuthenticatedStream(descriptor.getBodyDataURI(bodyName), authenticator.getAuthCookie());
+ if(stream == null){
+ return null;
+ }
+ return new ZipInputStream(stream);
+ }
+
public ServiceStateDocument setRegistrationState(String registrationState) throws IOException {
ServiceStateDocument doc = new ServiceStateDocument(registrationState);
XMLElement xml = wire.postAuthenticatedXML(descriptor.getServiceStateURI(), doc.toString(), authenticator.getAuthCookie());
@@ -537,5 +544,4 @@
public WebAPIClientWire getWire() {
return wire;
}
-
}
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIDescriptor.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIDescriptor.java 2007-09-27 18:06:34 UTC (rev 445)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIDescriptor.java 2007-09-27 18:06:43 UTC (rev 446)
@@ -123,6 +123,10 @@
return WebAPIUtil.appendToURI(getBodiesURI(username), bodyID + "/");
}
+ public URI getBodyDataURI(String bodyName) {
+ return WebAPIUtil.appendToURI(serviceURI, "ogoglio-body-" + bodyName + ".jar");
+ }
+
public URI getPagesURI(long spaceID, long thingID) {
return WebAPIUtil.appendToURI(getThingURI(spaceID, thingID), "page/");
}
Added: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/model/BodyDataProvider.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/model/BodyDataProvider.java (rev 0)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/model/BodyDataProvider.java 2007-09-27 18:06:43 UTC (rev 446)
@@ -0,0 +1,9 @@
+package com.ogoglio.client.model;
+
+import java.util.zip.ZipInputStream;
+
+public interface BodyDataProvider {
+
+ public ZipInputStream getBodyData(String bodyName);
+
+}
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/model/Door.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/model/Door.java 2007-09-27 18:06:34 UTC (rev 445)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/model/Door.java 2007-09-27 18:06:43 UTC (rev 446)
@@ -1,7 +1,5 @@
package com.ogoglio.client.model;
-import java.io.IOException;
-import java.io.InputStream;
import java.net.URI;
import javax.media.j3d.Transform3D;
@@ -9,7 +7,7 @@
import com.ogoglio.util.ArgumentUtils;
import com.ogoglio.xml.DoorDocument;
-public class Door implements GeometryProvider {
+public class Door {
private Space space = null;
@@ -83,22 +81,6 @@
position.set(this.position);
}
- public InputStream getGeometryStream(int lodIndex) throws IOException {
- return space.getDoorGeometryStream(this, lodIndex);
- }
-
- public InputStream getSubGeometryStream(String name) throws IOException {
- return space.getDoorResourceStream(this, name);
- }
-
- public InputStream getAnimationStream(long animationID) throws IOException {
- throw new IllegalStateException("Doors don't have animations");
- }
-
- public InputStream getSkinMapStream() throws IOException {
- throw new IllegalStateException("Doors don't have skin maps");
- }
-
public void setDoorID(long doorID) {
ArgumentUtils.assertNotNegative(doorID);
if(this.doorID != -1) {
Deleted: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/model/GeometryProvider.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/model/GeometryProvider.java 2007-09-27 18:06:34 UTC (rev 445)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/model/GeometryProvider.java 2007-09-27 18:06:43 UTC (rev 446)
@@ -1,31 +0,0 @@
-/* Copyright 2007 Transmutable (http://transmutable.com/)
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. */
-package com.ogoglio.client.model;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-public interface GeometryProvider {
-
- public static final float[] LOD_DISTANCES = { 15f, 75f };
-
- public InputStream getGeometryStream(int lodIndex) throws IOException;
-
- public InputStream getSubGeometryStream(String name) throws IOException;
-
- public InputStream getAnimationStream(long animationID) throws IOException ;
-
- public InputStream getSkinMapStream() throws IOException;
-
-}
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-09-27 18:06:34 UTC (rev 445)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/model/Space.java 2007-09-27 18:06:43 UTC (rev 446)
@@ -204,26 +204,12 @@
public void shapeMotionStopped(Shape shape, Transform3D position);
- public void userAnimationStarted(User user, long animationID);
+ public void userAnimationStarted(User user, String animationName);
}
public interface Context {
- public InputStream getTemplateResourceStream(String ownerUsername, long templateID, String name) throws IOException;
-
- public InputStream getTemplateGeometryStream(String ownerUsername, long templateID, int lodIndex);
-
- public InputStream getUserGeometryStream(String username, String name) throws IOException;
-
- public InputStream getThingAnimationStream(long thingID, long animationID) throws IOException;
-
- public InputStream getUserAnimationStream(String username, long animationID) throws IOException;
-
- public InputStream getUserSkinMapStream(String username) throws IOException;
-
- public String getThingScript(long thingID) throws IOException;
-
public InputStream getPageContentStream(long thingID, long pageID);
public BodyDocument getBodyDocument(String username, long bodyID) throws IOException;
@@ -281,10 +267,10 @@
}
}
- public void notifyUserAnimationStarted(User user, long animationID) {
+ public void notifyUserAnimationStarted(User user, String animationName) {
Listener[] listeners = listenerList.getListeners();
for (int i = 0; i < listeners.length; i++) {
- listeners[i].userAnimationStarted(user, animationID);
+ listeners[i].userAnimationStarted(user, animationName);
}
}
@@ -512,46 +498,6 @@
return ownerUsername;
}
- protected InputStream getDoorGeometryStream(Door door, int lodIndex) throws IOException {
- return spaceContext.getTemplateGeometryStream(door.getTemplate().getOwnerUsername(), door.getTemplate().getTemplateID(), lodIndex);
- }
-
- protected InputStream getDoorResourceStream(Door door, String name) throws IOException {
- return spaceContext.getTemplateResourceStream(door.getTemplate().getOwnerUsername(), door.getTemplate().getTemplateID(), name);
- }
-
- protected InputStream getThingGeometryStream(Thing thing, int lodIndex) throws IOException {
- return spaceContext.getTemplateGeometryStream(thing.getTemplate().getOwnerUsername(), thing.getTemplate().getTemplateID(), lodIndex);
- }
-
- protected InputStream getThingResourceStream(Thing thing, String resourceName) throws IOException {
- return spaceContext.getTemplateResourceStream(thing.getTemplate().getOwnerUsername(), thing.getTemplate().getTemplateID(), resourceName);
- }
-
- protected InputStream getUserGeometryStream(String username) throws IOException {
- return spaceContext.getUserGeometryStream(username, null);
- }
-
- protected InputStream getUserGeometryStream(String username, String name)...
[truncated message content] |
