Commit graph

3054 commits

Author SHA1 Message Date
Brian Roberts fbb11027b6
Merge pull request #245 from Areloch/PopupMenuBitmapArrays
Minor additions to popup menus
2020-07-12 14:07:49 -05:00
Areloch 7818b1ba49 Correct to make the getModuleFromPath function static again. 2020-07-11 21:57:40 -05:00
Areloch a3d6afc197 Corrects lookup/in-place auto import logic for ImageAssets
Fixed sizing issue for material asset ptr fields
Fixed type of comment in Particle Asset
Hooked GLSL and HLSL shader files to be proper asset loose files for PostEffectAsset
Adjusted some default values for default ImportConfig
Corrected field type of multiple fields  for the importConfig
Corrected loading of PopulateMaterialMaps config setting from config file
Corrected field types of multiple fields for AssetImportObjects
Exposed several utility fields for the Importer to script
Added ability to create an AssetImportObject in script and add it to the Importer's current session
Ensured stable naming behavior(replacing spaces, -, and . in names with _
Improved getAssetTypeByFile logical lookup so it doesn't accidentally grab cached.dts files
Added ability to hard reset an import session, wiping all inbound files for a full reset
Added ability to process DTS files to shape import so it can parse out content such as materials for associated asset imports
Added better handling for shape materials that are just colors
Added callback hook-in so if the importer doesn't have a defined function for importing a given asset type, it'll try calling down into the editor
Stabilized imageAsset processing logic when generating a material for it
Improved imageType lookup/processing logic in Importer
Improved logic for binding in associated image files to materialAssets
Improved logic for processing shapes to get related materials and images, ensuring better likelyhood of finding and associating related assets
Cleaned up validation logic
Added ability to properly look up the editor's default import config if it's set to be used for autoimport
Improved handling of originalFilePath logic, so if it's an in-place import, it doesn't bother populating the field
Set default UP axis value on shape importing to ensure better default behavior
2020-07-11 16:20:10 -05:00
Areloch a71f5cfd9d Missed header changes 2020-07-11 15:58:39 -05:00
Areloch a5404ad216 Adds ability to utilize bitmap arrays and set entry indexes for popup menus
Also enables the ability to fetch the text of a popup menu item
2020-07-11 15:57:13 -05:00
Areloch 758dd20724 Adds logic to guiTextEditCtrl to have placeholder text when the control is empty. 2020-07-11 15:53:21 -05:00
Brian Roberts 67dbe4dfe2
Merge pull request #229 from Areloch/TerrainAssetFixup
Reworks the terrain loader code to work with the assets.
2020-07-10 17:30:27 -05:00
Brian Roberts ef6137ac6f
Merge pull request #242 from Azaezel/alpha40_stuckSpots
from practicing: aiplayer onstuck correction
2020-07-10 17:28:29 -05:00
AzaezelX b8c3b515f8 from @practicing01: trigger mounting 2020-07-10 15:50:25 -05:00
AzaezelX 1619b7cd23 from practicing: aiplayer onstuck correction 2020-07-10 12:15:46 -05:00
Brian Roberts 55c95a6146
Merge pull request #241 from Azaezel/alpha40_macCompile
comparison flaw in spotlight animation check.
2020-07-08 12:27:28 -05:00
AzaezelX 61db21aaaf comparison flaw in spotlight animation check. also, proper location of shadercache dir 2020-07-07 16:54:25 -05:00
Jeff Hutchinson 7880c71d9a fixed cpu detection on 64bit windows (and removing nasty assembly for win32).
Note that this still works for 32bit windows.
2020-07-07 01:05:08 -04:00
Brian Roberts 1173c4f153
Merge pull request #239 from Azaezel/alpha40_compilefix
#include "console/typeValidators.h"
2020-07-05 20:39:07 -05:00
Brian Roberts d86c6aff35
Merge pull request #238 from Azaezel/alpha40_gl_cubemapWipwork
fix cubemap capture for gl
2020-07-05 20:38:53 -05:00
AzaezelX fcffca65e6 #include "console/typeValidators.h" 2020-07-03 22:58:27 -05:00
AzaezelX c57205b1f4 from @rextimmy: final fixes 2020-07-03 22:56:44 -05:00
AzaezelX a41b28f6b7 safety check
ensures
`   Knot *p1 = getKnot((S32)mFloor(t));
   Knot *p2 = next(p1);`
can't trip bad memory
2020-07-03 15:47:05 -05:00
Brian Roberts 52c93ab5ea
Merge pull request #234 from chaigler/fix_gl_sreenies
Implements missing _captureBackBuffer method for GL gfx layer.
2020-07-02 16:18:00 -05:00
chaigler e2bf5cb8fe Implements missing _captureBackBuffer method for GL gfx layer.
GL layer was missing _captureBackBuffer() implementation which caused screenShot() function to fail. Also caused ScreenShot::capture() to be called every frame afterward which caused significant performance issues.
2020-07-02 16:02:05 -04:00
chaigler c4e00be91a Fix for crash in _onZoningChanged methods when called by hidden objects.
Hidden objects are removed from the scene manager so calls to getSceneManager()->getZoneManager() crash and burn.
2020-07-02 15:50:29 -04:00
AzaezelX ce2b05e0e2 a) grab the source mipmap levels not the dest ones for copy. b) lets rely less on trusting sizeof*4 when we've gor a size per pixel lookup already there 2020-06-29 21:26:08 -05:00
Areloch 7b1c083839 Adjusts importer logic of assets to fill spaces in the names as underscores to avoid issues. 2020-06-26 23:28:53 -05:00
Brian Roberts bac3146054
Merge pull request #215 from Azaezel/alpha40_trigger_tricks
fixes for trigger onenter/onleave
2020-06-26 20:48:27 -05:00
Areloch 41277fe3b8 Fixes a mistake with setting the looseFilePath for the auto-created terrain asset. 2020-06-26 00:05:14 -05:00
Areloch 4ce558f042 Reworks the terrain loader code to work with the assets.
Fixes the terrain asset creation, makes the loading logic go through the asset auto-import behavior when a filename or assetid is bound that is not found.
Corrects terrain material binding to properly save and load
Makes the terrain asset inspector fields work as expected.
2020-06-25 23:33:01 -05:00
AzaezelX 24e6d8c73c partial followup to #202.
largely cleanups, though does include glCopyImageSubData for gl revs that support it
TODOS:
1) non glCopyImageSubData for `void GFXGLCubemapArray::copyTo(GFXCubemapArray *pDstCubemap)`
2) while we don't get corruption showing in >0 mips for irradiance maps using the newer code, it nevertheless renders wrong.
not 100% sure if renderdoc is showing blank mips because it expects it due to size, or if we are in fact generating em even though we don't use em in the end for irradiance references.
2020-06-25 17:34:48 -05:00
AzaezelX 6fde8dd4c3 adress #225 2020-06-23 13:43:04 -05:00
Brian Roberts b98d0a946b
Merge pull request #209 from Azaezel/alpha40_ScopeStackShenanigans
adress #203
2020-06-20 05:32:04 -05:00
Brian Roberts f6cedc8043
Merge pull request #210 from Azaezel/alpha40_spotlightBoundsFix
adress #162 based on work by Chad Hall
2020-06-20 05:29:47 -05:00
Brian Roberts cc0d4f4d6b
Merge pull request #222 from Azaezel/alpha40_kill_macroMaps
adress #221 crash surpress macromap
2020-06-20 05:28:33 -05:00
Brian Roberts e3052a1919
Merge pull request #202 from Azaezel/alpha40_GL_CubemapSaver
implement copyResource, fix copyToBmp
2020-06-20 05:27:53 -05:00
AzaezelX 4a88d7a4e4 adress #221 crash surpress macromap
while shifitng loop in _initSamplerNames to use sgMaxTerrainMaterialsPerPass. if folks absolutely require thier projects to contain terrain macromaps, they can unrem

