Commit graph

3903 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
Areloch
02262b014a Removed test lines 2019-08-07 01:28:34 -05:00
Areloch
3f2770bea4 Adjusted init'ing logic to defer to project settings for the name of the play gui and mainMenu gui instead of hardcoding them 2019-08-07 01:27:39 -05:00
Areloch
7c72520308 Change to main.cs so the client/server core module execs after game modules have loaded 2019-08-05 02:04:12 -05:00
Areloch
1228fbcb78 Implemented initial pass at proper client/server separation handling for module initialization
Added GameModeName to Scene
Added function to get number of active scenes
Added logic to level/client loading to enact gameplay mode logic driven by either Scene's GameModeName or project setting's default game mode
Added template module.cs file for module creation and adjusted new module logic in AssetBrowser to create off template
Updated FPSGameplay code to have deathmatchGame mode work with new GameMode logic
Updated EmptyLevel scene to define deathMatchGame as gamemode
Updated FPSGameplay module script to properly client/server initialize
2019-08-04 23:21:28 -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
bbe00a246c Some missing bits and bobs that set up AFX 2019-07-24 23:33:45 -05:00
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
Areloch
ff7e580d28 Adjusted creation of various assets to utilize template files. 2019-07-15 00:34:18 -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
c5d1dfb7f8 blend, don't add skylight, and take shadowmask into account for compute4lights. 2019-07-05 22:01:03 -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
AzaezelX
679197d7ca shift ambient occlusion to the ibl terms only 2019-07-02 19:20:31 -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
AzaezelX
261bcd9a45 Merge branch 'Preview4_0' of https://github.com/Areloch/Torque3D into Preview4_0 2019-06-27 12:49:58 -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
AzaezelX
6edf1733d5 Merge branch 'Preview4_0' of https://github.com/Areloch/Torque3D into Preview4_0 2019-06-19 07:21:26 -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
AzaezelX
c1402daa54 Merge branch 'Preview4_0' of https://github.com/Areloch/Torque3D into Preview4_0 2019-06-17 02:58:39 -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
AzaezelX
0cc5421f5c Merge branch 'Preview4_0' of https://github.com/Areloch/Torque3D into Preview4_0 2019-06-05 07:24:03 -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
AzaezelX
ed79c7d6bf Merge branch 'Preview4_0' of https://github.com/Areloch/Torque3D into Preview4_0 2019-06-04 01:42:53 -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
AzaezelX
e8c3c777d2 Merge branch 'Preview4_0' of https://github.com/Areloch/Torque3D into Preview4_0 2019-05-31 11:02:10 -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
a5a13de04c Merge pull request #54 from Azaezel/alpha40CompilerCorrection
shader compiler correction
2019-05-30 23:57:42 -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