Commit graph

3835 commits

Author SHA1 Message Date
JeffR ecd35df7e9 Implementation of updated handling of Legacy Project importer to better seperate out importer versions as well as more explicit processing of incoming content 2022-01-20 01:14:43 -06:00
Brian Roberts e2a2f26828
Merge pull request #717 from lukaspj/fix/improve-taml-xml-formatting-no-tampering
Improve tinyXml2 output formatting
2022-01-17 05:03:24 -06:00
JeffR 15ef8b4fbe Cleaned up implementation of #712
Also updates other game classes like the shapebase to utilize the sound asset hooks properly.
2022-01-03 20:57:10 -06:00
Lukas Aldershaab 3ef57168b2 Cleanup fsTinyXml implementation 2022-01-03 21:16:34 +01:00
Lukas Aldershaab 5abd66dfa3 Split PrettyPrinting functionality from VFS printing 2022-01-03 21:10:26 +01:00
Lukas Aldershaab 165459c90b Improve tinyXml2 output formatting 2022-01-02 12:18:25 +01:00
JeffR b70faae38f Updates the handling of the baking of shape asset previews to generate them with support for view angle control to improve visibility, as well as supporting overriding of a material in the preview bake
Also utilizes the updated bake handling to have material asset previews render as a sphere shape asset, overriding with the material asset's material, improving distinction of what is a material asset vs image asset
Also updates the sphere preview mesh to be more generic and not only for reflection probes
2021-12-24 17:26:45 -06:00
Robert MacGregor 9cf6c42fa1 * Adjustment: Tweak more manual memory management to use dStrcpy and use the VFS for directory queries always now. 2021-12-21 14:52:31 -05:00
Robert MacGregor abb4e558dc * Adjustment: Rework the TORQUE_SECURE_VFS paths in the assetImporter to use dStrcpy instead of manual memory management. 2021-12-21 02:15:16 -05:00
Robert MacGregor 0e93373824 * BugFix: When querying against root with Torque::FS::DumpDirectories, correctly return directories with their path.
* Adjustment: Add commenting to some of the new programming.
* Adjustment: Tweak fileCreatedTime and fileModifiedTime functions to use the VFS.
2021-12-20 19:26:32 -05:00
Robert MacGregor b63122ea76 * BugFix: Corrections to the VFS dumpDirectories function to properly honor the depth parameter. 2021-12-19 01:51:19 -05:00
Robert MacGregor 46b8c3d15d * BugFix: Correct the VFS dumpDirectories function not honoring noBasePath properly. 2021-12-19 01:18:52 -05:00
Robert MacGregor 7665076b19 * Cleanup: Minor cleanup of test code and an unused include. 2021-12-19 00:54:11 -05:00
Robert MacGregor 66f9336995 * Adjustment: Tweak the asset importer to use the Torque VFS functions. 2021-12-19 00:28:15 -05:00
Robert MacGregor cbe7ee13d6 * Adjustment: Change several filesystem functions to use the VFS.
* Feature: Initial implementation of a VFS dump directories function.
2021-12-18 23:37:49 -05:00
Robert MacGregor 948bc43d85 * Feature: Augment VFS file information with creation times & update some console functions to use VFS. 2021-12-18 03:56:11 -05:00
Robert MacGregor 277cdf67b0 * Feature: Initial secure VFS implementation with asset import capability. 2021-12-17 21:16:42 -05:00
rextimmy e1398895b3 fix opengl device not returning the correct anisotropic value 2021-12-15 20:09:18 +10:00
Robert MacGregor deb994cb13 * BugFix: Correct a windows-only pathing issue in terrMaterial. 2021-12-14 19:44:44 -05:00
JeffR 434c6c26fe A clean implementation of Lukas' Fix side projection #684 PR with Az's addendum fix rolled in 2021-12-13 15:56:14 -06:00
Robert MacGregor cc45f9e9a4 * BugFix: Fix a Windows ASAN reported allocation mismatch error. 2021-12-13 00:04:24 -05:00
JeffR a8b3d874a1 Fixes mapping of imposter images to be packed as part of the shape asset, and fixes paths to be formatted more sanely. 2021-12-10 00:01:26 -06:00
Jeff Hutchinson 73b023a4b7 Fix console warning when calling void functions in console
Forgot to add this check when rewriting the interpreter.
2021-12-08 21:00:50 -05:00
Brian Roberts 0e06e2853e
Merge pull request #691 from Azaezel/alpha40/terrainTrickery
use internalname for terrain layers
2021-12-05 19:32:29 -06:00
Robert MacGregor 5fa7c62ba9 * BugFix: Don't use the register keyword in the console grammar files. 2021-12-03 20:33:02 -05:00
AzaezelX 1b282e0baf use internalname for terrain layers
stops bugs like spaces in filenames and the like from occuring due to pointing right at the diffuse flat file name, as well as corruption from using a different diffuse in the material later

