Commit graph

6794 commits

Author SHA1 Message Date
marauder2k7 c876e86957 Update gfxD3D11Shader.cpp
cleanups
2024-02-26 16:38:56 +00:00
marauder2k7 b979f4befc everything works
... apart from the sun =/
2024-02-26 09:22:19 +00:00
marauder2k7 e24971517e commit before pr 2024-02-25 23:10:23 +00:00
marauder2k7 25bc9cf354 stumped
buffers seem to be being added correctly, but for whatever reason render is not correct =/
2024-02-25 22:51:37 +00:00
marauder2k7 af29a2af0a Remove code duplication
Removed code duplication, all types can be routed through the same function apart from matrices.
2024-02-25 15:26:48 +00:00
marauder2k7 8c01a1a85b Working
This commit has everything rendering kind of correctly, but the colours seem off from lighting.
2024-02-25 13:39:22 +00:00
marauder2k7 6355e122d2 compare before change
check to see if data is different in internal sets before changing values
2024-02-24 19:52:35 +00:00
marauder2k7 3f3ef12c3b handle the global buffer
global buffer needs a special case
2024-02-24 17:33:28 +00:00
marauder2k7 e8d8138c74 working
last commit before global conform
2024-02-24 16:26:09 +00:00
marauder2k7 d9fd3375da Merge remote-tracking branch 'upstream/development' into ShaderConstBuffer-CleanupRefactor 2024-02-24 14:42:53 +00:00
marauder2k7 8887e21f4b working
working example, renders all gui controls.

We still cant render a scene, something to do with the constant buffer at slot 0 of the vertex shader being too small..... gotta figure this one out..................
2024-02-24 14:42:30 +00:00
marauder2k7 dd4d48d654 working example
now its working.. still not perfect but its getting there
2024-02-24 12:40:12 +00:00
marauder2k7 42b8748f5b bkup
still memory heap issue
2024-02-24 12:04:53 +00:00
Areloch 6b4472b762
Merge pull request #1221 from Azaezel/iesbugfixes
Iesbugfixes
2024-02-23 15:34:38 -06:00
marauder2k7 4caa54ad7e working example
everything is working apart from samplers......
2024-02-23 21:27:44 +00:00
marauder2k7 a1e2f781a8 Set constant buffers
added logic to set constant buffers dx side
2024-02-23 20:06:46 +00:00
AzaezelX 3ab716063f doc correction 2024-02-23 12:39:26 -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
AzaezelX 4d1395dd57 from mar: fix the opengl cookie uv lookup 2024-02-23 11:23:07 -06:00
marauder2k7 97ed522667 gfxD3D handles and buffermap
init handles coded.
bufferMap added.
2024-02-23 17:18:45 +00:00
AzaezelX c27b9bf48f allow spotlights specifically to comprress ies based on angle differentials 2024-02-23 01:28:15 -06:00
AzaezelX bbe9bc8871 missed a 1d convert 2024-02-22 23:47:57 -06:00
AzaezelX 14b6822e49 a) use a 1d texture for this
b) if we're going to optionally assign iesProfiles via shadowMacros.push_back, should specify the entries for the samplers too
2024-02-22 17:53:53 -06:00
AzaezelX 0b7fd2f0b3 ies bugfixes 2024-02-22 16:00:26 -06:00
marauder2k7 630bee97c7 backup 2024-02-22 21:37:44 +00:00
marauder2k7 55519aac57 Shader refactor
Refactored DX Shader compilation and reflection to be more similar to opengl
Added support for more than 1 const buffer per shader stage.

This is boilerplate code, no functionality yet, that will be added in further commits. Though this builds without errors do not try and run it at this point.
2024-02-22 09:58:45 +00:00
Brian Roberts 1cb5ed6884
Merge pull request #1218 from marauder2k9-torque/IES-Profiles
Loads an IES Photometric profile.
2024-02-21 12:14:45 -06:00
marauder2k7 2335a05fbe
Update LICENSE.md 2024-02-21 16:32:29 +00:00
marauder2k7 5588213996
Update LICENSE.md 2024-02-21 16:28:40 +00:00
marauder2k7 7fb14e17b5 Create jelly-fish.ies 2024-02-21 10:16:07 +00:00
marauder2k7 973d2792ed Delete A23D-Pathway-&-Accent-Light.ies 2024-02-21 10:15:44 +00:00
marauder2k7 3b4a15d7aa Some test ies profiles
IES profiles to my knowledge are not only free to download, but also free to distribute. you can get packs with thousands of these, i am uploading 3 test ones for now.
2024-02-21 10:14:29 +00: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 39ec0305f9 GLSL To match
Update the glsl side to match hlsl ies profile usage
2024-02-21 08:24:24 +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
Brian Roberts 429585f060
Merge pull request #1217 from Azaezel/alpha41/crashFyxMatED
temp workaround for material editor crash
2024-02-20 14:12:16 -06:00
AzaezelX 60758dd5a2 temp workaround for material editor crash
selection swapping is causing an apcrash
notDirtyMaterial.delete(); *should* work, but we know what they say about assumptions.
supressing deletion of workspace material kill off and recreation pending proper review
2024-02-20 14:11:58 -06:00
Brian Roberts 5b9ec4e025
Merge pull request #1215 from Areloch/InspectorFieldSearch
Adds ability to filter inspector fields
2024-02-14 00:36:08 -06:00
Areloch 7563130545 Fixes the guiEditor inspector search bar extents and clear button position 2024-02-14 00:34:52 -06:00
Areloch 3734ef8e5b Added search behavior to guiEditor's inspector as well 2024-02-14 00:23:27 -06: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
Brian Roberts 59fc6d3d65
Merge pull request #1214 from Azaezel/alpha41/fixAnimScrubberPos
fix animation scrubber position
2024-02-10 15:15:40 -06:00
AzaezelX 7c7a213f94 fix animation scrubber position 2024-02-10 15:15:09 -06: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
AzaezelX acef688a45 correct main entry to 128 2024-02-10 14:49:54 -06:00
AzaezelX ddddf112a4 revert "defaulting" to shapeEditorplugin 2024-02-10 14:43:35 -06:00
AzaezelX 85e5cfec3c set object editor previewBackground element to .5s instead of .0s to stop blowing up eye adaption 2024-02-10 14:41:12 -06:00
AzaezelX 359ec3aa43 set object editor previewBackground element to .5s instead of .0s to stop blowing up eye adaption 2024-02-10 13:47:44 -06: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