From: Olyutorskii <olyutorskii@users.osdn.me>
Date: Tue, 23 Aug 2011 13:54:04 +0000 (+0900)
Subject: [no commit message]
X-Git-Tag: fromMercurial~59
X-Git-Url: http://git.osdn.net/view?p=mikutoga%2FTogaGem.git;a=commitdiff_plain;h=2e74d5bab58efff35cf87efa12e8b6621eb408a9

[no commit message]
---

diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/BoneGroup.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/BoneGroup.java
similarity index 98%
rename from src/main/java/jp/sourceforge/mikutoga/pmd/BoneGroup.java
rename to src/main/java/jp/sourceforge/mikutoga/pmd/model/BoneGroup.java
index 8fb3520..a9688e6 100644
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/BoneGroup.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/BoneGroup.java
@@ -5,7 +5,7 @@
  * Copyright(c) 2010 MikuToga Partners
  */
 
-package jp.sourceforge.mikutoga.pmd;
+package jp.sourceforge.mikutoga.pmd.model;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/BoneInfo.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/BoneInfo.java
similarity index 97%
rename from src/main/java/jp/sourceforge/mikutoga/pmd/BoneInfo.java
rename to src/main/java/jp/sourceforge/mikutoga/pmd/model/BoneInfo.java
index e8f2882..987a27b 100644
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/BoneInfo.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/BoneInfo.java
@@ -5,10 +5,12 @@
  * Copyright(c) 2010 MikuToga Partners
  */
 
-package jp.sourceforge.mikutoga.pmd;
+package jp.sourceforge.mikutoga.pmd.model;
 
 import jp.sourceforge.mikutoga.corelib.I18nText;
 import jp.sourceforge.mikutoga.corelib.SerialNumbered;
+import jp.sourceforge.mikutoga.pmd.BoneType;
+import jp.sourceforge.mikutoga.pmd.Pos3d;
 
 /**
  * ボーン情報。
diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/DynamicsInfo.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/DynamicsInfo.java
similarity index 98%
rename from src/main/java/jp/sourceforge/mikutoga/pmd/DynamicsInfo.java
rename to src/main/java/jp/sourceforge/mikutoga/pmd/model/DynamicsInfo.java
index 82538d2..6b6f68e 100644
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/DynamicsInfo.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/DynamicsInfo.java
@@ -5,7 +5,7 @@
  * Copyright(c) 2010 MikuToga Partners
  */
 
-package jp.sourceforge.mikutoga.pmd;
+package jp.sourceforge.mikutoga.pmd.model;
 
 /**
  * 剛体間力学演算の各種パラメータ。
diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/IKChain.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/IKChain.java
similarity index 96%
rename from src/main/java/jp/sourceforge/mikutoga/pmd/IKChain.java
rename to src/main/java/jp/sourceforge/mikutoga/pmd/model/IKChain.java
index 9ca055c..ece4d56 100644
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/IKChain.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/IKChain.java
@@ -5,8 +5,9 @@
  * Copyright(c) 2010 MikuToga Partners
  */
 
-package jp.sourceforge.mikutoga.pmd;
+package jp.sourceforge.mikutoga.pmd.model;
 
+import jp.sourceforge.mikutoga.pmd.model.BoneInfo;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/JointInfo.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/JointInfo.java
similarity index 94%
rename from src/main/java/jp/sourceforge/mikutoga/pmd/JointInfo.java
rename to src/main/java/jp/sourceforge/mikutoga/pmd/model/JointInfo.java
index 10c6090..76f9f8d 100644
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/JointInfo.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/JointInfo.java
@@ -5,9 +5,13 @@
  * Copyright(c) 2010 MikuToga Partners
  */
 
-package jp.sourceforge.mikutoga.pmd;
+package jp.sourceforge.mikutoga.pmd.model;
 
 import jp.sourceforge.mikutoga.corelib.I18nText;
