TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-01 19:43:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'development' into EngineAPI-Refactor

Browse source
This commit is contained in:
Areloch 2018-12-09 14:48:50 -06:00 • committed by GitHub
commit 3a71c75596
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1937 changed files with 102332 additions and 70549 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/forest/editor/forestBrushElement.cpp
View file

@ -172,8 +172,8 @@ SimGroup* ForestBrush::getGroup()
bool ForestBrush::containsItemData( const ForestItemData *inData )
{
SimObjectList::iterator iter = objectList.begin();
for ( ; iter != objectList.end(); iter++ )
SimObjectList::iterator iter = mObjectList.begin();
for ( ; iter != mObjectList.end(); iter++ )
{
ForestBrushElement *pElement = dynamic_cast<ForestBrushElement*>(*iter);

2
Engine/source/forest/forestCollision.cpp
View file

@ -151,7 +151,7 @@ void ForestConvex::getFeatures( const MatrixF &mat, const VectorF &n, ConvexFeat
for (i = 0; i < numVerts; i++)
{
cf->mVertexList.increment();
U32 index = emitString[currPos++];
index = emitString[currPos++];
mat.mulP(pAccel->vertexList[index], &cf->mVertexList.last());
}

7
Engine/source/forest/forestWindEmitter.cpp
View file

@ -150,10 +150,10 @@ void ForestWind::processTick()
mCurrentInterp = 0;
mCurrentTarget.set( 0, 0 );
Point2F windDir( mDirection.x, mDirection.y );
windDir.normalizeSafe();
Point2F windNorm( mDirection.x, mDirection.y );
windNorm.normalizeSafe();
mCurrentTarget = finalVec + windDir;
mCurrentTarget = finalVec + windNorm;
}
else
{
@ -179,6 +179,7 @@ void ForestWind::setStrengthAndDirection( F32 strength, const VectorF &direction
{
mStrength = strength;
mDirection = direction;
mCurrentTarget.zero();
mIsDirty = true;
}
}

2
Engine/source/forest/ts/tsForestItemData.h
View file

@ -88,7 +88,7 @@ public:
const Vector<S32>& getLOSDetails() const { return mLOSDetails; }
// ForestItemData
const Box3F& getObjBox() const { return mShape ? mShape->bounds : Box3F::Zero; }
const Box3F& getObjBox() const { return mShape ? mShape->mBounds : Box3F::Zero; }
bool render( TSRenderState *rdata, const ForestItem& item ) const;
ForestCellBatch* allocateBatch() const;
bool canBillboard( const SceneRenderState *state, const ForestItem &item, F32 distToCamera ) const;