From: Olyutorskii Date: Tue, 23 Aug 2011 14:00:21 +0000 (+0900) Subject: [no commit message] X-Git-Tag: fromMercurial~58 X-Git-Url: http://git.osdn.net/view?p=mikutoga%2FTogaGem.git;a=commitdiff_plain;h=b8a721a08069c4f7d2b680fbb05746b42e113af9 [no commit message] --- diff --git a/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdBasicHandler.java b/src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdBasicHandler.java similarity index 97% rename from src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdBasicHandler.java rename to src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdBasicHandler.java index 4e43921..77dcbd7 100644 --- a/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdBasicHandler.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdBasicHandler.java @@ -5,7 +5,7 @@ * Copyright(c) 2010 MikuToga Partners */ -package jp.sourceforge.mikutoga.parser.pmd; +package jp.sourceforge.mikutoga.pmd.parser; import jp.sourceforge.mikutoga.parser.MmdFormatException; diff --git a/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdBoneHandler.java b/src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdBoneHandler.java similarity index 99% rename from src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdBoneHandler.java rename to src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdBoneHandler.java index 45c7d71..97451ac 100644 --- a/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdBoneHandler.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdBoneHandler.java @@ -5,7 +5,7 @@ * Copyright(c) 2010 MikuToga Partners */ -package jp.sourceforge.mikutoga.parser.pmd; +package jp.sourceforge.mikutoga.pmd.parser; import jp.sourceforge.mikutoga.parser.LoopHandler; import jp.sourceforge.mikutoga.parser.MmdFormatException; diff --git a/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdEngHandler.java b/src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdEngHandler.java similarity index 98% rename from src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdEngHandler.java rename to src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdEngHandler.java index 2a14f4b..4883884 100644 --- a/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdEngHandler.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdEngHandler.java @@ -5,7 +5,7 @@ * Copyright(c) 2010 MikuToga Partners */ -package jp.sourceforge.mikutoga.parser.pmd; +package jp.sourceforge.mikutoga.pmd.parser; import jp.sourceforge.mikutoga.parser.LoopHandler; import jp.sourceforge.mikutoga.parser.MmdFormatException; diff --git a/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdJointHandler.java b/src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdJointHandler.java similarity index 99% rename from src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdJointHandler.java rename to src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdJointHandler.java index 74d5216..64b139f 100644 --- a/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdJointHandler.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdJointHandler.java @@ -5,7 +5,7 @@ * Copyright(c) 2010 MikuToga Partners */ -package jp.sourceforge.mikutoga.parser.pmd; +package jp.sourceforge.mikutoga.pmd.parser; import jp.sourceforge.mikutoga.parser.LoopHandler; import jp.sourceforge.mikutoga.parser.MmdFormatException; diff --git a/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdLimits.java b/src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdLimits.java similarity index 97% rename from src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdLimits.java rename to src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdLimits.java index 9f875de..e96a63c 100644 --- a/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdLimits.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdLimits.java @@ -5,7 +5,7 @@ * Copyright(c) 2010 MikuToga Partners */ -package jp.sourceforge.mikutoga.parser.pmd; +package jp.sourceforge.mikutoga.pmd.parser; /** * PMDファイルフォーマットの各種リミット値その他定数。 diff --git a/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdMaterialHandler.java b/src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdMaterialHandler.java similarity index 98% rename from src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdMaterialHandler.java rename to src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdMaterialHandler.java index 19ed5de..b8f21e8 100644 --- a/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdMaterialHandler.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdMaterialHandler.java @@ -5,7 +5,7 @@ * Copyright(c) 2010 MikuToga Partners */ -package jp.sourceforge.mikutoga.parser.pmd; +package jp.sourceforge.mikutoga.pmd.parser; import jp.sourceforge.mikutoga.parser.LoopHandler; import jp.sourceforge.mikutoga.parser.MmdFormatException; diff --git a/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdMorphHandler.java b/src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdMorphHandler.java similarity index 98% rename from src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdMorphHandler.java rename to src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdMorphHandler.java index df12b87..d0836b0 100644 --- a/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdMorphHandler.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdMorphHandler.java @@ -5,7 +5,7 @@ * Copyright(c) 2010 MikuToga Partners */ -package jp.sourceforge.mikutoga.parser.pmd; +package jp.sourceforge.mikutoga.pmd.parser; import jp.sourceforge.mikutoga.parser.LoopHandler; import jp.sourceforge.mikutoga.parser.MmdFormatException; diff --git a/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdParser.java b/src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdParser.java similarity index 93% rename from src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdParser.java rename to src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdParser.java index 5889b72..423f4f6 100644 --- a/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdParser.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdParser.java @@ -5,7 +5,7 @@ * Copyright(c) 2010 MikuToga Partners */ -package jp.sourceforge.mikutoga.parser.pmd; +package jp.sourceforge.mikutoga.pmd.parser; import jp.sourceforge.mikutoga.parser.MmdSource; diff --git a/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdParserBase.java b/src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdParserBase.java similarity index 99% rename from src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdParserBase.java rename to src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdParserBase.java index fab5682..1bf7f97 100644 --- a/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdParserBase.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdParserBase.java @@ -5,7 +5,7 @@ * Copyright(c) 2010 MikuToga Partners */ -package jp.sourceforge.mikutoga.parser.pmd; +package jp.sourceforge.mikutoga.pmd.parser; import java.io.IOException; import jp.sourceforge.mikutoga.parser.CommonParser; diff --git a/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdParserExt1.java b/src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdParserExt1.java similarity index 99% rename from src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdParserExt1.java rename to src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdParserExt1.java index 8368ab7..c1b8172 100644 --- a/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdParserExt1.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdParserExt1.java @@ -5,7 +5,7 @@ * Copyright(c) 2010 MikuToga Partners */ -package jp.sourceforge.mikutoga.parser.pmd; +package jp.sourceforge.mikutoga.pmd.parser; import java.io.IOException; import jp.sourceforge.mikutoga.parser.MmdFormatException; diff --git a/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdParserExt2.java b/src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdParserExt2.java similarity index 97% rename from src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdParserExt2.java rename to src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdParserExt2.java index b87fb95..9ac7d4c 100644 --- a/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdParserExt2.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdParserExt2.java @@ -5,7 +5,7 @@ * Copyright(c) 2010 MikuToga Partners */ -package jp.sourceforge.mikutoga.parser.pmd; +package jp.sourceforge.mikutoga.pmd.parser; import java.io.IOException; import jp.sourceforge.mikutoga.parser.MmdFormatException; diff --git a/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdParserExt3.java b/src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdParserExt3.java similarity index 99% rename from src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdParserExt3.java rename to src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdParserExt3.java index 2e5df35..0a420ae 100644 --- a/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdParserExt3.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdParserExt3.java @@ -5,7 +5,7 @@ * Copyright(c) 2010 MikuToga Partners */ -package jp.sourceforge.mikutoga.parser.pmd; +package jp.sourceforge.mikutoga.pmd.parser; import java.io.IOException; import jp.sourceforge.mikutoga.parser.MmdFormatException; diff --git a/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdRigidHandler.java b/src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdRigidHandler.java similarity index 98% rename from src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdRigidHandler.java rename to src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdRigidHandler.java index c3ca64e..19cfad8 100644 --- a/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdRigidHandler.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdRigidHandler.java @@ -5,7 +5,7 @@ * Copyright(c) 2010 MikuToga Partners */ -package jp.sourceforge.mikutoga.parser.pmd; +package jp.sourceforge.mikutoga.pmd.parser; import jp.sourceforge.mikutoga.parser.LoopHandler; import jp.sourceforge.mikutoga.parser.MmdFormatException; diff --git a/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdShapeHandler.java b/src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdShapeHandler.java similarity index 98% rename from src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdShapeHandler.java rename to src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdShapeHandler.java index 0963ef5..06b92e0 100644 --- a/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdShapeHandler.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdShapeHandler.java @@ -5,7 +5,7 @@ * Copyright(c) 2010 MikuToga Partners */ -package jp.sourceforge.mikutoga.parser.pmd; +package jp.sourceforge.mikutoga.pmd.parser; import jp.sourceforge.mikutoga.parser.LoopHandler; import jp.sourceforge.mikutoga.parser.MmdFormatException; diff --git a/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdToonHandler.java b/src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdToonHandler.java similarity index 95% rename from src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdToonHandler.java rename to src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdToonHandler.java index 2bebba3..dca87cb 100644 --- a/src/main/java/jp/sourceforge/mikutoga/parser/pmd/PmdToonHandler.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/parser/PmdToonHandler.java @@ -5,7 +5,7 @@ * Copyright(c) 2010 MikuToga Partners */ -package jp.sourceforge.mikutoga.parser.pmd; +package jp.sourceforge.mikutoga.pmd.parser; import jp.sourceforge.mikutoga.parser.LoopHandler; import jp.sourceforge.mikutoga.parser.MmdFormatException; diff --git a/src/main/java/jp/sourceforge/mikutoga/parser/pmd/package-info.java b/src/main/java/jp/sourceforge/mikutoga/pmd/parser/package-info.java similarity index 81% rename from src/main/java/jp/sourceforge/mikutoga/parser/pmd/package-info.java rename to src/main/java/jp/sourceforge/mikutoga/pmd/parser/package-info.java index 0b08cc3..708350e 100644 --- a/src/main/java/jp/sourceforge/mikutoga/parser/pmd/package-info.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/parser/package-info.java @@ -9,6 +9,6 @@ * PMDモデルファイル用パーサライブラリ。 */ -package jp.sourceforge.mikutoga.parser.pmd; +package jp.sourceforge.mikutoga.pmd.parser; /* EOF */ diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/PmdExporterBase.java b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/PmdExporterBase.java index 792d358..f076253 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/PmdExporterBase.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/PmdExporterBase.java @@ -16,7 +16,6 @@ import java.util.List; import java.util.Map; import java.util.Set; import jp.sourceforge.mikutoga.corelib.SerialNumbered; -import jp.sourceforge.mikutoga.parser.pmd.PmdLimits; import jp.sourceforge.mikutoga.pmd.BoneType; import jp.sourceforge.mikutoga.pmd.MorphType; import jp.sourceforge.mikutoga.pmd.Pos2d; @@ -32,6 +31,7 @@ import jp.sourceforge.mikutoga.pmd.model.PmdModel; import jp.sourceforge.mikutoga.pmd.model.ShadeInfo; import jp.sourceforge.mikutoga.pmd.model.Surface; import jp.sourceforge.mikutoga.pmd.model.Vertex; +import jp.sourceforge.mikutoga.pmd.parser.PmdLimits; /** * PMDファイルのエクスポーター(拡張無し基本フォーマット)。 diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/PmdExporterExt1.java b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/PmdExporterExt1.java index 4697d7f..b8a1d90 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/PmdExporterExt1.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/PmdExporterExt1.java @@ -11,12 +11,12 @@ import java.io.IOException; import java.io.OutputStream; import java.util.List; import java.util.Map; -import jp.sourceforge.mikutoga.parser.pmd.PmdLimits; import jp.sourceforge.mikutoga.pmd.MorphType; import jp.sourceforge.mikutoga.pmd.model.BoneGroup; import jp.sourceforge.mikutoga.pmd.model.BoneInfo; import jp.sourceforge.mikutoga.pmd.model.MorphPart; import jp.sourceforge.mikutoga.pmd.model.PmdModel; +import jp.sourceforge.mikutoga.pmd.parser.PmdLimits; /** * PMDファイルのエクスポーター(拡張1:英名対応)。 diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/PmdExporterExt2.java b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/PmdExporterExt2.java index f129848..6ffc330 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/PmdExporterExt2.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/PmdExporterExt2.java @@ -9,9 +9,9 @@ package jp.sourceforge.mikutoga.pmd.pmdexporter; import java.io.IOException; import java.io.OutputStream; -import jp.sourceforge.mikutoga.parser.pmd.PmdLimits; import jp.sourceforge.mikutoga.pmd.model.PmdModel; import jp.sourceforge.mikutoga.pmd.model.ToonMap; +import jp.sourceforge.mikutoga.pmd.parser.PmdLimits; /** * PMDファイルのエクスポーター(拡張2:任意のトゥーンファイル名対応)。 diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/PmdExporterExt3.java b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/PmdExporterExt3.java index 1c92d25..daf75d2 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/PmdExporterExt3.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/PmdExporterExt3.java @@ -10,7 +10,6 @@ package jp.sourceforge.mikutoga.pmd.pmdexporter; import java.io.IOException; import java.io.OutputStream; import java.util.List; -import jp.sourceforge.mikutoga.parser.pmd.PmdLimits; import jp.sourceforge.mikutoga.pmd.Deg3d; import jp.sourceforge.mikutoga.pmd.Rad3d; import jp.sourceforge.mikutoga.pmd.RigidShapeType; @@ -22,6 +21,7 @@ import jp.sourceforge.mikutoga.pmd.model.PmdModel; import jp.sourceforge.mikutoga.pmd.model.RigidGroup; import jp.sourceforge.mikutoga.pmd.model.RigidInfo; import jp.sourceforge.mikutoga.pmd.model.RigidShape; +import jp.sourceforge.mikutoga.pmd.parser.PmdLimits; /** * PMDファイルのエクスポーター(拡張3:物理演算対応)。 diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/BoneBuilder.java b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/BoneBuilder.java index c2a5181..9722683 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/BoneBuilder.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/BoneBuilder.java @@ -12,14 +12,14 @@ import java.util.LinkedList; import java.util.List; import jp.sourceforge.mikutoga.corelib.ListUtil; import jp.sourceforge.mikutoga.parser.ParseStage; -import jp.sourceforge.mikutoga.parser.pmd.PmdBoneHandler; -import jp.sourceforge.mikutoga.parser.pmd.PmdLimits; import jp.sourceforge.mikutoga.pmd.BoneType; import jp.sourceforge.mikutoga.pmd.Pos3d; import jp.sourceforge.mikutoga.pmd.model.BoneGroup; import jp.sourceforge.mikutoga.pmd.model.BoneInfo; import jp.sourceforge.mikutoga.pmd.model.IKChain; import jp.sourceforge.mikutoga.pmd.model.PmdModel; +import jp.sourceforge.mikutoga.pmd.parser.PmdBoneHandler; +import jp.sourceforge.mikutoga.pmd.parser.PmdLimits; /** * ボーン関係の通知をパーサから受け取る。 diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/JointBuilder.java b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/JointBuilder.java index 8185381..0d65342 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/JointBuilder.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/JointBuilder.java @@ -11,7 +11,6 @@ import java.util.Iterator; import java.util.List; import jp.sourceforge.mikutoga.corelib.ListUtil; import jp.sourceforge.mikutoga.parser.ParseStage; -import jp.sourceforge.mikutoga.parser.pmd.PmdJointHandler; import jp.sourceforge.mikutoga.pmd.Deg3d; import jp.sourceforge.mikutoga.pmd.Pos3d; import jp.sourceforge.mikutoga.pmd.Rad3d; @@ -19,6 +18,7 @@ import jp.sourceforge.mikutoga.pmd.TripletRange; import jp.sourceforge.mikutoga.pmd.model.JointInfo; import jp.sourceforge.mikutoga.pmd.model.PmdModel; import jp.sourceforge.mikutoga.pmd.model.RigidInfo; +import jp.sourceforge.mikutoga.pmd.parser.PmdJointHandler; /** * ジョイント関係の通知をパーサから受け取る。 diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/MaterialBuilder.java b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/MaterialBuilder.java index 42ade37..bdc5e5a 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/MaterialBuilder.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/MaterialBuilder.java @@ -12,12 +12,12 @@ import java.util.Iterator; import java.util.List; import jp.sourceforge.mikutoga.corelib.ListUtil; import jp.sourceforge.mikutoga.parser.ParseStage; -import jp.sourceforge.mikutoga.parser.pmd.PmdMaterialHandler; import jp.sourceforge.mikutoga.pmd.model.Material; import jp.sourceforge.mikutoga.pmd.model.PmdModel; import jp.sourceforge.mikutoga.pmd.model.ShadeInfo; import jp.sourceforge.mikutoga.pmd.model.Surface; import jp.sourceforge.mikutoga.pmd.model.ToonMap; +import jp.sourceforge.mikutoga.pmd.parser.PmdMaterialHandler; /** * マテリアル素材関連の通知をパーサから受け取る。 diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/MorphBuilder.java b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/MorphBuilder.java index 8406077..e2b57cf 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/MorphBuilder.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/MorphBuilder.java @@ -14,13 +14,13 @@ import java.util.List; import java.util.Map; import jp.sourceforge.mikutoga.corelib.ListUtil; import jp.sourceforge.mikutoga.parser.ParseStage; -import jp.sourceforge.mikutoga.parser.pmd.PmdMorphHandler; import jp.sourceforge.mikutoga.pmd.MorphType; import jp.sourceforge.mikutoga.pmd.Pos3d; import jp.sourceforge.mikutoga.pmd.model.MorphPart; import jp.sourceforge.mikutoga.pmd.model.MorphVertex; import jp.sourceforge.mikutoga.pmd.model.PmdModel; import jp.sourceforge.mikutoga.pmd.model.Vertex; +import jp.sourceforge.mikutoga.pmd.parser.PmdMorphHandler; /** * モーフ関係の通知をパーサから受け取る。 diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/PmdLoader.java b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/PmdLoader.java index 6a0410d..d11fd10 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/PmdLoader.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/PmdLoader.java @@ -12,9 +12,9 @@ import java.util.ArrayList; import java.util.List; import jp.sourceforge.mikutoga.parser.MmdFormatException; import jp.sourceforge.mikutoga.parser.MmdSource; -import jp.sourceforge.mikutoga.parser.pmd.PmdParser; import jp.sourceforge.mikutoga.pmd.model.MorphPart; import jp.sourceforge.mikutoga.pmd.model.PmdModel; +import jp.sourceforge.mikutoga.pmd.parser.PmdParser; /** * PMDモデルファイルを読み込むためのローダ。 diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/RigidBuilder.java b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/RigidBuilder.java index efc987a..0e03f7c 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/RigidBuilder.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/RigidBuilder.java @@ -11,8 +11,6 @@ import java.util.Iterator; import java.util.List; import jp.sourceforge.mikutoga.corelib.ListUtil; import jp.sourceforge.mikutoga.parser.ParseStage; -import jp.sourceforge.mikutoga.parser.pmd.PmdLimits; -import jp.sourceforge.mikutoga.parser.pmd.PmdRigidHandler; import jp.sourceforge.mikutoga.pmd.Pos3d; import jp.sourceforge.mikutoga.pmd.Rad3d; import jp.sourceforge.mikutoga.pmd.RigidBehaviorType; @@ -23,6 +21,8 @@ import jp.sourceforge.mikutoga.pmd.model.PmdModel; import jp.sourceforge.mikutoga.pmd.model.RigidGroup; import jp.sourceforge.mikutoga.pmd.model.RigidInfo; import jp.sourceforge.mikutoga.pmd.model.RigidShape; +import jp.sourceforge.mikutoga.pmd.parser.PmdLimits; +import jp.sourceforge.mikutoga.pmd.parser.PmdRigidHandler; /** * 剛体関係の通知をパーサから受け取る。 diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/ShapeBuilder.java b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/ShapeBuilder.java index 6e0261e..e74bfc0 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/ShapeBuilder.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/ShapeBuilder.java @@ -12,7 +12,6 @@ import java.util.List; import java.util.RandomAccess; import jp.sourceforge.mikutoga.corelib.ListUtil; import jp.sourceforge.mikutoga.parser.ParseStage; -import jp.sourceforge.mikutoga.parser.pmd.PmdShapeHandler; import jp.sourceforge.mikutoga.pmd.Pos2d; import jp.sourceforge.mikutoga.pmd.Pos3d; import jp.sourceforge.mikutoga.pmd.Vec3d; @@ -20,6 +19,7 @@ import jp.sourceforge.mikutoga.pmd.model.BoneInfo; import jp.sourceforge.mikutoga.pmd.model.PmdModel; import jp.sourceforge.mikutoga.pmd.model.Surface; import jp.sourceforge.mikutoga.pmd.model.Vertex; +import jp.sourceforge.mikutoga.pmd.parser.PmdShapeHandler; /** * モデル形状に関する通知をパーサから受け取る。 diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/TextBuilder.java b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/TextBuilder.java index 2eecbeb..dd532d2 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/TextBuilder.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/TextBuilder.java @@ -11,12 +11,12 @@ import java.util.Iterator; import java.util.List; import jp.sourceforge.mikutoga.corelib.I18nText; import jp.sourceforge.mikutoga.parser.ParseStage; -import jp.sourceforge.mikutoga.parser.pmd.PmdBasicHandler; -import jp.sourceforge.mikutoga.parser.pmd.PmdEngHandler; import jp.sourceforge.mikutoga.pmd.model.BoneGroup; import jp.sourceforge.mikutoga.pmd.model.BoneInfo; import jp.sourceforge.mikutoga.pmd.model.MorphPart; import jp.sourceforge.mikutoga.pmd.model.PmdModel; +import jp.sourceforge.mikutoga.pmd.parser.PmdBasicHandler; +import jp.sourceforge.mikutoga.pmd.parser.PmdEngHandler; /** * テキスト関係の通知をパーサから受け取る。 diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/ToonBuilder.java b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/ToonBuilder.java index a855025..f5ddb0f 100644 --- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/ToonBuilder.java +++ b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/ToonBuilder.java @@ -8,10 +8,10 @@ package jp.sourceforge.mikutoga.pmd.pmdloader; import jp.sourceforge.mikutoga.parser.ParseStage; -import jp.sourceforge.mikutoga.parser.pmd.PmdLimits; -import jp.sourceforge.mikutoga.parser.pmd.PmdToonHandler; import jp.sourceforge.mikutoga.pmd.model.PmdModel; import jp.sourceforge.mikutoga.pmd.model.ToonMap; +import jp.sourceforge.mikutoga.pmd.parser.PmdLimits; +import jp.sourceforge.mikutoga.pmd.parser.PmdToonHandler; /** * トゥーン関係の通知をパーサから受け取る。 diff --git a/src/test/java/sample/pmd/DummyHandler.java b/src/test/java/sample/pmd/DummyHandler.java index dc1d774..45f1df0 100644 --- a/src/test/java/sample/pmd/DummyHandler.java +++ b/src/test/java/sample/pmd/DummyHandler.java @@ -8,15 +8,15 @@ package sample.pmd; import jp.sourceforge.mikutoga.parser.ParseStage; -import jp.sourceforge.mikutoga.parser.pmd.PmdBasicHandler; -import jp.sourceforge.mikutoga.parser.pmd.PmdBoneHandler; -import jp.sourceforge.mikutoga.parser.pmd.PmdEngHandler; -import jp.sourceforge.mikutoga.parser.pmd.PmdJointHandler; -import jp.sourceforge.mikutoga.parser.pmd.PmdMaterialHandler; -import jp.sourceforge.mikutoga.parser.pmd.PmdMorphHandler; -import jp.sourceforge.mikutoga.parser.pmd.PmdRigidHandler; -import jp.sourceforge.mikutoga.parser.pmd.PmdShapeHandler; -import jp.sourceforge.mikutoga.parser.pmd.PmdToonHandler; +import jp.sourceforge.mikutoga.pmd.parser.PmdBasicHandler; +import jp.sourceforge.mikutoga.pmd.parser.PmdBoneHandler; +import jp.sourceforge.mikutoga.pmd.parser.PmdEngHandler; +import jp.sourceforge.mikutoga.pmd.parser.PmdJointHandler; +import jp.sourceforge.mikutoga.pmd.parser.PmdMaterialHandler; +import jp.sourceforge.mikutoga.pmd.parser.PmdMorphHandler; +import jp.sourceforge.mikutoga.pmd.parser.PmdRigidHandler; +import jp.sourceforge.mikutoga.pmd.parser.PmdShapeHandler; +import jp.sourceforge.mikutoga.pmd.parser.PmdToonHandler; /** * サンプルのハンドラ。 diff --git a/src/test/java/sample/pmd/DummyMain.java b/src/test/java/sample/pmd/DummyMain.java index d890279..2f5762d 100644 --- a/src/test/java/sample/pmd/DummyMain.java +++ b/src/test/java/sample/pmd/DummyMain.java @@ -15,7 +15,7 @@ import java.io.IOException; import java.io.InputStream; import jp.sourceforge.mikutoga.parser.MmdFormatException; import jp.sourceforge.mikutoga.parser.MmdSource; -import jp.sourceforge.mikutoga.parser.pmd.PmdParser; +import jp.sourceforge.mikutoga.pmd.parser.PmdParser; /** * パーサ利用のサンプルプログラム。