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

Tweaked the naming convention to a) be more in line with the prefab creation functions, and b) avoid common artist terminologies that may lead to confusion on what it does.

Browse source
This commit is contained in:
Areloch 2016-12-11 23:02:13 -06:00
parent 8ec88a26b6
commit eb2d3a908a
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3753,18 +3753,18 @@ void WorldEditor::explodeSelectedPrefab()
setDirty();
}
void WorldEditor::bakeSelectionToMesh(const char *filename)
void WorldEditor::makeSelectionAMesh(const char *filename)
{
if (mSelected->size() == 0)
{
Con::errorf("WorldEditor::makeSelectionPrefab - Nothing selected.");
Con::errorf("WorldEditor::makeSelectionAMesh - Nothing selected.");
return;
}
SimGroup *missionGroup;
if (!Sim::findObject("MissionGroup", missionGroup))
{
Con::errorf("WorldEditor::makeSelectionPrefab - Could not find MissionGroup.");
Con::errorf("WorldEditor::makeSelectionAMesh - Could not find MissionGroup.");
return;
}
@ -3918,11 +3918,11 @@ DefineEngineMethod( WorldEditor, explodeSelectedPrefab, void, (),,
object->explodeSelectedPrefab();
}
DefineEngineMethod(WorldEditor, bakeSelectionToMesh, void, (const char* filename), ,
DefineEngineMethod(WorldEditor, makeSelectionAMesh, void, (const char* filename), ,
"Save selected objects to a .dae collada file and replace them in the level with a TSStatic object."
"@param filename collada file to save the selected objects to.")
{
object->bakeSelectionToMesh(filename);
object->makeSelectionAMesh(filename);
}
DefineEngineMethod( WorldEditor, mountRelative, void, ( SceneObject *objA, SceneObject *objB ),,

2
Engine/source/gui/worldEditor/worldEditor.h
View file

@ -117,7 +117,7 @@ class WorldEditor : public EditTSCtrl
void makeSelectionPrefab( const char *filename );
void explodeSelectedPrefab();
void bakeSelectionToMesh(const char *filename);
void makeSelectionAMesh(const char *filename);
//
static SceneObject* getClientObj(SceneObject *);

4
Templates/Full/game/tools/worldEditor/scripts/menuHandlers.ed.cs
View file

@ -555,7 +555,7 @@ function EditorExplodePrefab()
EditorTree.buildVisibleTree( true );
}
function bakeSelectedToMesh()
function makeSelectedAMesh()
{
%dlg = new SaveFileDialog()
@ -582,7 +582,7 @@ function bakeSelectedToMesh()
if ( !%ret )
return;
EWorldEditor.bakeSelectionToMesh( %saveFile );
EWorldEditor.makeSelectionAMesh( %saveFile );
EditorTree.buildVisibleTree( true );
}

2
Templates/Full/game/tools/worldEditor/scripts/menus.ed.cs
View file

@ -263,7 +263,7 @@ function EditorGui::buildMenus(%this)
item[0] = "Network Graph" TAB "n" TAB "toggleNetGraph();";
item[1] = "Profiler" TAB "ctrl F2" TAB "showMetrics(true);";
item[2] = "Bake Selected to Mesh" TAB "" TAB "bakeSelectedToMesh();";
item[2] = "Make Selected a Mesh" TAB "" TAB "makeSelectedAMesh();";
};
%this.menuBar.insert(%toolsMenu, %this.menuBar.getCount());