Commit graph

4926 commits

Author SHA1 Message Date
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
Marc Chapman
4aed48697d typos 2019-10-16 19:22:56 +01:00
Marc Chapman
7ddf6cd4f2 Fix shader path and added console.log in cleanup.bat 2019-10-16 19:22:34 +01:00
AzaezelX
f44cb01249 looks like arrayObjects return count() as size+1;
one of these days should really do a consistency pass on those...
2019-10-06 11:08:49 -05:00
Areloch
e621e362f4 Corrected the logic for the GenerateComposite import config rule so it only applies if there's any of the ORM maps detected
Added new import config rule: AlwaysPresentImageMaps so it will add entries for the regular map inputs on a material, even if they weren't actually found
Disabled a number of inactive popup menu items
Added Create New Module to normal add asset popup for more obvious/simplified use-flow
Adjusted the editor loading logic so it will properly display the loading splash to inform loading is happening instead of just lagging
Adjusted the assimp shape loader code so if it doesn't find a texture, and thus just sets a material value as the material color, it has a more parsable formatting
2019-10-06 01:29:12 -05:00
AzaezelX
9229c21788 adds an optional entry to registerDatablock that sets a flag in the datablock files to-be-executed DatablockFilesList ArrayObject that erases relative-path duplicates and surpresses overwrites. setting it again in a sucessively executed module will take ownership of the exclusivity. otherwise, all script files follwing the same general path will be executed.
adds an unRegisterDatablock to remove a given "relativePath / file" from the list
sets up an automatically-cleaned ExecFilesList  ArrayObject following a similar pattern, and executed for each callOnModules call, so that for instance all module::initServer(%this) entries are parsed, %this.queueExec feeds the vector, and opon completion of gathering the list, all are then executed in module-dependency order
2019-10-05 08:03:13 -05:00
AzaezelX
466d03ffec adds a moduleDependencySort qsort callback, and uses it in the findModule method to massage the return vector by depends order 2019-10-05 07:53:43 -05:00
Areloch
248f1da1c5 Standardizes the Level Assets to just use the regular asset description field for it's description
Updated existing level asset definitions to comply
2019-10-05 01:55:52 -05:00
Areloch
782ab7b73a Add proper refreshing of fields in the Project and Editor settings editors. 2019-10-05 01:16:14 -05:00
Areloch
94b6749012 Catches FPSGameplay module up to new gamemode and module paradigm
Adds additional args for callGamemodeFunction
Adds default Observer camera datablock
2019-10-04 21:00:58 -05:00
Areloch
01f562b9e5 Added check for when getting the Detail feature's output, to validate if we have the foliage feature, which was causing a stomp on the required float4 texCoord for the foliage featuer to work right
Temporarily disabled wsNormal addition when we have no defined normal map until it's finished being integrated
Fixed the structure for the lighting/probe shadergen logic in GL so it generates correctly, resolving a crash on unix machines.
2019-10-03 23:46:53 -05:00
Areloch
6f02f64dd2 Re-enabled ExampleModule's keybinds 2019-09-29 23:12:46 -05:00
Areloch
bc7cbbe413 Merge branch 'Preview4_0' of https://github.com/Areloch/Torque3D into Preview4_0 2019-09-29 07:52:03 -05:00
Areloch
c9a63d63cf Updated ToolsGuiTextPadProile to comply to editor theme
Further tweaks/reorg to UI module
Implemented cubemap array scaling on GL so it doesn't crash when texture quality is lowered
2019-09-29 07:51:43 -05:00
Areloch
0a78c1fb42 Merge pull request #67 from zfbx/Preview4_0
removed and moved files for baseGame
2019-09-29 07:28:54 -05:00
Areloch
f44d424ff2 Merge pull request #66 from Azaezel/SSR4
from user Ewyncat: more matrices for postfx
2019-09-29 07:24:23 -05:00
Areloch
db6c6b1e85 Merge pull request #71 from Azaezel/alpha40DynShadowRefreshRedux
re-add dynamic shadow refresh rate
2019-09-29 07:23:37 -05:00
Areloch
9459fab3e4 Merge pull request #69 from Azaezel/alpha40EditorEditing
Alpha40 editor editing
2019-09-29 07:23:02 -05:00
Areloch
3986b800cd Merge branch 'Preview4_0' of https://github.com/zfbx/Torque3D into Preview4_0 2019-09-29 06:51:47 -05:00
Areloch
8403345de4 Merge branch 'SSR4' of https://github.com/Azaezel/Torque3D into Preview4_0 2019-09-29 06:51:23 -05:00
Areloch
6b6e5b6ca2 Merge branch 'alpha40DynShadowRefreshRedux' of https://github.com/Azaezel/Torque3D into Preview4_0 2019-09-29 06:51:04 -05:00
Areloch
c83bfef7a5 Merge branch 'alpha40EditorEditing' of https://github.com/Azaezel/Torque3D into Preview4_0 2019-09-29 06:50:45 -05:00
Areloch
e7bf49e801 Moved unneeded modules to Templates/Modules
Added templated getObjectsByClass to Scene for easier engine-side polling of objects, including nested checks for subscenes
Proper init'ing of mGamemodeName in LevelAsset, as well as proper fieldType for mIsSubLevel
D3D11 added logic to handle scaling down of textures in cubemap arrays for lower texture resolution preferences
Added ability to collapse groups programmatically to GuiVariableInspector
Upped PSSM shadowmap max size to 4096
Caught GL deferred lighting/probes up to D3D11
Temporarily disabled forward lighting/probes on GL materials until conversion finished
Upped smMaxInstancingVerts to 2000 from 200 to support slightly more detailed meshes being instanced
Reordered project settings so they load ahead of core modules, so that core modules can actually use project settings
Established current preset file for PostFXManager to use for reverting
WIP logic for forcing probes to update as part of level lighting load step in loading process
Streamlined PostFXManager code, removing unnecessary/redundant files
Coverted HDR, Lightrays and SSAO and ExamplePostEffect to use new PostFX Manager/Editor paradigm
PostFX manager now enacts callbacks so that postFXs' can process their own settings as well as provide editor fields
Changed PostFX editor to work with new callbacks via using VariableInspector
Updated PostEffectAsset's template file so new PostFX's will now automatically register with the PostFXManager and have the needed new callbacks for integration
Made HDR on by default, removed enable field from editing
Made probe bake resolution a project setting
Updated many GL postFX shaders to have proper case for PostFx.glsl
Example module now loads ExampleGUI and ExamplePostEffect during init'ing
Removed unneeded autoload definitions from ExampleModule's module file
Fixed Graphics Adapter settings field to properly display as well as apply setting
Updated many referenced profiles in tools folder to use the Tools specific gui profiles to make theming more consistent
Fixed coloration of tools button bitmap to make theming more consistent
Updated a few theme settings for improved visibility with theme, particularly selected/highlighted text
Moved AssetBrowser field types to separated folder/files
Updated new module creation to properly utilize template file instead of overriding it with a programmatic script generation.
Removed unneded default autoload definitions from new modules
Added WIP for editing Module/Asset dependencies
Updated the PostEffectAsset to properly generate glsl and hlsl files from templates
Updated module editor window to display only necessary fields
Added WIP of TerrainAsset
Added shaderCache gitignore file so folder isn't lost
2019-09-29 06:44:43 -05:00
AzaezelX
c680471378 looks like the with the latest translucnency work, dynamic shadows are no longer triggering malformed values in forward lit materials, so flipped that back on 2019-09-20 14:45:05 -05:00
Areloch
ff4c2d59fc Utilizes old method to clean up tree items in GuiTreeViewCtrl to resolve guiEditor crashes
Updates probeManager to correctly utilize skylight idx to infer if a skylight is active, and set the SKYLIGHT_ONLY macro correctly, resolving erroneous behavior
Cleaned up some of the guiEditor initialization script to remove redundancy
Cleaned up tools modules loading script to remove redundancy
2019-09-18 01:41:57 -05:00
AzaezelX
6027e253a1 pad the internals of the GuiScrollCtrl encapsulated within the EWCreatorWindow/[CreatorWindow] to prevent overhang issues due to the parent rescaling it's position/extent 2019-09-15 13:32:56 -05:00
AzaezelX
6574531c89 kill duplicate gui as a source of correction confusion 2019-09-15 13:30:54 -05:00
Tony
c97e6a32b5 moved guis to where they're called in script 2019-09-15 00:41:40 -04:00
Tony
67d71c8558 removed and moved files for baseGame
removed templates/baseGame/game/data/art as it's a copy of /images
removed templates/baseGame/game/data/scripts/guis as it's a copy of ../gui
moved fileDialog.cs to /ui/gui
remove duplicate scripts under /ui/scripts that are in /ui/gui already
2019-09-14 23:55:21 -04:00
Areloch
9db95f4fb2 Implemented proper ScriptAsset execution on load
Implemented script dependency handling
Added test-case of script dependency handling in ExampleModule
Cleanup of redundant getSceneCount calls
Properly get scene count in callGamemodeFunction
Remove unneeded TODO comment in shaders
Converted onMissionEnded gamemode func call to use callGameModeFunction function
Convert ExampleGameMode to be container-object based, and updated callGamemodeFunction to handle that
Correct import settings typoe so image suffixes are read correctly
Largely fixed companion image scanning when importing images and streamlined image-material interop during import preprocessing
Added handling for reading in PBR maps and creating a composite image + asset
Added WIP of Cubemap asset, and editing integration with a standalone cubemap editor
Added ability to create new Cubemap asset in Asset Browser
2019-09-13 00:27:48 -05:00
AzaezelX
28e4a86cff forgot the initializers and shader variable to source hooks 2019-09-06 14:48:15 -05:00