X-Git-Url: http://git.osdn.net/view?p=mikutoga%2FTogaGem.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fjp%2Fsourceforge%2Fmikutoga%2Fpmd%2Fmodel%2Fxml%2FPmdXmlExporter.java;h=2fe76b5bb6735be7bf8f5e4c540949558f60db95;hp=3cd685ac5e3fcf20cb015e76f17d5262034184a8;hb=e9895add16883fa71f90b0716520b03549164fc6;hpb=8368100b9cbc8dd5a0d10720596906557f97f0ee
diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd/model/xml/PmdXmlExporter.java b/src/main/java/jp/sourceforge/mikutoga/pmd/model/xml/PmdXmlExporter.java
index 3cd685a..2fe76b5 100644
--- a/src/main/java/jp/sourceforge/mikutoga/pmd/model/xml/PmdXmlExporter.java
+++ b/src/main/java/jp/sourceforge/mikutoga/pmd/model/xml/PmdXmlExporter.java
@@ -13,15 +13,15 @@ import java.io.OutputStream;
import java.util.List;
import java.util.Map;
import jp.sourceforge.mikutoga.corelib.I18nText;
+import jp.sourceforge.mikutoga.math.MkPos2D;
+import jp.sourceforge.mikutoga.math.MkPos3D;
+import jp.sourceforge.mikutoga.math.MkVec3D;
import jp.sourceforge.mikutoga.pmd.BoneType;
import jp.sourceforge.mikutoga.pmd.Deg3d;
import jp.sourceforge.mikutoga.pmd.MorphType;
-import jp.sourceforge.mikutoga.pmd.Pos2d;
-import jp.sourceforge.mikutoga.pmd.Pos3d;
import jp.sourceforge.mikutoga.pmd.Rad3d;
import jp.sourceforge.mikutoga.pmd.RigidShapeType;
import jp.sourceforge.mikutoga.pmd.TripletRange;
-import jp.sourceforge.mikutoga.pmd.Vec3d;
import jp.sourceforge.mikutoga.pmd.model.BoneGroup;
import jp.sourceforge.mikutoga.pmd.model.BoneInfo;
import jp.sourceforge.mikutoga.pmd.model.DynamicsInfo;
@@ -217,11 +217,12 @@ public class PmdXmlExporter extends BasicXmlExporter{
* @return thisæ¬ä½
* @throws IOException åºåã¨ã©ã¼
*/
- protected PmdXmlExporter putPosition(Pos3d position) throws IOException{
+ protected PmdXmlExporter putPosition(MkPos3D position)
+ throws IOException{
put("");
return this;
}
@@ -704,20 +705,20 @@ public class PmdXmlExporter extends BasicXmlExporter{
put(">").ln();
pushNest();
- Pos3d position = vertex.getPosition();
+ MkPos3D position = vertex.getPosition();
ind().putPosition(position).ln();
- Vec3d normal = vertex.getNormal();
+ MkVec3D normal = vertex.getNormal();
ind().put("").ln();
- Pos2d uvPos = vertex.getUVPosition();
+ MkPos2D uvPos = vertex.getUVPosition();
ind().put("").ln();
BoneInfo boneA = vertex.getBoneA();
@@ -779,7 +780,7 @@ public class PmdXmlExporter extends BasicXmlExporter{
putI18nName(i18nName);
- Pos3d position = bone.getPosition();
+ MkPos3D position = bone.getPosition();
ind().putPosition(position).ln();
BoneInfo ikBone = bone.getIKBone();
@@ -986,14 +987,14 @@ public class PmdXmlExporter extends BasicXmlExporter{
putI18nName(i18nName);
for(MorphVertex mvertex : part){
- Pos3d offset = mvertex.getOffset();
+ MkPos3D offset = mvertex.getOffset();
Vertex base = mvertex.getBaseVertex();
ind().put("");
ln();
}
@@ -1060,7 +1061,7 @@ public class PmdXmlExporter extends BasicXmlExporter{
RigidShape shape = rigid.getRigidShape();
putRigidShape(shape);
- Pos3d position = rigid.getPosition();
+ MkPos3D position = rigid.getPosition();
ind().putPosition(position).ln();
Rad3d rotation = rigid.getRotation();
@@ -1235,7 +1236,7 @@ public class PmdXmlExporter extends BasicXmlExporter{
+ " <=> [" + rigidB.getRigidName().getText() + "]");
ln(2);
- Pos3d position = joint.getPosition();
+ MkPos3D position = joint.getPosition();
ind().putPosition(position).ln();
TripletRange posRange = joint.getPositionRange();
@@ -1270,11 +1271,11 @@ public class PmdXmlExporter extends BasicXmlExporter{
popNest();
ind().put("/>").ln(2);
- Pos3d elaPosition = joint.getElasticPosition();
+ MkPos3D elaPosition = joint.getElasticPosition();
ind().put("").ln();
Deg3d elaRotation = joint.getElasticRotation();