From 744cfc6a5174ec27397e80a945a79e0f52ce4adc Mon Sep 17 00:00:00 2001
From: fredzio <chardon.frederic@gmail.com>
Date: Sat, 17 Jul 2021 08:56:43 +0200
Subject: [PATCH] Do not store a btTransform into Projectile class: reduce its
 size by 112 bytes

---
 apps/openmw/mwphysics/projectile.cpp | 11 +++++------
 apps/openmw/mwphysics/projectile.hpp |  5 +++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/openmw/mwphysics/projectile.cpp b/apps/openmw/mwphysics/projectile.cpp
index 252da0a687..0e233562c2 100644
--- a/apps/openmw/mwphysics/projectile.cpp
+++ b/apps/openmw/mwphysics/projectile.cpp
@@ -3,14 +3,11 @@
 #include <BulletCollision/CollisionShapes/btSphereShape.h>
 #include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
 
-#include <LinearMath/btVector3.h>
-
 #include <components/misc/convert.hpp>
 
 #include "../mwworld/class.hpp"
 
 #include "collisiontype.hpp"
-#include "memory"
 #include "mtphysics.hpp"
 #include "projectile.hpp"
 
@@ -55,7 +52,9 @@ void Projectile::commitPositionChange()
     std::scoped_lock lock(mMutex);
     if (mTransformUpdatePending)
     {
-        mCollisionObject->setWorldTransform(mLocalTransform);
+        auto& trans = mCollisionObject->getWorldTransform();
+        trans.setOrigin(Misc::Convert::toBullet(mPosition));
+        mCollisionObject->setWorldTransform(trans);
         mTransformUpdatePending = false;
     }
 }
@@ -63,14 +62,14 @@ void Projectile::commitPositionChange()
 void Projectile::setPosition(const osg::Vec3f &position)
 {
     std::scoped_lock lock(mMutex);
-    mLocalTransform.setOrigin(Misc::Convert::toBullet(position));
+    mPosition = position;
     mTransformUpdatePending = true;
 }
 
 osg::Vec3f Projectile::getPosition() const
 {
     std::scoped_lock lock(mMutex);
-    return Misc::Convert::toOsg(mLocalTransform.getOrigin());
+    return mPosition;
 }
 
 bool Projectile::canTraverseWater() const
diff --git a/apps/openmw/mwphysics/projectile.hpp b/apps/openmw/mwphysics/projectile.hpp
index 81c33d2a5e..2ce1a72d5b 100644
--- a/apps/openmw/mwphysics/projectile.hpp
+++ b/apps/openmw/mwphysics/projectile.hpp
@@ -6,12 +6,13 @@
 #include <mutex>
 #include <optional>
 
+#include <LinearMath/btVector3.h>
+
 #include "ptrholder.hpp"
 
 class btCollisionObject;
 class btCollisionShape;
 class btConvexShape;
-class btVector3;
 
 namespace osg
 {
@@ -76,7 +77,6 @@ namespace MWPhysics
         btConvexShape* mConvexShape;
 
         std::unique_ptr<btCollisionObject> mCollisionObject;
-        btTransform mLocalTransform;
         bool mTransformUpdatePending;
         bool mCanCrossWaterSurface;
         bool mCrossedWaterSurface;
@@ -84,6 +84,7 @@ namespace MWPhysics
         MWWorld::Ptr mCaster;
         MWWorld::Ptr mHitTarget;
         std::optional<btVector3> mWaterHitPosition;
+        osg::Vec3f mPosition;
         btVector3 mHitPosition;
         btVector3 mHitNormal;