TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 11:43:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
7232 commits 5 branches 33 tags 958 MiB
Commit graph

1226 commits

Author SHA1 Message Date
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
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
Lukas Aldershaab
099dd4f1f3 Parametrize script extension, default to 'tscript' 2021-01-19 21:32:31 +01:00
Areloch
c5cdba750e Fixes some minor errors on MacOS regarding compiling in clang 2021-01-14 18:00:56 -06:00
OTHGMars
8148bdfcdd ModuleManager and AssetManager updated for T3D mount system. 
Platform file calls replaced with Torque::FS calls when scanning for or loading files.
 2021-01-11 05:03:00 -05:00
Brian Roberts
4de1449c4b
Merge pull request #442 from rextimmy/gfx_cleanup 
Removed old fixed function code from GFX.
 2021-01-05 03:00:04 -06:00
Areloch
8585278fe4 Adds autoimport logic for materials if the materialDefinition already exists 
Adds some additional utility functions to AssetImporter for easier access to setup
Corrects handling for legacy field names with meshRoad
 2021-01-05 00:58:18 -06:00
rextimmy
5a933c00d3 Removed old fixed function code from GFX. 2021-01-05 12:57:17 +10:00
Areloch
bf5b26f734 Assetifies MeshRoad, Decal Road, and the material slot of GroundCover 
Creates a networked and non-networked variant of DECLARE_MATERIALASSET macro
 2021-01-03 08:58:53 -06:00
Brian Roberts
03e6b5b096
Merge pull request #433 from Azaezel/alpha40/shapeAssetErrorFollowups 
moar asset errorhandling
 2021-01-02 11:09:31 -06:00
AzaezelX
5e8862dafc further info by request 2020-12-31 19:38:53 -06:00
AzaezelX
6495ee16c6 report shape file location that failed to load, set loaded status to badfilereference if getAssetById can't even find noshape 2020-12-31 18:54:31 -06:00
AzaezelX
6b53b6581a mac fixes 
1) add sdl token for referencing the parent directory of the aplication bundle when determining the root dir
2) shape and mateiral asset macro corrections for a few stray ## redundencies (space, ->, . ect are all conidered token sperators in and of themselves)
 2020-12-30 19:36:51 -06:00
Brian Roberts
1fbf46fa90
Merge pull request #425 from Areloch/MaterialMacroMagic 
Initial pass at implementing MaterialAsset macromagic utility functions
 2020-12-29 00:40:46 -06:00
AzaezelX
482e836797 membervar compile fix 2020-12-28 17:18:19 -06:00
Areloch
3b111b14cc
Merge pull request #417 from Azaezel/alpha40_shapeMacroMagic 
corrected and implemented a usage of shapeasset macros
 2020-12-28 00:15:04 -06:00
Areloch
baeabb4a51
Merge pull request #413 from Azaezel/alpha40_ServerAssetValidator 
add validation flagging for server objects
 2020-12-28 00:14:46 -06:00
Areloch
c1cd217557 Initial pass at implementing MaterialAsset macromagic utility functions and applies it to the renderMeshExample object as well as groundPlane 2020-12-27 23:24:29 -06:00
AzaezelX
516a05301f corrected and implemented a usage of shapeasset macros (and stray membervars touched). todo: shapebaseimage, debris. 2020-12-22 12:34:15 -06:00
Brian Roberts
7dc6fc8abf
Merge pull request #415 from Areloch/GroundPlaneAssetify 
Converts GroundPlane to utilize assets
 2020-12-19 02:35:32 -06:00
Brian Roberts
78a836e433
Merge pull request #409 from Azaezel/alpha40_assetPipeCleanups 
asset pipe cleanups
 2020-12-19 02:34:57 -06:00
Areloch
fb5195dd44 Corrects groundplane assigned material in the example and editor levels 
Assetifies GroundPlane's handling of it's material field
 2020-12-19 01:43:52 -06:00
Areloch
3821ddd15a Merge branch 'GroundPlaneAssetify' of https://github.com/Areloch/Torque3D into Preview4_0 2020-12-18 14:12:54 -06:00
Areloch
8f60d03830 Adjusts Asset Importer logic when looking up and saving out a newly created ShapeConstructor so that it doesn't duplicate a definition it one already exists. 
Adds _ORM and -ORM suffixes for PBR-ORM map import rule
Tweaks naming convention for IgnoreNode/Meshes and ImportNode/Meshes to be clearer via the prefix 'Always'
Fixes a token typo in suffix parsing, and adds \t to token deliniation for all suffix parsing to asset importer
 2020-12-18 00:55:01 -06:00
AzaezelX
6408297eb9 add validation flagging for server objects 
sets up a generic `ServerAssetValidator` PersistenceManager onServerCreated and saves anything marked dirty after processing. demonstrates looking that up and setting something dirty via shapebase::preload asset tagging
 2020-12-16 21:31:54 -06:00
AzaezelX
b26c87491f need to ensure we've got an asset at all before setting the loaded state 2020-12-14 13:33:49 -06:00