mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-14 16:14:38 +00:00
- Fixes the display of the preview in the MaterialAsset fields
- Hides the special-case direct filepath field for ShapeAsset persist fields macro - Shifts the handling of TSStatics so the shape instance will load materials on the server as well as the client. This opens gameplay options as well as allowing rebaking of meshes functionality more easily - Expands AssetBase's isValidAsset utility function to actually check validity instead of just returning true - Adds isValid utility function to AssetPtr - Added new field flag that makes the field not write out to file - Removed legacy iconBitmap field from GuiIconButtonCtrl because it was causing errors - Fixed group filtering check of guiInspector to ignore case - Removed unneeded isFile checks for common datablock script files in Prototyping module script - Removed test datablocks from Prototyping module - Removed unnecessary container control from AssetBrowser - Adjusted preview regen logic of AssetBrowser so it doesn't trip if you're simply resizing the window - Fixed issue where row-vs-column layout logic for AssetBrowser when resizing window was fiddly - Added handling for when Dragging and Dropping datablock from AssetBrowser to spawn, it'll prompt if it spawns the actual object, or a spawnsphere that spawns said object. In the event of an PlayerData will also prompt if it should spawn an AIPlayer - Added ability to take a TSStatic that uses a baked down mesh and are able to restore it to the cache prefab, or trigger and in-place rebake to refresh it if something has changed in the original contents via RMB menu on the scene tree - Added ability to explode prefab to RMB menu on scene tree - Added ability to convert selection to prefab or bake to mesh in RMB menu on scene tree - Tweaked sizing of the DatablockEditorCreatePrompt window to not have cut off elements and easier to see/work with - Added sanity check to datablock editor creation - Fixed preview display of material in Decal Editor - Made compositeTextureEditor use the cached preview of images - Fixed sizing/spacing of gui selection dropdown as well as resolution dropdown of GuiEditor - Fixes MaterialEditor to properly save the group collapse state when editing - Adds ability to in-flow edit and create datablocks in the NavMesh Editor for the testing panel, and makes the datablock dropdown searchable - Fixed issue where opening the ShapeEditor via the edit button on a ShapeAsset field would cause the action buttons on the top bar to not show - Fixed error in shape editor where when exiting it was erroneously checking for a clear value of -1 rather than 0 - Removed unneeded top tabbook and tab page for main editor panel - Fixed issue where reset button of TerrainBrush Softness Curve editor didn't actually reset - Resized Object Builder window to not cut off elements and have enough width to show more data - Added a TypeCommand field type to Object Builder and changed spawnscript field of SpawnSphere to use it rather than a simple text edit field - Allow SpawnSphere in ObjectBuilder to be passed in spawn class and spawn datablock default info - Injects button to controllable objects when Inspecting them to make it easy to toggle if you're in control of it or not -
This commit is contained in:
JeffR
parent
2af8bf25d5
commit
9c654d7932
37 changed files with 728 additions and 346 deletions
|
|
@ -32,30 +32,11 @@ $guiContent = new GuiContainer(EditorGui,EditorGuiGroup) {
|
|||
isDecoy = "1";
|
||||
};
|
||||
|
||||
new GuiTabBookCtrl(EditorGuiMainTabBook) {
|
||||
tabHeight = "20";
|
||||
selectedPage = "0";
|
||||
position = "0 5";
|
||||
extent = "800 595";
|
||||
horizSizing = "width";
|
||||
vertSizing = "height";
|
||||
profile = "ToolsGuiTabBookProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
|
||||
new GuiTabPageCtrl(MainSceneEditorTab) {
|
||||
text = "Main Scene";
|
||||
position = 0 SPC 20;
|
||||
extent = 800 SPC 580;
|
||||
horizSizing = "width";
|
||||
vertSizing = "height";
|
||||
profile = "ToolsGuiTabPageProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
|
||||
new GuiContainer(MainSceneTabPanel) {
|
||||
HorizSizing = "width";
|
||||
VertSizing = "height";
|
||||
Position = "0 0";
|
||||
Extent = "800 580";
|
||||
Position = "0 5";
|
||||
Extent = "800 595";
|
||||
|
||||
new WorldEditor(EWorldEditor) {
|
||||
canSaveDynamicFields = "0";
|
||||
|
|
@ -1569,7 +1550,5 @@ $guiContent = new GuiContainer(EditorGui,EditorGuiGroup) {
|
|||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
//--- OBJECT WRITE END ---
|
||||
|
|
|
|||
|
|
@ -228,5 +228,5 @@ function TerrainBrushSoftnessCurveDlg::onOk( %this )
|
|||
function TerrainBrushSoftnessCurveDlg::resetCurve( %this )
|
||||
{
|
||||
%curve = %this-->FilterCurveCtrl;
|
||||
%curve.identity();
|
||||
%curve.resetFiltering();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,106 +1,76 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
$guiContent = new GuiControl(ObjectBuilderGui, EditorGuiGroup) {
|
||||
profile = "ToolsGuiDefaultProfile";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
position = "0 0";
|
||||
extent = "800 600";
|
||||
minExtent = "8 8";
|
||||
visible = "1";
|
||||
setFirstResponder = "0";
|
||||
modal = "1";
|
||||
helpTag = "0";
|
||||
$guiContent = new GuiControl(ObjectBuilderGui,EditorGuiGroup) {
|
||||
extent = "1920 1080";
|
||||
minExtent = "8 8";
|
||||
profile = "ToolsGuiDefaultProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
isContainer = "1";
|
||||
canSaveDynamicFields = "1";
|
||||
helpTag = "0";
|
||||
|
||||
new GuiWindowCtrl(OBTargetWindow) {
|
||||
profile = "ToolsGuiWindowProfile";
|
||||
horizSizing = "center";
|
||||
vertSizing = "center";
|
||||
position = "384 205";
|
||||
extent = "256 282";
|
||||
minExtent = "256 8";
|
||||
visible = "1";
|
||||
setFirstResponder = "0";
|
||||
modal = "1";
|
||||
helpTag = "0";
|
||||
resizeWidth = "1";
|
||||
resizeHeight = "1";
|
||||
canMove = "1";
|
||||
canClose = "0";
|
||||
canMinimize = "0";
|
||||
canMaximize = "0";
|
||||
minSize = "50 50";
|
||||
text = "Create Object";
|
||||
new GuiWindowCtrl(OBTargetWindow) {
|
||||
Text = "Create Object";
|
||||
canClose = "0";
|
||||
canMinimize = "0";
|
||||
canMaximize = "0";
|
||||
position = "735 399";
|
||||
extent = "449 282";
|
||||
minExtent = "256 8";
|
||||
horizSizing = "center";
|
||||
vertSizing = "center";
|
||||
profile = "ToolsGuiWindowProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
|
||||
new GuiTextCtrl() {
|
||||
profile = "ToolsGuiTextProfile";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
position = "9 26";
|
||||
extent = "84 16";
|
||||
minExtent = "8 8";
|
||||
visible = "1";
|
||||
setFirstResponder = "0";
|
||||
modal = "1";
|
||||
helpTag = "0";
|
||||
text = "Object Name:";
|
||||
};
|
||||
new GuiTextEditCtrl(OBObjectName) {
|
||||
class = ObjectBuilderGuiTextEditCtrl;
|
||||
profile = "ToolsGuiTextEditProfile";
|
||||
horizSizing = "width";
|
||||
vertSizing = "bottom";
|
||||
position = "78 26";
|
||||
extent = "172 18";
|
||||
minExtent = "8 8";
|
||||
visible = "1";
|
||||
setFirstResponder = "0";
|
||||
modal = "1";
|
||||
helpTag = "0";
|
||||
historySize = "0";
|
||||
};
|
||||
new GuiBitmapBorderCtrl(OBContentWindow) {
|
||||
profile = "ToolsGuiGroupBorderProfile";
|
||||
horizSizing = "width";
|
||||
vertSizing = "bottom";
|
||||
position = "7 51";
|
||||
extent = "243 193";
|
||||
minExtent = "0 0";
|
||||
visible = "1";
|
||||
setFirstResponder = "0";
|
||||
modal = "1";
|
||||
helpTag = "0";
|
||||
};
|
||||
new GuiButtonCtrl(OBOKButton) {
|
||||
profile = "ToolsGuiButtonProfile";
|
||||
horizSizing = "width";
|
||||
vertSizing = "bottom";
|
||||
position = "7 250";
|
||||
extent = "156 24";
|
||||
minExtent = "8 8";
|
||||
visible = "1";
|
||||
setFirstResponder = "0";
|
||||
modal = "1";
|
||||
command = "ObjectBuilderGui.onOK();";
|
||||
helpTag = "0";
|
||||
text = "Create New";
|
||||
Accelerator = "return";
|
||||
};
|
||||
new GuiButtonCtrl(OBCancelButton) {
|
||||
profile = "ToolsGuiButtonProfile";
|
||||
horizSizing = "left";
|
||||
vertSizing = "bottom";
|
||||
position = "170 250";
|
||||
extent = "80 24";
|
||||
minExtent = "8 8";
|
||||
visible = "1";
|
||||
setFirstResponder = "0";
|
||||
modal = "1";
|
||||
command = "ObjectBuilderGui.onCancel();";
|
||||
helpTag = "0";
|
||||
text = "Cancel";
|
||||
Accelerator = "escape";
|
||||
};
|
||||
};
|
||||
new GuiTextCtrl() {
|
||||
Text = "Object Name:";
|
||||
position = "9 26";
|
||||
extent = "84 16";
|
||||
minExtent = "8 8";
|
||||
profile = "ToolsGuiTextProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
};
|
||||
new GuiTextEditCtrl(OBObjectName) {
|
||||
position = "102 26";
|
||||
extent = "341 20";
|
||||
minExtent = "8 8";
|
||||
horizSizing = "width";
|
||||
profile = "ToolsGuiTextEditProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
class = "ObjectBuilderGuiTextEditCtrl";
|
||||
};
|
||||
new GuiBitmapBorderCtrl(OBContentWindow) {
|
||||
position = "7 51";
|
||||
extent = "437 193";
|
||||
minExtent = "0 0";
|
||||
horizSizing = "width";
|
||||
profile = "ToolsGuiGroupBorderProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
};
|
||||
new GuiButtonCtrl(OBOKButton) {
|
||||
Text = "Create New";
|
||||
position = "263 250";
|
||||
extent = "97 24";
|
||||
minExtent = "8 8";
|
||||
horizSizing = "left";
|
||||
vertSizing = "top";
|
||||
profile = "ToolsGuiButtonProfile";
|
||||
command = "ObjectBuilderGui.onOK();";
|
||||
accelerator = "return";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
};
|
||||
new GuiButtonCtrl(OBCancelButton) {
|
||||
Text = "Cancel";
|
||||
position = "364 250";
|
||||
extent = "80 24";
|
||||
minExtent = "8 8";
|
||||
horizSizing = "left";
|
||||
vertSizing = "top";
|
||||
profile = "ToolsGuiButtonProfile";
|
||||
command = "ObjectBuilderGui.onCancel();";
|
||||
accelerator = "escape";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
};
|
||||
};
|
||||
};
|
||||
//--- OBJECT WRITE END ---
|
||||
|
||||
|
|
@ -110,13 +80,13 @@ function ObjectBuilderGui::init(%this)
|
|||
%this.baseOffsetY = 5;
|
||||
%this.defaultObjectName = "";
|
||||
%this.defaultFieldStep = 22;
|
||||
%this.columnOffset = 110;
|
||||
%this.columnOffset = 140;
|
||||
|
||||
%this.fieldNameExtent = "105 18";
|
||||
%this.textEditExtent = "122 18";
|
||||
%this.fieldNameExtent = "135 18";
|
||||
%this.textEditExtent = "280 18";
|
||||
%this.checkBoxExtent = "13 18";
|
||||
%this.popupMenuExtent = "122 18";
|
||||
%this.fileButtonExtent = "122 18";
|
||||
%this.popupMenuExtent = "280 18";
|
||||
%this.fileButtonExtent = "280 18";
|
||||
%this.matButtonExtent = "17 18";
|
||||
|
||||
//
|
||||
|
|
@ -886,6 +856,50 @@ function ObjectBuilderGui::createStringType(%this, %index)
|
|||
%this.curYPos += %this.defaultFieldStep;
|
||||
}
|
||||
|
||||
function ObjectBuilderGuiCommandCtrl::apply(%this, %text)
|
||||
{
|
||||
%this.text = %text;
|
||||
}
|
||||
|
||||
function ObjectBuilderGui::createCommandType(%this, %index)
|
||||
{
|
||||
if(%index >= %this.numFields || %this.field[%index, name] $= "")
|
||||
{
|
||||
error("ObjectBuilderGui::createCommandType: invalid field");
|
||||
return;
|
||||
}
|
||||
|
||||
//
|
||||
if(%this.field[%index, text] $= "")
|
||||
%name = %this.field[%index, name];
|
||||
else
|
||||
%name = %this.field[%index, text];
|
||||
|
||||
//
|
||||
%this.textControls[%this.numControls] = new GuiTextCtrl() {
|
||||
profile = "ToolsGuiTextRightProfile";
|
||||
text = %name;
|
||||
extent = %this.fieldNameExtent;
|
||||
position = %this.curXPos @ " " @ %this.curYPos;
|
||||
modal = "1";
|
||||
};
|
||||
|
||||
//
|
||||
%this.controls[%this.numControls] = new GuiButtonCtrl() {
|
||||
class = ObjectBuilderGuiCommandCtrl;
|
||||
HorizSizing = "width";
|
||||
profile = "ToolsGuiTextEditProfile";
|
||||
extent = %this.textEditExtent;
|
||||
text = %this.field[%index, value];
|
||||
position = %this.curXPos + %this.columnOffset @ " " @ %this.curYPos;
|
||||
modal = "1";
|
||||
command = "TextPad($ThisControl.text, \"$ThisControl.apply\", $ThisControl.getRoot());";
|
||||
};
|
||||
|
||||
%this.numControls++;
|
||||
%this.curYPos += %this.defaultFieldStep;
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
function ObjectBuilderGui::adjustSizes(%this)
|
||||
|
|
@ -940,6 +954,9 @@ function ObjectBuilderGui::process(%this)
|
|||
|
||||
case "TypeMaterialName":
|
||||
%this.createMaterialNameType(%i);
|
||||
|
||||
case "TypeCommand":
|
||||
%this.createCommandType(%i);
|
||||
|
||||
default:
|
||||
%this.createStringType(%i);
|
||||
|
|
@ -1502,18 +1519,18 @@ function ObjectBuilderGui::buildFlyingVehicle(%this)
|
|||
%this.process();
|
||||
}
|
||||
|
||||
function ObjectBuilderGui::buildSpawnSphere(%this)
|
||||
function ObjectBuilderGui::buildSpawnSphere(%this, %spawnClass, %spawnDatablock)
|
||||
{
|
||||
%this.objectClassName = "SpawnSphere";
|
||||
%this.addField("dataBlock", "TypeDataBlock", "dataBlock", "MissionMarkerData SpawnSphereMarker");
|
||||
%this.addField("radius", "TypeFloat", "Radius", 1);
|
||||
%this.addField("sphereWeight", "TypeFloat", "Sphere Weight", 1);
|
||||
|
||||
%this.addField("spawnClass", "TypeString", "Spawn Class", "");
|
||||
%this.addField("spawnDatablock", "TypeString", "Spawn Data", "");
|
||||
%this.addField("spawnClass", "TypeString", "Spawn Class", %spawnClass);
|
||||
%this.addField("spawnDatablock", "TypeString", "Spawn Data", %spawnDatablock);
|
||||
%this.addField("spawnTransform", "TypeBool", "Spawn Here", "true");
|
||||
%this.addField("autoSpawn", "TypeBool", "Auto Spawn Objects", "false");
|
||||
%this.addField("spawnScript", "TypeString", "spawnScript", "%this.spawned = $SpawnObject;");
|
||||
%this.addField("spawnScript", "TypeCommand", "spawnScript", "%this.spawned = $SpawnObject;");
|
||||
%this.addField("canSaveDynamicFields", "TypeBool", "Save metadata", "false");
|
||||
%this.process();
|
||||
}
|
||||
|
|
@ -1768,4 +1785,98 @@ function TriggerData::create(%datablock)
|
|||
polyhedron = "-0.5 0.5 0.0 1.0 0.0 0.0 0.0 -1.0 0.0 0.0 0.0 1.0";
|
||||
};
|
||||
return %obj;
|
||||
}
|
||||
|
||||
//
|
||||
function PlayerData::create(%datablock)
|
||||
{
|
||||
%obj = new Player()
|
||||
{
|
||||
dataBlock = %datablock;
|
||||
parentGroup = ObjectCreator.objectGroup;
|
||||
};
|
||||
return %obj;
|
||||
}
|
||||
|
||||
function Player::create(%datablock)
|
||||
{
|
||||
%obj = new Player()
|
||||
{
|
||||
dataBlock = %datablock;
|
||||
parentGroup = ObjectCreator.objectGroup;
|
||||
};
|
||||
return %obj;
|
||||
}
|
||||
|
||||
function AIPlayer::create(%datablock)
|
||||
{
|
||||
%obj = new AIPlayer()
|
||||
{
|
||||
dataBlock = %datablock;
|
||||
parentGroup = ObjectCreator.objectGroup;
|
||||
};
|
||||
return %obj;
|
||||
}
|
||||
|
||||
//
|
||||
function WheeledVehicleData::create(%datablock)
|
||||
{
|
||||
%obj = new WheeledVehicle()
|
||||
{
|
||||
dataBlock = %datablock;
|
||||
parentGroup = ObjectCreator.objectGroup;
|
||||
};
|
||||
return %obj;
|
||||
}
|
||||
|
||||
function WheeledVehicle::create(%datablock)
|
||||
{
|
||||
%obj = new WheeledVehicle()
|
||||
{
|
||||
dataBlock = %datablock;
|
||||
parentGroup = ObjectCreator.objectGroup;
|
||||
};
|
||||
return %obj;
|
||||
}
|
||||
|
||||
//
|
||||
function FlyingVehicleData::create(%datablock)
|
||||
{
|
||||
%obj = new FlyingVehicle()
|
||||
{
|
||||
dataBlock = %datablock;
|
||||
parentGroup = ObjectCreator.objectGroup;
|
||||
};
|
||||
return %obj;
|
||||
}
|
||||
|
||||
function FlyingVehicle::create(%datablock)
|
||||
{
|
||||
%obj = new FlyingVehicle()
|
||||
{
|
||||
dataBlock = %datablock;
|
||||
parentGroup = ObjectCreator.objectGroup;
|
||||
};
|
||||
return %obj;
|
||||
}
|
||||
|
||||
//
|
||||
function HoverVehicleData::create(%datablock)
|
||||
{
|
||||
%obj = new HoverVehicle()
|
||||
{
|
||||
dataBlock = %datablock;
|
||||
parentGroup = ObjectCreator.objectGroup;
|
||||
};
|
||||
return %obj;
|
||||
}
|
||||
|
||||
function HoverVehicle::create(%datablock)
|
||||
{
|
||||
%obj = new HoverVehicle()
|
||||
{
|
||||
dataBlock = %datablock;
|
||||
parentGroup = ObjectCreator.objectGroup;
|
||||
};
|
||||
return %obj;
|
||||
}
|
||||
|
|
@ -1709,7 +1709,7 @@ function EWorldEditor::maxSize(%this, %window)
|
|||
|
||||
%fixedWindow = EWTreeWindow;
|
||||
%fluidWindow = EWInspectorWindow;
|
||||
%offset = 25; // tweak the vertical offset so that it aligns neatly
|
||||
%offset = 0; // tweak the vertical offset so that it aligns neatly
|
||||
%top = EditorGuiToolbar.extent.y + %offset;
|
||||
%bottom = %top + 59;
|
||||
%maxHeight = Canvas.extent.y - %top - %bottom + 12;
|
||||
|
|
@ -2101,7 +2101,10 @@ function EditorTree::onRightMouseUp( %this, %itemId, %mouse, %obj )
|
|||
%popup.item[ 0 ] = "Delete" TAB "" TAB "EditorMenuEditDelete();";
|
||||
%popup.item[ 1 ] = "Group" TAB "" TAB "EWorldEditor.addSimGroup( true );";
|
||||
%popup.item[ 2 ] = "-";
|
||||
%popup.item[ 3 ] = "Make selected a Sub-Level" TAB "" TAB "MakeSelectionASublevel();";
|
||||
%popup.item[ 3 ] = "Make selected a Prefab" TAB "" TAB "EWorldEditor.makeSelectionPrefab();";
|
||||
%popup.item[ 4 ] = "Bake selected into Mesh" TAB "" TAB "AssetBrowser.setupCreateNewAsset(\"ShapeAsset\", AssetBrowser.selectedModule, \"makeSelectedAMesh\");";
|
||||
%popup.item[ 5 ] = "-";
|
||||
%popup.item[ 6 ] = "Make selected a Sub-Level" TAB "" TAB "MakeSelectionASublevel();";
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -2206,6 +2209,29 @@ function EditorTree::onRightMouseUp( %this, %itemId, %mouse, %obj )
|
|||
%popup.item[ 13 ] = "Convert to SubScene" TAB "" TAB "EWorldEditor.createSelectedAsSubScene( " @ %popup.object @ " );";
|
||||
}
|
||||
}
|
||||
else if(%obj.getClassName() $= "TSStatic")
|
||||
{
|
||||
if(AssetDatabase.isDeclaredAsset(%obj.shapeAsset))
|
||||
{
|
||||
%assetDef = AssetDatabase.acquireAsset(%obj.shapeAsset);
|
||||
|
||||
%assetFileName = %assetDef.getFilename();
|
||||
%assetFileBase = strreplace(fileBase(%assetFileName), ".asset", "");
|
||||
%assetFileBase = strreplace(%assetFileBase, ".taml", "");
|
||||
|
||||
%prefabFile = filePath(%assetFileName) @ "/" @ %assetFileBase @ ".prefab";
|
||||
if(isFile(%prefabFile))
|
||||
{
|
||||
%popup.item[ 8 ] = "-";
|
||||
%popup.item[ 9 ] = "Restore to Prefab" TAB "" TAB "EWorldEditor.restoreSelectedToPrefab( " @ %popup.object @ " );";
|
||||
%popup.item[ 10 ] = "Rebake Mesh" TAB "" TAB "EWorldEditor.rebakeSelectedMesh( " @ %popup.object @ " );";
|
||||
}
|
||||
}
|
||||
}
|
||||
else if( %obj.isMemberOfClass( "Prefab" ) )
|
||||
{
|
||||
%popup.item[ 8 ] = "Explode Prefab" TAB "" TAB "EWorldEditor.explodeSelectedPrefab();";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -135,7 +135,7 @@ function ObjectCreator::createObject( %this, %cmd )
|
|||
if(startsWith(%cmd, "return "))
|
||||
%objId = eval(%cmd);
|
||||
else
|
||||
%objId = eval("return " @ %cmd);
|
||||
%objId = eval("return " @ %cmd);
|
||||
popInstantGroup();
|
||||
|
||||
if( isObject( %objId ) )
|
||||
|
|
@ -246,7 +246,7 @@ function ObjectCreator::addMissionObjectIcon( %this, %class, %name, %buildfunc )
|
|||
%cmd = "ObjectBuilderGui." @ %method @ "();";
|
||||
|
||||
%ctrl.altCommand = "ObjectBuilderGui.newObjectCallback = \"ObjectCreator.onFinishCreateObject\"; ObjectCreator.createObject( \"" @ %cmd @ "\" );";
|
||||
%ctrl.iconBitmap = EditorIconRegistry::findIconByClassName( %class );
|
||||
%ctrl.iconBitmapFile = EditorIconRegistry::findIconByClassName( %class );
|
||||
%ctrl.text = %name;
|
||||
%ctrl.class = "CreatorMissionObjectIconBtn";
|
||||
%ctrl.tooltip = %class;
|
||||
|
|
@ -270,7 +270,7 @@ function ObjectCreator::addShapeIcon( %this, %datablock )
|
|||
%createCmd = "ObjectCreator.createObject( \\\"" @ %cmd @ "\\\" );";
|
||||
%ctrl.altCommand = "showImportDialog( \"" @ %shapePath @ "\", \"" @ %createCmd @ "\" );";
|
||||
|
||||
%ctrl.iconBitmap = EditorIconRegistry::findIconByClassName( %class );
|
||||
%ctrl.iconBitmapFile = EditorIconRegistry::findIconByClassName( %class );
|
||||
%ctrl.text = %name;
|
||||
%ctrl.class = "CreatorShapeIconBtn";
|
||||
%ctrl.tooltip = %name;
|
||||
|
|
@ -296,7 +296,7 @@ function ObjectCreator::addStaticIcon( %this, %fullPath )
|
|||
%createCmd = "ObjectCreator.createStatic( \\\"" @ %fullPath @ "\\\" );";
|
||||
%ctrl.altCommand = "showImportDialog( \"" @ %fullPath @ "\", \"" @ %createCmd @ "\" );";
|
||||
|
||||
%ctrl.iconBitmap = ( ( %ext $= ".dts" ) ? EditorIconRegistry::findIconByClassName( "TSStatic" ) : "tools/gui/images/iconCollada" );
|
||||
%ctrl.iconBitmapFile = ( ( %ext $= ".dts" ) ? EditorIconRegistry::findIconByClassName( "TSStatic" ) : "tools/gui/images/iconCollada" );
|
||||
%ctrl.text = %file;
|
||||
%ctrl.class = "CreatorStaticIconBtn";
|
||||
%ctrl.tooltip = %tip;
|
||||
|
|
@ -320,7 +320,7 @@ function ObjectCreator::addPrefabIcon( %this, %fullPath )
|
|||
"Last Modified: " @ fileModifiedTime( %fullPath );
|
||||
|
||||
%ctrl.altCommand = "ObjectCreator.createPrefab( \"" @ %fullPath @ "\" );";
|
||||
%ctrl.iconBitmap = EditorIconRegistry::findIconByClassName( "Prefab" );
|
||||
%ctrl.iconBitmapFile = EditorIconRegistry::findIconByClassName( "Prefab" );
|
||||
%ctrl.text = %file;
|
||||
%ctrl.class = "CreatorPrefabIconBtn";
|
||||
%ctrl.tooltip = %tip;
|
||||
|
|
|
|||
|
|
@ -516,6 +516,15 @@ function Inspector::inspect( %this, %obj )
|
|||
%name = %obj.getName();
|
||||
else
|
||||
FieldInfoControl.setText( "" );
|
||||
|
||||
%category = getCategoryOfClass(%obj.getClassName());
|
||||
if(getFieldCount(%category > 1) && trim(getField(%category, 1)) $= "Controllable")
|
||||
{
|
||||
%genGroup = %this.findExistentGroup("General");
|
||||
|
||||
if(isObject(%genGroup))
|
||||
%genGroup.addField("ToggleControlBtn", "ToggleControlButton", "Takes control of the selected controllable object");
|
||||
}
|
||||
|
||||
//InspectorNameEdit.setValue( %name );
|
||||
Parent::inspect( %this, %obj );
|
||||
|
|
|
|||
|
|
@ -455,7 +455,7 @@ function EditorAutoSaveMission()
|
|||
|
||||
AssetBackupListArray.empty();
|
||||
|
||||
%scenePath = makeFullPath(getRootScene().getFileName());
|
||||
%scenePath = getRootScene().getFileName();
|
||||
if(startsWith(%scenePath, "tools/levels/"))
|
||||
return false;
|
||||
|
||||
|
|
@ -793,7 +793,7 @@ function EditorExplodePrefab()
|
|||
EditorTree.buildVisibleTree( true );
|
||||
}
|
||||
|
||||
function makeSelectedAMesh(%assetId)
|
||||
function makeSelectedAMesh(%assetId, %createPrefab, %spawnNewStatic)
|
||||
{
|
||||
%selectedCount = EWorldEditor.getSelectionSize();
|
||||
|
||||
|
|
@ -803,6 +803,12 @@ function makeSelectedAMesh(%assetId)
|
|||
return;
|
||||
}
|
||||
|
||||
if(%createPrefab $= "")
|
||||
%createPrefab = true;
|
||||
|
||||
if(%spawnNewStatic $= "")
|
||||
%spawnNewStatic = true;
|
||||
|
||||
%assetDef = AssetDatabase.acquireAsset(%assetId);
|
||||
|
||||
%assetPath = AssetDatabase.getAssetPath(%assetId);
|
||||
|
|
@ -836,31 +842,48 @@ function makeSelectedAMesh(%assetId)
|
|||
}
|
||||
}
|
||||
|
||||
%prefabPath = %assetPath @ "/" @ %assetDef.AssetName @ ".prefab";
|
||||
EWorldEditor.makeSelectionPrefab(%prefabPath, false);
|
||||
%selectionPos = EWorldEditor.getSelectedObject(0).getPosition();
|
||||
//Next, nuke 'em
|
||||
EditorMenuEditDelete();
|
||||
|
||||
//now make a new static
|
||||
%newStatic = new TSStatic()
|
||||
if(%createPrefab)
|
||||
{
|
||||
shapeAsset = %assetId;
|
||||
position = %selectionPos;
|
||||
};
|
||||
|
||||
if(%sameParent)
|
||||
%firstParent.add(%newStatic);
|
||||
else
|
||||
getRootScene().add(%newStatic);
|
||||
%prefabPath = %assetPath @ "/" @ %assetDef.AssetName @ ".prefab";
|
||||
EWorldEditor.makeSelectionPrefab(%prefabPath, false);
|
||||
}
|
||||
|
||||
if(%spawnNewStatic)
|
||||
{
|
||||
%selectionPos = EWorldEditor.getSelectedObject(0).getPosition();
|
||||
|
||||
EWorldEditor.clearSelection();
|
||||
EWorldEditor.selectObject(%newStatic);
|
||||
//Next, nuke 'em
|
||||
EditorMenuEditDelete();
|
||||
|
||||
//now make a new static
|
||||
%newStatic = new TSStatic()
|
||||
{
|
||||
shapeAsset = %assetId;
|
||||
position = %selectionPos;
|
||||
};
|
||||
|
||||
if(%sameParent)
|
||||
%firstParent.add(%newStatic);
|
||||
else
|
||||
getRootScene().add(%newStatic);
|
||||
|
||||
EWorldEditor.clearSelection();
|
||||
EWorldEditor.selectObject(%newStatic);
|
||||
}
|
||||
}
|
||||
|
||||
EditorTree.buildVisibleTree( true );
|
||||
}
|
||||
|
||||
function EditorToggleControlOfEntity()
|
||||
{
|
||||
%object = EWorldEditor.getSelectedObject(0);
|
||||
if(%object == localClientConnection.getControlObject())
|
||||
EditorReleaseControlOfEntity();
|
||||
else
|
||||
EditorTakeControlOfEntity();
|
||||
}
|
||||
|
||||
function EditorTakeControlOfEntity()
|
||||
{
|
||||
%object = EWorldEditor.getSelectedObject(0);
|
||||
|
|
@ -868,8 +891,9 @@ function EditorTakeControlOfEntity()
|
|||
{
|
||||
$Editor::previousControlObject = localClientConnection.getControlObject();
|
||||
localClientConnection.setControlObject(%object);
|
||||
|
||||
}
|
||||
|
||||
Inspector.refresh();
|
||||
}
|
||||
|
||||
function EditorReleaseControlOfEntity()
|
||||
|
|
@ -878,6 +902,8 @@ function EditorReleaseControlOfEntity()
|
|||
{
|
||||
localClientConnection.setControlObject($Editor::previousControlObject);
|
||||
}
|
||||
|
||||
Inspector.refresh();
|
||||
}
|
||||
|
||||
function EditorMount()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue