TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-06 14:00:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
4036 commits 5 branches 33 tags 961 MiB
Commit graph

4036 commits

This branch
This branch
All branches
Author SHA1 Message Date
Areloch
371531a88d Merge branch 'alpha40_premul' of https://github.com/Azaezel/Torque3D into Preview4_0 2019-11-22 21:27:52 -06:00
Areloch
b01d53a825 Merge branch 'alph40_pbrConfig_BREAKINGWip' of https://github.com/Azaezel/Torque3D into Preview4_0 2019-11-22 21:24:59 -06:00
AzaezelX
d14317d795 largely based on work by @rextimmy: add premultiplied alpha 2019-11-22 10:02:01 -06:00
Areloch
a42ab1239b Enabled probe viz item for live updates of probes when working with them(auto-baking while on) 
Updated debug forward mat viz to work with probe visualization
More correct premult math
Updated probe viz menu behavior to properly toggle and mark which is active
 2019-11-22 01:30:49 -06:00
Areloch
06b88a6f68 Added Forward Material debug viz for HLSL(so far) and integrated it back into editor flagging. 
Re-added logic to track existing probe shader consts instead of constantly recreating it
Added logic for pre multiplied translucency mode
 2019-11-21 00:48:55 -06:00
Areloch
83459deeec Removed redundant 'load last edited level' startup mode to editor. 
Fixed recent levels open command behavior
Includes rextimmy's vertex WS normal logic in HLS shadergen
 2019-11-20 01:39:12 -06:00
Areloch
e8450b6f78 From @rextimmy was missing the stateblock handling for the Transparency mode Sub 
Added Open Recent functionality to File menubar item
Added new editor setting for Startup Mode to dictate if it'll open the most recent level edited or the blank level, instead of utilizing a game UI control for level selection.
Properly re-enabled the handling for the forceSidebarToSide setting to track to the setting value
 2019-11-19 01:25:24 -06:00
Areloch
28fd38266d Adds in missing assimp OBJ importer/exporter folder 
Corrects highlighting behavior on ToolsGuiTextEditProfile
 2019-11-18 21:42:55 -06:00
Areloch
86bdaad25d Removed inconsistently named forest green testgrid item 2019-11-18 03:31:50 -06:00
Areloch
af057d7f40 Merge branch 'Preview4_0' of https://github.com/Areloch/Torque3D into Preview4_0 2019-11-18 03:31:07 -06:00
Areloch
30446e53b0 @rextimmy fix for GuiWindowCtrl so they snap correctly again 
Added asset loose files for editor and bake level files on level asset
Correct return of ConsoleGetType on TypeShapeAssetPtr
Adds shape asset support to TSStatic, now will support either raw shape file or ShapeAsset
Adds onInspect function behavior, so when object is inspected, it can do special editor behavior
Adds callback for when editTSCtrl is resized
Added editor setting to force the world editor sidebar(scene tree and inspector windows) to resize to fit to the right side of the screen automatically instead of float
If assimp loader encounters error, it's output into the console log
Makes root Data item in folder hierarchy tree in Asset Browser able to support right mouse popup menu action
Material and Shape assets now correctly base on current browsed folder
Material asset generation now more properly fills out common maps, as well as handles skipped dependencies better
More theme corrections
Updated TestGrid images asset defs to have proper loose file handling
 2019-11-18 03:30:04 -06:00
Areloch
90fa54e7e9
Merge pull request #125 from Azaezel/alpha40_spotlightSlimdown 
shifts spotlightparams to the actually used float2/vec2 entries
 2019-11-18 03:17:47 -06:00
Areloch
5c08846a25
Merge pull request #126 from Bloodknight/UpdateAssimp 
Update assimp
 2019-11-18 03:17:35 -06:00
Areloch
5274332b61
Merge pull request #127 from Azaezel/alpha40_blendstateFix 
from @rextimmy: corrections for stateblock blending support
 2019-11-18 03:16:57 -06:00
Areloch
21dfe4f16d Merge branch 'alpha40_SetVdeoShenanigans' of https://github.com/Azaezel/Torque3D into Preview4_0 2019-11-16 10:15:39 -06:00
Areloch
fceb84f5a1 Merge branch 'alpha40_spotlightSlimdown' of https://github.com/Azaezel/Torque3D into Preview4_0 2019-11-16 10:15:07 -06:00
Areloch
0dfd167771 Merge branch 'alpha40_blendstateFix' of https://github.com/Azaezel/Torque3D into Preview4_0 2019-11-16 10:14:50 -06:00
Areloch
74049e497e Merge branch 'UpdateAssimp' of https://github.com/Bloodknight/Torque3D into Preview4_0 2019-11-16 10:14:21 -06:00
Areloch
6882d863ab Adds isSRGB and invertSmoothness checkboxes to terrain material editor 
Added ability for assimp loader to ignore cached DTS shapes on demand when building shape data
Added assimp importer options to asset import config settings set
Moved variableInspector field types folder from tools/assetBrowser/scripts to tools/guis
 2019-11-11 01:40:55 -06:00
