Commit graph

3911 commits

Author SHA1 Message Date
Azaezel
c590c2df2b should only need to set the brdf texture the once 2019-01-28 01:36:17 -06:00
Azaezel
ce4409db17 typofix for bbMinArray, cubemap array lookups for irradiance and spec 2019-01-28 00:31:01 -06:00
Areloch
eedf31b6ad Collapse the ProbeManager into RenderProbeMgr to simplify the probe management/rendering behavior(as the game sim doesn't require simple access to probe data, unlike lights) 2019-01-26 02:05:18 -06:00
Azaezel
d7b36ad33d probe-array specific vert shader. may be able to re-use the postfx one, but either way, definately shouldn't be trying to calc from the convex geo one. 2019-01-22 02:25:57 -06:00
Azaezel
e1c72b5aa2 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
Areloch
a469f2b0a5
Merge pull request #2292 from Azaezel/highlightHax
afxRenderHighlightMgr: account for hardware skinning
2019-01-21 15:18:19 -06:00
Areloch
77a316079a
Merge pull request #2300 from OTHGMars/SDL_Joystick2
Sdl joystick2
2019-01-21 15:17:31 -06:00
Areloch
e0cf7b8702
Merge pull request #2294 from OTHGMars/GuiInputCtrl
Adds features to GuiInputCtrl
2019-01-21 15:14:37 -06:00
Areloch
0e5a975df5
Merge pull request #2296 from CouleeApps/patch-1
Fix SDL Input::getKeyCode on software keyboard layouts
2019-01-21 15:14:19 -06:00
Areloch
d6ae28b58e WIP hook-in of the cubemap array.
Also inversed probe transforms to make them correct.
2019-01-21 01:50:13 -06:00
Areloch
f5da79b39f 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
Azaezel
1f38bb6d2d adds a #define TORQUE_TEXCUBEARRAYLOD(tex,coords,id,lod) texture_##tex.SampleLevel(tex,float4(coords.xyz,id),lod) macro. puts everything in a compilable state 2019-01-16 12:55:11 -06:00
Azaezel
69e47a4b5c swap methods on over to surface+id ref for uniform arrays 2019-01-16 03:46:37 -06:00
Azaezel
ec5b795500 partial compilation fixes 2019-01-15 19:24:13 -06:00
Azaezel
0fa3568e07 'frontend' wipwork for the probe array. takes up to 50 probes, calcs a weighted blend, and displays them all in a batch. 2019-01-14 16:31:26 -06:00
OTHGMars
4fd6dfeaf0 Adds support for SDL joystick and game controllers. 2019-01-10 20:09:05 -05:00
OTHGMars
bc8796773c Adds event codes for 2 POV hat masks, 2 trackballs and the guide button. 2019-01-10 20:06:54 -05:00
OTHGMars
2f3b3e87c2 Updated to work without keyboard event refactor. 2019-01-10 17:44:30 -05:00
Marc Chapman
9291bc6105 Sqlite Console refactor, also rename param to make tooltip function more helpful 2019-01-10 21:31:17 +00:00
troido
30d236cfb2 travis test whether compilation works on mac and linux
This checks both gcc and clang on linux, but only clang on mac

Becuse there are so many debug warnings they are supressed in a very hacky way:
Make is run first with error output ignored.
Then an incremental build is run which has the error output, but will only build the files that errored the first time (and will error again).
If anyone knows a better way to ignore the warnings that would be great.
2019-01-10 12:39:27 +01:00
Glenn Smith
2739d8713a
Really, github? 2019-01-10 04:18:35 -05:00
Glenn Smith
c256ebdb5c
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
1acd8eb7c3
Merge pull request #2287 from Azaezel/macUpdates2
corrects compilation errors on mac
2019-01-09 09:42:19 -06:00
Marc Chapman
e2348f3d98 Add a .editorconfig file 2019-01-08 19:35:02 +00:00
Azaezel
8573e28e79 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
edbbeaf008 Probe Array WIP 2019-01-07 20:34:19 -06:00
Brian Roberts
d640eeb228
Update afxRenderHighlightMgr.cpp 2019-01-07 11:41:17 -06:00
Azaezel
8d770c5609 afxRenderHighlightMgr: account for hardware skinning 2019-01-07 06:22:24 -06:00
Azaezel
aebbb1e3d8 tabspace 2019-01-06 15:50:19 -06:00
Azaezel
831e9db5a5 constant consistency creates continuums 2019-01-06 15:42:18 -06:00
Azaezel
95eb2fc626 zenity backend file filter fix 2019-01-06 14:24:33 -06:00
Areloch
6a0ef46c05
Merge pull request #2282 from OTHGMars/CanvasResize
Fixes CanvasSizeChangeSignal and Canvas::onResize()  under SDL
2019-01-06 04:51:18 -06:00
Areloch
480818795f
Merge pull request #2288 from Azaezel/unixUpdates
corrects compilation errors on non-mac unix derivatives
2019-01-06 02:12:45 -06:00
Azaezel
e4206c4ae3 no message 2019-01-02 17:53:17 -06:00
Azaezel
7695c56f08 use the newer c_controlInterface file 2019-01-02 17:52:20 -06:00
Azaezel
9d59caae35 corrects compilation errors on non-mac unix derivatives 2019-01-01 15:41:59 -06:00
Azaezel
8304168365 linux compilation, defaults to using the older gtk solution till more folks have a chance to beat up the zenity one. 2019-01-01 15:40:44 -06:00
Azaezel
a5bdbd47a2 corrects compilation errors on mac 2019-01-01 13:11:46 -06:00
Azaezel
989662774e blacklist updated to filter out the new zenity backend when on windows. likely need to do the same on mac and potentially resolve conflicts on linux 2019-01-01 11:00:05 -06:00
Azaezel
b5815bde22 NFD updated to 1.1.4 2019-01-01 10:58:53 -06:00
Areloch
6a6f452dad
Merge pull request #2285 from Azaezel/method_Unmangle
corrects a pair of conversions. one object oriented, one not.
2018-12-13 09:38:59 -06:00
Azaezel
85d8c7a2de console conversion 2018-12-12 16:01:26 -06:00
Azaezel
8e534dd0c9 Merge branch 'method_Unmangle' into PBR_PR 2018-12-12 14:54:22 -06:00
Azaezel
450080de6a corrects a pair of conversions. one object oriented, one not. 2018-12-12 14:52:14 -06:00
Azaezel
b09a9938f5 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
a2c27c398b Merge branch 'PBR_PR' into PBR_PR_GLWIP 2018-12-10 01:19:41 -06:00
Areloch
a4770c19b5 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
03690e2169 vectorlight ssao macro fix, z=w trick gl side for cloudlayer variants 2018-12-09 19:48:18 -06:00
Azaezel
db84f5954e 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
Azaezel
652d041af3 skylight conversion 2018-12-09 16:57:14 -06:00