TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-13 09:20:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
4469 commits 5 branches 33 tags 977 MiB
Commit graph

4469 commits

This branch
This branch
All branches
Author SHA1 Message Date
Areloch
62fabf6894 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
c1e99364b7 Adds in missing assimp OBJ importer/exporter folder 
Corrects highlighting behavior on ToolsGuiTextEditProfile
 2019-11-18 21:42:55 -06:00
Areloch
19eff7c616 Merge branch 'Preview4_0' of https://github.com/Areloch/Torque3D into Preview4_0 2019-11-18 03:31:07 -06:00
Areloch
7b5e1c3c58 @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
a6f41f271d 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
715d8af3df Merge pull request #126 from Bloodknight/UpdateAssimp 
Update assimp
 2019-11-18 03:17:35 -06:00
Areloch
28a1befb7d Merge pull request #127 from Azaezel/alpha40_blendstateFix 
from @rextimmy: corrections for stateblock blending support
 2019-11-18 03:16:57 -06:00
Areloch
7ff451ec89 Merge branch 'alpha40_SetVdeoShenanigans' of https://github.com/Azaezel/Torque3D into Preview4_0 2019-11-16 10:15:39 -06:00
Areloch
883420d21b Merge branch 'alpha40_spotlightSlimdown' of https://github.com/Azaezel/Torque3D into Preview4_0 2019-11-16 10:15:07 -06:00
Areloch
f1846c0389 Merge branch 'alpha40_blendstateFix' of https://github.com/Azaezel/Torque3D into Preview4_0 2019-11-16 10:14:50 -06:00
Areloch
e2728036e9 Merge branch 'UpdateAssimp' of https://github.com/Bloodknight/Torque3D into Preview4_0 2019-11-16 10:14:21 -06:00
Areloch
796a95b8a5 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
c2e018c6a7 from @rextimmy: corrections for stateblock blending support 2019-11-10 20:05:14 -06:00
Marc Chapman
413cb8ecfd Updated cmake file to list all import/export options 2019-11-10 14:45:13 +00:00
Marc Chapman
c2018ad3de Upgrade to Assimp 5.0 2019-11-10 14:40:50 +00:00
AzaezelX
63a4d69a33 clip out eroneous test casuing issues with MFT_SubSurface 2019-11-08 05:54:30 -06:00
AzaezelX
2e56645f13 shifts spotlightparams to the actually used float2/vec2 entries (stops debug screaming every frame) 2019-11-07 23:18:14 -06:00
AzaezelX
60d2b0a0f6 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
fb67458eaf fix terrain default values when not applying a pbrConfigMap 2019-11-07 03:27:44 -06:00
AzaezelX
062e6f3364 Merge branch 'Preview4_0' of https://github.com/Areloch/Torque3D into alph40_pbrConfig_BREAKINGWip 2019-11-07 01:39:50 -06:00
Areloch
d8cc73f5a1 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
906c7095f1 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
a8b6327091 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
22249bf4d4 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
a67d2c52cd "ShaderFeatureGLSL::getInTexCoord - Type mismatch!" bit turned out to be a simple typofix 2019-11-05 06:22:04 -06:00
Areloch
ed53f3cf76 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
aa259753f9 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
fd4c65ad0d Merge pull request #122 from Azaezel/Preview4_0 
from @rextimmy: ssao work
 2019-11-04 00:42:30 -06:00
Areloch
c6a6e72f66 Merge pull request #121 from Azaezel/alpha40MonoColorMayhem 
getChanelValueAt 'correction'
 2019-11-04 00:42:20 -06:00
AzaezelX
091af6bdff 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
d034895e8f 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
ac6fdf884e from @rextimmy, we need to target the lightmap gbuffer slot, not the color one 2019-11-01 03:24:23 -05:00
Areloch
a85bc7bae0 Merge branch 'Preview4_0' of https://github.com/Azaezel/Torque3D into Preview4_0 2019-11-01 01:24:57 -05:00
Areloch
ab2057c9d3 Merge branch 'alpha40MonoColorMayhem' of https://github.com/Azaezel/Torque3D into Preview4_0 2019-11-01 01:24:37 -05:00
Areloch
3c0b7b2086 Merge branch 'alpha40VCFixFrame' of https://github.com/Azaezel/Torque3D into Preview4_0 2019-11-01 01:24:20 -05:00
AzaezelX
25015eb724 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
501990c3b6 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
047a45c82d 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
070a9845a2 preliminary glowmap+glowmul feature augmentation math 2019-10-30 18:29:11 -05:00
AzaezelX
f284524dd0 fix glowchan groupnum entry (used to group buttons) 2019-10-30 18:28:30 -05:00
AzaezelX
0f5ba17126 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
8cb018fb44 from @rextimmy: clamps the vc workaround now that later versions fixed that bug 2019-10-29 06:57:13 -05:00
Areloch
3af902c911 Merge pull request #114 from Azaezel/alpha40DBCache 
Alpha40 db cache
 2019-10-26 23:19:19 -05:00
Areloch
fde83b7058 Merge pull request #111 from Bloodknight/MinorFixes 
Minor fixes
 2019-10-26 23:19:07 -05:00
Areloch
0b282c6947 Merge pull request #99 from Azaezel/alpha40ModuleDependencyResolvers 
Alpha40 module dependency resolvers
 2019-10-26 23:18:49 -05:00
Areloch
25a117159f Merge pull request #113 from Azaezel/alpha40VolfogTriggerTrip 
set volfog to use the standard window-resized trigger for it's update
 2019-10-24 21:20:53 -05:00
AzaezelX
8fac88dadc more misc cleanup, including cutting down on sampling the pbrconfigmap by filling that out first, and drawing the smooth and metal vars from it, and filling out an ao var in case folks wanna use that later, as well as a bit more doubled up functionality prune-down. still tracing why forward lit seems to have lost the map config feature 2019-10-23 20:38:13 -05:00
AzaezelX
ad216abc02 cleans up a few more spots of various variables that ammount to the "PBRConfig" in the end, as well as a MFT_isDeferred test for determining if that's stored off as a temp-val or in the gbuffer. though seem to have forgotten a catch, as it's not finding the MFT_PBRConfigMap feature and falling back to recreation come time to process MFT_ReflectionProbes 2019-10-23 14:59:29 -05:00
AzaezelX
bfccfca0ce more conversionwork from specular entries to pbrconfig ones, adds backend glowmul and glowmap var tracking, as well as pbrconfigmap composite slip-in for the glowmap (sans shaderfeatures just yet). seems to have busted forward lit application though... 2019-10-22 15:11:39 -05:00
AzaezelX
7daf66cf9d frontend work. stubbs in a glowMul slider, and a glow mask channel for composites (defaults to writing to the alpha chan) 2019-10-22 13:20:42 -05:00