Commit graph

987 commits

Author SHA1 Message Date
Robert MacGregor 2b15c9e89d * BugFix: Correct the vehicle types double-tapping their onAdd and onRemove callbacks - rigidShape handles dispatching the script callbacks. 2021-11-11 16:41:28 -05:00
Brian Roberts 4e51ac17bd
Merge pull request #661 from Azaezel/alpha40/namedtexturetargs
better handle old style references to named texture targets
2021-11-08 14:38:11 -06:00
Brian Roberts e53012a938
Merge pull request #660 from Azaezel/alpha40/tsStaticNodeLookup
new method tsstatic.getNodeTransform
2021-11-08 14:37:50 -06:00
Brian Roberts 721f14a284
Merge pull request #665 from Azaezel/alpha40/TriggerSelfReferencing
fill out a %this variable for trigger callbacks
2021-11-08 14:37:39 -06:00
Brian Roberts e87ce245e9
Merge pull request #662 from Areloch/MiscImportFixes20211105
Misc asset import QOL and bugfix changes
2021-11-08 14:37:03 -06:00
Robert MacGregor a8116bbaf5 * [AssetImporter] BugFix: Correct ASAN reported out of bounds reads in the asset import programming. 2021-11-08 15:31:07 -05:00
AzaezelX 733b71ccad fill out a %this variable for trigger callbacks 2021-11-07 14:52:25 -06:00
Brian Roberts 8293ac7b49
Merge pull request #656 from Ragora/bugfix-module-deinitialization-order
BugFix: Correct Module deinitialization Ordering
2021-11-06 18:15:21 -05:00
JeffR b3cd08520e Disables generation of the materials script files by the internal shape import processor. Material script files are now only generated by the AssetImporter as part of the shape injest process.
Renames validateImportingAssets to hasImportIssues for AssetImporter console method for clarity
Updated console method documentation for AssetImporter methods
Fixed logical error for material asset generation if the import config was set to use existing materials but one was not found.
Fixed logical error when a shapeFile has a material with a texture mapped to it is not in the same directory as the shape, it would not correctly find the texture
Adjusts AssetImport window logic so it will display the window in the event of import issues being detected, or the asset is being re-imported.
Updates the AssetImport window activity log to use the new AssetImporter's log for consistency.
2021-11-05 17:49:48 -05:00
AzaezelX e211f502e8 better handle old style references to named texture targets 2021-11-04 15:44:43 -05:00
Brian Roberts 2bb4d34efd
Merge pull request #658 from Azaezel/alpha40/imageArrayProfileFixes
imageasset array profile fixes
2021-11-03 21:15:59 -05:00
AzaezelX 19e4643707 new method tsstatic.getNodeTransform
used to look up a given node's transform by explicit name in a tsstatic object
2021-11-03 21:15:00 -05:00
AzaezelX e45b959d7d correct imageassetarrays having a singular texture profile as oposed to a type per.
while that certainly works for most cases it falls apart when dealing with postfx where it's an unnamed array of variable types of inputs.
shifted the profile assignment to #define INIT_IMAGEASSET_ARRAY(name, profile, index) so there's still a really obvious point where you can see the default setting, even if it's not in the more desireable OG definition spot
for postfx in particular, given we can swap that, provided an example of how to do just that
2021-11-03 12:30:52 -05:00
JeffR fda722e355 Updates asset importer and project importer to output to separate log files into tools/logs
Add utility console function for getting current datetime
2021-11-03 00:13:00 -05:00
Robert MacGregor 38e7bb9232 * BugFix: Correct the possibility of the Sim module being deinitialized after the Scene module despite the Sim module being dependentant on the Scene module. 2021-11-02 18:52:54 -04:00
Areloch 0fab2ebf54 Added fallback handling to MaterialAssets if the asset was found but the matDef was not
Added import config handling for prepending Directory to asset name
Added handling for import config of appending a sound suffix
Integrated handling of directory prepend and asset type suffix to rename issue resolution of asset importing
Corrected miswording of warn message for duplicate object names
Correct GUI issues with verve tools
Convert verve tools to utilize assets for their GUI elements
Fix window binding/naming issue depending on window mode for verve
Fix popup menus formatting for verve
WIP fix for material swap in Material editor. Corrects crash, but swap action is unreliable depending on object type
Fix display issue with mission area editor toolbar button image
Fix tooltip display of SFXEmitters in editor tree to correctly show the bound asset
Changed network graph accelerator keybind from just N to Ctrl N to avoid keybind issues when typing
Fixed Create New Emitter button in particle emitter that was showing as no texture
2021-10-28 23:52:58 -05:00
AzaezelX f0d919e859 sound asset conversions - materials 2021-10-14 19:09:20 -05:00
AzaezelX 33210c4a1e minor logic cleanups. we want to ensure if we *do* set the projectile sound to empty via editor, that gets propagated 2021-10-14 15:05:49 -05:00
AzaezelX 9217c62446 sound followups
debug spam removal
2021-10-14 15:04:52 -05:00
AzaezelX f5600826d7 Merge branch 'Preview4_0' into SoundAssetImplements
# Conflicts:
#	Engine/source/T3D/assets/assetImporter.cpp
#	Engine/source/forest/forestItem.cpp
2021-10-11 20:11:27 -05:00
Robert MacGregor aba091a97a Merge remote-tracking branch 'main/Preview4_0' into bugfix-msvc-compiler-warnings 2021-10-11 19:36:52 -04:00
AzaezelX d9eea8e5be make gcc happy 2021-10-11 16:25:37 -05:00
AzaezelX e468c2bf73 add a bit of further clarity to soundasset code injectors 2021-10-11 14:38:14 -05:00
Brian Roberts 25e9e97c45
Merge pull request #603 from Azaezel/alpha40/assetimportcleanups
item->importStatus cleanup for asset importer
2021-10-09 01:01:42 -05:00
Areloch 506621352c Tweaks the MaterialAsset loading logic to continue to see if the matDefinition already points to an existing object(to avoid needlessly re-executing files over and over), but also validate other cases, and ensures that if we DO have an existing definition, we still process and load it in the asset itself properly. 2021-10-09 00:07:01 -05:00
Robert MacGregor 2d55fcf1bc * BugFix: Invert the corrections made in ImageAsset and ScriptAsset to be correct. 2021-10-07 13:16:55 -04:00
Robert MacGregor 74cc60508b * BugFix: More cleanup of MSVC compiler warnings. 2021-10-07 01:10:00 -04:00
Robert MacGregor 5d26dba7da * BugFix: Clear some MSVC compiler warnings. 2021-10-07 00:27:39 -04:00
AzaezelX eb8434c5a4 don't try and sort ribbon particles 2021-10-05 00:23:26 -05:00
Robert MacGregor 1b6b803a20 * BugFix: Clear a lot of warnings and correct a few actual programming errors along the way. 2021-10-04 20:04:21 -04:00
AzaezelX 79ad78361d item->importStatus cleanup for asset importer 2021-10-04 18:24:33 -05:00
AzaezelX 42d137f4a9 DECLARE_ASSET_ARRAY_SETGET is incompatible with INITPERSISTFIELD_SOUNDASSET_ENUMED 2021-10-03 15:20:08 -05:00
AzaezelX ab1b14587e generic asset loader macros. currently unused 2021-10-03 15:19:04 -05:00
AzaezelX 98a079a797 code duplication prune. should aid in stability 2021-10-03 02:56:26 -05:00
AzaezelX 10f2453cee setget was causing active interference with INITPERSISTFIELD_SOUNDASSET_ENUMED 2021-10-02 23:24:46 -05:00
AzaezelX 19eb3c42f0 more enum work, now with somewhat clearer boundary names, and some debug spam for initpersistfields, and pack and unpack macros to help us try and trace why those are scrambling 2021-10-02 21:05:04 -05:00
AzaezelX 0760621212 fix item->importStatus tagging in importer 2021-10-02 21:01:14 -05:00
AzaezelX 5c7069555a filter out array entries without enum strings 2021-09-30 16:00:37 -05:00
AzaezelX d3693bef8d shifted playerdata down to the Long Lists block. fix player enum ref source side 2021-09-30 14:40:03 -05:00
AzaezelX 64a87ceba8 trim assetEnumNameConcat to 2 values, set INITPERSISTFIELD_SOUNDASSET_ENUMED to exclude maxValue 2021-09-30 13:46:03 -05:00
AzaezelX 0c6ca6c701 conflict resolution 2021-09-29 12:38:47 -05:00
marauder2k7 656096e016 Another way of doing shapeBase, this requires fewer changes but will have an empty asset in each stateData until it is filled with an asset.
Both these will need to be tested to see which one is better.
2021-09-29 12:48:37 +01:00
marauder2k7 1c14dc5ec4 The beast is ready for a look over.
Can't have a soundAsset inside a struct. If we could this might work better.
PrevState needs to be kept track of for clearing looping sounds before the next state is loaded in. This might cause issues when switching weapons.
2021-09-29 12:36:02 +01:00
marauder2k7 d700ea4878 Committing player separately.
shapeBase is its own beast and will require a very critical look over once its up.
2021-09-29 11:41:57 +01:00
marauder2k7 3d7f092c52 Merge branch 'SoundAssetImplements' of https://github.com/Azaezel/Torque3D-1 into SoundAssetImplements
# Conflicts:
#	Engine/source/T3D/fx/lightning.cpp
2021-09-29 06:31:56 +01:00
AzaezelX 2630b4ada6 corrected and simplified the is<foo>Valid method macro injections 2021-09-28 18:50:35 -05:00
AzaezelX 776741770d boolean is<thing>valid chjecks for assets. tests wether it's non-empty and reporting zero flaws 2021-09-28 18:16:14 -05:00
marauder2k7 6bec47d3fa -SoundAsset added init for enum types.
-Vehicles updated to use enum initpersistfield.
2021-09-28 23:36:04 +01:00
AzaezelX 96891e5673 early out if any asset feed route results in explicitly being told to use an emptystring 2021-09-28 17:33:36 -05:00
marauder2k7 76addc52eb Checks for emptyString in preload
Sound asset out for emptyString
2021-09-28 21:10:48 +01:00