From 805557ea1ca44b22676a074ce8ff9693cc8287c7 Mon Sep 17 00:00:00 2001 From: Areloch Date: Tue, 21 May 2019 00:29:44 -0500 Subject: [PATCH] Fixed up behavior of the new functions of convex editor. --- .../tools/convexEditor/convexEditorGui.cs | 64 +- .../tools/convexEditor/convexEditorGui.gui | 214 ----- .../convexEditor/convexEditorSidebarGui.gui | 750 ++++++++++++++++++ .../BaseGame/game/tools/convexEditor/main.cs | 8 +- 4 files changed, 786 insertions(+), 250 deletions(-) create mode 100644 Templates/BaseGame/game/tools/convexEditor/convexEditorSidebarGui.gui diff --git a/Templates/BaseGame/game/tools/convexEditor/convexEditorGui.cs b/Templates/BaseGame/game/tools/convexEditor/convexEditorGui.cs index e2351dde5..919caa7f0 100644 --- a/Templates/BaseGame/game/tools/convexEditor/convexEditorGui.cs +++ b/Templates/BaseGame/game/tools/convexEditor/convexEditorGui.cs @@ -24,16 +24,16 @@ function ConvexEditorGui::onWake( %this ) { convexEditorToolbar-->gridSnapSizeEdit.setText(%this.getGridSnapSize()); - if(ConvexEditorOptionssWindow-->matPreviewBtn.bitmap $= "") + if(ConvexEditorOptionsWindow-->matPreviewBtn.bitmap $= "") { //no active material, so set one - ConvexEditorOptionssWindow-->matPreviewBtn.setText(""); + ConvexEditorOptionsWindow-->matPreviewBtn.setText(""); %mat = EditorSettings.Value("ConvexEditor/MaterialName"); - ConvexEditorOptionssWindow-->matPreviewBtn.setBitmap(%mat.diffuseMap[0]); + ConvexEditorOptionsWindow-->matPreviewBtn.setBitmap(%mat.diffuseMap[0]); - ConvexEditorOptionssWindow.activeMaterial = %mat; + ConvexEditorOptionsWindow.activeMaterial = %mat; } } @@ -60,29 +60,29 @@ function ConvexEditorGui::onSelectionChanged( %this, %shape, %face ) if ( !isObject( %shape ) ) { - ConvexEditorOptionssWindow-->defMatPreviewBtn.setText("No Brush Selected"); - ConvexEditorOptionssWindow.activeShape = ""; + ConvexEditorOptionsWindow-->defMatPreviewBtn.setText("No Brush Selected"); + ConvexEditorOptionsWindow.activeShape = ""; return; } ConvexEditorDeleteFaceBtn.setActive( true ); - ConvexEditorOptionssWindow-->defMatPreviewBtn.setText(""); - ConvexEditorOptionssWindow-->defMatPreviewBtn.setBitmap(%shape.material.diffuseMap[0]); + ConvexEditorOptionsWindow-->defMatPreviewBtn.setText(""); + ConvexEditorOptionsWindow-->defMatPreviewBtn.setBitmap(%shape.material.diffuseMap[0]); - ConvexEditorOptionssWindow.activeShape = %shape; + ConvexEditorOptionsWindow.activeShape = %shape; if ( %face == -1 ) { ConvexEditorDeleteFaceBtn.ToolTip = "Delete selected ConvexShape (Delete)"; - ConvexEditorOptionssWindow-->UOffset.setText(""); - ConvexEditorOptionssWindow-->VOffset.setText(""); + ConvexEditorOptionsWindow-->UOffset.setText(""); + ConvexEditorOptionsWindow-->VOffset.setText(""); - ConvexEditorOptionssWindow-->UScale.setText(""); - ConvexEditorOptionssWindow-->VScale.setText(""); + ConvexEditorOptionsWindow-->UScale.setText(""); + ConvexEditorOptionsWindow-->VScale.setText(""); - ConvexEditorOptionssWindow-->ZRotation.setText(""); + ConvexEditorOptionsWindow-->ZRotation.setText(""); } else { @@ -93,15 +93,15 @@ function ConvexEditorGui::onSelectionChanged( %this, %shape, %face ) %UVOffset = %this.getSelectedFaceUVOffset(); - ConvexEditorOptionssWindow-->UOffset.setText(%UVOffset.x); - ConvexEditorOptionssWindow-->VOffset.setText(%UVOffset.y); + ConvexEditorOptionsWindow-->UOffset.setText(%UVOffset.x); + ConvexEditorOptionsWindow-->VOffset.setText(%UVOffset.y); %UVScale = %this.getSelectedFaceUVScale(); - ConvexEditorOptionssWindow-->UScale.setText(%UVScale.x); - ConvexEditorOptionssWindow-->VScale.setText(%UVScale.y); + ConvexEditorOptionsWindow-->UScale.setText(%UVScale.x); + ConvexEditorOptionsWindow-->VScale.setText(%UVScale.y); - ConvexEditorOptionssWindow-->ZRotation.setText(ConvexEditorGui.getSelectedFaceZRot()); + ConvexEditorOptionsWindow-->ZRotation.setText(ConvexEditorGui.getSelectedFaceZRot()); } } @@ -110,14 +110,14 @@ function ConvexEditorUVFld::onReturn(%this) EWorldEditor.isDirty = true; %offset = "0 0"; - %offset.x = ConvexEditorOptionssWindow-->UOffset.getText(); - %offset.y = ConvexEditorOptionssWindow-->VOffset.getText(); + %offset.x = ConvexEditorOptionsWindow-->UOffset.getText(); + %offset.y = ConvexEditorOptionsWindow-->VOffset.getText(); %scale = "0 0"; - %scale.x = ConvexEditorOptionssWindow-->UScale.getText(); - %scale.y = ConvexEditorOptionssWindow-->VScale.getText(); + %scale.x = ConvexEditorOptionsWindow-->UScale.getText(); + %scale.y = ConvexEditorOptionsWindow-->VScale.getText(); - %rot = ConvexEditorOptionssWindow-->ZRotation.getText(); + %rot = ConvexEditorOptionsWindow-->ZRotation.getText(); ConvexEditorGui.setSelectedFaceUVOffset(%offset); ConvexEditorGui.setSelectedFaceUVScale(%scale); @@ -155,29 +155,29 @@ function ConvexEditorMaterialBtn::gotMaterialName(%this, %name) //%this.object.inspectorApply(); %diffusemap = %name.diffuseMap[0]; - ConvexEditorOptionssWindow-->matPreviewBtn.setBitmap(%diffusemap); + ConvexEditorOptionsWindow-->matPreviewBtn.setBitmap(%diffusemap); - ConvexEditorOptionssWindow.activeMaterial = %name; + ConvexEditorOptionsWindow.activeMaterial = %name; } function ConvexEditorMaterialApplyBtn::onClick(%this) { EWorldEditor.isDirty = true; - ConvexEditorGui.setSelectedFaceMaterial(ConvexEditorOptionssWindow.activeMaterial); + ConvexEditorGui.setSelectedFaceMaterial(ConvexEditorOptionsWindow.activeMaterial); ConvexEditorGui.updateShape(); } function ConvexEditorMaterialLiftBtn::onClick(%this) { %mat = ConvexEditorGui.getSelectedFaceMaterial(); - ConvexEditorOptionssWindow.activeMaterial = %mat; - ConvexEditorOptionssWindow-->matPreviewBtn.setBitmap(%mat.diffuseMap[0]); + ConvexEditorOptionsWindow.activeMaterial = %mat; + ConvexEditorOptionsWindow-->matPreviewBtn.setBitmap(%mat.diffuseMap[0]); } function ConvexEditorMaterialResetBtn::onClick(%this) { EWorldEditor.isDirty = true; - ConvexEditorGui.setSelectedFaceMaterial(ConvexEditorOptionssWindow.activeShape.material); + ConvexEditorGui.setSelectedFaceMaterial(ConvexEditorOptionsWindow.activeShape.material); ConvexEditorGui.updateShape(); } @@ -208,9 +208,9 @@ function ConvexEditorDefaultMaterialBtn::gotMaterialName(%this, %name) //%this.object.inspectorApply(); %diffusemap = %name.diffuseMap[0]; - ConvexEditorOptionssWindow-->defMatPreviewBtn.setBitmap(%diffusemap); + ConvexEditorOptionsWindow-->defMatPreviewBtn.setBitmap(%diffusemap); - ConvexEditorOptionssWindow.activeShape.material = %name; + ConvexEditorOptionsWindow.activeShape.material = %name; ConvexEditorGui.updateShape(); } \ No newline at end of file diff --git a/Templates/BaseGame/game/tools/convexEditor/convexEditorGui.gui b/Templates/BaseGame/game/tools/convexEditor/convexEditorGui.gui index 1849a91c5..f28b3b5b4 100644 --- a/Templates/BaseGame/game/tools/convexEditor/convexEditorGui.gui +++ b/Templates/BaseGame/game/tools/convexEditor/convexEditorGui.gui @@ -141,221 +141,7 @@ }; }; }; - new GuiWindowCollapseCtrl(ConvexEditorOptionsWindow) { - internalName = "Window"; - canSaveDynamicFields = "0"; - Enabled = "1"; - isContainer = "1"; - Profile = "ToolsGuiWindowProfile"; - HorizSizing = "windowRelative"; - VertSizing = "windowRelative"; - Position = getWord($pref::Video::mode, 0) - 209 - SPC getWord(EditorGuiToolbar.extent, 1) + getWord(ConvexEditorTreeWindow.extent, 1) - 2; - Extent = "210 530"; - MinExtent = "210 298"; - canSave = "1"; - Visible = "1"; - tooltipprofile = "ToolsGuiToolTipProfile"; - hovertime = "1000"; - Margin = "0 0 0 0"; - Padding = "0 0 0 0"; - AnchorTop = "1"; - AnchorBottom = "0"; - AnchorLeft = "1"; - AnchorRight = "0"; - resizeWidth = "1"; - resizeHeight = "1"; - canMove = "1"; - canClose = "0"; - canMinimize = "0"; - canMaximize = "0"; - minSize = "50 50"; - closeCommand = "EditorGui.setEditor( WorldEditorPlugin );"; - EdgeSnap = "1"; - text = "Properties"; - new GuiContainer(){ //Node Properties - isContainer = "1"; - Profile = "inspectorStyleRolloutDarkProfile"; - HorizSizing = "width"; - VertSizing = "bottom"; - Position = "4 24"; - Extent = "202 85"; - Docking = "Top"; - Margin = "3 3 3 3"; - - new GuiTextCtrl(){ - Profile = "ToolsGuiDefaultProfile"; - HorizSizing = "right"; - VertSizing = "bottom"; - Position = "5 0"; - Extent = "86 18"; - text = "Node Properties"; - }; - - new GuiTextCtrl(){ - Profile = "ToolsGuiTextRightProfile"; - HorizSizing = "right"; - VertSizing = "bottom"; - Position = "7 21"; - Extent = "46 18"; - text = "Position"; - }; - new GuiTextEditCtrl(){ - internalName = "position"; - Profile = "ToolsGuiTextEditProfile"; - HorizSizing = "width"; - VertSizing = "bottom"; - Position = "57 21"; - Extent = "141 18"; - text = ""; - AltCommand = "ConvexEditorGui.editNodeDetails();"; - }; - new GuiTextCtrl(){ - Profile = "ToolsGuiTextRightProfile"; - HorizSizing = "right"; - VertSizing = "bottom"; - Position = "7 42"; - Extent = "46 18"; - text = "Rotation"; - }; - new GuiTextEditCtrl(){ - internalName = "rotation"; - Profile = "ToolsGuiTextEditProfile"; - HorizSizing = "width"; - VertSizing = "bottom"; - Position = "57 42"; - Extent = "141 18"; - text = ""; - AltCommand = "ConvexEditorGui.editNodeDetails();"; - }; - new GuiTextCtrl(){ - Profile = "ToolsGuiTextRightProfile"; - HorizSizing = "right"; - VertSizing = "bottom"; - Position = "7 63"; - Extent = "46 18"; - text = "Width"; - }; - new GuiTextEditCtrl(){ - internalName = "width"; - Profile = "ToolsGuiTextEditProfile"; - HorizSizing = "right"; - VertSizing = "bottom"; - Position = "57 63"; - Extent = "52 18"; - text = ""; - AltCommand = "ConvexEditorGui.editNodeDetails();"; - }; - new GuiTextCtrl(){ - Profile = "ToolsGuiTextRightProfile"; - HorizSizing = "left"; - VertSizing = "bottom"; - Position = "110 63"; - Extent = "32 18"; - text = "Depth"; - }; - new GuiTextEditCtrl(){ - internalName = "depth"; - Profile = "ToolsGuiTextEditProfile"; - HorizSizing = "left"; - VertSizing = "bottom"; - Position = "146 63"; - Extent = "52 18"; - text = ""; - AltCommand = "ConvexEditorGui.editNodeDetails();"; - }; - }; - new GuiContainer(){ //Conve Road Properties - isContainer = "1"; - Profile = "inspectorStyleRolloutDarkProfile"; - HorizSizing = "width"; - VertSizing = "bottom"; - Position = "4 112"; - Extent = "202 31"; - Docking = "Top"; - Margin = "0 0 3 3"; - - new GuiTextCtrl(){ - Profile = "ToolsGuiDefaultProfile"; - HorizSizing = "right"; - VertSizing = "bottom"; - Position = "5 0"; - Extent = "121 18"; - text = "ConvexShape Properties"; - }; - }; - new GuiScrollCtrl() { - canSaveDynamicFields = "0"; - Enabled = "1"; - isContainer = "1"; - Profile = "GuiEditorScrollProfile"; - HorizSizing = "width"; - VertSizing = "height"; - Position = "4 129"; - Extent = "202 357"; - MinExtent = "8 2"; - canSave = "1"; - Visible = "1"; - tooltipprofile = "ToolsGuiToolTipProfile"; - hovertime = "1000"; - Docking = "Client"; - Margin = "-14 41 3 3"; - Padding = "0 0 0 0"; - AnchorTop = "1"; - AnchorBottom = "0"; - AnchorLeft = "1"; - AnchorRight = "0"; - willFirstRespond = "1"; - hScrollBar = "alwaysOff"; - vScrollBar = "dynamic"; - lockHorizScroll = "true"; - lockVertScroll = "false"; - constantThumbHeight = "0"; - childMargin = "0 0"; - - new GuiInspector(ConvexInspector) { - StackingType = "Vertical"; - HorizStacking = "Left to Right"; - VertStacking = "Top to Bottom"; - Padding = "1"; - name = "ConvexInspector"; - canSaveDynamicFields = "0"; - Enabled = "1"; - isContainer = "1"; - Profile = "ToolsGuiTransparentProfile"; - HorizSizing = "right"; - VertSizing = "bottom"; - Position = "1 1"; - Extent = "179 16"; - MinExtent = "16 16"; - canSave = "1"; - Visible = "1"; - tooltipprofile = "ToolsGuiToolTipProfile"; - hovertime = "1000"; - dividerMargin = "5"; - }; - }; - new GuiMLTextCtrl(ConvexFieldInfoControl) { - canSaveDynamicFields = "0"; - Enabled = "1"; - isContainer = "0"; - Profile = "GuiInspectorFieldInfoMLTextProfile"; - HorizSizing = "width"; - VertSizing = "top"; - Position = "1 485"; - Extent = "202 42"; - MinExtent = "8 2"; - canSave = "1"; - Visible = "1"; - tooltipprofile = "ToolsGuiToolTipProfile"; - hovertime = "1000"; - lineSpacing = "2"; - allowColorChars = "0"; - maxChars = "-1"; - useURLMouseCursor = "0"; - }; - }; new GuiWindowCollapseCtrl(ConvexEditorTipsWindow) { CollapseGroup = "-1"; CollapseGroupNum = "-1"; diff --git a/Templates/BaseGame/game/tools/convexEditor/convexEditorSidebarGui.gui b/Templates/BaseGame/game/tools/convexEditor/convexEditorSidebarGui.gui new file mode 100644 index 000000000..64bdc13f8 --- /dev/null +++ b/Templates/BaseGame/game/tools/convexEditor/convexEditorSidebarGui.gui @@ -0,0 +1,750 @@ +//--- OBJECT WRITE BEGIN --- +%guiContnt = new GuiControl(ConvexEditorOptions) +{ + position = "0 0"; + extent = "800 600"; + + new GuiWindowCollapseCtrl(ConvexEditorOptionsWindow) { + text = "Properties"; + resizeWidth = "1"; + resizeHeight = "1"; + canMove = "1"; + canClose = "0"; + canMinimize = "0"; + canMaximize = "0"; + canCollapse = "1"; + closeCommand = "EditorGui.setEditor( WorldEditorPlugin );"; + edgeSnap = "1"; + margin = "0 0 0 0"; + padding = "0 0 0 0"; + anchorTop = "1"; + anchorBottom = "0"; + anchorLeft = "1"; + anchorRight = "0"; + Position = Canvas.extent.x - 209 + SPC getWord(EditorGuiToolbar.extent, 1) - 2; + Extent = "210 485"; + minExtent = "210 298"; + horizSizing = "windowRelative"; + vertSizing = "windowRelative"; + profile = "ToolsGuiWindowProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + isContainer = "1"; + internalName = "window"; + canSave = "1"; + canSaveDynamicFields = "1"; + enabled = "1"; + minSize = "50 50"; + + new GuiContainer() { + docking = "Top"; + margin = "3 3 3 3"; + padding = "0 0 0 0"; + anchorTop = "1"; + anchorBottom = "0"; + anchorLeft = "1"; + anchorRight = "0"; + position = "4 24"; + extent = "1432 301"; + minExtent = "8 2"; + horizSizing = "width"; + vertSizing = "bottom"; + profile = "inspectorStyleRolloutDarkProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "GuiToolTipProfile"; + hovertime = "1000"; + isContainer = "1"; + canSave = "1"; + canSaveDynamicFields = "0"; + + new GuiTextCtrl() { + text = "Materials"; + maxLength = "1024"; + margin = "0 0 0 0"; + padding = "0 0 0 0"; + anchorTop = "1"; + anchorBottom = "0"; + anchorLeft = "1"; + anchorRight = "0"; + position = "5 0"; + extent = "86 18"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiDefaultProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "GuiToolTipProfile"; + hovertime = "1000"; + isContainer = "1"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiTextCtrl() { + text = "Active Material(Click image to change)"; + maxLength = "1024"; + margin = "0 0 0 0"; + padding = "0 0 0 0"; + anchorTop = "1"; + anchorBottom = "0"; + anchorLeft = "1"; + anchorRight = "0"; + position = "5 18"; + extent = "197 18"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiDefaultProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "GuiToolTipProfile"; + hovertime = "1000"; + isContainer = "1"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiBitmapButtonCtrl() { + bitmapMode = "Stretched"; + autoFitExtents = "0"; + useModifiers = "0"; + useStates = "0"; + text = "No Surface Selected"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + position = "18 36"; + extent = "107 106"; + minExtent = "8 2"; + horizSizing = "center"; + vertSizing = "bottom"; + profile = "ToolsGuiButtonProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "GuiToolTipProfile"; + tooltip = "Change material"; + hovertime = "1000"; + isContainer = "0"; + canSave = "1"; + canSaveDynamicFields = "0"; + internalName = "matPreviewBtn"; + class = "ConvexEditorMaterialBtn"; + }; + new GuiControl() { + position = "24 149"; + extent = "153 25"; + minExtent = "8 2"; + horizSizing = "center"; + vertSizing = "bottom"; + profile = "GuiDefaultProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "GuiToolTipProfile"; + hovertime = "1000"; + isContainer = "1"; + canSave = "1"; + canSaveDynamicFields = "0"; + + new GuiButtonCtrl() { + text = "Lift"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + position = "0 0"; + extent = "47 21"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiButtonProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "GuiToolTipProfile"; + hovertime = "1000"; + isContainer = "0"; + canSave = "1"; + canSaveDynamicFields = "0"; + class = "ConvexEditorMaterialLiftBtn"; + }; + new GuiButtonCtrl() { + text = "Apply"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + position = "52 0"; + extent = "47 21"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiButtonProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "GuiToolTipProfile"; + hovertime = "1000"; + isContainer = "0"; + canSave = "1"; + canSaveDynamicFields = "0"; + class = "ConvexEditorMaterialApplyBtn"; + }; + new GuiButtonCtrl() { + text = "Reset"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + position = "104 0"; + extent = "47 21"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiButtonProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "GuiToolTipProfile"; + hovertime = "1000"; + isContainer = "0"; + canSave = "1"; + canSaveDynamicFields = "0"; + class = "ConvexEditorMaterialResetBtn"; + }; + }; + new GuiTextCtrl() { + text = "Default Material(Click image to change)"; + maxLength = "1024"; + margin = "0 0 0 0"; + padding = "0 0 0 0"; + anchorTop = "1"; + anchorBottom = "0"; + anchorLeft = "1"; + anchorRight = "0"; + position = "5 171"; + extent = "197 18"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiDefaultProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "GuiToolTipProfile"; + hovertime = "1000"; + isContainer = "1"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiBitmapButtonCtrl() { + bitmapMode = "Stretched"; + autoFitExtents = "0"; + useModifiers = "0"; + useStates = "0"; + text = "No Brush Selected"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + position = "47 189"; + extent = "107 106"; + minExtent = "8 2"; + horizSizing = "center"; + vertSizing = "bottom"; + profile = "ToolsGuiButtonProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "GuiToolTipProfile"; + tooltip = "Change material"; + hovertime = "1000"; + isContainer = "0"; + canSave = "1"; + canSaveDynamicFields = "0"; + internalName = "defMatPreviewBtn"; + class = "ConvexEditorDefaultMaterialBtn"; + }; + }; + new GuiContainer() { + docking = "Top"; + margin = "0 0 3 3"; + padding = "0 0 0 0"; + anchorTop = "1"; + anchorBottom = "0"; + anchorLeft = "1"; + anchorRight = "0"; + position = "4 199"; + extent = "1432 303"; + minExtent = "8 2"; + horizSizing = "width"; + vertSizing = "bottom"; + profile = "inspectorStyleRolloutDarkProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "GuiToolTipProfile"; + hovertime = "1000"; + isContainer = "1"; + canSave = "1"; + canSaveDynamicFields = "0"; + + new GuiTextCtrl() { + text = "UV Options"; + maxLength = "1024"; + margin = "0 0 0 0"; + padding = "0 0 0 0"; + anchorTop = "1"; + anchorBottom = "0"; + anchorLeft = "1"; + anchorRight = "0"; + position = "5 0"; + extent = "121 18"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiDefaultProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "GuiToolTipProfile"; + hovertime = "1000"; + isContainer = "1"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiControl() { + position = "0 26"; + extent = "1428 282"; + minExtent = "8 2"; + horizSizing = "relative"; + vertSizing = "relative"; + profile = "GuiDefaultProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "GuiToolTipProfile"; + hovertime = "1000"; + isContainer = "1"; + canSave = "1"; + canSaveDynamicFields = "0"; + + new GuiContainer() { + docking = "Top"; + margin = "0 0 3 3"; + padding = "0 0 0 0"; + anchorTop = "1"; + anchorBottom = "0"; + anchorLeft = "1"; + anchorRight = "0"; + position = "3 8"; + extent = "200 123"; + minExtent = "8 2"; + horizSizing = "width"; + vertSizing = "bottom"; + profile = "inspectorStyleRolloutDarkProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "GuiToolTipProfile"; + hovertime = "1000"; + isContainer = "1"; + canSave = "1"; + canSaveDynamicFields = "0"; + + new GuiTextCtrl() { + text = "Texture Position"; + maxLength = "1024"; + margin = "0 0 0 0"; + padding = "0 0 0 0"; + anchorTop = "1"; + anchorBottom = "0"; + anchorLeft = "1"; + anchorRight = "0"; + position = "5 0"; + extent = "121 18"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiDefaultProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "GuiToolTipProfile"; + hovertime = "1000"; + isContainer = "1"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiControl() { + position = "3 24"; + extent = "102 64"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "GuiDefaultProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "GuiToolTipProfile"; + hovertime = "1000"; + isContainer = "1"; + canSave = "1"; + canSaveDynamicFields = "0"; + + new GuiTextCtrl() { + text = "Scale:"; + maxLength = "1024"; + margin = "0 0 0 0"; + padding = "0 0 0 0"; + anchorTop = "1"; + anchorBottom = "0"; + anchorLeft = "1"; + anchorRight = "0"; + position = "15 -1"; + extent = "121 18"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiDefaultProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "GuiToolTipProfile"; + hovertime = "1000"; + isContainer = "1"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiTextCtrl() { + text = "X:"; + maxLength = "1024"; + margin = "0 0 0 0"; + padding = "0 0 0 0"; + anchorTop = "1"; + anchorBottom = "0"; + anchorLeft = "1"; + anchorRight = "0"; + position = "5 18"; + extent = "121 18"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiDefaultProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "GuiToolTipProfile"; + hovertime = "1000"; + isContainer = "1"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiTextEditCtrl() { + historySize = "0"; + tabComplete = "0"; + sinkAllKeyEvents = "0"; + password = "0"; + passwordMask = "*"; + maxLength = "1024"; + margin = "0 0 0 0"; + padding = "0 0 0 0"; + anchorTop = "1"; + anchorBottom = "0"; + anchorLeft = "1"; + anchorRight = "0"; + position = "17 17"; + extent = "77 18"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "GuiTextEditProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "GuiToolTipProfile"; + hovertime = "1000"; + isContainer = "1"; + canSave = "1"; + canSaveDynamicFields = "0"; + internalName = "UScale"; + class = "ConvexEditorUVFld"; + }; + new GuiTextCtrl() { + text = "Y:"; + maxLength = "1024"; + margin = "0 0 0 0"; + padding = "0 0 0 0"; + anchorTop = "1"; + anchorBottom = "0"; + anchorLeft = "1"; + anchorRight = "0"; + position = "5 44"; + extent = "121 18"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiDefaultProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "GuiToolTipProfile"; + hovertime = "1000"; + isContainer = "1"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiTextEditCtrl() { + historySize = "0"; + tabComplete = "0"; + sinkAllKeyEvents = "0"; + password = "0"; + passwordMask = "*"; + maxLength = "1024"; + margin = "0 0 0 0"; + padding = "0 0 0 0"; + anchorTop = "1"; + anchorBottom = "0"; + anchorLeft = "1"; + anchorRight = "0"; + position = "17 43"; + extent = "77 18"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "GuiTextEditProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "GuiToolTipProfile"; + hovertime = "1000"; + isContainer = "1"; + canSave = "1"; + canSaveDynamicFields = "0"; + internalName = "VScale"; + class = "ConvexEditorUVFld"; + }; + }; + new GuiControl() { + position = "104 24"; + extent = "102 64"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "GuiDefaultProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "GuiToolTipProfile"; + hovertime = "1000"; + isContainer = "1"; + canSave = "1"; + canSaveDynamicFields = "0"; + + new GuiTextCtrl() { + text = "Offset:"; + maxLength = "1024"; + margin = "0 0 0 0"; + padding = "0 0 0 0"; + anchorTop = "1"; + anchorBottom = "0"; + anchorLeft = "1"; + anchorRight = "0"; + position = "15 -1"; + extent = "121 18"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiDefaultProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "GuiToolTipProfile"; + hovertime = "1000"; + isContainer = "1"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiTextCtrl() { + text = "X:"; + maxLength = "1024"; + margin = "0 0 0 0"; + padding = "0 0 0 0"; + anchorTop = "1"; + anchorBottom = "0"; + anchorLeft = "1"; + anchorRight = "0"; + position = "5 18"; + extent = "121 18"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiDefaultProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "GuiToolTipProfile"; + hovertime = "1000"; + isContainer = "1"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiTextEditCtrl() { + historySize = "0"; + tabComplete = "0"; + sinkAllKeyEvents = "0"; + password = "0"; + passwordMask = "*"; + maxLength = "1024"; + margin = "0 0 0 0"; + padding = "0 0 0 0"; + anchorTop = "1"; + anchorBottom = "0"; + anchorLeft = "1"; + anchorRight = "0"; + position = "17 17"; + extent = "77 18"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "GuiTextEditProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "GuiToolTipProfile"; + hovertime = "1000"; + isContainer = "1"; + canSave = "1"; + canSaveDynamicFields = "0"; + internalName = "UOffset"; + class = "ConvexEditorUVFld"; + }; + new GuiTextCtrl() { + text = "Y:"; + maxLength = "1024"; + margin = "0 0 0 0"; + padding = "0 0 0 0"; + anchorTop = "1"; + anchorBottom = "0"; + anchorLeft = "1"; + anchorRight = "0"; + position = "5 44"; + extent = "121 18"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiDefaultProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "GuiToolTipProfile"; + hovertime = "1000"; + isContainer = "1"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiTextEditCtrl() { + historySize = "0"; + tabComplete = "0"; + sinkAllKeyEvents = "0"; + password = "0"; + passwordMask = "*"; + maxLength = "1024"; + margin = "0 0 0 0"; + padding = "0 0 0 0"; + anchorTop = "1"; + anchorBottom = "0"; + anchorLeft = "1"; + anchorRight = "0"; + position = "17 43"; + extent = "77 18"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "GuiTextEditProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "GuiToolTipProfile"; + hovertime = "1000"; + isContainer = "1"; + canSave = "1"; + canSaveDynamicFields = "0"; + internalName = "VOffset"; + class = "ConvexEditorUVFld"; + }; + }; + new GuiTextCtrl() { + text = "Rotation:"; + maxLength = "1024"; + margin = "0 0 0 0"; + padding = "0 0 0 0"; + anchorTop = "1"; + anchorBottom = "0"; + anchorLeft = "1"; + anchorRight = "0"; + position = "9 98"; + extent = "121 18"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiDefaultProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "GuiToolTipProfile"; + hovertime = "1000"; + isContainer = "1"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiTextEditCtrl() { + historySize = "0"; + tabComplete = "0"; + sinkAllKeyEvents = "0"; + password = "0"; + passwordMask = "*"; + maxLength = "1024"; + margin = "0 0 0 0"; + padding = "0 0 0 0"; + anchorTop = "1"; + anchorBottom = "0"; + anchorLeft = "1"; + anchorRight = "0"; + position = "58 97"; + extent = "40 18"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "GuiTextEditProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "GuiToolTipProfile"; + hovertime = "1000"; + isContainer = "1"; + canSave = "1"; + canSaveDynamicFields = "0"; + internalName = "ZRotation"; + class = "ConvexEditorUVFld"; + }; + + new GuiButtonCtrl() { + text = "Flip H"; + groupNum = "-1"; + buttonType = "PushButton"; + position = "110 97"; + extent = "40 21"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiButtonProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "GuiToolTipProfile"; + hovertime = "1000"; + isContainer = "0"; + canSave = "1"; + canSaveDynamicFields = "0"; + class = "ConvexEditorUVHorzFlipBtn"; + }; + + new GuiButtonCtrl() { + text = "Flip V"; + groupNum = "-1"; + buttonType = "PushButton"; + position = "154 97"; + extent = "40 21"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiButtonProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "GuiToolTipProfile"; + hovertime = "1000"; + isContainer = "0"; + canSave = "1"; + canSaveDynamicFields = "0"; + class = "ConvexEditorUVVertFlipBtn"; + }; + }; + }; + }; + }; +}; +//--- OBJECT WRITE END --- diff --git a/Templates/BaseGame/game/tools/convexEditor/main.cs b/Templates/BaseGame/game/tools/convexEditor/main.cs index c5a320898..684c08adc 100644 --- a/Templates/BaseGame/game/tools/convexEditor/main.cs +++ b/Templates/BaseGame/game/tools/convexEditor/main.cs @@ -35,13 +35,13 @@ function initializeConvexEditor() ConvexEditorOptionsWindow.setVisible( false ); ConvexEditorTreeWindow.setVisible( false ); ConvexEditorToolbar.setVisible( false ); - ConvexEditorOptionssWindow.setVisible( false ); + ConvexEditorOptionsWindow.setVisible( false ); EditorGui.add( ConvexEditorGui ); EditorGui.add( ConvexEditorOptionsWindow ); EditorGui.add( ConvexEditorTreeWindow ); EditorGui.add( ConvexEditorToolbar ); - EditorGui.add( ConvexEditorOptionssWindow ); + EditorGui.add( ConvexEditorOptionsWindow ); new ScriptObject( ConvexEditorPlugin ) { @@ -102,7 +102,7 @@ function ConvexEditorPlugin::onActivated( %this ) EditorGui.bringToFront( ConvexEditorGui ); ConvexEditorGui.setVisible( true ); ConvexEditorToolbar.setVisible( true ); - ConvexEditorOptionssWindow.setVisible( true ); + ConvexEditorOptionsWindow.setVisible( true ); ConvexEditorGui.makeFirstResponder( true ); %this.map.push(); @@ -137,7 +137,7 @@ function ConvexEditorPlugin::onDeactivated( %this ) ConvexEditorGui.setVisible( false ); ConvexEditorOptionsWindow.setVisible( false ); ConvexEditorTreeWindow.setVisible( false ); - ConvexEditorOptionssWindow.setVisible( false ); + ConvexEditorOptionsWindow.setVisible( false ); ConvexEditorToolbar.setVisible( false ); %this.map.pop();