change j3md files

diff --git a/build.xml b/build.xml
index 15119f7..20fdb27 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -71,4 +71,10 @@
     nbproject/build-impl.xml file. \r
 \r
     -->\r
+    <target name="src-jar" depends="init">\r
+        <jar basedir="src" jarfile="${dist.dir}/MMDLoaderJME3-source.jar"/>\r
+    </target>\r
+    <target name="javadoc-jar" depends="javadoc">\r
+        <jar basedir="${dist.dir}/javadoc" jarfile="${dist.dir}/MMDLoaderJME3-javadoc.jar"/>\r
+    </target>\r
 </project>\r

diff --git a/src/MatDefs/pmd/pmd.j3md b/src/MatDefs/pmd/pmd.j3md
index 9e0a623..ff4805f 100755 (executable)
--- a/src/MatDefs/pmd/pmd.j3md
+++ b/src/MatDefs/pmd/pmd.j3md
@@ -38,16 +38,16 @@ MaterialDef pmd {
         Boolean UseVertexColor\r
 \r
         // Ambient color\r
-        Color Ambient\r
+        Color Ambient (MaterialAmbient)\r
 \r
         // Diffuse color\r
-        Color Diffuse : Color\r
+        Color Diffuse (MaterialDiffuse)\r
 \r
         // Specular color\r
-        Color Specular\r
+        Color Specular (MaterialSpecular)\r
 \r
         // Specular power/shininess\r
-        Float Shininess\r
+        Float Shininess (MaterialShininess) : 1\r
 \r
         // Diffuse map\r
         Texture2D DiffuseMap\r

diff --git a/src/MatDefs/pmd/pmd_alpha.j3md b/src/MatDefs/pmd/pmd_alpha.j3md
index 8fc5ed3..1b379b2 100755 (executable)
--- a/src/MatDefs/pmd/pmd_alpha.j3md
+++ b/src/MatDefs/pmd/pmd_alpha.j3md
@@ -38,16 +38,16 @@ MaterialDef pmd {
         Boolean UseVertexColor\r
 \r
         // Ambient color\r
-        Color Ambient\r
+        Color Ambient (MaterialAmbient)\r
 \r
         // Diffuse color\r
-        Color Diffuse : Color\r
+        Color Diffuse (MaterialDiffuse)\r
 \r
         // Specular color\r
-        Color Specular\r
+        Color Specular (MaterialSpecular)\r
 \r
         // Specular power/shininess\r
-        Float Shininess\r
+        Float Shininess (MaterialShininess) : 1\r
 \r
         // Diffuse map\r
         Texture2D DiffuseMap\r

diff --git a/src/MatDefs/pmd/pmd_no_skinning.j3md b/src/MatDefs/pmd/pmd_no_skinning.j3md
index 2315f1d..3958cc5 100755 (executable)
--- a/src/MatDefs/pmd/pmd_no_skinning.j3md
+++ b/src/MatDefs/pmd/pmd_no_skinning.j3md
@@ -38,16 +38,16 @@ MaterialDef pmd {
         Boolean UseVertexColor\r
 \r
         // Ambient color\r
-        Color Ambient\r
+        Color Ambient (MaterialAmbient)\r
 \r
         // Diffuse color\r
-        Color Diffuse : Color\r
+        Color Diffuse (MaterialDiffuse)\r
 \r
         // Specular color\r
-        Color Specular\r
+        Color Specular (MaterialSpecular)\r
 \r
         // Specular power/shininess\r
-        Float Shininess\r
+        Float Shininess (MaterialShininess) : 1\r
 \r
         // Diffuse map\r
         Texture2D DiffuseMap\r

diff --git a/src/MatDefs/pmd/pmd_no_skinning_alpha.j3md b/src/MatDefs/pmd/pmd_no_skinning_alpha.j3md
index 2cff028..04b29ec 100755 (executable)
--- a/src/MatDefs/pmd/pmd_no_skinning_alpha.j3md
+++ b/src/MatDefs/pmd/pmd_no_skinning_alpha.j3md
@@ -38,16 +38,16 @@ MaterialDef pmd {
         Boolean UseVertexColor\r
 \r
         // Ambient color\r
-        Color Ambient\r
+        Color Ambient (MaterialAmbient)\r
 \r
         // Diffuse color\r
-        Color Diffuse : Color\r
+        Color Diffuse (MaterialDiffuse)\r
 \r
         // Specular color\r
-        Color Specular\r
+        Color Specular (MaterialSpecular)\r
 \r
         // Specular power/shininess\r
-        Float Shininess\r
+        Float Shininess (MaterialShininess) : 1\r
 \r
         // Diffuse map\r
         Texture2D DiffuseMap\r

diff --git a/src/projectkyoto/jme3/mmd/PMDSkinMesh.java b/src/projectkyoto/jme3/mmd/PMDSkinMesh.java
index f07e3fa..0711fbb 100755 (executable)
--- a/src/projectkyoto/jme3/mmd/PMDSkinMesh.java
+++ b/src/projectkyoto/jme3/mmd/PMDSkinMesh.java
@@ -105,13 +105,15 @@ public class PMDSkinMesh extends Mesh {
         newMesh.skinnb2.setupData(VertexBuffer.Usage.Dynamic, 3, VertexBuffer.Format.Float, skinnfb2);
         
         VertexBuffer skinvb1 = new VertexBuffer(VertexBuffer.Type.Position);
-        FloatBuffer skinvfb1 = BufferUtils.clone((FloatBuffer)this.skinvb2.getData());
+//        FloatBuffer skinvfb1 = BufferUtils.clone((FloatBuffer)this.skinvb2.getData());
+        FloatBuffer skinvfb1 = BufferUtils.clone((FloatBuffer)this.getBuffer(VertexBuffer.Type.Position).getData());
         skinvb1.setupData(VertexBuffer.Usage.Dynamic, 3, VertexBuffer.Format.Float, skinvfb1);
         newMesh.clearBuffer(VertexBuffer.Type.Position);
         newMesh.setBuffer(skinvb1);
         
         VertexBuffer skinnb1 = new VertexBuffer(VertexBuffer.Type.Normal);
-        FloatBuffer skinnfb1 = BufferUtils.clone((FloatBuffer)this.skinnb2.getData());
+//        FloatBuffer skinnfb1 = BufferUtils.clone((FloatBuffer)this.skinnb2.getData());
+        FloatBuffer skinnfb1 = BufferUtils.clone((FloatBuffer)this.getBuffer(VertexBuffer.Type.Normal).getData());
         skinnb1.setupData(VertexBuffer.Usage.Dynamic, 3, VertexBuffer.Format.Float, skinnfb1);
         newMesh.clearBuffer(VertexBuffer.Type.Normal);
         newMesh.setBuffer(skinnb1);