+import jp.sourceforge.mikutoga.pmd.Deg3d;
+import jp.sourceforge.mikutoga.pmd.Pos3d;
+import jp.sourceforge.mikutoga.pmd.Rad3d;
+import jp.sourceforge.mikutoga.pmd.TripletRange;
 
 /**
  * 剛体間ジョイント情報。
diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/Material.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/Material.java
similarity index 99%
rename from src/main/java/jp/sourceforge/mikutoga/pmd/Material.java
rename to src/main/java/jp/sourceforge/mikutoga/pmd/model/Material.java
index 17b1f48..4431227 100644
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/Material.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/Material.java
@@ -5,7 +5,7 @@
  * Copyright(c) 2010 MikuToga Partners
  */
 
-package jp.sourceforge.mikutoga.pmd;
+package jp.sourceforge.mikutoga.pmd.model;
 
 import java.awt.Color;
 import java.awt.Transparency;
diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/MorphPart.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/MorphPart.java
similarity index 96%
rename from src/main/java/jp/sourceforge/mikutoga/pmd/MorphPart.java
rename to src/main/java/jp/sourceforge/mikutoga/pmd/model/MorphPart.java
index e041564..1744c7d 100644
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/MorphPart.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/MorphPart.java
@@ -5,13 +5,14 @@
  * Copyright(c) 2010 MikuToga Partners
  */
 
-package jp.sourceforge.mikutoga.pmd;
+package jp.sourceforge.mikutoga.pmd.model;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import jp.sourceforge.mikutoga.corelib.I18nText;
 import jp.sourceforge.mikutoga.corelib.SerialNumbered;
+import jp.sourceforge.mikutoga.pmd.MorphType;
 
 /**
  * 個別モーフ情報。
diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/MorphVertex.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/MorphVertex.java
similarity index 97%
rename from src/main/java/jp/sourceforge/mikutoga/pmd/MorphVertex.java
rename to src/main/java/jp/sourceforge/mikutoga/pmd/model/MorphVertex.java
index 39951d6..24c49e4 100644
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/MorphVertex.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/MorphVertex.java
@@ -5,10 +5,11 @@
  * Copyright(c) 2010 MikuToga Partners
  */
 
-package jp.sourceforge.mikutoga.pmd;
+package jp.sourceforge.mikutoga.pmd.model;
 
 import java.util.Comparator;
 import jp.sourceforge.mikutoga.corelib.SerialNumbered;
+import jp.sourceforge.mikutoga.pmd.Pos3d;
 
 /**
  * モーフアニメーションを構成する個別の頂点移動の情報。
diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/PmdModel.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/PmdModel.java
similarity index 99%
rename from src/main/java/jp/sourceforge/mikutoga/pmd/PmdModel.java
rename to src/main/java/jp/sourceforge/mikutoga/pmd/model/PmdModel.java
index 1dfc9a1..bfa1b34 100644
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/PmdModel.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/PmdModel.java
@@ -5,7 +5,7 @@
  * Copyright(c) 2010 MikuToga Partners
  */
 
-package jp.sourceforge.mikutoga.pmd;
+package jp.sourceforge.mikutoga.pmd.model;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -18,6 +18,7 @@ import java.util.Map;
 import java.util.RandomAccess;
 import java.util.Set;
 import jp.sourceforge.mikutoga.corelib.I18nText;
+import jp.sourceforge.mikutoga.pmd.MorphType;
 
 /**
  * PMDモデルファイル一式に相当するもの。
diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/RigidGroup.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/RigidGroup.java
similarity index 97%
rename from src/main/java/jp/sourceforge/mikutoga/pmd/RigidGroup.java
rename to src/main/java/jp/sourceforge/mikutoga/pmd/model/RigidGroup.java
index 93db41d..8c4ee40 100644
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/RigidGroup.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/RigidGroup.java
@@ -5,7 +5,7 @@
  * Copyright(c) 2010 MikuToga Partners
  */
 
