Commit graph

4567 commits

Author SHA1 Message Date
marauder2k7 92b10df7eb cleanup nodes
ADDED: functionality to clean nodes out of the script that are related to a specific target
ADDED: functionality to clean multiple addCollisionDetails from the script
ADDED: ColConvex get added as nodes now and dont just get skipped (for future reference ColMeshes are checked for colConvex are not but this will be needed in future)

Removed: erroneous deletion of nodes and meshes from shapeEditorActions tscript file.
2024-05-16 07:04:54 +01:00
marauder2k7 25b0c5e2b1 finish fill mode setting
now fill mode actually takes effect and changes the fill mode type used to generate the convex hull
2024-05-16 04:32:14 +01:00
marauder2k7 48848f9706 rename vars
renamed vars to make more sense with the new option params
2024-05-16 03:39:18 +01:00
marauder2k7 f963a78446 TEST progress
Adding multiple collision hulls and shapes through the shape editor now works as intended though with multiple convex hulls it does produce a few lag spikes on first load of the objects.
2024-05-15 07:32:26 +01:00
marauder2k7 78f6206cde repurposed sliders
repurposed and renamed the 2 sliders in the gui to be for settings in vhacd
added the drop down for fillMode types but it is not hooked up to source yet
2024-05-14 17:20:17 +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
marauder2k7 81a913616c revert ThreadPool rename
revert ThreadPool rename, resources ThreadPool class is already nested in namespace VHACD
2024-05-12 21:59:18 +01:00
marauder2k7 8cf2b1d0ef Update tsMeshFit.cpp
fix addSphere
fix addCapsule

now spheres and capsules scale correctly.... hopefully....
2024-05-12 17:51:21 +01:00
marauder2k7 399844f7f1 linux and tests
fix linux build
change thread test to use TorqueThreadPool
2024-05-12 16:31:30 +01:00
marauder2k7 948d2e5cef Update tsMeshFit.cpp
code cleanup, fix warnings etc
2024-05-12 15:21:59 +01:00
marauder2k7 109d8c06e9 final cleanup
final cleanup removal of the old convexDecomp library
ADDDED: library for the floatmath from v-hacd resource, required for fit sphere/capsule/box functions
2024-05-12 15:13:03 +01:00
marauder2k7 eb33fe04af working vhacd
renamed ThreadPool to TorqueThreadPool to avoid conflics
fixed data transmission between stages of convexDecome and trimesh creation
TODO: re-add our own functions for generating sphere/cylinder/box
2024-05-12 14:43:56 +01:00
marauder2k7 679f0ff065 vhacd
added vhacd not working atm
2024-05-12 03:07:59 +01: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 da743d9dc4 Removed test enum values 2024-05-04 10:19:12 -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
AzaezelX 3a7f3beb64 play steering thread on server so mounted objects like turrets can be linked to it 2024-05-02 21:01:16 -05:00
Brian Roberts 67b052a192
Merge pull request #1269 from Areloch/MultiObjectEditMadness
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-05-01 23:21:15 -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
AzaezelX 1ea74bf8c6 enhanced argc reporting
in a method argc out of bounds scenario, report how many it got, and what range it expected
2024-05-01 18:20:14 -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
marauder2k7 baa977eed8 missed change
missed explicit value
2024-04-27 23:40:35 +01:00
marauder2k7 8cf5fac497 Improved error printing torquescript
Added a vector that can lookback across x number of lines in a file, if not a file just print out the error.
2024-04-27 21:19:56 +01:00
marauder2k7 f82082f59f Merge remote-tracking branch 'upstream/development' into torquescript-errorPrinting 2024-04-27 07:02:52 +01:00
Brian Roberts 4e88c4c050
Merge pull request #1255 from marauder2k9-torque/torquescript-generateCompiler
TorqueScript Generate compiler
2024-04-27 00:44:35 -05:00
Sven ada83d9a6a
Remove redundant cstdint include 2024-04-25 18:10:26 +00:00
Sven ac56258c9f
Revert "Remove redundant include" 2024-04-25 18:09:54 +00:00
Sven 51be14645d
Remove redundant include 2024-04-25 19:58:50 +02:00
Sven ba5351180b
Add cstdint to ies_loader 2024-04-25 11:27:09 +00:00
Brian Roberts 29ba0439b7
Merge pull request #1260 from Azaezel/alpha41/dynamicReflectionRevisions
fix dynamicCubemaps on objects
2024-04-24 23:14:10 -05:00
Brian Roberts d464c450d5
Merge pull request #1259 from marauder2k9-torque/test-cubemap-mip-gen
Test PR for generating cubemap mips
2024-04-24 23:14:02 -05:00
marauder2k7 6966d20104 Error printing
now torquescript will print out a more modern error message with a pointer to the offending character.
Multi line error outputs to be added to this for context
2024-04-24 06:42:25 +01:00
marauder2k7 4f3a1f395c Merge remote-tracking branch 'upstream/development' into torquescript-generateCompiler 2024-04-20 06:21:05 +01:00
Areloch 51c1ab6b83 Adds a sanity check to SimObject's setFieldValue console method so if you pass in a blank field name it doesn't crash, instead asserting in debug, and logging the error in release 2024-04-19 00:00:37 -05:00
AzaezelX 824b9a9cd5 fix dynamicCubemaps on objects 2024-04-18 13:57:29 -05:00
marauder2k7 ce4d861658 Test PR for generating cubemap mips
note ibl skips prefilter step and prefilter just becomes the cubeRefl.getCubemap()

