Commit graph

282 commits

Author SHA1 Message Date
Brian Roberts
190343cbc7
Merge pull request #531 from Ragora/bugfix-asset-browser-linux
Asset Browser on Linux Fixes
2021-08-13 22:35:40 -05:00
Robert MacGregor
3a4f0e8808 * [x86UNIXFileio] BugFix: Correct an error in the initial call to recurseDumpDirectories that causes an empty list of directories to always be returned.
* [UI Module] BugFix: Change module directory name to uppercase for matching the declared module name in its module file for asset tree browsing to work correctly on case sensitive systems.
2021-08-13 23:31:29 -04:00
Brian Roberts
8d9f57b077
Merge pull request #526 from Azaezel/alpha40/abExecOrder
ensure the asset browser is executed prior to other pseudo-modules that may need bits
2021-08-13 22:21:06 -05:00
Brian Roberts
c9d2ec0f56
Merge pull request #527 from Azaezel/alpha40/stopTheBleeding_Materials
suppress deletion of temp material created by the editor
2021-08-13 22:20:58 -05:00
Robert MacGregor
8d4d4b7588 * [Material Editor] BugFix: Correct case sensitivity errors on the model previews when running on case sensitive systems (Ie. Linux). 2021-08-13 21:07:29 -04:00
AzaezelX
1e119141d2 ok, turns out the asset browser needs to have the world editor spooled up to slot in place 2021-08-12 19:08:04 -05:00
AzaezelX
98941702a7 supress deletion of temp mateiral created by the editor
stops it from crashing out swapping back and forth into the mat editor
not a proper fix, just ensures we have *something* for the weekend if we don't do a better job.
2021-08-12 17:02:13 -05:00
AzaezelX
d4c739c348 ensure the asset browser is executed prior to other tll pseudo-modules that may need bits 2021-08-10 23:29:48 -05:00
Areloch
0dddeeb6dd Corrects preload logic for projectiles to only fail if shape is specified, but failed to load
Corrects logic in Project Importer for if cubemapData is defined in material scripts, it can process them correctly.
2021-08-09 18:55:05 -05:00
AzaezelX
58b539653e skip using the extension for the asset.scriptFile entry 2021-08-09 13:48:44 -05:00
Areloch
426f5974da Corrected ShapeAsset array initpersist macro to assign arraySize
Uncommented line in preview build function for material assets so they generate the reduced preview image
Added cubeFace to cubemapData import processing vars checked
Updated ShapeBaseImageData convert vars to properly use asset var names
2021-08-08 23:44:17 -05:00
Areloch
34f0f01cea Adds console function to compare file modified times
Adds console function to save a scaled image
Improved logic of generating previews for shape, material and image assets to regen if original asset loose file was modified
Added logic to generate scaled preview image for material and image assets to improve load times of AB
2021-08-08 16:20:58 -05:00
Areloch
555c563b39 More updating of editor icons to assets
Fixed handling of convex shape editor's active and default materials
Fixed assignment of material for convex shapes via editor
Fixed material editor map assignment logic
Added utility function to detect possible duplicate files in project to ProjectImporter
Added conversion of legacy sky and water classes to importer
Fixed bufferLen issue with guiTreeViewCtrl
2021-08-07 19:27:01 -05:00
Areloch
2f5f585aaf Fixed logic for parsing registerDatablock paths to trim script extensions during import conversion
Fixed creation of materialAsset from AB to properly generate companion script file
Fixed logic in project import that if we import in a legacy module script, we get rid of the newly generated one in favor of the old one
2021-08-07 02:36:38 -05:00
Areloch
c76c5f7ee1 Removed unneeded duplicate of blank sky skybox
Fixed various inspector field editor button icons
Fixed drag-n-drop apply logic for material assets
Fixed up some convex shape editor material references
Fixed tools overlay gui profile opaqueness flag
Fixed uvEditor image asset binding/lookups
Fixed decal editor preview display
Fixed shape editor would you like to save your changes prompt
Added additional sanity check for bad material reference in tsMesh
Fixed saving of terrain asset when working in editor default level
2021-08-06 01:06:36 -05:00
AzaezelX
c5d0310bc3 Merge branch 'EngineAssetify' of https://github.com/Areloch/Torque3D into EngineAssetify_Followups_XML2Check
# Conflicts:
#	Engine/source/ts/tsShapeConstruct.cpp
2021-08-02 13:54:51 -05:00
Areloch
88ae8a9665 Added getShapeConstructorFilePath console function on shapeAsset
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
2021-08-02 04:20:27 -05:00
AzaezelX
3fad050028 Merge branch 'Preview4_0' into EngineAssetify_Followups 2021-07-28 13:51:44 -05:00
Areloch
52c83d19e1 Added shapeFile field to TSForestItemData convert setting
Fixed modulePath not setting in some cases for project importer
Fixed not assigning drop and splash textures in precipitation
Fixed stringtable insert for sfxProfile
2021-07-28 12:01:17 -05:00
Areloch
abf5a09bc3 Removed duplicate checkbox image
Added asset import conflict resolution option to prepend folder name
Cleanups of Project Importer and fixed importing of material and terrain materials, specifically, fallbacks in the event they are unnamed to utilize the mapTo and internalName fields, respectively
Fixed typos in guiTerrainMaterialDlg
Added AssetBrowser button to GuiEditor
Improved FileObject's PeekLine function to be able to peek forward further via an optional lineOffset argument
2021-07-28 09:26:13 -05:00
AzaezelX
438e6cbb3c fix for diffuse map mangling in several cases, filter imposters out of real time lighting (for now?) fix the blankskybox via a resave, and filter "badfilereference" and "failed" assets out of variable replacement for the project converter 2021-07-25 17:18:55 -05:00
Areloch
432d201569 Further conversions of missed file fields in core and tools
Assets created for missed objects and files
Improvements to the Project Importer to correct a number of issues, including not parsing ,'s from object names, trimming whitespace, pruning script extensions from exec invokes
2021-07-24 02:08:23 -05:00
AzaezelX
4df5baffec alter project importing in the following ways:
A) if the file reference string lacks a "/" or "\" entirely, assume it's truly oldschool relative-to-scriptfile when generating links
B) leverage a combination of getClassHierarchy(%currentObjClass); and a new T3Dpre4ProjectImporter::genProcessor(%classType, %conversionMap) method to list-generate ittertatively applied entry conversions in a typo avoiding manner. (will stil need to ensure the old entries are properly listed. this only really avoids copypasta errors)
2021-07-22 12:25:45 -05:00
Areloch
3e131f5b8e Added changes missed via merge failures.
Removed some unused files/references that were causing errors, related to issues #502 & #512
2021-07-20 20:05:49 -05:00
AzaezelX
817f01ff92 followup: readd, and rename the module.ScriptFile entries to thier lower case 2021-07-20 12:15:05 -05:00
AzaezelX
2090d85aa3 rename core and tools modules and index files to match the directory
(ornery tool doesn't like case renames, so delete and readd)
2021-07-20 12:13:54 -05:00
Areloch
5525f8ecdd 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
2021-07-19 01:07:08 -05:00
Brian Roberts
793c4c3701
Merge pull request #484 from Azaezel/alpha40/matEditorSaveFix
form steve yorkshire: mat editor save extension fix
2021-04-22 20:02:29 -05:00
AzaezelX
0289090c34 minor cleanup 2021-04-22 20:02:21 -05:00
Brian Roberts
880cb13762
Merge pull request #448 from Azaezel/alpha40/genericObjectSpawner
general spawnspheres
2021-04-22 19:39:00 -05:00
AzaezelX
fadafbfa1b form steve yorkshire: mat editor save extension fix 2021-04-11 19:57:31 -05:00
Brian Roberts
b6a1acabf8
Merge pull request #471 from Areloch/forestCreationEditingFixes
Adjusts Forest object creation and forest item data creation/management to work with asset/module workflows
2021-03-14 01:12:58 -06:00
Brian Roberts
a8e2ec6df4
Merge pull request #475 from Areloch/importAssetSuffixes
Adds import config settings for forcefully adding configurable suffixes for shapes, materials and images
2021-03-14 01:12:29 -06:00
Brian Roberts
1695e76514
Merge pull request #472 from Areloch/moduleFriendlyDBCreation
Makes the DB creation process better jive with modules
2021-03-14 01:12:05 -06:00
Areloch
a0c8a77043 Adds import config settings for forcefully adding configurable suffixes for shapes, materials and images 2021-02-27 02:43:37 -06:00
Areloch
87bd7bbeae Fixes script presentation logic in the AB so it only shows scripts that isn't an asset file for an asset.
Also fixes a reference to the Inspector for refreshing purposes.
Adds a pop call to ensure AB is in focus when shown
2021-02-21 02:16:34 -06:00
Areloch
12b58dc7ef Makes the DB creation process better jive with modules by having you select the destination folder for the managed datablock script file to be saved off into 2021-02-21 02:09:40 -06:00
Areloch
8af6513aea Adjusts Forest object creation and forest item data creation/management to work with asset/module workflows 2021-02-21 02:04:13 -06:00
Brian Roberts
f4982f3b7d
Merge pull request #464 from Azaezel/alpha40/ribbonParticles
ribbon particle resource port
2021-02-15 22:28:10 -06:00
Areloch
931556c3c6 Added the makeRelative call to the other openShapeAsset function to ensure it works both ways 2021-02-13 00:18:48 -06:00
Areloch
372a7887be Fixes the constructor path compare logic in the shape editor so the lists can populate correctly. 2021-02-12 00:21:36 -06:00
AzaezelX
e96624032f ribbon particle resource port 2021-02-07 13:43:21 -06:00
AzaezelX
e153bed606 Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into alpha40/genericObjectSpawner 2021-01-27 19:11:25 -06:00
AzaezelX
7e3e1941c6 add a toggle for the standard canSaveDynamicFields flipped by default to off so folks can bolt variables on the fly onto the spawner (like thing spawned, how many ect) without it poluting level saves 2021-01-27 14:03:12 -06:00
Areloch
85a9a9b608 Implements shape preview caching for shape assets
Also standardizes the loading gui overlay so it can be used to inform that the asset preview generation is happening
2021-01-27 01:54:26 -06:00
Areloch
3cb1699ed1 Fixed guiProfile references 2021-01-24 04:40:19 -06:00
Areloch
b7a2c30337 Integrates object creator logic into the AB
Adds lookup logic to Datablock AB entries to try and find class icons for the preview
Adds 2 new datablock class create methods
2021-01-24 04:33:28 -06:00
Areloch
c051a0357c Fixes some conversion mistakes in the scripts 2021-01-19 21:32:31 +01:00
Lukas Aldershaab
9ccaa6d3ea Improve handling of non-default script filenames 2021-01-19 21:32:31 +01:00
Lukas Aldershaab
099dd4f1f3 Parametrize script extension, default to 'tscript' 2021-01-19 21:32:31 +01:00