Commit graph

5440 commits

Author SHA1 Message Date
JeffR dff83182e2 Added sanity check to ensure that the requested file to be scaled via saveScaledImage actually exists
Shifts integration of other modules with the OptionsMenu so other modules can inject their own options categories to a callOnModules hook
Updated ExampleModule to use new options menu integration angle to show example option
Deleted unneeded dropdown_textEdit_image asset def from baseUI
Fixed incorrect internal values for the terrainIcon_image asset def that made it present as a redundant terrain material asset
Cleaned up old, bad loadFilters calls and replaced them with the proper refresh() calls.
Removed old, bad calls for jumping through the asset browser's tree from when it was still hardcoded organization, which cuts down a lot of error spam
Cleaned up some of the asset type's preview image assignment code to be more reliable
Made terrain materials now use a similar preview proxy shape as regular materials
Fixed erroneous duplicate GuiInspectorTypeShapeAssetPtr::onControlDropped, which was breaking drag-n-drop actions of shapeAssets into inspector fields
Added proper logic for drag-n-drop actions of imageAssets into inspector fields
Add sanity check after creating new asset to avoid redundant attempts at initialization of the new asset
Fixed ConvexShape Editor tooling so you can now use the UI to apply the selected material to the selected surface
Added tools menu to the menubar with the Project Importer entry so the PI can be launched from either tool
Implemented ability to drag-n-drop imageAssets onto MaterialEditor map fields and have it work
Implemented ability to drag-n-drop imageAssets onto TerrainMaterial Editor map fields and have it work
Made the TerrainMaterial editor dialogue have a non-modal background so you can interact with the editor as normal while it's up
Add sanity check to avoid attempting to mark EditorTree items if we couldn't find it's id
renamed BaseMap references in terrain material editor to diffuseMap for consistency
2022-03-27 03:05:48 -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
Brian Roberts fe7f2f761e
Merge pull request #750 from Areloch/MiscToolFixes20220320
Misc tool fixes20220320
2022-03-20 18:48:50 -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 ee4253c982
Merge pull request #746 from Azaezel/alpha40/CompilationCorrection
fix compilation flaws
2022-03-19 12:56:07 -05:00
AzaezelX d883575d0f fix compilation flaws 2022-03-17 17:38:41 -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
Brian Roberts 1523bb0653
Merge pull request #743 from Areloch/newMatEdMaterialAsset
Changes the creation of new materials in the material editor process
2022-03-17 13:39:44 -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
Brian Roberts 0fad36787f
Merge pull request #740 from Azaezel/alpha40/spotCookieCorrection
crashfix and projection fix for spotlights with cookies
2022-03-16 03:30:55 -05:00
Brian Roberts 3411dab754
Merge pull request #742 from Areloch/invisibleFileFix
Tweaks handling of "invisible" files
2022-03-16 03:30:45 -05:00
Brian Roberts dad0149dfe
Merge pull request #741 from Areloch/systemCommandFunction
Adds a systemCommand console utility function
2022-03-16 03:30:33 -05:00
Brian Roberts 673833f235
Merge pull request #738 from Azaezel/alpha40/fogfix
point baseline fog color at the right target hen in deferred mode
2022-03-16 03:30:20 -05:00
JeffR b36776d567 Tweaks handling of "invisible" files, files which start with a ., effectively making them have no filename and only an extension.
This allows the engine to actually process and work with such files.
2022-03-15 21:17:37 -05:00
JeffR 1496ffac6e Adds a systemCommand console utility function, which invokes the standard system() function call, and also has an optional callback return parameter. 2022-03-15 21:10:55 -05:00
AzaezelX 23b908da56 crashfix and projection fix for spotlights with cookies 2022-03-15 19:26:37 -05:00
AzaezelX 8dcd74ff18 point baseline fog color at the right target hen in deferred mode 2022-03-09 18:21:47 -06:00
Brian Roberts 2198dd14d1
Merge pull request #737 from Azaezel/alpha40/GCOrder
ensure MissionCleanup exists before .mis load
2022-03-09 17:02:29 -06:00
Brian Roberts 32f3194e3e
Merge pull request #736 from marauder2k9-torque/SkyImprovements
Sky improvements
2022-03-09 17:02:20 -06:00
AzaezelX 4d336e9ecf ensure MissionCleanup exists before .mis load 2022-03-08 17:52:42 -06:00
marauder2k7 382ee60d86 Sky Sorting
-Change: ScatterSky is always drawn behind other sky objects (since it has sun and moon)
2022-03-08 20:18:47 +00:00
marauder2k7 bbf92846c2 Update scatterSky.cpp 2022-03-08 19:52:47 +00: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
Brian Roberts 916121a1bd
Merge pull request #735 from Areloch/ImagePreviewGenFix
Fixes handling of loading non-DDS images to better handle pointer references with the GBitmap resources.
2022-03-06 23:09:29 -06:00
JeffR f1f73e41bd Fixes handlong of loading non-DDS images to better handle pointer references with the GBitmap resources.
Also adds a sanity check for the source or dest strings so they can't be empty strings
2022-03-06 22:55:05 -06:00
Brian Roberts 21c72f6b53
Merge pull request #734 from Azaezel/alpha40/bakefix
fix probe baking typo
2022-03-06 13:26:19 -06:00
AzaezelX 3e4cc0a5c6 fix probe baking typo 2022-03-06 13:18:06 -06:00
Brian Roberts 96669453d8
Merge pull request #733 from Areloch/saveScaledDDSImageFix
Fixes saveScaledImage to handle DDS format files, since DDS's go through a separate resource loader
2022-03-02 13:05:01 -06:00
JeffR 7fe85ab7d5 Fixes saveScaledImage to handle DDS format files, since DDS's go through a separate resource loader 2022-02-25 16:55:05 -06:00
Brian Roberts 5e26ce037b
Merge pull request #732 from Areloch/InPlaceImportFixes
Misc importer improvements to handle importing in-place more predictably
2022-02-25 10:44:58 -06: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
Brian Roberts da5cb56c83
Merge pull request #731 from Areloch/importerObjectProcessingFix
Fixes some mishandled cases when preprocessing objects and functions for project import
2022-02-24 01:50:23 -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
Brian Roberts 10c3188171
Merge pull request #730 from Areloch/BaseUIModuleStandardizePR
Base UI module standardize pr
2022-02-23 10:45:00 -06:00
JeffR 9b4acda7bd Missed clearing the options categories in options menu onWake 2022-02-23 00:29:00 -06:00
JeffR 725e2b1575 Typo'd assetId correction 2022-02-22 23:39:52 -06:00
JeffR 938e4930ae Git didn't properly actually commit new files. 2022-02-22 23:28:28 -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
Brian Roberts 2f41526233
Merge pull request #728 from Azaezel/alpha40/horizonHorrors
doublesided material renderfix
2022-02-19 20:41:45 -06:00
Brian Roberts 5d7335e4bd
Merge pull request #729 from Azaezel/alpha40/mixinMuckup
template mixins need this-> specified
2022-02-19 20:41:37 -06:00
JeffR 6a357d8dfb Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into Preview4_0 2022-02-17 18:30:23 -06:00
JeffR 40acf75238 Template changes 2022-02-17 18:21:13 -06:00
JeffR ed36cf2c5c Changes for BaseUI Update 2022-02-17 18:04:31 -06:00
AzaezelX 540e82b95c template mixins need this-> specified 2022-02-14 19:50:37 -06:00