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

Merge pull request #799 from Areloch/MiscFixes20220530

Browse source 
Misc Fixes for 2022/05/30
This commit is contained in:
Brian Roberts 2022-05-31 14:33:59 -05:00 • committed by GitHub
commit d9361a0128
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
98 changed files with 1274 additions and 1725 deletions
Download patch file Download diff file Expand all files Collapse all files

140
Templates/BaseGame/game/tools/assetBrowser/assetImportConfigs.xml
View file

@ -316,144 +316,4 @@
name="VolumeAdjust">1.0</Setting>
</Group>
</Group>
<Group
name="NewTest">
<Group
name="Animations">
<Setting
name="animFPS">2</Setting>
<Setting
name="animTiming">Seconds</Setting>
<Setting
name="ImportAnimations">1</Setting>
<Setting
name="SeparateAnimations">1</Setting>
</Group>
<Group
name="Collision">
<Setting
name="CollisionMeshPrefix">Col</Setting>
<Setting
name="GenCollisionType">CollisionMesh</Setting>
<Setting
name="GenerateCollisions">1</Setting>
<Setting
name="GenerateLOSCollisions">1</Setting>
<Setting
name="GenLOSCollisionType">CollisionMesh</Setting>
<Setting
name="LOSCollisionMeshPrefix">LOS</Setting>
</Group>
<Group
name="General">
<Setting
name="AddDirectoryPrefixToAssetName">0</Setting>
<Setting
name="AutomaticallyPromptMissingFiles">0</Setting>
<Setting
name="DuplicatAutoResolution">AutoPrune</Setting>
<Setting
name="PreventImportWithErrors">1</Setting>
<Setting
name="WarningsAsErrors">0</Setting>
</Group>
<Group
name="Images">
<Setting
name="AOTypeSuffixes">_AO,_AMBIENT,_AMBIENTOCCLUSION</Setting>
<Setting
name="Compressed">1</Setting>
<Setting
name="DiffuseTypeSuffixes">_ALBEDO,_DIFFUSE,_ALB,_DIF,_COLOR,_COL</Setting>
<Setting
name="GenerateMaterialOnImport">1</Setting>
<Setting
name="ImageType">N/A</Setting>
<Setting
name="IsHDR">0</Setting>
<Setting
name="MetalnessTypeSuffixes">_METAL,_MET,_METALNESS,_METALLIC</Setting>
<Setting
name="NormalTypeSuffixes">_NORMAL,_NORM</Setting>
<Setting
name="PBRTypeSuffixes">_COMP,_COMPOSITE,_PBR,-COMP,-COMPOSITE,-PBR,_ORM,-ORM</Setting>
<Setting
name="RoughnessTypeSuffixes">_ROUGH,_ROUGHNESS</Setting>
<Setting
name="Scaling">1.0</Setting>
<Setting
name="SmoothnessTypeSuffixes">_SMOOTH,_SMOOTHNESS</Setting>
<Setting
name="TextureFilteringMode">Bilinear</Setting>
<Setting
name="UseMips">1</Setting>
</Group>
<Group
name="Materials">
<Setting
name="CreateComposites">1</Setting>
<Setting
name="ImportMaterials">1</Setting>
<Setting
name="PopulateMaterialMaps">1</Setting>
<Setting
name="UseDiffuseSuffixOnOriginImage">1</Setting>
<Setting
name="UseExistingMaterials">1</Setting>
</Group>
<Group
name="Meshes">
<Setting
name="AdjustCenter">0</Setting>
<Setting
name="AdjustFloor">0</Setting>
<Setting
name="calcTangentSpace">0</Setting>
<Setting
name="CollapseSubmeshes">0</Setting>
<Setting
name="convertLeftHanded">0</Setting>
<Setting
name="DoScaleOverride">0</Setting>
<Setting
name="DoUpAxisOverride">0</Setting>
<Setting
name="findInstances">0</Setting>
<Setting
name="flipUVCoords">0</Setting>
<Setting
name="genUVCoords">0</Setting>
<Setting
name="IgnoreNodeScale">0</Setting>
<Setting
name="ImportMesh">1</Setting>
<Setting
name="invertNormals">0</Setting>
<Setting
name="JoinIdenticalVerts">0</Setting>
<Setting
name="limitBoneWeights">0</Setting>
<Setting
name="LODType">TrailingNumber</Setting>
<Setting
name="removeRedundantMats">0</Setting>
<Setting
name="reverseWindingOrder">0</Setting>
<Setting
name="ScaleOverride">1</Setting>
<Setting
name="TransformUVs">0</Setting>
<Setting
name="UpAxisOverride">Z_AXIS</Setting>
</Group>
<Group
name="Sounds">
<Setting
name="Compressed">0</Setting>
<Setting
name="PitchAdjust">1.0</Setting>
<Setting
name="VolumeAdjust">1.0</Setting>
</Group>
</Group>
</AssetImportSettings>

1
Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/material.tscript
View file

@ -16,6 +16,7 @@ function AssetBrowser::createMaterialAsset(%this)
materialDefinitionName = %assetName;
new Material(%assetName) {
mapTo = %assetName;
};
};

7
Templates/BaseGame/game/tools/assetBrowser/scripts/editAsset.tscript
View file