(cherry picked from commit c1227dbdd0dd61c25970eeaac128c6cbe5d25947)
2021-11-29 13:54:13 -06:00
Brian Roberts 346a84d16c
Merge pull request #688 from Azaezel/alpha40/guibitmapbuttonColorModulation
adds colorization to GuiBitmapButtonCtrl
2021-11-28 12:49:18 -06:00
Brian Roberts a7e804c7c3
Merge pull request #689 from Azaezel/alpha40/soundcleanups
cleanups for sound assets
2021-11-28 12:49:10 -06:00
AzaezelX 663335e556 TSStatic::updateMaterials() crashfix 2021-11-27 14:29:30 -06:00
AzaezelX 93faa243ac cleanups for sound assets
removed redundant get<foo>Profile calls, correctly used a few in proxmine
2021-11-27 00:32:25 -06:00
AzaezelX d074343b50 adds colorization to GuiBitmapButtonCtrl 2021-11-26 20:13:59 -06:00
Areloch a5944aff19 Adjusted callback handling of asset inspector fields when invoking AB to select asset for more consistent behavior and better handling of updating the objects and inspector
Added logic to forcefully acquire newly imported asset definition to better try and ensure it's loaded immediately after import
Added logic to asset importer so if a file is not found for an importing material asset, if populate maps is on, then it will try and find a matching image asset in the destination module
Added logic to tsStatic to better handle fields being updated via the editor, forcing updates and refreshes of the shape and materialSlots
Fixed handling of guiBitmapButtonCtrl so it will update the bitmap used when edited via the Gui Editor
Updated image ref to the hudFill image asset for the console GUI
Cleaned up names for the default camera model/material
Defaulted import config to utilize the Prune action instead of rename for more predictable default behavior
Added icons next to AB's preview slider bar for additional visual feedback of slider intent
Added missing checkbox to asset import window and cleaned up scaling behavior
Fixed handling of drag-n-drop behavior in GUI editor so it doesn't block further interaction
Added logic for drag-n-drop of image assets to GUI Editor so it will create a GuiBitmapCtrl with the image
Added handling for drag-n-drop import of folders of assets to AB/Asset Import
Added missing asset import config option to indicate if config supported import of sound assets
Added logic when opening asset import config editor, where if there is a default import config set in the settings, it will open that one by default
Hid the collision section of the import config editor, as those options are currently unutilized
Improved behavior for Create New Folder window in the AB, now always pushing to the front, and also selecting the text by default, so the user can just start typing the new name
Also added return and escape key accelerators to Create New Folder window for better UX
Fixed display of editor windows, adding a distinct blue color to highlighted windows' title bar and fixing display of minimize/maximize/window/close buttons
Moved GUIEditor's onControlDropped function to the AB script to match placement of sibling world editor function
Fixed issue with material editor where the ORM Config map slot was getting the normal map instead of the correct ORM map
2021-11-26 16:40:15 -06:00
Robert MacGregor 41e5988c46 * BugFix: Correct a scoping error with ConsoleValue in the updated code in GuiInspectorField. 2021-11-24 14:14:24 -05:00
Robert MacGregor 4dea3810b9 * [SFXDescription] BugFix: Correct a data corruption issue in converting legacy channel values. 2021-11-24 13:46:18 -05:00
Robert MacGregor f1a48df676 * [GuiInspectorField] BugFix: Correct data corruption potential caused by casting the result of Con::evaluatef directly to a const char. 2021-11-24 09:16:09 -05:00
AzaezelX 0527865462 set cubemapsaver profile to one that preserves sizes
also aug size mismatches for the popup so they're reported
2021-11-21 14:28:51 -06:00
Brian Roberts 797020286b
Merge pull request #668 from Ragora/feature-turret-typemask
Feature: Implement a TurretObjectType bit for typemasks
2021-11-20 23:32:15 -06:00
Brian Roberts df4624e88a
Merge pull request #674 from Ragora/adjustment-unix-platform
Adjustment: Generalization of platformX86UNIX to platformPOSIX
2021-11-20 19:27:48 -06:00
Jeff Hutchinson 7ac62f42a3 Fixed a leak with console stack in the interpreter.
Issue was pushing a new frame in the global scope. Everytime a global scope was called, 1 ConsoleValue got allocated that was never freed. After 4096 'global scope' function calls, the engine would blow. Also cleans up an extra rogue usage of push/pop with the saver helper.
2021-11-20 19:08:02 -05:00
Areloch 04b0883a31 Assimp checks against lowercase extensions, so we force the extension of the file to lower before fetching the importer.
Also adds sanity check that the importer was actually found before we try and use it.
2021-11-19 23:14:06 -06:00
Robert MacGregor 88cfa4533b * Cleanup: Remove a comment referencing the now-removed DisplayPtrManager. 2021-11-17 22:08:08 -05:00
Robert MacGregor d1fde1f54b * Cleanup: Fully remove the DisplayPtrManager class as it was not actually being used by anything. 2021-11-17 21:58:17 -05:00
Robert MacGregor b986589804 Merge remote-tracking branch 'main/Preview4_0' into adjustment-unix-platform 2021-11-17 21:38:48 -05:00
Brian Roberts 75adcb9b7c
Merge pull request #676 from JeffProgrammer/ts-errors
Optionally allow to treat script assert as warning
2021-11-17 17:03:32 -06:00
Jeff Hutchinson 2e03108856 Optionally allow to treat script assert as warning
This commit allows us to treat variable use before assign errors and local variables inside of the global scope as warnings instead of asserts. This will allow for easier porting of legacy scripts. It is highly recommended use this as an aid to port scripts, but can be used in production if needbe.
2021-11-17 18:01:35 -05:00
AzaezelX 6474413aaf fix reported ASAN crash 2021-11-16 12:40:22 -06:00
Brian Roberts b5bd242e23
Merge pull request #673 from Areloch/useImagePreviews
Shifts utilization of gui elements in editors that point to 'normal' image assets to utilize generated previews instead.
2021-11-15 12:39:33 -06:00
Areloch eb24b63be4 Shifts utilization of gui elements in editors that point to 'normal' image assets to utilize generated previews instead.
This reduces console spam about mismatched texture profiles and improves stability.
2021-11-14 21:39:51 -06:00
Brian Roberts 4f04213cd9
Merge pull request #671 from Azaezel/alpha40/brdfFixes
brdf handling corrections
2021-11-14 13:46:47 -06:00
Robert MacGregor 247b12e795 * BugFix: Correct many include paths and build platformX11 on non-Apple Unix. 2021-11-14 14:45:42 -05:00
Robert MacGregor a24149ba3b * Adjustment: Tweak the include paths for platformPOSIX.h. 2021-11-14 14:05:16 -05:00
Robert MacGregor 6583134ef2 * Adjustment: Initial work on moving x86Unix platform code into a more common POSIX platform. 2021-11-14 13:56:12 -05:00
Areloch 2af12c52e1 Shifted check for FBX importer in assimp shape loader code to utilize stringtable 2021-11-14 01:28:16 -06:00
Areloch f14375983b Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into MiscFixes2021114 2021-11-14 01:26:16 -06:00
Areloch 97484247ae Fixes Settings window not being able to be brought forward over AB
Adds checkbox to mark as not showing Import Window each time
Added loaded import config to import log output
Fixed targeted material map slot field names
Added helper function for playing a sound asset via AssetId
Updated import config to have some more common suffixes
Updated editor settings to have Import Window show by default
Changed AB context menu from listing item as "Refresh Asset" to "Reload Asset" for improved clarity
Removed unneeded duplicate editor settings window script file
2021-11-14 01:26:04 -06:00
AzaezelX b60d51969e brdf handling corrections
1-handle the brdfTexture in linear space, not srgb.
2-clamp surface.NoV across the board for consistency. (solves several new and ongoing artifacts)
2021-11-13 19:05:26 -06:00
Jeff Hutchinson 949813956d Add Object Inheritence Acceptance Test 2021-11-11 22:57:09 -05:00
Brian Roberts 91469c25ab
Merge pull request #667 from Azaezel/alpha40/scaleShenanigans
fix fbx importer lookup for setting formatScaleFactor
2021-11-11 18:33:11 -06:00
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
Robert MacGregor 227b1e3f51 * Feature: Implement a TurretObjectType bit for typemasks. 2021-11-10 19:34:32 -05:00
Areloch 8d310b8d5d Merge branch 'alpha40/scaleShenanigans' of https://github.com/Azaezel/Torque3D-1 into Preview4_0 2021-11-09 19:10:50 -06:00
Areloch d06bc790e3 Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into Preview4_0 2021-11-09 19:06:57 -06:00
AzaezelX f9496559c9 fix fbx importer lookup for setting formatScaleFactor 2021-11-09 01:05:42 -06:00
Brian Roberts e0e3ebc69d
Merge pull request #637 from Azaezel/alpha40/guiRotation
blatantly ganked from T2D; adds rotation as an option for drawbitmap
2021-11-08 16:08:17 -06:00
AzaezelX 8fa652a327 by request, changed fspin and the new "rotation" for bitmap gui elements to a more generic "angle" to preserve thedistinction between rotating a gui and rotating a 3d object. 2021-11-08 16:07:44 -06:00
Robert MacGregor 2c7dc4e783
Merge branch 'Preview4_0' into bugfix-crash-variableinspector 2021-11-08 15:42:44 -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
Areloch 9f51cc7e4c Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into Preview4_0 2021-11-08 12:51:13 -06:00
AzaezelX 733b71ccad fill out a %this variable for trigger callbacks 2021-11-07 14:52:25 -06:00
Areloch a3351390c6 Expands handling of the collada enumerator so if the material is not named the same as the image file, it performs a lookup to find the associated material. 2021-11-06 22:36:59 -05:00
Robert MacGregor a6a7d6e1a1 * [Tokenizer] BugFix: Correct a malloc/delete mismatch in the tokenizer programming. 2021-11-06 20:34:12 -04:00
Areloch bd0a070d03 Merge branch 'MiscImportFixes20211105' of https://github.com/Areloch/Torque3D into Preview4_0 2021-11-06 19:09:55 -05: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 4d56b34bbb
Merge pull request #651 from Ragora/bugfix-asan-tsshapeedit
BugFix: Correct an ASAN use-after-free Error in TSShapeEdit
2021-11-03 22:19:50 -05:00
Brian Roberts dec886036c
Merge pull request #659 from Ragora/bugfix-delete-and-new-mismatch
[TAML] BugFix: Correct a delete and new[] mismatch in tamlWriteNode
2021-11-03 21:17:16 -05:00
Brian Roberts 1a0b66b5e3
Merge pull request #655 from Ragora/bugfix-asan-sync-fetch-and-add
BugFix: Correct an ASAN reported memory error caused by incorrect usage of __sync_fetch_and_add
2021-11-03 21:17:07 -05:00
Brian Roberts efed9358f7
Merge pull request #649 from Ragora/bugfix-asan-guigamelistmenuctrl
BugFix: Correct an ASAN reported memory access error in GuiGameListMenuCtrl
2021-11-03 21:16:47 -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
Brian Roberts e4428cf75a
Merge pull request #657 from Areloch/SeparateImporterLogFile
Updates asset importer and project importer to output to separate log files into tools/logs
2021-11-03 21:15:51 -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
Robert MacGregor 400db2da88 * [TAML] BugFix: Correct a delete and new[] mismatch in tamlWriteNode reported by ASAN. 2021-11-03 18:27:26 -04:00
AzaezelX 69afd3d370 Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into alpha40/imageArrayProfileFixes 2021-11-03 12:48:47 -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
Robert MacGregor 2311d7d683 * BugFix: Correct an ASAN reported memory error caused by incorrect usage of __sync_fetch_and_add. 2021-11-02 18:11:42 -04:00
Brian Roberts e372545cc6
Merge pull request #647 from Azaezel/alpha40/guiProfileCleanups
clean up more texture profile refs to kill spam
2021-11-02 16:39:25 -05:00
Brian Roberts 7c1574355f
Merge pull request #653 from Ragora/bugfix-asan-tabcomplete
BugFix: Correct an invalid memory access error caused by the tab autocomplete
2021-11-02 16:38:18 -05:00
Robert MacGregor 215a93e9af * BugFix: Correction for compiling on x86 Unix devices. 2021-11-02 17:36:22 -04:00
Robert MacGregor b33e1b400b * BugFix: Correct a crash in the variable inspector caused by keeping pointers into tVector managed memory. 2021-11-02 17:32:26 -04:00
Robert MacGregor 2b53c065ce * BugFix: Correct an invalid memory access error caused by the tab autocomplete in the console when attempting to tab complete at the start of the input while there is text to the right. 2021-11-02 13:55:57 -04:00
Robert MacGregor 2eefb4972f * BugFix: Correct an ASAN memory access error in TSShapeEdit caused by reading a reference from the same vector we are pushing to at the same time. 2021-11-02 09:11:25 -04:00
Robert MacGregor 724e4f423c * BugFix: Correct an ASAN reported memory access error when calling updateHeight on GuiGameListMenuCtrl when an invalid profile is initially set. 2021-11-02 08:21:22 -04:00
Robert MacGregor dd03af5041 * BugFix: Corrections to the Unix file IO to allow for compilation on ARM Unix devics. 2021-11-01 08:52:35 -04:00
AzaezelX 0dcd272b87 clean up more texture profile refs to kill spam 2021-10-31 14:38:02 -05: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
Brian Roberts 1f06cf1dad
Merge pull request #644 from Ragora/adjustment-update-assimp
Adjustment: Update Assimp version to 5.0.1.
2021-10-28 17:48:39 -05:00
Brian Roberts f250955f63
Merge pull request #640 from Azaezel/alpha40/iblCleanups
Alpha40/ibl cleanups
2021-10-28 12:27:24 -05:00
Robert MacGregor 5c83b417a5 * [GuiControl] BugFix: Don't assume a tooltip profile is going to be set when waking and sleeping. 2021-10-28 10:40:13 -04:00
Brian Roberts 6d0105948d
Merge pull request #636 from Azaezel/alpha40/matAnimAngry
addsa material.setAnimflags(LAYER,TAGS STRING); method
2021-10-27 18:58:41 -05:00
AzaezelX 8685173207 typofix 2021-10-27 16:01:37 -05:00
AzaezelX a9bc56944c Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into alpha40/iblCleanups 2021-10-27 13:50:58 -05:00
AzaezelX 42bc6fa358 differentiate forward lit and deferred ibl vars
since we're not currently using the same arrays et al for the whole pass, need to make sure those don't fight
2021-10-26 12:32:37 -05:00
Brian Roberts e658c95f90
Merge pull request #632 from Ragora/bugfix-get-sound-filename-crash
BugFix: Correct a crash caused by sfxProfile
2021-10-26 11:49:55 -05:00
Robert MacGregor 72b31f6f6b * BugFix: Correct a crash caused by sfxProfile due to returning an address to a temporary value in getSoundFileName. 2021-10-26 12:48:28 -04:00
Brian Roberts 8c2aaaad18
Merge pull request #638 from Ragora/bugfix-create-directory-logic
BugFix: Correct usage of mkdir in posixVolume.cpp
2021-10-26 11:17:28 -05:00
Robert MacGregor 0cf8498fce * BugFix: Correct usage of mkdir in posixVolume.cpp to check for the expected successful return value. 2021-10-26 08:22:58 -04:00
AzaezelX d07d113246 blatantly ganked from T2D; adds rotation as an option for drawbitmap
demonstrates a bit of usage in guibitmapctrl. (do note, gui elements may need followup via altering thier clip rect depending on how folks want to end up using this)
2021-10-25 23:16:41 -05:00
Brian Roberts 0f4cf446a3
Merge pull request #631 from Azaezel/alpha40/spotlightSpotting
adress gl spotlights disapearing for deferred
2021-10-25 22:57:24 -05:00
AzaezelX 3fdf49f829 addsa material.setAnimflags(LAYER,TAGS STRING); method
workaround for mat.animFlags[#]= foo; not taking
time of writing seems to not work for scroll for some reason. might be a different bug
2021-10-25 22:54:19 -05:00
AzaezelX a05c83493e adress gl spotlights disapearing for deferred
It was mixing vars up between it and forward. resolved by prefixing the forward vars with "in" as the rest are, as well as pointing the val at the const String ShaderGenVars::lightSpotParams("$inlightSpotParams");
2021-10-21 22:08:56 -05:00
Robert MacGregor 4758f7bdaf * Adjustment: Update Assimp version to 5.0.1. 2021-10-21 21:14:55 -04:00
Brian Roberts 14ebeaf3eb
Merge pull request #625 from Ragora/bugfix-case-insensitivity-fatal-assert
BugFix: Correct a fatal error that may be thrown in case insensitive Unix IO
2021-10-21 14:17:49 -05:00
Brian Roberts 361ae7e2da
Merge pull request #627 from Azaezel/alpha40/soundAssetFollowup
sound asset followups
2021-10-21 14:17:39 -05:00
Jeff Hutchinson 4af4d90f4a Get rid of setLocalVariable entirely. 2021-10-19 20:38:13 -04:00
Jeff Hutchinson 4293aef858 This one slipped through - nextToken can't use local variable for its token variable. This was stated as one of the breaking changes in the origional PR. 2021-10-19 20:34:57 -04:00
AzaezelX 670b246a2a sound asset conversions - playlist (as a point of significance, that no longer uses mSlots.mTrack[ i ] on the backend. just th equivalent of mTrack[i]. While the former was certainly useful for clustering, it's actively fighting standarization) 2021-10-14 22:33:13 -05:00
AzaezelX 9ab5f61c39 sound asset conversions - ambience 2021-10-14 22:31:00 -05:00
Robert MacGregor 42b862a54b * [Unix] BugFix: Correct a fatal error that may be thrown from functions like isFile is passed a bad path. 2021-10-14 20:38:01 -04:00
AzaezelX f0d919e859 sound asset conversions - materials 2021-10-14 19:09:20 -05:00
Robert MacGregor 2586e73145 * BugFix: Correct a few memory leaks. 2021-10-14 19:40:16 -04:00
AzaezelX 00515fffa8 sound asset conversions - afxmagicmissile for a datablock case and guimltextcrtl for an object-instance case 2021-10-14 15:06:49 -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
Jeff Hutchinson 98657bde7a
Merge pull request #621 from Ragora/bugfix-lpng-warnings
update lpng
2021-10-13 18:29:06 -04:00
Brian Roberts ba9debf89f
Merge pull request #617 from Ragora/adjustment-unix-case-insensitivity
Adjustment: POSIX Case Insensitivty
2021-10-13 13:12:29 -05:00
Brian Roberts 15aed0efc2
Merge pull request #616 from Azaezel/SoundAssetImplements
Sound asset implements
2021-10-13 13:11:57 -05:00
Robert MacGregor bd9b3fd55b * [Win32] Adjustment: Only trigger the Linux compat warning when TORQUE_POSIX_PATH_CASE_INSENSITIVE is disabled. 2021-10-13 11:40:54 -04:00
Robert MacGregor 2f3215c4fb * [lpng] Adjustment: Update libpng to version 1.6.37. 2021-10-12 22:04:36 -04:00
Robert MacGregor c965429cf6 * [lpng] BugFix: Corrections to allow the SSE intrinsics to build properly. 2021-10-12 17:38:27 -04:00
Jeff Hutchinson 90951b3cc8
Merge pull request #619 from Azaezel/alpha40/glcubefix
fix opengl cubemap display
2021-10-11 21:13:25 -04: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
AzaezelX bce14ab63f fix opengl cubemap display 2021-10-11 20:02:49 -05:00
Brian Roberts 8f8a8384e3
Merge pull request #608 from DraconicEnt/bugfix-msvc-compiler-warnings
BugFix: Correct MSVC Compiler Warnings
2021-10-11 19:31:22 -05:00
Brian Roberts ed80136322
Merge pull request #615 from JeffProgrammer/gl_meminfo
OpenGL Memory Info Extensions
2021-10-11 19:31:10 -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
Robert MacGregor c376bc3f9c * [ZIP] BugFix: Correct another codepath that may fail due to case sensitive string searches. 2021-10-11 19:31:37 -04:00
Robert MacGregor 8d0128698a * [ZIPVolume] BugFix: Add the capability of resolving ZIP prefix paths with case insensitivity and a CMake option to control this behavior. 2021-10-11 19:02:58 -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
Robert MacGregor f3eadb922b Merge remote-tracking branch 'origin/Preview4_0' into adjustment-unix-case-insensitivity 2021-10-11 10:56:56 -04:00
Robert MacGregor 444c9dcf41 * BugFix: Correct non-constant array allocations in the POSIX case insensitivity code. 2021-10-11 10:45:02 -04:00
Robert MacGregor 497a94f884 * Adjustment: Cleanups to the case insensitivity code for POSIX systems and add case insensitivty to directory dumping code. 2021-10-11 10:24:24 -04:00
Brian Roberts fe3edb8ccf
Merge pull request #613 from Azaezel/kermithelpme
followups to #582
2021-10-11 01:27:15 -05:00
Robert MacGregor 1385b29f03 * Adjustment: Initial testing with extensions to load GPU VRAM. 2021-10-10 20:53:55 -04:00
Jeff Hutchinson a458c97217 Implement more extensions to get graphics card memory for OpenGL on windows and Linux.
(cherry picked from commit da942cdb79a87b76e629b36415c83067e3620a70)
2021-10-10 20:09:02 -04:00
Robert MacGregor 77ea34d2b2 * Adjustment: Minor tweaks to allow case insensitivity on Unix systems. 2021-10-10 04:19:27 -04:00
AzaezelX f7cf1c020c inject getworldtotangent and getworldnormal to ensure var order 2021-10-09 18:20:57 -05:00
Jeff Hutchinson 0429b5afa5 Added more tests for torquescript 2021-10-09 18:47:12 -04:00
AzaezelX e2e1c491ac Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into kermithelpme 2021-10-09 11:32:13 -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
Brian Roberts ee824e0f17
Merge pull request #611 from Areloch/MatAssetLoadStabilization
Tweaks the MaterialAsset loading logic
2021-10-09 00:59:28 -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 cf9d15a9d4 * BugFix: Correct a Windows compilation error in the endian swap code due to a missing include. 2021-10-08 17:23:16 -04:00
Brian Roberts 3b8d1f4031
Merge pull request #605 from Azaezel/alpha40/followup604
don't try and sort ribbon particles
2021-10-08 10:57:29 -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 15b946fb35 * Adjustment: Utilize native compiler intrinsics for endian swapping when available. 2021-10-07 09:59:03 -04:00
Robert MacGregor 74cc60508b * BugFix: More cleanup of MSVC compiler warnings. 2021-10-07 01:10:00 -04:00
Robert MacGregor 22d6b4a1f1 * BugFix: Correct an accidentally removed line from clearing compiler warnings. 2021-10-07 00:32:42 -04:00
Robert MacGregor 5d26dba7da * BugFix: Clear some MSVC compiler warnings. 2021-10-07 00:27:39 -04:00
Jeff Hutchinson 24bf807713 various shadergen fixes. 2021-10-06 21:53:26 -04:00
Robert MacGregor 070a3a30b6 * [Linux] BugFix: Free the mouse cursor when triggering SIGTRAP on Linux to ensure that the cursor is available for debugging. 2021-10-06 00:35:38 -04:00
AzaezelX 42e90ad3fb RTLightingFeat work.
1) we do *not* in fact want to early out in the presence of MFT_ImposterVert. it mangles the position-send.
2) dx sucessfuly handles the    if ( !fd.features[MFT_NormalMap] ) case, so use the same for gl
2021-10-05 14:46:37 -05: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 661a192e87 orderfix for RTLightingFeatHLSL vert vs pixel shader. the order needs to match, same as network comunicating 2021-10-03 21:53:16 -05:00
AzaezelX a1117b1c41 add getInWorldNormal method glsl side 2021-10-03 21:51:40 -05:00
AzaezelX 52040fb072 Merge branch 'Preview4_0' into kermithelpme 2021-10-03 17:23:52 -05:00
Brian Roberts dc9899907b
Merge pull request #601 from Ragora/bugfix-audio-devices
* BugFix: Fix AL device listing
2021-10-03 17:08:15 -05:00
Brian Roberts 4de330eaed
Merge pull request #598 from OTHGMars/canvasCallbacks
GuiCanvas keyboard mode callbacks.
2021-10-03 17:07:01 -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
Robert MacGregor 6a94946e5b * BugFix: Fallback to ALC_ENUMERATION_EXT if ALC_ENUMERATE_ALL_EXT is not available. 2021-10-02 22:29:34 -04:00
Robert MacGregor 43630c31c2 * BugFix: Tweaks to the ALC device listing logic to be more consistent with the AL API. 2021-10-02 22:24:11 -04: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
Robert MacGregor 5e88ab2570 * BugFix: Fix AL device listing so that functions like sfxGetAvailableDevices return the actual devices on the system. 2021-10-02 16:31:43 -04: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
Areloch c5d5a91356 Add handling to RotationF's addRotation function to ensure formatted return 2021-09-28 18:17:49 -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