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
AzaezelX
4f31dea023
materials.cs files are still being automatically executed reguardless of location twice. shifted the ribbonshader shaderdata defines from new to singleton to avoid attempts at duplicated creation.
2019-10-21 19:22:13 -05:00
AzaezelX
8b4f3fea31
misc formatting fixes, and a removal of the
...
bool LightningData::preload(bool server, String &errorStr)
{...
dQsort(thunderSounds, MaxThunders, sizeof(SFXTrack*), cmpSounds);
...}
call causing network stream corruption
2019-10-21 18:58:15 -05:00
AzaezelX
0b21072b10
datablock caching, and dependency-object vs hooked up class method segregation
...
1) relies on https://github.com/Areloch/Torque3D/pull/99 for modular resolvers (re-included for ease of testing)
2) adds a new module::onServerScriptExec(%this) callback executed after datablock transmission
3) bypasses DB transmission in favor of a straight file read if the resulting network data would (via CRC compare) match what a client already has saved off under data\cache\<client or server>
2019-10-21 18:55:15 -05:00
Marc Chapman
723125695d
Un Mirrored these green textures... again
2019-10-20 14:05:09 +01:00
Marc Chapman
626a656bcb
MIssed settings
2019-10-20 09:48:57 +01:00
Marc Chapman
47f60f9272
Added TerrainSnapOffsetZ back to editor settings
2019-10-20 09:16:16 +01:00
Areloch
cba14c035f
Change Asset Browser logic to utilize folder heirarchy instead of strict Asset Type filtration
...
Added navigation history to AB, as well as ability to navigate via forward and backward buttons and breadcrumb buttons
Added folder 'asset type', allowing you to create, rename, delete and move folders via the asset browser for better organization
Adjusted various behaviors to work with the address-driven navigation/organization of the AB
Expanded visibility options for the AB and integrated them into editor settings so they are retained
Added Search field for searching the folder structure, in addition to the existing preview tiles search
Adjusted drag-n-drop behavior of the platform code so it accepts dropping folders
Added ability to dump active PostEffects list to see what is currently running
Added ability to mark specific items in GuiTreeViewCtrl as hidden
Made reflection probe bounds boxes translucent rather than wireframe to improve editing visibility
Added expanded loose file references to LevelAsset for common companion files like decals and posteffect scrips
Added editor setting for Editor Layout Mode, allowing you to set the editor into 'Modern' layout.
Added editor settings to set default import config ruleset, and also ability to set auto-import. If both of these are set, then as long as the importing assets have no errors, they will auto-process and the user doesn't need to manually check and confirm them via the asset import window
2019-10-20 02:47:15 -05:00
Marc Chapman
326908aa3d
Fixed bug in display options UI writing incorrect values.
2019-10-18 04:25:49 +01:00
AzaezelX
27d6665d21
set volumetric fog to use the standard window-resized trigger for it's update
2019-10-17 09:54:38 -05:00
AzaezelX
60df3744c7
shift smoothness and metallness sliders on up to the same areas as the textureslots
2019-10-16 15:56:30 -05:00
AzaezelX
65cbf49c4a
backend specularMap to PBRConfigMap alts.
...
left:
addField( "specularMap", TypeImageFilename, Offset(mPBRConfigMapFilename, Material), MAX_STAGES,
scripthook till last since that *will* break all current materials.
2019-10-16 15:51:02 -05:00
Marc Chapman
40cdc29e0c
GFXStateBlockData new -> singleton
2019-10-16 19:26:45 +01:00
Marc Chapman
27d2f63986
Shaderdata new->singleton
2019-10-16 19:23:32 +01:00
