TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-06-05 04:56:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #1757 from Azaezel/alpha41/colFilterFix
Some checks are pending
Linux Build / Ubuntu Latest GCC (push) Waiting to run
Details
MacOSX Build / MacOSX Latest Clang (push) Waiting to run
Details
Windows Build / Windows Latest MSVC (push) Waiting to run
Details

Browse source 
fix advanced model editor slider blocker
This commit is contained in:
Brian Roberts 2026-06-03 19:45:41 -05:00 • committed by GitHub
commit 0df3bea9ca
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdAdvancedWindow.ed.gui
View file

@ -879,6 +879,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow,EditorGuiGroup) {
tooltipProfile = "GuiToolTipProfile";
tooltip = "Select the method used to auto-generate the collision geometry";
internalName = "colType";
command = "ShapeEdColWindow.onColTypeSelected();";
};
new GuiTextCtrl() {
text = "Fit Target";
@ -1127,7 +1128,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow,EditorGuiGroup) {
new GuiBitmapCtrl() {
BitmapAsset = "ToolsModule:inactive_overlay_image";
position = "0 47";
extent = "199 178";
extent = "342 178";
profile = "ToolsGuiDefaultProfile";
visible = "0";
tooltipProfile = "GuiToolTipProfile";

10
Templates/BaseGame/game/tools/shapeEditor/scripts/shapeEditor.ed.tscript
View file

@ -3112,7 +3112,6 @@ function ShapeEdColWindow::update_onCollisionChanged( %this )
if ( %this-->colType.getText() $= "Convex Hulls" )
{
%this-->hullInactive.setVisible( false );
%this-->hullDepth.setValue( getField( %colData, 2 ) );
%this-->hullDepthText.setText( mFloor( %this-->hullDepth.getValue() ) );
%this-->hullMergeThreshold.setValue( getField( %colData, 3 ) );
@ -3130,6 +3129,15 @@ function ShapeEdColWindow::update_onCollisionChanged( %this )
%fillModeID = %this-->fillMode.findText( getField( %colData, 9 ) );
%this-->fillMode.setSelected( %fillModeID, false );
}
}
function ShapeEdColWindow::onColTypeSelected(%this)
{
if ( %this-->colType.getText() $= "Convex Hulls" )
{
%this-->hullInactive.setVisible( false );
}
else
{
%this-->hullInactive.setVisible( true );