Commit graph

83 commits

Author SHA1 Message Date
Areloch
82881f0875 Merge branch 'PBR_ProbeArrayGLWIP' of https://github.com/Azaezel/Torque3D into development 2019-05-06 01:50:45 -05:00
Areloch
a928744b73 Merge branch 'AssimpWIP' of https://github.com/Areloch/Torque3D into development 2019-05-04 16:25:16 -05:00
Areloch
54b4d2eaaf
Merge pull request #2311 from Bloodknight/TerrainSnapOffsetZ
Snap to terrain Z offset.
2019-05-04 14:25:03 -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
8d85a56095 Failed to get the Scene changes for the Full template rolled up. This corrects that. 2019-03-31 22:12:38 -05:00
Areloch
852f82b8a5
Merge pull request #2000 from saxonschmauderer/patch-3
Fix for bug #1975
2019-03-31 14:45:15 -05:00
Areloch
7b01b42e15 Fixes a crash that comes from toggling the editors on and off, then clicking a menubar item
Fixes the menubar not resizing with the Window
Fixes the Editors Menubar item not being repopulated if the editor was closed/reopened
Fixes the Physics menubar item not appearing if the editor was closed/reopened
Fixes issue where findMenu could fail if the StringTableEntry happened to trip against a different capitalization.
2019-03-16 02:38:40 -05: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
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
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
Areloch
0f7641a282 WIP of assimp integration. 2019-02-08 16:25:43 -06:00
Areloch
a25f188200 Added propagated multibake mode.
Temporarily disabled Precapture post effect.
2018-10-27 02:21:46 -05:00
Areloch
2be32ad737 Implementation of reflection and skylight probes.
Moves lighting math to the diffuse/specular two-channel logic.
2018-09-16 22:15:07 -05:00
Areloch
ef5e3a5271 Core implementation of Physical Based Rendering. 2018-09-15 20:19:57 -05:00
Ratfish Studios
7af34fa432 Rearranges the right-mouse click popup menus for the world editor and gui editors to a) be organized more logically and b) be more flexible.
This also fixes some insecure behavior relying on %this value eval'ing, which has also been modified to be better.

Also fixes up some old calls for getting menubar menus by internal name, which is no longer supported, instead using the findMenu function call.
2018-05-08 00:30:15 -05:00
Areloch
eb5af65daf Removes the folder insert for the scripted object creator grid, which was causing a UI screwup making the scripted objects overlap and jumble up.
Also reorgs the popup controls to match what's in the BaseGame template's setup, which should fix editor popups.
2018-02-12 00:02:20 -06:00
Areloch
6a078b614f Prior commit had mangled files somehow. Fixed. 2017-11-12 11:42:44 -06:00
Areloch
253dd02096 Refactors the Popup menus and GuiMenuBars to remove unneeded duplication and platform-specific/deprecated code. 2017-11-11 01:21:48 -06:00
Areloch
b7870c33f8 Sets the default grid snap size to 1 rather than 10. 1 Seems like a more neutral default value, and also makes it match the displayed '1' in the UI interface as the default as well. 2017-09-17 18:24:44 -05:00
saxonschmauderer
632300740d Fix for bug #1975
The change was made to the function that is executed when entering the world editor. The boolean variable for first person shooter was set to true, since the camera always defaults to first person on entering the world editor. On setting this boolean variable to be true, the correct camera setting will always be displayed on entering the world editor. This does not affect other camera labels.
2017-04-30 16:39:05 -04:00
Azaezel
f1d315d51a adds an atGizmo option - for now drops a new object at a given singular mesh position. TODO: at the center of a given group. 2017-02-26 18:34:32 -06:00
Azaezel
4b1e2816a9 console spam cleanup 2017-02-22 16:51:50 -06:00
Azaezel
5e6826d9bd fixes snap-to-terrain toggle not displaying it's initially saved-off state. 2017-02-22 15:11:21 -06:00
Azaezel
ebdd441833 adds a useGroupCenter var/button to allow folks to use non-itterative snapping, and defaults it to do so (maintains prior functionality envelope) 2017-02-22 14:31:26 -06:00
Areloch
f8b650f7a1 Reworks the open/close functions of the gui and world editors so they will properly toggle between and clean up when closed. 2017-01-21 17:11:54 -06:00
Johxz
260f108693 added torque SimView tool 2016-12-28 15:25:55 -06:00
Areloch
eb2d3a908a Tweaked the naming convention to a) be more in line with the prefab creation functions, and b) avoid common artist terminologies that may lead to confusion on what it does. 2016-12-11 23:02:13 -06:00
Areloch
1d754cbbad Makes it so prefabs can correctly 'export to collada' by running the buildPolyList function on it's children.
Also adds a 'Bake Selection to Mesh' option to the tools menu in the editor to export the selected mesh to a collada file, and then replaces the selection with a TSStatic.
2016-12-10 17:27:27 -06:00
Areloch
15db25c0b8 Fixes minor issue where if a prefab was in one of the root directories rather than further in the heirarchy, it would incorrectly add a folder of the prefab's name that contains the prefab in the creator menu's prefabs tab. 2016-10-26 00:51:05 -05:00
Areloch
bb27535597 Fixes the Toggle Children Lock and Toggle Children Hidden options in the editor context popup menu. 2016-09-14 01:41:49 -05:00
Areloch
a2a4b1c5e3 more case sensitivity corrections. 2016-07-09 16:07:57 -05:00
Areloch
8424f99052 Some case sensitivity fixes. 2016-07-09 14:57:42 -05:00
Areloch
51049b6e8c Fixes the member-of-class check order to properly sort the context. Also fixes a bug with the spacer entries being filtered from the popup menu, which threw off the selection. 2016-07-06 00:46:16 -05:00
Areloch
3a73344abb Resolves merging-order conflicts for the vehicle physics PR, as well as correcting cmake not blacklisting the componentGroup files if TORQUE_EXPERIMENTAL_EC was flipped off. 2016-06-05 19:17:34 -05:00
Areloch
5122360552 Merge pull request #1587 from Areloch/ProfilerMenuTool
Profiler toggle and World Editor menu entry.
2016-05-31 23:32:31 -05:00
Areloch
fb7e4f92ef Adds in a GameObjects folder that lists all available game objects to the Scripted objects tab in the creator panel in the editor. 2016-05-25 22:16:24 -05:00
Areloch
9d47830a8b Merge branch 'development' of https://github.com/GarageGames/Torque3D into development 2016-05-24 20:09:53 -05:00
John3
4bb63f277e change pipe to underscore and fix prefabs assets 2016-05-21 15:10:35 -05:00
Areloch
6517b86491 Editor integration for creation of entities and GameObjects. 2016-05-21 11:47:10 -05:00
John3
7ae1d3d996 Bug space folder in scene tree.
Fix by David Robert Pemberton
https://www.garagegames.com/community/blogs/view/22295

