TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-14 16:14:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #839 from eightyeight/bank-fixes

Browse source 
Some engine fixes
This commit is contained in:
Daniel Buckmaster 2014-10-19 14:33:10 +11:00
commit 7162fd609d
6 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Engine/source/T3D/debris.cpp
View file

@ -99,7 +99,6 @@ DebrisData::DebrisData()
friction = 0.2f; friction = 0.2f;
numBounces = 0; numBounces = 0;
bounceVariance = 0; bounceVariance = 0;
minSpinSpeed = maxSpinSpeed = 0.0;
staticOnMaxBounce = false; staticOnMaxBounce = false;
explodeOnMaxBounce = false; explodeOnMaxBounce = false;
snapOnMaxBounce = false; snapOnMaxBounce = false;

4
Engine/source/T3D/turret/turretShape.cpp
View file

@ -1155,7 +1155,7 @@ void TurretShape::unpackUpdate(NetConnection *connection, BitStream *stream)
void TurretShape::getWeaponMountTransform( S32 index, const MatrixF &xfm, MatrixF *outMat ) void TurretShape::getWeaponMountTransform( S32 index, const MatrixF &xfm, MatrixF *outMat )
{ {
// Returns mount point to world space transform // Returns mount point to world space transform
if ( index >= 0 && index < SceneObject::NumMountPoints) { if ( index >= 0 && index < ShapeBase::MaxMountedImages) {
S32 ni = mDataBlock->weaponMountNode[index]; S32 ni = mDataBlock->weaponMountNode[index];
if (ni != -1) { if (ni != -1) {
MatrixF mountTransform = mShapeInstance->mNodeTransforms[ni]; MatrixF mountTransform = mShapeInstance->mNodeTransforms[ni];
@ -1180,7 +1180,7 @@ void TurretShape::getWeaponMountTransform( S32 index, const MatrixF &xfm, Matrix
void TurretShape::getRenderWeaponMountTransform( F32 delta, S32 mountPoint, const MatrixF &xfm, MatrixF *outMat ) void TurretShape::getRenderWeaponMountTransform( F32 delta, S32 mountPoint, const MatrixF &xfm, MatrixF *outMat )
{ {
// Returns mount point to world space transform // Returns mount point to world space transform
if ( mountPoint >= 0 && mountPoint < SceneObject::NumMountPoints) { if ( mountPoint >= 0 && mountPoint < ShapeBase::MaxMountedImages) {
S32 ni = mDataBlock->weaponMountNode[mountPoint]; S32 ni = mDataBlock->weaponMountNode[mountPoint];
if (ni != -1) { if (ni != -1) {
MatrixF mountTransform = mShapeInstance->mNodeTransforms[ni]; MatrixF mountTransform = mShapeInstance->mNodeTransforms[ni];

4
Engine/source/console/fileSystemFunctions.cpp
View file

@ -696,7 +696,7 @@ DefineEngineFunction(makeFullPath, String, ( const char* path, const char* cwd )
"@ingroup FileSystem") "@ingroup FileSystem")
{ {
static const U32 bufSize = 512; static const U32 bufSize = 512;
char *buf = Con::getReturnBuffer(buf); char *buf = Con::getReturnBuffer(bufSize);
Platform::makeFullPathName(path, buf, bufSize, dStrlen(cwd) > 1 ? cwd : NULL); Platform::makeFullPathName(path, buf, bufSize, dStrlen(cwd) > 1 ? cwd : NULL);
return buf; return buf;
} }
@ -723,7 +723,7 @@ DefineEngineFunction(pathConcat, String, ( const char* path, const char* file),,
"@ingroup FileSystem") "@ingroup FileSystem")
{ {
static const U32 bufSize = 1024; static const U32 bufSize = 1024;
char *buf = Con::getReturnBuffer(buf); char *buf = Con::getReturnBuffer(bufSize);
Platform::makeFullPathName(file, buf, bufSize, path); Platform::makeFullPathName(file, buf, bufSize, path);
return buf; return buf;
} }

2
Engine/source/materials/processedFFMaterial.cpp
View file

@ -368,7 +368,7 @@ void ProcessedFFMaterial::_initPassStateBlock( RenderPassData *rpd, GFXStateBloc
result.blendDefined = true; result.blendDefined = true;
result.blendEnable = true; result.blendEnable = true;
result.blendSrc = GFXBlendOne; result.blendSrc = GFXBlendOne;
result.blendSrc = GFXBlendOne; result.blendDest = GFXBlendZero;
} }
// This is here for generic FF shader fallbacks. // This is here for generic FF shader fallbacks.

1
Engine/source/renderInstance/renderBinManager.cpp
View file

@ -122,7 +122,6 @@ void RenderBinManager::internalAddElement(RenderInst* inst)
mElementList.increment(); mElementList.increment();
MainSortElem &elem = mElementList.last(); MainSortElem &elem = mElementList.last();
elem.inst = inst; elem.inst = inst;
elem.key = elem.key2 = 0;
elem.key = inst->defaultKey; elem.key = inst->defaultKey;
elem.key2 = inst->defaultKey2; elem.key2 = inst->defaultKey2;

1
Engine/source/scene/simPath.cpp
View file

@ -371,7 +371,6 @@ Marker::Marker()
mTypeMask |= MarkerObjectType; mTypeMask |= MarkerObjectType;
mSeqNum = 0; mSeqNum = 0;
mSmoothingType = SmoothingTypeLinear;
mMSToNext = 1000; mMSToNext = 1000;
mSmoothingType = SmoothingTypeSpline; mSmoothingType = SmoothingTypeSpline;
mKnotType = KnotTypeNormal; mKnotType = KnotTypeNormal;