Converts all game, gui editor, and system classes to utilize assets

Processed core, tools and default modules to utilize assets
Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption
Removed unneeded MainEditor mockup module
Removed some unused/duplicate image assets from the tools
This commit is contained in:
Areloch 2021-07-19 01:07:08 -05:00
parent 83b0432283
commit 5525f8ecdd
1708 changed files with 19619 additions and 4596 deletions

View file

@ -0,0 +1,6 @@
<GUIAsset
canSave="true"
canSaveDynamicFields="true"
scriptFile="@assetFile=shapeEdSelectWindow.ed.gui"
GUIFile="@assetFile=shapeEdSelectWindow.ed.gui"
VersionId="1" />

View file

@ -48,12 +48,12 @@ singleton GuiControlProfile(GuiShapeEdTextListProfile : ToolsGuiTextListProfile)
singleton GuiControlProfile(GuiShapeEdRolloutProfile : GuiInspectorRolloutProfile0)
{
bitmap = "tools/editorClasses/gui/images/rollout";
bitmapAsset = "ToolsModule:rollout_image";
category = "Editor";
};
singleton GuiControlProfile( GuiShapeEdTransitionSliderProfile )
{
bitmap = "tools/shapeEditor/images/transition_slider";
bitmapAsset = "ToolsModule:transition_slider_image";
category = "Core";
};

View file

@ -0,0 +1,7 @@
<GUIAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="ShapeEdAdvancedWindow, EditorGuiGroup"
scriptFile="@assetFile=shapeEdAdvancedWindow.ed.gui"
GUIFile="@assetFile=shapeEdAdvancedWindow.ed.gui"
VersionId="1" />

View file

@ -0,0 +1,7 @@
<GUIAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="ShapeEdAnimWindow"
scriptFile="@assetFile=shapeEdAnimWindow.ed.gui"
GUIFile="@assetFile=shapeEdAnimWindow.ed.gui"
VersionId="1" />

View file

@ -0,0 +1,7 @@
<GUIAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="ShapeEdPropWindow"
scriptFile="@assetFile=shapeEdPropWindow.ed.gui"
GUIFile="@assetFile=shapeEdPropWindow.ed.gui"
VersionId="1" />

View file

@ -0,0 +1,7 @@
<GUIAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="ShapeEditorSettingsTab,EditorGuiGroup"
scriptFile="@assetFile=ShapeEditorSettingsTab.gui"
GUIFile="@assetFile=ShapeEditorSettingsTab.gui"
VersionId="1" />

View file

@ -0,0 +1,7 @@
<GUIAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="ShapeEditorToolbar, EditorGuiGroup"
scriptFile="@assetFile=ShapeEditorToolbar.ed.gui"
GUIFile="@assetFile=ShapeEditorToolbar.ed.gui"
VersionId="1" />

View file

