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

Merge pull request #715 from Areloch/ConvexShapeSpawnFix

Browse source 
Fixes creation of convex shapes via editor
This commit is contained in:
Brian Roberts 2021-12-25 17:11:08 -06:00 • committed by GitHub
commit 3812ce2e82
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Templates/BaseGame/game/tools/convexEditor/convexEditorGui.tscript
View file

@ -51,6 +51,8 @@ function ConvexEditorGui::onSleep( %this )
function ConvexEditorGui::createConvexBox( %this ) function ConvexEditorGui::createConvexBox( %this )
{ {
%obj = genericCreateObject( "ConvexShape" ); %obj = genericCreateObject( "ConvexShape" );
%obj.setMaterial(%this.materialName); //set whatever the editor has as it's default material to the new one
%this.handleDeselect(); %this.handleDeselect();
%this.selectConvex( %obj ); %this.selectConvex( %obj );
%this.dropSelectionAtScreenCenter(); %this.dropSelectionAtScreenCenter();

4
Templates/BaseGame/game/tools/worldEditor/scripts/editors/creator.ed.tscript
View file

@ -227,6 +227,10 @@ function ObjectCreator::createObject( %this, %cmd )
%this.setNewObjectGroup( getScene(0) ); %this.setNewObjectGroup( getScene(0) );
pushInstantGroup(); pushInstantGroup();
if(startsWith(%cmd, "return "))
%objId = eval(%cmd);
else
%objId = eval("return " @ %cmd); %objId = eval("return " @ %cmd);
popInstantGroup(); popInstantGroup();