Commit graph

248 commits

Author SHA1 Message Date
Areloch
823fc41abc Merge pull request #1620 from John3/spaceFolderSceneTree2
Bug space folder in scene tree 2
2016-05-31 23:28:45 -05:00
Areloch
ee6d9961e3 Merge pull request #1582 from Azaezel/SubSurf
Reimplements a form of subsurface scattering
2016-05-25 13:35:44 -05:00
Areloch
358bbdb740 Removed script calls to some fields that no longer exist, which was causing console errors. 2016-05-25 13:32:20 -05:00
John3
4bb63f277e change pipe to underscore and fix prefabs assets 2016-05-21 15:10:35 -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
Azaezel
d79b9a2988 removes w=z trick (was causing fisheye, effectively) 2016-05-18 06:38:13 -05:00
Areloch
f703a84218 Duplicates the missing samplerstate configurations in the empty template, for parity. 2016-05-16 13:21:44 -05:00
Azaezel
c104313f43 updated empty template with stray script files from devhead that had yet to be converted 2016-05-08 21:21:52 -05:00
rextimmy
3a9b50f702 Direct3D11 common shader changes. 2016-03-20 21:50:21 +10:00
Areloch
908be4818f Merge pull request #1519 from Azaezel/deferredShading
Deferred shading
2016-02-27 15:08:20 -06:00
Anis
a34cf9e3f9 Merge pull request #1185 from MusicMonkey5555/script-improvements
Improved file open dialogue
2016-02-26 23:01:24 +01:00
Azaezel
ca2ffea6cd Merge branch 'development' of https://github.com/GarageGames/Torque3D into ColorPickerAdvanced 2016-02-21 15:30:54 -06:00
Anis
5947933f99 Merge pull request #1434 from blackwc/fullscreen-cli-fix
fullscreen and windowed mode cli fix
2016-02-19 16:59:42 +01:00
Azaezel
8c5810adad The final step (barring any overlooked missing bits, requested refactors, and of course, rolling in dependencies already submitted as PRs) consists of:
renderPrePassMgr.cpp related:
A) shifting .addFeature( MFT_XYZ); calls from ProcessedShaderMaterial::_determineFeatures to ProcessedPrePassMaterial::_determineFeatures
B) mimicking the "// set the XXX if different" entries from RenderMeshMgr::render in RenderPrePassMgr::render
C) fleshing out ProcessedPrePassMaterial::getNumStages() so that it shares a 1:1 correlation with ProcessedShaderMaterial::getNumStages()
D) causing inline void Swizzle<T, mapLength>::ToBuffer( void *destination, const void *source, const dsize_t size )  to silently fail rather than fatally assert if a source or destination buffer is not yet ready to be filled. (support for #customTarget scripted render targets)

Reflections:
A) removing reflectRenderState.disableAdvancedLightingBins(true); entries. this would otherwise early out from prepass and provide no color data whatsoever.
B) removing the fd.features.addFeature( MFT_ForwardShading ); entry forcing all materials to be forward lit when reflected.
C) 2 things best described bluntly as working hacks:
C1) when reflected, a scattersky is rotated PI along it's z then x axis in order to draw properly.
C2) along similar lines, in terraincellmaterial, we shut off culling if it's a prepass material.

Skies: scattersky is given a pair of rotations for reflection purposes, all sky objects are given a z value for depth testing.
2016-02-16 02:50:49 -06:00
Areloch
a90eb9762b Re-submission of the Volumetric Fog PR, with cleanup. 2015-12-01 00:10:13 -06:00
Areloch
1a009d6dd3 Merge pull request #1443 from Areloch/TAM_Implementation
TAML, Assets and Modules implementation
2015-11-12 23:54:27 -06:00
Areloch
92aa785bb2 Merge pull request #1442 from Azaezel/shadow_caching
This all seems to work pretty well.
2015-11-12 12:49:58 -06:00
Areloch
9d726bb9ed Merge pull request #1453 from blackwc/playJournal-template-fix
playJournal fix and removed depcrecated command line options
2015-11-09 10:24:30 -06:00
blackwc
ca37e9f84e fix playJournal instruction in comments 2015-10-28 22:52:16 -04:00
blackwc
bba604a043 playJournal fix and removed depcrecated command line options 2015-10-28 22:46:17 -04:00
Areloch
48d38ca803 Merge pull request #1447 from blackwc/radioButton-image-new
improved radio button
2015-10-27 00:26:21 -05:00
Areloch
8253bcc343 Merge pull request #1446 from rextimmy/water_vertex_format_fix
Looks to work fine. Thanks!
2015-10-24 02:12:46 -05:00
blackwc
ea1931d215 improved radio button 2015-10-23 20:37:22 -04:00
rextimmy
9c6ff1775b Removed unused vertex colors from GFXWaterVertex 2015-10-22 21:54:35 +10:00
Areloch
a72802b677 Merge pull request #1435 from Azaezel/glowDebugEmpty
Looks good
2015-10-21 00:56:59 -05:00
Areloch
aba6cf2d9e Merge pull request #1436 from Azaezel/ribbonShadersEmpty
Agreed, it makes sense that the shaders are common, so that people can start with empty and add their own art without worrying about stuff not working as expected.
2015-10-21 00:51:22 -05:00
Areloch
f41f9fb7c8 Merge pull request #1431 from blackwc/sfxCompareProvider-fix
Seems to work fine.
2015-10-19 22:20:18 -05:00
rextimmy
246785a8bf Removed unused vertex formats from ScatterSky 2015-10-16 21:30:39 +10:00
Azaezel
2753f562e8 shadow caching
SPECIAL NOTE: highly suggest https://github.com/GarageGames/Torque3D/pull/1441 or a variation thereof to prevent debug spew and false-postives for occlusion results.

