OSDN > Finden Software > Multimedia > Graphics > Animation > MMDX(MikuMikuDance for XNA/SlimDX) > SCM > SVN > Commit

MMDX(MikuMikuDance for XNA/SlimDX)

mmdx: Commit

箱コンパイル通ったとこまで。まだ動かない。

--- branches/XNA4/MikuMikuDanceXNA/Model/MMDXModel.cs (revision 838)

+++ branches/XNA4/MikuMikuDanceXNA/Model/MMDXModel.cs (revision 839)

		@@ -49,7 +49,7 @@
49	49	System.Threading.Tasks.Parallel.ForEach(Parts, (part) => part.SetSkinMatrix(skinTransforms));
50	50	#else
51	51	foreach (var part in Parts)
52		- part.SetSkinMatrix(BoneManager.SkinTransforms);
	52	+ part.SetSkinMatrix(skinTransforms);
53	53	#endif
54	54
55	55	}

--- branches/XNA4/MikuMikuDanceCore/Model/MMDFaceManager.cs (revision 838)

+++ branches/XNA4/MikuMikuDanceCore/Model/MMDFaceManager.cs (revision 839)

		@@ -8,7 +8,9 @@
8	8	using SlimDX;
9	9	#endif
10	10	using MikuMikuDance.Core.Misc;
	11	+#if !XBOX
11	12	using System.Threading.Tasks;
	13	+#endif
12	14
13	15	namespace MikuMikuDance.Core.Model
14	16	{

		@@ -98,7 +100,11 @@
98	100	/// </summary>
99	101	/// <param name="vert">頂点</param>
100	102	/// <param name="indices">PMDとMMDとの頂点変換マップ</param>
101		- public void ApplyToVertex(MMDVertex[] vert, int[] indices = null)
	103	+ public void ApplyToVertex(MMDVertex[] vert, int[] indices
	104	+#if !XBOX
	105	+ = null
	106	+#endif
	107	+ )
102	108	{
103	109	if (indices == null)
104	110	{

		@@ -105,20 +111,18 @@
105	111	#if !XBOX
106	112	Parallel.For(0, vert.LongLength, (index) =>
107	113	#else
108		- foreach(var it in vertData)
	114	+ for (int index = 0; index < vert.Length; index++ )
109	115	#endif
110	116	{
111		- if (vertData.ContainsKey(index))
	117	+ //baseで初期化
	118	+ vert[index].Position = vertData[index][0].vector;
	119	+ for (int j = 1; j < vertData[index].Length; ++j)
112	120	{
113		- //baseで初期化
114		- vert[index].Position = vertData[index][0].vector;
115		- for (int j = 1; j < vertData[index].Length; ++j)
116		- {
117		- Vector3 temp;
118		- Vector3.Multiply(ref vertData[index][j].vector, FaceRates[vertData[index][j].FaceName], out temp);
119		- vert[index].Position += temp;
120		- }
	121	+ Vector3 temp;
	122	+ Vector3.Multiply(ref vertData[index][j].vector, FaceRates[vertData[index][j].FaceName], out temp);
	123	+ vert[index].Position += temp;
121	124	}
	125	+
122	126	}
123	127	#if !XBOX
124	128	);

		@@ -129,7 +133,7 @@
129	133	#if !XBOX
130	134	Parallel.For(0,vert.LongLength, (i) =>
131	135	#else
132		- foreach(var it in vertData)
	136	+ for (int i = 0; i < vert.Length; ++i )
133	137	#endif
134	138	{
135	139	long index = indices[i];

--- branches/XNA4/MikuMikuDanceCore/Motion/MMDMotionFactory.cs (revision 838)

+++ branches/XNA4/MikuMikuDanceCore/Motion/MMDMotionFactory.cs (revision 839)

		@@ -2,7 +2,9 @@
2	2	using System.Collections.Generic;
3	3	using System.Linq;
4	4	using System.Text;
	5	+#if !XBOX
5	6	using MikuMikuDance.Motion;
	7	+#endif
6	8	using System.IO;
7	9	using MikuMikuDance.Core.Misc;
8	10	#if XNA

		@@ -13,6 +15,7 @@
13	15
14	16	namespace MikuMikuDance.Core.Motion
15	17	{
	18	+#if !XBOX
16	19	class MMDMotionFactory : IMMDMotionFactory
17	20	{
18	21

--- branches/XNA4/MikuMikuDanceCore/Accessory/MMDVACFactory.cs (revision 838)

+++ branches/XNA4/MikuMikuDanceCore/Accessory/MMDVACFactory.cs (revision 839)

		@@ -12,6 +12,7 @@
12	12
13	13	namespace MikuMikuDance.Core.Accessory
14	14	{
	15	+#if !XBOX
15	16	class MMDVACFactory : IMMDVACFactory
16	17	{
17	18	#region IMMDVACFactory メンバー