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

gfxDrawutil, gizmo shadowvar cleanups

Browse source
This commit is contained in:
Azaezel 2018-03-15 20:44:13 -05:00
parent 46bbb88d71
commit 870acaf5e4
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Engine/source/gfx/gfxDrawUtil.cpp
View file

@ -1041,9 +1041,9 @@ void GFXDrawUtil::_drawSolidPolyhedron( const GFXStateBlockDesc &desc, const Any
continue;
}
U32 numPoints = poly.extractFace( i, &indices[ idx ], numIndices - idx );
numIndicesForPoly[ numPolys ] = numPoints;
idx += numPoints;
U32 polyIDx = poly.extractFace( i, &indices[ idx ], numIndices - idx );
numIndicesForPoly[ numPolys ] = polyIDx;
idx += polyIDx;
numPolys ++;
}
@ -1083,11 +1083,11 @@ void GFXDrawUtil::drawObjectBox( const GFXStateBlockDesc &desc, const Point3F &s
PrimBuild::color( color );
PrimBuild::begin( GFXLineList, 48 );
static const Point3F cubePoints[8] =
Point3F cubePts[8];
for (U32 i = 0; i < 8; i++)
{
Point3F(-0.5, -0.5, -0.5), Point3F(-0.5, -0.5, 0.5), Point3F(-0.5, 0.5, -0.5), Point3F(-0.5, 0.5, 0.5),
Point3F( 0.5, -0.5, -0.5), Point3F( 0.5, -0.5, 0.5), Point3F( 0.5, 0.5, -0.5), Point3F( 0.5, 0.5, 0.5)
};
cubePts[i] = cubePoints[i]/2;
}
// 8 corner points of the box
for ( U32 i = 0; i < 8; i++ )

6
Engine/source/gui/worldEditor/gizmo.cpp
View file

@ -612,12 +612,12 @@ bool Gizmo::collideAxisGizmo( const Gui3DMouseEvent & event )
Point3F(mOrigin + (p1 + p2) * scale)
};
Point3F end = camPos + event.vec * smProjectDistance;
F32 t = plane.intersect(camPos, end);
Point3F endProj = camPos + event.vec * smProjectDistance;
F32 t = plane.intersect(camPos, endProj);
if ( t >= 0 && t <= 1 )
{
Point3F pos;
pos.interpolate(camPos, end, t);
pos.interpolate(camPos, endProj, t);
// check if inside our 'poly' of this axisIdx vector...
bool inside = true;