@ -52,7 +52,7 @@
position = "94 3";
Extent = "2 26";
MinExtent = "1 1";
bitmap = "tools/gui/images/separator-h.png";
bitmapAsset = "ToolsModule:separator_h_image";
};
new GuiBitmapButtonCtrl() {
canSaveDynamicFields = "0";
@ -125,7 +125,7 @@
position = "202 3";
Extent = "2 26";
MinExtent = "1 1";
bitmap = "tools/gui/images/separator-h.png";
bitmapAsset = "ToolsModule:separator_h_image";
};
new GuiBitmapButtonCtrl() {
canSaveDynamicFields = "0";
@ -195,7 +195,7 @@
position = "309 3";
Extent = "2 26";
MinExtent = "1 1";
bitmap = "tools/gui/images/separator-h.png";
bitmapAsset = "ToolsModule:separator_h_image";
};
new GuiBitmapButtonCtrl() {
canSaveDynamicFields = "0";
@ -268,7 +268,7 @@
position = "415 3";
Extent = "2 26";
MinExtent = "1 1";
bitmap = "tools/gui/images/separator-h.png";
bitmapAsset = "ToolsModule:separator_h_image";
};
new GuiBitmapButtonCtrl() {
internalName = "showAdvanced";

View file

@ -690,7 +690,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapCtrl(){
bitmap = "tools/gui/images/inactive-overlay";
bitmapAsset = "ToolsModule:inactive_overlay_image";
position = "4 18";
Extent = "193 64";
tooltip = "Imposters must be enabled, and an imposter detail level selected to edit these properties";
@ -1747,7 +1747,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapCtrl() {
bitmap = "tools/gui/images/inactive-overlay";
bitmapAsset = "ToolsModule:inactive_overlay_image";
position = "0 47";
extent = "199 175";
horizSizing = "right";

View file

@ -838,7 +838,7 @@
buttonType = "RadioButton";
useMouseEvents = "0";
buttonMargin = "0 4";
iconBitmap = "tools/gui/images/menubar/world-transform_n";
bitmapAsset = "ToolsModule:world_transform_n_image";
textMargin = "25";
};
new GuiIconButtonCtrl() {
@ -862,7 +862,7 @@
buttonType = "RadioButton";
useMouseEvents = "0";
buttonMargin = "0 4";
iconBitmap = "tools/gui/images/menubar/object-transform_n";
bitmapAsset = "ToolsModule:object_transform_n_image";
textMargin = "26";
};
new GuiTextEditCtrl() {
@ -1137,7 +1137,7 @@
internalName = "objectNode";
};
new GuiBitmapCtrl(){
bitmap = "tools/gui/images/inactive-overlay";
bitmapAsset = "ToolsModule:inactive_overlay_image";
position = "4 45";
extent = "193 42";
tooltip = "A mesh must be selected to edit these properties";
@ -1353,7 +1353,7 @@
buttonType = "PushButton";
useMouseEvents = "0";
buttonMargin = "0 4";
iconBitmap = "tools/worldEditor/images/toolbar/material-editor_n";
bitmapAsset = "ToolsModule:material_editor_n_image";
textMargin = "25";
};
new GuiCheckBoxCtrl() {

View file

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

View file

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

View file

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

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="collision_shape_d_image"
imageFile="@assetFile=collision-shape_d.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="collision_shape_h_image"
imageFile="@assetFile=collision-shape_h.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="collision_shape_n_image"
imageFile="@assetFile=collision-shape_n.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="detail_levels_btn_d_image"
imageFile="@assetFile=detail-levels_btn_d.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="detail_levels_btn_h_image"
imageFile="@assetFile=detail-levels_btn_h.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="detail_levels_btn_n_image"
imageFile="@assetFile=detail-levels_btn_n.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="object_bounds_d_image"
imageFile="@assetFile=object-bounds_d.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="object_bounds_h_image"
imageFile="@assetFile=object-bounds_h.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="object_bounds_n_image"
imageFile="@assetFile=object-bounds_n.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="object_fit_bounds_d_image"
imageFile="@assetFile=object-fit-bounds_d.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="object_fit_bounds_h_image"
imageFile="@assetFile=object-fit-bounds_h.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="object_fit_bounds_n_image"
imageFile="@assetFile=object-fit-bounds_n.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="seq_bar_in_d_image"
imageFile="@assetFile=seq_bar-in_d.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="seq_bar_in_h_image"
imageFile="@assetFile=seq_bar-in_h.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="seq_bar_in_n_image"
imageFile="@assetFile=seq_bar-in_n.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="seq_bar_out_d_image"
imageFile="@assetFile=seq_bar-out_d.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="seq_bar_out_h_image"
imageFile="@assetFile=seq_bar-out_h.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="seq_bar_out_n_image"
imageFile="@assetFile=seq_bar-out_n.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="show_wireframe_d_image"
imageFile="@assetFile=show-wireframe_d.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="show_wireframe_h_image"
imageFile="@assetFile=show-wireframe_h.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="show_wireframe_n_image"
imageFile="@assetFile=show-wireframe_n.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="sun_btn_d_image"
imageFile="@assetFile=sun-btn_d.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="sun_btn_h_image"
imageFile="@assetFile=sun-btn_h.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="sun_btn_n_image"
imageFile="@assetFile=sun-btn_n.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

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

View file

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

View file

@ -2168,7 +2168,7 @@ function ShapeEdTriggerList::addItem( %this, %frame, %state )
VertSizing = "bottom";
position = %pos SPC "0";
Extent = "2 12";
bitmap = "tools/shapeEditor/images/trigger_marker";
bitmapAsset = "ToolsModule:trigger_marker_image";
};
ShapeEdAnimWindow.getObject(0).addGuiControl( %ctrl );
%this.triggerId++;