Areloch
251f24581e
Merge pull request #2299 from Bloodknight/SQLiteConsoleRefactor
...
Sqlite Console refactor,
2019-02-20 23:51:56 -06:00
Areloch
99e3fa2156
Merge pull request #2305 from Azaezel/copyCleanup
...
corrects a copy-corruption flaw with GuiSwatchButtonCtrl::onMouseDragged
2019-02-20 23:12:58 -06:00
Azaezel
c1bf59bf07
destructor code+ removed a crash-causing redundancy in onRemove
2019-02-20 16:59:58 -06:00
Azaezel
727dbbfd8d
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
46624cc95a
wireframe capsule set to the contents of the solid capsule for corrections and backwards compatibility
2019-02-19 16:30:39 -06:00
Azaezel
110d815b39
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
cf50803e72
swap over to wireframe, plus a few misc cleanups
2019-02-19 13:58:29 -06:00
Azaezel
05f8d8b5f1
corrects a parity flaw between wireframe and non wireframe box display
2019-02-19 13:13:23 -06:00
Azaezel
309d518249
scale reflection properly
2019-02-19 09:38:34 -06:00
Azaezel
5bce2d0904
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
e4ddfcfb01
hook editor displays back up
2019-02-19 08:55:55 -06:00
Areloch
87e9d3edbd
Correct stateblock settings to display probes more correctly without crushing other forward elements.
2019-02-18 00:43:21 -06:00
Areloch
b754c022ba
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
8d08ab2370
kill off a couple extraneous sets
2019-02-15 20:31:59 -06:00
Areloch
788e265477
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
58e3349286
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
3da245134d
Switches to absolute position for mouse tracking when the platform cursor is visible.
2019-02-13 14:12:12 -05:00
Areloch
050f1e226a
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
fd8840ff53
Updated the PostFX ability to setShaderConsts and cubetextures for probes
2019-02-12 01:10:30 -06:00
Marc Chapman
c92c508a5d
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
b50f72b109
set gl vertcolor mapping to bgra format, the same as we do for stateblocks
2019-02-11 07:42:31 -06:00
Areloch
64db2b1d15
Ongoing PostFX org rework.
2019-02-11 00:17:53 -06:00
Areloch
bf170ffbca
WIP of assimp integration.
2019-02-08 16:25:43 -06:00
Areloch
b221b312d2
Org rework and postFX-setup WIP
2019-02-08 01:35:35 -06:00
Azaezel
72acec0a3f
set the alignedarray sizes to maxprobes, reguardless of actual probe count
2019-02-07 09:55:52 -06:00
Azaezel
f031ee9e39
duplication cleanups
2019-02-07 09:46:54 -06:00
Azaezel
0caac1a28c
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
4aa371cea2
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
8a7c09c8fe
Clean up redundant variables
2019-02-06 15:03:06 -05:00
Azaezel
7837576de7
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
1036097eca
Merge branch 'gg-development' into SQLiteConsoleRefactor
2019-02-04 18:02:30 +00:00
Areloch
847d58a967
Progress in getting array data to comply.
2019-02-02 23:28:51 -06:00
suncaller
31d0eb16f8
Clean up MSVC warning [C4312] conversion from type to type * of greater size
2019-02-02 23:09:55 -05:00
suncaller
265e64f6fc
Clean up MSVC warning [C4305]: truncation from 'double' to 'F32'
2019-02-02 23:07:44 -05:00
Areloch
32c7f2c7a7
Merge pull request #2286 from Azaezel/NFD_Update
...
Nfd update
2019-02-01 19:34:38 -06:00
Azaezel
2eb58e4cb7
portwork from jeff to use farFrustumQuad for the vertex shader
2019-01-31 13:00:52 -06:00
Areloch
b03e7a79b7
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
0baa410619
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
3efbdbf9e1
Shifts the verts used to match the fullscreen quad setup of vector light, utilizing FarFrustuQuadVerts
2019-01-30 13:52:59 -06:00
Azaezel
26ee0d986f
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
1dfd130d85
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
e7c3085d5f
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
7a8dd96808
should only need to set the brdf texture the once
2019-01-28 01:36:17 -06:00
Azaezel
1607f58bc4
typofix for bbMinArray, cubemap array lookups for irradiance and spec
2019-01-28 00:31:01 -06:00
Areloch
2abdef7459
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
26a89882c7
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
a77eb37f9a
Merge pull request #2292 from Azaezel/highlightHax
...
afxRenderHighlightMgr: account for hardware skinning
2019-01-21 15:18:19 -06:00
Areloch
8717c6a376
Merge pull request #2300 from OTHGMars/SDL_Joystick2
...
Sdl joystick2
2019-01-21 15:17:31 -06:00
Areloch
72af45ef69
Merge pull request #2294 from OTHGMars/GuiInputCtrl
...
Adds features to GuiInputCtrl
2019-01-21 15:14:37 -06:00
Areloch
5b7e2edb66
WIP hook-in of the cubemap array.
...
Also inversed probe transforms to make them correct.
2019-01-21 01:50:13 -06:00