Commit graph

6904 commits

Author SHA1 Message Date
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
d2ac25195f Update CMakeLists.txt
fix to skip mpeg on mac (would require another lib for mp3)
2024-03-24 12:51:22 +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
Brian Roberts
36fa51da3a
Merge pull request #1240 from marauder2k9-torque/MACOSX-CompileFixes
MacOSX compile fixes and improvements
2024-03-23 21:08:44 -05: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
3889798818 add speex
in order to access the experimental code in libsndfile have to have speex...
2024-03-23 09:55:21 +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
Brian Roberts
057654dda7
Merge pull request #1237 from marauder2k9-torque/fix-inspector-in-worldeditor
Update WorldEditorInspectorWindow.ed.gui
2024-03-20 14:03:23 -05:00
marauder2k7
fc8a281113 Update WorldEditorInspectorWindow.ed.gui
Scroll bar was extending beyond its parents extent making it render incorrectly.
2024-03-20 19:01:08 +00:00
Brian Roberts
8fbfcf1481
Merge pull request #1235 from Azaezel/alpha41/clangTidyCleanups
clang tidy misc fixes
2024-03-19 23:15:04 -05:00
Brian Roberts
58c3b31847
Merge pull request #1236 from Areloch/remapUIModifierSupport
Adds handling for the keyboard remap page of the options menu to be able to present a bind with a modifier key
2024-03-19 23:13:14 -05:00
Areloch
b1f71bab74 Adds handling for the keyboard remap page of the options menu to be able to present a bind with a modifier key 2024-03-19 23:05:03 -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
marauder2k7
8805ca4f9d
Merge pull request #5 from Azaezel/virtuals-override
Virtuals override
2024-03-19 08:16:13 +00:00
AzaezelX
cc3dd556cc shift clang-tidy on over to supressing libraries alone, so we don't accidently overlook enhaced reports 2024-03-18 22:41:10 -05: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
Brian Roberts
88a43f3137
Merge pull request #1229 from marauder2k9-torque/MASOX-compile-run-fixes
macosx changes
2024-03-17 13:51:16 -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
Brian Roberts
b624ec230a
Merge pull request #1223 from marauder2k9-torque/ShaderConstBuffer-CleanupRefactor
GFX Shader Refactor
2024-03-14 10:29:32 -05: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
a7dabae88a Update helperFunctions.tscript 2024-03-14 11:30:52 +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