WIP of updating terrain editor to work with assets

Fix minor UI issues for asset browser
included folder 'asset type' script

Templates/BaseGame/game/tools/worldEditor/gui/guiCreateNewTerrainGui.gui

@@ -299,6 +299,20 @@
 function CreateNewTerrainGui::onWake( %this )
 {   
    %this-->theName.setText( "" );
+   
+   //Run through and grab any TerrainMaterialAssets
+   %assetQuery = new AssetQuery();
+   AssetDatabase.findAssetType(%assetQuery, "TerrainMaterialAsset");
+        
+   %count = %assetQuery.getCount();
+      
+	for(%i=0; %i < %count; %i++)
+	{
+	   %assetId = %assetQuery.getAsset(%i);
+	   
+      AssetDatabase.acquireAsset(%assetId);
+	}	
+	%assetQuery.delete();		   
 
    %matList = %this-->theMaterialList;
    %matList.clear();
@@ -313,8 +327,8 @@ function CreateNewTerrainGui::onWake( %this )
    %rezList.add( "512", 512 );
    %rezList.add( "1024", 1024 );
    %rezList.add( "2048", 2048 );
-   //%rezList.add( "4096", 4096 );
-   %rezList.setSelected( 256 );
+   %rezList.add( "4096", 4096 );
+   %rezList.setSelected( 512 );
    
    %this-->flatRadio.setStateOn( true );
 }

Templates/BaseGame/game/tools/worldEditor/gui/objectBuilderGui.ed.gui

@@ -227,6 +227,77 @@ function ObjectBuilderGui::gotFileName(%this, %name)
    //%this.controls[%this.currentControl].setValue(%name);
 }
 
+//------------------------------------------------------------------------------
+function ObjectBuilderGui::createTerrainAssetType(%this, %index)
+{
+   if(%index >= %this.numFields || %this.field[%index, name] $= "")
+   {
+      error("ObjectBuilderGui::createTerrainAssetType: 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() {
+      HorizSizing = "width";
+      profile = "ToolsGuiButtonProfile";
+      extent = %this.fileButtonExtent;
+      position = %this.curXPos + %this.columnOffset @ " " @ %this.curYPos;
+      modal = "1";
+      command = %this @ ".getTerrainAsset(" @ %index @ ");";
+   };
+
+   %val = %this.field[%index, value];
+   %this.controls[%this.numControls].setValue(fileBase(%val) @ fileExt(%val));
+
+   %this.numControls++;
+   %this.curYPos += %this.defaultFieldStep;
+}
+
+function ObjectBuilderGui::getTerrainAsset(%this, %index)
+{
+   if(%index >= %this.numFields || %this.field[%index, name] $= "")
+   {
+      error("ObjectBuilderGui::getTerrainAsset: invalid field");
+      return;
+   }
+   
+   %val = %this.field[%index, ext];
+
+   //%path = filePath(%val);
+   //%ext = fileExt(%val);
+
+   %this.currentControl = %index;
+   AssetBrowser.showDialog("TerrainAsset", %this @ ".gotTerrainAsset", "", "", "");
+   //getLoadFilename( %val @ "|" @ %val, %this @ ".gotFileName", %this.lastPath );
+}
+
+function ObjectBuilderGui::gotTerrainAsset(%this, %name)
+{
+   %index = %this.currentControl;
+   
+   %this.field[%index, value] = %name;
+   %this.controls[%this.currentControl].setText(fileBase(%name) @ fileExt(%name));
+   
+   %this.lastPath = %name;
+   
+   // This doesn't work for button controls as getValue returns their state!
+   //%this.controls[%this.currentControl].setValue(%name);
+}
 //------------------------------------------------------------------------------
 
 function ObjectBuilderGui::createMaterialNameType(%this, %index)
@@ -489,6 +560,9 @@ function ObjectBuilderGui::process(%this)
 
          case "TypeFile":
             %this.createFileType(%i);
+            
+         case "TypeTerrainAsset":
+            %this.createTerrainAssetType(%i);
 
          case "TypeMaterialName":
             %this.createMaterialNameType(%i);
@@ -830,6 +904,7 @@ function ObjectBuilderGui::buildTerrainBlock(%this)
    %this.createCallback = "ETerrainEditor.attachTerrain();";
 
    %this.addField("terrainFile", "TypeFile", "Terrain file", "", "*.ter");
+   %this.addField("terrainAsset", "TypeTerrainAsset", "Terrain Asset", "", "");
    %this.addField("squareSize", "TypeInt", "Square size", "8");
 
    %this.process();

Templates/BaseGame/game/tools/worldEditor/scripts/interfaces/terrainMaterialDlg.ed.cs

@@ -83,6 +83,20 @@ function TerrainMaterialDlg::onWake( %this )
    if( !isObject( TerrainMaterialDlgDeleteGroup ) )
       new SimGroup( TerrainMaterialDlgDeleteGroup );
       
+   //Run through and grab any TerrainMaterialAssets
+   %assetQuery = new AssetQuery();
+   AssetDatabase.findAssetType(%assetQuery, "TerrainMaterialAsset");
+        
+   %count = %assetQuery.getCount();
+      
+	for(%i=0; %i < %count; %i++)
+	{
+	   %assetId = %assetQuery.getAsset(%i);
+	   
+      AssetDatabase.acquireAsset(%assetId);
+	}	
+	%assetQuery.delete();	   
+      
    // Snapshot the materials.
    %this.snapshotMaterials();
 
@@ -292,12 +306,33 @@ function TerrainMaterialDlg::changeNormal( %this )
    %ctrl.setBitmap( %file );   
 }
 
