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

Merge branch 'GarageGames/development' into ueberengine-dev

Browse source
This commit is contained in:
Duion 2015-08-06 20:05:32 +02:00
commit 683a11e384
273 changed files with 4702 additions and 3631 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -918,7 +918,7 @@ void DICreateUndoAction::initPersistFields()
Parent::initPersistFields();
}
void DICreateUndoAction::addDecal( DecalInstance decal )
void DICreateUndoAction::addDecal(const DecalInstance& decal)
{
mDecalInstance = decal;
mDatablockId = decal.mDataBlock->getId();
@ -1006,7 +1006,7 @@ void DIDeleteUndoAction::initPersistFields()
Parent::initPersistFields();
}
void DIDeleteUndoAction::deleteDecal( DecalInstance decal )
void DIDeleteUndoAction::deleteDecal(const DecalInstance& decal)
{
mDecalInstance = decal;
mDatablockId = decal.mDataBlock->getId();
@ -1094,7 +1094,7 @@ void DBDeleteUndoAction::initPersistFields()
Parent::initPersistFields();
}
void DBDeleteUndoAction::deleteDecal( DecalInstance decal )
void DBDeleteUndoAction::deleteDecal(const DecalInstance& decal)
{
mDecalInstanceVec.increment();
mDecalInstanceVec.last() = decal;

6
Engine/source/gui/worldEditor/guiDecalEditorCtrl.h
View file

@ -129,7 +129,7 @@ public:
DICreateUndoAction( const UTF8* actionName = "Create Decal " );
virtual ~DICreateUndoAction();
void addDecal( DecalInstance decal );
void addDecal(const DecalInstance& decal);
// UndoAction
virtual void undo();
@ -159,7 +159,7 @@ public:
virtual ~DIDeleteUndoAction();
///
void deleteDecal( DecalInstance decal );
void deleteDecal(const DecalInstance& decal);
// UndoAction
virtual void undo();
@ -188,7 +188,7 @@ public:
DBDeleteUndoAction( const UTF8* actionName = "Delete Decal Datablock" );
virtual ~DBDeleteUndoAction();
void deleteDecal( DecalInstance decal );
void deleteDecal(const DecalInstance& decal);
// UndoAction
virtual void undo();

3
Engine/source/gui/worldEditor/guiMissionArea.cpp
View file

@ -357,9 +357,6 @@ GBitmap * GuiMissionAreaCtrl::createTerrainBitmap()
GBitmap * bitmap = new GBitmap(mTerrainBlock->getBlockSize(), mTerrainBlock->getBlockSize(), false, GFXFormatR8G8B8 );
if(!bitmap)
return NULL;
// get the min/max
F32 min, max;
mTerrainBlock->getMinMaxHeight(&min, &max);

4
Engine/source/gui/worldEditor/tSelection.h
View file

@ -66,7 +66,7 @@ template<class T> inline void Selection<T>::offset( const Point3F &delta )
{
typename Selection<T>::iterator itr = this->begin();
for ( ; itr != this->end(); itr++ )
for (; itr != this->end(); ++itr)
offsetObject( *itr, delta );
}
@ -75,7 +75,7 @@ template<class T> inline void Selection<T>::rotate( const EulerF &delta )
typename Selection<T>::iterator itr = this->begin();
Point3F origin = getOrigin();
for ( ; itr != this->end(); itr++ )
for (; itr != this->end(); ++itr)
rotateObject( *itr, delta, origin );
}

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;

4
Engine/source/gui/worldEditor/undoActions.h
View file

@ -30,7 +30,9 @@
#include "console/simObjectMemento.h"
#endif
class GuiInspectorField;
// Need full definition visible for SimObjectPtr<GuiInspectorField>
#include "gui/editor/inspector/field.h"
class GuiInspector;
class MECreateUndoAction : public UndoAction

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;
}
//