You can see the folder "soldier actor"
<img src="http://i.imgur.com/8XSWrrF.png"/>
2016-05-20 17:04:56 -05:00
Areloch
25d2fd877b Makes the profiler pop-up act on a toggle, and also adds an entry into the World Editor's Tool menu to easily activate it. 2016-04-20 01:06:31 -05:00
Areloch
587ab6a39e Adds 2 fields to expose the net simulation functionality more readily to the NetGraph GUI.
Also added a Tools option to the World Editor menubar, with the NetGraph as the first option to make it easier to activate the NetGraph in the editor.
2016-04-20 00:46:41 -05:00
Azaezel
5b5c6b9907 Deferred Shading
Phase 1: buffers
engine:
provides the following hooks and methods
A) render target "color", and "matinfo". these correspond to texture[0] = "#color";  texture[2] = "#matinfo"; entries in scripts
B) utilizes the independentMrtBitDepth method added GarageGames#857 to set color to an 8RGBA if cards support it
C) adds an RenderPrePassMgr::_initShaders() method to support void RenderPrePassMgr::clearBuffers(). This operates as a pseudo-postfx by rendering a veiwspace plane which fills the screen, then calls a shader which fills both the introduced rendertarget buffers and the prepass buffer to relevant defaults (white with full alpha for prepass, black with full alpha for color and material respectively)

script:
\game\tools\worldEditor\main.cs adds additional hooks similar to GarageGames#863 for colorbuffer, specular map, and backbuffer display
\game\core\scripts\client\lighting\advanced\deferredShading.cs adds the clearbuffer shader, visualizers, and the ShaderData( AL_DeferredShader )  +  PostEffect( AL_DeferredShading ) which combine the various buffers into the output which reaches the screen under normal conditions, as well as the extended debug visualizers.
again, note the lines

   texture[0] = "#color";
   texture[1] = "#lightinfo";
   texture[2] = "#matinfo";
   target = "$backBuffer";
in particular for the core tie-in.

shader:
\game\shaders\common\lighting\advanced\deferredColorShaderP.hlsl
\game\shaders\common\lighting\advanced\gl\deferredClearGBufferP.glsl
the previously mentioned shaders which clear the buffers to specified colors

\game\shaders\common\lighting\advanced\deferredShadingP.hlsl
\game\shaders\common\lighting\advanced\gl\deferredShadingP.glsl
the tie-in shaders

the rest are visualizers

purpose: to expose methodology that allows one to render color, lighting and material information such as specular and gloss which effect the result of both when combined

long term intent: the previous prepass lighting methodology while serviceable, unfortunately had the side effect of throwing out raw color information required by more modern pipelines and methodologies. This preserves that data while also allowing the manipulation to occur only on a screenspace (or reflected speudo-screenspace) basis.
2016-02-16 01:50:58 -06:00
Areloch
a90eb9762b Re-submission of the Volumetric Fog PR, with cleanup. 2015-12-01 00:10:13 -06:00
Areloch
242d317a31 Adds a debug visualization mode for the active physics world.
Allows you to see the active collision info for the physics engine.
2015-08-13 23:38:59 -05:00
Daniel Buckmaster
b24bdfbc8b Merge pull request #1374 from Azaezel/PSSMDebugRender
"AL: PSSM Cascade Viz" tool-button
2015-07-28 14:45:50 +10:00
Azaezel
ac39253b98 "AL: PSSM Cascade Viz" tool-button
Adds a debug toggle for the script-exposed global found c152ae86f3/Engine/source/lighting/advanced/advancedLightBinManager.cpp (L168)
2015-07-27 23:00:54 -05:00
Daniel Buckmaster
b911768adc Add RibbonData::create functions to the world editor. 2015-07-25 11:44:57 +10:00
Daniel Buckmaster
d268199f4f Merge pull request #1339 from Areloch/Remove_Demo_Mode_Checks
Remove demo and trial checks
2015-07-23 20:33:31 +10:00
Areloch
0d6768d57b Removing stuff pertaining to demo modes and trials, as they're redundant now. 2015-07-01 23:36:56 -05:00