+//-----------------------------------------------------------------------------
+function TerrainMaterialDlg::changePBRConfig( %this )
+{   
+   %ctrl = %this-->pbrConfigTexCtrl;
+   %file = %ctrl.bitmap;
+   if( getSubStr( %file, 0 , 6 ) $= "tools/" )
+      %file = "";
+
+   %file = TerrainMaterialDlg._selectTextureFileDialog( %file );  
+   if( %file $= "" )
+   {
+      if( %ctrl.bitmap !$= "" )
+         %file = %ctrl.bitmap;
+      else
+         %file = "tools/materialEditor/gui/unknownImage";
+   }
+
+   %file = makeRelativePath( %file, getMainDotCsDir() );
+   %ctrl.setBitmap( %file );   
+}
+
 //-----------------------------------------------------------------------------
 
 function TerrainMaterialDlg::newMat( %this )
 {
    // Create a unique material name.
-   %matName = getUniqueInternalName( "newMaterial", TerrainMaterialSet, true );
+   /*%matName = getUniqueInternalName( "newMaterial", TerrainMaterialSet, true );
 
    // Create the new material.
    %newMat = new TerrainMaterial()
@@ -308,12 +343,16 @@ function TerrainMaterialDlg::newMat( %this )
    %newMat.setFileName( "art/terrains/materials.cs" );
    
    // Mark it as dirty and to be saved in the default location.
-   ETerrainMaterialPersistMan.setDirty( %newMat, "art/terrains/materials.cs" );
-            
-   %matLibTree = %this-->matLibTree;
-   %matLibTree.buildVisibleTree( true );
-   %item = %matLibTree.findItemByObjectId( %newMat );
-   %matLibTree.selectItem( %item );   
+   ETerrainMaterialPersistMan.setDirty( %newMat, "art/terrains/materials.cs" );*/
+
+   %scene = getRootScene();
+   %path = filePath(%scene.getFilename());
+   %module = AssetBrowser.getModuleFromAddress(%path);
+   AssetBrowser.selectedModule = %module.moduleID;
+   
+   AssetBrowser.currentAddress = "data/" @ %module.moduleID;
+   
+   AssetBrowser.setupCreateNewAsset("TerrainMaterialAsset", AssetBrowser.selectedModule);
 }
 
 //-----------------------------------------------------------------------------