-package jp.sourceforge.mikutoga.pmd;
+package jp.sourceforge.mikutoga.pmd.model;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/RigidInfo.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/RigidInfo.java
similarity index 94%
rename from src/main/java/jp/sourceforge/mikutoga/pmd/RigidInfo.java
rename to src/main/java/jp/sourceforge/mikutoga/pmd/model/RigidInfo.java
index 7f22adf..f8ee9dd 100644
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/RigidInfo.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/RigidInfo.java
@@ -5,12 +5,17 @@
  * Copyright(c) 2010 MikuToga Partners
  */
 
-package jp.sourceforge.mikutoga.pmd;
+package jp.sourceforge.mikutoga.pmd.model;
 
+import jp.sourceforge.mikutoga.pmd.model.DynamicsInfo;
+import jp.sourceforge.mikutoga.pmd.model.BoneInfo;
 import java.util.ArrayList;
 import java.util.Collection;
 import jp.sourceforge.mikutoga.corelib.I18nText;
 import jp.sourceforge.mikutoga.corelib.SerialNumbered;
+import jp.sourceforge.mikutoga.pmd.Pos3d;
+import jp.sourceforge.mikutoga.pmd.Rad3d;
+import jp.sourceforge.mikutoga.pmd.RigidBehaviorType;
 
 /**
  * 個別の剛体の情報。
diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/RigidShape.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/RigidShape.java
similarity index 97%
rename from src/main/java/jp/sourceforge/mikutoga/pmd/RigidShape.java
rename to src/main/java/jp/sourceforge/mikutoga/pmd/model/RigidShape.java
index 8af0765..7a4773d 100644
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/RigidShape.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/RigidShape.java
@@ -5,7 +5,9 @@
  * Copyright(c) 2010 MikuToga Partners
  */
 
-package jp.sourceforge.mikutoga.pmd;
+package jp.sourceforge.mikutoga.pmd.model;
+
+import jp.sourceforge.mikutoga.pmd.RigidShapeType;
 
 /**
  * 剛体形状に関する情報。
diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/ShadeInfo.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/ShadeInfo.java
similarity index 98%
rename from src/main/java/jp/sourceforge/mikutoga/pmd/ShadeInfo.java
rename to src/main/java/jp/sourceforge/mikutoga/pmd/model/ShadeInfo.java
index fba37e9..0d9ccf9 100644
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/ShadeInfo.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/ShadeInfo.java
@@ -5,7 +5,7 @@
  * Copyright(c) 2010 MikuToga Partners
  */
 
-package jp.sourceforge.mikutoga.pmd;
+package jp.sourceforge.mikutoga.pmd.model;
 
 /**
  * シェーディング情報。
diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/Surface.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/Surface.java
similarity index 99%
rename from src/main/java/jp/sourceforge/mikutoga/pmd/Surface.java
rename to src/main/java/jp/sourceforge/mikutoga/pmd/model/Surface.java
index 00c0444..0bb81b4 100644
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/Surface.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/Surface.java
@@ -5,7 +5,7 @@
  * Copyright(c) 2010 MikuToga Partners
  */
 
-package jp.sourceforge.mikutoga.pmd;
+package jp.sourceforge.mikutoga.pmd.model;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/ToonMap.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/ToonMap.java
similarity index 98%
rename from src/main/java/jp/sourceforge/mikutoga/pmd/ToonMap.java
rename to src/main/java/jp/sourceforge/mikutoga/pmd/model/ToonMap.java
index 1a98d79..ae9f561 100644
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/ToonMap.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/ToonMap.java
@@ -5,7 +5,7 @@
  * Copyright(c) 2010 MikuToga Partners
  */
 
-package jp.sourceforge.mikutoga.pmd;
+package jp.sourceforge.mikutoga.pmd.model;
 
 import java.util.Collections;
 import java.util.Map;
diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/Vertex.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/Vertex.java
similarity index 96%
rename from src/main/java/jp/sourceforge/mikutoga/pmd/Vertex.java
rename to src/main/java/jp/sourceforge/mikutoga/pmd/model/Vertex.java
index cde99ec..751f3cf 100644
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/Vertex.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/Vertex.java
@@ -5,9 +5,13 @@
  * Copyright(c) 2010 MikuToga Partners
  */
 