Generates cubemap mip levels after the bake correctly on DX side.
2024-04-18 07:56:52 +01:00
Brian Roberts e5aa6e4a95
Merge pull request #1258 from Azaezel/alpha41/probePoke
shift capturing from a globalMacro to a sceneRenderstate S32
2024-04-18 01:42:33 -05:00
AzaezelX fe26ffc375 shift capturing from a globalMacro to a sceneRenderstate S32
lets us ditch shader recompilation so that can be done on the fly without hitches, though does cost us a per-shader const for objects and postfx
2024-04-16 13:51:41 -05:00
Brian Roberts 848db69ef1
Merge pull request #1256 from Azaezel/alpha41/orphanOops
getPrefabByCHild should skip NULLs
2024-04-15 17:55:24 -05:00
AzaezelX f6419d9659 fix order of ops mangling useGroupCenter snapping 2024-04-15 15:33:06 -05:00
AzaezelX 785872d398 getPrefabByCHild should skip NULLs 2024-04-15 13:20:09 -05:00
marauder2k7 587f80da91 Update bison.bat
make it output the header file, this way the linkage should always work..... "should"
2024-04-15 00:33:04 +01:00
marauder2k7 77eec75bed Update astNodes.cpp
typo
2024-04-14 22:52:32 +01:00
marauder2k7 856d3bc901 fix for linux
linux case sensitivity
2024-04-14 22:47:55 +01:00
marauder2k7 83b3f01928 update bison flex
-Updated bison flex exe files to the latest windows version i could find
-Regenned the compiler..... alot of changes.....
2024-04-14 22:17:41 +01:00
marauder2k7 0954b081d0 GenerateCompiler
-ReAdded generateCompiler.bat
-Fixed paths in bat filse
-Fixed paths for includes
2024-04-14 07:08:17 +01:00
AzaezelX ce36e2cac6 typofix 2024-04-10 16:27:30 -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 65fe0be037 use consistent clipping 2024-04-10 15:17:24 -05:00
AzaezelX f7ed077d82 round utility functions
add mRoundF to return nearest floating value to stepsize
2024-04-10 14:17:19 -05:00
Brian Roberts f0e7a27c16
Merge pull request #1249 from Azaezel/alpha41/refreshrevamp
hot editing tsstatics crashfix
2024-04-07 14:26:15 -05:00
AzaezelX 00bdc913b0 onAssetRefresh(); already chains. no need to call that again 2024-04-06 17:14:56 -05:00
AzaezelX 40d38cc1ec uneeeded 2024-04-06 16:48:02 -05:00
AzaezelX 5ff83138cf need to set state to ok post-load and pre-changesignal callback 2024-04-06 16:39:31 -05:00
AzaezelX 3ace31c68c crashfix work for hot-editing shape assets tied to tsstatics 2024-04-06 14:48:22 -05:00
marauder2k7 447cec6cdd Update guiInspectorTypes.cpp
fix rotation display
2024-04-02 01:48:37 +01:00
Brian Roberts cc6bf16d95
Merge pull request #1247 from Azaezel/alpha41/copyPasteCrunch
fix mangled copypaste
2024-03-30 18:51:16 -05:00
AzaezelX 01ff82cb72 fix mangled copypaste 2024-03-30 17:41:22 -05:00
marauder2k7 33094397c2 Update bitmapSTB.cpp
stb loader was spamming NO SOI with the function of stbi_info_from_memory because it checks for a jpeg first. This will always return an error if you are sending any other format. Remove this check and just load the memory stream. if it fails to return pixeldata then we have an error.
2024-03-27 07:32:59 +00: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
marauder2k7 ee9ac81281 Merge remote-tracking branch 'upstream/development' into change-to-use-libsndfile 2024-03-25 08:41:12 +00:00
Triston a2cdbebfa1 removes a use after freed in consoleInternal 2024-03-24 18:36:42 -05:00
marauder2k7 d08583bef1 Merge branch 'SFXResource-fix' into change-to-use-libsndfile 2024-03-24 15:56:01 +00:00
marauder2k7 352afa3f0f SFXResource multi read
SFXResource was always creating a new file for each sound resource. Sometimes this would happen 3 times since the asset was creating a resource, then the profile, then the object that was using it.

