TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-09 14:31:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
7089 commits 5 branches 33 tags 958 MiB
Commit graph

623 commits

Author SHA1 Message Date
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
Brian Roberts 600a6b8ebc
Merge pull request #1192 from Areloch/EditorPopupEXFieldExpansion 
Usability improvements for editor fields utilizing popup menus
 2024-02-07 19:29:07 -06:00
Brian Roberts 3fd4cbdb89
Merge pull request #1207 from Areloch/ImageAssetArrayInspectorFix 
Fixes the handling of imageAssets for array'd field types, as well asfixing the editor behavior of guiBitmapCtrl so the imageAssets correctly update the fields upon editing
 2024-02-04 15:49:20 -06:00
Areloch 7ef4552196 Fixed category filtering logic for datablockField populateMenu 2024-02-04 15:25:35 -06:00
Areloch 1e21cc678f Fixes the handling of imageAssets for array'd field types, as well as fixing the editor behavior of guiBitmapCtrl so the imageAssets correctly update the fields upon editing 2024-02-04 14:45:19 -06:00
Brian Roberts ceec0dfb5b
Merge pull request #1205 from Areloch/ForcedArrayIndexInspector 
Adds ability to force the inspector to only show a set index of array'd fields.
 2024-02-04 11:27:50 -06:00
Areloch 4646d5eac3 Adds ability to force the inspector to only show a set index of array'd fields. Mostly for specific editor tool use(like editing material's individual layers/stages) 2024-02-04 00:21:54 -06:00
Brian Roberts 79e06af6dd
Merge pull request #1204 from Areloch/MLTextTypeOut 
Adds ability for MLTextCtrl to type the characters out over time
 2024-02-04 00:14:58 -06:00
Areloch 6de92264f6 Adds ability for MLTextCtrl to type the characters out over time 2024-02-04 00:13:33 -06:00