Commit graph

50 commits

Author SHA1 Message Date
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
Daniel Buckmaster
009bff7f88 Merge pull request #863 from Azaezel/GlowbufferVisualizer
glow buffer debug visualiser
2015-07-01 22:24:16 +10:00
Daniel Buckmaster
7ab6731f51 Merge branch 'development' into walkabout
Conflicts:
	Templates/Empty/game/tools/worldEditor/scripts/editors/creator.ed.cs
	Templates/Full/game/tools/worldEditor/scripts/editors/creator.ed.cs
2015-01-02 14:45:20 +11:00
Azaezel
c6cdfafe4e cleaned up variant of https://github.com/GarageGames/Torque3D/pull/768 alterations: opengl support, in-shader bug-reporting, direction vector fit to material slider-bar. 2014-12-21 14:07:42 -06:00
Daniel Buckmaster
61e106251d Made toolbar resize intelligently. 2014-12-15 11:22:44 +11:00
LuisAntonRebollo
7962eef7dd Revert - Merge pull request #962 Fix OpenGL new terrain blend
from BeamNG/fix_opengl_new_terrain_blend (reverted from commit a0d5dc25cd)
2014-12-03 21:54:57 +01:00
LuisAntonRebollo
ff83e8c209 Merge remote-tracking branch 'GG-Github/development' into fix_opengl_new_terrain_blend 2014-11-30 04:47:38 +01:00
Daniel Buckmaster
163b14fac1 Added editor. 2014-11-29 01:07:05 +11:00
Anis A. Hireche
18213a7fa9 missing some file 2014-11-27 20:56:25 +01:00
Azaezel
f18dd9e438 glow buffer debug visualiser
pure script, there will be several of these using identical methodology for deferred. displays a given buffer via the
 texture[0] = "#glowbuffer"; entry,
passed along to a given shader via the
samplerNames[0] = "glowBuffer";entry
which corresponds to an expected variable name and register.

as much documentation for later as tool
2014-10-24 10:04:17 -05:00
LukasPJ
35f88a77b1 Script integration for Ribbons 2014-09-23 15:44:55 +02:00
Daniel Buckmaster
cf5d48e6ef Merge pull request #665 from andr3wmac/multiformat
Support for large lists of shape formats.
2014-07-08 14:14:54 +02:00
Daniel Buckmaster
05e6fbf3d6 Merge remote-tracking branch 'JackDavidson/master' into procedural-terrain-coverage 2014-06-09 21:43:57 +10:00
Andrew Mac
eb74525a38 Added support for large lists of shape formats. Needed for assimp. 2014-05-21 14:50:44 -03:00
JackDavidson
060b2a4e29 Commit to add "Coverage" option to procedural terrain generator
This commit adds a "Coverage" option to the procedural terrain
generator. Allows mixing of textures. See
http://www.garagegames.com/community/blogs/view/22371 for more info.
This version has many improvements - coverage is now entered as a
percentage, accepts decimals, and doesn't have any bugs as far as I
know.
2014-05-04 22:17:24 -07:00
LuisAntonRebollo
a8462b7fc3 Case-sensitive fixes on template script files for Linux. 2014-04-13 19:50:22 +02:00
Bloodknight
3d38dc60eb Increase terrain editor and painter max brush size to 256 x 256 2013-07-28 02:26:29 +01:00
Daniel Buckmaster
df2abed2c4 Added navmesh wrapper code and module. 2013-07-04 17:27:48 +10:00
David Wyand
2dcc7f0247 Merge pull request #310 from thecelloman/goodbyeDIF
Remove Interior Object format (DIF)
2013-04-20 13:44:11 -07:00
SilentMike
20b8294282 Merge pull request #287 from xoltan/terrainmacro
Terrain Macro Texture
2013-04-18 08:50:06 -07:00
thecelloman
3934c3bbbe Default to an empty field for cubemap in the river and other water object builder script. 2013-04-17 23:13:26 -04:00
thecelloman
8eb0e98f86 Add a new Terrain brush action: Smooth Slope.
This smoothes the terrain using a linear regression algorithm.  Exists alongside the oldstyle height averaging action -- options are good!
2013-04-10 08:44:22 -04:00
thecelloman
b4ea1123dc Remove Interior Object format (DIF) 2013-04-05 12:39:26 -04:00
SilentMike
93c7e1fb73 Merge pull request #302 from thecelloman/movewater
Relocate water related assets.
2013-04-04 11:16:08 -07:00
thecelloman
6d7270c894 Relocate water related assets.
Also remove duplication, favoring DDS over other formats.
2013-04-04 14:13:46 -04:00
thecelloman
a371fc5855 Relocating sky related assets.
Also reduced duplication of the "empty" solid color sky cubemaps.
2013-04-04 10:46:28 -04:00
xoltan
add2f8cb47 Terrain Macro Texture
Adds another layer of detail-like texture to the terrain and the
interface updates in the Terrain Painter.
2013-03-27 18:58:37 -06:00
SilentMike
769268784f Merge pull request #268 from eightyeight/terrain-import-flipped
Importing terrain heightmaps flips Y-axis
2013-03-25 14:03:11 -07:00
Daniel Buckmaster
b868906ba5 Added a checkbox to the terrain import GUI and fixed a space. 2013-03-23 09:24:02 +11:00
thecelloman
25efdb4a06 Adding a basic rule-based terrain painting implementation.
http://www.garagegames.com/community/resources/view/17145
2013-03-21 17:45:23 -04:00
thecelloman
ceff8d72e0 Tools GuiProfile Separation.
This effectively duplicates (where necessary) and moves tools specific GuiProfiles out of the core and into the tools.  This will allow future modifications to either the game guis or tools guis that use these profiles to not conflict with each other.
2013-03-18 06:38:48 -04:00
DavidWyand-GG
497f3c96dc Fix for Issue #90 for Camera orbit object bug 2012-10-16 18:43:11 -04:00
TwistedJenius
f922bc4fd0 AI related bug fixes and improvements.
Removed references to AIObjective and aiAvoidThis which are not used.
Made minor improvements to the spawning system in the aiPlayer.cs file.
2012-09-21 06:51:53 -05:00
DavidWyand-GG
f439dc8dcd Full Template for ticket #1 2012-09-19 11:54:25 -04:00