@ -115,8 +115,11 @@ function AssetBrowser::regeneratePreviewImage(%this)
{
%assetDef = AssetDatabase.acquireAsset(EditAssetPopup.assetId);
%dummyObj = new ScriptObject();
%regenCommand = "AssetBrowser.build" @ EditAssetPopup.assetType @
"Preview(" @%assetDef @ "," @ %dummyObj @ ", true);";
%dummyObj.moduleName = AssetDatabase.getAssetModule(EditAssetPopup.assetId).moduleId;
%dummyObj.assetName = AssetDatabase.getAssetName(EditAssetPopup.assetId);
%regenCommand = "AssetBrowser.generate" @ EditAssetPopup.assetType @
"PreviewImage(" @ %dummyObj @ ", true);";
eval(%regenCommand);
%dummyObj.delete();

22
Templates/BaseGame/game/tools/gui/profiles.ed.tscript
View file

@ -1101,10 +1101,10 @@ singleton GuiControlProfile( GuiEditorScrollProfile )
singleton GuiControlProfile( GuiCreatorIconButtonProfile )
{
opaque = true;
fillColor = "225 243 252 255";
fillColorHL = "225 243 252 0";
fillColorNA = "225 243 252 0";
fillColorSEL = "225 243 252 0";
fillColor = EditorSettings.value("Theme/tabsColor");
fillColorHL = EditorSettings.value("Theme/tabsHLColor");
fillColorSEL = EditorSettings.value("Theme/tabsSELColor");
fillColorNA = EditorSettings.value("Theme/tabsSELColor");
//tab = true;
//canKeyFocus = true;
@ -1112,15 +1112,15 @@ singleton GuiControlProfile( GuiCreatorIconButtonProfile )
fontType = "Noto Sans";
fontSize = 14;
fontColor = "215 215 215";
fontColorSEL = "43 107 206";
fontColorHL = "244 244 244";
fontColorNA = "100 100 100";
fontColor = EditorSettings.value("Theme/fieldTextColor");
fontColorHL = EditorSettings.value("Theme/fieldTextHLColor");
fontColorNA = EditorSettings.value("Theme/fieldTextSELColor");
fontColorSEL = EditorSettings.value("Theme/fieldTextSELColor");
border = 1;
borderColor = "153 222 253 255";
borderColorHL = "156 156 156";
borderColorNA = "153 222 253 0";
borderColor = EditorSettings.value("Theme/dividerMidColor");
borderColorHL = EditorSettings.value("Theme/dividerLightColor");
borderColorNA = EditorSettings.value("Theme/dividerDarkColor");
//bevelColorHL = "255 255 255";
//bevelColorLL = "0 0 0";

10
Templates/BaseGame/game/tools/levels/DefaultEditorLevel.mis
View file

@ -2,14 +2,7 @@
new Scene(EditorTemplateLevel) {
canSave = "1";
canSaveDynamicFields = "1";
isSubScene = "0";
isEditing = "0";
isDirty = "0";
EditPostEffects = "0";
cdTrack = "2";
CTF_scoreLimit = "5";
Enabled = "1";
musicTrack = "lush";
new LevelInfo(theLevelInfo) {
nearClip = "0.1";
@ -27,10 +20,7 @@ new Scene(EditorTemplateLevel) {
soundDistanceModel = "Linear";
canSave = "1";
canSaveDynamicFields = "1";
advancedLightmapSupport = "0";
desc0 = "A blank room template that acts as a starting point.";
Enabled = "1";
LevelName = "Blank Room Template";
};
new SkyBox(theSky) {
Material = "BlankSkyMat";

9
Templates/BaseGame/game/tools/levels/EditorTemplateLevel.mis
View file

@ -2,13 +2,7 @@
new Scene(EditorTemplateLevel) {
canSave = "1";
canSaveDynamicFields = "1";
isSubScene = "0";
isEditing = "0";
isDirty = "0";
cdTrack = "2";
CTF_scoreLimit = "5";
Enabled = "1";
musicTrack = "lush";
new LevelInfo(theLevelInfo) {
nearClip = "0.1";
@ -26,10 +20,7 @@ new Scene(EditorTemplateLevel) {
soundDistanceModel = "Linear";
canSave = "1";
canSaveDynamicFields = "1";
advancedLightmapSupport = "0";
desc0 = "A blank room template that acts as a starting point.";
Enabled = "1";
LevelName = "Blank Room Template";
};
new SkyBox(theSky) {
Material = "BlankSkyMat";

5
Templates/BaseGame/game/tools/settings.xml
View file

@ -47,6 +47,11 @@
<Setting
name="showToolsModule">1</Setting>
</Group>
<Group
name="New">
<Setting
name="defaultModule">ExampleModule</Setting>
</Group>
</Group>
<Group
name="AxisGizmo">

4
Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainMaterialDlg.ed.gui
View file

@ -145,11 +145,11 @@ $guiContent = new GuiControl(TerrainMaterialDlg,EditorGuiGroup) {
tooltipProfile = "ToolsGuiDefaultProfile";
isContainer = "0";
};
new GuiTextEditCtrl() {
new GuiTextCtrl() {
position = "39 21";
extent = "227 18";
profile = "ToolsGuiTextEditProfile";
altCommand = "TerrainMaterialDlg.setMaterialName( $ThisControl.getText() );";
//altCommand = "TerrainMaterialDlg.setMaterialName( $ThisControl.getText() );";
tooltipProfile = "ToolsGuiToolTipProfile";
isContainer = "0";
internalName = "matNameCtrl";