浏览代码

Updated mini_al

Corrected issue with sound playing (pop sound at the end)
Ray 7 年之前
父节点
当前提交
7634cbeb22
共有 4 个文件被更改,包括 845 次插入455 次删除
  1. 7 1
      release/include/raylib.h
  2. 二进制
      release/libs/win32/mingw32/libraylib.a
  3. 5 1
      src/external/mini_al.c
  4. 833 453
      src/external/mini_al.h

+ 7 - 1
release/include/raylib.h

@@ -71,6 +71,8 @@
 #ifndef RAYLIB_H
 #define RAYLIB_H
 
+#include <stdarg.h>                             // Required for: va_list - Only used by TraceLogCallback
+
 #if defined(_WIN32) && defined(BUILD_LIBTYPE_SHARED)
     #define RLAPI __declspec(dllexport)         // We are building raylib as a Win32 shared library (.dll)
 #elif defined(_WIN32) && defined(USE_LIBTYPE_SHARED)
@@ -727,6 +729,9 @@ typedef enum {
     HMD_SONY_PSVR
 } VrDeviceType;
 
+// Callbacks to be implemented by users
+typedef void (*TraceLogCallback)(int msgType, const char *text, va_list args);
+
 #ifdef __cplusplus
 extern "C" {            // Prevents name mangling of functions
 #endif
@@ -779,7 +784,7 @@ RLAPI Ray GetMouseRay(Vector2 mousePosition, Camera camera);      // Returns a r
 RLAPI Vector2 GetWorldToScreen(Vector3 position, Camera camera);  // Returns the screen space position for a 3d world space position
 RLAPI Matrix GetCameraMatrix(Camera camera);                      // Returns camera transform matrix (view matrix)
 
-// Timing-related functions
+// timing-related functions
 RLAPI void SetTargetFPS(int fps);                                 // Set target FPS (maximum)
 RLAPI int GetFPS(void);                                           // Returns current FPS
 RLAPI float GetFrameTime(void);                                   // Returns time in seconds for last frame drawn
@@ -796,6 +801,7 @@ RLAPI Color Fade(Color color, float alpha);                       // Color fade-
 RLAPI void ShowLogo(void);                                        // Activate raylib logo at startup (can be done with flags)
 RLAPI void SetConfigFlags(unsigned char flags);                   // Setup window configuration flags (view FLAGS)
 RLAPI void SetTraceLog(unsigned char types);                      // Enable trace log message types (bit flags based)
+RLAPI void SetTraceLogCallback(TraceLogCallback callback);        // Set a trace log callback to enable custom logging bypassing raylib's one
 RLAPI void TraceLog(int logType, const char *text, ...);          // Show trace log messages (LOG_INFO, LOG_WARNING, LOG_ERROR, LOG_DEBUG)
 RLAPI void TakeScreenshot(const char *fileName);                  // Takes a screenshot of current screen (saved a .png)
 RLAPI int GetRandomValue(int min, int max);                       // Returns a random value between min and max (both included)

二进制
release/libs/win32/mingw32/libraylib.a


+ 5 - 1
src/external/mini_al.c

@@ -1,4 +1,8 @@
 // The implementation of mini_al needs to #include windows.h which means it needs to go into
 // it's own translation unit. Not doing this will cause conflicts with CloseWindow(), etc.
 #define MINI_AL_IMPLEMENTATION
-#include "mini_al.h"
+#define MAL_NO_JACK
+#define MAL_NO_OPENAL
+#define MAL_NO_SDL
+#define MAL_NO_NULL
+#include "mini_al.h"

文件差异内容过多而无法显示
+ 833 - 453
src/external/mini_al.h


部分文件因为文件数量过多而无法显示