TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-14 12:13:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
3899 commits 5 branches 33 tags 958 MiB
Commit graph

674 commits

Author SHA1 Message Date
AzaezelX
e7ee94428e Revert "Updated SDL, Bullet and OpenAL soft libs" 
This reverts commit 370161cfb1.
 2019-07-08 09:49:44 -05:00
Areloch
370161cfb1 Updated SDL, Bullet and OpenAL soft libs 
Fixed case sensitivity problem
Fixed clang compiler problem with having the class namespace used in an inline for the == operator
Tweaked some theme stuff to be more consistent.
Added initial test of no-pie for linux
test sidestep of getTexCoord in shadergen hlsl feature so we don't assert when getting the terrain's shaderstuffs(which uses float3 instead of normal float2)
 2019-07-07 02:43:49 -05:00
Areloch
747113bfc7
Merge pull request #56 from Azaezel/alpha40_4_entityComponentCleanup 
Alpha40 4 entity component cleanup
 2019-06-29 02:43:46 -05:00
Areloch
226529fd1b Added ability to pass ints to post effect shader consts 
Reorg'd probe init to flow better and be more robust on load
Cleaned up various parts of the probe render manager to be more stable
Fixed issue with crash on release due to numProbe in loops being 0
Updated glsl probe array shader
Beginning of rework of editor settings
Beginning of conversion of asset import config to similar system as editor settings
 2019-06-13 00:37:12 -05:00
Areloch
bb9e5ce313 WIP of shifting the skylight cubemap to be packed into the cubemap array 2019-06-05 01:04:47 -05:00
Areloch
f433cf4a0d Various fixes 
Separated baked cubemap load/processing logic into a separate function for clarity
various corrections for when fields change so it properly notifies down to the client
Fixed enable flag logic to actually work
Fixed skylight enable flag so it properly disables if flipped off
 2019-06-05 00:07:46 -05:00
Areloch
6a654a9c35 Reorg of the probe initialization/update code to streamline parts of it, and make it flow more obviously 
Added some initial asset stuffs for Das Boot for building out a better testing level.
 2019-06-04 00:21:52 -05:00
AzaezelX
9e8cf93bf3 component vector cleanup cleanup 2019-06-03 15:12:56 -05:00
Areloch
ff871f37e3 Added refactor of Editor Settings window 
Various fixes for asset handling.
WIP of crash tracking
 2019-06-03 02:47:30 -05:00
Areloch
6073bc5551 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
6eb997c449 Removed test custom shader bindings until memleak is corrected. 2019-05-27 13:06:15 -05:00
Areloch
729391eeeb Merge branch 'alpha40Macwork' of https://github.com/Azaezel/Torque3D into Preview4_0 2019-05-25 01:12:20 -05:00
Brian Roberts
da492a589e mac compilation correction - casting flaw 2019-05-21 19:32:17 -05:00
AzaezelX
a8380744d8 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
f5bf70b584 Catch the template files up and add the improved convex editor bits. 2019-05-19 21:30:45 -05:00
Areloch
ae11d3548d Merge branch 'ModernEditorLayoutWIP' of https://github.com/Areloch/Torque3D into development 2019-05-13 00:28:23 -05:00
Areloch
741fcaed5a Merge branch 'CustomShaderFeatures' of https://github.com/Areloch/Torque3D into development 2019-05-11 21:53:08 -05:00
Areloch
ad5f583893 Various fixes 2019-05-11 21:42:27 -05:00
Areloch
82881f0875 Merge branch 'PBR_ProbeArrayGLWIP' of https://github.com/Azaezel/Torque3D into development 2019-05-06 01:50:45 -05:00
Areloch
00b958aff9 Merge branch 'VerveMergeWIP' of https://github.com/Areloch/Torque3D into development 2019-05-06 01:49:58 -05:00
Areloch
471254ac0c Merge branch 'GameObjectExamples' of https://github.com/Areloch/Torque3D into development 2019-05-04 16:25:00 -05:00
Areloch
b4a744a366 Merge branch 'ExpandsComponents' of https://github.com/Areloch/Torque3D into development 2019-05-04 16:09:09 -05:00
Areloch
4422082035 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
97ec99f704 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
b759bde0c0
Merge pull request #2043 from John3/toolShapes_3 
cleaning the modules
 2019-03-31 14:41:35 -05:00
Areloch
0dfad8f072
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
5cefefd55b
Merge pull request #2331 from Bloodknight/PR_PlayerZRotation 
Set contrsaints for Player Z rotation
 2019-03-31 03:47:41 -05:00
Areloch
4c959e1fa1 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
e241cbc7c9 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
399088d09e 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
ead78ec588 hook up attenuation value. todo: sort networkjing properly 2019-03-21 23:47:01 -05:00
Areloch
0b7579b42e 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
6f5c215d9e 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
f3e04751b6 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
8f94d09e6e 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
461e2b6534 Set contrsaints for Player Z rotation 2019-02-26 14:42:09 +00:00
Areloch
dac8d6e1fd Updates to various components, added a few new ones. 2019-02-24 01:50:38 -06:00
Areloch
1c2f90a190 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
e0627973fb
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
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
077325c0ab swap over to wireframe, plus a few misc cleanups 2019-02-19 13:58:29 -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
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
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
suncaller
5e8e7e7bf8 Clean up redundant variables 2019-02-06 15:03:06 -05:00
suncaller
7f7e402c42 Clean up MSVC warning [C4312] conversion from type to type * of greater size 2019-02-02 23:09:55 -05:00