Commit graph

346 commits

Author SHA1 Message Date
Areloch
ab9fc302fc Added D3D error code interpreter
Added sanity check for findMatch
Finished most of asset importer logic to utilize settings system
Cleaned up code for finding associated files
Added General importer settings category and integrated logic for those settings fields
Updated logic in variableGroup to support callbacks in custom fields
Updated logic in variableInspector to better handle callbacks, as well as being able to manually update when manipulating fields
Updated scripts to utilize project settings values for playGUI and mainMenuGUI names
Improved module-oriented loading of materials
Added util function for populating custom fonts
2019-08-12 01:04:17 -05:00
Jeff Raab
da18eaff45 Initial implementation of separated client and server create/destroy functions for module setup
Implements fix so cubemap arrays load correctly when texture resolution settings have been lowered
Begun refactor of asset import config editing/settings.
2019-08-01 01:38:36 -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
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
17cec11b97 Added refactor of Editor Settings window
Various fixes for asset handling.
WIP of crash tracking
2019-06-03 02:47:30 -05:00
AzaezelX
35ea209827 corrects a leak found with createcomposite 2019-05-28 17:13:05 -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
Areloch
60a29777fa WIP updated UI
WIP dark editor theme
fixed multiwindow
2019-05-09 00:11:49 -05:00
Areloch
cedbd387d9 Updating BaseGame to work with PBR, and a PBR example module 2019-05-08 01:27:51 -05:00
Areloch
e83ec69292 Merge branch 'PBR_ProbeArrayGLWIP' of https://github.com/Azaezel/Torque3D into development 2019-05-06 01:50:45 -05:00
Areloch
82c74b4511 Merge branch 'VerveMergeWIP' of https://github.com/Areloch/Torque3D into development 2019-05-06 01:49:58 -05:00
AzaezelX
432a927884 Merge branch 'PBR_ProbeArrayGLWIP' of https://github.com/Areloch/Torque3D into PBR_ProbeArrayGLWIP 2019-05-03 00:40:57 -05:00
Areloch
446d094b03 uncommented a bit that was done up for debugging/testing 2019-05-03 00:30:05 -05:00
AzaezelX
fccd2117cf Merge branch 'PBR_ProbeArrayGLWIP' of https://github.com/Areloch/Torque3D into PBR_ProbeArrayGLWIP 2019-05-03 00:21:01 -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
Areloch
65fb8bc5f3 Ongoing fiddling with correcting the forward render behavior. 2019-04-29 00:07:38 -05:00
Areloch
6db975e81c random testing bits trying to isolate remaining forward issues. 2019-04-28 18:32:23 -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
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
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
b9c2db28e4 enhanced stage check 2019-04-10 11:43:45 -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
669bfc24d8 Merge pull request #2315 from Azaezel/wireFrameFix
corrects a parity flaw between wireframe and non wireframe box display
2019-03-30 15:09:32 -05:00
Areloch
1627cbabe6 ongoing WIP to sort out init'ing issues as well as correcting values so the probes actually correctly update data into the arrays
Additional sanity checks on the updateTexture calls added by timmy
2019-03-25 00:06:08 -05:00
Areloch
26471aaa77 WIP of timmy's changes merged in. Not properly initializing the probes/array slots just yet. 2019-03-24 18:18:44 -05:00
Areloch
87ee749801 (Mostly) updated verve implementation. 2019-03-07 16:23:41 -06:00
Azaezel
727dbbfd8d rolled in more of https://github.com/GarageGames/Torque3D/pull/2315 + set the mProbeShapeType(s) for the two derivative classes 2019-02-19 16:34:30 -06:00
Azaezel
46624cc95a wireframe capsule set to the contents of the solid capsule for corrections and backwards compatibility 2019-02-19 16:30:39 -06:00
Azaezel
110d815b39 solid capsule renderfix. +/- halfhieght, not full, and need to do vector, not point-multiplication for the verts 2019-02-19 16:10:33 -06:00
Azaezel
cf50803e72 swap over to wireframe, plus a few misc cleanups 2019-02-19 13:58:29 -06:00
Azaezel
05f8d8b5f1 corrects a parity flaw between wireframe and non wireframe box display 2019-02-19 13:13:23 -06:00
suncaller
31d0eb16f8 Clean up MSVC warning [C4312] conversion from type to type * of greater size 2019-02-02 23:09:55 -05:00
Azaezel
26a89882c7 tracks wether or not a cubemap has been fully intitialised (as well as defautls for other shared entries). skips out including an uninitialized cuebmap in probe array (inthoery. in practice, need to root arround a bit more) 2019-01-22 02:03:14 -06:00
Azaezel
1eed979a9c Merge branch 'method_Unmangle' into PBR_PR 2018-12-12 14:54:22 -06:00
Azaezel
a9cb78b67f straight convert of RGBA16F saving support for probes. should note gl side seems to be having an issue with loading probes thats resulting in color channel swapping. 2018-12-09 18:09:45 -06:00
Areloch
6cf0c9e360 Merge branch 'development' into EngineAPI-Refactor 2018-12-09 14:48:50 -06:00
Tim Barnes
6937989d61 RGBA16F saving support for probes 2018-12-05 20:01:58 +10:00
Tim Barnes
ab10cc0c87 timmy merge work 2018-11-28 17:51:52 +10:00
Azaezel
96101a0e56 correction for folks supporting older codebases outside of this engine: don't try and include the older directx library unless youre also deliberately using the older directsound end of things, and for dx11, reference the #include <d3d11_1.h> lib instead of the <d3d11.h> one to pair with the reference used by SDL2 2018-11-23 00:30:23 -06:00
Tim Barnes
9e65e940d0 lighting single buffer 2018-11-21 15:53:02 +10:00
Azaezel
b19fe23473 from timmy: fix for seperated out RGB and A blends 2018-11-10 00:32:24 -06:00
Tim Barnes
6e17475f86 WIP shader work - not complete! 2018-11-02 09:08:45 +10:00
Areloch
e72f04648a 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
d484a1a46e apply consistent colorspace to cubemaps 2018-10-17 21:04:41 -05:00
Areloch
f31445751f Updates and fixes to probe and lighting logic. 2018-09-17 01:52:18 -05:00
Areloch
b19a4b22c8 Implementation of reflection and skylight probes.
Moves lighting math to the diffuse/specular two-channel logic.
2018-09-16 22:15:07 -05:00