Areloch
17cec11b97
Added refactor of Editor Settings window
...
Various fixes for asset handling.
WIP of crash tracking
2019-06-03 02:47:30 -05:00
Areloch
ae857faae2
Adds test shapes of Kork and SpaceOrc
...
Sidestep of memleak from CSF at the moment
Minor fixes and corrections with asset importing and loose files
WIP of updated options menu
2019-05-28 17:24:29 -05:00
Areloch
98c4606b3c
Removed test custom shader bindings until memleak is corrected.
2019-05-27 13:06:15 -05:00
Areloch
dfa0f30572
Merge branch 'alpha40Macwork' of https://github.com/Azaezel/Torque3D into Preview4_0
2019-05-25 01:12:20 -05:00
Brian Roberts
f79265089a
mac compilation correction - casting flaw
2019-05-21 19:32:17 -05:00
AzaezelX
76dbedb02f
reskinning fixes
...
1) falls back to assuming the word "base" is what is to be replaced if no "oldSkin = newSkin" entry exists
2) falls back to *using* base if the entry is left entriely blank
2019-05-21 12:03:19 -05:00
Areloch
ebb51bb178
Catch the template files up and add the improved convex editor bits.
2019-05-19 21:30:45 -05:00
Areloch
3697737498
Merge branch 'ModernEditorLayoutWIP' of https://github.com/Areloch/Torque3D into development
2019-05-13 00:28:23 -05:00
Areloch
c283295f22
Merge branch 'CustomShaderFeatures' of https://github.com/Areloch/Torque3D into development
2019-05-11 21:53:08 -05:00
Areloch
3fa7a0d4fa
Various fixes
2019-05-11 21:42:27 -05:00
Areloch
e83ec69292
Merge branch 'PBR_ProbeArrayGLWIP' of https://github.com/Azaezel/Torque3D into development
2019-05-06 01:50:45 -05:00
Areloch
82c74b4511
Merge branch 'VerveMergeWIP' of https://github.com/Areloch/Torque3D into development
2019-05-06 01:49:58 -05:00
Areloch
bac0b2e8df
Merge branch 'GameObjectExamples' of https://github.com/Areloch/Torque3D into development
2019-05-04 16:25:00 -05:00
Areloch
7f37aced90
Merge branch 'ExpandsComponents' of https://github.com/Areloch/Torque3D into development
2019-05-04 16:09:09 -05:00
Areloch
ddfc416418
Expands/Cleans up a lot of the asset functionality, including management, file association, and creation/importing
2019-05-04 11:49:42 -05:00
AzaezelX
dd1470202d
Merge branch 'development' of https://github.com/GarageGames/Torque3D into PBR_ProbeArrayGLWIP
...
# Conflicts:
# Engine/source/gfx/D3D11/gfxD3D11Device.cpp
# Engine/source/lighting/lightManager.cpp
# Templates/Full/game/levels/Empty Room.mis
# Templates/Full/game/levels/Empty Terrain.mis
2019-05-01 23:18:31 -05:00
Areloch
59b6e67ecf
Merge pull request #2043 from John3/toolShapes_3
...
cleaning the modules
2019-03-31 14:41:35 -05:00
Areloch
fc93bc229c
Merge pull request #2339 from Areloch/MountedCollisionsFix
...
Adds logic to temporarily disable collisions of mounted objects on Players
2019-03-31 12:31:57 -05:00
Areloch
c7b542a875
Merge pull request #2331 from Bloodknight/PR_PlayerZRotation
...
Set contrsaints for Player Z rotation
2019-03-31 03:47:41 -05:00
Areloch
e2b194182c
Undid debug work, shifted logic over entirely to utilize the updateTexture methods. Refactored probe init'ing so they'll load correctly without nudging, properly sequestered skylights from the probe array and updated the shader to contain az's changes as well as skylight and probe array changes.
2019-03-25 23:17:53 -05:00
Areloch
1627cbabe6
ongoing WIP to sort out init'ing issues as well as correcting values so the probes actually correctly update data into the arrays
...
Additional sanity checks on the updateTexture calls added by timmy
2019-03-25 00:06:08 -05:00
Areloch
26471aaa77
WIP of timmy's changes merged in. Not properly initializing the probes/array slots just yet.
2019-03-24 18:18:44 -05:00
Azaezel
ba8948a5b1
hook up attenuation value. todo: sort networkjing properly
2019-03-21 23:47:01 -05:00
Areloch
2bf67f7fa5
Corrections to make it use the correct transform, as well as passing along the scale as our extents in the bbMax.
...
Adjusts the box influence logic to try the bsf method.
2019-03-18 00:14:06 -05:00
Areloch
87ef9bf15e
Adds logic to temporarily disable collisions of mounted objects on Players so you don't try colliding with things that are mounted to you when moving.
2019-03-16 10:48:00 -05:00
Areloch
23182eb2a1
Adds some in-progress gameObject recreation of various legacy game classes, such as PlayerObject, AIPlayerObject, Sound Emitter and Static Shape.
2019-03-04 21:44:00 -06:00
Areloch
70d85d2241
Begun hook-in of skylight into array
...
Reworked the reflection reference offset/scale behavior to re-integrate into the editor interface via button(and work)
Hid irrelevent fields from given probe types.
Filter out editPosOffset and bake button fields from being saved to avoid weird loading behavior
2019-03-02 04:48:07 -06:00
Marc Chapman
1fb0492975
Set contrsaints for Player Z rotation
2019-02-26 14:42:09 +00:00
Areloch
34d05ff16f
Updates to various components, added a few new ones.
2019-02-24 01:50:38 -06:00
Areloch
9bf8337e4a
Initial implementation of the Scene object for handling scenes/levels in a more consistent and deliberate way.
2019-02-23 15:55:28 -06:00
Areloch
775ca57047
Merge pull request #2307 from Azaezel/highlightHax
...
nextfreemask does nothing for proximity mines as there are no subclas…
2019-02-21 00:08:57 -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
cf50803e72
swap over to wireframe, plus a few misc cleanups
2019-02-19 13:58:29 -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
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
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
suncaller
8a7c09c8fe
Clean up redundant variables
2019-02-06 15:03:06 -05:00
suncaller
31d0eb16f8
Clean up MSVC warning [C4312] conversion from type to type * of greater size
2019-02-02 23:09:55 -05: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
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
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
Azaezel
1eed979a9c
Merge branch 'method_Unmangle' into PBR_PR
2018-12-12 14:54:22 -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
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
6cf0c9e360
Merge branch 'development' into EngineAPI-Refactor
2018-12-09 14:48:50 -06:00