AzaezelX
943f010a52 from @rextimmy: corrections for stateblock blending support 2019-11-10 20:05:14 -06:00
Marc Chapman
95a9d91891 Updated cmake file to list all import/export options 2019-11-10 14:45:13 +00:00
Marc Chapman
00f46a613b Upgrade to Assimp 5.0 2019-11-10 14:40:50 +00:00
AzaezelX
294938b85b clip out eroneous test casuing issues with MFT_SubSurface 2019-11-08 05:54:30 -06:00
AzaezelX
0f2fd9baaa shifts spotlightparams to the actually used float2/vec2 entries (stops debug screaming every frame) 2019-11-07 23:18:14 -06:00
AzaezelX
619c10bece conversion lockin: cleans out eroneous editor refs to specmap and specularmap in favor of the desired PBRConfigMap var name for the combined (smooth,ao,metalness) map used throughout 2019-11-07 03:46:31 -06:00
AzaezelX
8f5b99112c fix terrain default values when not applying a pbrConfigMap 2019-11-07 03:27:44 -06:00
AzaezelX
ba69f2fe2b Merge branch 'Preview4_0' of https://github.com/Areloch/Torque3D into alph40_pbrConfig_BREAKINGWip 2019-11-07 01:39:50 -06:00
Areloch
32c70c5763 Added utility methods to AssetBase: 
getAssetDependencyFieldCount
clearAssetDependencyFields
addAssetDependencyField
saveAsset

Updated the saveAsset function for terrain block to utilize utility methods to ensure the terrain asset's material dependencies, so they will load properly.
 2019-11-07 00:42:55 -06:00
Areloch
e13e7b9fe7 Merge branch 'Preview4_0' of https://github.com/Areloch/Torque3D into Preview4_0_terrain_edit_update 2019-11-07 00:40:18 -06:00
AzaezelX
9b2c189929 conforms platformWindow<implementations> to use _setVideoMode internals so that those are called by 
void PlatformWindow::setVideoMode(const GFXVideoMode &mode)
{
   _setVideoMode(mode);
 getScreenResChangeSignal().trigger(this, true);
}

allowing the resize trigger to go off, as well as any other shared functionality we want to slim the per-implementation specs down to later down the line
 2019-11-06 22:24:12 -06:00
Areloch
fa9f920755 WIP of updating terrain editor to work with assets 
Fix minor UI issues for asset browser
included folder 'asset type' script
 2019-11-06 00:23:07 -06:00
AzaezelX
074094cf0b "ShaderFeatureGLSL::getInTexCoord - Type mismatch!" bit turned out to be a simple typofix 2019-11-05 06:22:04 -06:00
Areloch
e94b751feb
Merge pull request #115 from Azaezel/alpha40MatUnmangle 
materials.cs files are still being automatically executed reguardless…
 2019-11-04 00:43:25 -06:00
Areloch
295c9b7499
Merge pull request #120 from Azaezel/alpha40VCFixFrame 
from @rextimmy: clamps the vc workaround now that later versions fixe…
 2019-11-04 00:42:38 -06:00
Areloch
5fcb63e583
Merge pull request #122 from Azaezel/Preview4_0 
from @rextimmy: ssao work
 2019-11-04 00:42:30 -06:00
Areloch
74ab886e4e
Merge pull request #121 from Azaezel/alpha40MonoColorMayhem 
getChanelValueAt 'correction'
 2019-11-04 00:42:20 -06:00
AzaezelX
21ea0d94aa glowmap gl port rev1: debug yells about "ShaderFeatureGLSL::getInTexCoord - Type mismatch!", so will need to hunt that down before calling it final, but otherwise, functions. 2019-11-04 00:40:09 -06:00
AzaezelX
13f251e83c shifts glowmap out of the composite and to it's own texture, as well as featureset. (GL port pending design finalization) 2019-11-01 19:29:31 -05:00
AzaezelX
2da7bd87de from @rextimmy, we need to target the lightmap gbuffer slot, not the color one 2019-11-01 03:24:23 -05:00
Areloch
9d37aed74f Merge branch 'Preview4_0' of https://github.com/Azaezel/Torque3D into Preview4_0 2019-11-01 01:24:57 -05:00
Areloch
d16a2c4ea4 Merge branch 'alpha40MonoColorMayhem' of https://github.com/Azaezel/Torque3D into Preview4_0 2019-11-01 01:24:37 -05:00
Areloch
019c311a04 Merge branch 'alpha40VCFixFrame' of https://github.com/Azaezel/Torque3D into Preview4_0 2019-11-01 01:24:20 -05:00
AzaezelX
d048c60494 missing gui file entries. though it doesn't seem to be reflected in the end terrain material editor result... 2019-10-31 23:42:13 -05:00
AzaezelX
e75124fdf7 from @rextimmy: ssao work 
shifts ssao from the vectorlight to ibl-only via the reflectionProbearray postfx shader
 2019-10-31 19:06:40 -05:00
AzaezelX
6f647c2d73 getChanelValueAt 'correction' 
when feeding a u8 value from a 16 bit format, best to look up the red chanel for minimal artifacting
 2019-10-30 21:39:20 -05:00
AzaezelX
acc49548a0 preliminary glowmap+glowmul feature augmentation math 2019-10-30 18:29:11 -05:00
AzaezelX
d0cb7344f8 fix glowchan groupnum entry (used to group buttons) 2019-10-30 18:28:30 -05:00
AzaezelX
f437dcad45 needed mft_pbrconfigmap or _convifgvars and _matinfocflags set to default=true to trip the forward lit side, 
shifted the mft_skybox test on down below the checks for the presence of those features to be inserted, and removed them on out if a skybox.
 2019-10-29 22:11:59 -05:00
AzaezelX
b4196f5171 from @rextimmy: clamps the vc workaround now that later versions fixed that bug 2019-10-29 06:57:13 -05:00
Areloch
864d40eb92
Merge pull request #114 from Azaezel/alpha40DBCache 
Alpha40 db cache
 2019-10-26 23:19:19 -05:00