TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-25 07:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
7702 commits 5 branches 33 tags 958 MiB
Commit graph

229 commits

Author SHA1 Message Date
AzaezelX 37f28dfbd7 cleanup strays 
handle clearing composite input textures
we no longer have a material value labeled emissive.
 2025-05-16 10:54:00 -05:00
marauder2k7 f64c7ce7aa Update materialDefinition.h 
the values holding the channel selection were set to floats when they were expecting integer values.
 2025-05-16 16:16:41 +01:00
marauder2k7 aa3f07e339 update macro 
Added get##name##File to macro that will check to make sure the asset is not null before getting the image file.
 2025-05-14 00:30:47 +01:00
marauder2k7 a52069bbc5 processed material null ref 
processedMaterial was not checking to see if each asset was null before getting the image filename inside the call to _createCompositeTexture
 2025-05-13 23:46:54 +01:00
marauder2k7 7c4d41ee21 Merge remote-tracking branch 'upstream/development' into imageAsset_refactor_rev3 2025-04-05 15:59:02 +01:00
AzaezelX 2d974cebf5 add difFloatPi range validator 
player:
apply to player min/max angle
allow fallingspeedthreshold to go negative
splashdata:
velocity, hieght, acceleration and startradius can all be negative
wrap material animation range from -1 to 1
 2025-04-03 16:52:49 -05:00
AzaezelX 0e78312e95 fix (?) rotation 
set the behaviour back to prior calcs, plus allow the desired scroll combo to work
 2025-04-02 23:07:09 -05:00
marauder2k7 79e046d379 Update processedShaderMaterial.cpp 
requires extra safety when the diffusemap asset is null, this is something that will be fixed by the material asset refactor
 2025-03-30 12:22:17 +01:00
marauder2k7 73ad92b757 review notes from Az 
Should render fallback for namedTarget if namedTarget fails
Add safety around namedtarget getTexture to stop assert
Missing assets should revert to fallback image and print a warning to console
Remove REFACTOR tag from all macros.
 2025-03-30 11:22:42 +01:00
marauder2k7 6eac6d767b cleanup areas checking for named tex target in materials 2025-03-28 14:05:03 +00:00
marauder2k7 fad397d914 always cleanup -_- 2025-03-27 09:11:40 +00:00
marauder2k7 ea49af52a5 Update materialManager.cpp 2025-03-27 09:00:12 +00:00
marauder2k7 c025ea86b4 more cleanups 
cleanup the type removing the refactor tag
materialManager restored to its original state
 2025-03-27 08:59:50 +00:00
marauder2k7 a8d7664fc2 named target material reload clean 
clean up the previous requirements for namedTarget to display on a material
 2025-03-27 08:31:28 +00:00
marauder2k7 9ff4c84bc8 Merge remote-tracking branch 'upstream/development' into imageAsset_refactor_rev3 2025-03-25 21:02:57 +00:00
AzaezelX 5e79c01208 fix forward cubemip 
in case of temporary loss of the probe array, fall back to a (slightly) less arbitrary probemanager mip level as oposed to assuming 1 mip exists
 2025-03-25 14:25:29 -05:00
marauder2k7 987ff90467 named target functionality 2025-03-25 18:22:26 +00:00
marauder2k7 b2fe48ab8d more merge conflicts 
fixed more merge conflicts (afxZodiac and MaterialDefinition)
Updated cubemapdata to use refactor asset
added new part to image_asset macro to create a private asset if the file exists.

updated reflectionProbe errors to actual function name where the error occurs.
 2025-03-24 21:50:04 +00:00
marauder2k7 0da0903599
Merge branch 'development' into imageAsset_refactor_rev3 2025-03-24 20:07:06 +00:00
AzaezelX f633ef3a3d fill in the validated variables 2025-03-09 11:53:23 -05:00
AzaezelX 0ac0ee88c2 BitfieldConsoleBaseType::setData definition 
also, preserve saved out 0 and -1 numbers to resrver 'none' and 'all'
ditch 'no' materialdefinition::animtype
 2025-03-06 20:55:40 -06:00
AzaezelX 64103a58aa enum value listing 
show the string value of masked enums in variable entries
also sort the combo case of scrolling and rotating materials
 2025-03-06 19:04:22 -06:00
