Merge pull request #1815 from Areloch/StaticShapePhysRepFix

Implements mPhysicsRep to StaticShape

Author: Azaezel

Engine/source/T3D/staticShape.cpp

@@ -39,6 +39,9 @@
 #include "math/mathIO.h"
 #include "sim/netConnection.h"
 #include "scene/sceneObjectLightingPlugin.h"
+#include "T3D/physics/physicsPlugin.h"
+#include "T3D/physics/physicsBody.h"
+#include "T3D/physics/physicsCollision.h"
 
 extern void wireCube(F32 size,Point3F pos);
 
@@ -183,6 +186,8 @@ StaticShape::StaticShape()
 {
    mTypeMask |= StaticShapeObjectType | StaticObjectType;
    mDataBlock = 0;
+
+   mPhysicsRep = NULL;
 }
 
 StaticShape::~StaticShape()
@@ -208,6 +213,8 @@ bool StaticShape::onAdd()
 
    addToScene();
 
+   _updatePhysics();
+
    if (isServerObject())
       scriptOnAdd();
    return true;
@@ -219,6 +226,8 @@ bool StaticShape::onNewDataBlock(GameBaseData* dptr, bool reload)
    if (!mDataBlock || !Parent::onNewDataBlock(dptr, reload))
       return false;
 
+   _updatePhysics();
+
    scriptOnNewDataBlock(reload);
    return true;
 }
@@ -227,9 +236,32 @@ void StaticShape::onRemove()
 {
    scriptOnRemove();
    removeFromScene();
+
+   SAFE_DELETE(mPhysicsRep);
+
    Parent::onRemove();
 }
 
+//----------------------------------------------------------------------------
+
+void StaticShape::_updatePhysics()
+{
+   if (PHYSICSMGR)
+   {
+      PhysicsCollision* colShape = NULL;
+
+      Resource<TSShape> shape = mDataBlock->shapeAssetRef.assetPtr->getShapeResource();
+      colShape = shape->buildColShape(true, getScale());
+
+      if (colShape)
+      {
+         PhysicsWorld* world = PHYSICSMGR->getWorld(isServerObject() ? "server" : "client");
+         mPhysicsRep = PHYSICSMGR->createBody();
+         mPhysicsRep->init(colShape, 0, 0, this, world);
+         mPhysicsRep->setTransform(getTransform());
+      }
+   }
+}
 
 //----------------------------------------------------------------------------
 
@@ -255,6 +287,10 @@ void StaticShape::interpolateTick(F32 delta)
 void StaticShape::setTransform(const MatrixF& mat)
 {
    Parent::setTransform(mat);
+
+   if (mPhysicsRep)
+      mPhysicsRep->setTransform(mat);
+
    setMaskBits(PositionMask);
 }
 

Engine/source/T3D/staticShape.h

@@ -32,6 +32,8 @@
 #include "T3D/shapeBase.h"
 #endif
 
+class PhysicsBody;
+
 //----------------------------------------------------------------------------
 
 struct StaticShapeData: public ShapeBaseData {
@@ -65,6 +67,8 @@ class StaticShape: public ShapeBase
    StaticShapeData*  mDataBlock;
    bool              mPowered;
 
+   PhysicsBody*      mPhysicsRep;
+
    void onUnmount(SceneObject* obj,S32 node) override;
 
 protected:
@@ -73,6 +77,8 @@ class StaticShape: public ShapeBase
       NextFreeMask = Parent::NextFreeMask << 1
    };
 
+   void _updatePhysics();
+
 public:
    DECLARE_CONOBJECT(StaticShape);
    DECLARE_CATEGORY("Object \t Destructable");