コールバック呼び出し順変更

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 99bbfa4..74653fe 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -5,9 +5,10 @@ TogaGem 変更履歴
 
 
 X.XXX.X (20XX-XX-XX)
 
 
 X.XXX.X (20XX-XX-XX)

-    ・逆正接の分母に小さな値が来たときの判定を甘くした。

     ・パッケージ構成を変更。
     ・パッケージ構成を変更。

-    ・多言語対応に際してのフォールバックを禁止。
+    ・ジンバルロック判定を甘くした。
+    ・多言語対応に際してデフォルトロケールへのフォールバックを禁止。
+    ・コールバックpmdIKInfo()がpmdIKChainInfo()より先に呼ばれるよう変更。

 
 2.102.2 (2013-03-17)
     ・Maven3対応。
 
 2.102.2 (2013-03-17)
     ・Maven3対応。

diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdParserBase.java b/src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdParserBase.java
index 7b6e6fb..8ffb03c 100644 (file)
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdParserBase.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdParserBase.java
@@ -321,8 +321,8 @@ public class PmdParserBase extends CommonParser {
             float vVal = parseLeFloat();
             this.shapeHandler.pmdVertexUV(uVal, vVal);
 
             float vVal = parseLeFloat();
             this.shapeHandler.pmdVertexUV(uVal, vVal);
 

-            int boneId1 = parseLeUShortAsInt();
-            int boneId2 = parseLeUShortAsInt();
+            int boneId1     = parseLeUShortAsInt();
+            int boneId2     = parseLeUShortAsInt();

             int weightForB1 = parseUByteAsInt();
             this.shapeHandler.pmdVertexWeight(boneId1, boneId2, weightForB1);
 
             int weightForB1 = parseUByteAsInt();
             this.shapeHandler.pmdVertexWeight(boneId1, boneId2, weightForB1);
 


@@ -379,7 +379,7 @@ public class PmdParserBase extends CommonParser {
             parseColor();
 
             int toonidx = parseUByteAsInt();
             parseColor();
 
             int toonidx = parseUByteAsInt();

-            boolean hasEdge = parseBoolean();
+            boolean hasEdge  = parseBoolean();

             int surfaceCount = parseLeInt();
 
             String shadingFile =
             int surfaceCount = parseLeInt();
 
             String shadingFile =


@@ -447,10 +447,10 @@ public class PmdParserBase extends CommonParser {
         for(int ct = 0; ct < this.boneCount; ct++){
             String boneName =
                     parsePmdText(PmdLimits.MAXBYTES_BONENAME);
         for(int ct = 0; ct < this.boneCount; ct++){
             String boneName =
                     parsePmdText(PmdLimits.MAXBYTES_BONENAME);

-            int parentId = parseLeUShortAsInt();
-            int tailId = parseLeUShortAsInt();
+            int parentId  = parseLeUShortAsInt();
+            int tailId    = parseLeUShortAsInt();

             byte boneKind = parseByte();
             byte boneKind = parseByte();

-            int srcId = parseLeUShortAsInt();
+            int srcId     = parseLeUShortAsInt();

 
             this.boneHandler.pmdBoneInfo(boneName, boneKind);
             this.boneHandler.pmdBoneLink(parentId, tailId, srcId);
 
             this.boneHandler.pmdBoneInfo(boneName, boneKind);
             this.boneHandler.pmdBoneLink(parentId, tailId, srcId);


@@ -480,16 +480,16 @@ public class PmdParserBase extends CommonParser {
         this.boneHandler.loopStart(PmdBoneHandler.IK_LIST, ikCount);
 
         for(int ct = 0; ct < ikCount; ct++){
         this.boneHandler.loopStart(PmdBoneHandler.IK_LIST, ikCount);
 
         for(int ct = 0; ct < ikCount; ct++){

-            int boneId = parseLeUShortAsInt();
-            int targetId = parseLeUShortAsInt();
+            int boneId      = parseLeUShortAsInt();
+            int targetId    = parseLeUShortAsInt();

             int chainLength = parseUByteAsInt();
             int chainLength = parseUByteAsInt();

-            int depth = parseLeUShortAsInt();
-            float weight = parseLeFloat();
-
-            parseIKChainList(chainLength);
+            int depth       = parseLeUShortAsInt();
+            float weight    = parseLeFloat();

 
             this.boneHandler.pmdIKInfo(boneId, targetId, depth, weight);
 
 
             this.boneHandler.pmdIKInfo(boneId, targetId, depth, weight);
 

+            parseIKChainList(chainLength);
+

             this.boneHandler.loopNext(PmdBoneHandler.IK_LIST);
         }
 
             this.boneHandler.loopNext(PmdBoneHandler.IK_LIST);
         }
 


@@ -536,7 +536,7 @@ public class PmdParserBase extends CommonParser {
             String morphName =
                     parsePmdText(PmdLimits.MAXBYTES_MORPHNAME);
             int vertexCount = parseLeInt();
             String morphName =
                     parsePmdText(PmdLimits.MAXBYTES_MORPHNAME);
             int vertexCount = parseLeInt();

-            byte morphType = parseByte();
+            byte morphType  = parseByte();

 
             this.morphHandler.pmdMorphInfo(morphName, morphType);
 
 
             this.morphHandler.pmdMorphInfo(morphName, morphType);
 


@@ -639,7 +639,7 @@ public class PmdParserBase extends CommonParser {
                                    groupedBoneCount);
 
         for(int ct = 0; ct < groupedBoneCount; ct++){
                                    groupedBoneCount);
 
         for(int ct = 0; ct < groupedBoneCount; ct++){

-            int boneId = parseLeUShortAsInt();
+            int boneId  = parseLeUShortAsInt();

             int groupId = parseUByteAsInt();
             this.boneHandler.pmdGroupedBoneInfo(boneId, groupId);
 
             int groupId = parseUByteAsInt();
             this.boneHandler.pmdGroupedBoneInfo(boneId, groupId);