TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 15:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Further conversions of missed file fields in core and tools

Browse source 
Assets created for missed objects and files
Improvements to the Project Importer to correct a number of issues, including not parsing ,'s from object names, trimming whitespace, pruning script extensions from exec invokes
This commit is contained in:
Areloch 2021-07-24 02:08:23 -05:00
parent 36b31ae19d
commit 432d201569
49 changed files with 406 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Templates/BaseGame/game/tools/worldEditor/gui/EditorGui.ed.gui
View file

@ -1238,7 +1238,7 @@ new GuiMouseEventCtrl(CameraSpeedDropdownCtrlContainer, EditorGuiGroup) {
new GuiBitmapCtrl(){ // Fast
position = "105 15";
extent = "2 8";
bitmap = "tools/gui/images/separator-h.png";
bitmapAsset = "ToolsModule:separator_h_image";
Profile = "ToolsGuiDefaultProfile";
HorizSizing = "right";
VertSizing = "bottom";
@ -1246,7 +1246,7 @@ new GuiMouseEventCtrl(CameraSpeedDropdownCtrlContainer, EditorGuiGroup) {
new GuiBitmapCtrl(){ // normal
position = "73 15";
extent = "2 8";
bitmap = "tools/gui/images/separator-h.png";
bitmapAsset = "ToolsModule:separator_h_image";
Profile = "ToolsGuiDefaultProfile";
HorizSizing = "right";
VertSizing = "bottom";
@ -1254,7 +1254,7 @@ new GuiMouseEventCtrl(CameraSpeedDropdownCtrlContainer, EditorGuiGroup) {
new GuiBitmapCtrl(){ // slow
position = "41 15";
extent = "2 8";
bitmap = "tools/gui/images/separator-h.png";
bitmapAsset = "ToolsModule:separator_h_image";
Profile = "ToolsGuiDefaultProfile";
HorizSizing = "right";
VertSizing = "bottom";

10
Templates/BaseGame/game/tools/worldEditor/scripts/interfaces/terrainMaterialDlg.ed.tscript
View file

@ -412,7 +412,7 @@ function TerrainMaterialDlg::setActiveMaterial( %this, %mat )
%this-->baseTexCtrl.setBitmap( %mat.diffuseMap );
%imgPath = $TerrainMaterialEditor::emptyMaterialImage;
%this-->texBaseMap.setBitmap( %imgPath );
%this-->texBaseMap.setBitmapAsset( %imgPath );
if(%imgPath !$= $TerrainMaterialEditor::emptyMaterialImage)
{
@ -431,7 +431,7 @@ function TerrainMaterialDlg::setActiveMaterial( %this, %mat )
if(%imgPath $= "")
%imgPath = $TerrainMaterialEditor::emptyMaterialImage;
%this-->texNormalMap.setBitmap( %imgPath );
%this-->texNormalMap.setBitmapAsset( %imgPath );
if(%imgPath !$= $TerrainMaterialEditor::emptyMaterialImage)
{
@ -450,7 +450,7 @@ function TerrainMaterialDlg::setActiveMaterial( %this, %mat )
if(%imgPath $= "")
%imgPath = $TerrainMaterialEditor::emptyMaterialImage;
%this-->texORMConfigMap.setBitmap( %imgPath );
%this-->texORMConfigMap.setBitmapAsset( %imgPath );
if(%imgPath !$= $TerrainMaterialEditor::emptyMaterialImage)
{
@ -469,7 +469,7 @@ function TerrainMaterialDlg::setActiveMaterial( %this, %mat )
if(%imgPath $= "")
%imgPath = $TerrainMaterialEditor::emptyMaterialImage;
%this-->texDetailMap.setBitmap( %imgPath );
%this-->texDetailMap.setBitmapAsset( %imgPath );
if(%imgPath !$= $TerrainMaterialEditor::emptyMaterialImage)
{
@ -488,7 +488,7 @@ function TerrainMaterialDlg::setActiveMaterial( %this, %mat )
if(%imgPath $= "")
%imgPath = $TerrainMaterialEditor::emptyMaterialImage;
%this-->texMacroMap.setBitmap( %imgPath );
%this-->texMacroMap.setBitmapAsset( %imgPath );
if(%imgPath !$= $TerrainMaterialEditor::emptyMaterialImage)
{

2
Templates/BaseGame/game/tools/worldEditor/scripts/visibility/lightViz.tscript
View file

@ -140,7 +140,7 @@ singleton PostEffect( AL_DepthVisualize )
shader = AL_DepthVisualizeShader;
stateBlock = AL_DefaultVisualizeState;
texture[0] = "#deferred";
texture[1] = "tools/worldEditor/images/depthviz";
textureAsset[1] = "ToolsModule:depthviz_image";
target = "$backBuffer";
renderPriority = 9999;
};