Commit graph

404 commits

Author SHA1 Message Date
JeffR
69d547fd72 Adjusted handling for the bitmap and bitmapAsset fields for guiBitmapButtonCtrl to forcefully update the button states when changed, ensuring that the bitmaps refresh when changed via the field
Added callback for onResize to guiWindowCtrl so controls - such as the EditorTree - can be properly resized in certain circumstances when the window is changed
Added getIncrement() and getRange() to GuiGameSettingsCtrl to better facilitate options manipulation on the script side
Corrected some of the console method documentation strings in GuiGameSettingsCtrl
Removed some unneeded, extraneous files and their asset definitions that came from odd import conversions. Where applicable, created cleaned up versions to make naming conventions and references stable
Fixed canvas mode update text typo: FSAA -> FXAA
Added logic to DOF, Light Rays, SSAO and Vignette postFX's to check both the preset setting AND the user preference before enabling.
Shifted initialization order so PostFX's are loaded before we configure the canvas, to ensure stuff like the FXAAPostFX exists and can be toggled on on load
Fixed multiple issues with options menu:
 When using gamepad, unable to navigate from categories to options. Fixed so can now traverse as normal
 Input limitations on gamepad necessitated changing of how setting applying happens, is now done as a 'apply or discard' prompt when leaving the options menu
 Added proper handling for adjusting settings with gamepad with left/right inputs
 Fixed issue where the unapplied change for an option was sometimes being processed as an object name rather than an implicit string. Now made to be explicit strings to avoid issue.
 Made the menu button input for "Select" to go from categories to options gamepad only, and hidden when in the options list
 Fixed issue where changing window mode didn't correctly affect resolution option. Now set up so changing this field correctly refreshes the resolution option. Specifically, when on borderless, the resolution field does not show, preventing confusion as it is always full resolution
 Generally have the options list refresh when changes happen to allow any and all fields to be able to dynamically respond to other options having changed improving flexibility.
 Cleaned up old, unused, commented out functions
Added ability on OKCancel message boxes to override the button text if needed
Fixed issue with AssetBrowser where the shrink/grow icons next to the preview size slider were not anchored correctly.
Adjusted callback logic so if preview slider is clicked on, rather than dragged, it will correctly update the zoom values
Added sorting to Modules List dropdown for the AssetBrowser
Improved standardization of double-clicking in AssetBrowser. Now defaults to editing action if regularly browsing and selecting if in select mode. Still allows regular per-type overrides as normal
Moved definition of GuiDisabledTextEditProfile to gui profiles.ed.tscript file, removed duplicates to stop error spam
Adjusted default settings value for double-click action in AB to be edit to prevent unstable behavior
Removed old file refs from Load Recent list in the default settings
2022-03-26 22:36:37 -05:00
Brian Roberts
05a6a249ea
Merge pull request #748 from Areloch/MiscImportAndToolFixes
Misc Tool and Asset Import fixes and improvements
2022-03-20 18:49:36 -05:00
JeffR
26044677c1 Made renaming of terrain materials on importing terrainblocks to use the full assetId, as it should 2022-03-20 16:42:21 -05:00
JeffR
cf8659735b Adjusts handling so if a file being processed for importing is not actually imported as a new, successful asset it does not return an id, allowing tooling to only worry about actual new assets.
Adds utility functions to TerrainBlock to be able to replace names of materials in the terrain file, mostly used for importing legacy files
Adjusts terrainblock save asset logic to be able to save on a non-networked terrainblock such as when loaded temporarily on the server, for tooling purposes.
Changes handling of not-found terrain materials when loading a terrain block so it will create a dummy terrain material with the same name as the not-found, but set the texture as the Warning image, instead of thrashing the original material names data
Adds logic for testing newly imported terrain files' materials and if needbe, replacing them with the new terrain material asset ids.
Adds logic in the project importer for if a would-be level asset's name already exists, we attempt to slap a "Level" suffix onto it to sidestep collisions.
Changed LegacyImport config to try always adding shape suffix to help minimize probable naming collisions.
Fixed handling of mission file's MissionGroup defines by specially checking for MissionGroup objects and processing the line into a Scene() declaration instead.
2022-03-20 16:17:06 -05:00
JeffR
b3342ff7e6 Adds handling for import of files marked as ShapeAnimationAsset
Adds filetype handling of dsqs for importing
Improves logic checks to prevent incorrectly redundantly processing incoming assets for collisions, which could mark all assets as colliding instead of all but the first.
Adds better handling for assets marked as for dependency usage when importing
Improves rules for writing originalFilePath only if it's actually from an external directory, and the file actually exists to prevent polluting in redundant or garbage data
Fixes issue where MaterialEditor was not tracking the currently material assetId if the material was changed via the dropdown selector
Adds a sanity check to shapeAnimationAsset load so if the resource does not load properly it doesn't hard crash but instead logs the error and returns safely.
2022-03-20 03:17:31 -05:00
Brian Roberts
c95db92622
Merge pull request #745 from Areloch/FixEditorsMenubar
Fixes handling of the setEditor commands so that the dropdown Editors menubar entry properly works
2022-03-17 13:40:01 -05:00
Brian Roberts
4969effaba
Merge pull request #744 from Areloch/miscCoreToolsErrorCleanups
Fixes and cleans up various issues and error spam for core and tools folders
2022-03-17 13:39:53 -05:00
JeffR
87ea262ef0 Fixes handling of the setEditor commands so that the dropdown Editors menubar entry properly works 2022-03-17 03:09:11 -05:00
JeffR
2c999008f1 Fixes and cleans up various issues and error spam for core and tools folders
Also:
Fixes error spam about CreatorIconArray
Fixes error spam about duplicate uses of various materials
Converts a number of materials to be packed into the mat assets for cleanliness and preventing unwanted duplicate exec's
Removed some extraneous misconvert '.asset.taml' files
Fixes 'cannot compile shader' error when trying to use the viz modes
Fixed a some instances of guiControlProfiles not being actually defined
Fixed some instances of guiControlProfiles being duplicated
2022-03-17 02:43:18 -05:00
JeffR
532200ff43 Changes the creation of new materials in the material editor to go through the new asset interface, which ensures the creation is standardized across the board. 2022-03-17 00:03:22 -05:00
marauder2k7
1d5a36c4c0 Spheres for Skies
-Added: SkySphere a full sphere skyBox
-Change: ScatterSky now renders a dome instead of the top face of a cubeSphere
-Change: Creator now has skySphere

