OSDN -- Desarrollar y descargar software de código abierto
Translation Status of Español translation status for es
  • R/O
  • SSH
  • HTTPS

vima19: Commit


Commit MetaInfo

Revisión935 (tree)
Tiempo2022-09-29 00:40:54
Autorhgtterry

Log Message

Equity_SB 280922 Markers

Cambiar Resumen

Diferencia incremental

--- Anim19_OSDN/SB_Dimensions.cpp (revision 934)
+++ Anim19_OSDN/SB_Dimensions.cpp (revision 935)
@@ -178,9 +178,8 @@
178178 App->SBC_Scene->B_Object[Index]->Object_Node->setPosition(Pos);
179179 App->SBC_Scene->B_Object[Index]->Mesh_Pos = Pos;
180180
181- AxisAlignedBox worldAAB = App->SBC_Scene->B_Object[Index]->Object_Ent->getBoundingBox();
182- worldAAB.transformAffine(App->SBC_Scene->B_Object[Index]->Object_Node->_getFullTransform());
183- Ogre::Vector3 Centre = worldAAB.getCenter();
181+ Ogre::Vector3 Centre = App->SBC_Object->Get_BoundingBox_World_Centre(Index);
182+
184183 App->SBC_Scene->B_Object[Index]->Phys_Body->getWorldTransform().setOrigin(btVector3(Centre.x, Centre.y, Centre.z));
185184 UpDate_Physics_And_Visuals(Index);
186185 }
@@ -191,9 +190,8 @@
191190 App->SBC_Scene->B_Object[Index]->Object_Node->setPosition(Pos);
192191 App->SBC_Scene->B_Object[Index]->Mesh_Pos = Pos;
193192
194- AxisAlignedBox worldAAB = App->SBC_Scene->B_Object[Index]->Object_Ent->getBoundingBox();
195- worldAAB.transformAffine(App->SBC_Scene->B_Object[Index]->Object_Node->_getFullTransform());
196- Ogre::Vector3 Centre = worldAAB.getCenter();
193+ Ogre::Vector3 Centre = App->SBC_Object->Get_BoundingBox_World_Centre(Index);
194+
197195 App->SBC_Scene->B_Object[Index]->Phys_Body->getWorldTransform().setOrigin(btVector3(Centre.x, Centre.y, Centre.z));
198196 UpDate_Physics_And_Visuals(Index);
199197 }
@@ -204,9 +202,8 @@
204202 App->SBC_Scene->B_Object[Index]->Object_Node->setPosition(Pos);
205203 App->SBC_Scene->B_Object[Index]->Mesh_Pos = Pos;
206204
207- AxisAlignedBox worldAAB = App->SBC_Scene->B_Object[Index]->Object_Ent->getBoundingBox();
208- worldAAB.transformAffine(App->SBC_Scene->B_Object[Index]->Object_Node->_getFullTransform());
209- Ogre::Vector3 Centre = worldAAB.getCenter();
205+ Ogre::Vector3 Centre = App->SBC_Object->Get_BoundingBox_World_Centre(Index);
206+
210207 App->SBC_Scene->B_Object[Index]->Phys_Body->getWorldTransform().setOrigin(btVector3(Centre.x, Centre.y, Centre.z));
211208 UpDate_Physics_And_Visuals(Index);
212209 }
@@ -224,9 +221,8 @@
224221 App->SBC_Scene->B_Object[Index]->Object_Node->setPosition(Pos);
225222 App->SBC_Scene->B_Object[Index]->Mesh_Pos = Pos;
226223
227- AxisAlignedBox worldAAB = App->SBC_Scene->B_Object[Index]->Object_Ent->getBoundingBox();
228- worldAAB.transformAffine(App->SBC_Scene->B_Object[Index]->Object_Node->_getFullTransform());
229- Ogre::Vector3 Centre = worldAAB.getCenter();
224+ Ogre::Vector3 Centre = App->SBC_Object->Get_BoundingBox_World_Centre(Index);
225+
230226 App->SBC_Scene->B_Object[Index]->Phys_Body->getWorldTransform().setOrigin(btVector3(Centre.x, Centre.y, Centre.z));
231227 UpDate_Physics_And_Visuals(Index);
232228 }
@@ -237,9 +233,8 @@
237233 App->SBC_Scene->B_Object[Index]->Object_Node->setPosition(Pos);
238234 App->SBC_Scene->B_Object[Index]->Mesh_Pos = Pos;
239235
240- AxisAlignedBox worldAAB = App->SBC_Scene->B_Object[Index]->Object_Ent->getBoundingBox();
241- worldAAB.transformAffine(App->SBC_Scene->B_Object[Index]->Object_Node->_getFullTransform());
242- Ogre::Vector3 Centre = worldAAB.getCenter();
236+ Ogre::Vector3 Centre = App->SBC_Object->Get_BoundingBox_World_Centre(Index);
237+
243238 App->SBC_Scene->B_Object[Index]->Phys_Body->getWorldTransform().setOrigin(btVector3(Centre.x, Centre.y, Centre.z));
244239 UpDate_Physics_And_Visuals(Index);
245240 }
@@ -250,9 +245,8 @@
250245 App->SBC_Scene->B_Object[Index]->Object_Node->setPosition(Pos);
251246 App->SBC_Scene->B_Object[Index]->Mesh_Pos = Pos;
252247
253- AxisAlignedBox worldAAB = App->SBC_Scene->B_Object[Index]->Object_Ent->getBoundingBox();
254- worldAAB.transformAffine(App->SBC_Scene->B_Object[Index]->Object_Node->_getFullTransform());
255- Ogre::Vector3 Centre = worldAAB.getCenter();
248+ Ogre::Vector3 Centre = App->SBC_Object->Get_BoundingBox_World_Centre(Index);
249+
256250 App->SBC_Scene->B_Object[Index]->Phys_Body->getWorldTransform().setOrigin(btVector3(Centre.x, Centre.y, Centre.z));
257251 UpDate_Physics_And_Visuals(Index);
258252 }
--- Anim19_OSDN/SB_Markers.cpp (revision 934)
+++ Anim19_OSDN/SB_Markers.cpp (revision 935)
@@ -100,9 +100,7 @@
100100 void SB_Markers::Update_Red_Axis_Marker(int Index)
101101 {
102102
103- AxisAlignedBox worldAAB = App->SBC_Scene->B_Object[Index]->Object_Ent->getBoundingBox();
104- worldAAB.transformAffine(App->SBC_Scene->B_Object[Index]->Object_Node->_getFullTransform());
105- Ogre::Vector3 Centre = worldAAB.getCenter();
103+ Ogre::Vector3 Centre = App->SBC_Object->Get_BoundingBox_World_Centre(Index);
106104
107105 App->SBC_Markers->RedAxis_Node->setPosition(Centre);
108106 App->SBC_Markers->RedAxis_Node->setVisible(true);
@@ -114,9 +112,7 @@
114112 void SB_Markers::Update_Green_Axis_Marker(int Index)
115113 {
116114
117- AxisAlignedBox worldAAB = App->SBC_Scene->B_Object[Index]->Object_Ent->getBoundingBox();
118- worldAAB.transformAffine(App->SBC_Scene->B_Object[Index]->Object_Node->_getFullTransform());
119- Ogre::Vector3 Centre = worldAAB.getCenter();
115+ Ogre::Vector3 Centre = App->SBC_Object->Get_BoundingBox_World_Centre(Index);
120116
121117 App->SBC_Markers->GreenAxis_Node->setPosition(Centre);
122118 App->SBC_Markers->GreenAxis_Node->setVisible(true);
@@ -128,9 +124,7 @@
128124 void SB_Markers::Update_Blue_Axis_Marker(int Index)
129125 {
130126
131- AxisAlignedBox worldAAB = App->SBC_Scene->B_Object[Index]->Object_Ent->getBoundingBox();
132- worldAAB.transformAffine(App->SBC_Scene->B_Object[Index]->Object_Node->_getFullTransform());
133- Ogre::Vector3 Centre = worldAAB.getCenter();
127+ Ogre::Vector3 Centre = App->SBC_Object->Get_BoundingBox_World_Centre(Index);
134128
135129 App->SBC_Markers->BlueAxis_Node->setPosition(Centre);
136130 App->SBC_Markers->BlueAxis_Node->setVisible(true);
Show on old repository browser