summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorRay <[email protected]>2020-06-30 11:05:09 +0200
committerRay <[email protected]>2020-06-30 11:05:09 +0200
commit5986eee6ab0c69045b1115d30b9f7d8a42d2f330 (patch)
tree1b06c47e0b5907769463c1aae436d95142c39c09 /src
parent00557df17fc1654688b3306cfbee86fa8c725366 (diff)
downloadraylib-5986eee6ab0c69045b1115d30b9f7d8a42d2f330.tar.gz
raylib-5986eee6ab0c69045b1115d30b9f7d8a42d2f330.zip
Expose additional configuration options
Some internal defines have been exposed in config.h
Diffstat (limited to 'src')
-rw-r--r--src/config.h73
-rw-r--r--src/core.c13
-rw-r--r--src/raudio.c6
-rw-r--r--src/textures.c10
4 files changed, 84 insertions, 18 deletions
diff --git a/src/config.h b/src/config.h
index 52a09cef..d9d5b5d7 100644
--- a/src/config.h
+++ b/src/config.h
@@ -25,7 +25,7 @@
*
**********************************************************************************************/
-#define RAYLIB_VERSION "3.0"
+#define RAYLIB_VERSION "3.1-dev"
// Edit to control what features Makefile'd raylib is compiled with
#if defined(RAYLIB_CMAKE)
@@ -63,12 +63,56 @@
// Support saving binary data automatically to a generated storage.data file. This file is managed internally.
#define SUPPORT_DATA_STORAGE 1
+// core: Configuration values
+//------------------------------------------------------------------------------------
+#if defined(__linux__)
+ #define MAX_FILEPATH_LENGTH 4096 // Maximum length for filepaths (Linux PATH_MAX default value)
+#else
+ #define MAX_FILEPATH_LENGTH 512 // Maximum length supported for filepaths
+#endif
+
+#define MAX_GAMEPADS 4 // Max number of gamepads supported
+#define MAX_GAMEPAD_AXIS 8 // Max number of axis supported (per gamepad)
+#define MAX_GAMEPAD_BUTTONS 32 // Max bumber of buttons supported (per gamepad)
+#define MAX_TOUCH_POINTS 10 // Maximum number of touch points supported
+#define MAX_KEY_PRESSED_QUEUE 16 // Max number of characters in the key input queue
+
+#define STORAGE_DATA_FILE "storage.data" // Automatic storage filename
+
+
//------------------------------------------------------------------------------------
// Module: rlgl - Configuration Flags
//------------------------------------------------------------------------------------
// Support VR simulation functionality (stereo rendering)
#define SUPPORT_VR_SIMULATOR 1
+// rlgl: Configuration values
+//------------------------------------------------------------------------------------
+#if defined(GRAPHICS_API_OPENGL_11) || defined(GRAPHICS_API_OPENGL_33)
+ #define DEFAULT_BATCH_BUFFER_ELEMENTS 8192 // Default internal render batch limits
+#elif defined(GRAPHICS_API_OPENGL_ES2)
+ #define DEFAULT_BATCH_BUFFER_ELEMENTS 2048 // Default internal render batch limits
+#endif
+
+#define DEFAULT_BATCH_BUFFERS 1 // Default number of batch buffers (multi-buffering)
+#define DEFAULT_BATCH_DRAWCALLS 256 // Default number of batch draw calls (by state changes: mode, texture)
+
+#define MAX_MATRIX_STACK_SIZE 32 // Maximum size of internal Matrix stack
+#define MAX_SHADER_LOCATIONS 32 // Maximum number of shader locations supported
+#define MAX_MATERIAL_MAPS 12 // Maximum number of shader maps supported
+
+#define RL_CULL_DISTANCE_NEAR 0.01 // Default projection matrix near cull distance
+#define RL_CULL_DISTANCE_FAR 1000.0 // Default projection matrix far cull distance
+
+// Default shader vertex attribute names to set location points
+#define DEFAULT_SHADER_ATTRIB_NAME_POSITION "vertexPosition" // Binded by default to shader location: 0
+#define DEFAULT_SHADER_ATTRIB_NAME_TEXCOORD "vertexTexCoord" // Binded by default to shader location: 1
+#define DEFAULT_SHADER_ATTRIB_NAME_NORMAL "vertexNormal" // Binded by default to shader location: 2
+#define DEFAULT_SHADER_ATTRIB_NAME_COLOR "vertexColor" // Binded by default to shader location: 3
+#define DEFAULT_SHADER_ATTRIB_NAME_TANGENT "vertexTangent" // Binded by default to shader location: 4
+#define DEFAULT_SHADER_ATTRIB_NAME_TEXCOORD2 "vertexTexCoord2" // Binded by default to shader location: 5
+
+
//------------------------------------------------------------------------------------
// Module: shapes - Configuration Flags
//------------------------------------------------------------------------------------
@@ -79,6 +123,7 @@
// Some lines-based shapes could still use lines
#define SUPPORT_QUADS_DRAW_MODE 1
+
//------------------------------------------------------------------------------------
// Module: textures - Configuration Flags
//------------------------------------------------------------------------------------
@@ -98,13 +143,13 @@
// Support image export functionality (.png, .bmp, .tga, .jpg)
#define SUPPORT_IMAGE_EXPORT 1
-
// Support procedural image generation functionality (gradient, spot, perlin-noise, cellular)
#define SUPPORT_IMAGE_GENERATION 1
// Support multiple image editing functions to scale, adjust colors, flip, draw on images, crop...
// If not defined, still some functions are supported: ImageFormat(), ImageCrop(), ImageToPOT()
#define SUPPORT_IMAGE_MANIPULATION 1
+
//------------------------------------------------------------------------------------
// Module: text - Configuration Flags
//------------------------------------------------------------------------------------
@@ -119,6 +164,14 @@
// If not defined, still some functions are supported: TextLength(), TextFormat()
#define SUPPORT_TEXT_MANIPULATION 1
+// text: Configuration values
+//------------------------------------------------------------------------------------
+#define MAX_TEXT_BUFFER_LENGTH 1024 // Size of internal static buffers used on some functions:
+ // TextFormat(), TextSubtext(), TextToUpper(), TextToLower(), TextToPascal(), TextSplit()
+#define MAX_TEXT_UNICODE_CHARS 512 // Maximum number of unicode codepoints: GetCodepoints()
+#define MAX_TEXTSPLIT_COUNT 128 // Maximum number of substrings to split: TextSplit()
+
+
//------------------------------------------------------------------------------------
// Module: models - Configuration Flags
//------------------------------------------------------------------------------------
@@ -131,6 +184,7 @@
// NOTE: Some generated meshes DO NOT include generated texture coordinates
#define SUPPORT_MESH_GENERATION 1
+
//------------------------------------------------------------------------------------
// Module: audio - Configuration Flags
//------------------------------------------------------------------------------------
@@ -142,6 +196,15 @@
//#define SUPPORT_FILEFORMAT_FLAC 1
#define SUPPORT_FILEFORMAT_MP3 1
+// audio: Configuration values
+//------------------------------------------------------------------------------------
+#define AUDIO_DEVICE_FORMAT ma_format_f32 // Device output format (miniaudio: float-32bit)
+#define AUDIO_DEVICE_CHANNELS 2 // Device output channels: stereo
+#define AUDIO_DEVICE_SAMPLE_RATE 44100 // Device output sample rate
+
+#define DEFAULT_AUDIO_BUFFER_SIZE 4096 // Default audio buffer size for streaming
+#define MAX_AUDIO_BUFFER_POOL_CHANNELS 16 // Maximum number of audio pool channels
+
//------------------------------------------------------------------------------------
// Module: utils - Configuration Flags
//------------------------------------------------------------------------------------
@@ -150,4 +213,10 @@
#define SUPPORT_TRACELOG 1
//#define SUPPORT_TRACELOG_DEBUG 1
+// utils: Configuration values
+//------------------------------------------------------------------------------------
+#define MAX_TRACELOG_MSG_LENGTH 128 // Max length of one trace-log message
+#define MAX_UWP_MESSAGES 512 // Max UWP messages to process
+
+
#endif //defined(RAYLIB_CMAKE)
diff --git a/src/core.c b/src/core.c
index 39d8f8f3..737d2935 100644
--- a/src/core.c
+++ b/src/core.c
@@ -119,7 +119,7 @@
#if !defined(EXTERNAL_CONFIG_FLAGS)
#include "config.h" // Defines module configuration flags
#else
- #define RAYLIB_VERSION "3.0"
+ #define RAYLIB_VERSION "3.1-dev"
#endif
#include "utils.h" // Required for: TRACELOG macros
@@ -269,15 +269,8 @@
#if defined(PLATFORM_RPI)
#define USE_LAST_TOUCH_DEVICE // When multiple touchscreens are connected, only use the one with the highest event<N> number
- // Old device inputs system
- #define DEFAULT_KEYBOARD_DEV STDIN_FILENO // Standard input
- #define DEFAULT_GAMEPAD_DEV "/dev/input/js" // Gamepad input (base dev for all gamepads: js0, js1, ...)
- #define DEFAULT_EVDEV_PATH "/dev/input/" // Path to the linux input events
-
- // New device input events (evdev) (must be detected)
- //#define DEFAULT_KEYBOARD_DEV "/dev/input/eventN"
- //#define DEFAULT_MOUSE_DEV "/dev/input/eventN"
- //#define DEFAULT_GAMEPAD_DEV "/dev/input/eventN"
+ #define DEFAULT_GAMEPAD_DEV "/dev/input/js" // Gamepad input (base dev for all gamepads: js0, js1, ...)
+ #define DEFAULT_EVDEV_PATH "/dev/input/" // Path to the linux input events
#endif
#ifndef MAX_FILEPATH_LENGTH
diff --git a/src/raudio.c b/src/raudio.c
index c565b0ec..66afc924 100644
--- a/src/raudio.c
+++ b/src/raudio.c
@@ -244,6 +244,10 @@ typedef struct tagBITMAPINFOHEADER {
#ifndef MAX_AUDIO_BUFFER_POOL_CHANNELS
#define MAX_AUDIO_BUFFER_POOL_CHANNELS 16 // Audio pool channels
#endif
+#ifndef DEFAULT_AUDIO_BUFFER_SIZE
+ #define DEFAULT_AUDIO_BUFFER_SIZE 4096 // Default audio buffer size
+#endif
+
//----------------------------------------------------------------------------------
// Types and Structures Definition
@@ -335,7 +339,7 @@ static AudioData AUDIO = { // Global AUDIO context
// After some math, considering a sampleRate of 48000, a buffer refill rate of 1/60 seconds and a
// standard double-buffering system, a 4096 samples buffer has been chosen, it should be enough
// In case of music-stalls, just increase this number
- .Buffer.defaultSize = 4096
+ .Buffer.defaultSize = DEFAULT_AUDIO_BUFFER_SIZE
};
//----------------------------------------------------------------------------------
diff --git a/src/textures.c b/src/textures.c
index 71efe280..589c5563 100644
--- a/src/textures.c
+++ b/src/textures.c
@@ -148,8 +148,8 @@
//----------------------------------------------------------------------------------
// Defines and Macros
//----------------------------------------------------------------------------------
-#ifndef R5G5B5A1_ALPHA_THRESHOLD
- #define R5G5B5A1_ALPHA_THRESHOLD 50 // Threshold over 255 to set alpha as 0
+#ifndef UNCOMPRESSED_R5G5B5A1_ALPHA_THRESHOLD
+ #define UNCOMPRESSED_R5G5B5A1_ALPHA_THRESHOLD 50 // Threshold over 255 to set alpha as 0
#endif
//----------------------------------------------------------------------------------
@@ -932,7 +932,7 @@ void ImageFormat(Image *image, int newFormat)
r = (unsigned char)(round(pixels[i].x*31.0f));
g = (unsigned char)(round(pixels[i].y*31.0f));
b = (unsigned char)(round(pixels[i].z*31.0f));
- a = (pixels[i].w > ((float)R5G5B5A1_ALPHA_THRESHOLD/255.0f))? 1 : 0;
+ a = (pixels[i].w > ((float)UNCOMPRESSED_R5G5B5A1_ALPHA_THRESHOLD/255.0f))? 1 : 0;
((unsigned short *)image->data)[i] = (unsigned short)r << 11 | (unsigned short)g << 6 | (unsigned short)b << 1 | (unsigned short)a;
}
@@ -2351,7 +2351,7 @@ void ImageDrawPixel(Image *dst, int x, int y, Color color)
unsigned char r = (unsigned char)(round(coln.x*31.0f));
unsigned char g = (unsigned char)(round(coln.y*31.0f));
unsigned char b = (unsigned char)(round(coln.z*31.0f));
- unsigned char a = (coln.w > ((float)R5G5B5A1_ALPHA_THRESHOLD/255.0f))? 1 : 0;;
+ unsigned char a = (coln.w > ((float)UNCOMPRESSED_R5G5B5A1_ALPHA_THRESHOLD/255.0f))? 1 : 0;;
((unsigned short *)dst->data)[y*dst->width + x] = (unsigned short)r << 11 | (unsigned short)g << 6 | (unsigned short)b << 1 | (unsigned short)a;
@@ -3620,7 +3620,7 @@ void SetPixelColor(void *dstPtr, Color color, int format)
unsigned char r = (unsigned char)(round(coln.x*31.0f));
unsigned char g = (unsigned char)(round(coln.y*31.0f));
unsigned char b = (unsigned char)(round(coln.z*31.0f));
- unsigned char a = (coln.w > ((float)R5G5B5A1_ALPHA_THRESHOLD/255.0f))? 1 : 0;;
+ unsigned char a = (coln.w > ((float)UNCOMPRESSED_R5G5B5A1_ALPHA_THRESHOLD/255.0f))? 1 : 0;;
((unsigned short *)dstPtr)[0] = (unsigned short)r << 11 | (unsigned short)g << 6 | (unsigned short)b << 1 | (unsigned short)a;