Enable interleave.

Fix a bug when accuracy < 0
Fix a problem when the model desn't contain physics data.

diff --git a/src/projectkyoto/jme3/mmd/PMDLoaderGLSLSkinning2.java b/src/projectkyoto/jme3/mmd/PMDLoaderGLSLSkinning2.java
index 0c4bf40..69cf5d4 100755 (executable)
--- a/src/projectkyoto/jme3/mmd/PMDLoaderGLSLSkinning2.java
+++ b/src/projectkyoto/jme3/mmd/PMDLoaderGLSLSkinning2.java
@@ -168,7 +168,7 @@ public class PMDLoaderGLSLSkinning2 implements AssetLoader{
             node.pmdGeometryArray[pmdGeometryIndex++] = geom;
             meshConverter.getMeshDataList().set(i, null);
 //            go.add(mesh);
-//            mesh.setInterleaved();    
+            mesh.setInterleaved();    
         }
 //        go.optimize3();
         createSkinCommonVertData();

diff --git a/src/projectkyoto/jme3/mmd/nativebullet/PMDPhysicsWorld.java b/src/projectkyoto/jme3/mmd/nativebullet/PMDPhysicsWorld.java
index 0802971..d329b8d 100755 (executable)
--- a/src/projectkyoto/jme3/mmd/nativebullet/PMDPhysicsWorld.java
+++ b/src/projectkyoto/jme3/mmd/nativebullet/PMDPhysicsWorld.java
@@ -60,6 +60,7 @@ import projectkyoto.mmd.file.PMDModel;
  * @author kobayasi
  */
 public class PMDPhysicsWorld {
+    int maxSteps = 10;
     // bullet physics
     static final Object lockObject = new Object();
     PhysicsSpace physicsSpace;
@@ -503,7 +504,7 @@ public class PMDPhysicsWorld {
 //            applyResultToBone();
 //        }
 //        synchronized(lockObject) {
-            physicsSpace.update(timeStep, 100);
+            physicsSpace.update(timeStep, maxSteps);
 //        }
 //        applyResultToBone();
     }
@@ -618,4 +619,13 @@ public class PMDPhysicsWorld {
         return physicsSpace;
     }
 
+    public int getMaxSteps() {
+        return maxSteps;
+    }
+
+    public void setMaxSteps(int maxSteps) {
+        this.maxSteps = maxSteps;
+    }
+    
+
 }

diff --git a/src/projectkyoto/jme3/mmd/vmd/VMDControl.java b/src/projectkyoto/jme3/mmd/vmd/VMDControl.java
index 7dec0a3..6ba1517 100755 (executable)
--- a/src/projectkyoto/jme3/mmd/vmd/VMDControl.java
+++ b/src/projectkyoto/jme3/mmd/vmd/VMDControl.java
@@ -276,12 +276,19 @@ public class VMDControl extends AbstractControl {
             return;
         }
         float time = currentTime + tpf;
-        if (accuracy > 0 && tpf < 1f) {
+        if (accuracy <= 0) {
+            controlUpdate2(tpf);
+        } else if (tpf < accuracy * 8) {
             physicsControl.update(tpf);
             physicsControl.getWorld().applyResultToBone();
             physicsControl.getWorld().getPhysicsSpace().distributeEvents();
         } else {
-            controlUpdate2(tpf);
+            float accuracy2 = tpf / 8;
+            physicsControl.getWorld().setAccuracy(accuracy2);
+            physicsControl.update(tpf);
+            physicsControl.getWorld().applyResultToBone();
+            physicsControl.getWorld().getPhysicsSpace().distributeEvents();
+            physicsControl.getWorld().setAccuracy(accuracy);
         }
         resetSkins();
         calcSkins();

diff --git a/src/projectkyoto/mmd/file/PMDModel.java b/src/projectkyoto/mmd/file/PMDModel.java
index af85d70..a7d2d72 100755 (executable)
--- a/src/projectkyoto/mmd/file/PMDModel.java
+++ b/src/projectkyoto/mmd/file/PMDModel.java
@@ -30,6 +30,7 @@
 package projectkyoto.mmd.file;
 
 import java.io.BufferedInputStream;
+import java.io.EOFException;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -149,8 +150,13 @@ public class PMDModel implements Serializable{
         boneDispList = new PMDBoneDispList(is);
         headerEnglish = new PMDHeaderEnglish(this, is);
         toonTextureList = new PMDToonTextureList(is);
-        rigidBodyList = new PMDRigidBodyList(is);
-        jointList = new PMDJointList(is);
+        try {
+            rigidBodyList = new PMDRigidBodyList(is);
+            jointList = new PMDJointList(is);
+        } catch(EOFException ex) {
+            rigidBodyList = new PMDRigidBodyList();
+            jointList = new PMDJointList();
+        }
 //        toonTextureList = new PMDToonTextureList();
 //        rigidBodyList = new PMDRigidBodyList();
 //        jointList = new PMDJointList();