Merge branch 'development' into filesystem-functions

Author: MyNameIsTrez

RTEA.vcxproj

@@ -816,7 +816,7 @@
     <ClInclude Include="Source\Managers\ActivityMan.h" />
     <ClInclude Include="Source\Managers\AudioMan.h" />
     <ClInclude Include="Source\Managers\ConsoleMan.h" />
-    <ClInclude Include="managers\FrameMan.h" />
+    <ClInclude Include="Source\Managers\FrameMan.h" />
     <ClInclude Include="Source\Managers\LuaMan.h" />
     <ClInclude Include="Source\Managers\MetaMan.h" />
     <ClInclude Include="Source\Managers\MovableMan.h" />

RTEA.vcxproj.filters

@@ -674,7 +674,7 @@
     <ClCompile Include="Source\Managers\ConsoleMan.cpp">
       <Filter>Managers</Filter>
     </ClCompile>
-    <ClCompile Include="managers\FrameMan.cpp">
+    <ClCompile Include="Source\Managers\FrameMan.cpp">
       <Filter>Managers</Filter>
     </ClCompile>
     <ClCompile Include="Source\Managers\LuaMan.cpp">

Source/Managers/LuaMan.cpp

@@ -1312,7 +1312,7 @@ namespace RTE {
 				g_ThreadMan.GetPriorityThreadPool().submit([luaState]() {
 					ZoneScopedN("Lua Garbage Collection");
 					std::lock_guard<std::recursive_mutex> lock(luaState->GetMutex());
-					lua_gc(luaState->GetLuaState(), LUA_GCSTEP, 30);
+					lua_gc(luaState->GetLuaState(), LUA_GCCOLLECT, 0); // we'd use GCSTEP but fuck lua it's trash
 					lua_gc(luaState->GetLuaState(), LUA_GCSTOP, 0);
 				})
 			);

Source/Managers/PostProcessMan.cpp

@@ -159,7 +159,7 @@ namespace RTE {
 		glBindTexture(GL_TEXTURE_2D, reinterpret_cast<GLBitmapInfo*>(bitmap->extra)->m_Texture);
 		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, bitmap->w, bitmap->h, 0, GL_RGBA, GL_UNSIGNED_BYTE, bitmap->line[0]);
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 		glGenerateMipmap(GL_TEXTURE_2D);
 	}
 
@@ -548,4 +548,4 @@ namespace RTE {
 			}
 		}
 	}
-} // namespace RTE
+} // namespace RTE

external/include/fmod-2.2.13/fmod/fmod_common.h

@@ -56,7 +56,7 @@ typedef struct FMOD_ASYNCREADINFO  FMOD_ASYNCREADINFO;
 /*
     FMOD constants
 */
-#define FMOD_VERSION    0x00020213                     /* 0xaaaabbcc -> aaaa = product version, bb = major version, cc = minor version.*/
+#define FMOD_VERSION    0x00020220                     /* 0xaaaabbcc -> aaaa = product version, bb = major version, cc = minor version.*/
 
 typedef unsigned int FMOD_DEBUG_FLAGS;
 #define FMOD_DEBUG_LEVEL_NONE                       0x00000000
@@ -439,6 +439,7 @@ typedef enum FMOD_OUTPUTTYPE
     FMOD_OUTPUTTYPE_AAUDIO,
     FMOD_OUTPUTTYPE_AUDIOWORKLET,
     FMOD_OUTPUTTYPE_PHASE,
+    FMOD_OUTPUTTYPE_OHAUDIO,
 
     FMOD_OUTPUTTYPE_MAX,
     FMOD_OUTPUTTYPE_FORCEINT = 65536
@@ -795,6 +796,7 @@ typedef struct FMOD_ADVANCEDSETTINGS
     unsigned int        randomSeed;
     int                 maxConvolutionThreads;
     int                 maxOpusCodecs;
+    int                 maxSpatialObjects;
 } FMOD_ADVANCEDSETTINGS;
 
 typedef struct FMOD_TAG

external/include/fmod-2.2.13/fmod/fmod_errors.h

@@ -49,7 +49,7 @@ static const char *FMOD_ErrorString(FMOD_RESULT errcode)
         case FMOD_ERR_HTTP_TIMEOUT:              return "The HTTP request timed out.";
         case FMOD_ERR_INITIALIZATION:            return "FMOD was not initialized correctly to support this function.";
         case FMOD_ERR_INITIALIZED:               return "Cannot call this command after System::init.";
-        case FMOD_ERR_INTERNAL:                  return "An error occurred that wasn't supposed to.  Contact support.";
+        case FMOD_ERR_INTERNAL:                  return "An error occured in the FMOD system. Use the logging version of FMOD for more information.";
         case FMOD_ERR_INVALID_FLOAT:             return "Value passed in was a NaN, Inf or denormalized float.";
         case FMOD_ERR_INVALID_HANDLE:            return "An invalid object handle was used.";
         case FMOD_ERR_INVALID_PARAM:             return "An invalid parameter was passed to this function.";
@@ -87,7 +87,7 @@ static const char *FMOD_ErrorString(FMOD_RESULT errcode)
         case FMOD_ERR_TAGNOTFOUND:               return "The specified tag could not be found or there are no tags.";
         case FMOD_ERR_TOOMANYCHANNELS:           return "The sound created exceeds the allowable input channel count.  This can be increased using the 'maxinputchannels' parameter in System::setSoftwareFormat.";
         case FMOD_ERR_TRUNCATED:                 return "The retrieved string is too long to fit in the supplied buffer and has been truncated.";
-        case FMOD_ERR_UNIMPLEMENTED:             return "Something in FMOD hasn't been implemented when it should be! contact support!";
+        case FMOD_ERR_UNIMPLEMENTED:             return "Something in FMOD hasn't been implemented when it should be. Contact support.";
         case FMOD_ERR_UNINITIALIZED:             return "This command failed because System::init or System::setDriver was not called.";
         case FMOD_ERR_UNSUPPORTED:               return "A command issued was not supported by this object.  Possibly a plugin without certain callbacks specified.";
         case FMOD_ERR_VERSION:                   return "The version number of this file format is not supported.";

external/lib/linux/arm64/libfmod.so

@@ -0,0 +1 @@
+libfmod.so.13.20

external/lib/linux/arm64/libfmod.so.13

@@ -0,0 +1 @@
+libfmod.so.13.20

external/lib/linux/arm64/libfmod.so.13.20

@@ -0,0 +1,9 @@
+cp = find_program('cp')
+fmod_so = files('libfmod.so.13.20', 'libfmod.so.13', 'libfmod.so')
+if get_option('install_fmod')
+  install_data(fmod_so, install_dir:get_option('fmod_dir'), install_mode:'rwxr-xr-x')
+endif
+
+fmod = compiler.find_library('fmod', dirs: meson.current_source_dir())
+
+deps += fmod