[Ogoglio-commits] SF.net SVN: ogoglio: [443] maven/trunk/ogoglio-viewer-applet/src/test/java/ com/ogoglio/viewer/j3d/obj/test/ObjTest.java

[<tre...@us...>]

Revision: 443
          http://ogoglio.svn.sourceforge.net/ogoglio/?rev=443&view=rev
Author:   trevorolio
Date:     2007-09-27 10:13:24 -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-viewer-applet/src/test/java/com/ogoglio/viewer/j3d/obj/test/ObjTest.java

Modified: maven/trunk/ogoglio-viewer-applet/src/test/java/com/ogoglio/viewer/j3d/obj/test/ObjTest.java
===================================================================
--- maven/trunk/ogoglio-viewer-applet/src/test/java/com/ogoglio/viewer/j3d/obj/test/ObjTest.java	2007-09-27 16:38:52 UTC (rev 442)
+++ maven/trunk/ogoglio-viewer-applet/src/test/java/com/ogoglio/viewer/j3d/obj/test/ObjTest.java	2007-09-27 17:13:24 UTC (rev 443)
@@ -23,7 +23,7 @@
 
 import junit.framework.TestCase;
 
-import com.ogoglio.client.model.GeometryProvider;
+import com.ogoglio.client.model.TemplateDataProvider;
 import com.ogoglio.util.ArgumentUtils;
 import com.ogoglio.viewer.j3d.obj.Obj;
 import com.ogoglio.viewer.j3d.obj.ObjMtl;
@@ -54,28 +54,10 @@
         assertIsValidObj(geoProvider1);
     }
 
-    /*
-    private void printParsed(GeometryProvider geoProvider) {
+    public void assertIsValidObj(TemplateDataProvider dataProvider) {
         try {
-            ObjParser parser = new ObjParser(geoProvider1, 0);
+            ObjParser parser = new ObjParser("trevor", 1, 0, dataProvider);
             Obj obj = parser.parse();
-            StringWriter writer = new StringWriter();
-            obj.writeObj(writer);
-            System.out.println(writer);
-            System.out.println("===================");
-            writer = new StringWriter();
-            obj.getMtl().writeMtl(writer);
-            System.out.println(writer);
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-    */
-    public void assertIsValidObj(GeometryProvider geoProvider) {
-        try {
-            ObjParser parser = new ObjParser(geoProvider, 0);
-            Obj obj = parser.parse();
             assertNotNull(obj);
 
             try {
@@ -197,7 +179,7 @@
         }
     }
 
-    private class TestGeometryProvider implements GeometryProvider {
+    private class TestGeometryProvider implements TemplateDataProvider {
 
         private InputStream objStream = null;
 
@@ -210,22 +192,18 @@
             ArgumentUtils.assertNotNull(mtlStream);
         }
 
-        public InputStream getAnimationStream(long animationID) throws IOException {
-            return null;
-        }
-
-        public InputStream getGeometryStream(int lodIndex) throws IOException {
+        public InputStream getTemplateGeometry(String username, long templateID, int lod) {
             return objStream;
         }
 
-        public InputStream getSkinMapStream() throws IOException {
+        public InputStream getTemplateResource(String username, long templateID, String resourceName) {
+            if (resourceName.endsWith(".mtl")) {
+                return mtlStream;
+            }
             return null;
         }
 
-        public InputStream getSubGeometryStream(String name) throws IOException {
-            if (name.endsWith(".mtl")) {
-                return mtlStream;
-            }
+        public String getTemplateScript(String username, long templateID) {
             return null;
         }
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.