Now if the sfxResource exists and we call openStream it returns the sfxFileStream linked to that file instead of just creating a new one.
2024-03-24 15:39:58 +00:00
marauder2k7 6bc4ace2e5 Update sfxSndStream.cpp
fix for stereo files (2d sound files) frames report back as bytesPerSample * channels

which for us is bytesPerSample. This needs to be applied to the return from read so sfx resource knows we have read all the info.
2024-03-24 13:51:04 +00:00
marauder2k7 705b17ab57 Merge remote-tracking branch 'upstream/development' into change-to-use-libsndfile 2024-03-24 12:07:26 +00:00
marauder2k7 0342eb6f31 replace other classes
now all sfxFileStreams create a libsndfile stream class.

At the moment we only read as short
2024-03-24 12:06:03 +00:00
marauder2k7 147044796b sfxSndStream
Ogg file from libsndfile now working. we can pull more information from the format and specifics of the file from libsndfile should maybe look at updating all the parameters around mFormat so it feeds openal settings better.

Next step is to remove the other stream classes.
2024-03-24 11:33:42 +00:00
marauder2k7 3652367b36 sfxSndStream
read an ogg file through libsndfile instead of libvorbis.

There are still issues with this part of the file opens but doesn't read the whole file for some reason
2024-03-23 20:17:18 +00:00
marauder2k7 d1fcdcbea3 Merge remote-tracking branch 'upstream/development' into MACOSX-CompileFixes 2024-03-21 18:52:54 +00:00
marauder2k7 a745fc3757 Initial commit
added libraries:
opus
flac
libsndfile

updated:
libvorbis
libogg
openal

- Everything works as expected for now. Bare in mind libsndfile needed the check for whether or not it could find the xiph libraries removed in order for this to work.
2024-03-21 17:33:47 +00:00
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
marauder2k7 d44e475800 compile fixes and improvements
mac was failing to generate an archive.

Icons now in an app asset so it can be properly modified in the project instead of being a static .icns file.

Info.plist now gets its bundle name from the product bundle identifier field, this means it can be changed through the gui instead of having to manually modify the bundle identifier. All other settings are left blank.

Info.plist will need further updates to take values set in Xcode to make it easier to distribute apps.

