diff options
| author | Ray <[email protected]> | 2017-10-22 20:43:57 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-10-22 20:43:57 +0200 |
| commit | 8380c488be90ed0c29a6446b490bfaca6574436e (patch) | |
| tree | 04e6dac350ecb354600b1019cc98fdbce03198c1 /release | |
| parent | 18601f761935cd81b0f6298e22885c9bc6b5ee6e (diff) | |
| parent | 2ba43b595ec1129bd08b89104d5e0fa962d5b2b8 (diff) | |
| download | raylib-1.8.0.tar.gz raylib-1.8.0.zip | |
Merge pull request #371 from raysan5/develop1.8.0
Integrate Develop branch
Diffstat (limited to 'release')
| -rw-r--r-- | release/include/raylib.h | 45 | ||||
| -rw-r--r-- | release/libs/android/armeabi-v7a/libraylib.a | bin | 759594 -> 760182 bytes | |||
| -rw-r--r-- | release/libs/android/armeabi-v7a/libraylib.so | bin | 477744 -> 477808 bytes | |||
| -rw-r--r-- | release/libs/html5/libraylib.bc | bin | 763476 -> 763552 bytes | |||
| -rw-r--r-- | release/libs/rpi/ADDLIBS | 0 | ||||
| -rw-r--r-- | release/libs/rpi/libraylib.a | bin | 0 -> 451046 bytes | |||
| -rw-r--r-- | release/libs/win32/mingw32/libraylib.a | bin | 700748 -> 671510 bytes | |||
| -rw-r--r-- | release/libs/win32/mingw32/libraylibdll.a | bin | 193632 -> 293464 bytes | |||
| -rw-r--r-- | release/libs/win32/mingw32/raylib.dll | bin | 721385 -> 1552376 bytes |
9 files changed, 31 insertions, 14 deletions
diff --git a/release/include/raylib.h b/release/include/raylib.h index 7d656ec8..392e0a24 100644 --- a/release/include/raylib.h +++ b/release/include/raylib.h @@ -5,21 +5,22 @@ * A simple and easy-to-use library to learn videogames programming (www.raylib.com) * * FEATURES: -* - Library written in plain C code (C99) -* - Multiple platforms supported: Windows, Linux, Mac, Android, Raspberry Pi, HTML5. +* - Written in plain C code (C99) in PascalCase/camelCase notation +* - Multiple platforms support: Windows, Linux, Mac, Android, Raspberry Pi and HTML5 * - Hardware accelerated with OpenGL (1.1, 2.1, 3.3 or ES 2.0) * - Unique OpenGL abstraction layer (usable as standalone module): [rlgl] * - Powerful fonts module with SpriteFonts support (XNA bitmap fonts, AngelCode fonts, TTF) -* - Multiple textures support, including compressed formats and mipmaps generation -* - Basic 3d support for Shapes, Models, Billboards, Heightmaps and Cubicmaps +* - Outstanding texture formats support, including compressed formats (DXT, ETC, PVRT, ASTC) +* - Basic 3d support for Geometrics, Models, Billboards, Heightmaps and Cubicmaps +* - Flexible Materials system, supporting classic maps and PBR maps +* - Shaders support, including Model shaders and Postprocessing shaders * - Powerful math module for Vector2, Vector3, Matrix and Quaternion operations: [raymath] * - Audio loading and playing with streaming support and mixing channels: [audio] * - VR stereo rendering support with configurable HMD device parameters * - Minimal external dependencies (GLFW3, OpenGL, OpenAL) -* - Complete bindings for Lua, Go and Pascal +* - Complete bindings to LUA (raylib-lua) and Go (raylib-go) * * NOTES: -* 32bit Colors - Any defined Color is always RGBA (4 byte) * One custom font is loaded by default when InitWindow() [core] * If using OpenGL 3.3 or ES2, one default shader is loaded automatically (internally defined) [rlgl] * If using OpenGL 3.3 or ES2, several vertex buffers (VAO/VBO) are created to manage lines-triangles-quads @@ -31,12 +32,16 @@ * * OPTIONAL DEPENDENCIES: * stb_image (Sean Barret) for images loading (JPEG, PNG, BMP, TGA) [textures] +* 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_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] +* rgif (Charlie Tangora, Ramon Santamaria) for GIF recording [core] * tinfl for data decompression (DEFLATE algorithm) [rres] * * @@ -303,7 +308,7 @@ //---------------------------------------------------------------------------------- #ifndef __cplusplus // Boolean type - #if !defined(_STDBOOL_H) || !defined(__STDBOOL_H) // CLang uses second form + #ifndef bool typedef enum { false, true } bool; #endif #endif @@ -518,6 +523,20 @@ typedef struct RRESData { // RRES type (pointer to RRESData array) typedef struct RRESData *RRES; +// Head-Mounted-Display device parameters +typedef struct VrDeviceInfo { + int hResolution; // HMD horizontal resolution in pixels + int vResolution; // HMD vertical resolution in pixels + float hScreenSize; // HMD horizontal size in meters + float vScreenSize; // HMD vertical size in meters + float vScreenCenter; // HMD screen center in meters + float eyeToScreenDistance; // HMD distance between eye and display in meters + float lensSeparationDistance; // HMD lens separation distance in meters + float interpupillaryDistance; // HMD IPD (distance between pupils) in meters + float lensDistortionValues[4]; // HMD lens distortion constant parameters + float chromaAbCorrection[4]; // HMD chromatic aberration correction parameters +} VrDeviceInfo; + //---------------------------------------------------------------------------------- // Enumerators Definition //---------------------------------------------------------------------------------- @@ -660,13 +679,10 @@ typedef enum { HMD_DEFAULT_DEVICE = 0, HMD_OCULUS_RIFT_DK2, HMD_OCULUS_RIFT_CV1, + HMD_OCULUS_GO, HMD_VALVE_HTC_VIVE, - HMD_SAMSUNG_GEAR_VR, - HMD_GOOGLE_CARDBOARD, - HMD_SONY_PLAYSTATION_VR, - HMD_RAZER_OSVR, - HMD_FOVE_VR, -} VrDevice; + HMD_SONY_PSVR +} VrDeviceType; // RRESData type typedef enum { @@ -1078,7 +1094,8 @@ RLAPI void BeginBlendMode(int mode); // Beg RLAPI void EndBlendMode(void); // End blending mode (reset to default: alpha blending) // VR control functions -RLAPI void InitVrSimulator(int vrDevice); // Init VR simulator for selected device +VrDeviceInfo GetVrDeviceInfo(int vrDeviceType); // Get VR device information for some standard devices +void InitVrSimulator(VrDeviceInfo info); // Init VR simulator for selected device parameters RLAPI void CloseVrSimulator(void); // Close VR simulator for current device RLAPI bool IsVrSimulatorReady(void); // Detect if VR simulator is ready RLAPI void UpdateVrTracking(Camera *camera); // Update VR tracking (position and orientation) and camera diff --git a/release/libs/android/armeabi-v7a/libraylib.a b/release/libs/android/armeabi-v7a/libraylib.a Binary files differindex 3406efc6..4802cda0 100644 --- a/release/libs/android/armeabi-v7a/libraylib.a +++ b/release/libs/android/armeabi-v7a/libraylib.a diff --git a/release/libs/android/armeabi-v7a/libraylib.so b/release/libs/android/armeabi-v7a/libraylib.so Binary files differindex a9cbca41..d90a30c5 100644 --- a/release/libs/android/armeabi-v7a/libraylib.so +++ b/release/libs/android/armeabi-v7a/libraylib.so diff --git a/release/libs/html5/libraylib.bc b/release/libs/html5/libraylib.bc Binary files differindex d5351320..a92e7d17 100644 --- a/release/libs/html5/libraylib.bc +++ b/release/libs/html5/libraylib.bc diff --git a/release/libs/rpi/ADDLIBS b/release/libs/rpi/ADDLIBS deleted file mode 100644 index e69de29b..00000000 --- a/release/libs/rpi/ADDLIBS +++ /dev/null diff --git a/release/libs/rpi/libraylib.a b/release/libs/rpi/libraylib.a Binary files differnew file mode 100644 index 00000000..8fe4e244 --- /dev/null +++ b/release/libs/rpi/libraylib.a diff --git a/release/libs/win32/mingw32/libraylib.a b/release/libs/win32/mingw32/libraylib.a Binary files differindex a89aa94d..da618b7b 100644 --- a/release/libs/win32/mingw32/libraylib.a +++ b/release/libs/win32/mingw32/libraylib.a diff --git a/release/libs/win32/mingw32/libraylibdll.a b/release/libs/win32/mingw32/libraylibdll.a Binary files differindex 09b7f008..7d910eeb 100644 --- a/release/libs/win32/mingw32/libraylibdll.a +++ b/release/libs/win32/mingw32/libraylibdll.a diff --git a/release/libs/win32/mingw32/raylib.dll b/release/libs/win32/mingw32/raylib.dll Binary files differindex d7a6ebbb..c5387654 100644 --- a/release/libs/win32/mingw32/raylib.dll +++ b/release/libs/win32/mingw32/raylib.dll |
