TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-12 19:31:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
4600 commits 5 branches 33 tags 958 MiB
Commit graph

844 commits

Author SHA1 Message Date
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
AzaezelX
f95a78d2e8 misc asset pipeline cleanups 
AssetImporter::validateAsset make sure the modelDef looked for is valid
AssetImporter::importShapeAsset had a stray +"_"+embeded in it when it came to stitching togeather filenames and extentions
 2020-12-14 13:32:45 -06:00
Brian Roberts
5534384c54
Merge pull request #390 from Azaezel/alpha40_assetErrorcodes 
variation on #387 that also introduces errorcodes
 2020-12-08 23:50:07 -06:00
AzaezelX
8bb43dd5ae error string interpreter, example of usage in shapebase::preload, plus flips the datablock filter back on to save some network bandwidth. 2020-12-03 15:37:51 -06:00
Areloch
e8564680e4 Better handling for finding modules by file path. Mainly used in asset importer 2020-12-02 23:57:17 -06:00
AzaezelX
220771d2fe variation on #387 that also introduces errorcodes 2020-12-01 19:16:36 -06:00
AzaezelX
c626bc10e0 get shapeassetID read. TODO: find further flaws and unrem the filter 2020-11-27 19:03:20 -06:00
Brian Roberts
6441ecd941
Merge pull request #317 from Areloch/ShapeBaseDataAssetify 
Implements hook-look-up logic for shape assets to ShapeBaseData including autoimport handling
 2020-11-27 18:04:16 -06:00
Lukas Joergensen
5a994bdddc Rename GuiSpeedometer::mColor to mNeedleColor to avoid clash with parent 2020-11-15 21:30:45 +01:00
Lukas Joergensen
a241d27b58 Expand EngineAPI type definitions 2020-11-15 21:30:45 +01:00
AzaezelX
5de19404d9 mac compile fixes 
1) `/` not `\` for includes
2) had to clean up a few extra ## bits that work fine winside, but trip up macs (only needed when stitching, had 5 spots where that was pointless)
 2020-11-06 02:11:13 -06:00
Areloch
388a700a53 Implements material asset handling for GroundPlane object 
Adds handling for finding material asset akin to shape and image assets
Updates the material asset inspector field to follow the current standard
Updates prototyping material assets to correctly have materialDefinitionName assigned
Fixed material asset import step to properly assign materialDefinitionName
Fixed typo in material editor icon name
Added logic to editAsset function call so it can also parse assetIds
Changed DefaultEditorLevel to utilize FloorGray material
Adds proper NoMaterial asset for fallback purposes
 2020-11-01 23:32:34 -06:00
Areloch
94e6d19fb2 Ensures that baking is consistently set to use HDR formats or not which avoids an occasional mismatch crash 
Also corrected a string formatting issue with loading static cubemaps on probes that could lead to a crash
Fixed the resources loaded handling so it would correctly initialize the probe's cubemaps even if the initial ghost network packet assigned a cubemap before we fully init'd the client object
 2020-10-29 23:27:07 -05:00
Areloch
6a3603c737 Overhauls the handling of probes to utilize an active probe list to improve performance and allow a greater total number of active probes in a scene. 
Also fixes handling of metal materials during bakes to render properly, and fixes a possible double-up return in findObjectByType, which could cause doubling when getting probes in the scene
 2020-10-19 00:53:09 -05:00
Brian Roberts
072b5ecb19
Merge pull request #357 from Areloch/ImageAssetHookins 
Updates macromagic to properly set up for init'ing when image assets are set in material and terrain materials
 2020-10-17 16:21:24 -05:00
Brian Roberts
3851612b91
Merge pull request #361 from Areloch/LevelAssetLoadConsistency 
Updates some level asset functions and script handling
 2020-10-17 16:21:01 -05:00
Areloch
f4f60e1ae7 Improves default suffix handling for asset importer on image assets under a material asset 2020-10-16 17:03:30 -05:00
Areloch
837983c767 Adds script function to access full path of the level asset's preview image file 
Updates script function descriptions to be correct
Updates chooseLevelDlg functions to be more efficient and consistent, and use the exposed get methods for getting preview images and the like properly
 2020-10-13 18:44:42 -05:00
AzaezelX
4250e1d1b4 simplification of the Class::_set<slotname>Asset methods, (as well as early outting before dAtoi(index) hurt itself if index was invalid) 
also since I was in there, fixed isrgb accidently being flipped on by default
 2020-10-12 04:43:47 -05:00
Areloch
f0068c2435 Updates macromagic to properly set up for init'ing when image assets are set in material and terrain materials 2020-10-10 22:48:13 -05:00
Brian Roberts
8e4edc3545
Merge pull request #237 from Azaezel/alpha40_notKnotNoNo 
safety check
 2020-10-09 20:00:10 -05:00
AzaezelX
d1cc5964c4 fix GCC compile 2020-10-08 18:17:35 -05:00
Brian Roberts
d50f1f0b81
Merge pull request #342 from lukaspj/fix/replace-dstrcmp 
Replace uses of dStrCmp with new String::compare
 2020-10-03 17:01:12 -05:00
Lukas Aldershaab
197a62f6ea Convert dStrcmp to String::compare for more cases 2020-10-04 00:00:01 +02:00
AzaezelX
33f17ea759 pathshape gravity suppression injection 2020-10-03 12:21:16 -05:00
Brian Roberts
681dbe108c
Merge pull request #323 from Azaezel/alpha40_smoothToRough_clean 
shift pbrconfig to ORM in keeping with the prepoderance of industry standards
 2020-10-03 11:49:10 -05:00
Brian Roberts
bbfa55c206
Merge pull request #328 from lukaspj/feature/guiRenderTargetVizCtrl 
Implementation of guiRenderTargetVizCtrl
 2020-10-03 11:34:50 -05:00
Brian Roberts
612a3e3358
Merge pull request #309 from Azaezel/alpha40_triggerTricksTre 
new trigger features: triponce, tripcondition, and trippedby.
 2020-10-03 11:26:59 -05:00
Brian Roberts
e5014fb24e
Merge pull request #212 from Azaezel/alpha40_export_LOD_rounding 
export rounds LODs to the nearest power of 2
 2020-10-03 11:25:53 -05:00
Lukas Aldershaab
c999baf7ed Moves from using dStrCmp to the new String::compare static functions. Keeps things cleaner, consistent, and works with intellisense. 2020-10-03 14:37:55 +02:00
Lukas Aldershaab
dca2dc0074 Implementation of guiRenderTargetVizCtrl 2020-10-03 00:58:38 +02:00
AzaezelX
3a67ddd34c so ok, looks like there's *still* wonkiness with processtick runing through from vehicle to rigidshape. we'll have to review that at a later date. mean time, explicitly specifying shapebase so folks can proceede with thier project requests 2020-10-02 14:44:43 -05:00
AzaezelX
321c25a401 profiler tracking name collision fix 2020-10-02 14:16:27 -05:00