Commit graph

134 commits

Author SHA1 Message Date
Areloch
a1ecc98c87 Corrected probe init'ing so they don't fight for the cubemap idx order
Also correct deleting behavior so it updates indicies when a probe is removed
Updated forward lighting to utilize the same math as deferred
2019-06-30 23:04:16 -05:00
Areloch
e5bbd12d4b Merge branch 'MatInstanceViewer' of https://github.com/Areloch/Torque3D into Preview4_0
Fixed up forward IBL
Reimplemented old forward light shader code as a baseline so it can be updated to new PBR math
2019-06-27 00:36:56 -05:00
AzaezelX
54cf07fa94 strip out unused pixspecular to cut down on sources of confusion 2019-05-05 20:10:14 -05:00
AzaezelX
97ec99f704 Merge branch 'development' of https://github.com/GarageGames/Torque3D into PBR_ProbeArrayGLWIP
# Conflicts:
#	Engine/source/gfx/D3D11/gfxD3D11Device.cpp
#	Engine/source/lighting/lightManager.cpp
#	Templates/Full/game/levels/Empty Room.mis
#	Templates/Full/game/levels/Empty Terrain.mis
2019-05-01 23:18:31 -05:00
AzaezelX
2b997d2d9c nonbreaking 'specularcolor' to 'pbrConfig' var conversion. (TODO: specularMap entries) 2019-04-29 19:40:22 -05:00
Azaezel
ae8bc232a2 surpress nonrendered lights killoff method till we've time to revisit that 2019-04-04 20:56:57 -05:00
Areloch
eedf31b6ad Collapse the ProbeManager into RenderProbeMgr to simplify the probe management/rendering behavior(as the game sim doesn't require simple access to probe data, unlike lights) 2019-01-26 02:05:18 -06:00
Areloch
d6ae28b58e WIP hook-in of the cubemap array.
Also inversed probe transforms to make them correct.
2019-01-21 01:50:13 -06:00
Areloch
f5da79b39f Shifted the rest of the probe render code to hook into the array'd uniforms, made the reflection probe shader definition refer to the array shader. 2019-01-19 00:31:42 -06:00
Areloch
edbbeaf008 Probe Array WIP 2019-01-07 20:34:19 -06:00
Azaezel
8e534dd0c9 Merge branch 'method_Unmangle' into PBR_PR 2018-12-12 14:54:22 -06:00
Azaezel
b09a9938f5 ReflectProbeMaterialInfo::setProbeParameters buffer binding correction (again, set order as colorbuffer = 1, matinfo = 2 for gbuffer consistency) 2018-12-10 03:39:31 -06:00
Areloch
3a71c75596
Merge branch 'development' into EngineAPI-Refactor 2018-12-09 14:48:50 -06:00
Areloch
b2963442e6 Added deletion tracking so when we delete a probe, it'll delete the prefilter/irrad bakes if they exist.
WIP of static cubemap bake(not working).
2018-12-07 00:30:08 -06:00
Azaezel
866ff49993 retweaked filter for wether ot not to supress the zonelight culling methods when not in the diffuse pass 2018-12-05 10:55:29 -06:00
Azaezel
8590f7daf9 registergloballights now taks a (by default on) cullSceneLights. off for reflection capture as that is presently acting up 2018-12-04 12:41:15 -06:00
Azaezel
18a02516d1 put lerp back after verifying we were indeed getting values passed along. 2018-11-28 14:25:48 -06:00
Azaezel
d3eb2f7784 put sphereical influence back via the new spherical attenuation methods, shifted the stateblock for probes specifically to max of either source or desitination alpha (though not entirely convinced that is in fact the case) 2018-11-28 12:00:06 -06:00
Tim Barnes
15aeba20e7 timmy merge work 2018-11-28 17:51:52 +10:00
Azaezel
5fa2c5b4a6 stateblocks: skylight uses one+(dest)zero. probes use (src)alpha+(dst(1.0-alpha) for a lerp blend. skylight writes out 0 alpha to ensure probes always win if even only a little. 2018-11-27 08:50:44 -06:00
Azaezel
1703d5910b missed mscore pasalong in .set 2018-11-27 08:03:04 -06:00
Azaezel
29aa29a9fb 1)use standard setupPass inheritance chain. already checks for !mprocessedmaterial and a few other things
2)pass along mIsSkylight from probes to matinstances
3) stubbs in a seperate setupPass for skylightmatinstance
2018-11-23 02:05:36 -06:00
Tim Barnes
b0fff30d33 lighting single buffer 2018-11-21 15:53:02 +10:00
Areloch
ecef09525a Implemented registration of probes to avoid rendering all probes when unneeded. 2018-11-19 01:18:09 -06:00
Tim Barnes
f0924c8dcd point light WIP & moved lighting position/direction to WS 2018-11-14 20:58:47 +10:00
Azaezel
78a3c264b4 REVIEW LATER: invert the world transform for probes to shove them into cam space as far as rotation goes. keep position. 2018-11-09 20:16:15 -06:00
Tim Barnes
b91126c08c WIP shader work - not complete! 2018-11-02 09:08:45 +10:00
Tim Barnes
59a5bf11e1 reflection probe updates 2018-10-28 20:42:26 +10:00
Areloch
62a6a6a5f0 Adjusts the lightbin manager to be a regular bin, and shifts ownership of both lighting targets to the deferred manager. Probes now render ahead of lights to make the additive order jive.
Also reordered the probe targets used so they match lights for consistency.
2018-10-24 23:43:12 -05:00
Azaezel
de894c264f stateblock work for probe blending 2018-10-24 18:27:59 -05:00
Azaezel
de5ef2d63f crashfix. free will eventually lead to destroyself so don't doubleup or it trys to kill the dead. zombu bad. 2018-10-17 21:05:38 -05:00
Areloch
4942168529 Corrected some missed bits in the template, and a check in the forward-lit probes 2018-10-10 01:52:19 -05:00
Areloch
1966d348e4 Shifted to the static-list arrangement for probe instance tracking to help performance as well as drastically streamline the data submission/material instance flow for probe rendering. 2018-10-07 17:32:23 -05:00
Areloch
24007432e8 Updates and fixes to probe and lighting logic. 2018-09-17 01:52:18 -05:00
Areloch
2be32ad737 Implementation of reflection and skylight probes.
Moves lighting math to the diffuse/specular two-channel logic.
2018-09-16 22:15:07 -05:00
Areloch
ef5e3a5271 Core implementation of Physical Based Rendering. 2018-09-15 20:19:57 -05:00
Lukas Joergensen
5bde18143f Eliminate DefineConsoleFunction 2018-04-17 20:54:08 +02:00
Azaezel
68da3176c9 more gfx shadowvar cleanups 2018-03-13 21:25:45 -05:00
Azaezel
3ceaa0ed50 cleaned up member::radius 2018-03-13 15:31:00 -05:00
Azaezel
242a51eefe bounds to mBounds conflict avoidance 2018-03-13 01:05:15 -05:00
chaigler
e67e87cfac Fix assert on exit when Basic Lighting is removed
Occurs because ShadowMapManager is destroyed before
AdvancedLightManager.
2018-01-24 16:30:34 -05:00
chaigler
59c81f9179 Fixes linker errors when Basic Lighting is removed 2018-01-24 16:27:29 -05:00
Areloch
7e62b11502 Includes a fix to get lights to render more correctly in the reflection pass. Also includes a helper function to force a render from a passed in transform and frustum. 2017-07-07 02:55:56 -05:00
Areloch
0801a3cca8 Implementation of sRGB image support. Overhauls the linearization setup to utilize the sRGB image types, as well as refactors the use of ColorF and ColorI to be properly internally consistent. ColorIs are used only for front-facing/editing/UI settings, and ColorFs, now renamed to LinearColorF to reduce confusion of purpose, are used for color info in the engine itself. This avoids confusing and expensive conversions back and forth between types and avoids botches with linearity. Majority work done by @rextimmy 2017-06-23 11:36:20 -05:00
Areloch
23fb9ba38b Conflict resolution with devhead.
Cleaned up a few remaining d3d9 references in the cmake file.
2017-06-01 23:54:44 -05:00
Areloch
7e5e3b5105 Removes Direct3D9 functionality. 2017-05-28 16:51:31 -05:00
Areloch
9ce521d95f Catches the remaining prepass to deferred changes on the engine side. 2017-05-14 18:28:17 -05:00
Areloch
19dcfde60f Merge pull request #1984 from FooBarbarians/fix-1912
Reordering initialization methods #1912
2017-04-26 01:11:51 -05:00
Masquara
970dd5c477 Reordering initialization methods #1912 2017-04-19 14:02:45 -04:00
Areloch
c443e7a4ae Merge branch 'development' into Xenon_Removal 2017-04-18 20:47:43 -05:00