[Ogoglio-commits] SF.net SVN: ogoglio: [724] maven/trunk/ogoglio-common/src/main/java/com/ ogoglio

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

Revision: 724
          http://ogoglio.svn.sourceforge.net/ogoglio/?rev=724&view=rev
Author:   trevorolio
Date:     2008-02-07 04:20:28 -0800 (Thu, 07 Feb 2008)

Log Message:
-----------
More attachment work:
a first pass at a body editor UI
a template for Joe with just a texture containing shirts and pants
fixed up the populate mojo to read an attachment property out of template.properties

Modified Paths:
--------------
    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/viewer/j3d/body/Skin.java
    maven/trunk/ogoglio-common/src/main/java/com/ogoglio/xml/BodyConfigurationDocument.java

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	2008-02-07 12:20:21 UTC (rev 723)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIClient.java	2008-02-07 12:20:28 UTC (rev 724)
@@ -313,7 +313,18 @@
     public TemplateDocument getTemplateDocument(String ownerUsername, long templateID) throws IOException {
         return new TemplateDocument(wire.fetchAuthenticatedXML(descriptor.getTemplateURI(ownerUsername, templateID), authenticator.getAuthCookie()));
     }
+    
+    public TemplateDocument[] getAttachmentTemplateDocuments() throws IOException {
+        XMLElement list = wire.fetchAuthenticatedXML(descriptor.getAttachmentTemplatesURI(), authenticator.getAuthCookie());
+        Vector result = new Vector();
+        XMLElement[] children = (XMLElement[]) list.getChildren().toArray(new XMLElement[0]);
+        for (int i = 0; i < children.length; i++) {
+            result.add(new TemplateDocument(children[i]));
+        }
+        return (TemplateDocument[]) result.toArray(new TemplateDocument[0]);
 
+    }
+
     public void uploadTemplateGeometryStream(String ownerUsername, long templateID, int lodIndex, InputStream input) throws IOException {
         wire.performPOST(descriptor.getTemplateGeometryURI(ownerUsername, templateID, lodIndex), StreamUtils.readInput(input), "application/octet-stream", authenticator.getAuthCookie());
     }

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	2008-02-07 12:20:21 UTC (rev 723)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIDescriptor.java	2008-02-07 12:20:28 UTC (rev 724)
@@ -89,6 +89,10 @@
         return WebAPIUtil.appendToURI(getTemplatesURI(username), templateID + "/");
     }
 
+    public URI getAttachmentTemplatesURI() {
+        return WebAPIUtil.appendToURI(getAccountURI(), "template/attachment/");
+    }
+    
     public URI getDoorsURI(long spaceID) {
         return WebAPIUtil.appendToURI(getSpaceURI(spaceID), "door/");
     }

Modified: 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/Skin.java	2008-02-07 12:20:21 UTC (rev 723)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/body/Skin.java	2008-02-07 12:20:28 UTC (rev 724)
@@ -120,7 +120,7 @@
 
             BufferedImage[] decalBIs = getDecals();
             for (int i = 0; i < decalBIs.length; i++) {
-                g.drawImage(decalBIs[i], 0, 0, null);
+                g.drawImage(decalBIs[i], 0, 0, imageComp.getWidth(), imageComp.getHeight(), null);
             }
         }
 

Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/xml/BodyConfigurationDocument.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/xml/BodyConfigurationDocument.java	2008-02-07 12:20:21 UTC (rev 723)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/xml/BodyConfigurationDocument.java	2008-02-07 12:20:28 UTC (rev 724)
@@ -15,6 +15,7 @@
 
 import nanoxml.XMLElement;
 
+import com.ogoglio.client.model.Attachment;
 import com.ogoglio.client.model.BodyConfiguration;
 import com.ogoglio.util.ArgumentUtils;
 
@@ -60,6 +61,10 @@
         for (int i = 0; i < settingNames.length; i++) {
             addBodySetting(settingNames[i], bodyConfiguration.getSetting(settingNames[i]));
         }
+        Attachment[] attachments = bodyConfiguration.getAttachments();
+        for (int i = 0; i < attachments.length; i++) {
+            data.addChild(new AttachmentDocument(attachments[i].getAttachmentID(), attachments[i].getTemplate().getOwnerUsername(), attachments[i].getTemplate().getTemplateID(), bodyConfiguration.getBodyConfigurationID()).toElement());
+        }
     }
 
     public long getBodyConfigurationID(){


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