From 76042538efc2e40781b7cb25233749410dbe4695 Mon Sep 17 00:00:00 2001
From: Olyutorskii <olyutorskii@users.osdn.me>
Date: Wed, 17 Apr 2013 23:10:15 +0900
Subject: [PATCH] =?utf8?q?=E3=82=B3=E3=83=BC=E3=83=AB=E3=83=90=E3=83=83?=
 =?utf8?q?=E3=82=AF=E5=91=BC=E3=81=B3=E5=87=BA=E3=81=97=E9=A0=86=E5=A4=89?=
 =?utf8?q?=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.txt                                      |  5 ++--
 .../mikutoga/pmd/parser/PmdParserBase.java         | 28 +++++++++++-----------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 99bbfa4..74653fe 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -5,9 +5,10 @@ TogaGem 変更履歴
 
 
 X.XXX.X (20XX-XX-XX)
-    ・逆正接の分母に小さな値が来たときの判定を甘くした。
     ・パッケージ構成を変更。
-    ・多言語対応に際してのフォールバックを禁止。
+    ・ジンバルロック判定を甘くした。
+    ・多言語対応に際してデフォルトロケールへのフォールバックを禁止。
+    ・コールバックpmdIKInfo()がpmdIKChainInfo()より先に呼ばれるよう変更。
 
 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
--- 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);
 
-            int boneId1 = parseLeUShortAsInt();
-            int boneId2 = parseLeUShortAsInt();
+            int boneId1     = parseLeUShortAsInt();
+            int boneId2     = parseLeUShortAsInt();
             int weightForB1 = parseUByteAsInt();
             this.shapeHandler.pmdVertexWeight(boneId1, boneId2, weightForB1);
 
@@ -379,7 +379,7 @@ public class PmdParserBase extends CommonParser {
             parseColor();
 
             int toonidx = parseUByteAsInt();
-            boolean hasEdge = parseBoolean();
+            boolean hasEdge  = parseBoolean();
             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);
-            int parentId = parseLeUShortAsInt();
-            int tailId = parseLeUShortAsInt();
+            int parentId  = parseLeUShortAsInt();
+            int tailId    = parseLeUShortAsInt();
             byte boneKind = parseByte();
-            int srcId = parseLeUShortAsInt();
+            int srcId     = parseLeUShortAsInt();
 
             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++){
-            int boneId = parseLeUShortAsInt();
-            int targetId = parseLeUShortAsInt();
+            int boneId      = parseLeUShortAsInt();
+            int targetId    = parseLeUShortAsInt();
             int chainLength = parseUByteAsInt();
-            int depth = parseLeUShortAsInt();
-            float weight = parseLeFloat();
-
-            parseIKChainList(chainLength);
+            int depth       = parseLeUShortAsInt();
+            float weight    = parseLeFloat();
 
             this.boneHandler.pmdIKInfo(boneId, targetId, depth, weight);
 
+            parseIKChainList(chainLength);
+
             this.boneHandler.loopNext(PmdBoneHandler.IK_LIST);
         }
 
@@ -536,7 +536,7 @@ public class PmdParserBase extends CommonParser {
             String morphName =
                     parsePmdText(PmdLimits.MAXBYTES_MORPHNAME);
             int vertexCount = parseLeInt();
-            byte morphType = parseByte();
+            byte morphType  = parseByte();
 
             this.morphHandler.pmdMorphInfo(morphName, morphType);
 
@@ -639,7 +639,7 @@ public class PmdParserBase extends CommonParser {
                                    groupedBoneCount);
 
         for(int ct = 0; ct < groupedBoneCount; ct++){
-            int boneId = parseLeUShortAsInt();
+            int boneId  = parseLeUShortAsInt();
             int groupId = parseUByteAsInt();
             this.boneHandler.pmdGroupedBoneInfo(boneId, groupId);
 
-- 
2.11.0