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

bounds to mBounds conflict avoidance

Browse source
This commit is contained in:
Azaezel 2018-03-13 01:05:15 -05:00
parent f08339c534
commit 242a51eefe
22 changed files with 50 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Engine/source/ts/tsShape.cpp
View file

@ -1198,7 +1198,7 @@ void TSShape::assembleShape()
tsalloc.get32((S32*)&radius,1);
tsalloc.get32((S32*)&tubeRadius,1);
tsalloc.get32((S32*)&center,3);
tsalloc.get32((S32*)&bounds,6);
tsalloc.get32((S32*)&mBounds,6);
tsalloc.checkGuard();
@ -1673,7 +1673,7 @@ void TSShape::disassembleShape()
tsalloc.copyToBuffer32((S32*)&radius,1);
tsalloc.copyToBuffer32((S32*)&tubeRadius,1);
tsalloc.copyToBuffer32((S32*)&center,3);
tsalloc.copyToBuffer32((S32*)&bounds,6);
tsalloc.copyToBuffer32((S32*)&mBounds,6);
tsalloc.setGuard();
@ -2063,8 +2063,8 @@ void TSShape::createEmptyShape()
radius = 0.866025f;
tubeRadius = 0.707107f;
center.set(0.0f, 0.5f, 0.0f);
bounds.minExtents.set(-0.5f, 0.0f, -0.5f);
bounds.maxExtents.set(0.5f, 1.0f, 0.5f);
mBounds.minExtents.set(-0.5f, 0.0f, -0.5f);
mBounds.maxExtents.set(0.5f, 1.0f, 0.5f);
mExporterVersion = 124;
mSmallestVisibleSize = 2;