TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-19 06:33:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
3737 commits 5 branches 33 tags 958 MiB
Commit graph

2616 commits

Author SHA1 Message Date
AzaezelX
fccd2117cf Merge branch 'PBR_ProbeArrayGLWIP' of https://github.com/Areloch/Torque3D into PBR_ProbeArrayGLWIP 2019-05-03 00:21:01 -05:00
Areloch
bd170b5abe WIP of forward probe scoring. 2019-05-03 00:03:58 -05:00
Areloch
4e557aec83 Added fetch for BRDF texture for forward rendering use, re-enabled brdf logic in the lighting shader and got the probe arrays properly sampling into forward as well. 
TODO: core::rendering pref on the BRDF texture instead of hardcode path, add best-pick logic for forward probes and double-check ogl forward is playing nice.
 2019-05-02 00:05:12 -05:00
AzaezelX
dd1470202d 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
98a3ff604a nonbreaking 'specularcolor' to 'pbrConfig' var conversion. (TODO: specularMap entries) 2019-04-29 19:40:22 -05:00
AzaezelX
d519479562 shifted forward lit probe lighting to pre-rt lighting in keeping with the deferred methodologies. in diong so, also needed to add a vertex feature for in/out tangent space normals detection. also in keeping with the fact we sample the deferred albedo result-buffer, fed the createForwardSurface the output target so that can take color multiplication et al instead of just raw albedo 2019-04-29 17:39:47 -05:00
AzaezelX
de385bc220 Merge branch 'PBR_ProbeArrayGLWIP' of https://github.com/Areloch/Torque3D into PBR_ProbeArrayGLWIP 2019-04-29 00:32:40 -05:00
Areloch
65fb8bc5f3 Ongoing fiddling with correcting the forward render behavior. 2019-04-29 00:07:38 -05:00
AzaezelX
26b3ecff4c Merge branch 'PBR_ProbeArrayGLWIP' of https://github.com/Areloch/Torque3D into PBR_ProbeArrayGLWIP 2019-04-28 20:37:03 -05:00
Areloch
6db975e81c random testing bits trying to isolate remaining forward issues. 2019-04-28 18:32:23 -05:00
AzaezelX
d2a01ece03 gl conversionwork - forward lit variant. do note, crashs with 
`Engine\source\gfx\gfxDevice.cpp(837,0): {Fatal} - GFXDevice::setTexture - out of range stage! -1>16` though the shaders themselves are now in a compling state (ostensibly)
 2019-04-28 06:24:19 -05:00
Areloch
093f50bd9d Make the gl cubemap array init that takes a pointer list of cubemaps actually have parity to the updateTexture gl calls(aka, actually works). 2019-04-27 03:09:01 -05:00
AzaezelX
404cb929c1 we likely don't want to be overwriting that set of cubemap array registers for every forward lit object instance 2019-04-26 13:33:28 -05:00
AzaezelX
d766348867 1) bumped bytesPerTexel on up to 8 and got rid of the explicit fillin 
2) fed glTexSubImage3D GL_RGBA instead of a second GFXGLTextureType[mFormat]. this tells it what order colors come in, not what size
3)for safeties sake, skipped out on updatetexture if the fed cubemap isn't initialized yet
 2019-04-26 13:32:23 -05:00
Areloch
175f0eebb7 ongoing WIP of openGL cubemap arrays. 
Got the initialization of the arrays to work, but currently fill the supplied cubemaps with flat 1 values(effectively filling with garbage) as sampling from the cubemap to feed to the array leads to memory/heap corruption.
 2019-04-26 01:57:07 -05:00
AzaezelX
b5436b6cb7 tweaked the updating behavior in the probe manager so calling updateProbes just flags a ProbesDirty bool, which is used to kick the update of the static parameters when the bin's render() is called 
that way if multiple probes get updated at once, we don't hit the update loop for each one, which is obviously silly
also fixed the 'probes' cubemaps aren't ready until you nudge them'
turns out when we were setting out global var which we used for the irradiance and prefilter cubemap paths, it was being set AFTER the probes got loaded
so it was using an invalid path to look up the cubemaps
-@areloch
 2019-04-22 15:39:55 -05:00
AzaezelX
d034ea2be8 no point in resetting effectiveprobecount or mipcount in the compute4probes method. the latter is going to remain a fixed global var to support the cubemap arrays while the latter isn't even used by forward lit (though it likely should be, rather than trying to cook up 2 bound vectors) 2019-04-16 11:47:21 -05:00
AzaezelX
a0d1a076d5 Merge branch 'PBR_ProbeArrayForward' into PBR_ProbeArrayGLWIP 
# Conflicts:
#	Engine/source/renderInstance/renderProbeMgr.cpp
 2019-04-16 09:34:01 -05:00
