Commit graph

731 commits

Author SHA1 Message Date
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
Brian Roberts 5feef0ec5c
Merge pull request #1368 from Azaezel/alpha41/sourceGroupGrok
fill in asset based sound group if not specified by instanced emitter
2025-01-27 11:31:41 -06:00
Brian Roberts fdbac265b7
Merge pull request #1363 from marauder2k9-torque/ColorPicker-refactor
Color picker refactor rev2
2025-01-27 11:31:17 -06:00
marauder2k7 44a6ceab2d code review
Revert Hsb to using integers
Clamp drag values
2025-01-27 08:04:55 +00:00
AzaezelX 557b3639eb fill in asset based sound group if not specified by instanced emitter 2025-01-26 20:52:50 -06:00
Olathuss 44df6dada7 Close Menu Implemented
closeMenu function on guiMenuBar implemented. Closes menu when selecting a popup menu action.
2025-01-25 22:59:17 -07:00
marauder2k7 4d980e5406 various cleanups and fixes
basicClouds refactored
null dereference fixes in guiMenuBar
2025-01-23 22:14:05 +00:00
marauder2k7 eb746a1142 console spam
moved error printout in guiType guiControlProfile incLoadCount inside a check to make sure the profile has a bitmap asset set.

remove older typeImageAssetId from group and variable inspector classes
2025-01-23 22:13:49 +00:00
marauder2k7 32c6330b72 guiControlProfile 2025-01-23 22:13:48 +00:00
marauder2k7 b75d5b70c6 toolbox 2025-01-23 22:13:47 +00:00
marauder2k7 22037bf94f moar refactors 2025-01-23 22:13:46 +00:00
marauder2k7 4d893f51cf gui image asset refactor
bitmap button popup ctrl ex
2025-01-23 22:13:21 +00:00
marauder2k7 f519cff6ff gui types using image_asset 2025-01-23 22:12:57 +00:00
marauder2k7 eca0820134 init commit
start of attempt 3
2025-01-23 22:12:52 +00:00
marauder2k7 055ca0ae00 use screenshot for eye dropper
instead of using backbuffer image, use the screenshot so it captures everything
2025-01-23 20:23:47 +00:00
marauder2k7 704e304eef display correct values
Few fixes to display float values if the inspector field asks for floats
Split Hsb out from colorI now linearColorF can return HSB from its own color without having to go through the colorI conversion, hopefully gets rid of rounding errors etc since we are only doing the calc once.
2025-01-23 19:06:35 +00:00
marauder2k7 46192c3709 Eye dropper functionality
Adds eye dropper functionality
adds eye dropper button image supplied by jeff
adds a few missing asset files (due to in asset browser scan and add all loose files)
2025-01-23 10:18:18 +00:00
marauder2k7 029a495de1 change hsb to doubles internally 2025-01-22 20:12:49 +00:00
marauder2k7 29a9bd7917 ground work before gui 2025-01-22 17:21:46 +00:00
Brian Roberts 69fa4b389f
Merge pull request #1340 from marauder2k9-torque/ImageAsset-NamedTexTarget
NamedTexTargets as ImageAssets
2024-12-23 03:12:22 -06:00
JeffR 81ac23fd35 Merge branch 'SubScenes_Gamemode_PR' of https://github.com/Areloch/Torque3D into development 2024-12-15 18:39:03 -06:00
marauder2k7 f6dc694bd4 fully working 2024-12-14 01:18:46 +00:00
Brian Roberts c9b22a59b3
Merge pull request #1331 from Azaezel/alpha41/canvasClamping
add a canvas.constrainMouse(true/false);
2024-12-04 17:37:52 -06:00
AzaezelX de882b4024 add a canvas.constrainMouse(true/false);
command keeps a mouse point within the ap window (off by default)
2024-11-26 08:51:43 -06:00
AzaezelX 218caea9e8 remove filtes on misbehaving brushes.
correct range defaults
2024-10-28 09:39:02 -05:00
JeffR 10d1aeca1f Shift tracking of dynamicObjects from strict child objects for Scenes, to tracking the objects but keeping them in the Cleanup Group to fix prefab loading behavior
Shifted to utilizing SimGroupInterator and persistenceManager to fix saving issues with SubScenes
Shifted to utilizing SimGroupIterator for Scene saving to standardize and minimize object misses
Changed prefab load file logic to add loaded child simgroup to rootscene for consistent tracking and avoiding conflicts with subScene's hijacking the ImmediateGroup var
Reduced duplication of build<type>field callback for inspectors
Added more standard field type lookups to inspector group when creating a field to avoid misses for types like 'F32' or similar.
Folded the added-on MinSize/MaxSize/SimgroupSelect fields for SimGroup editing into a single compound field and fixed bugs with it's behavior so it works as expected now
2024-10-27 20:04:13 -05:00
AzaezelX 24933a1cc7 add min/max tile height entrys to painter, apply those to the general isvalid check for a given tile alteration. apply that to more brushes. 2024-10-24 13:37:45 -05:00
AzaezelX 85955479c8 terrain mask work
adds an isValid(gridinfo tile) command to prefilter out grid elements of a specified nature
applies that to SetEmptyAction::process
also corrects sliderbar positions for terrain painting elements, as ell as adds a min/max slope for removal

