Commit graph

359 commits

Author SHA1 Message Date
Brian Roberts 52ecd8bb0f
Merge pull request #395 from Areloch/MarkActiveScene
WIP of marking active scene in the scenetree
2020-12-19 02:35:58 -06:00
Brian Roberts 7dc6fc8abf
Merge pull request #415 from Areloch/GroundPlaneAssetify
Converts GroundPlane to utilize assets
2020-12-19 02:35:32 -06:00
Areloch fb5195dd44 Corrects groundplane assigned material in the example and editor levels
Assetifies GroundPlane's handling of it's material field
2020-12-19 01:43:52 -06:00
Areloch 3821ddd15a Merge branch 'GroundPlaneAssetify' of https://github.com/Areloch/Torque3D into Preview4_0 2020-12-18 14:12:54 -06:00
Areloch 8f60d03830 Adjusts Asset Importer logic when looking up and saving out a newly created ShapeConstructor so that it doesn't duplicate a definition it one already exists.
Adds _ORM and -ORM suffixes for PBR-ORM map import rule
Tweaks naming convention for IgnoreNode/Meshes and ImportNode/Meshes to be clearer via the prefix 'Always'
Fixes a token typo in suffix parsing, and adds \t to token deliniation for all suffix parsing to asset importer
2020-12-18 00:55:01 -06:00
Areloch 334cd1d205 Adds function to better report active device type from GFXDevice
Ensures Window title and options menu correctly displays available and active render api
Fixes AA option so it correctly toggles FXAA
2020-12-12 23:04:50 -06:00
Brian Roberts 9be3151cb0
Merge pull request #400 from Areloch/PostFXEdFix
Fixes logic that checks if a postFX was enabled so the PostFX Editor works properly
2020-12-07 14:04:09 -06:00
Areloch d25e9d64dc Fixes logic that checks if a postFX was enabled so the PostFX Editor works properly
Corrected the enabled variable hook-in for the SSAOPostFX
2020-12-07 00:00:53 -06:00
Areloch b0f977b810 Fixes opening of Gui Asset from AB so it correctly opens the GUI editor, making the toolbar appear
Fixes typo'd name for material-editor menubar image
Adds probe menubar images
Adds setting menubar images
Adds probe and settings buttons to menubar
Removes unneeded tab from class visibility window popup
2020-12-06 08:48:35 -06:00
Areloch 7b6ee8a453 Adds handling so the pause menu has a button to exit the editor as a quick shortcut 2020-12-03 19:58:51 -06:00
Brian Roberts 6b58d4b8ca
Merge pull request #388 from Azaezel/alpha40_objectEditorAssetRef
hooks up shapebase children breadcrumb
2020-12-03 13:49:30 -06:00
Brian Roberts 6779e486dc
Merge pull request #394 from Areloch/DragNDropFixes
Fixes Datablock and Prefab DragnDrop behavior with the AB
2020-12-03 12:45:09 -06:00
Brian Roberts 217b691f4e
Merge pull request #393 from Areloch/DeleteModuleAction
Adds ability to delete a module
2020-12-03 12:44:55 -06:00
Areloch 27cf3466c3 WIP of marking active scene in the scenetree 2020-12-03 00:31:23 -06:00
Areloch a43abffed2 Fixes Datablock and Prefab DragnDrop behavior with the AB 2020-12-03 00:19:16 -06:00
Areloch 941cfb6d40 Adds ability to delete a module 2020-12-03 00:15:24 -06:00
Areloch 2ce48d0e6f Cleanup of some log errors and spam with assets 2020-12-03 00:11:35 -06:00
AzaezelX 6f23eed8e0 hooks up shapebase children breadcrumb
(lets you select an object-instance in game and review it via the shape editor)
TODO: hutn why lists aren't propagating
2020-12-01 13:36:32 -06:00
Brian Roberts 6441ecd941
Merge pull request #317 from Areloch/ShapeBaseDataAssetify
Implements hook-look-up logic for shape assets to ShapeBaseData including autoimport handling
2020-11-27 18:04:16 -06:00
Areloch bca972ae24 Adds a flag to the guiGameListMenuCtrl to allow consuming of key input events. This allows for overriding other active keybinds that may be in play when a menu is active. 2020-11-21 02:35:05 -06:00
AzaezelX 1e107ceb94 Merge branch 'Preview4_0' into alpha40_lightreview
# Conflicts:
#	Templates/BaseGame/game/core/rendering/shaders/gl/lighting.glsl
2020-11-16 04:23:00 -06:00
AzaezelX 70358d0dbc yet more PostEffect::isEnabled -> enabled that somehow slipped through the search filter 2020-11-15 21:36:11 +01:00
AzaezelX 48a38f61ef Field PostEffect::isEnabled -> enabled followup
GuiScriptNotifyCtrl::onXXX->notifyOnXXX followup
2020-11-15 21:36:02 +01:00
AzaezelX 6ee6d7c717 Field PostEffect::isEnabled -> enabled followup 2020-11-15 21:35:51 +01:00
AzaezelX 39574e7fee clamp factor entriely for getXXXLight calcs, and take metalness into account for reducing direct light diffusion imact (while this seems to make it match the tooling, I can't say I've seen this exact approach used, so might want to re-review the methodology) 2020-11-13 15:24:12 -06:00
AzaezelX c0b6007b9f undefined preprocessors on some machines eval to true. given this is purely a bool anyway, might as well stick to ifdef 2020-11-13 15:19:50 -06:00
AzaezelX 2d18d5b280 clamp borghtpass filter return values to smooth out bloom 2020-11-13 15:18:20 -06:00
Brian Roberts f5f0eb2bb4
Merge pull request #378 from Azaezel/alpha40MacCompilePreprocessor
shader preprocessor fixes
2020-11-11 12:20:33 -06:00
AzaezelX d76a76a1c4 shader preprocessor fixes
some hardware/apis do not evalueate 'not defined' as '0', so always ensure there's *some* value when doing macro value comparisons
2020-11-10 13:57:26 -06:00
AzaezelX eb365fc866 be sure to executte defaults prior to clientprefs to ensure nothing gets missed 2020-11-04 16:31:17 -06:00
Brian Roberts e3b8c7b001
Merge pull request #373 from Azaezel/alpha40_HDRfixes
get gl side HDR compiling, attempt clamp to keep bloom in range
2020-11-03 21:28:19 -06:00
Areloch 388a700a53 Implements material asset handling for GroundPlane object
Adds handling for finding material asset akin to shape and image assets
Updates the material asset inspector field to follow the current standard
Updates prototyping material assets to correctly have materialDefinitionName assigned
Fixed material asset import step to properly assign materialDefinitionName
Fixed typo in material editor icon name
Added logic to editAsset function call so it can also parse assetIds
Changed DefaultEditorLevel to utilize FloorGray material
Adds proper NoMaterial asset for fallback purposes
2020-11-01 23:32:34 -06:00
AzaezelX be8988b1a3 remove gl side TORQUE_HDR_RGB16 macros. doesn't exist DX side, and seemed to be causing issues 2020-11-01 20:19:49 -06:00
Areloch 9ca276fef0 Misc fixes to ensure that the default postFX save, load and editing process is valid
Also fixes it so if a level asset doesn't point to a valid postfx preset file, it'll generate a clean one on save
2020-11-01 15:39:30 -06:00
AzaezelX 5be1b77791 get gl side HDR compiling, attempt clamp to keep bloom in range 2020-10-30 00:15:08 -05:00
Brian Roberts 72ee2260ca
Merge pull request #370 from Areloch/MiscBaseGameUIFixes
Misc. BaseGame UI fixes
2020-10-28 20:24:33 -05:00
Areloch d83fc0b232 Adds check so we only do the pausing of the audio/sim when opening the pause menu when it's single player 2020-10-25 14:40:32 -05:00
Areloch f47e3f395a Adds a sanity check so asset names cannot start with a number, which would be an invalid object name, 2020-10-25 12:26:42 -05:00
Areloch db6c63d424 Adjusts guiGameListMenuCtrl.cpp to handle Left and Right keys to adjust options, which simultaneously fixes the 'jiggle' issue on the options menu of the BaseGame base UI
Per Steve's suggestion, put a pause on gameplay sounds alongside the game sim being paused when the pause menu is opened.
Nudges the keybind preview image for guiGameListMenuCtrl to be better centered
2020-10-25 02:51:52 -05:00
Areloch 6a3603c737 Overhauls the handling of probes to utilize an active probe list to improve performance and allow a greater total number of active probes in a scene.
Also fixes handling of metal materials during bakes to render properly, and fixes a possible double-up return in findObjectByType, which could cause doubling when getting probes in the scene
2020-10-19 00:53:09 -05:00
Brian Roberts 3851612b91
Merge pull request #361 from Areloch/LevelAssetLoadConsistency
Updates some level asset functions and script handling
2020-10-17 16:21:01 -05:00
Areloch c0203e13e9 Basic prototyping module initial upload 2020-10-16 22:12:05 -05:00
Areloch 837983c767 Adds script function to access full path of the level asset's preview image file
Updates script function descriptions to be correct
Updates chooseLevelDlg functions to be more efficient and consistent, and use the exposed get methods for getting preview images and the like properly
2020-10-13 18:44:42 -05:00
AzaezelX 93e00a8242 clip ./ when doing pattern matching 2020-10-12 02:32:16 -05:00
AzaezelX e8ca1a6705 postfFx to postFX dir listing fixes 2020-10-09 12:56:38 -05:00
AzaezelX 4a11b0dea3 underwater fog fix 2020-10-09 12:42:43 -05:00
AzaezelX 4c982a4b29 fix gl compilation 2020-10-08 21:38:43 -05:00
AzaezelX 7d63f114fa followup 2020-10-05 15:50:45 -05:00
AzaezelX 09f9b5351c replicate exec signatures for queueExec 2020-10-05 15:19:04 -05:00
Lukas Aldershaab b6d7fdd7bd Fix paths in caustics shader 2020-10-05 00:51:06 +02:00