diff options
| author | raysan5 <raysan5@gmail.com> | 2017-04-22 22:35:19 +0200 |
|---|---|---|
| committer | raysan5 <raysan5@gmail.com> | 2017-04-22 22:35:19 +0200 |
| commit | cfec2b40a42c3848d3fc8bd16eb5b7443591fc5a (patch) | |
| tree | 40b3636fed2ecc5dcfa3bc32fd437a492a9e178b /src | |
| parent | 247da006ae81ee66fe0239a1c9bbbfcb0f79aa6f (diff) | |
| download | raylib-cfec2b40a42c3848d3fc8bd16eb5b7443591fc5a.tar.gz raylib-cfec2b40a42c3848d3fc8bd16eb5b7443591fc5a.zip | |
Organize structs vs enums
Diffstat (limited to 'src')
| -rw-r--r-- | src/raylib.h | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/src/raylib.h b/src/raylib.h index 41e1ccb7..18d442d1 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -74,7 +74,6 @@ //#define PLATFORM_ANDROID // Android device //#define PLATFORM_RPI // Raspberry Pi //#define PLATFORM_WEB // HTML5 (emscripten, asm.js) -//#define RLGL_OCULUS_SUPPORT // Oculus Rift CV1 (complementary to PLATFORM_DESKTOP) // Security check in case no PLATFORM_* defined #if !defined(PLATFORM_DESKTOP) && !defined(PLATFORM_ANDROID) && !defined(PLATFORM_RPI) && !defined(PLATFORM_WEB) @@ -516,12 +515,28 @@ typedef struct AudioStream { unsigned int buffers[2]; // OpenAL audio buffers (double buffering) } AudioStream; +// rRES data returned when reading a resource, +// it contains all required data for user (24 byte) +typedef struct RRESData { + unsigned int type; // Resource type (4 byte) + + unsigned int param1; // Resouce parameter 1 (4 byte) + unsigned int param2; // Resouce parameter 2 (4 byte) + unsigned int param3; // Resouce parameter 3 (4 byte) + unsigned int param4; // Resouce parameter 4 (4 byte) + + void *data; // Resource data pointer (4 byte) +} RRESData; + +// RRES type (pointer to RRESData array) +typedef struct RRESData *RRES; + //---------------------------------------------------------------------------------- // Enumerators Definition //---------------------------------------------------------------------------------- // Trace log type typedef enum { - INFO = 0, + INFO = 0, WARNING, ERROR, DEBUG, @@ -615,19 +630,6 @@ typedef enum { HMD_FOVE_VR, } VrDevice; -// rRES data returned when reading a resource, -// it contains all required data for user (24 byte) -typedef struct RRESData { - unsigned int type; // Resource type (4 byte) - - unsigned int param1; // Resouce parameter 1 (4 byte) - unsigned int param2; // Resouce parameter 2 (4 byte) - unsigned int param3; // Resouce parameter 3 (4 byte) - unsigned int param4; // Resouce parameter 4 (4 byte) - - void *data; // Resource data pointer (4 byte) -} RRESData; - // RRESData type typedef enum { RRES_TYPE_RAW = 0, @@ -640,9 +642,6 @@ typedef enum { RRES_TYPE_DIRECTORY } RRESDataType; -// RRES type (pointer to RRESData array) -typedef struct RRESData *RRES; - #ifdef __cplusplus extern "C" { // Prevents name mangling of functions #endif |