diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | src/Makefile | 10 | ||||
| -rw-r--r-- | src/config.h | 4 | ||||
| -rw-r--r-- | src/rcamera.h (renamed from src/camera.h) | 6 | ||||
| -rw-r--r-- | src/rcore.c (renamed from src/core.c) | 12 | ||||
| -rw-r--r-- | src/rgestures.h (renamed from src/gestures.h) | 9 | ||||
| -rw-r--r-- | src/rmodels.c (renamed from src/models.c) | 2 | ||||
| -rw-r--r-- | src/rshapes.c (renamed from src/shapes.c) | 2 | ||||
| -rw-r--r-- | src/rtext.c (renamed from src/text.c) | 2 | ||||
| -rw-r--r-- | src/rtextures.c (renamed from src/textures.c) | 2 |
10 files changed, 29 insertions, 30 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3dcd96bf..54bfc2c2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -30,11 +30,11 @@ set(raylib_public_headers # Sources to be compiled set(raylib_sources - core.c - models.c - shapes.c - text.c - textures.c + rcore.c + rmodels.c + rshapes.c + rtext.c + rtextures.c utils.c ) diff --git a/src/Makefile b/src/Makefile index 38027a2a..2be86e78 100644 --- a/src/Makefile +++ b/src/Makefile @@ -549,7 +549,7 @@ endif # Compile all modules with their prerequisites # Compile core module -core.o : core.c raylib.h rlgl.h utils.h raymath.h camera.h gestures.h +rcore.o : rcore.c raylib.h rlgl.h utils.h raymath.h rcamera.h rgestures.h $(CC) -c $< $(CFLAGS) $(INCLUDE_PATHS) -D$(PLATFORM) -D$(GRAPHICS) # Compile rglfw module @@ -557,15 +557,15 @@ rglfw.o : rglfw.c $(CC) $(GLFW_OSX) -c $< $(CFLAGS) $(INCLUDE_PATHS) -D$(PLATFORM) -D$(GRAPHICS) # Compile shapes module -shapes.o : shapes.c raylib.h rlgl.h +rshapes.o : rshapes.c raylib.h rlgl.h $(CC) -c $< $(CFLAGS) $(INCLUDE_PATHS) -D$(PLATFORM) -D$(GRAPHICS) # Compile textures module -textures.o : textures.c raylib.h rlgl.h utils.h +rtextures.o : rtextures.c raylib.h rlgl.h utils.h $(CC) -c $< $(CFLAGS) $(INCLUDE_PATHS) -D$(PLATFORM) -D$(GRAPHICS) # Compile text module -text.o : text.c raylib.h utils.h +rtext.o : rtext.c raylib.h utils.h $(CC) -c $< $(CFLAGS) $(INCLUDE_PATHS) -D$(PLATFORM) -D$(GRAPHICS) # Compile utils module @@ -573,7 +573,7 @@ utils.o : utils.c utils.h $(CC) -c $< $(CFLAGS) $(INCLUDE_PATHS) -D$(PLATFORM) # Compile models module -models.o : models.c raylib.h rlgl.h raymath.h +rmodels.o : rmodels.c raylib.h rlgl.h raymath.h $(CC) -c $< $(CFLAGS) $(INCLUDE_PATHS) -D$(PLATFORM) -D$(GRAPHICS) # Compile audio module diff --git a/src/config.h b/src/config.h index 39f8252c..99490099 100644 --- a/src/config.h +++ b/src/config.h @@ -28,9 +28,9 @@ //------------------------------------------------------------------------------------ // Module: core - Configuration Flags //------------------------------------------------------------------------------------ -// Camera module is included (camera.h) and multiple predefined cameras are available: free, 1st/3rd person, orbital +// Camera module is included (rcamera.h) and multiple predefined cameras are available: free, 1st/3rd person, orbital #define SUPPORT_CAMERA_SYSTEM 1 -// Gestures module is included (gestures.h) to support gestures detection: tap, hold, swipe, drag +// Gestures module is included (rgestures.h) to support gestures detection: tap, hold, swipe, drag #define SUPPORT_GESTURES_SYSTEM 1 // Mouse gestures are directly mapped like touches and processed by gestures system #define SUPPORT_MOUSE_GESTURES 1 diff --git a/src/camera.h b/src/rcamera.h index 6aad6c2f..2faf75d6 100644 --- a/src/camera.h +++ b/src/rcamera.h @@ -1,6 +1,6 @@ /******************************************************************************************* * -* raylib.camera - Camera system with multiple modes support +* rcamera - Basic camera system for multiple camera modes * * NOTE: Memory footprint of this library is aproximately 52 bytes (global variables) * @@ -41,8 +41,8 @@ * **********************************************************************************************/ -#ifndef CAMERA_H -#define CAMERA_H +#ifndef RCAMERA_H +#define RCAMERA_H //---------------------------------------------------------------------------------- // Defines and Macros diff --git a/src/core.c b/src/rcore.c index 6428a029..3b549ca8 100644 --- a/src/core.c +++ b/src/rcore.c @@ -1,6 +1,6 @@ /********************************************************************************************** * -* raylib.core - Basic functions to manage windows, OpenGL context and input on multiple platforms +* rcore - Basic functions to manage windows, OpenGL context and input on multiple platforms * * PLATFORMS SUPPORTED: * - PLATFORM_DESKTOP: Windows (Win32, Win64) @@ -39,10 +39,10 @@ * NOTE: If enabled, uses external module functions to load default raylib font (module: text) * * #define SUPPORT_CAMERA_SYSTEM -* Camera module is included (camera.h) and multiple predefined cameras are available: free, 1st/3rd person, orbital +* Camera module is included (rcamera.h) and multiple predefined cameras are available: free, 1st/3rd person, orbital * * #define SUPPORT_GESTURES_SYSTEM -* Gestures module is included (gestures.h) to support gestures detection: tap, hold, swipe, drag +* Gestures module is included (rgestures.h) to support gestures detection: tap, hold, swipe, drag * * #define SUPPORT_MOUSE_GESTURES * Mouse gestures are directly mapped like touches and processed by gestures system. @@ -129,12 +129,12 @@ #if defined(SUPPORT_GESTURES_SYSTEM) #define GESTURES_IMPLEMENTATION - #include "gestures.h" // Gestures detection functionality + #include "rgestures.h" // Gestures detection functionality #endif #if defined(SUPPORT_CAMERA_SYSTEM) #define CAMERA_IMPLEMENTATION - #include "camera.h" // Camera system functionality + #include "rcamera.h" // Camera system functionality #endif #if defined(SUPPORT_GIF_RECORDING) @@ -6617,7 +6617,7 @@ static void PlayAutomationEvent(unsigned int frame) { CORE.Input.Gamepad.axisState[events[i].params[0]][events[i].params[1]] = ((float)events[i].params[2]/32768.0f); } break; - case INPUT_GESTURE: GESTURES.current = events[i].params[0]; break; // param[0]: gesture (enum Gesture) -> gestures.h: GESTURES.current + case INPUT_GESTURE: GESTURES.current = events[i].params[0]; break; // param[0]: gesture (enum Gesture) -> rgestures.h: GESTURES.current // Window events case WINDOW_CLOSE: CORE.Window.shouldClose = true; break; diff --git a/src/gestures.h b/src/rgestures.h index 9cf53536..bd8ad5e2 100644 --- a/src/gestures.h +++ b/src/rgestures.h @@ -1,6 +1,6 @@ /********************************************************************************************** * -* raylib.gestures - Gestures system, gestures processing based on input events (touch/mouse) +* rgestures - Gestures system, gestures processing based on input events (touch/mouse) * * NOTE: Memory footprint of this library is aproximately 128 bytes (global variables) * @@ -43,8 +43,8 @@ * **********************************************************************************************/ -#ifndef GESTURES_H -#define GESTURES_H +#ifndef RGESTURES_H +#define RGESTURES_H #ifndef PI #define PI 3.14159265358979323846 @@ -481,8 +481,7 @@ float GetGestureDragAngle(void) // Get distance between two pinch points Vector2 GetGesturePinchVector(void) { - // NOTE: The position values used for GESTURES.Pinch.distance are not modified like the position values of [core.c]-->GetTouchPosition(int index) - // NOTE: pinch distance is calculated on two touch points TOUCH_ACTION_MOVE + // NOTE: Pinch distance is calculated on two touch points TOUCH_ACTION_MOVE return GESTURES.Pinch.vector; } diff --git a/src/models.c b/src/rmodels.c index ee55a100..3ee0d243 100644 --- a/src/models.c +++ b/src/rmodels.c @@ -1,6 +1,6 @@ /********************************************************************************************** * -* raylib.models - Basic functions to deal with 3d shapes and 3d models +* rmodels - Basic functions to draw 3d shapes and load and draw 3d models * * CONFIGURATION: * diff --git a/src/shapes.c b/src/rshapes.c index 86e7c97a..605cdad4 100644 --- a/src/shapes.c +++ b/src/rshapes.c @@ -1,6 +1,6 @@ /********************************************************************************************** * -* raylib.shapes - Basic functions to draw 2d Shapes and check collisions +* rshapes - Basic functions to draw 2d shapes and check collisions * * CONFIGURATION: * diff --git a/src/text.c b/src/rtext.c index 7145a971..a372ff1f 100644 --- a/src/text.c +++ b/src/rtext.c @@ -1,6 +1,6 @@ /********************************************************************************************** * -* raylib.text - Basic functions to load Fonts and draw Text +* rtext - Basic functions to load fonts and draw text * * CONFIGURATION: * diff --git a/src/textures.c b/src/rtextures.c index 6caaa5bb..81efec2d 100644 --- a/src/textures.c +++ b/src/rtextures.c @@ -1,6 +1,6 @@ /********************************************************************************************** * -* raylib.textures - Basic functions to load and draw Textures (2d) +* rtextures - Basic functions to load and draw textures * * CONFIGURATION: * |