Commit graph

4268 commits

Author SHA1 Message Date
AzaezelX 24562e6758 aug ArrayObject to have a uniquePair command
like uniqueket and uniquevalue, removes duplicate entries, but only if *both* match
also, use that for the populateAllFonts() cache generator
2024-03-03 22:04:09 -06:00
marauder2k7 6355da5df6 various fixes
STB probably shouldn't fail on failed info, just continue.
Assimp only add sequences if there are any.
Update kork chan asset.
2024-03-01 15:01:47 +00:00
marauder2k7 cd6656be35 Fix archive
Incorrect cmake directory was messing up reading from zips
STB was failing to read from zips, it was failing to get the file info, something we were using as an early out, now if that files on the filepath, we use the memory read instead since stream needs to be a success to get to that point.
2024-03-01 10:06:18 +00:00
Brian Roberts 5d1f306668
Merge pull request #1224 from Azaezel/alpha41/cmakeCleanup
t3d subdirectory review
2024-02-28 19:39:20 -06:00
AzaezelX 7d1927af99 t3d subdirectory review
add missing example directory
preserve reservations for ecs directories in remmed form
2024-02-28 03:53:49 -06:00
Brian Roberts 13e5302e93
Merge pull request #1211 from marauder2k9-torque/AssimpLoaader-Fix
Test assimp PR before full refactor
2024-02-28 03:37:25 -06:00
Brian Roberts e0cf6cd1b7
Merge pull request #1219 from Azaezel/alpha41/npcnono
fix non player class pathshape jitter
2024-02-24 12:31:15 -06:00
Brian Roberts ecd75bdc06
Merge pull request #1220 from Azaezel/alpha41/fixGLVisibility
fizzle fix for gl
2024-02-24 12:31:06 -06:00
AzaezelX c7cc86b357 clamp spot angle to 179,
up custommaterial inputs to 16
add Material::PhotometricMask:handling to processedcustommaterial
and for paranoias sake go ahead and be explicit about _getLightMaterial (those *should* be unneeded as they optionally default to that, but it's how they were in the beatup fork during testing)
2024-02-23 11:52:43 -06:00
marauder2k7 1ccf4cff85 Merge remote-tracking branch 'upstream/development' into AssimpLoaader-Fix 2024-02-22 10:01:32 +00:00
AzaezelX ad6880ec0d fizzle fix for gl
correct  ShaderFeatureGLSL::getInVpos to more closely match directx outcomes so we can keep using the same math across incudes
2024-02-21 14:16:38 -06:00
AzaezelX a4da6727ed fix non player class pathshape jitter
everything has a consistent getRenderTransform() nowadays
2024-02-21 12:24:38 -06:00
marauder2k7 ad64b4f2df IES Loader
Updated IES loader to use torque math functions and calls in the problem areas for mac and linux.

New F32_MIN_EX which is lower than F32_MIN (required for ies profiles)
2024-02-21 09:36:37 +00:00
marauder2k7 4417462499 Add support for both ies and cookie
Both ies and cookies can now exist on a light

We are still not using all the capabilities of an IES profile, such as candela and luminance values we are just using them as a mask for the moment

Issues compiling on mac and linux, will need to update the ies-loader to use torque methods instead of std::
2024-02-21 07:40:57 +00:00
marauder2k7 a12d915180 Loads an IES Photometric profile.
ADDED: Ability to add IES profile as the cookie texture slot in both point lights and spot lights

TODO:
Have the IES Profile also drive the settings for the lights.
Make it work with Cookie textures. IES profiles are to be another slot in the advanced light section.
2024-02-21 06:22:37 +00:00
Areloch d890c530f9 Adds logic to be able to set a search string on an inspector that will be used to filter displayed fields.
Adds a textEdit filter box to the main world inspector that hooks into the primary inspector for said search functionality
2024-02-13 20:33:14 -06:00
marauder2k7 58bcea770c Node interp
Fix node interpolation to remove the jittered (reverted back to previous get node transform)
2024-02-10 21:57:08 +00:00
Brian Roberts 5afbfec3b1
Merge pull request #1213 from Azaezel/alpha41/ProbesInPreviewers
fix guishapeedpreview not displaying IBL
2024-02-10 14:50:23 -06:00
marauder2k7 b7f9687a9d Merge remote-tracking branch 'upstream/development' into AssimpLoaader-Fix 2024-02-10 20:02:02 +00:00
marauder2k7 05960e4d25 extra fixes
Torque sees the seqEnd in appSequence as a time in seconds whereas in Assimp this is in frames.
This is then converted to frames in generateSequences.
2024-02-10 20:01:52 +00:00
AzaezelX de87d2f6ad fix guishapeedpreview not displaying IBL
note this *does* require a baked skylight in the main scene
todo: track down why a similar protocol does not operate for guimaterialpreview and guiobjectview
2024-02-10 13:36:55 -06:00
Brian Roberts 2fe2e7925e
Merge pull request #1212 from Azaezel/alpah41/UnitTestTrouble
supress concurent threadsafedeque test as invalid
2024-02-10 10:48:39 -06:00
AzaezelX 0ccb27b7ad supress concurent threadsafedeque test as invalid
it's never actually used like that in practice, and while the cornercase reminder is useful, it's activetly causing overlooks for practical problems
2024-02-10 10:16:23 -06:00
marauder2k7 e2550ed525 Update assimpAppSequence.cpp 2024-02-10 04:49:57 +00:00
marauder2k7 144e1bcc60 Update assimpShapeLoader.cpp 2024-02-10 04:25:48 +00:00
marauder2k7 4b2abd4828 Merge remote-tracking branch 'upstream/development' into ThreadSafeDeque 2024-02-10 03:20:59 +00:00
marauder2k7 26e1350234 Merge remote-tracking branch 'upstream/development' into AssimpLoaader-Fix 2024-02-10 02:56:56 +00:00
Brian Roberts 25a3c3325f
Merge pull request #1208 from jamesu/datachunker_refactor
Datachunker & FrameAllocator refactor
2024-02-09 20:32:39 -06:00
marauder2k7 7115d9bcc6 Update assimpShapeLoader.cpp 2024-02-09 22:12:52 +00:00
marauder2k7 37dd58dca4 Update assimpShapeLoader.cpp
non destructive fixes for assimp loader
-this creates an ambient sequence if 1 does not exist.
-adds a bounds node if 1 does not exist.
2024-02-09 22:06:11 +00:00
Brian Roberts 600a6b8ebc
Merge pull request #1192 from Areloch/EditorPopupEXFieldExpansion
Usability improvements for editor fields utilizing popup menus
2024-02-07 19:29:07 -06:00
marauder2k7 ae8a2a74f7 Update threadSafeDequeTest.cpp
change value to 50
2024-02-07 17:25:48 +00:00
James Urquhart 28ba2f2473 Fix gcc & clang Compile for FrameAllocator changes 2024-02-07 00:05:14 +00:00
AzaezelX c9ac4ffbfe correct grouping 2024-02-05 21:02:41 -06:00
James Urquhart 45898694e4 Reimplement FrameAllocator and FrameTemp; Tidy up DataChunker header.
- Also additional work on tests to reflect watermark behavior change
2024-02-06 02:35:16 +00:00
AzaezelX cea641b154 don't early out, *do* use case sensitive filename finding for the stringtable, and finally, don't even bother setting the mSoundpath here unless it's to clear it 2024-02-05 18:41:07 -06:00
James Urquhart 7332dd6643 Add tests for FrameAllocator and DataChunker 2024-02-05 22:53:09 +00:00
AzaezelX ef858d726b remindernote: false for unchanged, true for changed 2024-02-05 14:40:24 -06:00
AzaezelX da9b9ed787 prelim refactor 2024-02-05 14:23:11 -06:00
James Urquhart 3781c7fae5 Add an alternate allocator for DecalManager; Also fix SFX weirdness. 2024-02-04 23:27:31 +00:00
James Urquhart 915fac31b3 Basic refactoring WIP 2024-02-04 23:27:31 +00:00
Brian Roberts 36581246cd
Merge pull request #1206 from Areloch/MatAnimFlagsFix
Ensures that material animation flags are cleared when values are changed so they don't "stick"
2024-02-04 15:49:30 -06:00
Brian Roberts 3fd4cbdb89
Merge pull request #1207 from Areloch/ImageAssetArrayInspectorFix
Fixes the handling of imageAssets for array'd field types, as well asfixing the editor behavior of guiBitmapCtrl so the imageAssets correctly update the fields upon editing
2024-02-04 15:49:20 -06:00
Areloch 7ef4552196 Fixed category filtering logic for datablockField populateMenu 2024-02-04 15:25:35 -06:00
Areloch 138e426ed1 Ensures that material animation flags are cleared when values are changed so they don't "stick" 2024-02-04 14:58:26 -06:00
Areloch 1e21cc678f Fixes the handling of imageAssets for array'd field types, as well as fixing the editor behavior of guiBitmapCtrl so the imageAssets correctly update the fields upon editing 2024-02-04 14:45:19 -06:00
Brian Roberts ceec0dfb5b
Merge pull request #1205 from Areloch/ForcedArrayIndexInspector
Adds ability to force the inspector to only show a set index of array'd fields.
2024-02-04 11:27:50 -06:00
Areloch 4646d5eac3 Adds ability to force the inspector to only show a set index of array'd fields. Mostly for specific editor tool use(like editing material's individual layers/stages) 2024-02-04 00:21:54 -06:00
Brian Roberts 79e06af6dd
Merge pull request #1204 from Areloch/MLTextTypeOut
Adds ability for MLTextCtrl to type the characters out over time
2024-02-04 00:14:58 -06:00
Areloch 6de92264f6 Adds ability for MLTextCtrl to type the characters out over time 2024-02-04 00:13:33 -06:00