Commit graph

4345 commits

Author SHA1 Message Date
Areloch 5289fdf7f1 Re-implements the dynamic cubemap mode option for reflection probes 2020-09-11 02:13:05 -05:00
Brian Roberts c2bbab774a
Merge pull request #308 from Areloch/MiscFixes20200831
Misc fixes for Asset Browser navigation, scene asset utilization and editor settings
2020-09-10 12:55:39 -05:00
Brian Roberts 326690cccc
Merge pull request #310 from Areloch/MiscFixes20200907
Misc asset browser/asset creation fixes
2020-09-10 12:55:18 -05:00
Areloch c51adb6c1c Fixes regression of Select Asset Path selection
Fixes setting for showing core and tools dirs in Asset Browser
Fixes path for newly created PostFX, state machine and cubemap assets
Improves logic for getModuleFromAddress from asset browser directory handler
Prevents error if no field was edited in the Create New Asset window before hitting the create button
Forces acquiring newly created asset just so they can be utilized immediately
Updates PostFXAsset template files to better hook in and provide a better example of basic behaviors.
2020-09-08 01:22:57 -05:00
Areloch c5bccd8ff4 Adjusts getUtilizedAssets writeout so it more consistently prints out the dependent assets
Adds handling for prefabs with getUtilizedAssets
2020-09-08 01:04:41 -05:00
Areloch 0b954459a3 Added recursive scanning for utilized assets on any object within the scene, soas to catch objects in simgroups or parented
Disabled initial materialSlot fill-out until logic for looking up assetName from material list name can be done to avoid 'unable to find assetid' spam
Added function to SimGroup to easily acquire child object by index
Some minor cleanup of commented lines in asset browser
Fixed forward/backward navigation arrow behavior in asset browser
Fixed double-click navigation when the AB is in select mode
Fixed erroneous 'could not acquire asset' messages when navigating folders in AB
Added editor setting for UseGroupSnap snap option and integrated it into the UI interface
Removed some duplicate settings from the EditorSettingsWindow
2020-09-02 01:26:43 -05:00
Brian Roberts 82f7db3d48
Merge pull request #306 from Areloch/MiscFixes20200828
Misc Fixes for level saving and selecting asset paths
2020-08-30 07:24:04 -05:00
Brian Roberts 48b79ebec7
Merge pull request #307 from Areloch/MiscFixes20200830
Misc editor settings fixes and additions
2020-08-30 07:23:56 -05:00
Areloch 8824ee9a2a Added autosave logic to the world editor. Via a schedule, it will autosave to tool/autosave to create a backup of the current dirty scene
Fixed RMB menu on multi select objects in the Scene Tree so it will properly display the full list of actions
Fixed up several spots of editor settings fields being incorrect copy-pastes
Integrated AssetBrowser tool into the standard initSettings hook-through for proper default settings integration
Added Editor Theme settings to the default value init'ing of the World Editor
Shifted exec of editor settings default values as part of the initial editor load to ensure that if the settings.xml is deleted, theme info reverts back to the default
Integrated Convex Editor's settings into new EditorSettings window system
Added several missing World Editor settings to Editor Settings Window
2020-08-30 04:59:26 -05:00
Areloch f3fe2298d5 Fixes level save as logic to correctly name new level's scene object to match, and helps ensure you're editing the right scene.
Added New Folder button to Select Path window
2020-08-29 04:22:58 -05:00
Brian Roberts 8611e7090a
Merge pull request #304 from Areloch/MiscLightFixes20200828
Misc. Fixes and cleanup for lights
2020-08-28 14:59:48 -05:00
Brian Roberts 4c63090a6f
Merge pull request #305 from Areloch/OpenShapeEditorFix
Fixes logic when opening shapeEditor with a TSStatic selected
2020-08-28 12:02:24 -05:00
Areloch 55e24926e4 Fixes logic when opening shapeEditor with a TSStatic selected, it'll attempt to load up the shapeAsset if one is set on the static. 2020-08-28 02:49:26 -05:00
Areloch ae70cccfde Fixes de-selection logic in editor that caused special cases to permanently be selected such as mounted Lights
Shifted every-frame RT allocation to be stored in advancedLightBinManager
Remove deprecated references to dynamicShadowMap in light materials
Updated spotLight shaders to remove deprecated dynamic shadowmap reference which was causing a crash when spotlights had shadows turned on
Added GLSL version of Viz_SurfaceProperties so it works on both APIs
2020-08-28 01:57:06 -05:00
Brian Roberts 31039de2cf
Merge pull request #303 from Areloch/MiscFixes20200826
Miscellaneous small issue fixes
2020-08-26 18:19:51 -05:00
Areloch 7405453123 Fixes issue where it would try and load a SIS file even if it doesnt exist
Fixed warning about use of invalid function 'setEnabled' instead of 'setActive'
Fixed formatting of a schedule call in ExmapleGameMode
Fixed EditorOpenMission logic to correctly get and use levelAsset
Removed unneeded continues from menuInputButtons' refresh()
Updated settings.xml to have sorted order for future consistency
2020-08-26 13:40:04 -05:00
Brian Roberts 5544951b5d
Merge pull request #302 from Areloch/soundAndAnimationAssetImport
Integrates sound and shapeAnimation assets into the importer
2020-08-25 00:23:05 -05:00
Areloch 1942535923 Integrates sound and shapeAnimation assets into the importer
Added drag-n-drop spawn action for soundAssets
2020-08-24 20:24:50 -05:00
Brian Roberts a71537488c
Merge pull request #301 from Areloch/AssetMaterialLookupsAndSis
Material Asset import lookups and initial re-integration of sis files.
2020-08-24 15:40:52 -05:00
Areloch d06c99a088 Adds function to get material definition by mapTo usage
Re-enables logic for looking up existing material(generally just for in-place autoimport) and creates the material asset off of that. Also adds logic to look up the mapTo if it exists if the material name lookup fails.
Adds initial pass at re-enabling the sis file support for shape importing. In the event the UseManualShapeConfigRules setting is disabled(which it is by default) it will try and find the matching sis file and apply the rules from that to the config. Once the processing/import is done on the shape, the cached values of the main config are restored again.
Adds initial fbx.sis file. Needs to have the fields standardized to the config names.
2020-08-24 04:41:17 -05:00
Brian Roberts 20479cd818
Merge pull request #300 from Areloch/sortedSettings
Adds sorting to the settings class so when it saves out to file
2020-08-23 16:26:59 -05:00
Areloch 3f676e0966 Adds sorting to the settings class so when it saves out to file, it puts them in alphabetical order which keeps things consistent. 2020-08-23 14:29:17 -05:00
Brian Roberts 93ce5d0cfa
Merge pull request #298 from Azaezel/alpha40_triggerTroubleTre
fix for trigger::testobjects vector population
2020-08-21 07:28:40 -05:00
Brian Roberts 8e61600a82
Merge pull request #299 from Areloch/LevelDependencyLoadingAndFixes
Level Asset Dependency handling and various level fixes
2020-08-21 07:28:24 -05:00
Areloch 40dd926873 Adds function for sceneObjects to report utilized assets
Add reporting of used assets to tsStatics and TerrData
When saving a Scene, it will write static object asset dependencies to it's levelAsset
Shifted level loader logic to pass up the levelAsset rather than full level path
Made it so when level is loading, the levelAsset loads its dependencies. When the level is ended, as part of cleanup, they are unloaded
Shifts defaultEditorLevel to be an actual asset and made the ToolsModule load assets
Fixes the Save As action to correctly save out to the new level asset
Fixed the autoLoadAssets logic to be cleaner and not manually check types
Removed extra, unused DefaultEditorFile file
2020-08-19 18:30:42 -05:00
Brian Roberts f7dbfff42d
Merge pull request #297 from Areloch/NotesObject
Adds a notes object that only displays in the editor
2020-08-17 18:13:53 -05:00
AzaezelX 967841db7a fix for trigger::testobjects vector population 2020-08-17 18:06:23 -05:00
Areloch 4ffe6d2bb7 Adds a notes object that only displays in the editor, useful for when working on maps. 2020-08-17 16:41:59 -05:00
Brian Roberts fb7ae70676
Merge pull request #294 from Areloch/LocalLightShadowsPref
Adds a pref to dictate if local lights can cast shadows or not.
2020-08-16 20:28:42 -05:00
Areloch 756f2ef680 Adds a pref to dictate if local lights can cast shadows or not. 2020-08-16 18:08:00 -05:00
Brian Roberts abe2164e90
Merge pull request #293 from Areloch/ABPreviewFilePathTooltip
Expands AB tooltips with file info
2020-08-16 14:43:00 -05:00
Areloch 15ec65111e Adds some additional data, namely associated file path, to some of the asset browser's previews for a few types 2020-08-16 12:09:36 -05:00
Brian Roberts d763c6f509
Merge pull request #292 from Areloch/ABIconImageModes
Adds image variances for the menuGrid image
2020-08-16 04:26:28 -05:00
Brian Roberts 42f8a94cd6
Merge pull request #291 from Areloch/ConvexProxyMaterials
Adds in the missing materials used for the Convex Proxies for triggers, zones, etc.
2020-08-16 04:26:05 -05:00
Brian Roberts 89b885fd5a
Merge pull request #290 from Areloch/FixToolTipColor
Standardizes the tooltip profile colors to match the rest of the themeing stuff
2020-08-16 04:25:37 -05:00
Areloch 46f2ad04cf Adds image variances for the menuGrid image so the Asset Browser button reacts to interaction properly. 2020-08-16 03:10:39 -05:00
Areloch ac48625919 Adds in the missing materials used for the Convex Proxies for triggers, zones, etc. 2020-08-16 02:51:34 -05:00
Areloch 667557f6b2 Standardizes the tooltip profile colors to match the rest of the themeing stuff 2020-08-16 02:37:43 -05:00
Brian Roberts 84bf25f9e3
Merge pull request #289 from Areloch/NoAnimatedMakeAMesh
Adds logical check to skip animated statics when baking selection to mesh.
2020-08-16 02:27:13 -05:00
Areloch b6a3fb05d9 Adds logical check to skip animated statics when baking selection to mesh. 2020-08-16 02:16:19 -05:00
Brian Roberts 81777348c8
Merge pull request #288 from Areloch/MiscImageAssetFixes
Misc. Image Asset improvements
2020-08-13 15:05:47 -05:00
Areloch 686975c8ee shifts getImageFilename to getImagePath on ImageAsset
Adjusts references to utilize getImagePath to ensure things using the image asset gets the proper full path
Adjusts image import logic to import finding associated images
Adds logic so if a roughness map is imported, the generated material asset has the invertSmoothness flag on.
2020-08-13 01:35:24 -05:00
Brian Roberts 8d3071fb72
Merge pull request #286 from Areloch/SDLUpdate2012
Updates SDL to 2.0.12
2020-08-12 15:35:08 -05:00
Brian Roberts f582fa0dcd
Merge pull request #275 from Areloch/3DTextureFix
Fixes the backend logic for setting/creating 3DTextures in D3D11
2020-08-12 14:50:04 -05:00
Brian Roberts 2893cbfb88
Merge pull request #287 from Areloch/MoreMiscFixes20200812
More misc. fixes
2020-08-12 14:29:49 -05:00
Areloch bf8455469f from @rextimmy: appends vcruntime as a release dependency when using visual studio versions exceeding mark 1920, as failure to do so was leading to Error LNK2019 unresolved external symbol memset referenced in function SDL_vsnprintf_REAL
Ported up for the 2.0.12 version
2020-08-12 13:28:31 -05:00
Areloch 69bfbb0978 Adds functions to get the full path for level and shape asset files
Updated choose level UI to use getLevelPath function so it works again
Added a check for mis.dso for choose level UI as well in case it was compiled
Updated open asset in shape editor logic to use getShapeFile so it works again
Fixed on-exit crash after drag-n-drop importing of assets into the AB by properly using the import config object as a pointered object
Added sanity check when inspecting a TSStatic, if there isn't a materials inspector group for whatever reason to prevent a crash
Added filter logic so if in select mode for a specific asset type, it won't show datablocks, prefabs or other loosefiles
Removed unneeded setting of AB's current address path when creating a new terrain material asset
Added logic for forcing field validation in the create a new asset window. This fixes a problem where if you'd typed in a field but didn't hit enter and then immediately hit the done button, the typed string wasn't used.
2020-08-12 13:11:13 -05:00
Areloch a526029f2f Updates SDL to 2.0.12 2020-08-12 11:56:18 -05:00
Brian Roberts 3108a08650
Merge pull request #285 from Pecon/openWebBrowserLinux
Followup commit to switch to engine conventions
2020-08-11 17:29:28 -05:00
Pecon 909892f40e
Change shorts to ints 2020-08-11 15:27:52 -07:00