Commit graph

901 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
Jeff Hutchinson 6e072dbf91 Merge branch 'Preview4_0_DevHead' into tsneo 2021-08-29 22:28:42 -04:00
AzaezelX ee3ef531e2 ironically, overly paranoid checks were tripping warnings 2021-08-29 18:32:44 -05:00
AzaezelX bdf6bd5c69 account for the possiblity of _set##name(StringTableEntry _in entries somehow getting punted nulls 2021-08-29 17:41:20 -05:00
Brian Roberts 0a150e342f
Merge pull request #545 from Areloch/AssetFileCaseSensitivityFix
Enforces filename string case sensitivity for assets' internal filenames
2021-08-23 19:22:22 -05:00
Areloch cfe122f714 Enforces filename string case sensitivity for assets' internal filenames, which avoids the stringtable messing with the case preventing file name case sensitivity issues. 2021-08-21 23:12:37 -05:00
Jeff Hutchinson 37dc8626f5 MacOS fixes
This fixes an issue where Con::getVariable can't be used in the global scope before the console system is initialized. I'm honestly surprised this error didn't happen on any other platform.
2021-08-21 20:48:26 -04:00
Brian Roberts c04f3ae166
Merge pull request #533 from Ragora/bugfix-linux-release-builds
Bugfix linux release builds for Clang
2021-08-20 21:55:16 -05:00
AzaezelX 69abcb862c assetbase crashes: test (most) cases for mpAssetDefinition existing before returning values. return empty if it doesn't. 2021-08-17 15:32:05 -05:00
AzaezelX 0bf97ad2c8 decal safeties via if (mMaterialAsset.notNull() && mMaterialAsset->getStatus() == MaterialAsset::Ok) 2021-08-17 15:27:23 -05:00
AzaezelX 68fee78744 prefab safeties 2021-08-17 14:41:09 -05:00
Jeff Hutchinson ada1c5a021 Merge branch 'Preview4_0_DevHead' into tsneo 2021-08-16 22:50:02 -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
Robert MacGregor 3f34c9020e * [ParticleEmitter] BugFix: Make GCC happy by removing the inline specification on updateKeyData. 2021-08-14 18:22:30 -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 a2ecbe53dd gcc seems to have an issue converting nullptr to Resource<TSShape>, so this will at least get it compiling 2021-08-10 03:13:46 -05:00
AzaezelX cd6e027d1f nother specifier wrapper 2021-08-09 22:31:58 -05:00
AzaezelX 76386f433c fix eronous extra glue code in macro, fix slash direction in include 2021-08-09 22:08:55 -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 11a29ef97a preload materials for shapebasedatas and debris 2021-08-09 16:14:10 -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 33e78fd8a8 init reflection probes 2021-07-31 17:04:31 -05:00
AzaezelX b73353a446 we want old direct-file references first, then asset macros, since those plug in the old entries to empty if valid. 2021-07-29 11:12:07 -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 36b31ae19d zip support followup 2021-07-22 21:27:13 -05:00
AzaezelX b8eaefc21e refactor new IsScriptFile method to be zip-safe 2021-07-22 20:55:46 -05:00
AzaezelX 8976250fdf remove fallback from INIT_SHAPEASSET / INIT_SHAPEASSET_ARRAY as it seems that was causing more harm than good somehow 2021-07-22 12:35:25 -05:00
AzaezelX f185bef8a3 leverage isScriptFile
(also initialize  scattersky. mNightCubemapName = StringTable->EmptyString();)
2021-07-22 12:02:23 -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
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
Areloch 4d40e3cab5
Merge pull request #449 from OTHGMars/Zip_Test2
Loading from zipped game directories.
2021-07-17 11:03:19 -05:00
Lukas Joergensen 91c985e518
Merge pull request #497 from Azaezel/alpha40/particleBounds
particle emitter bounds box fix
2021-07-14 14:46:01 +02:00
AzaezelX cf0c7a2d11 particle emitter bounds box fix
take the distance particles can move over thier lifetime into account for emitter bounds.
in addition, don't zero out the y axis
2021-06-19 15:15:12 -05:00
AzaezelX e3e2de7f7b connects staticshape::unmount to the parent chain so it can actually do so 2021-06-07 15:03:23 -05:00
Jeff Hutchinson 69d7a2f4a1 Merge remote-tracking branch 'devhead/Preview4_0' into tsneo
# Conflicts:
#	Engine/source/console/test/ScriptTest.cpp
#	Engine/source/console/test/consoleTest.cpp
2021-05-06 21:08:53 -04:00
Jeff Hutchinson 6f7fdca87d lotsa fixes. 2021-05-04 21:18:15 -04:00
AzaezelX ab1661a851 add additional chars to the flatfile->asset->objectID name santization chain 2021-04-06 15:17:06 -05:00
Jeff Hutchinson 50df52ecfc more console refactor. 2021-03-31 21:09:23 -04:00
Jeff Hutchinson 35500a87c6 initial port of the new interpreter 2021-03-30 19:33:19 -04: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
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 9a10d52e0b Added logic to correctly associate constructor script file for shape asset to asset as an assetfile 2021-02-21 02:21:50 -06:00
AzaezelX e96624032f ribbon particle resource port 2021-02-07 13:43:21 -06:00