OneTrackをMotionTrackに変更
trunk/MikuMikuDanceXNA/Model/AnimationPlayer.cs (diff)| @@ -9,7 +9,7 @@ | ||
| 9 | 9 | |
| 10 | 10 | namespace MikuMikuDance.XNA.Model |
| 11 | 11 | { |
| 12 | - class OneTrack | |
| 12 | + class MotionTrack | |
| 13 | 13 | { |
| 14 | 14 | public MMDMotion motion; |
| 15 | 15 | Stopwatch timer = new Stopwatch(); |
| @@ -65,8 +65,8 @@ | ||
| 65 | 65 | //親のモデル |
| 66 | 66 | MMDModel mmdModel; |
| 67 | 67 | //現在のモーション一覧 |
| 68 | - List<OneTrack> mmdMotion = new List<OneTrack>(MikuMikuDanceXNA.MotionTrackCap); | |
| 69 | - List<OneTrack> trackPool = new List<OneTrack>(MikuMikuDanceXNA.MotionTrackCap);//オブジェクトプール | |
| 68 | + List<MotionTrack> mmdMotion = new List<MotionTrack>(MikuMikuDanceXNA.MotionTrackCap); | |
| 69 | + List<MotionTrack> trackPool = new List<MotionTrack>(MikuMikuDanceXNA.MotionTrackCap);//オブジェクトプール | |
| 70 | 70 | |
| 71 | 71 | |
| 72 | 72 |
| @@ -85,7 +85,7 @@ | ||
| 85 | 85 | { |
| 86 | 86 | mmdMotion.Capacity = MikuMikuDanceXNA.MotionTrackCap; |
| 87 | 87 | for (int i = 0; i < MikuMikuDanceXNA.MotionTrackCap; i++) |
| 88 | - trackPool.Add(new OneTrack()); | |
| 88 | + trackPool.Add(new MotionTrack()); | |
| 89 | 89 | mmdModel = model; |
| 90 | 90 | FramePerSecond = 30;//MMDは30フレーム/秒が標準 |
| 91 | 91 | } |
| @@ -99,7 +99,7 @@ | ||
| 99 | 99 | public int SetMotion(MMDMotion motion, bool SetStartPos) |
| 100 | 100 | { |
| 101 | 101 | if (trackPool.Count == 0) |
| 102 | - mmdMotion.Add(new OneTrack() { motion = motion }); | |
| 102 | + mmdMotion.Add(new MotionTrack() { motion = motion }); | |
| 103 | 103 | else |
| 104 | 104 | { |
| 105 | 105 | trackPool[0].Reset(); |
| @@ -212,9 +212,10 @@ | ||
| 212 | 212 | { |
| 213 | 213 | if (mmdModel.BoneManager.ContainsBone(bone)) |
| 214 | 214 | {//存在しないボーンへのモーションは無視…… |
| 215 | + int boneIndex = mmdModel.BoneManager.IndexOf(bone); | |
| 215 | 216 | QuatTransform move = mmdMotion[i].motion.GetBoneTransform(bone, NowFrame); |
| 216 | 217 | //ボーン処理 |
| 217 | - mmdModel.BoneManager[bone].BoneTransform = move * mmdModel.BoneManager[bone].BoneData.BindPose; | |
| 218 | + mmdModel.BoneManager[boneIndex].BoneTransform = move * mmdModel.BoneManager[boneIndex].BoneData.BindPose; | |
| 218 | 219 | } |
| 219 | 220 | } |
| 220 | 221 | #if TRACE |
