• R/O
  • SSH
  • HTTPS

mmdx: Commit


Commit MetaInfo

Revision842 (tree)
Zeit2011-06-11 15:04:32
Autorwilfrem

Log Message

SlimDX側も修正

Ändern Zusammenfassung

Diff

--- branches/XNA4/SlimMMDX/Model/SlimMMDModel.cs (revision 841)
+++ branches/XNA4/SlimMMDX/Model/SlimMMDModel.cs (revision 842)
@@ -135,7 +135,7 @@
135135 System.Threading.Tasks.Parallel.For(0, m_vertex.Length,
136136 (i) => {
137137 Vector4 pos;
138- SkinningHelpers.SkinVertex(skinTransforms, m_vertex[i], out pos);
138+ SkinningHelpers.SkinVertex(skinTransforms, m_vertex[i], out pos, out verticesSource[i].Normal);
139139 verticesSource[i].Position = new Vector3(pos.X, pos.Y, pos.Z);
140140 }
141141 );
--- branches/XNA4/SlimMMDX/Model/MMDModelFactory.cs (revision 841)
+++ branches/XNA4/SlimMMDX/Model/MMDModelFactory.cs (revision 842)
@@ -132,11 +132,11 @@
132132 //テクスチャを読み込んではめ込み
133133 Texture tex = Texture.FromFile(SlimMMDXCore.Instance.Device, BuildPath(modelAbsPath, material.TextureFileName));
134134 effect.SetTexture("Texture", tex);
135- shaderIndex = 6;//本来pmd以外のモデルを考慮すべきだが、('A`)マンドクセ
135+ shaderIndex = 2;//本来pmd以外のモデルを考慮すべきだが、('A`)マンドクセ
136136 }
137137 else
138138 {
139- shaderIndex = 4;
139+ shaderIndex = 0;
140140 }
141141 if (!string.IsNullOrEmpty(material.SphereTextureFileName))
142142 {
Show on old repository browser