potential TODOs: apply it more places pending feedback. add a min/max hieght filter as well
2024-10-23 17:50:07 -05:00
JeffR 20a01d9f02 Merge branch 'development' of https://github.com/TorqueGameEngines/Torque3D into SubScenes_Gamemode_PR 2024-09-28 22:11:39 -05:00
AzaezelX 7664b63071 snap syncing
for world and convex shape editors
2024-09-22 14:34:07 -05:00
AzaezelX ead06b845e colorpicker cleanups
largely focuses on removing extraneous code and mangled math
2024-09-16 13:24:41 -05:00
Areloch ae8eca48e1 Implementation of Subscenes, SceneGroups and Gamemodes
Standardizes Gamemodes to be an actual class with data and utility functions that can be parsed
Adds inspector field handling for selecting gamemodes
Updated Scene class to work with Gamemodes for the gamemode field
Updates editor suite elements to be able to create SubScenes, SceneGroups and Gamemodes
Adds ability to convert SimGroup to SubScene
Updates BaseUI's chooselevel menu to have gamemode selection and filters shown levels based on selected gamemode
2024-09-01 16:39:00 -05:00
AzaezelX 1055dc8415 guiaudio crashfix on exit
further ensure sound playback isn't even started unless the test condition is true and the gui element is awake
remove redundant sfx->stop(). already does so with SFX_DELETE(source)
2024-08-07 21:51:36 -05:00
AzaezelX 9b5f137f77 guiAudiocCtrl fixes
ditch description: not needed.
set process ticking off when the gui element is put to sleep
for the case of re-use of 3d sounds, set emission to the listener position
2024-08-05 17:51:17 -05:00
Brian Roberts 95c7e9f3f2
Merge pull request #1299 from Azaezel/alpha41/abFixes
fix guiwindowCTRL callback
2024-07-29 04:06:16 -05:00
AzaezelX 265ce8429b fix guiwindowCTRL callback
also set asset browser to use rows or columns depending on which dimension is longer
2024-07-28 05:51:03 -05:00
AzaezelX eaa09a6db7 corrections:
fill in missing SceneObjectTypes enums.
parity with simobject.cpp and objecttypes.h
correct inspector display
2024-07-24 20:43:36 -05:00
AzaezelX 72c67e196a Merge branch 'development' of https://github.com/TorqueGameEngines/Torque3D into Enumnanigans 2024-07-24 17:58:27 -05:00
marauder2k7 6807abc8b6 ID10T error
no default does not need case -_- id10t error, few other fixes
2024-07-22 21:12:48 +01:00
marauder2k7 a621cc5100 various warnings
warnings cleanup
2024-07-22 20:59:48 +01:00
Brian Roberts cbe7f77ce0
Merge pull request #1278 from Azaezel/alpha41/oopsOps
fix fighting itterators
2024-05-14 09:47:54 -05:00
AzaezelX fe5e81a27a fix fighting itterators 2024-05-13 21:31:20 -05:00
AzaezelX 84c08e6ed9 work around collide not returning false with a nul object
fix a crash caused by having boundingBoxCollision on, while projecting the mouse so that there is nothing between it and a globalbounds object
it would seem we're somehow ending up in a state of WorldEditor::collide returning true it hit somethging, but NULL as far as *what*
until we properly fix this, doublecheck to make sure the hitObject isn't NULL before we start trying to reference membervars/methods
2024-05-07 00:24:49 -05:00
Areloch b77911bdcd Exposes the SceneObjectTypeMasks as an enum type, allowing it to be utilized in inspectors.
Updated Trigger triggeredBy field to utilize new enum type for editing
Updated MaterialDefinition's animFlags field to utilize appropriate enum type for editing
Fixed image reference in bitmask inspectorField type to use correct image asset name
2024-05-04 09:56:04 -05:00
Areloch 0d2aeac303 Cleaned up unneeded formatting values on the TypePointX field elements
Adds logic checks so we don't multi-apply edits from applyWord fields, causing redundant extra undo's
2024-05-01 21:58:18 -05:00
Areloch fdadfa5eea Adds handling for complex fields such as Point2, Point3 and Point4's to be able to apply value changes to only one axis across a multi-object set without affecting other axis' 2024-04-30 18:44:17 -05:00
AzaezelX f6419d9659 fix order of ops mangling useGroupCenter snapping 2024-04-15 15:33:06 -05:00
AzaezelX 39e72cf2b6 ditch _snapfloat entirely in favor of just using the shared mRoundF 2024-04-10 15:56:44 -05:00
AzaezelX f52c1165b6 fix editor grid snap 2024-04-10 15:17:47 -05:00
AzaezelX f7ed077d82 round utility functions
add mRoundF to return nearest floating value to stepsize
2024-04-10 14:17:19 -05:00
marauder2k7 447cec6cdd Update guiInspectorTypes.cpp
fix rotation display
2024-04-02 01:48:37 +01:00
AzaezelX 01ff82cb72 fix mangled copypaste 2024-03-30 17:41:22 -05:00
AzaezelX 2b73f93f38 fix position editor value flutter
a) it didn't like mixing the script input %g and %.7f
b) we should set the increment to POINT_EPSILON as that's our cutoff value for several calcs.
2024-03-26 14:29:20 -05:00
Brian Roberts 05a083ca6f
Merge pull request #1234 from marauder2k9-torque/virtuals-override
Virtuals override
2024-03-21 10:43:26 -05:00
AzaezelX 8549c17a42 crashfix for inpector dynamic field editing 2024-03-20 14:32:09 -05:00
marauder2k7 2b295fb7f0 rest of virtuals removed
virtuals removed and replaced with override where necessary on the rest of the code base, clang-tidy to the rescue.
2024-03-18 18:40:22 +00:00
marauder2k7 efbe5e90f5 virtuals removed
virtuals removed and replaced with override where necessary, clang-tidy to the rescue.
2024-03-18 18:13:00 +00:00
marauder2k7 89843b541c Merge remote-tracking branch 'upstream/development' into ShaderConstBuffer-CleanupRefactor 2024-03-14 08:32:38 +00:00
marauder2k7 e6c653c441 warnings cleanup
cleanup and some warning fixes
2024-03-14 08:28:11 +00:00
AzaezelX 07ed59a872 TORQUE_TOOLS off compile fix
fix a cornercase for when TORQUE_TOOLS is #undef at the torqueconfig.h level
2024-03-10 14:29:17 -05:00
marauder2k7 fbed04050a gui shaders for opengl
First opengl geometry shader along with the other shaders for gui rendering opengl side.
2024-03-09 18:34:43 +00:00
marauder2k7 d9c4269d8b bug fix
deleteSelection when an output node had multiple connections only the first one was deleted, needed a new function to return a vector of connections that are now looped and deleted at the end of delete selection.