TODO: Simplify sphere creation
PossibleMethod: Add the sphere creation functions to one place to be shared around.
2022-03-08 19:50:36 +00:00
JeffR
b8b94fdec9 Standardizes project import copy behavior to validate if we're in-place importing to avoid erroring out needlessly with a new utility function
Fixed wrong variable preventing ImportConfig Editor from refreshing when selecting different configs
Standardized DefaultImportConfig's settings against Legacy Import setting, specifically collision resolution behavior and appending _mat suffix to materials
2022-02-25 00:03:33 -06:00
JeffR
7659b51ac9 Added trimming of parsed object names to ensure whitespace before and after isn't accidentally processed as invalid characters
Also made the classname validity check happen on the other creation keyword types
Added logic so when processing an importing material definition that already has an asset, can handle it if the scriptPath doesn't have the extension in it already.
2022-02-24 01:33:14 -06:00
JeffR
8d8432115b Adjusts formatting when parsing for object and function definitions in the project importer to be more accurate
Adds handling for progrommatic new object delcarations where the class type is defined via () encapsulated code so the project import doesn't mangle it.
2022-02-24 00:48:00 -06:00
JeffR
01de818503 Ran importer on UI module to ensure guis and images are converted to latest standards
Updated all UI module controls to utilize a more standard structure with stack controls instead of the GameMenu ctrls, as well as more standardization of gamepad input handling
2022-02-22 20:12:39 -06:00
JeffR
696c2e2eec Add sanity check for default value results checking when filtering out default values
Add additional utility functions for updating parsed object data in the project importer
Adds logic to find and associate FX materials to their terrainMaterials and adding them to the terrian material asset if found on project importer
2022-02-02 01:11:33 -06:00
JeffR
5e1eb80bc1 Fixed handling issue where it would misparse lines that would contain new/singleton/datablock keywords
fixed incorrect getSubStr function invoke
2022-01-30 19:14:36 -06:00
JeffR
630285def6 Shifts handling of material and terrain material definitions to be written into the asset definition taml file instead of having an extra loose file
Also updates importers to correctly handle this change
Adds ability for taml XML serialization to properly assign array'd fields
Adds 'inheritFrom' field to simobjects for when objects with parent objects are serialized
AssetBase how inherits from SimGroup so it can have objects like material definitions embedded in them for save/load in the taml definition file
Updated loading/handling logic in terrain material asset to be more similar to regular material assets
2022-01-30 11:50:16 -06:00
JeffR
728aa83481 Comments and cleanup 2022-01-20 17:48:01 -06:00
JeffR
ecd35df7e9 Implementation of updated handling of Legacy Project importer to better seperate out importer versions as well as more explicit processing of incoming content 2022-01-20 01:14:43 -06:00
JeffR
cde1d68f78 Fixes handling in the generic creator function to deal with commands formatted with "return " at the start AND without
Fixes assignment of default material to convex shape when the toolbar button is pressed to create a 1u cube automatically.
2021-12-25 12:30:31 -06:00
JeffR
b70faae38f Updates the handling of the baking of shape asset previews to generate them with support for view angle control to improve visibility, as well as supporting overriding of a material in the preview bake
Also utilizes the updated bake handling to have material asset previews render as a sphere shape asset, overriding with the material asset's material, improving distinction of what is a material asset vs image asset
Also updates the sphere preview mesh to be more generic and not only for reflection probes
2021-12-24 17:26:45 -06:00
Areloch
a30e9c6242 Removes the Library tabs from the World and GUI editors to avoid confusion. Adjusts the creation namespace from ECreatorWindow to a dummy object ObjectCreator to handle invoking for creation 2021-12-04 22:47:10 -06:00
AzaezelX
de379f8b25 fix metal sound entry for playerdata 2021-11-30 18:19:58 -06:00
Areloch
a5944aff19 Adjusted callback handling of asset inspector fields when invoking AB to select asset for more consistent behavior and better handling of updating the objects and inspector
Added logic to forcefully acquire newly imported asset definition to better try and ensure it's loaded immediately after import
Added logic to asset importer so if a file is not found for an importing material asset, if populate maps is on, then it will try and find a matching image asset in the destination module
Added logic to tsStatic to better handle fields being updated via the editor, forcing updates and refreshes of the shape and materialSlots
Fixed handling of guiBitmapButtonCtrl so it will update the bitmap used when edited via the Gui Editor
Updated image ref to the hudFill image asset for the console GUI
Cleaned up names for the default camera model/material
Defaulted import config to utilize the Prune action instead of rename for more predictable default behavior
Added icons next to AB's preview slider bar for additional visual feedback of slider intent
Added missing checkbox to asset import window and cleaned up scaling behavior
Fixed handling of drag-n-drop behavior in GUI editor so it doesn't block further interaction
Added logic for drag-n-drop of image assets to GUI Editor so it will create a GuiBitmapCtrl with the image
Added handling for drag-n-drop import of folders of assets to AB/Asset Import
Added missing asset import config option to indicate if config supported import of sound assets
Added logic when opening asset import config editor, where if there is a default import config set in the settings, it will open that one by default
Hid the collision section of the import config editor, as those options are currently unutilized
Improved behavior for Create New Folder window in the AB, now always pushing to the front, and also selecting the text by default, so the user can just start typing the new name
Also added return and escape key accelerators to Create New Folder window for better UX
Fixed display of editor windows, adding a distinct blue color to highlighted windows' title bar and fixing display of minimize/maximize/window/close buttons
Moved GUIEditor's onControlDropped function to the AB script to match placement of sibling world editor function
Fixed issue with material editor where the ORM Config map slot was getting the normal map instead of the correct ORM map
2021-11-26 16:40:15 -06:00
Brian Roberts
b5bd242e23
Merge pull request #673 from Areloch/useImagePreviews
Shifts utilization of gui elements in editors that point to 'normal' image assets to utilize generated previews instead.
2021-11-15 12:39:33 -06:00
Areloch
eb24b63be4 Shifts utilization of gui elements in editors that point to 'normal' image assets to utilize generated previews instead.
This reduces console spam about mismatched texture profiles and improves stability.
2021-11-14 21:39:51 -06:00
Areloch
97484247ae Fixes Settings window not being able to be brought forward over AB
Adds checkbox to mark as not showing Import Window each time
Added loaded import config to import log output
Fixed targeted material map slot field names
Added helper function for playing a sound asset via AssetId
Updated import config to have some more common suffixes
Updated editor settings to have Import Window show by default
Changed AB context menu from listing item as "Refresh Asset" to "Reload Asset" for improved clarity
Removed unneeded duplicate editor settings window script file
2021-11-14 01:26:04 -06:00
JeffR
b3cd08520e Disables generation of the materials script files by the internal shape import processor. Material script files are now only generated by the AssetImporter as part of the shape injest process.
Renames validateImportingAssets to hasImportIssues for AssetImporter console method for clarity
Updated console method documentation for AssetImporter methods
Fixed logical error for material asset generation if the import config was set to use existing materials but one was not found.
Fixed logical error when a shapeFile has a material with a texture mapped to it is not in the same directory as the shape, it would not correctly find the texture
Adjusts AssetImport window logic so it will display the window in the event of import issues being detected, or the asset is being re-imported.
Updates the AssetImport window activity log to use the new AssetImporter's log for consistency.
2021-11-05 17:49:48 -05:00
JeffR
fda722e355 Updates asset importer and project importer to output to separate log files into tools/logs
Add utility console function for getting current datetime
2021-11-03 00:13:00 -05:00
Brian Roberts
ac3126765f
Merge pull request #646 from Azaezel/alpha40/matScrollFix
fix material scrolling
2021-10-30 11:39:34 -05:00
AzaezelX
7b77877c63 fix material scrolling 2021-10-29 16:25:31 -05:00
Areloch
0fab2ebf54 Added fallback handling to MaterialAssets if the asset was found but the matDef was not
Added import config handling for prepending Directory to asset name
Added handling for import config of appending a sound suffix
Integrated handling of directory prepend and asset type suffix to rename issue resolution of asset importing
Corrected miswording of warn message for duplicate object names
Correct GUI issues with verve tools
Convert verve tools to utilize assets for their GUI elements
Fix window binding/naming issue depending on window mode for verve
Fix popup menus formatting for verve
WIP fix for material swap in Material editor. Corrects crash, but swap action is unreliable depending on object type
Fix display issue with mission area editor toolbar button image
Fix tooltip display of SFXEmitters in editor tree to correctly show the bound asset
Changed network graph accelerator keybind from just N to Ctrl N to avoid keybind issues when typing
Fixed Create New Emitter button in particle emitter that was showing as no texture
2021-10-28 23:52:58 -05:00
Robert MacGregor
9d2e95a1b1 * BugFix: Correct the usage of a local variable in a non-function scope in the set object locked dropdown item when right clicking in the inspector. 2021-10-28 10:30:43 -04:00
Brian Roberts
6d0105948d
Merge pull request #636 from Azaezel/alpha40/matAnimAngry
addsa material.setAnimflags(LAYER,TAGS STRING); method
2021-10-27 18:58:41 -05:00
AzaezelX
bf646b604f typofix for impoerter 2021-10-26 17:47:19 -05:00
Brian Roberts
7f5766a7fc
Merge pull request #635 from Ragora/bugfix-asset-browser-delete-directory-loop
BugFix: Address an error where deleting directories may result in an infinite loop
2021-10-26 00:25:45 -05:00
Brian Roberts
4b3a83c4df
Merge pull request #633 from Ragora/bugfix-asset-browser-horizontal
BugFix: Allow the asset browser tree view to use a horizontal scroll bar
2021-10-25 22:57:06 -05:00
AzaezelX
3fdf49f829 addsa material.setAnimflags(LAYER,TAGS STRING); method
workaround for mat.animFlags[#]= foo; not taking
time of writing seems to not work for scroll for some reason. might be a different bug
2021-10-25 22:54:19 -05:00
Robert MacGregor
4082fd36e3 * [AssetBrowser] BugFix: Address an error where deleting directories may result in an infinite loop. 2021-10-25 17:58:24 -04:00
Robert MacGregor
27d75486e6 * [Editor] BugFix: Correct the inability to use function keys F1-F10 when running the editor. These keys were supposed to open a series of other editors. 2021-10-24 19:10:59 -04:00
Robert MacGregor
edf9afbd9b * [AssetBrowser] BugFix: Allow the asset browser tree view to use a horizontal scroll bar where necessary. 2021-10-22 11:22:34 -04:00
Brian Roberts
361ae7e2da
Merge pull request #627 from Azaezel/alpha40/soundAssetFollowup
sound asset followups
2021-10-21 14:17:39 -05:00
Robert MacGregor
58170a7805 * [AssetBrowser] BugFix: Correct a case where creator categories may get shoved into the first module in the tree when entering asset select mode. 2021-10-17 18:21:29 -04:00
AzaezelX
670b246a2a sound asset conversions - playlist (as a point of significance, that no longer uses mSlots.mTrack[ i ] on the backend. just th equivalent of mTrack[i]. While the former was certainly useful for clustering, it's actively fighting standarization) 2021-10-14 22:33:13 -05:00
AzaezelX
9ab5f61c39 sound asset conversions - ambience 2021-10-14 22:31:00 -05:00
AzaezelX
9af2de3c4b upconverter tweaks 2021-10-14 19:07:48 -05:00
AzaezelX
c2fdb733fa make mat editor list and set soundassets 2021-10-14 19:07:36 -05:00
AzaezelX
adbd6d0711 sound asset conversions importer script updates - afxmagicmissile for a datablock case and guimltextcrtl for an object-instance case 2021-10-14 15:12:50 -05:00
AzaezelX
f5600826d7 Merge branch 'Preview4_0' into SoundAssetImplements
# Conflicts:
#	Engine/source/T3D/assets/assetImporter.cpp
#	Engine/source/forest/forestItem.cpp
2021-10-11 20:11:27 -05:00