OSDN -- Open-Source-Software-Entwicklung und Downloads
Übersetzungsstatus von Deutsch translation status for de
  • R/O
  • SSH
  • HTTPS

mmdx: Commit


Commit MetaInfo

Revision730 (tree)
Zeit2011-04-25 01:36:18
Autorwilfrem

Log Message

SlimMMDXによる修正をこっちにも反映

Ändern Zusammenfassung

Diff

--- branches/XNA4/MikuMikuDanceCore/Stages/MMDXDefaultCamera.cs (revision 729)
+++ branches/XNA4/MikuMikuDanceCore/Stages/MMDXDefaultCamera.cs (revision 730)
@@ -64,7 +64,7 @@
6464 MMDXMath.CreateLookAtMatrix(ref CameraPos, ref CameraTarget, ref CameraUpVector,out view);
6565 MMDXMath.CreatePerspectiveFieldOfViewMatrix(FieldOfView, aspectRatio, Near, Far, out proj);
6666 }
67-
67+ public Vector3 Position { get { return CameraPos; } set { CameraPos = value; } }
6868 #endregion
6969 }
7070 }
--- branches/XNA4/MikuMikuDanceCore/Stages/IMMDXCamera.cs (revision 729)
+++ branches/XNA4/MikuMikuDanceCore/Stages/IMMDXCamera.cs (revision 730)
@@ -22,5 +22,7 @@
2222 /// <param name="view">ビュー情報</param>
2323 /// <param name="proj">プロジェクション情報</param>
2424 void GetCameraParam(float aspectRatio, out Matrix view, out Matrix proj);
25+
26+ Vector3 Position { get; set; }
2527 }
2628 }
--- branches/XNA4/MikuMikuDanceXNA/Model/MMDModelPartCPU.cs (revision 729)
+++ branches/XNA4/MikuMikuDanceXNA/Model/MMDModelPartCPU.cs (revision 730)
@@ -44,7 +44,7 @@
4444 /// ボーンの設定
4545 /// </summary>
4646 /// <param name="bones">ボーン配列</param>
47- public override void SetBone(Matrix[] bones)
47+ public override void SetSkinMatrix(Matrix[] bones)
4848 {
4949 //頂点位置の計算
5050 System.Threading.Tasks.Parallel.For(0, vertices.Length,
@@ -94,7 +94,7 @@
9494 /// ボーンの設定
9595 /// </summary>
9696 /// <param name="bones">ボーン配列</param>
97- public override void SetBone(Matrix[] bones)
97+ public override void SetSkinMatrix(Matrix[] bones)
9898 {
9999 System.Threading.Tasks.Parallel.For(0, vertices.Length,
100100 (i) => SkinningHelpers.SkinVertex(bones, vertices[i], out gpuVertices[i].Position));
@@ -144,7 +144,7 @@
144144 /// ボーンの設定
145145 /// </summary>
146146 /// <param name="bones">ボーン配列</param>
147- public override void SetBone(Matrix[] bones)
147+ public override void SetSkinMatrix(Matrix[] bones)
148148 {
149149 //頂点と法線位置の計算
150150 System.Threading.Tasks.Parallel.For(0, vertices.Length,
@@ -194,7 +194,7 @@
194194 /// ボーンの設定
195195 /// </summary>
196196 /// <param name="bones">ボーン配列</param>
197- public override void SetBone(Matrix[] bones)
197+ public override void SetSkinMatrix(Matrix[] bones)
198198 {
199199 //頂点位置の計算
200200 System.Threading.Tasks.Parallel.For(0, vertices.Length,
@@ -246,7 +246,7 @@
246246 /// ボーンの設定
247247 /// </summary>
248248 /// <param name="bones">ボーン配列</param>
249- public override void SetBone(Matrix[] bones)
249+ public override void SetSkinMatrix(Matrix[] bones)
250250 {
251251 //頂点と法線位置の計算
252252 System.Threading.Tasks.Parallel.For(0, vertices.Length,
@@ -297,7 +297,7 @@
297297 /// ボーンの設定
298298 /// </summary>
299299 /// <param name="bones">ボーン配列</param>
300- public override void SetBone(Matrix[] bones)
300+ public override void SetSkinMatrix(Matrix[] bones)
301301 {
302302 //頂点位置の計算
303303 System.Threading.Tasks.Parallel.For(0, vertices.Length,
@@ -348,7 +348,7 @@
348348 /// ボーンの設定
349349 /// </summary>
350350 /// <param name="bones">ボーン配列</param>
351- public override void SetBone(Matrix[] bones)
351+ public override void SetSkinMatrix(Matrix[] bones)
352352 {
353353 //頂点と法線位置の計算
354354 System.Threading.Tasks.Parallel.For(0, vertices.Length,
@@ -400,7 +400,7 @@
400400 /// ボーンの設定
401401 /// </summary>
402402 /// <param name="bones">ボーン配列</param>
403- public override void SetBone(Matrix[] bones)
403+ public override void SetSkinMatrix(Matrix[] bones)
404404 {
405405 //頂点と法線位置の計算
406406 System.Threading.Tasks.Parallel.For(0, vertices.Length,
--- branches/XNA4/MikuMikuDanceXNA/Model/MMDModelPartGPU.cs (revision 729)
+++ branches/XNA4/MikuMikuDanceXNA/Model/MMDModelPartGPU.cs (revision 730)
@@ -44,7 +44,7 @@
4444 /// ボーンの設定
4545 /// </summary>
4646 /// <param name="bones">ボーン配列</param>
47- public override void SetBone(Matrix[] bones)
47+ public override void SetSkinMatrix(Matrix[] bones)
4848 {
4949 //頂点位置の計算
5050 System.Threading.Tasks.Parallel.For(0, vertices.Length,
@@ -94,7 +94,7 @@
9494 /// ボーンの設定
9595 /// </summary>
9696 /// <param name="bones">ボーン配列</param>
97- public override void SetBone(Matrix[] bones)
97+ public override void SetSkinMatrix(Matrix[] bones)
9898 {
9999 System.Threading.Tasks.Parallel.For(0, vertices.Length,
100100 (i) => SkinningHelpers.SkinVertex(bones, vertices[i], out gpuVertices[i].Position));
@@ -144,7 +144,7 @@
144144 /// ボーンの設定
145145 /// </summary>
146146 /// <param name="bones">ボーン配列</param>
147- public override void SetBone(Matrix[] bones)
147+ public override void SetSkinMatrix(Matrix[] bones)
148148 {
149149 //頂点と法線位置の計算
150150 System.Threading.Tasks.Parallel.For(0, vertices.Length,
@@ -194,7 +194,7 @@
194194 /// ボーンの設定
195195 /// </summary>
196196 /// <param name="bones">ボーン配列</param>
197- public override void SetBone(Matrix[] bones)
197+ public override void SetSkinMatrix(Matrix[] bones)
198198 {
199199 //頂点位置の計算
200200 System.Threading.Tasks.Parallel.For(0, vertices.Length,
@@ -246,7 +246,7 @@
246246 /// ボーンの設定
247247 /// </summary>
248248 /// <param name="bones">ボーン配列</param>
249- public override void SetBone(Matrix[] bones)
249+ public override void SetSkinMatrix(Matrix[] bones)
250250 {
251251 //頂点と法線位置の計算
252252 System.Threading.Tasks.Parallel.For(0, vertices.Length,
@@ -297,7 +297,7 @@
297297 /// ボーンの設定
298298 /// </summary>
299299 /// <param name="bones">ボーン配列</param>
300- public override void SetBone(Matrix[] bones)
300+ public override void SetSkinMatrix(Matrix[] bones)
301301 {
302302 //頂点位置の計算
303303 System.Threading.Tasks.Parallel.For(0, vertices.Length,
@@ -348,7 +348,7 @@
348348 /// ボーンの設定
349349 /// </summary>
350350 /// <param name="bones">ボーン配列</param>
351- public override void SetBone(Matrix[] bones)
351+ public override void SetSkinMatrix(Matrix[] bones)
352352 {
353353 //頂点と法線位置の計算
354354 System.Threading.Tasks.Parallel.For(0, vertices.Length,
@@ -400,7 +400,7 @@
400400 /// ボーンの設定
401401 /// </summary>
402402 /// <param name="bones">ボーン配列</param>
403- public override void SetBone(Matrix[] bones)
403+ public override void SetSkinMatrix(Matrix[] bones)
404404 {
405405 //頂点と法線位置の計算
406406 System.Threading.Tasks.Parallel.For(0, vertices.Length,
--- branches/XNA4/MikuMikuDanceXNA/Model/MMDModelPart.cs (revision 729)
+++ branches/XNA4/MikuMikuDanceXNA/Model/MMDModelPart.cs (revision 730)
@@ -91,6 +91,7 @@
9191 Effect.Parameters["World"].SetValue(world);
9292 Effect.Parameters["View"].SetValue(view);
9393 Effect.Parameters["Projection"].SetValue(projection);
94+ Effect.Parameters["EyePosition"].SetValue(MMDXCore.Instance.Camera.Position);
9495 }
9596 //ライティング処理
9697 Vector3 color, dir;
@@ -130,13 +131,13 @@
130131 graphics.SetVertexBuffer(null);
131132 }
132133
133-
134134
135+
135136 /// <summary>
136- /// ボーンの設定
137+ /// スキン行列の設定
137138 /// </summary>
138- /// <param name="bones">ボーン配列</param>
139- public abstract void SetBone(Matrix[] bones);
139+ /// <param name="bones">スキン行列配列</param>
140+ public abstract void SetSkinMatrix(Matrix[] skinTransforms);
140141
141142
142143
Show on old repository browser