marauder2k7 d87655bb3a merge dev 2025-01-23 22:16:33 +00:00
marauder2k7 0f4d2d1689 material definition finished 2025-01-23 22:16:02 +00:00
marauder2k7 58119a4f82 more material def 2025-01-23 22:15:47 +00:00
marauder2k7 cebfdbc5ec material definition 
changing the beast over to the refactor
 2025-01-23 22:15:29 +00:00
marauder2k7 eca0820134 init commit 
start of attempt 3
 2025-01-23 22:12:52 +00:00
marauder2k7 0458228e1c Update processedMaterial.cpp 
revert console spam
 2024-12-14 18:58:31 +00:00
marauder2k7 f5f50723ed final cleanup 2024-12-14 14:47:46 +00:00
marauder2k7 1edfbcf447 fixes for reload and flush 2024-12-14 13:37:23 +00:00
marauder2k7 f6dc694bd4 fully working 2024-12-14 01:18:46 +00:00
marauder2k7 85463c85ac named targets for image assets 
image assets can now be bound to a named texture target
if used in a material the target needs to exist before the material is initialized
 2024-12-13 00:26:39 +00:00
AzaezelX 2629d28520 let normal maps handle raw file locations (imposter support) 2024-08-22 18:16:19 -05:00
AzaezelX 72c67e196a Merge branch 'development' of https://github.com/TorqueGameEngines/Torque3D into Enumnanigans 2024-07-24 17:58:27 -05:00
AzaezelX 56e4484ff6 remove glowbin as it's own render pass 2024-05-30 17:29:42 -05:00
Areloch da743d9dc4 Removed test enum values 2024-05-04 10:19:12 -05:00
Areloch b77911bdcd Exposes the SceneObjectTypeMasks as an enum type, allowing it to be utilized in inspectors. 
Updated Trigger triggeredBy field to utilize new enum type for editing
Updated MaterialDefinition's animFlags field to utilize appropriate enum type for editing
Fixed image reference in bitmask inspectorField type to use correct image asset name
 2024-05-04 09:56:04 -05:00
AzaezelX 824b9a9cd5 fix dynamicCubemaps on objects 2024-04-18 13:57:29 -05:00
AzaezelX fe26ffc375 shift capturing from a globalMacro to a sceneRenderstate S32 
lets us ditch shader recompilation so that can be done on the fly without hitches, though does cost us a per-shader const for objects and postfx
 2024-04-16 13:51:41 -05:00
marauder2k7 2b295fb7f0 rest of virtuals removed 
virtuals removed and replaced with override where necessary on the rest of the code base, clang-tidy to the rescue.
 2024-03-18 18:40:22 +00:00
marauder2k7 efbe5e90f5 virtuals removed 
virtuals removed and replaced with override where necessary, clang-tidy to the rescue.
 2024-03-18 18:13:00 +00:00
marauder2k7 808e2f4200 Groundwork for other shaders 
Adds the ground work for geometry shaders
Expands shaderData and gfxShader to allow for more shader types

note: when building a GFXShader in source you have to call setShaderStageFile with the shaderStage and the filepath for that stage.

Once we add compute shaders this will become more apparent as compute shaders are a stage of their own and do not require vertex and pixel files whereas other shaders sometimes do.
 2024-03-06 13:26:39 +00:00
marauder2k7 d9fd3375da Merge remote-tracking branch 'upstream/development' into ShaderConstBuffer-CleanupRefactor 2024-02-24 14:42:53 +00:00
marauder2k7 42b8748f5b bkup 
still memory heap issue
 2024-02-24 12:04:53 +00: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 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
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 b161e72e7f Updates the initPersistFields for ParticleData and Material to be properly organized with order and group to reflect how they're expected in the editors 2024-02-03 23:50:32 -06:00
Areloch 829cc2b24a Adjusts some of the loading logic, for guiBitmapCtrl mostly, to not try and load ALL image content upfront during client init, improving load times 2024-01-07 23:09:41 -06:00
Brian Roberts a6f03897ed
Merge pull request #1016 from Azaezel/alpha41/mangledMath 
clean up math varsize complaints
 2023-05-08 21:28:49 -05:00