Commit graph

3944 commits

Author SHA1 Message Date
Areloch
c0e8b047f5 Shifted the rest of the probe render code to hook into the array'd uniforms, made the reflection probe shader definition refer to the array shader. 2019-01-19 00:31:42 -06:00
OTHGMars
3af77bbf15 Adds support for SDL joystick and game controllers. 2019-01-10 20:09:05 -05:00
OTHGMars
0ae675839e Adds event codes for 2 POV hat masks, 2 trackballs and the guide button. 2019-01-10 20:06:54 -05:00
OTHGMars
2add57079d Updated to work without keyboard event refactor. 2019-01-10 17:44:30 -05:00
Marc Chapman
e5884c56a7 Sqlite Console refactor, also rename param to make tooltip function more helpful 2019-01-10 21:31:17 +00:00
Glenn Smith
a78235dd06 Fix Input::getKeyCode on software keyboard layouts
Input::getAscii goes Torque keyCode -> SDL Scancode -> SDL Keycode -> SDL ascii key name
Input::getKeycode used to be SDL ascii key name -> SDL Scancode -> Torque keyCode

This mismatch made software keyboard layouts behave incorrectly in different places. For example, you would bind a key to an ActionMap and it would activate with a different button than specified.
2019-01-10 04:15:22 -05:00
Areloch
8633884145 Merge pull request #2287 from Azaezel/macUpdates2
corrects compilation errors on mac
2019-01-09 09:42:19 -06:00
Azaezel
4d3d800051 skylights do actually have a position. 0,0,0. so we can include those without messing with things. and we'll want to sum/count for blending purposes down the line. not render over each other 2019-01-08 11:16:05 -06:00
Areloch
f110158654 Probe Array WIP 2019-01-07 20:34:19 -06:00
Brian Roberts
6e4ed303f6 Update afxRenderHighlightMgr.cpp 2019-01-07 11:41:17 -06:00
Azaezel
7939d08c6a afxRenderHighlightMgr: account for hardware skinning 2019-01-07 06:22:24 -06:00
Areloch
d74a25540f Merge pull request #2282 from OTHGMars/CanvasResize
Fixes CanvasSizeChangeSignal and Canvas::onResize()  under SDL
2019-01-06 04:51:18 -06:00
Azaezel
547a2e28eb no message 2019-01-02 17:53:17 -06:00
Azaezel
94fe66a451 use the newer c_controlInterface file 2019-01-02 17:52:20 -06:00
Azaezel
be4cf58fb8 corrects compilation errors on non-mac unix derivatives 2019-01-01 15:41:59 -06:00
Azaezel
13ce1a7441 corrects compilation errors on mac 2019-01-01 13:11:46 -06:00
Azaezel
b0aa733c4e NFD updated to 1.1.4 2019-01-01 10:58:53 -06:00
Azaezel
453958234e console conversion 2018-12-12 16:01:26 -06:00
Azaezel
1eed979a9c Merge branch 'method_Unmangle' into PBR_PR 2018-12-12 14:54:22 -06:00
Azaezel
a7fc407284 corrects a pair of conversions. one object oriented, one not. 2018-12-12 14:52:14 -06:00
Azaezel
c3f0157331 ReflectProbeMaterialInfo::setProbeParameters buffer binding correction (again, set order as colorbuffer = 1, matinfo = 2 for gbuffer consistency) 2018-12-10 03:39:31 -06:00
Azaezel
6aff0c26bf Merge branch 'PBR_PR' into PBR_PR_GLWIP 2018-12-10 01:19:41 -06:00
Areloch
835513b861 Deleting a probe in the editor now automatically does a cleanup of it's baked cubemap files
Also added it to do the prefilter/irrad processing on any StaticCubemap selected.
2018-12-10 00:46:28 -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
58cf310971 Merge pull request #2284 from OTHGMars/SDLMonitor
Fills in monitor functions in PlatformWindowManagerSDL
2018-12-09 15:36:15 -06:00
Areloch
368a0041d1 Merge pull request #2283 from OTHGMars/SDLFocus
Adds handlers for sdl focus events.
2018-12-09 15:36:00 -06:00
Areloch
121ca2ac97 Merge pull request #2258 from Areloch/OthroCameraFix
Fixes the front/back ortho views in the editors
2018-12-09 15:35:38 -06:00
Areloch
bb30de04f7 Merge branch 'development' into ConvexProxies 2018-12-09 15:34:12 -06:00
Areloch
900816fcd0 Merge pull request #2186 from rextimmy/physx_3_4
Physx 3.4
2018-12-09 15:28:43 -06:00
Areloch
cbc09534e4 Merge pull request #2248 from lukaspj/new-cinterface
New cinterface
2018-12-09 15:28:22 -06:00
Areloch
644f4071ed Merge pull request #2246 from lukaspj/update-cinterface
Update CInterface
2018-12-09 15:24:29 -06:00
Areloch
ad2493bef2 Merge pull request #2228 from lukaspj/fix-enginexmlexport
Make EngineAPI Export work properly
2018-12-09 14:52:27 -06:00
Areloch
6cf0c9e360 Merge branch 'development' into EngineAPI-Refactor 2018-12-09 14:48:50 -06:00
Areloch
81dcac1190 Initial WIP of the Modern Editor Layout 2018-12-08 12:50:31 -06:00
Areloch
1fc38d496f Added deletion tracking so when we delete a probe, it'll delete the prefilter/irrad bakes if they exist.
WIP of static cubemap bake(not working).
2018-12-07 00:30:08 -06:00
Azaezel
1766e291ba Merge branch 'PBR_PR' of https://github.com/Azaezel/Torque3D into PBR_PR 2018-12-05 10:55:37 -06:00
Azaezel
74ca8d106c retweaked filter for wether ot not to supress the zonelight culling methods when not in the diffuse pass 2018-12-05 10:55:29 -06:00
Tim Barnes
6937989d61 RGBA16F saving support for probes 2018-12-05 20:01:58 +10:00
Azaezel
bd742bbf75 registergloballights now taks a (by default on) cullSceneLights. off for reflection capture as that is presently acting up 2018-12-04 12:41:15 -06:00
Azaezel
0d915b31ae bump effective LOD (Level Of Detail) up during the capture phase to work arround things like trying to capture within a building with agressive optimization killing off the internals due to the smaller effective 'screen' being rendered. 2018-12-03 11:15:17 -06:00
Areloch
87efea9683 Merge pull request #2276 from Azaezel/terrainNormalNeener
filter out pixel shader normalmap calcs when not in deferred mode.
2018-12-02 10:50:52 -06:00
Azaezel
47c36ff59d THIS IS AN ABOMINATION UNTO THE CODEBASE AND SHOULD BE REMOVED THE SECOND WE CAN SORT OUT WHAT THE HECK IS GOING ON WITH THAT QSORT
stops flickering by itterating through the probe list twice. once looking for the skylight, then doing the rest
2018-11-28 18:12:12 -06:00
Azaezel
0974902cc8 put lerp back after verifying we were indeed getting values passed along. 2018-11-28 14:25:48 -06:00
Azaezel
4ef1a25610 put sphereical influence back via the new spherical attenuation methods, shifted the stateblock for probes specifically to max of either source or desitination alpha (though not entirely convinced that is in fact the case) 2018-11-28 12:00:06 -06:00
Tim Barnes
ab10cc0c87 timmy merge work 2018-11-28 17:51:52 +10:00
Azaezel
f1e584ca69 stateblocks: skylight uses one+(dest)zero. probes use (src)alpha+(dst(1.0-alpha) for a lerp blend. skylight writes out 0 alpha to ensure probes always win if even only a little. 2018-11-27 08:50:44 -06:00
Azaezel
65ab39a2d2 cast to pointer to pointer, not just pointer. (confused yet?) 2018-11-27 08:28:33 -06:00
Azaezel
0f0fc5279b missed mscore pasalong in .set 2018-11-27 08:03:04 -06:00
Azaezel
2c1a5f5647 qsort compilation, though still not quite correct 2018-11-25 12:35:35 -06:00
Azaezel
b2ca85b988 couple additinal places for scroe to be set 2018-11-25 12:35:02 -06:00