Commit graph

706 commits

Author SHA1 Message Date
JeffR f3cad0d77e Converts the ad-hoc design of the Material Editor to utilize the same inspector interface as most everything else does.
- Overhauls the material editor to simplify and streamline the logic behind it since the inspector does most of the work
- Tweak a few order positions of materialdefinition fields to work better
- Sets AO, Rough and Metal channel fields to use an enum type for human readability
- Updates the MaterialPreview gui control to work with assetIds
- MatEd now supports setting of parent material to inherit from
- Creating a new material now can prompt selecting an existing material to inherit from
- Can now edit the mapTo value of a material in the matEd
- New standalone Composite Texture Editor window for convering AO, Roughness and Metalness maps in a material to an ORMMap
- Can also star the creation of a composite texture via RMB context menu in AB on an image asset
- Moved logic of CubemapEditor from MatEd to it's own stuff
- Made ImageAsset fields now be more clear when they have nothing assigned, and also have a clear button to empty the field's value so it's consistent across the board
- Reorganized the layout of the gui and image files for the MatEd to be easier to navigate
- MaterialEditor now overlays the EditorGUI instead of being forcefully embedded in it, allowing easy editing of the MatEd Gui via the Gui editor
2025-08-03 12:03:02 -05:00
marauder2k7 fd7342668c streamline shape asset
shape asset now has the same import "@" as image asset
cut out extra filename parameters that arent needed
refresh hopefully fixed
2025-06-20 15:58:20 +01:00
marauder2k7 08f52cfa16 add extra checks
add extra checks around an empty stringtableentry for assets and bitmap controls
2025-06-19 16:58:44 +01:00
marauder2k7 c6ec2fd6a1 Merge branch 'PreviewAssets_UseAsset' into SoundAsset_Refactor 2025-06-19 13:36:49 +01:00
marauder2k7 1918ecfdd6 feedback from az
fixes for interaction from az
2025-06-18 20:44:37 +01:00
marauder2k7 6f9c4158d8 gui offscreen material test
added interaction static guioffscreencanvas to capture mouse events
added test shape
2025-06-18 17:05:35 +01:00
marauder2k7 51b1e3b07e update cursors
GuiCursor needs to be changed to use bitmapAsset
guiTypes.GuiCursor safety around rendering getBitmap()
2025-06-18 09:27:47 +01:00
Brian Roberts 0aaddcddb4
Merge pull request #1500 from marauder2k9-torque/MissionArea-RemoveTerrainDependency
remove terrain dependency from mission area
2025-06-16 16:36:24 -05:00
marauder2k7 47bff2f0eb Update guiMissionArea.cpp
simplify logic around skipping objects that push the mLevelBounds outside F32_MAX
2025-06-15 17:15:59 +01:00
marauder2k7 4fc182444e Update guiMissionArea.cpp
set a minimum size for the level bounds, this stops the mouse drag issue until it is sorted out properly
2025-06-15 16:23:57 +01:00
marauder2k7 0a1e3f74ed remove terrain dependency from mission area
Mission Area now captures the entire level bounds based on objects in the scene
Terrain is no longer required for mission area to be set
2025-06-15 12:41:47 +01:00
AzaezelX 83a3ef877e don't trace setShaderConsts or onNewMessage callbacks
they spam up the console to uselessness when using the trace(true/false) command
2025-06-09 13:35:32 -05:00
JeffR 0e6c33f78a Fixed gui editor drag and drop behavior for image, shape, and sound
Ensure BitmapFile is given a proper default
2025-05-30 20:21:13 -05:00
JeffR 5397c168bc Merge branch 'DirectImageFileOption' of https://github.com/Areloch/Torque3D into development 2025-05-30 00:08:29 -05:00
AzaezelX 8bd145d54f use of get<some name> methods that already return nulls/false when attempting to load
in contexts where we would want to try first (pt2)
2025-05-28 17:45:02 -05:00
JeffR 0fa8b97f91 Reimplements ability to utilize direct file load alongside ImageAsset fields when utilizing the ImageAsset macros
Updates Asset Browser generated preview images to not utilize full assets, but just the preview image files themselves
2025-05-27 17:12:03 -05:00
AzaezelX 40974dd14b use of get<some name> methods that already return nulls/false when attempting to load
in contexts where we would want to try first
2025-05-27 17:07:08 -05:00
Brian Roberts a43458677a
Merge pull request #1481 from Areloch/MiscFixes_20250525
Misc Fixes and improvements including updated autosave handling
2025-05-27 08:03:08 -05:00
JeffR bb7ee38bf4 - Reimplements autosave logic to handle levels, subscenes and terrains in a more consistent, reliable way.
- Adds entry to RMB menu in Asset Browser to restore an asset to a backup copy taken from autosaves
- Adds reparent out-of-bounds objects button to SceneGroup inspector
- Adds ability to have SubScene have a different loading bounds from the actual subscene bounds, allowing load triggering to happen ahead of the bounds of the subscene itself
- Fixes asset importer handling of animFPS field to be the correct type
- Adds onInspect handling to GameBase allowing better handling for any game class type with editor integration
- Add getAssetLooseFileCount and getAssetLooseFile to AssetManager to be able to iterate over all loose files associated to an asset
- Add standard/default preload function def to forestItem
- Fixes handling of text placement on GuiIconButtonCtrl when text is set to the right
- Adds setGlobalCenter utility function
- Adds ability to set guiInputCtrl active state
- Matched util functions for tracking if left and right mouse buttons are down to EditTSCtrl alongside the existing middle mouse
- Add empty element sanity check to appMesh loader
- Add callback for GameBase when game is created
- Add default graphics options config for steamdeck
- Fix typo in assetImportConfig default
- Filters SceneGroup utility buttons in inspector to only show for relevent class types
2025-05-25 07:40:10 -05:00
AzaezelX 73af7f6c3e third case 2025-05-21 11:06:50 -05:00
AzaezelX 38de3d866c fix a couple cases of old direct references
use getBitmap(), not mBitmap
2025-05-21 11:02:31 -05:00
marauder2k7 aa3f07e339 update macro
Added get##name##File to macro that will check to make sure the asset is not null before getting the image file.
2025-05-14 00:30:47 +01:00
marauder2k7 e1c01cd49a Merge remote-tracking branch 'upstream/development' into imageAsset_refactor_rev3 2025-05-12 14:45:41 +01:00
AzaezelX c04eaa5862 fix PopupMenu::checkItem filter
reminder size is the total element count of the vector
2025-04-29 15:45:39 -05:00
marauder2k7 7c4d41ee21 Merge remote-tracking branch 'upstream/development' into imageAsset_refactor_rev3 2025-04-05 15:59:02 +01:00
AzaezelX 3d2a923a30 add 0-100 percent ranges
F32 and S32
apply to guibitmapbarctrl
2025-04-02 15:33:39 -05:00
marauder2k7 73ad92b757 review notes from Az
Should render fallback for namedTarget if namedTarget fails
Add safety around namedtarget getTexture to stop assert
Missing assets should revert to fallback image and print a warning to console
Remove REFACTOR tag from all macros.
2025-03-30 11:22:42 +01:00
marauder2k7 c025ea86b4 more cleanups
cleanup the type removing the refactor tag
materialManager restored to its original state
2025-03-27 08:59:50 +00:00
marauder2k7 0da0903599
Merge branch 'development' into imageAsset_refactor_rev3 2025-03-24 20:07:06 +00:00
AzaezelX fcd2d38deb further validator cleanups
bump default fidelity from 0,0001 to 0.01
fix F32Range. needs to go from - to +, not smallest to largest positive value
fix several misasigned validator ranges. most of which use some form of -1 default to do a Special Thing
2025-03-18 14:06:33 -05:00
AzaezelX 55ac453ab9 guiProfile.border has specific usage cases for -2, so use the full negative range
clarify a bit what fieldindex is being asigned
2025-03-18 01:23:33 -05:00
AzaezelX a30eac9a2b kill case of deprecated vars leaking in 2025-03-09 12:35:59 -05:00
AzaezelX f633ef3a3d fill in the validated variables 2025-03-09 11:53:23 -05:00
AzaezelX fa760fa746 add numerous new validators
as well as inspector support to treat a significant chunk of the codebase as range-clmped values which can take a guisliderbarctrl with a configurable at the validator level fidelity variable
additionally adds a new addfieldV and addprotetedfieldV for further callback validated slider-presented variables
*also* adds an on additional callbacks to the inspector itself, like onPreinspectobject, onPostinspectObject, and onPostInspectorfieldModified
in addition to *that*, adds a new hidefield command to tag a given specific field not to show in inspector
2025-03-09 11:51:54 -05:00
AzaezelX 45bb368762 from marauder: proper enumtable lookup 2025-03-07 00:12:09 -06:00
AzaezelX d8fcbb7863 work towards reflecting the typemask in the checkboxes in a combinatory manner again 2025-03-06 23:37:37 -06:00
AzaezelX 79782148ec fix another potential crash with firstresponder code 2025-03-06 23:32:38 -06:00
AzaezelX 53a87af2b1 inspector aug: docs as tooltips
convert feilddocs to an 80-char per line tooltip to better help folks understand what a given variables intent is
2025-03-01 15:09:32 -06:00
AzaezelX 5fb73edc00 setFirstResonder Safeties
make sure we've properly added gui elements before trying to set the to be the responding one, or running callbacks against them
2025-02-25 18:23:45 -06:00
AzaezelX b36ec14194 add typeS16 2025-02-22 18:57:27 -06:00
AzaezelX f9eeaf8869 simplify erosion calcs 2025-02-18 19:58:48 -06:00
AzaezelX e106871350 correct noise miltipliers. add biases for thermal (slope) and hydrolic (average) hieght changes 2025-02-18 16:08:30 -06:00
AzaezelX 0d2f3e294d use standard t3d maxes 2025-02-18 01:09:09 -06:00
AzaezelX 25ea164a1f add a pasteUp and pasteDown pallet 2025-02-17 23:42:19 -06:00
AzaezelX 561c201b88 copy paste support for terrains 2025-02-17 22:10:56 -06:00
AzaezelX 262ff405fa conform hydrolicErosion to the same spec as thermal 2025-02-17 20:58:40 -06:00
AzaezelX 315f05ea47 revert portions to a previously demonstrated to work state... 2025-02-17 19:55:23 -06:00
AzaezelX 329ffab86c work towards adding erosion noise 2025-02-17 16:43:10 -06:00
AzaezelX 2eb2cbc302 add erosion brushes
todo: sort why noise... isn't.
2025-02-17 05:48:15 -06:00
AzaezelX 11bf7df46d need to filter subscenes out of screenspace box drag
the ap hangs otherwise
2025-02-02 21:08:57 -06:00