OpenAL and SDL have to skip installation in release mode builds for the archive to be created correctly.
2024-03-21 10:45:31 +00: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 ae11d996d9, reversing
changes made to e6c653c441.
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
marauder2k7 017246cfa3 Update gfxD3D11Shader.cpp 2024-03-01 14:30:31 +00:00
marauder2k7 cd6656be35 Fix archive
Incorrect cmake directory was messing up reading from zips
STB was failing to read from zips, it was failing to get the file info, something we were using as an early out, now if that files on the filepath, we use the memory read instead since stream needs to be a success to get to that point.
2024-03-01 10:06:18 +00:00
marauder2k7 74da01dd0d Merge remote-tracking branch 'upstream/development' into ShaderConstBuffer-CleanupRefactor 2024-02-29 14:34:54 +00:00
marauder2k7 a7021c0ed3 cleanup
Reverted back to a 2d array since when the const buffer changes are made to the shaders they will be completely swapped out for a 1d array with a max size of 16 for the program, id3d11buffers will be shared across shaders apart from object buffers. We still need to decide on a structure to get everything setup so to keep functionality a max of 2 buffers per stage with 1 buffer as a padding so we can start coding constant buffers right away
2024-02-29 14:34:22 +00:00
Brian Roberts 5d1f306668
Merge pull request #1224 from Azaezel/alpha41/cmakeCleanup
t3d subdirectory review
2024-02-28 19:39:20 -06:00
AzaezelX 7d1927af99 t3d subdirectory review
add missing example directory
preserve reservations for ecs directories in remmed form
2024-02-28 03:53:49 -06:00
Brian Roberts 13e5302e93
Merge pull request #1211 from marauder2k9-torque/AssimpLoaader-Fix
Test assimp PR before full refactor
2024-02-28 03:37:25 -06:00
marauder2k7 cd8914b9ad reverse bitshift
need to reverse the bitshift on shaderstages so we get values between 0-5, need to also revert the mBoundConstVec back to a 2dimensional array so that the binding point can be dynamic as well.
2024-02-27 20:59:10 +00:00
marauder2k7 040bbdd6d6 Update gfxD3D11Shader.cpp
turns out we dont need to do this if both exist the bind point gets changed anyway
2024-02-27 14:51:59 +00:00
marauder2k7 e9a38539a3 multiple desc per handle
Added multiple descriptions to handles.

While maps are very efficient and match data very quickly due to hashing and what not, they are tricky memory wise, we cant clear them if they are only made up of structs and enums. Need to explore other methods for doing this. Original system had a sub buffer system with a check based on whether the handle was marked vertex/pixel. With 6 stages possible now we need to think of a more effective method. Since shaderstage is now a bit flag maybe some sort of streaming setup could be used to write without a loop.
2024-02-27 09:15:19 +00:00
marauder2k7 78df01af55 Update gfxD3D11Shader.cpp
plugging leaks
2024-02-26 22:44:32 +00:00
marauder2k7 37636bcd26 switch to vectors
uses vectors for buffers instead of 2d array
2024-02-26 22:25:11 +00:00
marauder2k7 dfe4bcd01e Merge remote-tracking branch 'upstream/development' into ShaderConstBuffer-CleanupRefactor 2024-02-26 18:51:40 +00:00
marauder2k7 c876e86957 Update gfxD3D11Shader.cpp
cleanups
2024-02-26 16:38:56 +00:00
marauder2k7 b979f4befc everything works
... apart from the sun =/
2024-02-26 09:22:19 +00:00
marauder2k7 e24971517e commit before pr 2024-02-25 23:10:23 +00:00
marauder2k7 25bc9cf354 stumped
buffers seem to be being added correctly, but for whatever reason render is not correct =/
2024-02-25 22:51:37 +00:00
marauder2k7 af29a2af0a Remove code duplication
Removed code duplication, all types can be routed through the same function apart from matrices.
2024-02-25 15:26:48 +00:00
marauder2k7 8c01a1a85b Working
This commit has everything rendering kind of correctly, but the colours seem off from lighting.
2024-02-25 13:39:22 +00:00
marauder2k7 6355e122d2 compare before change
check to see if data is different in internal sets before changing values
2024-02-24 19:52:35 +00:00
Brian Roberts e0cf6cd1b7
Merge pull request #1219 from Azaezel/alpha41/npcnono
fix non player class pathshape jitter
2024-02-24 12:31:15 -06:00
Brian Roberts ecd75bdc06
Merge pull request #1220 from Azaezel/alpha41/fixGLVisibility
fizzle fix for gl
2024-02-24 12:31:06 -06:00
marauder2k7 3f3ef12c3b handle the global buffer
global buffer needs a special case
2024-02-24 17:33:28 +00:00
marauder2k7 e8d8138c74 working
last commit before global conform
2024-02-24 16:26:09 +00:00
marauder2k7 d9fd3375da Merge remote-tracking branch 'upstream/development' into ShaderConstBuffer-CleanupRefactor 2024-02-24 14:42:53 +00:00
marauder2k7 8887e21f4b working
working example, renders all gui controls.

