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

Added getShapeConstructorFilePath console function on shapeAsset

Browse source 
Fixed typo in import config settings for DuplicateAutoResolution
Converted TSShapeConstructor to utilize assets
Updated shape editor to work with assetified constructors
Converted guiBitmapButtonCtrl to use assets
This commit is contained in:
Areloch 2021-08-02 04:20:27 -05:00
parent 52c83d19e1
commit 88ae8a9665
181 changed files with 2343 additions and 1577 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Templates/BaseGame/game/tools/materialEditor/gui/MaterialToolbar.ed.gui
View file

@ -59,7 +59,7 @@
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Select and Edit an Existing Material";
hovertime = "1000";
bitmap = "tools/materialEditor/gui/materialSelectorIcon";
bitmapAsset = "ToolsModule:materialSelectorIcon_n_image";
text = "";
groupNum = "-1";
buttonType = "PushButton";

2
Templates/BaseGame/game/tools/materialEditor/gui/cubemaped_cubepreview.tscript
View file

@ -1,7 +1,7 @@
singleton TSShapeConstructor(cubemaped_cubepreviewdts)
{
baseShape = "./cubemaped_cubepreview.dts";
baseShapeAsset = "ToolsModule:cubemaped_cubepreview";
singleDetailSize = "0";
flipUVCoords = "0";
JoinIdenticalVerts = "0";

2
Templates/BaseGame/game/tools/materialEditor/gui/cubemaped_cylinderpreview.tscript
View file

@ -1,7 +1,7 @@
singleton TSShapeConstructor(cubemaped_cylinderpreviewdts)
{
baseShape = "./cubemaped_cylinderpreview.dts";
baseShapeAsset = "ToolsModule:cubemaped_cylinderpreview";
singleDetailSize = "0";
flipUVCoords = "0";
JoinIdenticalVerts = "0";

2
Templates/BaseGame/game/tools/materialEditor/gui/cubemaped_spherepreview.tscript
View file

@ -1,7 +1,7 @@
singleton TSShapeConstructor(cubemaped_spherepreviewdts)
{
baseShape = "./cubemaped_spherepreview.dts";
baseShapeAsset = "ToolsModule:cubemaped_spherepreview";
singleDetailSize = "0";
flipUVCoords = "0";
JoinIdenticalVerts = "0";

2
Templates/BaseGame/game/tools/materialEditor/gui/cubepreview.tscript
View file

@ -1,7 +1,7 @@
singleton TSShapeConstructor(cubepreviewdts)
{
baseShape = "./cubepreview.dts";
baseShapeAsset = "ToolsModule:cubepreview";
singleDetailSize = "0";
flipUVCoords = "0";
JoinIdenticalVerts = "0";

2
Templates/BaseGame/game/tools/materialEditor/gui/cylinderpreview.tscript
View file

@ -1,7 +1,7 @@
singleton TSShapeConstructor(cylinderpreviewdts)
{
baseShape = "./cylinderpreview.dts";
baseShapeAsset = "ToolsModule:cylinderpreview";
singleDetailSize = "0";
flipUVCoords = "0";
JoinIdenticalVerts = "0";

72
Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPropertiesWindow.ed.gui
View file

@ -112,7 +112,7 @@
Extent = "17 17";
HorizSizing = "left";
tooltip = "Swap material on the object with existing";
bitmap = "tools/materialEditor/gui/change-material-btn";
bitmapAsset = "ToolsModule:change_material_btn_n_image";
command = "materialSelector.showDialog(\"MaterialEditorGui.showMaterialChangeSaveDialog\");";
};
@ -299,7 +299,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
};
new GuiTextCtrl() {
canSaveDynamicFields = "0";
@ -399,7 +399,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
};
};
new GuiBitmapCtrl(){
@ -473,7 +473,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
};
new GuiTextCtrl() {
canSaveDynamicFields = "0";
@ -525,7 +525,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
};
};
};
@ -828,7 +828,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
};
new GuiTextCtrl() {
canSaveDynamicFields = "0";
@ -880,7 +880,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
};
};
new GuiBitmapCtrl() {
@ -929,7 +929,7 @@
maxLength = "1024";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/save-icon";
bitmapAsset = "ToolsModule:save_icon_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
useModifiers = "0";
@ -1033,7 +1033,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
useModifiers = "0";
@ -1102,7 +1102,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
useModifiers = "0";
@ -1269,7 +1269,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
useModifiers = "0";
@ -1338,7 +1338,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
useModifiers = "0";
@ -1505,7 +1505,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
useModifiers = "0";
@ -1574,7 +1574,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
useModifiers = "0";
@ -1757,7 +1757,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
useModifiers = "0";
@ -1826,7 +1826,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
useModifiers = "0";
@ -1989,7 +1989,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
};
new GuiTextCtrl() { // Detailmap Scale text
@ -2081,7 +2081,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
};
};
new GuiBitmapCtrl(){
@ -2134,7 +2134,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
};
new GuiTextCtrl() { // Detail Normal Map Strength text
@ -2226,7 +2226,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
};
};
new GuiBitmapCtrl(){
@ -2279,7 +2279,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
};
new GuiTextCtrl() {
canSaveDynamicFields = "0";
@ -2353,7 +2353,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
};
};
new GuiBitmapCtrl(){
@ -2427,7 +2427,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
};
new GuiTextCtrl() {
canSaveDynamicFields = "0";
@ -2479,7 +2479,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
};
};
new GuiBitmapCtrl(){
@ -2553,7 +2553,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
};
new GuiTextCtrl() {
canSaveDynamicFields = "0";
@ -2605,7 +2605,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
};
};
};
@ -3892,7 +3892,7 @@
buttonType = "RadioButton";
position = "1 0";
Extent = "13 13";
bitmap = "tools/materialEditor/gui/wav-sine";
bitmapAsset = "ToolsModule:wav_sine_n_image";
command = "MaterialEditorGui.updateWaveType();";
tooltip="Sine Wave";
hovertime = "1000";
@ -3904,7 +3904,7 @@
buttonType = "RadioButton";
position = "17 0";
Extent = "13 13";
bitmap = "tools/materialEditor/gui/wav-triangle";
bitmapAsset = "ToolsModule:wav_triangle_n_image";
command = "MaterialEditorGui.updateWaveType();";
tooltip="Triangle Wave";
hovertime = "1000";
@ -3916,7 +3916,7 @@
buttonType = "RadioButton";
position = "33 0";
Extent = "13 13";
bitmap = "tools/materialEditor/gui/wav-square";
bitmapAsset = "ToolsModule:wav_square_n_image";
command = "MaterialEditorGui.updateWaveType();";
tooltip="Square Wave";
hovertime = "1000";
@ -4703,7 +4703,7 @@
Visible = "0";
//Command = "materialSelector.showDialog(\"MaterialEditorGui.switchMaterial\");";
hovertime = "1000";
bitmap = "tools/gui/images/folderUp";
bitmapAsset = "ToolsModule:folderUp_image";
tooltip = "Go back to previous editor";
groupNum = "-1";
buttonType = "PushButton";
@ -4722,7 +4722,7 @@
Visible = "1";
Command = "AssetBrowser.showDialog(\"MaterialAsset\", \"MaterialEditorGui.selectMaterialAsset\");";
hovertime = "1000";
bitmap = "tools/gui/images/open-file";
bitmapAsset = "ToolsModule:open_file_n_image";
tooltip = "Open Existing Material";
groupNum = "-1";
buttonType = "PushButton";
@ -4770,7 +4770,7 @@
tooltip = "Save Material (ALT S)";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/gui/images/save-icon";
bitmapAsset = "ToolsModule:save_icon_n_image";
};
new GuiBitmapButtonCtrl() {
canSaveDynamicFields = "0";
@ -4791,7 +4791,7 @@
tooltip = "Lookup Material Instances";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/gui/images/visible";
bitmapAsset = "ToolsModule:visible_n_image";
};
new GuiBitmapCtrl(){
position = "147 1";
@ -4818,7 +4818,7 @@
hovertime = "1000";
tooltip = "Revert Material to Saved";
text = "";
bitmap = "tools/gui/images/reset-icon";
bitmapAsset = "ToolsModule:reset_icon_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
@ -4840,7 +4840,7 @@
hovertime = "1000";
tooltip = "Clear All Material Properties";
text = "";
bitmap = "tools/gui/images/clear-icon";
bitmapAsset = "ToolsModule:clear_icon_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
@ -4862,7 +4862,7 @@
hovertime = "1000";
tooltip = "Delete Material from File";
text = "";
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";

8
Templates/BaseGame/game/tools/materialEditor/gui/gui_gridTiny2_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="gui_gridTiny2_image"
imageFile="@assetFile=gridTiny2.PNG"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

2
Templates/BaseGame/game/tools/materialEditor/gui/materialInstancesView.ed.gui
View file

@ -75,7 +75,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl(MaterialInstanceFilterBtn) {
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
useModifiers = "0";

2
Templates/BaseGame/game/tools/materialEditor/gui/pyramidpreview.tscript
View file

@ -1,7 +1,7 @@
singleton TSShapeConstructor(pyramidpreviewdts)
{
baseShape = "./pyramidpreview.dts";
baseShapeAsset = "ToolsModule:pyramidpreview";
singleDetailSize = "0";
flipUVCoords = "0";
JoinIdenticalVerts = "0";

2
Templates/BaseGame/game/tools/materialEditor/gui/spherepreview.tscript
View file

@ -1,7 +1,7 @@
singleton TSShapeConstructor(spherepreviewdts)
{
baseShape = "./spherepreview.dts";
baseShapeAsset = "ToolsModule:spherepreview";
singleDetailSize = "0";
flipUVCoords = "0";
JoinIdenticalVerts = "0";

2
Templates/BaseGame/game/tools/materialEditor/gui/torusknotpreview.tscript
View file

@ -1,7 +1,7 @@
singleton TSShapeConstructor(torusknotpreviewdts)
{
baseShape = "./torusknotpreview.dts";
baseShapeAsset = "ToolsModule:torusknotpreview";
singleDetailSize = "0";
flipUVCoords = "0";
JoinIdenticalVerts = "0";

2
Templates/BaseGame/game/tools/materialEditor/gui/torusknowpreview.tscript
View file

@ -1,7 +1,7 @@
singleton TSShapeConstructor(torusknowpreviewdts)
{
baseShape = "./torusknowpreview.dts";
baseShapeAsset = "ToolsModule:torusknowpreview";
singleDetailSize = "0";
flipUVCoords = "0";
JoinIdenticalVerts = "0";

2
Templates/BaseGame/game/tools/materialEditor/gui/toruspreview.tscript
View file

@ -1,7 +1,7 @@
singleton TSShapeConstructor(toruspreviewdts)
{
baseShape = "./toruspreview.dts";
baseShapeAsset = "ToolsModule:toruspreview";
singleDetailSize = "0";
flipUVCoords = "0";
JoinIdenticalVerts = "0";

4
Templates/BaseGame/game/tools/materialEditor/main.tscript
View file

@ -64,7 +64,7 @@ function MaterialEditorPlugin::onWorldEditorStartup( %this )
// Add ourselves to the ToolsToolbar
%tooltip = "Material Editor (" @ %accel @ ")";
EditorGui.addToToolsToolbar( "MaterialEditorPlugin", "MaterialEditorPalette", expandFilename("tools/worldEditor/images/toolbar/material-editor"), %tooltip );
EditorGui.addToToolsToolbar( "MaterialEditorPlugin", "MaterialEditorPalette", "ToolsModule:material_editor_n_image", %tooltip );
//connect editor windows
GuiWindowCtrl::attach( MaterialEditorPropertiesWindow, MaterialEditorPreviewWindow);
@ -163,4 +163,4 @@ function MaterialEditorPlugin::onDeactivated( %this )
%this.map.pop();
Parent::onDeactivated(%this);
}
}

7
Templates/BaseGame/game/tools/materialEditor/scripts/materialEd_justAlphaMaterial.asset.taml Normal file
View file

@ -0,0 +1,7 @@
<MaterialAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="materialEd_justAlphaMaterial"
scriptFile="@assetFile=materialEditor.ed.tscript"
materialDefinitionName="materialEd_justAlphaMaterial"
VersionId="1" />

7
Templates/BaseGame/game/tools/materialEditor/scripts/materialEd_previewMaterial.asset.taml Normal file
View file

@ -0,0 +1,7 @@
<MaterialAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="materialEd_previewMaterial"
scriptFile="@assetFile=materialEditor.ed.tscript"
materialDefinitionName="materialEd_previewMaterial"
VersionId="1" />

24
Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript
View file

@ -28,12 +28,12 @@ function MaterialEditorGui::establishMaterials(%this)
//Cubemap used to preview other cubemaps in the editor.
singleton CubemapData( matEdCubeMapPreviewMat )
{
cubeFace[0] = "tools/materialEditor/gui/cube_xNeg";
cubeFace[1] = "tools/materialEditor/gui/cube_xPos";
cubeFace[2] = "tools/materialEditor/gui/cube_ZNeg";
cubeFace[3] = "tools/materialEditor/gui/cube_ZPos";
cubeFace[4] = "tools/materialEditor/gui/cube_YNeg";
cubeFace[5] = "tools/materialEditor/gui/cube_YPos";
cubeMapFaceAsset[0] = "ToolsModule:cube_xNeg_image";
cubeMapFaceAsset[1] = "ToolsModule:cube_xPos_image";
cubeMapFaceAsset[2] = "ToolsModule:cube_zNeg_image";
cubeMapFaceAsset[3] = "ToolsModule:cube_zPos_image";
cubeMapFaceAsset[4] = "ToolsModule:cube_yNeg_image";
cubeMapFaceAsset[5] = "ToolsModule:cube_yPos_image";
parentGroup = "RootGroup";
};
@ -1690,12 +1690,12 @@ function MaterialEditorGui::createNewCubemap( %this, %cubemap )
new CubemapData(%cubemap)
{
cubeFace[0] = "tools/materialEditor/gui/cube_xNeg";
cubeFace[1] = "tools/materialEditor/gui/cube_xPos";
cubeFace[2] = "tools/materialEditor/gui/cube_ZNeg";
cubeFace[3] = "tools/materialEditor/gui/cube_ZPos";
cubeFace[4] = "tools/materialEditor/gui/cube_YNeg";
cubeFace[5] = "tools/materialEditor/gui/cube_YPos";
cubeMapFaceAsset[0] = "ToolsModule:cube_xNeg_image";
cubeMapFaceAsset[1] = "ToolsModule:cube_xPos_image";
cubeMapFaceAsset[2] = "ToolsModule:cube_zNeg_image";
cubeMapFaceAsset[3] = "ToolsModule:cube_zPos_image";
cubeMapFaceAsset[4] = "ToolsModule:cube_yNeg_image";
cubeMapFaceAsset[5] = "ToolsModule:cube_yPos_image";
parentGroup = RootGroup;
};