TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-29 08:15:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1352 from Areloch/PVS_Cleanup_807

Browse source 
Unnecessarily repeated expressions
This commit is contained in:
Daniel Buckmaster 2015-07-16 15:45:32 +10:00
commit 86e0e67496
38 changed files with 465 additions and 371 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Engine/source/gui/worldEditor/terrainEditor.cpp
View file

@ -1449,14 +1449,15 @@ void TerrainEditor::renderSelection( const Selection & sel, const ColorF & inCol
// walk the points in the selection
for(U32 i = 0; i < sel.size(); i++)
{
Point2I gPos = sel[i].mGridPoint.gridPos;
GridPoint selectedGridPoint = sel[i].mGridPoint;
Point2I gPos = selectedGridPoint.gridPos;
GFXVertexPC *verts = &(vertexBuffer[i * 5]);
bool center = gridToWorld(sel[i].mGridPoint, verts[0].point);
gridToWorld(Point2I(gPos.x + 1, gPos.y), verts[1].point, sel[i].mGridPoint.terrainBlock);
gridToWorld(Point2I(gPos.x + 1, gPos.y + 1), verts[2].point, sel[i].mGridPoint.terrainBlock);
gridToWorld(Point2I(gPos.x, gPos.y + 1), verts[3].point, sel[i].mGridPoint.terrainBlock);
bool center = gridToWorld(selectedGridPoint, verts[0].point);
gridToWorld(Point2I(gPos.x + 1, gPos.y), verts[1].point, selectedGridPoint.terrainBlock);
gridToWorld(Point2I(gPos.x + 1, gPos.y + 1), verts[2].point, selectedGridPoint.terrainBlock);
gridToWorld(Point2I(gPos.x, gPos.y + 1), verts[3].point, selectedGridPoint.terrainBlock);
verts[4].point = verts[0].point;
F32 weight = sel[i].mWeight;

9
Engine/source/gui/worldEditor/worldEditor.cpp
View file

@ -1631,10 +1631,11 @@ void WorldEditor::renderScreenObj( SceneObject *obj, const Point3F& projPos, con
// Save an IconObject for performing icon-click testing later.
mIcons.increment();
mIcons.last().object = obj;
mIcons.last().rect = renderRect;
mIcons.last().dist = projPos.z;
mIcons.last().alpha = iconAlpha;
IconObject& lastIcon = mIcons.last();
lastIcon.object = obj;
lastIcon.rect = renderRect;
lastIcon.dist = projPos.z;
lastIcon.alpha = iconAlpha;
}
//