Commit graph

1226 commits

Author SHA1 Message Date
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
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
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
Areloch
b6a3fb05d9 Adds logical check to skip animated statics when baking selection to mesh. 2020-08-16 02:16:19 -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
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
Brian Roberts
d1a79ae5eb
Merge pull request #280 from Areloch/YetMoreMiscAssetFixes
Even more misc asset fixes
2020-08-09 14:09:29 -05:00
Areloch
79ecc2f4a0 Updates the rest of the asset types to utilize separate expanded path variables to avoid breaking assetDef saving
Fixes select mode for the Asset Browser to properly filter to the selecting type
Fixes the imageType in the asset import window inspector to properly set to the importing image asset's discovered type if valid
Fixes AssetBrowser asset selection return so it returns back a valid assetId
Fixes TerrainMaterial save crash by ensuring we fill in the diffuseMapAsset
Removes saving of TerrainMaterial being saved to a generic script file if one isn't found for an existing TerrainMaterialAssets
2020-08-09 01:32:27 -05:00
Brian Roberts
641c75b721
Merge pull request #279 from Areloch/MoreABAndImporterFixes
More various Asset Browser and importer fixes
2020-08-08 15:12:01 -05:00
Areloch
d01341708e Removes extra assetImportConfigs file
Fixes name handling when finding associated image files on materials
Makes parseImageSuffix return back the case-correct suffix given the image's filename
Fixes import session reset logic to not have infinite looping happen when activated if files are in the session still(used mainly when import config is changed)
Makes sure materials are not processed if they are found in the import config's ignoreMaterials list
Makes sure active import config is properly on importer when it's changed in the Import window
Tweaked asset browser folder filtering logic so it always rejects .git folders from displaying, and also made the core, tools, cache and shaderCache filtering behavior consistent
Fixed navigation of root-level folders if double-clicking on them through the main window
Ensured import session is reset after an import happens so no extra files are left over in the importer's list
2020-08-08 13:01:50 -05:00
AzaezelX
284ad3e083 from @OTHGMars: AssetImporter type and path for material look-ups.
(and fix for pbrconfig<map> entry)
2020-08-08 00:54:06 -05:00
Areloch
813762c722 Separated ShapeAsset's fileName for the loose file name and the fully processed file path to avoid potential save-out problems
Fixed autoAssetImport so it properly cleared any prior import session objects
Added beginning and ending comment line signfiers to make import logging easier to spot in console
Fixed variable used when doing the actual import on assets where it would use the top-level asset import objects and not the children array, causing a crash
Fixed the Make Selected A Mesh logic to work with the creation of a new shapeAsset
Added secondary handling to generate a prefab of the original selection for preservation purposes
Added optional input for makeSelectedPrefab to not delete the original selection(useful for the preservational prefab mentioned above)
Adjusted font color for NA text edit fields to make it more legible
Changed the non-working reloadDatabase button in assetBrowser to instead open the Asset Editing editor settings page.
2020-08-07 00:24:26 -05:00
Brian Roberts
237b7cdac3
Merge pull request #268 from Areloch/ObjectFadePref
Adds some console preference variables for object fade overriding on TSStatics
2020-08-03 18:14:21 -05:00
Areloch
b9e16649d9 Slims down the obj size get math to just use the worldSphere radius rather than computing the bounds width to save cycles. 2020-08-03 18:12:21 -05:00
Areloch
695ad6357f Hides some light fields for local lights that are intended for PSSM's, thus useless.
Also disables the Paraboloid shadowmap type, as it is non-functional.
Disabled light animations by default so as to not waste processing time if not needed
Sets point lights' shadow types to be cubemap by default, and lowers the overdark factor to make them look cleaner and not exacerbate aliasing.
2020-08-02 23:47:20 -05:00
Areloch
a257dc8399 Adds some console preference variables for object fade overriding on TSStatics 2020-08-02 22:33:10 -05:00
Brian Roberts
914fc3e80c
Merge pull request #263 from Azaezel/alpha40_decalDrek
crashfix: decal report when missing the DB entry was malformed
2020-07-30 11:49:37 -05:00
Areloch
fc225a7f0b Adds a default value to the lodType of the asset importer to prevent utilizing an un initialized value 2020-07-29 15:42:28 -05:00
AzaezelX
820cd5cb10 crashfix: decal report when missing the DB entry was malformed 2020-07-27 18:22:08 -05:00
Bloodknight
af126ad089 Fix GCC9 complaints 2020-07-22 16:40:01 +01:00
Bloodknight
f52ae7f1b3 Fix GCC9 complaints 2020-07-22 14:29:54 +01: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
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
AzaezelX
61db21aaaf comparison flaw in spotlight animation check. also, proper location of shadercache dir 2020-07-07 16:54:25 -05:00
AzaezelX
fcffca65e6 #include "console/typeValidators.h" 2020-07-03 22:58:27 -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
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
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
2ef6008212
Merge pull request #216 from Azaezel/alpha40_groundcover_tricks
groundcover requested augs
2020-06-19 18:37:40 -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
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
4043015d2d adress #205 2020-06-10 11:52:47 -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
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
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
fabd5864fa uninitialized variables-t3d 2020-05-11 15:30:21 -05:00