-package jp.sourceforge.mikutoga.pmd;
+package jp.sourceforge.mikutoga.pmd.model;
 
+import jp.sourceforge.mikutoga.pmd.model.BoneInfo;
 import jp.sourceforge.mikutoga.corelib.SerialNumbered;
+import jp.sourceforge.mikutoga.pmd.Pos2d;
+import jp.sourceforge.mikutoga.pmd.Pos3d;
+import jp.sourceforge.mikutoga.pmd.Vec3d;
 
 /**
  * 頂点情報。
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 e606a74..792d358 100644
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/PmdExporterBase.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/PmdExporterBase.java
@@ -17,21 +17,21 @@ 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.BoneGroup;
-import jp.sourceforge.mikutoga.pmd.BoneInfo;
 import jp.sourceforge.mikutoga.pmd.BoneType;
-import jp.sourceforge.mikutoga.pmd.IKChain;
-import jp.sourceforge.mikutoga.pmd.Material;
-import jp.sourceforge.mikutoga.pmd.MorphPart;
 import jp.sourceforge.mikutoga.pmd.MorphType;
-import jp.sourceforge.mikutoga.pmd.MorphVertex;
-import jp.sourceforge.mikutoga.pmd.PmdModel;
 import jp.sourceforge.mikutoga.pmd.Pos2d;
 import jp.sourceforge.mikutoga.pmd.Pos3d;
-import jp.sourceforge.mikutoga.pmd.ShadeInfo;
-import jp.sourceforge.mikutoga.pmd.Surface;
 import jp.sourceforge.mikutoga.pmd.Vec3d;
-import jp.sourceforge.mikutoga.pmd.Vertex;
+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.Material;
+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.ShadeInfo;
+import jp.sourceforge.mikutoga.pmd.model.Surface;
+import jp.sourceforge.mikutoga.pmd.model.Vertex;
 
 /**
  * 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 2516a50..4697d7f 100644
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/PmdExporterExt1.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/PmdExporterExt1.java
@@ -12,11 +12,11 @@ import java.io.OutputStream;
 import java.util.List;
 import java.util.Map;
 import jp.sourceforge.mikutoga.parser.pmd.PmdLimits;
-import jp.sourceforge.mikutoga.pmd.BoneGroup;
-import jp.sourceforge.mikutoga.pmd.BoneInfo;
-import jp.sourceforge.mikutoga.pmd.MorphPart;
 import jp.sourceforge.mikutoga.pmd.MorphType;
-import jp.sourceforge.mikutoga.pmd.PmdModel;
+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;
 
 /**
  * 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 9dbe738..f129848 100644
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/PmdExporterExt2.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/PmdExporterExt2.java
@@ -10,8 +10,8 @@ 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.PmdModel;
-import jp.sourceforge.mikutoga.pmd.ToonMap;
+import jp.sourceforge.mikutoga.pmd.model.PmdModel;
+import jp.sourceforge.mikutoga.pmd.model.ToonMap;
 
 /**
  * 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 0f2ca38..1c92d25 100644
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/PmdExporterExt3.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdexporter/PmdExporterExt3.java
@@ -11,17 +11,17 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.util.List;
 import jp.sourceforge.mikutoga.parser.pmd.PmdLimits;
-import jp.sourceforge.mikutoga.pmd.BoneInfo;
 import jp.sourceforge.mikutoga.pmd.Deg3d;
-import jp.sourceforge.mikutoga.pmd.DynamicsInfo;
-import jp.sourceforge.mikutoga.pmd.JointInfo;
-import jp.sourceforge.mikutoga.pmd.PmdModel;
 import jp.sourceforge.mikutoga.pmd.Rad3d;
-import jp.sourceforge.mikutoga.pmd.RigidGroup;
-import jp.sourceforge.mikutoga.pmd.RigidInfo;
-import jp.sourceforge.mikutoga.pmd.RigidShape;
 import jp.sourceforge.mikutoga.pmd.RigidShapeType;
 import jp.sourceforge.mikutoga.pmd.TripletRange;
+import jp.sourceforge.mikutoga.pmd.model.BoneInfo;
+import jp.sourceforge.mikutoga.pmd.model.DynamicsInfo;
+import jp.sourceforge.mikutoga.pmd.model.JointInfo;
+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;
 
 /**
  * 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 a074e0f..c2a5181 100644
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/BoneBuilder.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/BoneBuilder.java
@@ -14,12 +14,12 @@ 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.BoneGroup;
-import jp.sourceforge.mikutoga.pmd.BoneInfo;
 import jp.sourceforge.mikutoga.pmd.BoneType;
-import jp.sourceforge.mikutoga.pmd.IKChain;
-import jp.sourceforge.mikutoga.pmd.PmdModel;
 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;
 
 /**
  * ボーン関係の通知をパーサから受け取る。
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 b2a38e2..8185381 100644
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/JointBuilder.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/JointBuilder.java
@@ -13,12 +13,12 @@ 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.JointInfo;
-import jp.sourceforge.mikutoga.pmd.PmdModel;
 import jp.sourceforge.mikutoga.pmd.Pos3d;
 import jp.sourceforge.mikutoga.pmd.Rad3d;
-import jp.sourceforge.mikutoga.pmd.RigidInfo;
 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;
 
 /**
  * ジョイント関係の通知をパーサから受け取る。
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 9d7c3cc..42ade37 100644
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/MaterialBuilder.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/MaterialBuilder.java
@@ -13,11 +13,11 @@ 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.Material;
-import jp.sourceforge.mikutoga.pmd.PmdModel;
-import jp.sourceforge.mikutoga.pmd.ShadeInfo;
-import jp.sourceforge.mikutoga.pmd.Surface;
-import jp.sourceforge.mikutoga.pmd.ToonMap;
+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;
 
 /**
  * マテリアル素材関連の通知をパーサから受け取る。
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 7c8666c..8406077 100644
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/MorphBuilder.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/MorphBuilder.java
@@ -15,12 +15,12 @@ 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.MorphPart;
 import jp.sourceforge.mikutoga.pmd.MorphType;
-import jp.sourceforge.mikutoga.pmd.MorphVertex;
-import jp.sourceforge.mikutoga.pmd.PmdModel;
 import jp.sourceforge.mikutoga.pmd.Pos3d;
-import jp.sourceforge.mikutoga.pmd.Vertex;
+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;
 
 /**
  * モーフ関係の通知をパーサから受け取る。
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 1c4b0eb..6a0410d 100644
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/PmdLoader.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/PmdLoader.java
@@ -13,8 +13,8 @@ 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.MorphPart;
-import jp.sourceforge.mikutoga.pmd.PmdModel;
+import jp.sourceforge.mikutoga.pmd.model.MorphPart;
+import jp.sourceforge.mikutoga.pmd.model.PmdModel;
 
 /**
  * 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 e952e17..efc987a 100644
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/RigidBuilder.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/RigidBuilder.java
@@ -13,16 +13,16 @@ 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.BoneInfo;
-import jp.sourceforge.mikutoga.pmd.DynamicsInfo;
-import jp.sourceforge.mikutoga.pmd.PmdModel;
 import jp.sourceforge.mikutoga.pmd.Pos3d;
 import jp.sourceforge.mikutoga.pmd.Rad3d;
 import jp.sourceforge.mikutoga.pmd.RigidBehaviorType;
-import jp.sourceforge.mikutoga.pmd.RigidGroup;
-import jp.sourceforge.mikutoga.pmd.RigidInfo;
-import jp.sourceforge.mikutoga.pmd.RigidShape;
 import jp.sourceforge.mikutoga.pmd.RigidShapeType;
+import jp.sourceforge.mikutoga.pmd.model.BoneInfo;
+import jp.sourceforge.mikutoga.pmd.model.DynamicsInfo;
+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;
 
 /**
  * 剛体関係の通知をパーサから受け取る。
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 a92a3fa..6e0261e 100644
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/ShapeBuilder.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/ShapeBuilder.java
@@ -13,13 +13,13 @@ 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.BoneInfo;
-import jp.sourceforge.mikutoga.pmd.PmdModel;
 import jp.sourceforge.mikutoga.pmd.Pos2d;
 import jp.sourceforge.mikutoga.pmd.Pos3d;
-import jp.sourceforge.mikutoga.pmd.Surface;
 import jp.sourceforge.mikutoga.pmd.Vec3d;
-import jp.sourceforge.mikutoga.pmd.Vertex;
+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;
 
 /**
  * モデル形状に関する通知をパーサから受け取る。
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 927c30e..2eecbeb 100644
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/TextBuilder.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/TextBuilder.java
@@ -13,10 +13,10 @@ 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.BoneGroup;
-import jp.sourceforge.mikutoga.pmd.BoneInfo;
-import jp.sourceforge.mikutoga.pmd.MorphPart;
-import jp.sourceforge.mikutoga.pmd.PmdModel;
+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;
 
 /**
  * テキスト関係の通知をパーサから受け取る。
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 b859942..a855025 100644
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/ToonBuilder.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/pmdloader/ToonBuilder.java
@@ -10,8 +10,8 @@ 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.PmdModel;
-import jp.sourceforge.mikutoga.pmd.ToonMap;
+import jp.sourceforge.mikutoga.pmd.model.PmdModel;
+import jp.sourceforge.mikutoga.pmd.model.ToonMap;
 
 /**
  * トゥーン関係の通知をパーサから受け取る。
diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/xml/PmdXmlExporter.java b/src/main/java/jp/sourceforge/mikutoga/pmd/xml/PmdXmlExporter.java
index e94097e..e6a5c58 100644
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/xml/PmdXmlExporter.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/xml/PmdXmlExporter.java
@@ -14,31 +14,31 @@ import java.util.List;
 import java.util.Map;
 import jp.sourceforge.mikutoga.corelib.I18nText;
 import jp.sourceforge.mikutoga.corelib.SerialNumbered;
-import jp.sourceforge.mikutoga.pmd.BoneGroup;
-import jp.sourceforge.mikutoga.pmd.BoneInfo;
 import jp.sourceforge.mikutoga.pmd.BoneType;
 import jp.sourceforge.mikutoga.pmd.Deg3d;
-import jp.sourceforge.mikutoga.pmd.DynamicsInfo;
-import jp.sourceforge.mikutoga.pmd.IKChain;
-import jp.sourceforge.mikutoga.pmd.JointInfo;
-import jp.sourceforge.mikutoga.pmd.Material;
-import jp.sourceforge.mikutoga.pmd.MorphPart;
 import jp.sourceforge.mikutoga.pmd.MorphType;
-import jp.sourceforge.mikutoga.pmd.MorphVertex;
-import jp.sourceforge.mikutoga.pmd.PmdModel;
 import jp.sourceforge.mikutoga.pmd.Pos2d;
 import jp.sourceforge.mikutoga.pmd.Pos3d;
 import jp.sourceforge.mikutoga.pmd.Rad3d;
-import jp.sourceforge.mikutoga.pmd.RigidGroup;
-import jp.sourceforge.mikutoga.pmd.RigidInfo;
-import jp.sourceforge.mikutoga.pmd.RigidShape;
 import jp.sourceforge.mikutoga.pmd.RigidShapeType;
-import jp.sourceforge.mikutoga.pmd.ShadeInfo;
-import jp.sourceforge.mikutoga.pmd.Surface;
-import jp.sourceforge.mikutoga.pmd.ToonMap;
 import jp.sourceforge.mikutoga.pmd.TripletRange;
 import jp.sourceforge.mikutoga.pmd.Vec3d;
-import jp.sourceforge.mikutoga.pmd.Vertex;
+import jp.sourceforge.mikutoga.pmd.model.BoneGroup;
+import jp.sourceforge.mikutoga.pmd.model.BoneInfo;
+import jp.sourceforge.mikutoga.pmd.model.DynamicsInfo;
+import jp.sourceforge.mikutoga.pmd.model.IKChain;
+import jp.sourceforge.mikutoga.pmd.model.JointInfo;
+import jp.sourceforge.mikutoga.pmd.model.Material;
+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.RigidGroup;
+import jp.sourceforge.mikutoga.pmd.model.RigidInfo;
+import jp.sourceforge.mikutoga.pmd.model.RigidShape;
+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.model.Vertex;
 import jp.sourceforge.mikutoga.xml.BasicXmlExporter;
 import jp.sourceforge.mikutoga.xml.XmlResourceResolver;
 
diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/xml/Xml2PmdLoader.java b/src/main/java/jp/sourceforge/mikutoga/pmd/xml/Xml2PmdLoader.java
index 512df23..e92ee88 100644
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/xml/Xml2PmdLoader.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/xml/Xml2PmdLoader.java
@@ -17,32 +17,32 @@ import java.util.Map;
 import javax.xml.parsers.DocumentBuilder;
 import jp.sourceforge.mikutoga.corelib.I18nText;
 import jp.sourceforge.mikutoga.corelib.ListUtil;
-import jp.sourceforge.mikutoga.pmd.BoneGroup;
-import jp.sourceforge.mikutoga.pmd.BoneInfo;
 import jp.sourceforge.mikutoga.pmd.BoneType;
 import jp.sourceforge.mikutoga.pmd.Deg3d;
-import jp.sourceforge.mikutoga.pmd.DynamicsInfo;
-import jp.sourceforge.mikutoga.pmd.IKChain;
-import jp.sourceforge.mikutoga.pmd.JointInfo;
-import jp.sourceforge.mikutoga.pmd.Material;
-import jp.sourceforge.mikutoga.pmd.MorphPart;
 import jp.sourceforge.mikutoga.pmd.MorphType;
-import jp.sourceforge.mikutoga.pmd.MorphVertex;
-import jp.sourceforge.mikutoga.pmd.PmdModel;
 import jp.sourceforge.mikutoga.pmd.Pos2d;
 import jp.sourceforge.mikutoga.pmd.Pos3d;
 import jp.sourceforge.mikutoga.pmd.Rad3d;
 import jp.sourceforge.mikutoga.pmd.RigidBehaviorType;
-import jp.sourceforge.mikutoga.pmd.RigidGroup;
-import jp.sourceforge.mikutoga.pmd.RigidInfo;
-import jp.sourceforge.mikutoga.pmd.RigidShape;
 import jp.sourceforge.mikutoga.pmd.RigidShapeType;
-import jp.sourceforge.mikutoga.pmd.ShadeInfo;
-import jp.sourceforge.mikutoga.pmd.Surface;
-import jp.sourceforge.mikutoga.pmd.ToonMap;
 import jp.sourceforge.mikutoga.pmd.TripletRange;
 import jp.sourceforge.mikutoga.pmd.Vec3d;
-import jp.sourceforge.mikutoga.pmd.Vertex;
+import jp.sourceforge.mikutoga.pmd.model.BoneGroup;
+import jp.sourceforge.mikutoga.pmd.model.BoneInfo;
+import jp.sourceforge.mikutoga.pmd.model.DynamicsInfo;
+import jp.sourceforge.mikutoga.pmd.model.IKChain;
+import jp.sourceforge.mikutoga.pmd.model.JointInfo;
+import jp.sourceforge.mikutoga.pmd.model.Material;
+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.RigidGroup;
+import jp.sourceforge.mikutoga.pmd.model.RigidInfo;
+import jp.sourceforge.mikutoga.pmd.model.RigidShape;
+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.model.Vertex;
 import jp.sourceforge.mikutoga.xml.DomUtils;
 import jp.sourceforge.mikutoga.xml.TogaXmlException;
 import org.w3c.dom.Document;