aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRay <raysan5@gmail.com>2017-04-21 00:08:00 +0200
committerRay <raysan5@gmail.com>2017-04-21 00:08:00 +0200
commitecfe31bf1d2647dc52b8e1584e4b7f022049e09b (patch)
treeadbccc5074a7a2af5459d1cae0c4da66308bffe7 /src
parent8d3750e36d970d86507e6556bb2c61ee83e45e47 (diff)
downloadraylib-ecfe31bf1d2647dc52b8e1584e4b7f022049e09b.tar.gz
raylib-ecfe31bf1d2647dc52b8e1584e4b7f022049e09b.zip
Make TraceLog() public to the API
enum LogType could require some revision...
Diffstat (limited to 'src')
-rw-r--r--src/audio.c2
-rw-r--r--src/core.c2
-rw-r--r--src/raylib.h28
-rw-r--r--src/text.c2
-rw-r--r--src/textures.c2
-rw-r--r--src/utils.h4
6 files changed, 28 insertions, 12 deletions
diff --git a/src/audio.c b/src/audio.c
index 34be4789..9a7779f4 100644
--- a/src/audio.c
+++ b/src/audio.c
@@ -75,7 +75,7 @@
#include <stdarg.h> // Required for: va_list, va_start(), vfprintf(), va_end()
#else
#include "raylib.h"
- #include "utils.h" // Required for: fopen() Android mapping, TraceLog()
+ #include "utils.h" // Required for: fopen() Android mapping
#endif
#ifdef __APPLE__
diff --git a/src/core.c b/src/core.c
index 3f3bc6ea..ee069d97 100644
--- a/src/core.c
+++ b/src/core.c
@@ -81,7 +81,7 @@
#include "raylib.h"
#include "rlgl.h" // raylib OpenGL abstraction layer to OpenGL 1.1, 3.3+ or ES2
-#include "utils.h" // Required for: fopen() Android mapping, TraceLog()
+#include "utils.h" // Required for: fopen() Android mapping
#define RAYMATH_IMPLEMENTATION // Use raymath as a header-only library (includes implementation)
#define RAYMATH_EXTERN_INLINE // Compile raymath functions as static inline (remember, it's a compiler hint)
diff --git a/src/raylib.h b/src/raylib.h
index b82ec342..286494c7 100644
--- a/src/raylib.h
+++ b/src/raylib.h
@@ -295,7 +295,7 @@
#define RAYWHITE CLITERAL{ 245, 245, 245, 255 } // My own White (raylib logo)
//----------------------------------------------------------------------------------
-// Types and Structures Definition
+// Structures Definition
//----------------------------------------------------------------------------------
#ifndef __cplusplus
// Boolean type
@@ -516,6 +516,18 @@ typedef struct AudioStream {
unsigned int buffers[2]; // OpenAL audio buffers (double buffering)
} AudioStream;
+//----------------------------------------------------------------------------------
+// Enumerators Definition
+//----------------------------------------------------------------------------------
+// Trace log type
+typedef enum {
+ INFO = 0,
+ WARNING,
+ ERROR,
+ DEBUG,
+ OTHER
+} LogType;
+
// Texture formats
// NOTE: Support depends on OpenGL version and platform
typedef enum {
@@ -552,10 +564,18 @@ typedef enum {
} TextureFilterMode;
// Texture parameters: wrap mode
-typedef enum { WRAP_REPEAT = 0, WRAP_CLAMP, WRAP_MIRROR } TextureWrapMode;
+typedef enum {
+ WRAP_REPEAT = 0,
+ WRAP_CLAMP,
+ WRAP_MIRROR
+} TextureWrapMode;
// Color blending modes (pre-defined)
-typedef enum { BLEND_ALPHA = 0, BLEND_ADDITIVE, BLEND_MULTIPLIED } BlendMode;
+typedef enum {
+ BLEND_ALPHA = 0,
+ BLEND_ADDITIVE,
+ BLEND_MULTIPLIED
+} BlendMode;
// Gestures type
// NOTE: It could be used as flags to enable only some gestures
@@ -689,7 +709,7 @@ RLAPI Color Fade(Color color, float alpha); // Color fade-
RLAPI void ShowLogo(void); // Activates raylib logo at startup (can be done with flags)
RLAPI void SetConfigFlags(char flags); // Setup some window configuration flags
-//RLAPI void TraceLog(int logType, const char *text, ...); // Show trace log messages (INFO, WARNING, ERROR, DEBUG)
+RLAPI void TraceLog(int logType, const char *text, ...); // Show trace log messages (INFO, WARNING, ERROR, DEBUG)
RLAPI void TakeScreenshot(void); // Takes a screenshot and saves it in the same folder as executable
RLAPI bool IsFileExtension(const char *fileName, const char *ext);// Check file extension
diff --git a/src/text.c b/src/text.c
index a057e347..ebc8b0ff 100644
--- a/src/text.c
+++ b/src/text.c
@@ -50,7 +50,7 @@
#include <stdarg.h> // Required for: va_list, va_start(), vfprintf(), va_end()
#include <stdio.h> // Required for: FILE, fopen(), fclose(), fscanf(), feof(), rewind(), fgets()
-#include "utils.h" // Required for: IsFileExtension()
+#include "utils.h" // Required for: fopen() Android mapping
#if defined(SUPPORT_FILEFORMAT_TTF)
// Following libs are used on LoadTTF()
diff --git a/src/textures.c b/src/textures.c
index af95f9dc..7013038d 100644
--- a/src/textures.c
+++ b/src/textures.c
@@ -65,7 +65,7 @@
// Required for: rlglLoadTexture() rlDeleteTextures(),
// rlglGenerateMipmaps(), some funcs for DrawTexturePro()
-#include "utils.h" // Required for: fopen() Android mapping, TraceLog()
+#include "utils.h" // Required for: fopen() Android mapping
// Support only desired texture formats on stb_image
#if !defined(SUPPORT_FILEFORMAT_BMP)
diff --git a/src/utils.h b/src/utils.h
index 2b4d838b..64592c73 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -46,8 +46,6 @@
//----------------------------------------------------------------------------------
// Types and Structures Definition
//----------------------------------------------------------------------------------
-typedef enum { INFO = 0, ERROR, WARNING, DEBUG, OTHER } TraceLogType;
-
#ifdef __cplusplus
extern "C" { // Prevents name mangling of functions
#endif
@@ -60,8 +58,6 @@ extern "C" { // Prevents name mangling of functions
//----------------------------------------------------------------------------------
// Module Functions Declaration
//----------------------------------------------------------------------------------
-void TraceLog(int msgType, const char *text, ...); // Outputs a trace log message
-
#if defined(PLATFORM_DESKTOP) || defined(PLATFORM_RPI)
#if defined(SUPPORT_SAVE_BMP)
void SaveBMP(const char *fileName, unsigned char *imgData, int width, int height, int compSize);