Commit graph

614 commits

Author SHA1 Message Date
JeffR
532200ff43 Changes the creation of new materials in the material editor to go through the new asset interface, which ensures the creation is standardized across the board. 2022-03-17 00:03:22 -05:00
Brian Roberts
2198dd14d1
Merge pull request #737 from Azaezel/alpha40/GCOrder
ensure MissionCleanup exists before .mis load
2022-03-09 17:02:29 -06:00
AzaezelX
4d336e9ecf ensure MissionCleanup exists before .mis load 2022-03-08 17:52:42 -06:00
marauder2k7
1d5a36c4c0 Spheres for Skies
-Added: SkySphere a full sphere skyBox
-Change: ScatterSky now renders a dome instead of the top face of a cubeSphere
-Change: Creator now has skySphere

TODO: Simplify sphere creation
PossibleMethod: Add the sphere creation functions to one place to be shared around.
2022-03-08 19:50:36 +00:00
AzaezelX
3e4cc0a5c6 fix probe baking typo 2022-03-06 13:18:06 -06:00
JeffR
b8b94fdec9 Standardizes project import copy behavior to validate if we're in-place importing to avoid erroring out needlessly with a new utility function
Fixed wrong variable preventing ImportConfig Editor from refreshing when selecting different configs
Standardized DefaultImportConfig's settings against Legacy Import setting, specifically collision resolution behavior and appending _mat suffix to materials
2022-02-25 00:03:33 -06:00
JeffR
7659b51ac9 Added trimming of parsed object names to ensure whitespace before and after isn't accidentally processed as invalid characters
Also made the classname validity check happen on the other creation keyword types
Added logic so when processing an importing material definition that already has an asset, can handle it if the scriptPath doesn't have the extension in it already.
2022-02-24 01:33:14 -06:00
JeffR
8d8432115b Adjusts formatting when parsing for object and function definitions in the project importer to be more accurate
Adds handling for progrommatic new object delcarations where the class type is defined via () encapsulated code so the project import doesn't mangle it.
2022-02-24 00:48:00 -06:00
Brian Roberts
10c3188171
Merge pull request #730 from Areloch/BaseUIModuleStandardizePR
Base UI module standardize pr
2022-02-23 10:45:00 -06:00
JeffR
9b4acda7bd Missed clearing the options categories in options menu onWake 2022-02-23 00:29:00 -06:00
JeffR
725e2b1575 Typo'd assetId correction 2022-02-22 23:39:52 -06:00
JeffR
938e4930ae Git didn't properly actually commit new files. 2022-02-22 23:28:28 -06:00
JeffR
01de818503 Ran importer on UI module to ensure guis and images are converted to latest standards
Updated all UI module controls to utilize a more standard structure with stack controls instead of the GameMenu ctrls, as well as more standardization of gamepad input handling
2022-02-22 20:12:39 -06:00
JeffR
6a357d8dfb Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into Preview4_0 2022-02-17 18:30:23 -06:00
JeffR
40acf75238 Template changes 2022-02-17 18:21:13 -06:00
AzaezelX
1f7d06542e doublesided material renderfix
as per the OG writeup, need to apply horizon trick strictly to the specular component
2022-02-14 14:42:15 -06:00
JeffR
c1a88ec423 Complied connect var data in GL to D3D for the wsPosition
Made the use of ints for the cubemapIdx in the shaders consistent
2022-02-12 17:32:30 -06:00
JeffR
79eebdd5f3 Cleaned and repacked work to update the probe bin and reflection probe behavior to clean and standardize it. 2022-02-12 15:53:40 -06:00
JeffR
696c2e2eec Add sanity check for default value results checking when filtering out default values
Add additional utility functions for updating parsed object data in the project importer
Adds logic to find and associate FX materials to their terrainMaterials and adding them to the terrian material asset if found on project importer
2022-02-02 01:11:33 -06:00
JeffR
5e1eb80bc1 Fixed handling issue where it would misparse lines that would contain new/singleton/datablock keywords
fixed incorrect getSubStr function invoke
2022-01-30 19:14:36 -06:00
JeffR
630285def6 Shifts handling of material and terrain material definitions to be written into the asset definition taml file instead of having an extra loose file
Also updates importers to correctly handle this change
Adds ability for taml XML serialization to properly assign array'd fields
Adds 'inheritFrom' field to simobjects for when objects with parent objects are serialized
AssetBase how inherits from SimGroup so it can have objects like material definitions embedded in them for save/load in the taml definition file
Updated loading/handling logic in terrain material asset to be more similar to regular material assets
2022-01-30 11:50:16 -06:00
JeffR
728aa83481 Comments and cleanup 2022-01-20 17:48:01 -06:00
JeffR
ecd35df7e9 Implementation of updated handling of Legacy Project importer to better seperate out importer versions as well as more explicit processing of incoming content 2022-01-20 01:14:43 -06:00
JeffR
cde1d68f78 Fixes handling in the generic creator function to deal with commands formatted with "return " at the start AND without
Fixes assignment of default material to convex shape when the toolbar button is pressed to create a 1u cube automatically.
2021-12-25 12:30:31 -06:00
JeffR
b70faae38f Updates the handling of the baking of shape asset previews to generate them with support for view angle control to improve visibility, as well as supporting overriding of a material in the preview bake
Also utilizes the updated bake handling to have material asset previews render as a sphere shape asset, overriding with the material asset's material, improving distinction of what is a material asset vs image asset
Also updates the sphere preview mesh to be more generic and not only for reflection probes
2021-12-24 17:26:45 -06:00
AzaezelX
7c32abd026 fix ServerPlaySound 2021-12-16 18:25:14 -06:00
AzaezelX
a76613604a augments playSoundAsset
adds hooks to the garbage collector
exposes an (optional) position.
adds a ServerPlaySound + clientCMDPlaySound command pair to trip that for all clients
2021-12-13 20:36:50 -06:00
Brian Roberts
07310d4d6d
Merge pull request #699 from Areloch/CoreInitCleanup
Cleans up some core execution behavior
2021-12-05 19:31:13 -06:00
Areloch
c6c2e9139f Cleans up some core execution behavior
Removes a duplicated material definition
Fixes up PostFX init'ing order so it inits before trying to load the prefs
Adds a skip of loading the CoreModule's materials so we don't double-execute any of them
Fixes a typo for the Vignette PostFX's name so it properly integrates
2021-12-05 11:00:02 -06:00
Areloch
a30e9c6242 Removes the Library tabs from the World and GUI editors to avoid confusion. Adjusts the creation namespace from ECreatorWindow to a dummy object ObjectCreator to handle invoking for creation 2021-12-04 22:47:10 -06:00
AzaezelX
de379f8b25 fix metal sound entry for playerdata 2021-11-30 18:19:58 -06:00
Areloch
a5944aff19 Adjusted callback handling of asset inspector fields when invoking AB to select asset for more consistent behavior and better handling of updating the objects and inspector
Added logic to forcefully acquire newly imported asset definition to better try and ensure it's loaded immediately after import
Added logic to asset importer so if a file is not found for an importing material asset, if populate maps is on, then it will try and find a matching image asset in the destination module
Added logic to tsStatic to better handle fields being updated via the editor, forcing updates and refreshes of the shape and materialSlots
Fixed handling of guiBitmapButtonCtrl so it will update the bitmap used when edited via the Gui Editor
Updated image ref to the hudFill image asset for the console GUI
Cleaned up names for the default camera model/material
Defaulted import config to utilize the Prune action instead of rename for more predictable default behavior
Added icons next to AB's preview slider bar for additional visual feedback of slider intent
Added missing checkbox to asset import window and cleaned up scaling behavior
Fixed handling of drag-n-drop behavior in GUI editor so it doesn't block further interaction
Added logic for drag-n-drop of image assets to GUI Editor so it will create a GuiBitmapCtrl with the image
Added handling for drag-n-drop import of folders of assets to AB/Asset Import
Added missing asset import config option to indicate if config supported import of sound assets
Added logic when opening asset import config editor, where if there is a default import config set in the settings, it will open that one by default
Hid the collision section of the import config editor, as those options are currently unutilized
Improved behavior for Create New Folder window in the AB, now always pushing to the front, and also selecting the text by default, so the user can just start typing the new name
Also added return and escape key accelerators to Create New Folder window for better UX
Fixed display of editor windows, adding a distinct blue color to highlighted windows' title bar and fixing display of minimize/maximize/window/close buttons
Moved GUIEditor's onControlDropped function to the AB script to match placement of sibling world editor function
Fixed issue with material editor where the ORM Config map slot was getting the normal map instead of the correct ORM map
2021-11-26 16:40:15 -06:00
Brian Roberts
b5bd242e23
Merge pull request #673 from Areloch/useImagePreviews
Shifts utilization of gui elements in editors that point to 'normal' image assets to utilize generated previews instead.
2021-11-15 12:39:33 -06:00
Areloch
eb24b63be4 Shifts utilization of gui elements in editors that point to 'normal' image assets to utilize generated previews instead.
This reduces console spam about mismatched texture profiles and improves stability.
2021-11-14 21:39:51 -06:00
Brian Roberts
4f04213cd9
Merge pull request #671 from Azaezel/alpha40/brdfFixes
brdf handling corrections
2021-11-14 13:46:47 -06:00
Areloch
97484247ae Fixes Settings window not being able to be brought forward over AB
Adds checkbox to mark as not showing Import Window each time
Added loaded import config to import log output
Fixed targeted material map slot field names
Added helper function for playing a sound asset via AssetId
Updated import config to have some more common suffixes
Updated editor settings to have Import Window show by default
Changed AB context menu from listing item as "Refresh Asset" to "Reload Asset" for improved clarity
Removed unneeded duplicate editor settings window script file
2021-11-14 01:26:04 -06:00
AzaezelX
72ef719c18 kill redundant clamp in forward 2021-11-13 19:18:03 -06:00
AzaezelX
b60d51969e brdf handling corrections
1-handle the brdfTexture in linear space, not srgb.
2-clamp surface.NoV across the board for consistency. (solves several new and ongoing artifacts)
2021-11-13 19:05:26 -06:00
JeffR
b3cd08520e Disables generation of the materials script files by the internal shape import processor. Material script files are now only generated by the AssetImporter as part of the shape injest process.
Renames validateImportingAssets to hasImportIssues for AssetImporter console method for clarity
Updated console method documentation for AssetImporter methods
Fixed logical error for material asset generation if the import config was set to use existing materials but one was not found.
Fixed logical error when a shapeFile has a material with a texture mapped to it is not in the same directory as the shape, it would not correctly find the texture
Adjusts AssetImport window logic so it will display the window in the event of import issues being detected, or the asset is being re-imported.
Updates the AssetImport window activity log to use the new AssetImporter's log for consistency.
2021-11-05 17:49:48 -05:00
JeffR
fda722e355 Updates asset importer and project importer to output to separate log files into tools/logs
Add utility console function for getting current datetime
2021-11-03 00:13:00 -05:00
Brian Roberts
ac3126765f
Merge pull request #646 from Azaezel/alpha40/matScrollFix
fix material scrolling
2021-10-30 11:39:34 -05:00
AzaezelX
7b77877c63 fix material scrolling 2021-10-29 16:25:31 -05:00
Areloch
0fab2ebf54 Added fallback handling to MaterialAssets if the asset was found but the matDef was not
Added import config handling for prepending Directory to asset name
Added handling for import config of appending a sound suffix
Integrated handling of directory prepend and asset type suffix to rename issue resolution of asset importing
Corrected miswording of warn message for duplicate object names
Correct GUI issues with verve tools
Convert verve tools to utilize assets for their GUI elements
Fix window binding/naming issue depending on window mode for verve
Fix popup menus formatting for verve
WIP fix for material swap in Material editor. Corrects crash, but swap action is unreliable depending on object type
Fix display issue with mission area editor toolbar button image
Fix tooltip display of SFXEmitters in editor tree to correctly show the bound asset
Changed network graph accelerator keybind from just N to Ctrl N to avoid keybind issues when typing
Fixed Create New Emitter button in particle emitter that was showing as no texture
2021-10-28 23:52:58 -05:00
Brian Roberts
f250955f63
Merge pull request #640 from Azaezel/alpha40/iblCleanups
Alpha40/ibl cleanups
2021-10-28 12:27:24 -05:00
Robert MacGregor
9d2e95a1b1 * BugFix: Correct the usage of a local variable in a non-function scope in the set object locked dropdown item when right clicking in the inspector. 2021-10-28 10:30:43 -04:00
Brian Roberts
6d0105948d
Merge pull request #636 from Azaezel/alpha40/matAnimAngry
addsa material.setAnimflags(LAYER,TAGS STRING); method
2021-10-27 18:58:41 -05:00
AzaezelX
bf646b604f typofix for impoerter 2021-10-26 17:47:19 -05:00
AzaezelX
42bc6fa358 differentiate forward lit and deferred ibl vars
since we're not currently using the same arrays et al for the whole pass, need to make sure those don't fight
2021-10-26 12:32:37 -05:00
Brian Roberts
7f5766a7fc
Merge pull request #635 from Ragora/bugfix-asset-browser-delete-directory-loop
BugFix: Address an error where deleting directories may result in an infinite loop
2021-10-26 00:25:45 -05:00
Brian Roberts
4b3a83c4df
Merge pull request #633 from Ragora/bugfix-asset-browser-horizontal
BugFix: Allow the asset browser tree view to use a horizontal scroll bar
2021-10-25 22:57:06 -05:00