We still cant render a scene, something to do with the constant buffer at slot 0 of the vertex shader being too small..... gotta figure this one out..................
2024-02-24 14:42:30 +00:00
marauder2k7 dd4d48d654 working example
now its working.. still not perfect but its getting there
2024-02-24 12:40:12 +00:00
marauder2k7 42b8748f5b bkup
still memory heap issue
2024-02-24 12:04:53 +00:00
marauder2k7 4caa54ad7e working example
everything is working apart from samplers......
2024-02-23 21:27:44 +00:00
marauder2k7 a1e2f781a8 Set constant buffers
added logic to set constant buffers dx side
2024-02-23 20:06:46 +00:00
AzaezelX c7cc86b357 clamp spot angle to 179,
up custommaterial inputs to 16
add Material::PhotometricMask:handling to processedcustommaterial
and for paranoias sake go ahead and be explicit about _getLightMaterial (those *should* be unneeded as they optionally default to that, but it's how they were in the beatup fork during testing)
2024-02-23 11:52:43 -06:00
marauder2k7 97ed522667 gfxD3D handles and buffermap
init handles coded.
bufferMap added.
2024-02-23 17:18:45 +00:00
marauder2k7 630bee97c7 backup 2024-02-22 21:37:44 +00:00
marauder2k7 1ccf4cff85 Merge remote-tracking branch 'upstream/development' into AssimpLoaader-Fix 2024-02-22 10:01:32 +00:00
marauder2k7 55519aac57 Shader refactor
Refactored DX Shader compilation and reflection to be more similar to opengl
Added support for more than 1 const buffer per shader stage.

This is boilerplate code, no functionality yet, that will be added in further commits. Though this builds without errors do not try and run it at this point.
2024-02-22 09:58:45 +00:00
AzaezelX ad6880ec0d fizzle fix for gl
correct  ShaderFeatureGLSL::getInVpos to more closely match directx outcomes so we can keep using the same math across incudes
2024-02-21 14:16:38 -06:00
AzaezelX a4da6727ed fix non player class pathshape jitter
everything has a consistent getRenderTransform() nowadays
2024-02-21 12:24:38 -06:00
marauder2k7 ad64b4f2df IES Loader
Updated IES loader to use torque math functions and calls in the problem areas for mac and linux.

New F32_MIN_EX which is lower than F32_MIN (required for ies profiles)
2024-02-21 09:36:37 +00:00
marauder2k7 4417462499 Add support for both ies and cookie
Both ies and cookies can now exist on a light

We are still not using all the capabilities of an IES profile, such as candela and luminance values we are just using them as a mask for the moment

Issues compiling on mac and linux, will need to update the ies-loader to use torque methods instead of std::
2024-02-21 07:40:57 +00:00
marauder2k7 a12d915180 Loads an IES Photometric profile.
ADDED: Ability to add IES profile as the cookie texture slot in both point lights and spot lights

TODO:
Have the IES Profile also drive the settings for the lights.
Make it work with Cookie textures. IES profiles are to be another slot in the advanced light section.
2024-02-21 06:22:37 +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
marauder2k7 58bcea770c Node interp
Fix node interpolation to remove the jittered (reverted back to previous get node transform)
2024-02-10 21:57:08 +00:00
Brian Roberts 5afbfec3b1
Merge pull request #1213 from Azaezel/alpha41/ProbesInPreviewers
fix guishapeedpreview not displaying IBL
2024-02-10 14:50:23 -06:00
marauder2k7 b7f9687a9d Merge remote-tracking branch 'upstream/development' into AssimpLoaader-Fix 2024-02-10 20:02:02 +00:00
marauder2k7 05960e4d25 extra fixes
Torque sees the seqEnd in appSequence as a time in seconds whereas in Assimp this is in frames.
This is then converted to frames in generateSequences.
2024-02-10 20:01:52 +00: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 2fe2e7925e
Merge pull request #1212 from Azaezel/alpah41/UnitTestTrouble
supress concurent threadsafedeque test as invalid
2024-02-10 10:48:39 -06:00
AzaezelX 0ccb27b7ad supress concurent threadsafedeque test as invalid
it's never actually used like that in practice, and while the cornercase reminder is useful, it's activetly causing overlooks for practical problems
2024-02-10 10:16:23 -06:00
marauder2k7 e2550ed525 Update assimpAppSequence.cpp 2024-02-10 04:49:57 +00:00
marauder2k7 144e1bcc60 Update assimpShapeLoader.cpp 2024-02-10 04:25:48 +00:00
marauder2k7 4b2abd4828 Merge remote-tracking branch 'upstream/development' into ThreadSafeDeque 2024-02-10 03:20:59 +00:00
marauder2k7 26e1350234 Merge remote-tracking branch 'upstream/development' into AssimpLoaader-Fix 2024-02-10 02:56:56 +00:00
Brian Roberts 25a3c3325f
Merge pull request #1208 from jamesu/datachunker_refactor
Datachunker & FrameAllocator refactor
2024-02-09 20:32:39 -06:00
marauder2k7 7115d9bcc6 Update assimpShapeLoader.cpp 2024-02-09 22:12:52 +00:00
marauder2k7 37dd58dca4 Update assimpShapeLoader.cpp
non destructive fixes for assimp loader
-this creates an ambient sequence if 1 does not exist.
-adds a bounds node if 1 does not exist.
2024-02-09 22:06:11 +00: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
marauder2k7 ae8a2a74f7 Update threadSafeDequeTest.cpp
change value to 50
2024-02-07 17:25:48 +00:00
James Urquhart 28ba2f2473 Fix gcc & clang Compile for FrameAllocator changes 2024-02-07 00:05:14 +00:00
AzaezelX c9ac4ffbfe correct grouping 2024-02-05 21:02:41 -06:00
James Urquhart 45898694e4 Reimplement FrameAllocator and FrameTemp; Tidy up DataChunker header.
- Also additional work on tests to reflect watermark behavior change
2024-02-06 02:35:16 +00:00
AzaezelX cea641b154 don't early out, *do* use case sensitive filename finding for the stringtable, and finally, don't even bother setting the mSoundpath here unless it's to clear it 2024-02-05 18:41:07 -06:00
James Urquhart 7332dd6643 Add tests for FrameAllocator and DataChunker 2024-02-05 22:53:09 +00:00
AzaezelX ef858d726b remindernote: false for unchanged, true for changed 2024-02-05 14:40:24 -06:00
AzaezelX da9b9ed787 prelim refactor 2024-02-05 14:23:11 -06:00
James Urquhart 3781c7fae5 Add an alternate allocator for DecalManager; Also fix SFX weirdness. 2024-02-04 23:27:31 +00:00
James Urquhart 915fac31b3 Basic refactoring WIP 2024-02-04 23:27:31 +00:00
Brian Roberts 36581246cd
Merge pull request #1206 from Areloch/MatAnimFlagsFix
Ensures that material animation flags are cleared when values are changed so they don't "stick"
2024-02-04 15:49:30 -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 138e426ed1 Ensures that material animation flags are cleared when values are changed so they don't "stick" 2024-02-04 14:58:26 -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
Brian Roberts ddd2522fa6
Merge pull request #1201 from Areloch/Particle_Material_InitPersistField_Reorg
Updates the initPersistFields for ParticleData and Material
2024-02-04 00:10:51 -06:00