summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRay <[email protected]>2018-07-02 18:53:46 +0200
committerRay <[email protected]>2018-07-02 18:53:46 +0200
commit7b971e06236c581087a851c8ecda11bb7be12839 (patch)
tree6bb66acb26e3146fcb25bdb1d1de3554b8284a55
parent1727bbabb17805bba8810f3134465fc71a50ddf7 (diff)
downloadraylib-7b971e06236c581087a851c8ecda11bb7be12839.tar.gz
raylib-7b971e06236c581087a851c8ecda11bb7be12839.zip
Added Quaternion typedef
-rw-r--r--release/include/raylib.h38
-rw-r--r--release/libs/win32/mingw32/libraylib.abin1116822 -> 1118066 bytes
-rw-r--r--src/raylib.h2
-rw-r--r--src/raymath.h16
4 files changed, 31 insertions, 25 deletions
diff --git a/release/include/raylib.h b/release/include/raylib.h
index 5542db71..96bf2443 100644
--- a/release/include/raylib.h
+++ b/release/include/raylib.h
@@ -3,6 +3,8 @@
* raylib - A simple and easy-to-use library to learn videogames programming (www.raylib.com)
*
* FEATURES:
+* - NO external dependencies, all required libraries included with raylib
+* - Multiple platforms support: Windows, Linux, FreeBSD, OpenBSD, NetBSD, DragonFly, MacOS, UWP, Android, Raspberry Pi, HTML5.
* - Written in plain C code (C99) in PascalCase/camelCase notation
* - Hardware accelerated with OpenGL (1.1, 2.1, 3.3 or ES2 - choose at compile)
* - Unique OpenGL abstraction layer (usable as standalone module): [rlgl]
@@ -12,10 +14,8 @@
* - Flexible Materials system, supporting classic maps and PBR maps
* - Shaders support, including Model shaders and Postprocessing shaders
* - Powerful math module for Vector, Matrix and Quaternion operations: [raymath]
-* - Audio loading and playing with streaming support (WAV, OGG, FLAC, XM, MOD)
-* - Multiple platforms support: Windows, Linux, FreeBSD, OpenBSD, NetBSD, DragonFly, MacOS, UWP, Android, Raspberry Pi, HTML5.
+* - Audio loading and playing with streaming support (WAV, OGG, MP3, FLAC, XM, MOD)
* - VR stereo rendering with configurable HMD device parameters
-* - NO external dependencies, all required libraries included with raylib
* - Complete bindings to LUA (raylib-lua) and Go (raylib-go)
*
* NOTES:
@@ -33,14 +33,15 @@
* stb_image_resize (Sean Barret) for image resizing algorythms [textures]
* stb_image_write (Sean Barret) for image writting (PNG) [utils]
* stb_truetype (Sean Barret) for ttf fonts loading [text]
+* stb_rect_pack (Sean Barret) for rectangles packing [text]
* stb_vorbis (Sean Barret) for OGG audio loading [audio]
* stb_perlin (Sean Barret) for Perlin noise image generation [textures]
* par_shapes (Philip Rideout) for parametric 3d shapes generation [models]
* jar_xm (Joshua Reisenauer) for XM audio module loading [audio]
* jar_mod (Joshua Reisenauer) for MOD audio module loading [audio]
* dr_flac (David Reid) for FLAC audio file loading [audio]
+* dr_mp3 (David Reid) for MP3 audio file loading [audio]
* rgif (Charlie Tangora, Ramon Santamaria) for GIF recording [core]
-* tinfl for data decompression (DEFLATE algorithm) [rres]
*
*
* LICENSE: zlib/libpng
@@ -331,6 +332,8 @@ typedef struct Vector4 {
float w;
} Vector4;
+typedef Vector4 Quaternion;
+
// Matrix type (OpenGL style 4x4 - right handed, column major)
typedef struct Matrix {
float m0, m4, m8, m12;
@@ -540,12 +543,12 @@ typedef struct VrDeviceInfo {
// Enumerators Definition
//----------------------------------------------------------------------------------
// Trace log type
-typedef enum {
+typedef enum {
LOG_INFO = 1,
- LOG_WARNING = 2,
- LOG_ERROR = 4,
- LOG_DEBUG = 8,
- LOG_OTHER = 16
+ LOG_WARNING = 2,
+ LOG_ERROR = 4,
+ LOG_DEBUG = 8,
+ LOG_OTHER = 16
} LogType;
// Shader location point type
@@ -637,16 +640,16 @@ typedef enum {
} TextureFilterMode;
// Texture parameters: wrap mode
-typedef enum {
- WRAP_REPEAT = 0,
- WRAP_CLAMP,
- WRAP_MIRROR
+typedef enum {
+ WRAP_REPEAT = 0,
+ WRAP_CLAMP,
+ WRAP_MIRROR
} TextureWrapMode;
// Color blending modes (pre-defined)
-typedef enum {
- BLEND_ALPHA = 0,
- BLEND_ADDITIVE,
+typedef enum {
+ BLEND_ALPHA = 0,
+ BLEND_ADDITIVE,
BLEND_MULTIPLIED
} BlendMode;
@@ -964,6 +967,7 @@ RLAPI void DrawTexturePro(Texture2D texture, Rectangle sourceRec, Rectangle dest
// Font loading/unloading functions
RLAPI Font GetDefaultFont(void); // Get the default Font
RLAPI Font LoadFont(const char *fileName); // Load font from file into GPU memory (VRAM)
+RLAPI Font LoadFontEx(const char *fileName, int fontSize, int charsCount, int *fontChars); // Load font from file with extended parameters
RLAPI CharInfo *LoadFontData(const char *fileName, int fontSize, int *fontChars, int charsCount, bool sdf); // Load font data for further use
RLAPI Image GenImageFontAtlas(CharInfo *chars, int fontSize, int charsCount, int padding, int packMethod); // Generate image font atlas using chars info
RLAPI void UnloadFont(Font font); // Unload Font from GPU memory (VRAM)
@@ -1018,7 +1022,7 @@ RLAPI void ExportMesh(const char *fileName, Mesh mesh);
// Mesh manipulation functions
RLAPI BoundingBox MeshBoundingBox(Mesh mesh); // Compute mesh bounding box limits
-RLAPI void MeshTangents(Mesh *mesh); // Compute mesh tangents
+RLAPI void MeshTangents(Mesh *mesh); // Compute mesh tangents
RLAPI void MeshBinormals(Mesh *mesh); // Compute mesh binormals
// Mesh generation functions
diff --git a/release/libs/win32/mingw32/libraylib.a b/release/libs/win32/mingw32/libraylib.a
index 0bf3c421..675b11ea 100644
--- a/release/libs/win32/mingw32/libraylib.a
+++ b/release/libs/win32/mingw32/libraylib.a
Binary files differ
diff --git a/src/raylib.h b/src/raylib.h
index de78b8c3..96bf2443 100644
--- a/src/raylib.h
+++ b/src/raylib.h
@@ -332,6 +332,8 @@ typedef struct Vector4 {
float w;
} Vector4;
+typedef Vector4 Quaternion;
+
// Matrix type (OpenGL style 4x4 - right handed, column major)
typedef struct Matrix {
float m0, m4, m8, m12;
diff --git a/src/raymath.h b/src/raymath.h
index a574dd0d..4e100bc3 100644
--- a/src/raymath.h
+++ b/src/raymath.h
@@ -114,6 +114,14 @@
float y;
float z;
} Vector3;
+
+ // Quaternion type
+ typedef struct Quaternion {
+ float x;
+ float y;
+ float z;
+ float w;
+ } Quaternion;
// Matrix type (OpenGL style 4x4 - right handed, column major)
typedef struct Matrix {
@@ -122,14 +130,6 @@
float m2, m6, m10, m14;
float m3, m7, m11, m15;
} Matrix;
-
- // Quaternion type
- typedef struct Quaternion {
- float x;
- float y;
- float z;
- float w;
- } Quaternion;
#endif
// NOTE: Helper types to be used instead of array return types for *ToFloat functions