@@ -380,6 +419,11 @@ function TerrainMaterialDlg::setActiveMaterial( %this, %mat )
       }else{
          %this-->baseTexCtrl.setBitmap( %mat.diffuseMap ); 
       }
+      if (%mat.pbrConfigMap $= ""){
+         %this-->pbrConfigTexCtrl.setBitmap( "tools/materialEditor/gui/unknownImage" );
+      }else{
+         %this-->pbrConfigTexCtrl.setBitmap( %mat.pbrConfigMap );
+      }
       if (%mat.detailMap $= ""){
          %this-->detailTexCtrl.setBitmap( "tools/materialEditor/gui/unknownImage" );
       }else{
@@ -438,6 +482,11 @@ function TerrainMaterialDlg::saveDirtyMaterial( %this, %mat )
    }else{
       %newNormal = %this-->normTexCtrl.bitmap;  
    }
+   if (%this-->pbrConfigTexCtrl.bitmap $= "tools/materialEditor/gui/unknownImage"){
+      %newPBRConfig = "";
+   }else{
+      %newPBRConfig = %this-->pbrConfigTexCtrl.bitmap;  
+   }
    if (%this-->detailTexCtrl.bitmap $= "tools/materialEditor/gui/unknownImage"){
       %newDetail = "";
    }else{
@@ -466,6 +515,7 @@ function TerrainMaterialDlg::saveDirtyMaterial( %this, %mat )
          %mat.diffuseMap $= %newDiffuse &&
          %mat.normalMap $= %newNormal &&
          %mat.detailMap $= %newDetail &&
+         %mat.pbrConfigMap $= %newPBRConfig &&
          %mat.macroMap $= %newMacro &&
          %mat.detailSize == %detailSize &&
          %mat.diffuseSize == %diffuseSize &&
@@ -497,7 +547,8 @@ function TerrainMaterialDlg::saveDirtyMaterial( %this, %mat )
    }
    
    %mat.diffuseMap = %newDiffuse;    
-   %mat.normalMap = %newNormal;    
+   %mat.normalMap = %newNormal;   
+   %mat.pbrConfigMap = %newPBRConfig; 
    %mat.detailMap = %newDetail;    
    %mat.macroMap = %newMacro;
    %mat.detailSize = %detailSize;  
@@ -543,6 +594,7 @@ function TerrainMaterialDlg::snapshotMaterials( %this )
          internalName = %mat.internalName;
          diffuseMap = %mat.diffuseMap;
          normalMap = %mat.normalMap;
+         pbrConfigMap = %mat.pbrConfigMap;
          detailMap = %mat.detailMap;
          macroMap = %mat.macroMap;
          detailSize = %mat.detailSize;
@@ -577,6 +629,7 @@ function TerrainMaterialDlg::restoreMaterials( %this )
       %mat.setInternalName( %obj.internalName );
       %mat.diffuseMap = %obj.diffuseMap;
       %mat.normalMap = %obj.normalMap;
+      %mat.pbrConfigMap = %obj.pbrConfigMap;
       %mat.detailMap = %obj.detailMap;
       %mat.macroMap = %obj.macroMap;
       %mat.detailSize = %obj.detailSize;

Templates/BaseGame/game/tools/worldEditor/scripts/menuHandlers.ed.cs

@@ -280,7 +280,17 @@ function EditorSaveMission()
       initContainerTypeSearch($TypeMasks::TerrainObjectType);
 
       while ((%terrainObject = containerSearchNext()) != 0)
-         %terrainObject.save(%terrainObject.terrainFile);
+      {
+         if(%terrainObject.terrainAsset !$= "")
+         {
+            //we utilize a terrain asset, so we'll update our dependencies while we're at it
+            %terrainObject.saveAsset();
+         }
+         else
+         {
+            %terrainObject.save(%terrainObject.terrainFile);
+         }
+      }
    }
 
    ETerrainPersistMan.saveDirty();