few other minor additions and fixes.
2024-03-07 17:22:48 +00:00
marauder2k7 dbbd9383e7 better rounded rect 2024-03-07 10:20:06 +00:00
marauder2k7 0d448ad761 smoothing out results from gui shaders
roundedRectangle and circle drawing now smooth out their results
2024-03-07 09:47:18 +00:00
marauder2k7 2dc623df7e material output node
material output node added

colors denoting node sockets added. this will probably be changed.
2024-03-06 19:57:18 +00:00
marauder2k7 c9d70de609 extra draw gui
add the extra functions for drawing gui elements
RoundedRectangle:

All draw rect functions now pass through roundedRectangle which uses a shader and can draw borders, and rounds the corners

Draw thick line:
draws a line thicker than 1 pixel, uses a geometry shader to do this

Draw Circle:
Draws a circle with a border parameter.
2024-03-06 17:27:18 +00:00
marauder2k7 808e2f4200 Groundwork for other shaders
Adds the ground work for geometry shaders
Expands shaderData and gfxShader to allow for more shader types

note: when building a GFXShader in source you have to call setShaderStageFile with the shaderStage and the filepath for that stage.

Once we add compute shaders this will become more apparent as compute shaders are a stage of their own and do not require vertex and pixel files whereas other shaders sometimes do.
2024-03-06 13:26:39 +00:00
marauder2k7 949f788a0a connections
connections rendering and logic finished.
can make rendering better in future updates such as using geo shaders for bezier curves and smoother lines.
2024-03-05 20:39:33 +00:00
marauder2k7 155dfe0c69 more options for nodes
render nodes with GuiShaderEditor border colors
node size now changable.
2024-03-05 13:15:33 +00:00
marauder2k7 b2095db575 can key focus 2024-03-04 17:15:13 +00:00
marauder2k7 daa0cfef3a shader node editor test
node editor functioning correctly, connections needed next
shader nodes to be added in the next commit also
2024-03-03 21:13:58 +00:00
marauder2k7 6e85b43088 backup before connections
everything in shaderEditor now finished only thing left to add is the connections.
2024-03-03 19:24:49 +00:00
marauder2k7 be0689549a place functions in cpp
stop cli bitching.....
2024-03-02 20:14:11 +00:00
marauder2k7 457cdd00bb shader editor ground work
Adds the ground work for shader editor
Adds the base gui for the shader editor
2024-03-02 20:09:45 +00:00
Areloch d890c530f9 Adds logic to be able to set a search string on an inspector that will be used to filter displayed fields.
Adds a textEdit filter box to the main world inspector that hooks into the primary inspector for said search functionality
2024-02-13 20:33:14 -06:00
AzaezelX de87d2f6ad fix guishapeedpreview not displaying IBL
note this *does* require a baked skylight in the main scene
todo: track down why a similar protocol does not operate for guimaterialpreview and guiobjectview
2024-02-10 13:36:55 -06:00