Brian Roberts
05a083ca6f
Merge pull request #1234 from marauder2k9-torque/virtuals-override
...
Virtuals override
2024-03-21 10:43:26 -05:00
Brian Roberts
3fd352926b
Merge pull request #1238 from Azaezel/alpha41/dynamicfieldsCrashfix
...
crashfix for inpector dynamic field editing
2024-03-21 10:43:17 -05:00
AzaezelX
8549c17a42
crashfix for inpector dynamic field editing
2024-03-20 14:32:09 -05:00
marauder2k7
f00d53f1d4
Revert "Update engineAPI.h"
...
This reverts commit a3742d26fb
2024-03-19 22:32:25 +00:00
marauder2k7
a3742d26fb
Update engineAPI.h
...
remove static inline and replace for static.
static inline is not C compliant.
2024-03-19 22:20:48 +00:00
marauder2k7
7874c0ae27
Merge remote-tracking branch 'upstream/development' into virtuals-override
2024-03-19 19:11:24 +00:00
AzaezelX
2e25059b27
fix inheritance conflict loop by declaring a singular root for class EngineObject : public StrongRefBase
2024-03-18 22:39:18 -05:00
AzaezelX
c337d5a9d2
clang tidy misc fixes
...
adress mixed || plus && concerns raised
2024-03-18 20:11:44 -05:00
marauder2k7
8dc3163fae
Update gfxNullDevice.cpp
2024-03-18 20:24:03 +00:00
marauder2k7
815832152d
changes on macosx
...
mac picked up a couple of left over issues.
2024-03-18 19:58:47 +00:00
marauder2k7
7c7e3c8bf8
Update gfxNullDevice.cpp
2024-03-18 19:58:02 +00:00
marauder2k7
155696ba76
Update gfxNullDevice.cpp
...
ubuntu gcc crash on this function
2024-03-18 18:55:59 +00: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
Brian Roberts
15971185ee
Merge pull request #1232 from Azaezel/alpha41/reloadredux
...
reload chain execution
2024-03-18 12:22:01 -05:00
AzaezelX
bfc921da22
reload chain execution
...
for imageassets and materialassets, check any other assets using them, and uppon completion of reloading, kick off the using assets reload as well in serial
2024-03-17 21:30:19 -05:00
marauder2k7
e0c80ac909
fix for the fix because original fix did jack
2024-03-15 22:59:27 +00:00
marauder2k7
51624b7ce8
macosx changes
...
changes required to get masox to run.
Some further changes possible required around resourceHolder in future.
The geometry shader works in macosx with gl version 3.3, though i do think some changes are required internally to account for a lack of OUT_col%
2024-03-15 15:17:25 +00:00
marauder2k7
db97e8473a
Update winPlatformCPUCount.cpp
...
fix pragma push/pop.
2024-03-14 15:14:01 +00:00
marauder2k7
11d8604d8e
ogl device buffer creation
...
now ogl mirrors dx side with ubo creation and clearing pushed up to the device level.
2024-03-14 14:23:08 +00:00
marauder2k7
1e8841e6b5
pushed buffer creation up to the device level
...
now shaders ask the device to create a buffer, if a buffer of the same name and size already exist then a pointer to that buffer is returned instead. Going to see if something similar can be added to the opengl end.
2024-03-14 13:32:21 +00:00
marauder2k7
e46a7a7d47
re-download array object from development
...
re-download arrayObject from development so it doesn't show up as if there have been changes
2024-03-14 08:40:10 +00:00
marauder2k7
d7b68a97ee
no idea why this was changed in a previous commit
...
how the fuck did this get changed!
2024-03-14 08:37:05 +00:00
marauder2k7
89843b541c
Merge remote-tracking branch 'upstream/development' into ShaderConstBuffer-CleanupRefactor
2024-03-14 08:32:38 +00:00
marauder2k7
bd7bbd782c
Revert "Merge branch 'development' into ShaderConstBuffer-CleanupRefactor"
...
This reverts commit ae11d996d9e6c653c441
2024-03-14 08:32:29 +00:00
marauder2k7
ae11d996d9
Merge branch 'development' into ShaderConstBuffer-CleanupRefactor
2024-03-14 08:28:29 +00:00
marauder2k7
e6c653c441
warnings cleanup
...
cleanup and some warning fixes
2024-03-14 08:28:11 +00:00
marauder2k7
9dc5ae833b
opengl ubo setup
...
opengl can now compile with ubo buffer objects similar to cbuffers on dx side.
cleaned double up of data from both sides, gfxhandles only need to use the desc info instead of holding onto its own.
2024-03-13 22:23:01 +00:00
Brian Roberts
3fa7faf361
Merge pull request #1228 from jamesu/zonefix
...
Basic fix for zone removal issue
few bits will still need a follow-up, but in the interests of killing the ap crash this is a good enough baseline
2024-03-12 21:24:14 -05:00
James Urquhart
42f4ccfbb5
Basic fix for zone removal issue
2024-03-11 23:02:15 +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
39c2cc09fc
Update gfxGLShader.h
...
forgot to save the file...
2024-03-06 14:02:30 +00:00
marauder2k7
4a6fbd5811
DX and GL Geometry shaders added
...
Added the dx and gl geometry shader compile codes.
2024-03-06 13:51:50 +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
AzaezelX
24562e6758
aug ArrayObject to have a uniquePair command
...
like uniqueket and uniquevalue, removes duplicate entries, but only if *both* match
also, use that for the populateAllFonts() cache generator
2024-03-03 22:04:09 -06: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
marauder2k7
d8636f754b
Merge remote-tracking branch 'upstream/development' into ShaderConstBuffer-CleanupRefactor
2024-03-01 17:52:37 +00:00
marauder2k7
6355da5df6
various fixes
...
STB probably shouldn't fail on failed info, just continue.
Assimp only add sequences if there are any.
Update kork chan asset.
2024-03-01 15:01:47 +00:00
