Commit graph

2639 commits

Author SHA1 Message Date
Azaezel
9c6635e4c0 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
90a93bd17d wireframe capsule set to the contents of the solid capsule for corrections and backwards compatibility 2019-02-19 16:30:39 -06:00
Azaezel
2ac7d55be0 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
077325c0ab swap over to wireframe, plus a few misc cleanups 2019-02-19 13:58:29 -06:00
Azaezel
0bc332374f corrects a parity flaw between wireframe and non wireframe box display 2019-02-19 13:13:23 -06:00
Azaezel
b9176d22fa scale reflection properly 2019-02-19 09:38:34 -06:00
Azaezel
5c356519e4 seperated offset from position (we pass the net to the shader for use in the reflection box), and added a scalar (also only used in the reflection box). maked both as probeRef to denote reflection parameters. 2019-02-19 08:58:02 -06:00
Azaezel
04b3509e6c hook editor displays back up 2019-02-19 08:55:55 -06:00
Areloch
dde21794c1 Correct stateblock settings to display probes more correctly without crushing other forward elements. 2019-02-18 00:43:21 -06:00
Areloch
cf1d22ba1b Corrected the blending logic somewhat, added visualization modes for spec/diffuse probe influences, attenuation and contribution. 2019-02-17 03:47:40 -06:00
Azaezel
5184e4b9e8 kill off a couple extraneous sets 2019-02-15 20:31:59 -06:00
Areloch
b52799bbce Finished current cleanup/reorg.
Temporarily disabled logic for forward render of probes to avoid data mangle. TODO: fix up forward once deferred math is locked in
Split probe modes out into distinct environmental probe objects
Removed the probes from tracking their own baked cubemap file paths and instead have a pref store it
Removed old probe shaders and materials that aren't used now.
Fixed mLastConst memory leak by removing nono line.
2019-02-14 00:35:22 -06:00
Areloch
9ec7eb999d Further cleanup, proper hook-in of CubeReflector for bake capture.
Shifted update of probe data to be triggered by probe changes.
Pack probes into the data arrays forward-first instead of keeping strict indicies.
todo: move bake to probeManager, clean up old/commented code, remove old probeMaterial stuff
2019-02-13 16:56:28 -06:00
OTHGMars
ee6cabb76a Switches to absolute position for mouse tracking when the platform cursor is visible. 2019-02-13 14:12:12 -05:00
Areloch
b0c89dddff WIP of adjusting the reflection probe's bake to utilize the ReflectionManager and CubeReflector instead of duplicating the capture code. 2019-02-13 00:37:50 -06:00
Areloch
34abe1b835 Updated the PostFX ability to setShaderConsts and cubetextures for probes 2019-02-12 01:10:30 -06:00
Marc Chapman
0ffb99e7d4 Adds the capability to add a small offset to the Z value of items being told to snap to terrain 2019-02-12 03:14:01 +00:00
Azaezel
aeb43432fa set gl vertcolor mapping to bgra format, the same as we do for stateblocks 2019-02-11 07:42:31 -06:00
Areloch
a1b281cc5f Ongoing PostFX org rework. 2019-02-11 00:17:53 -06:00
Areloch
0f7641a282 WIP of assimp integration. 2019-02-08 16:25:43 -06:00
Areloch
ecad33c598 Org rework and postFX-setup WIP 2019-02-08 01:35:35 -06:00
Azaezel
9a40e82ced set the alignedarray sizes to maxprobes, reguardless of actual probe count 2019-02-07 09:55:52 -06:00
Azaezel
66937ee47a duplication cleanups 2019-02-07 09:46:54 -06:00
Azaezel
a3e4ce5146 cut down on some of that per-frame allocation via prepping our vector 'registers' during the constructor 2019-02-07 09:34:23 -06:00
Azaezel
7529864942 remove push_back uses in favor of consistent [i], fill probe data with defaults before overriding to ensure no garbage data is getting referenced. 2019-02-07 08:05:39 -06:00
suncaller
5e8e7e7bf8 Clean up redundant variables 2019-02-06 15:03:06 -05:00
Azaezel
2e485c4946 conversionwork courtessy of jeff. seeems float3f aligned arrays were nonfuncntional, so shifts a few over to float4s 2019-02-06 10:59:36 -06:00
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