Areloch
2f68fdae5e
Merge branch 'Preview4_0_w_translucencyWIP' of https://github.com/Azaezel/Torque3D into Preview4_0_w_translucencyWIP
2019-07-22 00:17:29 -05:00
Areloch
ebe2c2dead
Add vector light support to forward materials.
2019-07-22 00:16:58 -05:00
AzaezelX
b6c28638b0
crashfix: we don't actually need the texture coordinates for forward lit surface creation. at that point, the rest of the shader features have already filled out the info being looked up from the gbuffer for deferred. (was triggering errors with float2 vs float3 coord entries for terrain)
2019-07-21 23:03:32 -05:00
AzaezelX
9859d9b7bc
'correct' refscale back to mismatching between forward and deferred. Because Reasons. >.>
2019-07-21 23:01:15 -05:00
Jeff Raab
38b0d0f1fe
Updates names of probe forward shader consts to be consistent with shadergen, allowing proper data throughput
2019-07-16 09:34:31 -05:00
Jeff Raab
5088197d05
Merge branch 'alpha40translucency2' of https://github.com/Azaezel/Torque3D into Preview4_0
2019-07-16 08:34:38 -05:00
Areloch
89128ce14a
Post FX script file initialization
2019-07-15 00:38:53 -05:00
AzaezelX
e83eabcb87
refbox calc parity, and killed off some doubled up alpha subtraction
2019-07-14 10:44:50 -05:00
AzaezelX
09c8e70e1c
Merge branch 'Preview4_0' into alpha40translucency2
2019-07-11 03:45:21 -05:00
Areloch
98f50a4453
Fixed probe cubemap reindexing assignment
...
Fixed BRDF texture binding in forward pass so it doesn't screw with the probes or regular lighting results during bakes
Fixed early-out check on probe manager so probes can be rendered during reflect pass as well.
2019-07-10 23:41:55 -05:00
AzaezelX
bc77ff0833
Revert "Updated SDL, Bullet and OpenAL soft libs"
...
This reverts commit 370161cfb1
2019-07-08 09:49:44 -05:00
AzaezelX
63be684474
Merge branch 'Preview4_0' into alpha40translucency2
2019-07-08 04:11:57 -05:00
AzaezelX
3cf332e514
logic cleanup. discount doubleups on normal generation if we've already got one calculated on out.
2019-07-07 22:52:23 -05:00
Areloch
f8750dd8ed
Updated SDL, Bullet and OpenAL soft libs
...
Fixed case sensitivity problem
Fixed clang compiler problem with having the class namespace used in an inline for the == operator
Tweaked some theme stuff to be more consistent.
Added initial test of no-pie for linux
test sidestep of getTexCoord in shadergen hlsl feature so we don't assert when getting the terrain's shaderstuffs(which uses float3 instead of normal float2)
2019-07-07 02:43:49 -05:00
AzaezelX
1ec9177557
augment ShaderFeatureHLSL::getSurface pixel shader feature with a fallback for missing normalmaps (really should correct this one vertex frag side)
2019-07-02 19:26:20 -05:00
AzaezelX
e51726aac6
albedo/diffuse color designators to curColor for clarity there (includes the case of color*albedo, so that was a misnomer)
2019-07-02 19:24:25 -05:00
AzaezelX
2a5ab66718
unused var cleanups
2019-07-02 19:22:55 -05:00
Areloch
e87dc787ee
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
a2aa241c92
Merge branch 'alpha40Probework' of https://github.com/Azaezel/Torque3D into Preview4_0
2019-06-29 03:11:58 -05:00
Areloch
0eca610c50
Merge pull request #56 from Azaezel/alpha40_4_entityComponentCleanup
...
Alpha40 4 entity component cleanup
2019-06-29 02:43:46 -05:00
AzaezelX
4d714091b7
missed a few conversions
2019-06-28 10:56:38 -05:00
AzaezelX
01f6938746
nomenclature shift for clarity: bunch of stuff tagged as probe that refferenced things properly tied conceptually to the reflection refrence box.
2019-06-28 10:21:50 -05:00
Areloch
af77444ec9
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
Areloch
e5c12f4aab
Reduce console spam from probe manager when not in debug
...
Added ability to activate height override on inspector fields from script
Further refinements of theme usage as well as editor settings
2019-06-17 23:48:20 -05:00
Areloch
07b28cb29a
GFX card profile config file logging moved to debug only
...
WIP mode of guiSliderCtrl to be a filled rectangle instead of a textured UI
Fixed bug with guiTextEditCtrl losing focus updating history passing malformed strings
Updated WIP options menu
Editor/Project settings WIP
Updated editor theme to be consistent, and feed off the editor settings
Updated popup menus to reference renamed profiles
Added more in-progress modules for examples/stress testing
2019-06-17 02:30:45 -05:00
Areloch
dd3422b5a2
Added ability to pass ints to post effect shader consts
...
Reorg'd probe init to flow better and be more robust on load
Cleaned up various parts of the probe render manager to be more stable
Fixed issue with crash on release due to numProbe in loops being 0
Updated glsl probe array shader
Beginning of rework of editor settings
Beginning of conversion of asset import config to similar system as editor settings
2019-06-13 00:37:12 -05:00
Areloch
b40d33a663
WIP of shifting the skylight cubemap to be packed into the cubemap array
2019-06-05 01:04:47 -05:00
Areloch
27b304eec3
Various fixes
...
Separated baked cubemap load/processing logic into a separate function for clarity
various corrections for when fields change so it properly notifies down to the client
Fixed enable flag logic to actually work
Fixed skylight enable flag so it properly disables if flipped off
2019-06-05 00:07:46 -05:00
Areloch
a552471e4e
Reorg of the probe initialization/update code to streamline parts of it, and make it flow more obviously
...
Added some initial asset stuffs for Das Boot for building out a better testing level.
2019-06-04 00:21:52 -05:00
AzaezelX
7832458005
component vector cleanup cleanup
2019-06-03 15:12:56 -05:00
Areloch
17cec11b97
Added refactor of Editor Settings window
...
Various fixes for asset handling.
WIP of crash tracking
2019-06-03 02:47:30 -05:00
Areloch
d4e55c1bf3
Merge pull request #55 from Azaezel/alpha40_createCompositeCorrection
...
Alpha40 create composite correction
2019-05-30 23:58:13 -05:00
Areloch
f2ea040a0e
Merge pull request #53 from OTHGMars/assimp_gltf_mats
...
Assimp Importer: Activates assignment for material light maps.
2019-05-30 23:57:27 -05:00
Areloch
ae857faae2
Adds test shapes of Kork and SpaceOrc
...
Sidestep of memleak from CSF at the moment
Minor fixes and corrections with asset importing and loose files
WIP of updated options menu
2019-05-28 17:24:29 -05:00
AzaezelX
35ea209827
corrects a leak found with createcomposite
2019-05-28 17:13:05 -05:00
Areloch
98c4606b3c
Removed test custom shader bindings until memleak is corrected.
2019-05-27 13:06:15 -05:00
Areloch
8196ad9d32
Removed old code that set the BRDF texture and caused a texture profile conflict with the probe array post effect, leading to a crash.
...
Renamed hasSkylight to mHasSkylight to avoid var ambiguity.
2019-05-26 03:13:16 -05:00
OTHGMars
2320b59bed
Activates assignment for material light maps.
2019-05-26 03:21:42 -04:00
Areloch
d9f80140f1
Include materialball shape asset info
...
Includes spectatorGameplay by default for streamline testing for now
Adds in reparentItem for GuiTreeViewCtrl
Added gitignore to shaderCache/.gitignore
Fixed material asset import logic to properly parent included images to the material
Includes D3D_Compiler47.dll for dependency compliance, and modified cmake file to not install said dll if not using D3D11 API
2019-05-25 03:37:18 -05:00
Areloch
dfa0f30572
Merge branch 'alpha40Macwork' of https://github.com/Azaezel/Torque3D into Preview4_0
2019-05-25 01:12:20 -05:00
Areloch
c1d67c5561
Merge branch 'Alpha40ReskinRevamp' of https://github.com/Azaezel/Torque3D into Preview4_0
2019-05-25 01:11:13 -05:00
Areloch
ef226f6a65
Merge branch 'Assimp_Settings' of https://github.com/OTHGMars/Torque3D into Preview4_0
2019-05-25 01:08:16 -05:00
Brian Roberts
2c3ab893c7
specify 4.0 core profile usage. see: https://en.wikipedia.org/wiki/OpenGL_Shading_Language#Versions
2019-05-24 19:06:38 -05:00
AzaezelX
4ee8df8863
windows and linux AL_ALEXT_PROTOTYPES blocks, as well as exposed the defining of it cmake side for the adventurous (windows and linux on by default, mac off till we sort why dylibs are freaking out)
2019-05-24 14:12:04 -05:00
Brian Roberts
518cd593b2
revert to using the stock mac framework, and encapsulate nonstandard openal extensions usage under a set of #if defined(AL_ALEXT_PROTOTYPES) blocks
2019-05-24 11:11:09 -05:00
AzaezelX
afa52850c3
Merge branch 'CustomShaderFeaturesPR' of https://github.com/Areloch/Torque3D into alpha40Macwork
...
# Conflicts:
# Engine/source/materials/materialDefinition.cpp
# Engine/source/materials/processedFFMaterial.h
# Engine/source/materials/processedShaderMaterial.cpp
# Engine/source/renderInstance/renderBinManager.cpp
# Engine/source/renderInstance/renderGlowMgr.cpp
# Engine/source/renderInstance/renderMeshMgr.cpp
# Engine/source/renderInstance/renderPassManager.h
# Engine/source/renderInstance/renderTranslucentMgr.cpp
# Engine/source/shaderGen/customShaderFeature.cpp
# Engine/source/shaderGen/customShaderFeature.h
2019-05-22 23:36:15 -05:00
Areloch
f9371bfc2e
Proper splitting of D3D and OpenGL sides of the CSF.
2019-05-22 21:44:07 -05:00
Brian Roberts
6c6bd7596b
conformed the function pointer table fill-out pattern to prior usage cases mac side, though it would appear we've still got issues finding the methods to bind
2019-05-21 23:27:59 -05:00
Brian Roberts
a5f2848b0d
(partial) mac compilation correction -
...
1) correct cmake to look to the included openal-soft, not the system framework.
2) (incorrect) stubb-ins for library to function table binds
2019-05-21 21:31:30 -05:00
Brian Roberts
47640420ca
mac compilation correction - don't use Class:Class constructors
2019-05-21 21:29:19 -05:00
