TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-12 23:24:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

code review:

Browse source 
1) got rid of evey class having it's own gravity
2) rigidshape inheritance simplifications
3) gravitymod from physicszones taking buoyancy into account natively (we still track raw bouyancy to cancel it out for player)
4) disableMove used throughout
5) items can now also be influenced by the appliedforce from physicszones
This commit is contained in:
AzaezelX 2020-10-02 13:53:46 -05:00
parent 76c5e30869
commit afb39d398f
13 changed files with 191 additions and 487 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Engine/source/T3D/rigidShape.h
View file

@ -31,12 +31,14 @@
#ifndef _BOXCONVEX_H_
#include "collision/boxConvex.h"
#endif
#ifndef _T3D_PHYSICS_PHYSICSBODY_H_
#include "T3D/physics/physicsBody.h"
#endif
class ParticleEmitter;
class ParticleEmitterData;
class ClippedPolyList;
class RigidShapeData : public ShapeBaseData
{
typedef ShapeBaseData Parent;
@ -112,6 +114,8 @@ class RigidShapeData : public ShapeBaseData
F32 splashFreqMod;
F32 splashVelEpsilon;
bool enablePhysicsRep;
F32 dragForce;
F32 vertFactor;
@ -132,6 +136,9 @@ class RigidShapeData : public ShapeBaseData
DECLARE_CONOBJECT(RigidShapeData);
DECLARE_CALLBACK(void, onEnterLiquid, (RigidShape* obj, F32 coverage, const char* type));
DECLARE_CALLBACK(void, onLeaveLiquid, (RigidShape* obj, const char* type));
};
@ -177,6 +184,8 @@ class RigidShape: public ShapeBase
Point3F cameraRotVec;
};
PhysicsBody* mPhysicsRep;
StateDelta mDelta;
S32 mPredictionCount; ///< Number of ticks to predict
bool inLiquid;
@ -196,6 +205,9 @@ class RigidShape: public ShapeBase
GFXStateBlockRef mSolidSB;
Box3F mWorkingQueryBox;
S32 mWorkingQueryBoxCountDown;
//
bool onNewDataBlock( GameBaseData *dptr, bool reload );
void updatePos(F32 dt);
@ -203,7 +215,6 @@ class RigidShape: public ShapeBase
bool resolveCollision(Rigid& ns,CollisionList& cList);
bool resolveContacts(Rigid& ns,CollisionList& cList,F32 dt);
bool resolveDisplacement(Rigid& ns,CollisionState *state,F32 dt);
bool findContacts(Rigid& ns,CollisionList& cList);
void checkTriggers();
static void findCallback(SceneObject* obj,void * key);
@ -227,7 +238,7 @@ class RigidShape: public ShapeBase
void _renderMassAndContacts( ObjectRenderInst *ri, SceneRenderState *state, BaseMatInstance *overrideMat );
void updateForces(F32);
void updateForces(F32 dt);
public:
// Test code...
@ -238,11 +249,13 @@ public:
RigidShape();
~RigidShape();
static void consoleInit();
static void initPersistFields();
void processTick(const Move *move);
bool onAdd();
void onRemove();
void _createPhysics();
/// Interpolates between move ticks @see processTick
/// @param dt Change in time between the last call and this call to the function
void interpolateTick(F32 dt);
@ -291,8 +304,6 @@ public:
void unpackUpdate(NetConnection *conn, BitStream *stream);
DECLARE_CONOBJECT(RigidShape);
DECLARE_CALLBACK( void, onEnterLiquid, ( const char* objId, F32 waterCoverage, const char* liquidType ));
DECLARE_CALLBACK( void, onLeaveLiquid, ( const char* objId, const char* liquidType ));
};