With significant research, development and prototyping assistance from both @andr3wmac (shaders and partial hook work), and @LuisAntonRebollo (additional culling)

System operates as follows:
1) materials are given an additional castDynamicShadows boolean entry. (Default at time of writing is true by request. Personal usage at time of writing defaults to false. value is default-initialized in materialDefinition.cpp. script/gui exposed)
2) lights are given a staticRefreshFreq and dynamicRefreshFreq (in milliseconds). script/gui exposed
3) materials are (effectively) sorted into dynamic and static shadowmap render lists based on flag. (see shadowMapPass.cpp)
4) initial shadowmaps are generated for each light and 'list'.
5) as each refreshFreq times out, the relevant shadowmap for a given light is refreshed.

Special notes:
dynamicRefreshFreq for all lights is set to a (script exposed) 8MS refresh timer.
StaticRefreshFreq for the lions share of lights defaults to 250 MS (1/4 of a second)
scattersky's embedded light, which is intended to operate in a mobile manner, defaults to 8
to reiterate, these are all customizable per-light via script/inspector gui in the case of alternate project needs.
2015-10-13 18:12:19 -05:00
Areloch
7a3b40a86d Initial Implementation of the Taml, Asset and Modules systems.
Only has example and shape assets currently.
2015-10-13 15:19:36 -05:00
blackwc
ef5bdc66d3 fullscreen and windowed mode cli fix update 2 2015-10-11 02:34:21 -04:00
Azaezel
a100a00c99 missing ribbon shaders, empty template 2015-10-07 05:40:05 -05:00
Azaezel
e0c275b56b missing empty template glow pass debug tool 2015-10-07 05:36:44 -05:00
blackwc
5239c2f183 fullscreen and windowed mode cli fix update 2015-10-07 04:56:36 -04:00
blackwc
6d6055c873 fullscreen and windowed mode cli fix 2015-10-07 03:28:48 -04:00
wcb
3c252689f3 sfxCompareProvider fix for Empty template 2015-10-06 02:07:01 -04:00
Areloch
3d65f1f8cd Fixes it so when using SDL, the editor menubar will correctly react to accelerator commands. 2015-09-24 22:23:26 -05:00
Areloch
5ba5092d44 Merge pull request #1402 from Azaezel/SoSensitive3
Files caught by https://github.com/GarageGames/Torque3D/pull/1401
2015-09-16 21:27:30 -05:00
Areloch
dd5f910b64 Companion PR to 1398 to add the change to the Empty template as well. 2015-09-05 12:07:47 -05:00
Areloch
5ee096de20 Added in explicit setting to vec2 in the shader functions per Az's suggestion, to avoid GLSL problems 2015-08-29 12:41:35 -05:00
Areloch
71c19a6151 Companion PR to #719
Adds the OGL side. redoing it to make sure the PR history is clean.
2015-08-28 00:27:08 -05:00
Areloch
95ab3a33a5 Merge pull request #719 from rextimmy/dxtnm-parallax-fix
Fix to allow parallax mapping with dxtnm textures via the red channel.
2015-08-27 23:59:20 -05:00
Azaezel
1107d23e23 git hates batch renames pt2 2015-08-18 06:22:57 -05:00
Azaezel
dd89f9b82a git hates batch renames pt1 2015-08-18 06:22:21 -05:00
Daniel Buckmaster
680f4442f0 Merge pull request #1399 from Areloch/PhysicsViz
Adds a debug visualization mode for the active physics world.
2015-08-15 19:51:18 +10:00
Azaezel
826be7287a case sensitivity script fixes 2015-08-14 18:00:36 -05: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
Areloch
9782490894 Merge pull request #1388 from Areloch/SDL_Scroll_Speed_Fix
SDL mouse wheel speed fix.
2015-08-10 08:44:15 -05:00
Areloch
8248ecdeac Looks like WHEEL_DELTA is defined for win and osx, but not linux. Retooling to utilize a $pref instead, as that will let the scroll speed be modifiable for any projects that need it. 2015-08-05 17:44:55 -05:00
Areloch
b614d87e78 Fixes the menubar functionality when using SDL.
This resolves menu order, cleanup and close/re-open issues, as well as crashes on close.

It also modifies the look slightly to look closer to the windows menubar to keep a cohesive look regardless of platform.
2015-08-04 22:57:25 -05:00