diff options
| author | Ray <[email protected]> | 2020-02-03 18:31:30 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-02-03 18:31:30 +0100 |
| commit | 40b73a8a91afb26becfcb39560dae73447ce15af (patch) | |
| tree | c00df37c9488649f694304149b45043165128b71 /src/raylib.h | |
| parent | 6f3c99a295533e41de3049db5e683d15fd5c6e1a (diff) | |
| download | raylib-40b73a8a91afb26becfcb39560dae73447ce15af.tar.gz raylib-40b73a8a91afb26becfcb39560dae73447ce15af.zip | |
Develop branch integration (#1091)
* [core] REDESIGNED: Implement global context
* [rlgl] REDESIGNED: Implement global context
* Reviewed globals for Android
* Review Android globals usage
* Update Android globals
* Bump raylib version to 3.0 !!!
* [raudio] REDESIGNED: Implement global context
* [raudio] Reorder functions
* [core] Tweaks on descriptions
* Issues with SUPPORT_MOUSE_GESTURES
* [camera] Use global context
* REDESIGN: Move shapes drawing texture/rec to RLGL context
* Review some issues on standalone mode
* Update to use global context
* [GAME] Upload RE-PAIR game from GGJ2020 -WIP-
* Update game: RE-PAIR
* [utils] TRACELOG macros proposal
* Update config.h
Diffstat (limited to 'src/raylib.h')
| -rw-r--r-- | src/raylib.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/raylib.h b/src/raylib.h index fbfc5006..1ca2ed0a 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -1081,8 +1081,6 @@ RLAPI void DrawTriangleStrip(Vector2 *points, int pointsCount, Color color); RLAPI void DrawPoly(Vector2 center, int sides, float radius, float rotation, Color color); // Draw a regular polygon (Vector version) RLAPI void DrawPolyLines(Vector2 center, int sides, float radius, float rotation, Color color); // Draw a polygon outline of n sides -RLAPI void SetShapesTexture(Texture2D texture, Rectangle source); // Define default texture used to draw shapes - // Basic shapes collision detection functions RLAPI bool CheckCollisionRecs(Rectangle rec1, Rectangle rec2); // Check collision between two rectangles RLAPI bool CheckCollisionCircles(Vector2 center1, float radius1, Vector2 center2, float radius2); // Check collision between two circles @@ -1329,6 +1327,9 @@ RLAPI void UnloadShader(Shader shader); // Unl RLAPI Shader GetShaderDefault(void); // Get default shader RLAPI Texture2D GetTextureDefault(void); // Get default texture +RLAPI Texture2D GetShapesTexture(void); // Get texture to draw shapes +RLAPI Rectangle GetShapesTextureRec(void); // Get texture rectangle to draw shapes +RLAPI void SetShapesTexture(Texture2D texture, Rectangle source); // Define default texture used to draw shapes // Shader configuration functions RLAPI int GetShaderLocation(Shader shader, const char *uniformName); // Get shader uniform location |