Commit graph

3231 commits

Author SHA1 Message Date
Jeff Hutchinson
6ec40e86da Fix bugs with certain properties (and .x .y .z accessors) and add tests. 2021-08-16 22:02:24 -04:00
Jeff Hutchinson
a449fadde2 hacks to make thedebugger work again. 2021-08-14 01:37:01 -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
Brian Roberts
9dd9e9fae5
Merge pull request #522 from Azaezel/alpha40/stringstringShenanigans
bad constructor usage! bad! GCC no like!
2021-08-10 22:31:21 -05:00
Brian Roberts
86a8fb5854
Merge pull request #523 from Azaezel/alpha40/windowWonk
report if SDL_CreateWindow is unable to create a window at all
2021-08-10 22:29:05 -05: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
c7b44203ad sanity check 2021-08-10 03:11:52 -05:00
AzaezelX
fc9d767256 report if SDL_CreateWindow is unable to create a window at all 2021-08-09 23:48:01 -05:00
AzaezelX
0285e073b9 wrap all the things! 2021-08-09 22:40:41 -05:00
AzaezelX
cd6e027d1f nother specifier wrapper 2021-08-09 22:31:58 -05:00
AzaezelX
20e4f3c120 wrap to remove ambiguity 2021-08-09 22:24:20 -05:00
AzaezelX
1037b5d718 extraneous entry 2021-08-09 22:24:03 -05:00
AzaezelX
76386f433c fix eronous extra glue code in macro, fix slash direction in include 2021-08-09 22:08:55 -05:00
AzaezelX
594c4f65c7 bad constructor usage! bad! GCC no like! 2021-08-09 21:34:24 -05:00
AzaezelX
a944b6435c give useful data when not finding a given shader var 2021-08-09 20:19:16 -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
AzaezelX
e7403197c7 yell when warningmaterial is undefined 2021-08-09 16:13:30 -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
AzaezelX
bdf32f4f7b texture profile cleanups 2021-08-06 03:33:02 -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
c43cee13ab Merge branch 'task/update-tinyxml' of https://github.com/lukaspj/Torque3D into EngineAssetify_Followups_XML2Check 2021-07-31 17:12:44 -05:00
AzaezelX
b5b06c4a10 assettext/macrotext/assetdoc refinements ala https://github.com/TorqueGameEngines/Torque3D/pull/518 2021-07-31 17:06:19 -05:00
AzaezelX
59e162abe5 void floating point error clipping courtessy higuy and hutch 2021-07-31 17:05:29 -05:00
AzaezelX
33e78fd8a8 init reflection probes 2021-07-31 17:04:31 -05:00
Lukas Aldershaab
9a795e89f3 Update usage of TinyXML to use TinyXML2 2021-07-31 21:54:19 +02: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
AzaezelX
3fad050028 Merge branch 'Preview4_0' into EngineAssetify_Followups 2021-07-28 13:51:44 -05:00
Brian Roberts
db842e7185
Merge pull request #514 from Azaezel/alpha40/GFXStringUnstrung
adress #510 - missing GFXFormatR11G11B10 macrohook
2021-07-28 13:31:17 -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
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
AzaezelX
c41b8e00ff clean up the light.cookie entries 2021-07-22 11:57:41 -05:00
AzaezelX
059fb63487 set initial asset loaded state to not loaded 2021-07-22 11:57:11 -05:00
AzaezelX
38b565e12a new method isScriptfile. operates like isFIle, but also checks variations on extentions 2021-07-22 11:56:35 -05:00
AzaezelX
313466f57c new method from JeffH and Marauder: getClassHierarchy(classname). dumps a list of the class inhericance in reverse ancestor order (so that class first, next parent, *it's* parent, ect 2021-07-22 11:55:34 -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
1c0f234d3a adress #510 - missing GFXFormatR11G11B10 macrohook 2021-07-20 11:29:13 -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
83b0432283
Merge pull request #489 from Azaezel/alpha40/zipPassPunt
expose a zip file password cmake config option
2021-07-17 11:03:26 -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