Areloch
000c7b2263 GL work 2019-04-15 23:11:18 -05:00
AzaezelX
9597014bc2 resource count and type sync with the computeForwardProbes call-insertion for shadergen. probly going to need to cook up a cubearray type 2019-04-11 12:31:15 -05:00
AzaezelX
7108c8cc64 use the right recreation when lacking a composite map (still need to do up matinfo flags) 2019-04-11 12:30:03 -05:00
AzaezelX
d2ed2555c9 typofix+ *add* computeForwardProbes to replicate the stateblock used in deferred 2019-04-10 17:46:42 -05:00
AzaezelX
0cd8948fcf stray var killoffs 2019-04-10 17:44:54 -05:00
AzaezelX
8118f42411 leverage the macros for a bit more legibility 2019-04-10 14:14:10 -05:00
AzaezelX
ed385ff342 conform some of the "specularColor" entries (TODO: matinfo flags, like emissive/glow ect) 2019-04-10 12:56:20 -05:00
AzaezelX
15ca6eabb4 cleanup duplicate var, and constructor-init skylight shaderconsts 2019-04-10 12:54:46 -05:00
AzaezelX
68f47d6041 defaults for diffusecolor, specularcolor (reminder todo: shift that to composite) and normal for createForwardSurface 2019-04-10 11:48:22 -05:00
AzaezelX
b9c2db28e4 enhanced stage check 2019-04-10 11:43:45 -05:00
Areloch
c622cfcb6b Modification of #2145 
Original PR broke class-type visibility toggles in the editor, so this adjustment on the same setup keeps the optimized path, but also enables the original class-based render toggle if the editor is open.
(Also adds TORQUE_TOOLS check to have it be even leaner if the project doesn't have tool support at all)
 2019-04-08 10:20:13 -05:00
Areloch
c025760422 Majority of forward work. Some state/register count issues and further testing required. 
Also requires proper binding of forward probe values, as well as scoring probes for forward selection.
 2019-04-07 23:57:05 -05:00
Azaezel
8e9468bddb surpress nonrendered lights killoff method till we've time to revisit that 2019-04-04 20:56:57 -05:00
Areloch
afb5a589c3 Cleanup/consolidation of shader logic. moved the common methods over to lighting.hlsl 
Did all the setup work to feed data for forward probestuffs, just have to rewrite the shaderFeature to replicate the regular probe array logic.
 2019-04-03 00:13:58 -05:00
Areloch
59b6e67ecf Merge pull request #2043 from John3/toolShapes_3 
cleaning the modules
 2019-03-31 14:41:35 -05:00
Areloch
15e50f58d6 Merge pull request #2313 from OTHGMars/MousePos 
Switches to absolute position for mouse tracking.
 2019-03-31 14:16:52 -05:00
Areloch
6daf0c8d34 Merge pull request #2338 from Areloch/MoreMenubarFixes 
Fixes some outstanding menubar problems.
 2019-03-31 12:39:31 -05:00
Areloch
67060e5c38 Merge pull request #2340 from Areloch/popupMenuBGFix 
Makes the popups correctly operate anywhere in the space of the canvas
 2019-03-31 12:36:15 -05:00
Areloch
fc93bc229c Merge pull request #2339 from Areloch/MountedCollisionsFix 
Adds logic to temporarily disable collisions of mounted objects on Players
 2019-03-31 12:31:57 -05:00
Areloch
f71db60e78 Merge pull request #2336 from wcbx/wcbx-cloudtexprofile 
Fixes artifacts in Cloud Layer.
 2019-03-31 12:31:37 -05:00
Areloch
2977fc1415 Merge pull request #2144 from RichardsGameStudio/development 
Allow correct display of widescreen resolutions (16:9 and 16:10 ratio) on a 4:3 ratio display
 2019-03-31 12:22:09 -05:00
Areloch
69b7ffc3af Merge pull request #2335 from Azaezel/navmeshNoNo 
rewrite of NavMeshUpdateAll/NavMeshUpdateAroundObject
 2019-03-31 12:20:16 -05:00
Areloch
c7b542a875 Merge pull request #2331 from Bloodknight/PR_PlayerZRotation 
Set contrsaints for Player Z rotation
 2019-03-31 03:47:41 -05:00
Areloch
f104fac305 Merge pull request #2322 from Areloch/add3dProjectionCtrl 
Adds gui3DProjectionCtrl
 2019-03-31 02:14:45 -05:00
Areloch
1ec048f41d Merge pull request #2220 from irei1as/development 
Changes for SFXSound::setPosition(time)
 2019-03-30 18:42:19 -05:00
Areloch
2b62796525 Merge pull request #2332 from Bloodknight/PR_DedicatedLinuxCrashFix 
Fixes a crash that occurs on linux headless servers
 2019-03-30 16:41:36 -05:00
Areloch
80c036b9b0 Merge pull request #2327 from Areloch/loadCachedDTS 
Adds ability to skip loading of cached dts in enumColladaForImport
 2019-03-30 16:33:37 -05:00
Areloch
b445b74bb2 Merge pull request #2325 from Areloch/fileDialogReturnBuffer 
Moves the path return from fileDialog through the returnBuffer
 2019-03-30 16:31:44 -05:00
Areloch
9ae6a5bfa7 Merge pull request #2320 from Areloch/setFieldHeight 
Allows special inspectorFields to override their height
 2019-03-30 16:31:21 -05:00
Areloch
7756c4a762 Merge pull request #2319 from Areloch/Scenes 
Initial implementation of the Scene object
 2019-03-30 16:30:34 -05:00
Areloch
0f22f2b20a Merge pull request #2310 from Azaezel/vertColorCorrection 
Vert color correction
 2019-03-30 16:30:01 -05:00
Areloch
18f4e3172e Merge pull request #2323 from Areloch/getFieldValueCrashfix 
Sanity check for calling getFieldValue
 2019-03-30 16:07:53 -05:00