Commit graph

215 commits

Author SHA1 Message Date
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
AzaezelX
0d4221fa59 uninitialized and unused value cleanups
(cherry picked from commit 1f08602cf0ad84409cd8b3520510f9c6ce7d5f9c)
2023-05-01 10:40:02 -05:00
AzaezelX
0ce2da3a23 clean up math varsize complaints 2023-04-27 16:10:04 -05:00
AzaezelX
57037080b2 add an ignoreLighting entry to materials
by request:, flag to utterly ignore lighting in favor of the base texture
2023-02-14 20:57:44 -06:00
AzaezelX
1b33b01eb1 add "docsURL" filter to assignFieldsFrom to prevent it from triggering opening web pages when inheriting values 2023-01-28 16:12:05 -06:00
AzaezelX
f5a34308f9 add a docsURL; macro to link a given set of script config vars to git or similar storage urls via clicking on the inspector 2023-01-27 01:13:15 -06:00
AzaezelX
645f88d4af emissive to recivesShadows
now we've got a glow mask and multiplier, ditch the emissive flag in favor of a proper recivesShadows
2022-12-29 13:38:30 -06:00
Brian Roberts
a304198abb
Merge pull request #930 from Azaezel/alpha402/fixORMChanMap
fix orm vs single channel mapping
2022-12-03 08:55:43 -06:00
AzaezelX
4c50270e25 fix orm vs single channel mapping 2022-12-03 08:54:30 -06:00
Brian Roberts
120691abee
Merge pull request #923 from Azaezel/alpha402/puppies
adds wetness
2022-11-29 12:33:21 -06:00
Jeff Hutchinson
1940becb2d Compilation fixes for C++20 2022-11-28 21:39:06 -05:00
AzaezelX
d23ee397e6 adds wetness
cliffsnotes:
   $Core::WetnessTexture = "core/rendering/images/wetMap.png"; //for the influence degree map
probes/skylight have a new canDamp boolean, set to off for probes, on for skylight by default.
:levelinfo has a dampness multiplier (0-1)
kicked up numTextures from 8 to 16 for shaderdata and postfx since that hit the 8 texture-in prior limit, and we've already adopted apis that can handle the higher count
2022-11-21 21:12:23 -06:00
AzaezelX
04f4a5fcf4 dedicated server nulltexturemanager work
also supress warning for imageassets not loading a texture in nulldevice, and early out of _determineFeatures shadergen methods under the same conditions
2022-10-01 12:44:45 -05:00
Areloch
cd82186231 Fixes setter issue for image/shape/material custom inspector fields where it was not correctly passing through the changed value from the Asset Browser select
Swapped the water's disableTrueReflections variable to be enableTrueReflections for simplicity and consistency(also fixed a persistent typo)
Swapped disableVerticalSync to be enableVerticalSync for simplicity and consistency
Swapped disableParallaxMapping to be enableParallaxMapping for simplicity and consistency
Fix click detection on slider mode entries for guiGameSettingsCtrl so the click position correctly matches the percentage
Fixed problem where postFX initialization would always exec default.postfxpreset.tscript, even if a level's got it's own preset, which can cause problems
Fixed range field type behavior so that editing the values applies in real time, and also consistently applies between slider and text field
2022-08-30 01:29:39 -05:00
AzaezelX
f4cc0e8151 default translucency for PBR authoring tools generally assume premul, not lerpalpha nowadays 2022-08-15 16:50:06 -05:00