[Ogoglio-commits] SF.net SVN: ogoglio: [273] maven/trunk/ogoglio-body-editor-applet

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

Revision: 273
          http://ogoglio.svn.sourceforge.net/ogoglio/?rev=273&view=rev
Author:   trevorolio
Date:     2007-08-27 14:05:45 -0700 (Mon, 27 Aug 2007)

Log Message:
-----------
Made body editor applet work, including refs to avatar resources.

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

Modified: maven/trunk/ogoglio-body-editor-applet/.classpath
===================================================================
--- maven/trunk/ogoglio-body-editor-applet/.classpath	2007-08-27 21:05:32 UTC (rev 272)
+++ maven/trunk/ogoglio-body-editor-applet/.classpath	2007-08-27 21:05:45 UTC (rev 273)
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/test/java"/>
+	<classpathentry excluding="**" output="src/main/resources" kind="src" path="src/main/resources"/>
+	<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-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-08-27 21:05:32 UTC (rev 272)
+++ maven/trunk/ogoglio-body-editor-applet/src/main/java/com/ogoglio/bodyeditor/BodyEditorApplet.java	2007-08-27 21:05:45 UTC (rev 273)
@@ -68,13 +68,13 @@
 
 public class BodyEditorApplet extends Applet {
 
-    public static final ImageIcon LEFT_ARROW = UIConstants.loadIconFromResource("com/ogoglio/viewer/applet/resources/LeftArrow.gif");
+    public static final ImageIcon LEFT_ARROW = UIConstants.loadIconFromResource("avatar/LeftArrow.gif");
 
-    public static final ImageIcon LEFT_ARROW_DISABLED = UIConstants.loadIconFromResource("com/ogoglio/viewer/applet/resources/LeftArrowDisabled.gif");
+    public static final ImageIcon LEFT_ARROW_DISABLED = UIConstants.loadIconFromResource("avatar/LeftArrowDisabled.gif");
 
-    public static final ImageIcon RIGHT_ARROW = UIConstants.loadIconFromResource("com/ogoglio/viewer/applet/resources/RightArrow.gif");
+    public static final ImageIcon RIGHT_ARROW = UIConstants.loadIconFromResource("avatar/RightArrow.gif");
 
-    public static final ImageIcon RIGHT_ARROW_DISABLED = UIConstants.loadIconFromResource("com/ogoglio/viewer/applet/resources/RightArrowDisabled.gif");
+    public static final ImageIcon RIGHT_ARROW_DISABLED = UIConstants.loadIconFromResource("avatar/RightArrowDisabled.gif");
 
     private RowModel hairRowModel = null;
 
@@ -118,22 +118,22 @@
     private class SpacelessContext implements Context {
 
         public InputStream getUserGeometryStream(String username, String name) throws IOException {
-            return BodyEditorApplet.class.getClassLoader().getResourceAsStream("/avatar/avatar.obj");
+            return UIConstants.getResource("avatar/avatar.obj");
         }
 
         public InputStream getUserAnimationStream(String username, long animationID) throws IOException {
             if (animationID == 1) {
-                return BodyEditorApplet.class.getClassLoader().getResourceAsStream("/avatar/avatar.bvh");
+                return UIConstants.getResource("avatar/avatar.bvh");
             } else if (animationID == 2) {
-                return BodyEditorApplet.class.getClassLoader().getResourceAsStream("/avatar/avatar-walk.bvh");
+                return UIConstants.getResource("avatar/avatar-walk.bvh");
             } else if (animationID == 3) {
-                return BodyEditorApplet.class.getClassLoader().getResourceAsStream("/avatar/avatar-wave.bvh");
+                return UIConstants.getResource("avatar/avatar-wave.bvh");
             }
             return null;
         }
 
         public InputStream getUserSkinMapStream(String username) throws IOException {
-            return BodyEditorApplet.class.getClassLoader().getResourceAsStream("/avatar/avatar.smap");
+            return UIConstants.getResource("avatar/avatar.smap");
         }
 
         public InputStream getPageContentStream(long thingID, long pageID) {
@@ -213,8 +213,6 @@
         }
 
         public void setupUniverse() {
- 
-        	UIConstants.loadIconFromResource("fart");
             addDirectionalLight(UIConstants.WHITE, new Vector3f(0, 0, -1));
             addDirectionalLight(UIConstants.DARK_GRAY, new Vector3f(0.3f, -0.8f, 0.3f));
             addDirectionalLight(UIConstants.DARK_GRAY, new Vector3f(-0.4f, 0.8f, -0.2f));


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