FEATUREMGR->registerFeature( MFT_TerrainMacroMap, new NamedFeatureGLSL("TerrainMacroMap Deprecated")); // new TerrainMacroMapFeatGLSL);
   //samplerNames.push_back("$macrolayerTex");
and
      //samplerNames.push_back(avar("$macroMap%d", i));
as well as turn sgMaxTerrainMaterialsPerPass down to 2 entries on a given terrain subchunk before it requires another rerender of the terrain blended in with prior passes.
2020-06-19 21:12:20 -05:00
Brian Roberts 73d57e86af
Merge pull request #213 from Azaezel/alpha40_gl_terrainfix
typofix in opengl terrain shadergen
2020-06-19 19:50:37 -05:00
Brian Roberts 2ef6008212
Merge pull request #216 from Azaezel/alpha40_groundcover_tricks
groundcover requested augs
2020-06-19 18:37:40 -05:00
Brian Roberts e010d02809
Merge pull request #214 from Azaezel/alpha40_ststatic_tricks
adds an animspeed and animoffset to tsstatic instances
2020-06-19 13:29:03 -05:00
AzaezelX 206d86f1bb .. we do however appear to need to swizzle DX vert colors... 2020-06-19 06:48:50 -05:00
AzaezelX 6859cbe308 adress #16 - don't need to swizzle vert colors 2020-06-13 13:02:56 -05:00
AzaezelX 7c9d2f3ca2 groundcover requested augs
1) fadescale- allows an enduser to reduce drawdistance for groundcover via $pref::GroundCover::fadeScale
2) adds minslope, conformtonormal, and min/max rotations along the x and y axies
2020-06-13 12:18:41 -05:00
AzaezelX 8ecb474a67 fixes for trigger onenter/onleave
1- corrects onleavetrigger for deletions
2-adds a testObjects to trip onenter when creating or moving a trigger itself so that that will list objects already there as opposed to only going off when something moves into it
2020-06-13 12:12:52 -05:00
AzaezelX 136bc8874f adds an animspeed and animoffset to tsstatic instances so clones can be set to break up syncing on multiples 2020-06-13 12:08:01 -05:00
AzaezelX 494049c4f6 typofix in opengl terrain shadergen 2020-06-13 12:02:16 -05:00
AzaezelX afd836cc56 export rounds LODs to the nearest power of 2
prevent submeshes from flickering in and out due to lod mismatches when exporting groups to a singularr model file
2020-06-13 11:58:16 -05:00
AzaezelX 16a159992f adress #162 based on work by Chad Hall 2020-06-12 14:38:19 -05:00
AzaezelX 06abd3f1eb adress #203 2020-06-12 13:25:53 -05:00
Marc Chapman 913c8753d0 Linux Slash compatability 2020-06-12 06:24:54 +01:00
AzaezelX 4043015d2d adress #205 2020-06-10 11:52:47 -05:00
AzaezelX 4223a26f05 no message 2020-06-07 18:00:17 -05:00
AzaezelX 81a4e47235 crashfix-string deconstructor
validate we aren't either empty or using the reserved empty string before we release the pointed to value (as a note, the latter at least shouldn't have been required, but might as well be paranoid about it)
2020-06-02 17:10:39 -05:00
Areloch 69089e1ee2 Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into Preview4_0_MenuUIRework 2020-06-01 03:48:20 -05:00
Areloch a561d590ca Minor cleanups to guiGameListMenuCtrl 2020-06-01 03:32:45 -05:00
Areloch 3b47d41da2 Majority of options menu integration completed
Implemented keybind option type
Updated Pause menu to comply with new style
2020-05-25 00:51:33 -05:00
Areloch bc27125e90 Initial pass to rework and cleanup the main UI interface
Implements interface buttons that react to input type and visually display keybinds
Updates the T3D icon and splash screen
2020-05-20 17:19:52 -05:00
Areloch 6a5661ddc7 Corrected some path-slash wrongness 2020-05-17 15:27:16 -05:00
Areloch 9b7b09dce8 Adjusts the ShapeAsset autoImport invoke logic to actually use the C++-side autoImport logic
Changed originalImportingAssets to originalImportingFiles in the AssetImporter for naming clarity
Made autoImportFile properly return the assetId that was made
Additional logging in the AssetImporter
Adjusted the asset registration logic to support reimports, which merely refreshes the assetID
Added logic to shape asset importing to be able to import in an existing companion constructor cs file
Tweaked the TSStatic setShapeName logic so it will properly set fields depending on if the assetID was correctly set, or if we have the noShape fallback in use
2020-05-17 01:38:17 -05:00
Areloch 3f0195475d Merge branch 'alpha40TerainLayerHack' of https://github.com/Azaezel/Torque3D into Preview4_0_w_alph40_cleanups 2020-05-16 02:19:02 -05:00
Areloch 240aa571de Merge branch 'alpha40_explodeNorm' of https://github.com/Azaezel/Torque3D into Preview4_0_w_alph40_cleanups 2020-05-16 02:18:35 -05:00
Areloch 2c2c9659e1 Merge branch 'alpha40_HiddenHugs' of https://github.com/Azaezel/Torque3D into Preview4_0_w_alph40_cleanups 2020-05-16 02:17:24 -05:00
Areloch 638a515702 Merge branch 'alpha40_BandingBreakup' of https://github.com/Azaezel/Torque3D into Preview4_0_w_alph40_cleanups 2020-05-16 02:16:52 -05:00
Areloch 9b907e77ee Swaps some references from the windows SDK-specific FLT_MAX to T3D's F32_MAX
Takes the makeFullPath in findTSShapeConstructor and turn it into a string before passing it along to the Filename to make stricter compilers happy
Removed some referenced to fields that don't exist in the current build
Removed unneeded ASM language activation for the cmake files
Adjustments to material map assembling macros to better comply to stricter compilers
2020-05-13 02:10:11 -05:00
Areloch 39d9e6039c Merge branch 'alph40_cleanups' of https://github.com/Azaezel/Torque3D into Preview4_0 2020-05-13 01:29:58 -05:00
AzaezelX ebb7ed1b78 uninitialized variables-math 2020-05-11 16:17:40 -05:00
AzaezelX 5f59ebbacc uninitialized variables-materials 2020-05-11 15:59:22 -05:00
AzaezelX 36cbc4c962 uninitialized variables-verve 2020-05-11 15:53:14 -05:00
AzaezelX 43259e29c1 uninitialized variables-util 2020-05-11 15:46:44 -05:00
AzaezelX 9e1c22204f uninitialized variables-ts 2020-05-11 15:40:55 -05:00
AzaezelX c2e74f375a uninitialized variables-terrain 2020-05-11 15:37:43 -05:00
AzaezelX fabd5864fa uninitialized variables-t3d 2020-05-11 15:30:21 -05:00
AzaezelX 87603029db uninitialized variables-sim 2020-05-11 15:26:52 -05:00
AzaezelX a1a6143e01 uninitialized variables-sfx 2020-05-11 15:24:49 -05:00
AzaezelX 7392d598da uninitialized variables-scene 2020-05-11 15:20:03 -05:00
AzaezelX 8aa03a4ac9 uninitialized variables-renderinstance
(cherry picked from commit dcbc22bf8450250f192ae56b303affd760f63db1)
2020-05-11 15:17:09 -05:00
AzaezelX 522578074c looks like distance needs to default to 0, not max, for raycast purposes.
(cherry picked from commit 00ee743559e19bc2dd3cbf92060b8bf089d5aceb)
2020-05-11 15:15:48 -05:00
AzaezelX bd8a72005e uninitialized variables-platform
(cherry picked from commit 36fd324de7a29a8f4bb84b7622ae925acb1d3760)
2020-05-11 15:15:01 -05:00
AzaezelX bfcc83638d uninitialized variables-core-2
(cherry picked from commit 7c329699e4e4d13a164b2483e174b5f555ea9344)
2020-05-11 15:13:29 -05:00
AzaezelX b6c33bdd2b uninitialized variables-persistence 2020-05-11 15:12:50 -05:00
AzaezelX a46bf3d7e5 uninitialized variables-navigation 2020-05-11 15:08:57 -05:00
AzaezelX f52c3d5ed2 uninitialized variables-lighting 2020-05-11 15:07:21 -05:00
AzaezelX 9fef1b3cd1 uninitialized variables-gui 2020-05-11 15:03:27 -05:00
AzaezelX b9c207765e uninitialized variables-gfx 2020-05-11 15:00:25 -05:00
AzaezelX 1efb687867 uninitialized variables-environment and forrest 2020-05-11 14:56:04 -05:00
AzaezelX 2c1508c169 uninitialized variables-console 2020-05-11 14:40:31 -05:00
AzaezelX e9415a0994 uninitialized variables-collision 2020-05-11 14:33:59 -05:00
AzaezelX 1cea8ffacb uninitialized variables-core 2020-05-11 14:00:35 -05:00
AzaezelX 3c0360fd2f uninitialized variables-afx 2020-05-11 13:54:23 -05:00
Areloch 4978538490 Includes required support functions for ImageAsset 2020-05-11 02:30:58 -05:00
Areloch 3e36dbb06f Finished out primary comment documentation and initPersistField hook-ins 2020-05-11 02:08:07 -05:00
Areloch fb31f9d1e5 Implements the Asset Importer integrated into the engine, avoiding the need for calldowns into the tool suite to import assets 2020-05-10 03:48:08 -05:00
Areloch 157b114ec7 Added ImageAsset type mode for cubemaps.
Added new inspector type TypeShapeAssetId which is processed as a assetId string instead of an AssetPtr.
Added utility function to ShapeAsset to getAssetIdByFilename, which lets you find - if any exist - the asset that utilizes a given loose file. If it doesn't find one, it can attempt to run an auto-import if the editor settings allow, then proceed.
Fixed callback of the shapeAsset inspector fields so the Open in Shape Editor correctly binds the asset's shape to the editor for modification.
Added function to open a shapeAssetId in the shape editor to facilitate the above.
Added additional check to findShapeConstructor to look up the full path of the shape in the cases where a full path is provided instead of a local path. This prevents the shapeConstructor from not finding shapes that absolutely exist.
Added beginnings of Datablock representation in Asset Browser.
Fixed a few minor issues with asset auto import causing false positive errors, preventing Import or erroneous logging.
Fixed issue where editing of asset import configs didn't save.
Fixed logic of materials in asset browser so they will open in the material editor as expected.
Re-enabled AutoImport of assets editor setting by default.
2020-04-15 12:15:12 -05:00
AzaezelX 1a33d483a3 ensure we've got a known stateblock set for GeneratePrefilterMap 2020-04-14 12:40:31 -05:00
Areloch 4f1c0769b1 Merge branch 'Preview4_0' of https://github.com/Areloch/Torque3D into Preview4_0 2020-04-05 01:28:44 -05:00
Areloch 32d8acd1b3 Adds functionality to duplicate an existing asset, currently works with image and level. Other types to follow.
Adds editor setting for default target module, as well as if duplication of an asset should prompt for a new name, or proceed automatically with a default naming behavior.
Shifts collada loader logic back to collada from assimp until the oddities with the assimp DAE import configs is ironed out.
2020-04-05 01:28:34 -05:00
Areloch 8b0ca60b39 Merge pull request #152 from OTHGMars/assimp_scale
Assimp Importer: Shape format scales.
2020-04-02 12:56:38 -05:00
AzaezelX 112ad70328 crashfix for (some) gui elements
looks like we did in fact need to reapply shaders at the tail end of GFXD3D11Device::endReset or it looses track and crashes out
2020-04-01 21:10:40 -05:00
AzaezelX 9c71d5eace Merge branch 'Preview4_0' into alpha40_HiddenHugs 2020-03-29 17:40:22 -05:00
AzaezelX bf50af7954 show/hide children automagically for simgroups via inspector
operates by shifting oninspectpostapply callback further down the inheritance hieracrchy and add some scripts to trigger sethidden and setlocked for all sceneobjects in a given simgroup if the states are set for that group
2020-03-29 17:36:33 -05:00
AzaezelX d3059513e2 expose explosion.initialnormal to script for fine grained directional control 2020-03-26 17:09:01 -05:00
OTHGMars 76550a5859 Adds a format scale multiplier for shape formats that use a default unit other than meters. 2020-03-22 02:25:12 -04:00
Areloch 9524e77596 Merge branch 'alpha40_zonePicker2' of https://github.com/Azaezel/Torque3D into Preview4_0 2020-03-21 01:06:03 -05:00
Areloch 8b4d4633bc Merge branch 'Preview4_0' of https://github.com/Areloch/Torque3D into Preview4_0 2020-03-21 00:54:30 -05:00
Areloch 7029024b8e Updated TSStatic to utilize the getShapeAsset utility functions, and shifted the loader logic to utilize ShapeAssets exclusively, having straight file names go through the utility function to find/process a relevent asset. 2020-03-21 00:36:49 -05:00
Areloch 6ade6f08ce Updated Assimp
Added initial behavior for ImageAssets to hold a list of GFX resources of different texture profiles to avoid mem leaks with incorrect-typed usages
Added function to ImageAsset to get best-fit asset, allowing for fallbacks if the requested assetID is not found
Added function to ShapeAsset to get best-fit asset, allowing for fallbacks if the requested assetID is not found
Disabled fields for dynamic and static shadowmap refresh rates
Moved noShape model to core/rendering/shapes to place it in a more logical module position
Added an include to avoid undefined type compile error and removed unneeded semicolon from zone code
Added call to reload probe textures when a reloadTextures call is made
Adjusted default directional light shadowmap settings to not be as extreme
Added utility function to probe manager to allow any class to request a 'best fit' list of probes that would affect a given location, allowing other classes such as fog or particles to utilize IBL. Also updated probeManager's forward rendering to utilize same function to reduce code duplication.
Shifted shape loader code to utilize assimp for loader consistency and testing
Changed render bin used for SSAO postfx so it runs at the right time
Made Core_Rendering module scan for assets
Updated loose file references to a number of assets to follow proper formatting
Refactored asset import code to follow a more consistent object heirarchy structure on importing assets, allowing more reliable cross-referencing between inbound items
Updated asset import logic for materials/images so that they properly utilize ImageType. Images correctly save out the assigned image type, materials reference the images' type to know what map slot they should be used in. Importer logic also updated to better find-and-add associated images based on type.
Cleaned up a bunch of old, outdated code in the asset importer
Added initial handling for in-place importing of files without needing to process them through the UI.
Added ability to edit module script from RMB context menu if torsion path is set
Updated list field code for variable inspector to utilize correct ownerObject field
2020-03-19 09:47:38 -05:00
AzaezelX c9518f678a compilation correction 2020-03-15 00:15:58 -05:00
AzaezelX ef264083ae followuup to #837378a -safety checks for select within zone 2020-03-11 12:41:21 -05:00
Areloch 0e006b2264 Merge pull request #147 from Azaezel/alpha40_TranslucentShadows
adds alphatest shadows for translucent objects
2020-03-11 00:44:30 -05:00
AzaezelX a308261886 followup: convex shape translucent with alphatested shadow support 2020-03-10 16:11:41 -05:00
AzaezelX 9beaba0e60 HACKALERT: eat the low bit of the depth map to store off a copy of the blend total for norm|depth layer blending when layers exceed single passes. really should hunt down root causality there... 2020-03-08 17:25:27 -05:00
Areloch 0bf8eb5517 Merge pull request #145 from Azaezel/alpha40_zonePicker
select within zone pushbutton
2020-03-03 11:06:52 -06:00
Areloch 2d015bc426 Merge branch 'alpha40MakeMats' of https://github.com/Azaezel/Torque3D into Preview4_0 2020-03-03 10:48:07 -06:00
Areloch 954743f55c Merge branch 'alpha40_pathshape' of https://github.com/Azaezel/Torque3D into Preview4_0 2020-03-03 10:47:49 -06:00
Areloch f30aed628f Merge branch 'alpha40_zonePicker' of https://github.com/Azaezel/Torque3D into Preview4_0 2020-03-03 10:47:28 -06:00
Areloch afbc781d98 Merge branch 'alpha40_ReactiveRigidReorg' of https://github.com/Azaezel/Torque3D into Preview4_0 2020-03-03 10:47:12 -06:00
AzaezelX f956c17f3b for normal rendering, if we're translucent, don't use alphatesting. (as a remindernote, the shadowmathook removes MFT_IsTranslucent]) 2020-03-01 11:51:50 -06:00
AzaezelX ff4b025c2c adds alphatest shadows for translucent objects
leverage the fact shadergen spits out a modified material per pass, in this instance the shadow pass, to basically flip the translucent aspect off if you've got both translucency and alphatesting flipped on.
2020-03-01 10:47:25 -06:00
Areloch 9c381caea2 Added initial implement of Image Types for GFX resource management
Added logic to intercept TSStatic setting shape to try and utilize a shapeAsset if it can find a matching loose file
Added lookup logic for getting any textures inside collada files to streamline asset importing logic
Fixed modal behavior for Import config and import window
Initial implementation of loose file/legacy file importing
Adjusted Asset Browser and Asset Import refreshing behavior to queue to improve performance by avoiding multiple refreshes as well as potential infinite loops
Fixed volume visibility behavior
Fixed physics world viz toggle
2020-02-17 00:32:50 -06:00
Areloch f7b891442a Updated path handling for loose asset files for CPP, Image, Level, Material, PostFX, Shape, Terrain, TerrainMat and StateMachine assets to be more predictable in when and how they expando the loose file path into a full, useable path
Fixed loose file bindings for all associated slots in level asset, such as postFX file, decals, etc
Expanded TSStatic onInspect testcase to parse materialSlots and hook-in a specialized material field for editing/quick reference from the inspector
Adjusted expand behavior of guiTree to be more reliable
Added internal name 'stack' to inspectorGroup's stack child objects for easier access to add programatic fields
Removed redundant PreMult translucency type code
Added setting of feature so probes work when in forward/basic lit mode
Corrected indexing error in SQLiteObject class so it properly parses with the updated console API
Tweaked the FOV setting logic in GameConnection::onControlObjectChange to not be spammy
Fixed var when trying to bind the camera to the client
Added project setting field to dictate the default render mode between Forward or Deferred
Integrated MotionBlur PostFX into updated PostFX Editor paradigm and exposed the samples uniform as an editable field
Integrated DOF PostFX into updated PostFX Editor paradigm
Updated setting group name for vignette postFX
Shifted shaderCache to be in data/cache along with other cached files
Added helper function to replace strings in a file
Fixed ExampleCppObject asset to have correct loose file references
Adjusted editor default level logic so it can be modifed and then stored, as well as reset back to the original default
Fixed verve reference to root scene group
Adjusted location of a nonmodal gui profile so it loads at the correct time
Reorganized AssetBrowser loading and refresh logic so it doesn't stack multiple refresh requests back-to-back causing lag
Updated the search behavior to search not just the current address, but all child folders as well, making it far more useful
Initial work into zip and folder drag-and-drop asset importing support
Removed the import config setting for 'always display material maps' as it is redundant with the new importer context menu actions
Updated example asset type file
Ensured all asset types have proper handling for move, rename and delete actions
Fixed double-click behavior on folders in the AB
Fixed CPP asset preview
Added better logic to discern if a top-level folder belongs to a module or not in the AB directory browser
Added ability to convert a non-module top-level folder in the AB into a module
Added initial hooks for being able to generate a new Editor Tool, similar to how the AB can generate modules
Renamed CPP asset template files to have the .template so they aren't accidentally picked up by cmake
Fixed convex editor's material handling to work with AB and reference back properly
Updated AB images for folder up/down navigation buttons, and the breadcrumb divider arrow
Made PostFX Editor properly allow for input pass-through so you can still edit the level with it open
Added some additional common text gui profiles
Disabled calls to old editor settings logic in various editors to remove spam
Added callOnModules call so tools can initialize properly when the world editor is opened
Fixed logic test for visualizers
Added ability for cmake to scan tools directory for any tools that add source files
2020-02-04 01:47:28 -06:00
AzaezelX 245994dbdd Merge branch 'rigidshapeReorg' of https://github.com/Azaezel/Torque3D into alpha40_ReactiveRigidReorg
# Conflicts:
#	Engine/source/T3D/rigid.cpp
#	Engine/source/T3D/vehicles/vehicle.cpp
2020-01-22 05:33:47 -06:00
AzaezelX dbf34df71d select within zone pushbutton 2020-01-16 21:07:37 -06:00
Areloch a7b7f755a3 Merge pull request #144 from Azaezel/alpha40_editedCallback
adds an onInspectPostApply(%objectInsatnceID) callback
2020-01-14 19:27:04 -06:00
AzaezelX d872d84b9f adds an onInspectPostApply(%objectInsatnceID) callback triggered any time the inspector is impacted (so moving things, scaling them, or otherwise altering variables on a given instance via editor) 2020-01-12 17:25:08 -06:00
AzaezelX c082f13b71 missing extract bit 2020-01-12 00:40:00 -06:00
AzaezelX f7f8faf47e truly a community project, this has been kicking around since 2003 in various forms. adds a path following shape that can be ridden. 2020-01-11 23:58:30 -06:00
Areloch 5375a4b275 Merge pull request #140 from Azaezel/alpha40TerrainTricks
Alpha40 terrain tricks
2020-01-09 18:30:01 -06:00
Areloch 8f68cfbf1e Merge pull request #141 from Azaezel/alpha40ProbeFilter
hooks up missing probe capture filters
2020-01-09 18:29:45 -06:00
Areloch d840d52038 Added asset import logging
Added WIP of lighting viz logic to point and spotlight shaders
Made new asset window adhere to path-based system
Ongoing work to standardize asset import actions
Context-based Asset Import popups
Fixed behavior with adding a new sequence in shape editor
Made it so apply in PostFX editor no longer closes window
Work to re-add class visibility filters in editor
2020-01-09 18:28:53 -06:00
AzaezelX d75593bf6f hooks up missing probe capture filters 2020-01-01 22:37:27 -06:00
Areloch 7dc6ab42dc Merge branch 'Preview4_0_ShadowCache_Component_Cleanup' of https://github.com/Areloch/Torque3D into Preview4_0 2019-12-23 23:24:47 -06:00
Areloch c0dd314c12 Changed default terrain paths to go into data/terrains if nothing is set
Added default terrianmat definition for warning_material
Corrected separator-h image path for a few GUI controls
Corrected SelectAssetPathWindow reference so it focuses the window right
Changed new asset window to work with new Select Path window and address system
Added call to force AssetBrowser to load/initialize when the tools are initialized(ensures anything utilizing assets in other tools don't have reference issues)
Standardized drag-n-drop move behavior in the Asset browser so dragging onto the folder tree and a folder in the browser both behave more predictably
If import config is set to not allow importing with errors, then the Done button is disabled when errors are detected
Updated the example assettype file for the AB
Fixed up move/delete/rename behavior for folders in AB
Begun full standardization of move/delete/rename actions for other asset types in AB
Added standardized call for New Asset field fillouts by letting the asset types populate them
Moved terrain block creation to the standard create call so it can accept other normal fields like resolution
Updated the 'Do you want to create' terrain block prompts to generate the asset if yes, and if no it'll prompt to go find an existing terrain asset
Added placeholder image for terrain material asset for preview
Updated refresh behavior for terrain material assets so they properly populate on creation now
Added standardized functions to the directoryHandling class for folder/file manipulation
Corrected some warnMat image references
2019-12-23 12:37:55 -06:00
AzaezelX 596dcb935d general cleanup GLSL side for terrain 2019-12-21 08:49:47 -06:00
AzaezelX 9ae1af645c work towards getting the materiallist generated by things like preload to spit out most if not all to-be-used variants for a given used material. ostensibly add reflection and deferred variants. will take a bit more doing to cook up mats for all the shadow variants, since it looks like that ends is more light-type based for some oddball reason (think i'm probably be misreading that end, since mats there should really just be as simnple as an occludes-or-doesn't based on alphatesting case with very few variations on that theme indeed...) 2019-12-20 23:27:44 -06:00
AzaezelX 29a8d5d36c backend support for isSRGB and invSmooth flags, general cleanup HLSL side. left GLSL alone for sxs comparrison while we work out the kinks 2019-12-17 19:26:47 -06:00
Areloch 66cc6fb9d1 Removes current implement of shadow caching
Also removes EC stuff as it's not ready for prime-time yet
2019-12-13 01:14:03 -06:00
Areloch f007700646 Merge pull request #133 from Azaezel/alpha40MacFixes
mac crashfix and compilation correction.
2019-12-08 15:55:00 -06:00
Areloch a43233d9c9 Updated move folder behavior to better update the module and asset databases of changes
added dynamic reload on editor profiles when the theme is changed via editor
Adjusted direct filename fields to just be hidden, not disabled(avoids breaking legacy content)
Added ability to update asset references in a given folder path
Added WIP ability to scan for and update module dependencies
2019-12-08 15:54:37 -06:00
Brian Roberts c0226d4640 mac crashfix and compilation correction. the former's down to a typo, the latter, needed specification for which class->setTexture(near identical sig) to use 2019-12-05 21:30:01 -06:00
Areloch 09c651c26d Corrected profile for GameObjectAsset type field button
Initial implementation of changeable TSStatic materials via material slots and drag and drop of material assets onto world editor from AB
Updated Volumetric Fog to support ShapeAsset for it's model data
Added cmake option to hide literal filename fields if the class supports asset fields for the same input
Added light viz modes to see diffuse, specular and detail lighting modes(currently just sun)
New raycast console function to return back material of hit object
Moved GameObject logic to SceneObject and started fixing up of editor behavior to allow any SceneObject to be converted into a GO, along with all supported behavior such as instance-template management and spawning GO via drag-and-drop from AB
Fixed inspector field tooltip text to be positioned in inspector footer properly again
Drag and drop of shape asset attempts to drop at raycast position now, instead of just at the camera ray position
2019-12-05 20:42:47 -06:00
Areloch b1e3706dd6 Removed unneeded deletion of asset definition in various asset deconstructors - was causing crash on shutdown when a new asset was made
Added ability to check if popup menu is currently Visible
Removed unwanted path debug/testing code from tsShapeConstructor
Made a number of default postFX's names more consistent and set up asset definitions for them. Began adding hooks to PostFX editor as well
Refactored Asset Import window with new layout, revamped import behavior to work with new layout concept and easier editing of import 'session'
Updated Asset Browser to utilize a common 'DirectoryHandler' object to standardize/centralize all folder navigation behavior for the asset tool ecosystem
Added new window to select path for assets
Refactored import config editor to be easier to utilize
Added field in editor settings to edit import configs without needing to first try and import assets
Updated a number of asset types' scripts to handle address-based system
Began standardizing a number of 'actions' for the asset browser, including drag-n-drop, renaming, deleting, moving, etc.
Made refreshing behavior of AB more consistent
When making new in AB folder, it will automatically navigate to the new folder
When making a new folder, prompts the folder name via new popup window
Refactored PostFX editor to use newer layout with side list for easier use
2019-12-03 00:09:18 -06:00
Areloch b2fcd5e7fb WIP corrections for drag-n-drop handling for cubemap and shape asset types
Added ability to override radio button behavior when selecting items in popup menus
Added ability to turn on rotation snapping as a setting, with SHIFT just inverting the rot snap mode
Implemented proper asset type filtering, complete with multiple type selection, and listing of active filters in AB footer. Selectable via visibility popup Menu
Moved asset preview button generation from code to template GUI file
added ability to move asset with drag-n-drop(Image asset only so far)
New AB folder icon
Properly link image asset fields to material asset if 'AlwaysPresentImageMaps' config setting is active
2019-11-24 06:52:34 -06:00
Areloch 27ee09e491 Merge branch 'alpha40_premul' of https://github.com/Azaezel/Torque3D into Preview4_0 2019-11-22 21:27:52 -06:00
Areloch ac77315e29 Merge branch 'alph40_pbrConfig_BREAKINGWip' of https://github.com/Azaezel/Torque3D into Preview4_0 2019-11-22 21:24:59 -06:00
AzaezelX bd21a207ef largely based on work by @rextimmy: add premultiplied alpha 2019-11-22 10:02:01 -06:00
Areloch 60d0e73190 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 72ceede272 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 c74b669f5e 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 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 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 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 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
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
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
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 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 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 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 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
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
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 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
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 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 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 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 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 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
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
AzaezelX 022b87cac2 from user Ewyncat: adds invcameratrans, cameratoscrren, and screentocamera postfx and shader matrix interfaces.
also a bit of backend work to normalize those later once we've proof-of-concepted the calcs
2019-09-06 14:25:17 -05:00
Areloch 7c3bd49615 Adds ability to adjust padding to guiTextListCtrl's rows
ForcedMaterialMeshMgr tweaked to allow proper setting of override material
Ongoing WIP of update/fixing of options menus
WIP of expanded visualizers, including material complexity viz
Adds no-pie flag when compiling on linux with non-clang compilers
2019-09-06 00:00:17 -05:00
Areloch d720eb8ccd Makes the graphics menu in the stock UI mostly functional again
Adds sanity check to editing of gameasset script action in asset browser
Updates module template file
Updates visualizers
Fixes checking of popup menu items
Adds stub for TerrainMaterialAsset
2019-08-29 00:22:33 -05:00
Areloch 07b8619bf3 Changed findModule default version value to 1 to match default module version number
Added running of onCreateGameServer and onDestoyGameServer callOnModules for core modules as well to enable default datablock stuffs
Added default datablocks, materials and shaders for some base required objects such as spawn markers, ribbon particles and the like.
Includes ExampleModule to act as a template/documentation case for how modules should be set up
Includes GameUI module so there's a PlayGUI gui object by default.
2019-08-28 00:56:24 -05:00
Areloch ca38fff31a Merge branch 'alpha40LINwork' of https://github.com/Azaezel/Torque3D into Preview4_0 2019-08-27 19:10:38 -05:00
Areloch 210009e498 Merge branch 'alpha40vertcolorCorrection' of https://github.com/Azaezel/Torque3D into Preview4_0 2019-08-27 19:10:25 -05:00
Areloch 6d2699cb1e Merge branch 'alpha40Terrainfix' of https://github.com/Azaezel/Torque3D into Preview4_0 2019-08-27 19:09:55 -05:00
Areloch 34d370c4f5 Merge branch 'Preview4_0_w_translucencyWIP' of https://github.com/Azaezel/Torque3D into Preview4_0 2019-08-27 19:09:35 -05:00
AzaezelX 4e984cfd40 from @rextimmy - linearcolor set and = operators 2019-08-22 07:03:48 -05:00
AzaezelX ccb500f0ca leftovers from when we added explicit 16 bit greyscale texture support 2019-08-22 04:33:38 -05:00
AzaezelX 059d531b62 linux followup work by tim 2019-08-21 03:12:54 -05:00
Areloch 600859bd63 Force proper update of box probe when attenuation changes
Fixed multiple case sensitivity issues
Adds GL ARB check for cubemap arrays for certain cases where the driver only supports the extension, not as core
Fixes undeeded namespace declaration in an inline operator function
Cleaned up/reordered some modules default in the data dir
WIP of Das Boot test map
Begun refactoring visualizer tools
Added default cloud and water textures to core/rendering so water and cloud objects work correctly
Added default Fog_Cube mesh so volumetric fog works correctly
2019-08-19 01:14:34 -05:00
Areloch ab9fc302fc Added D3D error code interpreter
Added sanity check for findMatch
Finished most of asset importer logic to utilize settings system
Cleaned up code for finding associated files
Added General importer settings category and integrated logic for those settings fields
Updated logic in variableGroup to support callbacks in custom fields
Updated logic in variableInspector to better handle callbacks, as well as being able to manually update when manipulating fields
Updated scripts to utilize project settings values for playGUI and mainMenuGUI names
Improved module-oriented loading of materials
Added util function for populating custom fonts
2019-08-12 01:04:17 -05:00
Areloch 02262b014a Removed test lines 2019-08-07 01:28:34 -05:00
Areloch 3f2770bea4 Adjusted init'ing logic to defer to project settings for the name of the play gui and mainMenu gui instead of hardcoding them 2019-08-07 01:27:39 -05:00
AzaezelX b3d376d085 Merge branch 'Preview4_0_w_translucencyWIP' of https://github.com/Areloch/Torque3D into Preview4_0_w_translucencyWIP 2019-08-05 01:34:23 -05:00
Areloch 1228fbcb78 Implemented initial pass at proper client/server separation handling for module initialization
Added GameModeName to Scene
Added function to get number of active scenes
Added logic to level/client loading to enact gameplay mode logic driven by either Scene's GameModeName or project setting's default game mode
Added template module.cs file for module creation and adjusted new module logic in AssetBrowser to create off template
Updated FPSGameplay code to have deathmatchGame mode work with new GameMode logic
Updated EmptyLevel scene to define deathMatchGame as gamemode
Updated FPSGameplay module script to properly client/server initialize
2019-08-04 23:21:28 -05:00
Jeff Raab da18eaff45 Initial implementation of separated client and server create/destroy functions for module setup
Implements fix so cubemap arrays load correctly when texture resolution settings have been lowered
Begun refactor of asset import config editing/settings.
2019-08-01 01:38:36 -05:00
AzaezelX 5112a98388 dx11 debugresult interpreter method (plugged into where we are finding issues with the material::mul switch on stateblocks 2019-07-22 08:39:51 -05:00
Areloch 2f68fdae5e Merge branch 'Preview4_0_w_translucencyWIP' of https://github.com/Azaezel/Torque3D into Preview4_0_w_translucencyWIP 2019-07-22 00:17:29 -05:00
Areloch ebe2c2dead Add vector light support to forward materials. 2019-07-22 00:16:58 -05:00
AzaezelX b6c28638b0 crashfix: we don't actually need the texture coordinates for forward lit surface creation. at that point, the rest of the shader features have already filled out the info being looked up from the gbuffer for deferred. (was triggering errors with float2 vs float3 coord entries for terrain) 2019-07-21 23:03:32 -05:00
AzaezelX 9859d9b7bc 'correct' refscale back to mismatching between forward and deferred. Because Reasons. >.> 2019-07-21 23:01:15 -05:00
Jeff Raab 38b0d0f1fe Updates names of probe forward shader consts to be consistent with shadergen, allowing proper data throughput 2019-07-16 09:34:31 -05:00
Jeff Raab 5088197d05 Merge branch 'alpha40translucency2' of https://github.com/Azaezel/Torque3D into Preview4_0 2019-07-16 08:34:38 -05:00
Areloch 89128ce14a Post FX script file initialization 2019-07-15 00:38:53 -05:00
AzaezelX e83eabcb87 refbox calc parity, and killed off some doubled up alpha subtraction 2019-07-14 10:44:50 -05:00
AzaezelX 09c8e70e1c Merge branch 'Preview4_0' into alpha40translucency2 2019-07-11 03:45:21 -05:00
Areloch 98f50a4453 Fixed probe cubemap reindexing assignment
Fixed BRDF texture binding in forward pass so it doesn't screw with the probes or regular lighting results during bakes
Fixed early-out check on probe manager so probes can be rendered during reflect pass as well.
2019-07-10 23:41:55 -05:00
AzaezelX bc77ff0833 Revert "Updated SDL, Bullet and OpenAL soft libs"
This reverts commit 370161cfb1.
2019-07-08 09:49:44 -05:00
AzaezelX 63be684474 Merge branch 'Preview4_0' into alpha40translucency2 2019-07-08 04:11:57 -05:00
AzaezelX 3cf332e514 logic cleanup. discount doubleups on normal generation if we've already got one calculated on out. 2019-07-07 22:52:23 -05:00
Areloch f8750dd8ed Updated SDL, Bullet and OpenAL soft libs
Fixed case sensitivity problem
Fixed clang compiler problem with having the class namespace used in an inline for the == operator
Tweaked some theme stuff to be more consistent.
Added initial test of no-pie for linux
test sidestep of getTexCoord in shadergen hlsl feature so we don't assert when getting the terrain's shaderstuffs(which uses float3 instead of normal float2)
2019-07-07 02:43:49 -05:00
AzaezelX 1ec9177557 augment ShaderFeatureHLSL::getSurface pixel shader feature with a fallback for missing normalmaps (really should correct this one vertex frag side) 2019-07-02 19:26:20 -05:00
AzaezelX e51726aac6 albedo/diffuse color designators to curColor for clarity there (includes the case of color*albedo, so that was a misnomer) 2019-07-02 19:24:25 -05:00
AzaezelX 2a5ab66718 unused var cleanups 2019-07-02 19:22:55 -05:00
Areloch e87dc787ee Corrected probe init'ing so they don't fight for the cubemap idx order
Also correct deleting behavior so it updates indicies when a probe is removed
Updated forward lighting to utilize the same math as deferred
2019-06-30 23:04:16 -05:00
Areloch a2aa241c92 Merge branch 'alpha40Probework' of https://github.com/Azaezel/Torque3D into Preview4_0 2019-06-29 03:11:58 -05:00
Areloch 0eca610c50 Merge pull request #56 from Azaezel/alpha40_4_entityComponentCleanup
Alpha40 4 entity component cleanup
2019-06-29 02:43:46 -05:00
AzaezelX 4d714091b7 missed a few conversions 2019-06-28 10:56:38 -05:00
AzaezelX 01f6938746 nomenclature shift for clarity: bunch of stuff tagged as probe that refferenced things properly tied conceptually to the reflection refrence box. 2019-06-28 10:21:50 -05:00
Areloch af77444ec9 Merge branch 'MatInstanceViewer' of https://github.com/Areloch/Torque3D into Preview4_0
Fixed up forward IBL
Reimplemented old forward light shader code as a baseline so it can be updated to new PBR math
2019-06-27 00:36:56 -05:00
Areloch e5c12f4aab Reduce console spam from probe manager when not in debug
Added ability to activate height override on inspector fields from script
Further refinements of theme usage as well as editor settings
2019-06-17 23:48:20 -05:00
Areloch 07b28cb29a GFX card profile config file logging moved to debug only
WIP mode of guiSliderCtrl to be a filled rectangle instead of a textured UI
Fixed bug with guiTextEditCtrl losing focus updating history passing malformed strings
Updated WIP options menu
Editor/Project settings WIP
Updated editor theme to be consistent, and feed off the editor settings
Updated popup menus to reference renamed profiles
Added more in-progress modules for examples/stress testing
2019-06-17 02:30:45 -05:00
Areloch dd3422b5a2 Added ability to pass ints to post effect shader consts
Reorg'd probe init to flow better and be more robust on load
Cleaned up various parts of the probe render manager to be more stable
Fixed issue with crash on release due to numProbe in loops being 0
Updated glsl probe array shader
Beginning of rework of editor settings
Beginning of conversion of asset import config to similar system as editor settings
2019-06-13 00:37:12 -05:00
Areloch b40d33a663 WIP of shifting the skylight cubemap to be packed into the cubemap array 2019-06-05 01:04:47 -05:00
Areloch 27b304eec3 Various fixes
Separated baked cubemap load/processing logic into a separate function for clarity
various corrections for when fields change so it properly notifies down to the client
Fixed enable flag logic to actually work
Fixed skylight enable flag so it properly disables if flipped off
2019-06-05 00:07:46 -05:00
Areloch a552471e4e Reorg of the probe initialization/update code to streamline parts of it, and make it flow more obviously
Added some initial asset stuffs for Das Boot for building out a better testing level.
2019-06-04 00:21:52 -05:00
AzaezelX 7832458005 component vector cleanup cleanup 2019-06-03 15:12:56 -05:00
Areloch 17cec11b97 Added refactor of Editor Settings window
Various fixes for asset handling.
WIP of crash tracking
2019-06-03 02:47:30 -05:00
Areloch d4e55c1bf3 Merge pull request #55 from Azaezel/alpha40_createCompositeCorrection
Alpha40 create composite correction
2019-05-30 23:58:13 -05:00
Areloch f2ea040a0e Merge pull request #53 from OTHGMars/assimp_gltf_mats
Assimp Importer: Activates assignment for material light maps.
2019-05-30 23:57:27 -05:00
Areloch ae857faae2 Adds test shapes of Kork and SpaceOrc
Sidestep of memleak from CSF at the moment
Minor fixes and corrections with asset importing and loose files
WIP of updated options menu
2019-05-28 17:24:29 -05:00
AzaezelX 35ea209827 corrects a leak found with createcomposite 2019-05-28 17:13:05 -05:00
Areloch 98c4606b3c Removed test custom shader bindings until memleak is corrected. 2019-05-27 13:06:15 -05:00
Areloch 8196ad9d32 Removed old code that set the BRDF texture and caused a texture profile conflict with the probe array post effect, leading to a crash.
Renamed hasSkylight to mHasSkylight to avoid var ambiguity.
2019-05-26 03:13:16 -05:00
OTHGMars 2320b59bed Activates assignment for material light maps. 2019-05-26 03:21:42 -04:00
Areloch d9f80140f1 Include materialball shape asset info
Includes spectatorGameplay by default for streamline testing for now
Adds in reparentItem for GuiTreeViewCtrl
Added gitignore to shaderCache/.gitignore
Fixed material asset import logic to properly parent included images to the material
Includes D3D_Compiler47.dll for dependency compliance, and modified cmake file to not install said dll if not using D3D11 API
2019-05-25 03:37:18 -05:00