Vmd2XMLと共通化

[mikutoga/Pmd2XML.git] / src / main / java / jp / sfjp / mikutoga / pmd / binio / RigidBuilder.java

diff --git a/src/main/java/jp/sfjp/mikutoga/pmd/binio/RigidBuilder.java b/src/main/java/jp/sfjp/mikutoga/pmd/binio/RigidBuilder.java
index 6be82b1..7f1e9da 100644 (file)
--- a/src/main/java/jp/sfjp/mikutoga/pmd/binio/RigidBuilder.java
+++ b/src/main/java/jp/sfjp/mikutoga/pmd/binio/RigidBuilder.java
@@ -9,6 +9,12 @@ package jp.sfjp.mikutoga.pmd.binio;
 
 import java.util.Iterator;
 import java.util.List;
 
 import java.util.Iterator;
 import java.util.List;

+import jp.sfjp.mikutoga.bin.parser.ParseStage;
+import jp.sfjp.mikutoga.math.MkPos3D;
+import jp.sfjp.mikutoga.pmd.PmdConst;
+import jp.sfjp.mikutoga.pmd.Rad3d;
+import jp.sfjp.mikutoga.pmd.RigidBehaviorType;
+import jp.sfjp.mikutoga.pmd.RigidShapeType;

 import jp.sfjp.mikutoga.pmd.model.BoneInfo;
 import jp.sfjp.mikutoga.pmd.model.DynamicsInfo;
 import jp.sfjp.mikutoga.pmd.model.ListUtil;
 import jp.sfjp.mikutoga.pmd.model.BoneInfo;
 import jp.sfjp.mikutoga.pmd.model.DynamicsInfo;
 import jp.sfjp.mikutoga.pmd.model.ListUtil;


@@ -16,13 +22,7 @@ import jp.sfjp.mikutoga.pmd.model.PmdModel;
 import jp.sfjp.mikutoga.pmd.model.RigidGroup;
 import jp.sfjp.mikutoga.pmd.model.RigidInfo;
 import jp.sfjp.mikutoga.pmd.model.RigidShape;
 import jp.sfjp.mikutoga.pmd.model.RigidGroup;
 import jp.sfjp.mikutoga.pmd.model.RigidInfo;
 import jp.sfjp.mikutoga.pmd.model.RigidShape;

-import jp.sourceforge.mikutoga.math.MkPos3D;
-import jp.sourceforge.mikutoga.parser.ParseStage;
-import jp.sourceforge.mikutoga.pmd.Rad3d;
-import jp.sourceforge.mikutoga.pmd.RigidBehaviorType;
-import jp.sourceforge.mikutoga.pmd.RigidShapeType;
-import jp.sourceforge.mikutoga.pmd.parser.PmdLimits;
-import jp.sourceforge.mikutoga.pmd.parser.PmdRigidHandler;
+import jp.sfjp.mikutoga.pmd.parser.PmdRigidHandler;

 
 /**
  * 剛体関係の通知をパーサから受け取る。
 
 /**
  * 剛体関係の通知をパーサから受け取る。


@@ -66,7 +66,7 @@ class RigidBuilder implements PmdRigidHandler {
 
         ListUtil.prepareDefConsList(this.rigidGroupList,
                                     RigidGroup.class,
 
         ListUtil.prepareDefConsList(this.rigidGroupList,
                                     RigidGroup.class,

-                                    PmdLimits.RIGIDGROUP_FIXEDNUM );
+                                    PmdConst.RIGIDGROUP_FIXEDNUM );

         ListUtil.assignIndexedSerial(this.rigidGroupList);
 
         return;
         ListUtil.assignIndexedSerial(this.rigidGroupList);
 
         return;


@@ -212,7 +212,7 @@ class RigidBuilder implements PmdRigidHandler {
         RigidBehaviorType type = RigidBehaviorType.decode(behaveType);
         this.currentRigid.setBehaviorType(type);
 
         RigidBehaviorType type = RigidBehaviorType.decode(behaveType);
         this.currentRigid.setBehaviorType(type);
 

-        for(int bitPos = 0; bitPos < PmdLimits.RIGIDGROUP_FIXEDNUM; bitPos++){
+        for(int bitPos = 0; bitPos < PmdConst.RIGIDGROUP_FIXEDNUM; bitPos++){

             short mask = 0x0001;
             mask <<= bitPos;
             if((collisionMap & mask) == 0){
             short mask = 0x0001;
             mask <<= bitPos;
             if((collisionMap & mask) == 0){