Browse Source

Add use of TransformState::make_pos_quat() in some places (#1116)

Fixes #1116
Stephen Imhoff 4 years ago
parent
commit
18873ffbf1
2 changed files with 3 additions and 4 deletions
  1. 2 3
      panda/src/bullet/bullet_utils.cxx
  2. 1 1
      pandatool/src/assimp/assimpLoader.cxx

+ 2 - 3
panda/src/bullet/bullet_utils.cxx

@@ -118,10 +118,9 @@ btTransform LMatrix4_to_btTrans(const LMatrix4 &m) {
  */
  */
 LMatrix4 btTrans_to_LMatrix4(const btTransform &trans) {
 LMatrix4 btTrans_to_LMatrix4(const btTransform &trans) {
 
 
-  return TransformState::make_pos_quat_scale(
+  return TransformState::make_pos_quat(
     btVector3_to_LVector3(trans.getOrigin()),
     btVector3_to_LVector3(trans.getOrigin()),
-    btQuat_to_LQuaternion(trans.getRotation()),
-    LVector3(1.0f, 1.0f, 1.0f))->get_mat();
+    btQuat_to_LQuaternion(trans.getRotation()))->get_mat();
 }
 }
 
 
 /**
 /**

+ 1 - 1
pandatool/src/assimp/assimpLoader.cxx

@@ -1035,7 +1035,7 @@ load_light(const aiLight &light) {
     LPoint3 pos (light.mPosition.x, light.mPosition.y, light.mPosition.z);
     LPoint3 pos (light.mPosition.x, light.mPosition.y, light.mPosition.z);
     LQuaternion quat;
     LQuaternion quat;
     ::look_at(quat, LPoint3(vec.x, vec.y, vec.z), LVector3::up());
     ::look_at(quat, LPoint3(vec.x, vec.y, vec.z), LVector3::up());
-    plight->set_transform(TransformState::make_pos_quat_scale(pos, quat, LVecBase3(1, 1, 1)));
+    plight->set_transform(TransformState::make_pos_quat(pos, quat));
     break; }
     break; }
 
 
   // This is a somewhat recent addition to Assimp, so let's be kind to those
   // This is a somewhat recent addition to Assimp, so let's be kind to those