Commit graph

484 commits

Author SHA1 Message Date
Jeff Hutchinson 485330ec7a Merge remote-tracking branch 'devhead/Preview4_0' into tsneo 2021-08-30 19:39:06 -04:00
Brian Roberts f6d3a30638
Merge pull request #551 from Azaezel/alpha40/decalDemangle
DiffuseRenderPassManager.addManager "cleanups"
2021-08-30 01:38:47 -05:00
Brian Roberts 61cb93643c
Merge pull request #552 from Azaezel/alpha40/classconvertsafety
ensure new (foo) lines being converted are valid according to findObj…
2021-08-30 01:38:35 -05:00
Jeff Hutchinson a2d5e475fb fix script issue. 2021-08-29 22:41:48 -04:00
Jeff Hutchinson 6e072dbf91 Merge branch 'Preview4_0_DevHead' into tsneo 2021-08-29 22:28:42 -04:00
AzaezelX 28dd431118 ensure new (foo) lines being converted are valid according to findObjectClass 2021-08-29 01:08:19 -05:00
Brian Roberts be3fd039af
Merge pull request #548 from Azaezel/alpha40/glowchanCleanups
kill off glowchan leftovers
2021-08-28 20:34:19 -05:00
AzaezelX 68c6b343d5 DiffuseRenderPassManager.addManager "cleanups"
adds bintypes where they're lacking, since that's an active object-type filter to avoid accidently rendering things twice. (particleBin being like glowmanager, a seperate flow, that acts up if filtered in that manner)
basiconly likewise is intended to avoid multiple-pass insertions, despite the varname.
2021-08-28 19:27:53 -05:00
AzaezelX cabfeea76b nother stray 2021-08-28 16:20:58 -05:00
AzaezelX 50fb4df1f0 kill off glowchan leftovers 2021-08-28 15:54:21 -05:00
Brian Roberts 6fc67a11bb
Merge pull request #547 from Azaezel/alpha40/tooltipWip
fixes for copypastas that somehow slipped in
2021-08-23 19:37:52 -05:00
AzaezelX 868bd6c361 fixes for copypastas that somehow slipped in 2021-08-23 19:37:09 -05:00
Brian Roberts a585c8736f
Merge pull request #546 from Areloch/AFXAssetify
Converts most of AFX classes to utilize assets
2021-08-23 19:22:30 -05:00
Areloch 64b98b0c10 Converts most of AFX classes to utilize assets
Adds modified classes to project importer convert logic
2021-08-22 02:15:14 -05:00
AzaezelX 3c79aace74 tooltip work 2021-08-21 17:13:57 -05:00
Robert MacGregor 452ef71274 * BugFix: Correct $i and %i interchangeably being used in parseArgs.tscript. 2021-08-20 20:38:24 -04:00
Areloch 19ba408354 Fixes new emitter button bitmap to proper fieldname 2021-08-18 00:48:30 -05:00
Jeff Hutchinson 838395840d script fixes from latest merge and more tests 2021-08-17 20:04:45 -04:00
Jeff Hutchinson ada1c5a021 Merge branch 'Preview4_0_DevHead' into tsneo 2021-08-16 22:50:02 -04:00
Brian Roberts 7a01f687ac
Merge pull request #535 from Ragora/bugfix-shapeeditor-mounting
* [Shape Editor] BugFix: Correct a bad octahedron.dts reference when using the mount viewer.
2021-08-16 14:07:51 -05:00
Robert MacGregor aa91ccfd39 * [Shape Editor] BugFix: Correct a bad octahedron.dts reference when using the mount viewer. 2021-08-15 23:33:33 -04:00
Areloch 48e994f7bd Shift file handling in importer to a standardized function
Added santizing of strings to filenames, object names and asset names for the importer process
Added sanitizeString console function for above
Added processing of terrainBlock object's fields for importer
Added check to avoid updateTSShapeLoadProgress spam
Adjusted folderPrefix logic to walk up directory to find assetName that isn't already in use.
2021-08-15 03:07:40 -05:00
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
Jeff Hutchinson 717c7acca9 Merge remote-tracking branch 'devhead/Preview4_0' into tsneo
# Conflicts:
#	Templates/BaseGame/game/data/ui/guis/loadingGui.gui
#	Templates/BaseGame/game/data/ui/guis/mainMenu.gui
#	Templates/BaseGame/game/tools/MainEditor/guis/MainEditorWindow.gui
#	Templates/BaseGame/game/tools/assetBrowser/guis/assetPreviewButtonsTemplate.gui
#	Templates/BaseGame/game/tools/forestEditor/brushes.tscript
2021-08-13 20:14:39 -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 47f2810e34 clients need loadModuleMaterials(); run too 2021-08-09 16:14:34 -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
Brian Roberts 8722d8bfd2
Merge pull request #515 from Azaezel/alpha40/moduleUnmangle
partly address #502
2021-07-28 13:31:10 -05:00
Brian Roberts afc0d3a1c9
Merge pull request #513 from Azaezel/alpha40/templateReview
template index file review
2021-07-28 13:31:00 -05:00
Brian Roberts 8d122bf3a6
Merge pull request #509 from Azaezel/postfxManagerManglefix
adress #508 - fix postfxmanager default initialization
2021-07-28 13:30:52 -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