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
AzaezelX
59bf75c8f0
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
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
29fda973b2
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
b59b7e1f04
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
abdc8b6d59
unused var cleanups
2019-07-02 19:22:55 -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
Areloch
37461b4768
Merge branch 'alpha40Probework' of https://github.com/Azaezel/Torque3D into Preview4_0
2019-06-29 03:11:58 -05:00
Areloch
747113bfc7
Merge pull request #56 from Azaezel/alpha40_4_entityComponentCleanup
...
Alpha40 4 entity component cleanup
2019-06-29 02:43:46 -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
AzaezelX
c77e59f4e6
Merge branch 'Preview4_0' of https://github.com/Areloch/Torque3D into Preview4_0
2019-06-27 12:49:58 -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
65b96eb34a
Merge branch 'Preview4_0' of https://github.com/Areloch/Torque3D into Preview4_0
2019-06-19 07:21:26 -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
AzaezelX
51bed8c95c
Merge branch 'Preview4_0' of https://github.com/Areloch/Torque3D into Preview4_0
2019-06-17 02:58:39 -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
AzaezelX
06fcf3c3d8
Merge branch 'Preview4_0' of https://github.com/Areloch/Torque3D into Preview4_0
2019-06-05 07:24:03 -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
AzaezelX
68e7214d84
Merge branch 'Preview4_0' of https://github.com/Areloch/Torque3D into Preview4_0
2019-06-04 01:42:53 -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
AzaezelX
9e8cf93bf3
component vector cleanup cleanup
2019-06-03 15:12:56 -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
AzaezelX
72a5e2eefe
Merge branch 'Preview4_0' of https://github.com/Areloch/Torque3D into Preview4_0
2019-05-31 11:02:10 -05:00
Areloch
691d3f501e
Merge pull request #55 from Azaezel/alpha40_createCompositeCorrection
...
Alpha40 create composite correction
2019-05-30 23:58:13 -05:00
Areloch
732f76b576
Merge pull request #54 from Azaezel/alpha40CompilerCorrection
...
shader compiler correction
2019-05-30 23:57:42 -05:00
Areloch
cc8b4b911d
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
AzaezelX
6af85b6e3c
Merge branch 'Preview4_0' of https://github.com/Areloch/Torque3D into Preview4_0
2019-05-29 13:58:17 -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
f63b1092d9
corrects a leak found with createcomposite
2019-05-28 17:13:05 -05:00
Areloch
6eb997c449
Removed test custom shader bindings until memleak is corrected.
2019-05-27 13:06:15 -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
1073765e6d
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
6577249f7b
Activates assignment for material light maps.
2019-05-26 03:21:42 -04:00
Areloch
d46a5ac601
Merge branch 'Preview4_0' of https://github.com/Areloch/Torque3D into Preview4_0
2019-05-25 03:37:56 -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
581d52be83
Merge pull request #52 from Azaezel/Alpha40ReskinRevamp
...
reskinning fixes
2019-05-25 03:34:54 -05:00
Areloch
3e323fbcdf
Merge pull request #51 from Azaezel/Alpha40LevelUpdate
...
updates pbr test level
2019-05-25 03:34:44 -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
debbbbd7a4
Merge branch 'Alpha40ReskinRevamp' of https://github.com/Azaezel/Torque3D into Preview4_0
2019-05-25 01:11:13 -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
Brian Roberts
69e9feb2a1
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
4ed3d11534
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
