diff --git a/Engine/source/terrain/terrFile.cpp b/Engine/source/terrain/terrFile.cpp index 5edd2e2c7..85ae8741b 100644 --- a/Engine/source/terrain/terrFile.cpp +++ b/Engine/source/terrain/terrFile.cpp @@ -684,7 +684,7 @@ void TerrainFile::import( const GBitmap &heightMap, F32 heightScale, const Vector &layerMap, const Vector &materials, - bool flipYAxis) + bool flipYAxis ) { AssertFatal( heightMap.getWidth() == heightMap.getHeight(), "TerrainFile::import - Height map is not square!" ); AssertFatal( isPow2( heightMap.getWidth() ), "TerrainFile::import - Height map is not power of two!" ); diff --git a/Templates/Empty PhysX/game/tools/worldEditor/gui/guiTerrainImportGui.gui b/Templates/Empty PhysX/game/tools/worldEditor/gui/guiTerrainImportGui.gui index e56cbab89..5d98864d5 100644 --- a/Templates/Empty PhysX/game/tools/worldEditor/gui/guiTerrainImportGui.gui +++ b/Templates/Empty PhysX/game/tools/worldEditor/gui/guiTerrainImportGui.gui @@ -510,6 +510,26 @@ buttonType = "PushButton"; useMouseEvents = "0"; }; + new GuiCheckBoxCtrl() { + text = " Flip Y axis?"; + groupNum = "-1"; + buttonType = "ToggleButton"; + useMouseEvents = "0"; + position = "12 222"; + extent = "140 30"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "GuiCheckBoxProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "GuiToolTipProfile"; + hovertime = "1000"; + isContainer = "0"; + internalName = "FlipYAxis"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; }; }; //--- OBJECT WRITE END --- @@ -533,6 +553,8 @@ function TerrainImportGui::import( %this ) %metersPerPixel = %this-->MetersPerPixel.getText(); %heightScale = %this-->HeightScale.getText(); + %flipYAxis = %this-->FlipYAxis.isStateOn(); + // Grab and validate terrain object name. %terrainName = %this-->TerrainName.getText(); @@ -568,7 +590,8 @@ function TerrainImportGui::import( %this ) %metersPerPixel, %heightScale, %opacityNames, - %materialNames ); + %materialNames, + %flipYAxis ); Canvas.popDialog( %this ); diff --git a/Templates/Empty/game/tools/worldEditor/gui/guiTerrainImportGui.gui b/Templates/Empty/game/tools/worldEditor/gui/guiTerrainImportGui.gui index e56cbab89..5d98864d5 100644 --- a/Templates/Empty/game/tools/worldEditor/gui/guiTerrainImportGui.gui +++ b/Templates/Empty/game/tools/worldEditor/gui/guiTerrainImportGui.gui @@ -510,6 +510,26 @@ buttonType = "PushButton"; useMouseEvents = "0"; }; + new GuiCheckBoxCtrl() { + text = " Flip Y axis?"; + groupNum = "-1"; + buttonType = "ToggleButton"; + useMouseEvents = "0"; + position = "12 222"; + extent = "140 30"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "GuiCheckBoxProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "GuiToolTipProfile"; + hovertime = "1000"; + isContainer = "0"; + internalName = "FlipYAxis"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; }; }; //--- OBJECT WRITE END --- @@ -533,6 +553,8 @@ function TerrainImportGui::import( %this ) %metersPerPixel = %this-->MetersPerPixel.getText(); %heightScale = %this-->HeightScale.getText(); + %flipYAxis = %this-->FlipYAxis.isStateOn(); + // Grab and validate terrain object name. %terrainName = %this-->TerrainName.getText(); @@ -568,7 +590,8 @@ function TerrainImportGui::import( %this ) %metersPerPixel, %heightScale, %opacityNames, - %materialNames ); + %materialNames, + %flipYAxis ); Canvas.popDialog( %this ); diff --git a/Templates/Full PhysX/game/tools/worldEditor/gui/guiTerrainImportGui.gui b/Templates/Full PhysX/game/tools/worldEditor/gui/guiTerrainImportGui.gui index e56cbab89..5d98864d5 100644 --- a/Templates/Full PhysX/game/tools/worldEditor/gui/guiTerrainImportGui.gui +++ b/Templates/Full PhysX/game/tools/worldEditor/gui/guiTerrainImportGui.gui @@ -510,6 +510,26 @@ buttonType = "PushButton"; useMouseEvents = "0"; }; + new GuiCheckBoxCtrl() { + text = " Flip Y axis?"; + groupNum = "-1"; + buttonType = "ToggleButton"; + useMouseEvents = "0"; + position = "12 222"; + extent = "140 30"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "GuiCheckBoxProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "GuiToolTipProfile"; + hovertime = "1000"; + isContainer = "0"; + internalName = "FlipYAxis"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; }; }; //--- OBJECT WRITE END --- @@ -533,6 +553,8 @@ function TerrainImportGui::import( %this ) %metersPerPixel = %this-->MetersPerPixel.getText(); %heightScale = %this-->HeightScale.getText(); + %flipYAxis = %this-->FlipYAxis.isStateOn(); + // Grab and validate terrain object name. %terrainName = %this-->TerrainName.getText(); @@ -568,7 +590,8 @@ function TerrainImportGui::import( %this ) %metersPerPixel, %heightScale, %opacityNames, - %materialNames ); + %materialNames, + %flipYAxis ); Canvas.popDialog( %this ); diff --git a/Templates/Full/game/tools/worldEditor/gui/guiTerrainImportGui.gui b/Templates/Full/game/tools/worldEditor/gui/guiTerrainImportGui.gui index e56cbab89..5d98864d5 100644 --- a/Templates/Full/game/tools/worldEditor/gui/guiTerrainImportGui.gui +++ b/Templates/Full/game/tools/worldEditor/gui/guiTerrainImportGui.gui @@ -510,6 +510,26 @@ buttonType = "PushButton"; useMouseEvents = "0"; }; + new GuiCheckBoxCtrl() { + text = " Flip Y axis?"; + groupNum = "-1"; + buttonType = "ToggleButton"; + useMouseEvents = "0"; + position = "12 222"; + extent = "140 30"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "GuiCheckBoxProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "GuiToolTipProfile"; + hovertime = "1000"; + isContainer = "0"; + internalName = "FlipYAxis"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; }; }; //--- OBJECT WRITE END --- @@ -533,6 +553,8 @@ function TerrainImportGui::import( %this ) %metersPerPixel = %this-->MetersPerPixel.getText(); %heightScale = %this-->HeightScale.getText(); + %flipYAxis = %this-->FlipYAxis.isStateOn(); + // Grab and validate terrain object name. %terrainName = %this-->TerrainName.getText(); @@ -568,7 +590,8 @@ function TerrainImportGui::import( %this ) %metersPerPixel, %heightScale, %opacityNames, - %materialNames ); + %materialNames, + %flipYAxis ); Canvas.popDialog( %this );