Commit graph

2662 commits

Author SHA1 Message Date
Marc Chapman
5e478291fb Merge branch 'gg-development' into SQLiteConsoleRefactor 2019-02-04 18:02:30 +00:00
Areloch
a8707b2410 Progress in getting array data to comply. 2019-02-02 23:28:51 -06:00
suncaller
7f7e402c42 Clean up MSVC warning [C4312] conversion from type to type * of greater size 2019-02-02 23:09:55 -05:00
suncaller
fcb906d598 Clean up MSVC warning [C4305]: truncation from 'double' to 'F32' 2019-02-02 23:07:44 -05:00
Azaezel
e8c2912498 portwork from jeff to use farFrustumQuad for the vertex shader 2019-01-31 13:00:52 -06:00
Areloch
a0b9c8cfd6 Broke it down to work with a single probe for confirmation of general math and behavior. 2019-01-31 11:44:09 -06:00
Azaezel
86947228d5 nextfreemask does nothing for proximity mines as there are no subclasses on this chain, but does bump it's enum value over the limit with the new addition to sceneobject. so killed it. 2019-01-31 06:45:10 -06:00
Areloch
54a64c0d82 Shifts the verts used to match the fullscreen quad setup of vector light, utilizing FarFrustuQuadVerts 2019-01-30 13:52:59 -06:00
Azaezel
4a5a071075 reference cleanups:
1) kill off extraneous cubemap and irradiancecubemap source-to-shader variable ties
2) use the cubemap arrays (renderdoc for instance doesn't list them as being input at all if they're never used)
3) use the vert file
2019-01-30 06:29:39 -06:00
Azaezel
6e09ff70d7 explicitly bound the namedtexttargets to input slots. shifted brdf slot on up to 3 (from 5) to cluster flat vs array entries. though it does not appear at time of writing that that is in fact binding... 2019-01-28 22:10:57 -06:00
Azaezel
951e302cb1 corrects a copy-corruption flaw with GuiSwatchButtonCtrl::onMouseDragged
pretty sure the offending leak-line creeps in with
 561f010f2e/Templates/BaseGame/game/tools/base/utils/swatchButtons.ed.cs (L34)
comparative release/debug results in
string gridBitmap = "\c0"
vs
string gridBitmap = "ic\c1Gl\c0"
and the relavent initpersistfields entry of TypeString points to
561f010f2e/Engine/source/console/consoleTypes.h (L71)
which is likely causing malformation
2019-01-28 21:04:51 -06:00
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
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
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
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
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
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
Areloch
6a0ef46c05
Merge pull request #2282 from OTHGMars/CanvasResize
Fixes CanvasSizeChangeSignal and Canvas::onResize()  under SDL
2019-01-06 04:51:18 -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
a5bdbd47a2 corrects compilation errors on mac 2019-01-01 13:11:46 -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
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
Areloch
18c054f3b1
Merge pull request #2284 from OTHGMars/SDLMonitor
Fills in monitor functions in PlatformWindowManagerSDL
2018-12-09 15:36:15 -06:00
Areloch
9303fa8089
Merge pull request #2283 from OTHGMars/SDLFocus
Adds handlers for sdl focus events.
2018-12-09 15:36:00 -06:00
Areloch
738e2d5088
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
8c2e27057e
Merge branch 'development' into ConvexProxies 2018-12-09 15:34:12 -06:00
Areloch
7fdd60a9b6
Merge pull request #2186 from rextimmy/physx_3_4
Physx 3.4
2018-12-09 15:28:43 -06:00
Areloch
9cd149102d
Merge pull request #2248 from lukaspj/new-cinterface
New cinterface
2018-12-09 15:28:22 -06:00
Areloch
e29f5b5001
Merge pull request #2246 from lukaspj/update-cinterface
Update CInterface
2018-12-09 15:24:29 -06:00
Areloch
e0591ddd2f
Merge pull request #2228 from lukaspj/fix-enginexmlexport
Make EngineAPI Export work properly
2018-12-09 14:52:27 -06:00