/[Sims3RigEditor]/trunk/gr2lib_cpp/gr2lib_rigeditor_frm.h
ViewVC logotype

Diff of /trunk/gr2lib_cpp/gr2lib_rigeditor_frm.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

--- trunk/gr2lib_cpp/gr2lib_rigeditor_frm.h	2010/08/14 10:47:15	74
+++ trunk/gr2lib_cpp/gr2lib_rigeditor_frm.h	2010/08/14 11:56:00	76
@@ -508,7 +508,7 @@
 					b->ParentIndex = toolinfo[i]->Bones[j].ParentIndex;
 
 					Transform^ _transform = gcnew Transform();
-					Matrix44^ _matrix44 = gcnew Matrix44(_transform->Matrix);				
+							
 
 					_transform->Dimensions = toolinfo[i]->Bones[j].LocalTransform.Flags;
 					_transform->Origin = *gcnew Vector3(
@@ -537,38 +537,38 @@
 						toolinfo[i]->Bones[j].LocalTransform.ScaleShear[2][0],
 						toolinfo[i]->Bones[j].LocalTransform.ScaleShear[2][1],
 						toolinfo[i]->Bones[j].LocalTransform.ScaleShear[2][2])
-						);
+						);				
+					
+				
 
+					Matrix44^ _matrix44 = gcnew Matrix44(_transform->Matrix);
 					_matrix44->right = *gcnew Vector4(
 														toolinfo[i]->Bones[j].InverseWorld4x4[0][0],
 														toolinfo[i]->Bones[j].InverseWorld4x4[0][1],
 														toolinfo[i]->Bones[j].InverseWorld4x4[0][2],
 														toolinfo[i]->Bones[j].InverseWorld4x4[0][3]
-														);
-														
+														);														
 					_matrix44->up = *gcnew Vector4(
 														toolinfo[i]->Bones[j].InverseWorld4x4[1][0],
 														toolinfo[i]->Bones[j].InverseWorld4x4[1][1],
 														toolinfo[i]->Bones[j].InverseWorld4x4[1][2],
 														toolinfo[i]->Bones[j].InverseWorld4x4[1][3]
-														);
-														
+														);														
 					_matrix44->at = *gcnew Vector4(
 														toolinfo[i]->Bones[j].InverseWorld4x4[2][0],
 														toolinfo[i]->Bones[j].InverseWorld4x4[2][1],
 														toolinfo[i]->Bones[j].InverseWorld4x4[2][2],
 														toolinfo[i]->Bones[j].InverseWorld4x4[2][3]
-														);
-														
+														);														
 					_matrix44->pos = *gcnew Vector4(
 														toolinfo[i]->Bones[j].InverseWorld4x4[3][0],
 														toolinfo[i]->Bones[j].InverseWorld4x4[3][1],
 														toolinfo[i]->Bones[j].InverseWorld4x4[3][2],
 														toolinfo[i]->Bones[j].InverseWorld4x4[3][3]
 														);
-
+					_transform->Matrix = *_matrix44;
 					b->LocalTransform = _transform;
-					b->InverseWorld4x4 = *_matrix44;
+					//b->InverseWorld4x4 = *_matrix44;
 					b->LODError = toolinfo[i]->Bones[j].LODError;
 					b->ExtendedData = ExtendedData_ToManaged(toolinfo[i]->Bones[j].ExtendedData);
 					bones->Add(b);

 

  ViewVC Help
Powered by ViewVC 1.1.22