Commit graph

780 commits

Author SHA1 Message Date
Areloch
4dcac05b33 Some missing bits and bobs that set up AFX 2019-07-24 23:33:45 -05:00
Areloch
836c4d34cd 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
9fad181748 Add vector light support to forward materials. 2019-07-22 00:16:58 -05:00
AzaezelX
e04b04a531 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
Jeff Raab
c873d534c7 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
ee01ff54d4 Merge branch 'alpha40translucency2' of https://github.com/Azaezel/Torque3D into Preview4_0 2019-07-16 08:34:38 -05:00
Areloch
6e2560ee46 Adjusted creation of various assets to utilize template files. 2019-07-15 00:34:18 -05:00
AzaezelX
941d8c7eec refbox calc parity, and killed off some doubled up alpha subtraction 2019-07-14 10:44:50 -05:00
AzaezelX
e7ee94428e Revert "Updated SDL, Bullet and OpenAL soft libs"
This reverts commit 370161cfb1.
2019-07-08 09:49:44 -05:00
AzaezelX
160dc00c07 Merge branch 'Preview4_0' into alpha40translucency2 2019-07-08 04:11:57 -05:00
Areloch
370161cfb1 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
fab6b6d7c6 blend, don't add skylight, and take shadowmask into account for compute4lights. 2019-07-05 22:01:03 -05:00
AzaezelX
0d6e4e2bed shift ambient occlusion to the ibl terms only 2019-07-02 19:20:31 -05:00
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
AzaezelX
857d8b8c81 missed a few conversions 2019-06-28 10:56:38 -05:00
AzaezelX
b44972859b 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
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
Areloch
436c28b87c 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
f1777016b8 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
226529fd1b 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
bb9e5ce313 WIP of shifting the skylight cubemap to be packed into the cubemap array 2019-06-05 01:04:47 -05:00
Areloch
f433cf4a0d 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
6a654a9c35 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
Areloch
ff871f37e3 Added refactor of Editor Settings window
Various fixes for asset handling.
WIP of crash tracking
2019-06-03 02:47:30 -05:00
Areloch
732f76b576
Merge pull request #54 from Azaezel/alpha40CompilerCorrection
shader compiler correction
2019-05-30 23:57:42 -05:00
Areloch
6073bc5551 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
66421dbca6 specifies floating point for a few entries some shader compilers were treating as int's 2019-05-26 17:19:27 -05:00
Areloch
d1308c3aba 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
729391eeeb Merge branch 'alpha40Macwork' of https://github.com/Azaezel/Torque3D into Preview4_0 2019-05-25 01:12:20 -05:00
Areloch
b727efec78 Merge branch 'Alpha40LevelUpdate' of https://github.com/Azaezel/Torque3D into Preview4_0 2019-05-25 01:09:58 -05:00
Areloch
cc01c79dc3 Merge branch 'Assimp_Settings' of https://github.com/OTHGMars/Torque3D into Preview4_0 2019-05-25 01:08:16 -05:00
Brian Roberts
cf64cc4537 (did this before the core profile specification update so may be unnecessary): shift surface class method on out to a global with an inout to modify a passed one. 2019-05-24 19:07:50 -05:00
AzaezelX
f889afc2fd updates pbr test level with some skinswapped demopieces and a skylight. included resulting bakes. 2019-05-21 10:45:06 -05:00
Areloch
e15f17354d Added missed lines to init the reflection probe baking gui 2019-05-21 01:25:24 -05:00
Areloch
d6f87da608 Fixed up behavior of the new functions of convex editor. 2019-05-21 00:29:44 -05:00
OTHGMars
7ddacc20f4 Import Options gui Update
Updated import options gui with tree view, additional shape statistics and settings load/save options. See /Engine/lib/assimp/t3d_usage.md for usage tips.
2019-05-21 01:19:35 -04:00
Areloch
f5bf70b584 Catch the template files up and add the improved convex editor bits. 2019-05-19 21:30:45 -05:00
Areloch
2479d388f2 Implements a Material Instance viewer to the material editor to see a feature-filtered dump of the generated shaders for a given material. 2019-05-17 01:48:45 -05:00
Areloch
ae11d3548d Merge branch 'ModernEditorLayoutWIP' of https://github.com/Areloch/Torque3D into development 2019-05-13 00:28:23 -05:00
Areloch
741fcaed5a Merge branch 'CustomShaderFeatures' of https://github.com/Areloch/Torque3D into development 2019-05-11 21:53:08 -05:00
Areloch
ad5f583893 Various fixes 2019-05-11 21:42:27 -05:00
Areloch
0e6ba354db WIP updated UI
WIP dark editor theme
fixed multiwindow
2019-05-09 00:11:49 -05:00
Areloch
9ac9c13fea Updating BaseGame to work with PBR, and a PBR example module 2019-05-08 01:27:51 -05:00
Areloch
82881f0875 Merge branch 'PBR_ProbeArrayGLWIP' of https://github.com/Azaezel/Torque3D into development 2019-05-06 01:50:45 -05:00
Areloch
00b958aff9 Merge branch 'VerveMergeWIP' of https://github.com/Areloch/Torque3D into development 2019-05-06 01:49:58 -05:00
AzaezelX
8d2d357948 invert surface.NdotV contribution for brdf texture lookup in keeping with authoring tool outputs 2019-05-05 20:09:35 -05:00
AzaezelX
6957e69d83 normal orientation debug lines (remmed) 2019-05-05 18:35:08 -05:00
AzaezelX
d1b24af399 go back to using raw wsNormal with a few additional prep-lines for if that hasn't been made a var for that shader yet 2019-05-05 18:34:39 -05:00
Areloch
a928744b73 Merge branch 'AssimpWIP' of https://github.com/Areloch/Torque3D into development 2019-05-04 16:25:16 -05:00
Areloch
471254ac0c Merge branch 'GameObjectExamples' of https://github.com/Areloch/Torque3D into development 2019-05-04 16:25:00 -05:00