TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-20 15:13:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'development' of https://github.com/TorqueGameEngines/Torque3D into Enumnanigans

Browse source
This commit is contained in:
AzaezelX 2024-07-24 17:58:27 -05:00
commit 72c67e196a
394 changed files with 49666 additions and 46898 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/T3D/fx/particleEmitter.h
View file

@ -232,7 +232,7 @@ class ParticleEmitter : public GameBase
void addParticle(const Point3F &pos, const Point3F &axis, const Point3F &vel, const Point3F &axisx, const U32 age_offset);
inline void setupBillboard( Particle *part,
void setupBillboard( Particle *part,
Point3F *basePts,
const MatrixF &camView,
const LinearColorF &ambientColor,

2
Engine/source/T3D/gameBase/moveManager.h
View file

@ -57,7 +57,7 @@ struct Move
bool trigger[MaxTriggerKeys];
Move();
virtual ~Move() {};
virtual void pack(BitStream *stream, const Move * move = NULL);
virtual void unpack(BitStream *stream, const Move * move = NULL);
virtual void clamp();

24
Engine/source/T3D/groundPlane.cpp
View file

@ -272,37 +272,35 @@ void GroundPlane::buildConvex( const Box3F& box, Convex* convex )
return;
// See if we already have a convex in the working set.
BoxConvex *boxConvex = NULL;
PlaneConvex *planeConvex = NULL;
CollisionWorkingList &wl = convex->getWorkingList();
CollisionWorkingList *itr = wl.wLink.mNext;
for ( ; itr != &wl; itr = itr->wLink.mNext )
{
if ( itr->mConvex->getType() == BoxConvexType &&
if ( itr->mConvex->getType() == PlaneConvexType &&
itr->mConvex->getObject() == this )
{
boxConvex = (BoxConvex*)itr->mConvex;
planeConvex = (PlaneConvex*)itr->mConvex;
break;
}
}
if ( !boxConvex )
if ( !planeConvex)
{
boxConvex = new BoxConvex;
mConvexList->registerObject( boxConvex );
boxConvex->init( this );
planeConvex = new PlaneConvex;
mConvexList->registerObject(planeConvex);
planeConvex->init( this );
convex->addToWorkingList( boxConvex );
convex->addToWorkingList(planeConvex);
}
// Update our convex to best match the queried box
if ( boxConvex )
if (planeConvex)
{
Point3F queryCenter = box.getCenter();
boxConvex->mCenter = Point3F( queryCenter.x, queryCenter.y, -GROUND_PLANE_BOX_HEIGHT_HALF );
boxConvex->mSize = Point3F( box.getExtents().x,
box.getExtents().y,
GROUND_PLANE_BOX_HEIGHT_HALF );
planeConvex->mCenter = Point3F( queryCenter.x, queryCenter.y, 0 );
planeConvex->mSize = Point3F( box.getExtents().x, box.getExtents().y, 0 );
}
}

6
Engine/source/T3D/player.cpp
View file

@ -4014,9 +4014,9 @@ void Player::updateActionThread()
mActionAnimation.callbackTripped = true;
}
if ((mActionAnimation.action == PlayerData::NullAnimation) ||
((!mActionAnimation.waitForEnd || mActionAnimation.atEnd) &&
(!mActionAnimation.holdAtEnd && (mActionAnimation.delayTicks -= !mMountPending) <= 0)))
if (mActionAnimation.action == PlayerData::NullAnimation || !mActionAnimation.waitForEnd || //either no animation or not waiting till the end
((mActionAnimation.atEnd && !mActionAnimation.holdAtEnd) && //or not holding that state and
(mActionAnimation.delayTicks -= mMountPending) <= 0)) //not waiting to mount
{
pickActionAnimation();
}

3
Engine/source/T3D/proximityMine.cpp
View file

@ -495,6 +495,9 @@ void ProximityMine::processTick( const Move* move )
return;
}
break;
default:
// just break out, unknown state, covers warnings for not fulfilling all possiblities in enum.
break;
}
}
}

3
Engine/source/T3D/sfx/sfxEmitter.cpp
View file

@ -407,8 +407,9 @@ U32 SFXEmitter::packUpdate(NetConnection* con, U32 mask, BitStream* stream)
stream->writeAffineTransform(mObjToWorld);
// track
if (stream->writeFlag(mask & DirtyUpdateMask))
if (stream->writeFlag(mask & DirtyUpdateMask)){
PACK_ASSET(con, Sound);
}
//if (stream->writeFlag(mDirty.test(Track)))
// sfxWrite( stream, mTrack );