TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-28 15:53:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fixes #1116
This commit is contained in:
Stephen Imhoff 2021-02-19 19:41:19 +00:00 committed by rdb
parent a196f1adcc
commit 18873ffbf1
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
panda/src/bullet/bullet_utils.cxx
View File

@ -118,10 +118,9 @@ btTransform LMatrix4_to_btTrans(const LMatrix4 &m) {
*/
LMatrix4 btTrans_to_LMatrix4(const btTransform &trans) {
return TransformState::make_pos_quat_scale(
return TransformState::make_pos_quat(
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();
}
/**

2
pandatool/src/assimp/assimpLoader.cxx
View File

@ -1035,7 +1035,7 @@ load_light(const aiLight &light) {
LPoint3 pos (light.mPosition.x, light.mPosition.y, light.mPosition.z);
LQuaternion quat;
::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; }
// This is a somewhat recent addition to Assimp, so let's be kind to those