[Ogoglio-commits] SF.net SVN: ogoglio: [476] maven/trunk/ogoglio-body-editor-applet/src/main/ java/com/ogoglio/bodyeditor/BodyEditorApplet.java

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

Revision: 476
          http://ogoglio.svn.sourceforge.net/ogoglio/?rev=476&view=rev
Author:   trevorolio
Date:     2007-10-03 23:30:49 -0700 (Wed, 03 Oct 2007)

Log Message:
-----------
Though there's no UI to set them, body rendering now respects body configuration for morphs.

Modified Paths:
--------------
    maven/trunk/ogoglio-body-editor-applet/src/main/java/com/ogoglio/bodyeditor/BodyEditorApplet.java

Modified: maven/trunk/ogoglio-body-editor-applet/src/main/java/com/ogoglio/bodyeditor/BodyEditorApplet.java
===================================================================
--- maven/trunk/ogoglio-body-editor-applet/src/main/java/com/ogoglio/bodyeditor/BodyEditorApplet.java	2007-10-04 06:30:45 UTC (rev 475)
+++ maven/trunk/ogoglio-body-editor-applet/src/main/java/com/ogoglio/bodyeditor/BodyEditorApplet.java	2007-10-04 06:30:49 UTC (rev 476)
@@ -39,10 +39,6 @@
 import javax.media.j3d.TransformGroup;
 import javax.media.j3d.View;
 import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JSlider;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
 import javax.vecmath.Color3f;
 import javax.vecmath.Point3d;
 import javax.vecmath.Vector3f;
@@ -51,6 +47,7 @@
 import com.ogoglio.client.WebAPIClient;
 import com.ogoglio.client.WebAPIClientWire;
 import com.ogoglio.client.WebAPIDescriptor;
+import com.ogoglio.client.model.BodyConfiguration;
 import com.ogoglio.client.model.BodyDataProvider;
 import com.ogoglio.client.model.Space;
 import com.ogoglio.client.model.TemplateDataProvider;
@@ -62,8 +59,9 @@
 import com.ogoglio.viewer.j3d.J3DDataManager;
 import com.ogoglio.viewer.j3d.J3DUniverse;
 import com.ogoglio.viewer.j3d.J3DUserRenderable;
-import com.ogoglio.viewer.j3d.body.SkinLoader;
 import com.ogoglio.xml.AccountDocument;
+import com.ogoglio.xml.BodyConfigurationDocument;
+import com.ogoglio.xml.BodyDataDocument;
 
 public class BodyEditorApplet extends Applet {
 
@@ -94,8 +92,8 @@
     }
 
     private class SpacelessUser extends User {
-        public SpacelessUser(String username) {
-            super(new Space(new SpacelessContext(), 1, "Space", "nobody", false, 0), username, new Transform3D());
+        public SpacelessUser(String username, BodyConfigurationDocument bodyConfigDoc) {
+            super(new Space(new SpacelessContext(), 1, "Space", "nobody", false, 0), username, new Transform3D(), new BodyConfiguration(bodyConfigDoc));
         }
     }
 
@@ -143,8 +141,7 @@
 
         public boolean addUserRenderable() {
             try {
-                System.err.println("Trevor needs to fix the body editor");
-                renderable = new J3DUserRenderable(user, dataManager.getBodyData("mike"));
+                renderable = new J3DUserRenderable(user, dataManager.getBodyData(user.getBodyConfiguration().getBodyDataID()));
                 userGroup.addChild(renderable);
                 return true;
             } catch (Exception e) {
@@ -266,7 +263,7 @@
 
             dataManager = new J3DDataManager(true, new TemplateProvider(), new BodyProvider());
 
-            user = new SpacelessUser(accountDoc.getUsername());
+            user = new SpacelessUser(accountDoc.getUsername(), webClient.getDefaultBodyConfiguration(accountDoc.getUsername()));
 
             add(bodyPanel, BorderLayout.CENTER);
             westPanel = new WestPanel();
@@ -317,9 +314,10 @@
     }
     
     private class BodyProvider implements BodyDataProvider {
-        public ZipInputStream getBodyData(String bodyName) {
+        public ZipInputStream getBodyData(long bodyDataID) {
             try {
-                return webClient.getBodyData(bodyName);
+                BodyDataDocument bodyDataDoc = webClient.getBodyDataDocument(bodyDataID);
+                return webClient.getBodyData(bodyDataDoc.getFileName());
             } catch (IOException e) {
                 removeAll();
                 validate();
@@ -328,6 +326,7 @@
                 return null;
             }
         }
+
     }
     
     //TODO make the error panel less ugly


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