Merge remote-tracking branch 'refs/remotes/raysan5/develop' into develop
This commit is contained in:
victorfisac
commit
7a09043cba
69 changed files with 1677 additions and 36169 deletions
23
CHANGELOG
23
CHANGELOG
|
|
@ -1,24 +1,24 @@
|
||||||
changelog
|
changelog
|
||||||
---------
|
---------
|
||||||
|
|
||||||
Current Release: raylib 1.5.0 (xx June 2016)
|
Current Release: raylib 1.5.0 (18 July 2016)
|
||||||
|
|
||||||
NOTE: Only versions marked as 'Release' are available in installer, updates are only available as source.
|
NOTE: Only versions marked as 'Release' are available in installer, updates are only available as source.
|
||||||
NOTE: Current Release includes all previous updates.
|
NOTE: Current Release includes all previous updates.
|
||||||
|
|
||||||
-----------------------------------------------
|
-----------------------------------------------
|
||||||
Release: raylib 1.5.0 (xx June 2016)
|
Release: raylib 1.5.0 (18 July 2016)
|
||||||
-----------------------------------------------
|
-----------------------------------------------
|
||||||
NOTE:
|
NOTE:
|
||||||
Probably this new version is the biggest boost of the library ever, lots of parts of the library have been redesigned,
|
Probably this new version is the biggest boost of the library ever, lots of parts of the library have been redesigned,
|
||||||
lots of bugs have been solved and some **AMAZING** new features have been added.
|
lots of bugs have been solved and some **AMAZING** new features have been added.
|
||||||
|
|
||||||
HUGE changes:
|
HUGE changes:
|
||||||
[rlgl] OCULUS RIFT CV1: Added support for VR witha bunch of Oculus-specific functions to init/close device and Oculus rendering.
|
[rlgl] OCULUS RIFT CV1: Added support for VR, not oly Oculus Rift CV1 but also stereo rendering simulator (multiplatform).
|
||||||
[rlgl] MATERIALS SYSTEM: Added support for Materials (.mtl) and multiple material properties: diffuse, specular, normal.
|
[rlgl] MATERIALS SYSTEM: Added support for Materials (.mtl) and multiple material properties: diffuse, specular, normal.
|
||||||
[rlgl] LIGHTING SYSTEM: Added support for up to 8 lights of 3 different types: Omni, Directional and Spot
|
[rlgl] LIGHTING SYSTEM: Added support for up to 8 lights of 3 different types: Omni, Directional and Spot.
|
||||||
[physac] REDESIGNED: Improved performance and simplified usage, physic objects are managed internally
|
[physac] REDESIGNED: Improved performance and simplified usage, physic objects now are managed internally in a second thread!
|
||||||
[audio] CHIPTUNES: Added support for module audio music (.xm, .mod) loading and playing
|
[audio] CHIPTUNES: Added support for module audio music (.xm, .mod) loading and playing. Multiple mixing channels supported.
|
||||||
|
|
||||||
other changes:
|
other changes:
|
||||||
|
|
||||||
|
|
@ -34,6 +34,9 @@ other changes:
|
||||||
[core] Translate mouse inputs as touch inputs in HTML5
|
[core] Translate mouse inputs as touch inputs in HTML5
|
||||||
[core] Improved function GetKeyPressed() to support multiple keys (including function keys)
|
[core] Improved function GetKeyPressed() to support multiple keys (including function keys)
|
||||||
[core] Improved gamepad support, specially for RaspberryPi (including multiple gamepads support)
|
[core] Improved gamepad support, specially for RaspberryPi (including multiple gamepads support)
|
||||||
|
[rlgl] Support stereo rendering simulation (duplicate draw calls by viewport, optimized)
|
||||||
|
[rlgl] Added distortion shader (embeded) to support custom VR simulator: shader_distortion.h
|
||||||
|
[rlgl] Added support for OpenGL 2.1 on desktop
|
||||||
[rlgl] Improved 2D vs 3D drawing system (lines, triangles, quads)
|
[rlgl] Improved 2D vs 3D drawing system (lines, triangles, quads)
|
||||||
[rlgl] Improved DXT-ETC1 support on HTML5
|
[rlgl] Improved DXT-ETC1 support on HTML5
|
||||||
[rlgl] Review function: rlglUnproject()
|
[rlgl] Review function: rlglUnproject()
|
||||||
|
|
@ -43,7 +46,7 @@ other changes:
|
||||||
[rlgl] Added support for indexed and dynamic mesh data
|
[rlgl] Added support for indexed and dynamic mesh data
|
||||||
[rlgl] Set fixed vertex attribs location points
|
[rlgl] Set fixed vertex attribs location points
|
||||||
[rlgl] Improved mesh data loading support
|
[rlgl] Improved mesh data loading support
|
||||||
[rlgl] Added standard shader (embeded) to support materials and lighting: standard_shader.h
|
[rlgl] Added standard shader (embeded) to support materials and lighting: shader_standard.h
|
||||||
[rlgl] Added light functions: CreateLight(), DestroyLight()
|
[rlgl] Added light functions: CreateLight(), DestroyLight()
|
||||||
[rlgl] Added wire mode functions: rlDisableWireMode(), rlEnableWireMode()
|
[rlgl] Added wire mode functions: rlDisableWireMode(), rlEnableWireMode()
|
||||||
[rlgl] Review function consistency, added: rlglLoadMesh(), rlglUpdateMesh(), rlglDrawMesh(), rlglUnloadMesh()
|
[rlgl] Review function consistency, added: rlglLoadMesh(), rlglUpdateMesh(), rlglDrawMesh(), rlglUnloadMesh()
|
||||||
|
|
@ -77,23 +80,23 @@ other changes:
|
||||||
[audio] Renamed SoundIsPlaying() to IsSoundPlaying()
|
[audio] Renamed SoundIsPlaying() to IsSoundPlaying()
|
||||||
[audio] Renamed MusicIsPlaying() to IsMusicPlaying()
|
[audio] Renamed MusicIsPlaying() to IsMusicPlaying()
|
||||||
[audio] Support multiple Music streams (indexed)
|
[audio] Support multiple Music streams (indexed)
|
||||||
|
[audio] Support multiple mixing channels
|
||||||
[gestures] Improved and reviewed gestures system
|
[gestures] Improved and reviewed gestures system
|
||||||
[raymath] Added QuaternionInvert()
|
[raymath] Added QuaternionInvert()
|
||||||
[raymath] Removed function: PrintMatrix()
|
[raymath] Removed function: PrintMatrix()
|
||||||
[raygui] Ported to header-only library
|
[raygui] Ported to header-only library (https://github.com/raysan5/raygui)
|
||||||
[shaders] Added depth drawing shader (requires a depth texture)
|
[shaders] Added depth drawing shader (requires a depth texture)
|
||||||
[shaders] Reviewed included shaders and added comments
|
[shaders] Reviewed included shaders and added comments
|
||||||
[OpenAL Soft] Updated to latest version (1.17.2)
|
[OpenAL Soft] Updated to latest version (1.17.2)
|
||||||
[GLFW3] Updated to latest version (3.2)
|
[GLFW3] Updated to latest version (3.2)
|
||||||
[GLAD] Converted to header only library
|
|
||||||
[stb] Updated to latest headers versions
|
[stb] Updated to latest headers versions
|
||||||
|
[GLAD] Converted to header only library and simplified to only used extensions
|
||||||
[*] Reorganize library folders: external libs moved to src/external folder
|
[*] Reorganize library folders: external libs moved to src/external folder
|
||||||
[*] Reorganize src folder for Android library
|
[*] Reorganize src folder for Android library
|
||||||
[*] Review external dependencies usage
|
[*] Review external dependencies usage
|
||||||
[*] Improved Linux and OSX build systems
|
[*] Improved Linux and OSX build systems
|
||||||
[*] Lots of tweaks and bugs corrected all around
|
[*] Lots of tweaks and bugs corrected all around
|
||||||
|
|
||||||
|
|
||||||
-----------------------------------------------
|
-----------------------------------------------
|
||||||
Release: raylib 1.4.0 (22 February 2016)
|
Release: raylib 1.4.0 (22 February 2016)
|
||||||
-----------------------------------------------
|
-----------------------------------------------
|
||||||
|
|
|
||||||
12
HELPME.md
12
HELPME.md
|
|
@ -7,23 +7,21 @@ please, [let me know][raysan5].
|
||||||
The following help is highly appreciated:
|
The following help is highly appreciated:
|
||||||
|
|
||||||
- C programming - Can you write / review / test / improve the code?
|
- C programming - Can you write / review / test / improve the code?
|
||||||
- Translators / Localizators - Can you translate raylib to another language?
|
|
||||||
- Documentation / Tutorials / Example writters - Can you write some tutorial / example?
|
- Documentation / Tutorials / Example writters - Can you write some tutorial / example?
|
||||||
- Web Development - Can you help with the web? Can you setup a forum?
|
- Web Development - Can you help with the web? Can you setup a forum?
|
||||||
- Porting to Linux, OSX... - Can you compile and test raylib on another OS?
|
- Porting to Linux, OSX, RaspberryPi, consoles... - Can you compile and test raylib on another systems?
|
||||||
- Testers of current features and multiple systems - Can you find some bug on raylib?
|
- Testers of current features and multiple systems - Can you find some bug on raylib?
|
||||||
|
|
||||||
If you can not help on any of the above points but you still want to contribute in some way... please, consider helping
|
If you can not help on any of the above points but you still want to contribute in some way... please, consider helping
|
||||||
with a small [donation](http://www.raylib.com/helpme.htm) (just some euros...). It will really motivate to continue improving this project (and pay some bills… or some coffee).
|
with a small [donation](http://www.raylib.com/helpme.htm) or contributing with [raylib patreon](https://www.patreon.com/raysan5). It will really motivate to continue improving this project (and pay some bills… or some coffee).
|
||||||
|
|
||||||
raylib philosophy
|
raylib philosophy
|
||||||
------------------
|
------------------
|
||||||
|
|
||||||
* raylib is a tool to LEARN videogames programming, every single function in raylib should be a tutorial on itself (clear code).
|
* raylib is a tool to LEARN videogames programming, every single function in raylib should be a tutorial on itself.
|
||||||
* raylib is SIMPLE and EASY-TO-USE, I tried to keep it compact with a small set of functions, if a function is too complex or
|
* raylib is SIMPLE and EASY-TO-USE, I tried to keep it compact with a small set of functions, if a function is too complex or has not a clear usefulness, better not to include it.
|
||||||
has not a clear usefulness, better not to include it.
|
|
||||||
* raylib is open source and free; educators and institutions can use this tool to TEACH videogames programming completely by free.
|
* raylib is open source and free; educators and institutions can use this tool to TEACH videogames programming completely by free.
|
||||||
* raylib is, hopefully, collaborative; contribution of tutorials / code-examples / bugs-solving / code-comments are highly appreciated.
|
* raylib is collaborative; contribution of tutorials / code-examples / bugs-solving / code-comments are highly appreciated.
|
||||||
* raylib's license (and its external libs respective licenses) allow using it for commercial products.
|
* raylib's license (and its external libs respective licenses) allow using it for commercial products.
|
||||||
|
|
||||||
contact
|
contact
|
||||||
|
|
|
||||||
45
README.md
45
README.md
|
|
@ -43,7 +43,7 @@ notes on raylib 1.1
|
||||||
On April 2014, after 6 month of first raylib release, raylib 1.1 has been released. This new version presents a
|
On April 2014, after 6 month of first raylib release, raylib 1.1 has been released. This new version presents a
|
||||||
complete internal redesign of the library to support OpenGL 1.1, OpenGL 3.3+ and OpenGL ES 2.0.
|
complete internal redesign of the library to support OpenGL 1.1, OpenGL 3.3+ and OpenGL ES 2.0.
|
||||||
|
|
||||||
A new module named [rlgl](https://github.com/raysan5/raylib/blob/master/src/rlgl.h) has been added to the library. This new module translate raylib-OpenGL-style
|
A new module named [rlgl](https://github.com/raysan5/raylib/blob/master/src/rlgl.h) has been added to the library. This new module translates raylib-OpenGL-style
|
||||||
immediate mode functions (i.e. rlVertex3f(), rlBegin(), ...) to different versions of OpenGL (1.1, 3.3+, ES2), selectable by one define.
|
immediate mode functions (i.e. rlVertex3f(), rlBegin(), ...) to different versions of OpenGL (1.1, 3.3+, ES2), selectable by one define.
|
||||||
|
|
||||||
[rlgl](https://github.com/raysan5/raylib/blob/master/src/rlgl.h) also comes with a second new module named [raymath](https://github.com/raysan5/raylib/blob/master/src/raymath.h), which includes
|
[rlgl](https://github.com/raysan5/raylib/blob/master/src/rlgl.h) also comes with a second new module named [raymath](https://github.com/raysan5/raylib/blob/master/src/raymath.h), which includes
|
||||||
|
|
@ -83,9 +83,7 @@ Shaders support is the biggest addition to raylib 1.3, with support for easy sha
|
||||||
attached to 3d models or used as fullscreen postrocessing effects. A bunch of postprocessing shaders are also included
|
attached to 3d models or used as fullscreen postrocessing effects. A bunch of postprocessing shaders are also included
|
||||||
in this release, check raylib/shaders folder.
|
in this release, check raylib/shaders folder.
|
||||||
|
|
||||||
Textures module has grown to support most of the internal texture formats available in OpenGL (RGB565, RGB888, RGBA5551, RGBA4444, etc.),
|
Textures module has grown to support most of the internal texture formats available in OpenGL (RGB565, RGB888, RGBA5551, RGBA4444, etc.), including compressed texture formats (DXT, ETC1, ETC2, ASTC, PVRT); raylib 1.3 can load .dds, .pkm, .ktx, .astc and .pvr files.
|
||||||
including compressed texture formats (DXT, ETC1, ETC2, ASTC, PVRT); raylib 1.3 can load .dds, .pkm, .ktx, .astc and .pvr files.
|
|
||||||
|
|
||||||
A brand new [camera](https://github.com/raysan5/raylib/blob/develop/src/camera.c) module offers to the user multiple preconfigured ready-to-use camera systems (free camera, 1st person, 3rd person).
|
A brand new [camera](https://github.com/raysan5/raylib/blob/develop/src/camera.c) module offers to the user multiple preconfigured ready-to-use camera systems (free camera, 1st person, 3rd person).
|
||||||
Camera modes are very easy to use, just check examples: [core_3d_camera_free.c](https://github.com/raysan5/raylib/blob/develop/examples/core_3d_camera_free.c) and [core_3d_camera_first_person.c](https://github.com/raysan5/raylib/blob/develop/examples/core_3d_camera_first_person.c).
|
Camera modes are very easy to use, just check examples: [core_3d_camera_free.c](https://github.com/raysan5/raylib/blob/develop/examples/core_3d_camera_free.c) and [core_3d_camera_first_person.c](https://github.com/raysan5/raylib/blob/develop/examples/core_3d_camera_first_person.c).
|
||||||
|
|
||||||
|
|
@ -133,22 +131,27 @@ Lots of code changes and lots of hours of hard work have concluded in this amazi
|
||||||
notes on raylib 1.5
|
notes on raylib 1.5
|
||||||
-------------------
|
-------------------
|
||||||
|
|
||||||
On June 2016, after 4 months of raylib 1.4 release, arrives raylib 1.5. Probably this new version is the biggest boost of the library ever, lots of parts of the library have been redesigned, lots of bugs have been solved and some **AMAZING** new features have been added.
|
On July 2016, after 5 months of raylib 1.4 release, arrives raylib 1.5. This new version is the biggest boost of the library until now, lots of parts of the library have been redesigned, lots of bugs have been solved and some **AMAZING** new features have been added.
|
||||||
|
|
||||||
New platform support: **Oculus Rift CV1**. raylib introduces VR support for one of the most anticipated VR devices in the market.
|
VR support: raylib supports **Oculus Rift CV1**, one of the most anticipated VR devices in the market. Additionally, raylib supports simulated VR stereo rendering, independent of the VR device; it means, raylib can generate stereo renders with custom head-mounted-display device parameteres, that way, any VR device in the market can be **simulated in any platform** just configuring device parameters (and consequently, lens distortion). To enable VR is [extremely easy](https://github.com/raysan5/raylib/blob/develop/examples/core_oculus_rift.c).
|
||||||
Supporting Oculus Rift CV1 makes raylib the only (or one of the few) C libraries in the market to support VR out-of-the-box. Additionally, stereo mode rendering has been added to raylib independently of the VR device.
|
|
||||||
|
|
||||||
New materials system:
|
New materials system: now raylib supports standard material properties for 3D models, including diffuse-ambient-specular colors and diffuse-normal-specular textures. Just assign values to standard material and everything is processed internally.
|
||||||
|
|
||||||
New lighting system:
|
New lighting system: added support for up to 8 configurable lights and 3 light types: **point**, **directional** and **spot** lights. Just create a light, configure its parameters and raylib manages render internally for every 3d object using standard material.
|
||||||
|
|
||||||
Complete gamepad support on Raspberry Pi
|
Complete gamepad support on Raspberry Pi: Gamepad system has been completely redesigned. Now multiple gamepads can be easily configured and used; gamepad data is read and processed in raw mode in a second thread.
|
||||||
|
|
||||||
Redesigned physics module: physac
|
Redesigned physics module: [physac](https://github.com/raysan5/raylib/blob/develop/src/physac.h) module has been converted to header only and usage [has been simplified](https://github.com/raysan5/raylib/blob/develop/examples/physics_basic_rigidbody.c). Performance has also been singnificantly improved, now physic objects are managed internally in a second thread.
|
||||||
|
|
||||||
Up to 8 new code examples have been added to show the new raylib features and the usage of multiple raylib modules as standalone libraries (rlgl, audio).
|
Audio chiptunese support and mixing channels: Added support for module audio music (.xm, .mod) loading and playing. Multiple mixing channels are now also supported. All this features thanks to the amazing work of @kd7tck.
|
||||||
|
|
||||||
Lots of code changes (more than 250 commits) and lots of hours of hard work have concluded in this amazing new raylib 1.5.
|
Other additions include a [2D camera system](https://github.com/raysan5/raylib/blob/develop/examples/core_2d_camera.c), render textures for offline render (and most comprehensive [postprocessing](https://github.com/raysan5/raylib/blob/develop/examples/shaders_postprocessing.c)) or support for legacy OpenGL 2.1 on desktop platforms.
|
||||||
|
|
||||||
|
This new version is so massive that is difficult to list all the improvements, most of raylib modules have been reviewed and [rlgl](https://github.com/raysan5/raylib/blob/develop/src/rlgl.c) module has been completely redesigned to accomodate to new material-lighting systems and stereo rendering. You can check [CHANGELOG](https://github.com/raysan5/raylib/blob/develop/CHANGELOG) file for a more detailed list of changes.
|
||||||
|
|
||||||
|
Up to 8 new code examples have been added to show the new raylib features and also some samples to show the usage of [rlgl](https://github.com/raysan5/raylib/blob/develop/examples/rlgl_standalone.c) and [audio](https://github.com/raysan5/raylib/blob/develop/examples/audio_standalone.c) raylib modules as standalone libraries.
|
||||||
|
|
||||||
|
Lots of code changes (+400 commits) and lots of hours of hard work have concluded in this amazing new raylib 1.5.
|
||||||
|
|
||||||
features
|
features
|
||||||
--------
|
--------
|
||||||
|
|
@ -160,10 +163,14 @@ features
|
||||||
* Powerful fonts module with multiple SpriteFonts formats support (XNA bitmap fonts, AngelCode fonts, TTF)
|
* Powerful fonts module with multiple SpriteFonts formats support (XNA bitmap fonts, AngelCode fonts, TTF)
|
||||||
* Outstanding texture formats support, including compressed formats (DXT, ETC, PVRT, ASTC)
|
* Outstanding texture formats support, including compressed formats (DXT, ETC, PVRT, ASTC)
|
||||||
* Basic 3d support for Shapes, Models, Billboards, Heightmaps and Cubicmaps
|
* Basic 3d support for Shapes, Models, Billboards, Heightmaps and Cubicmaps
|
||||||
|
* Materials (diffuse, normal, specular) and Lighting (point, directional, spot) support
|
||||||
|
* Shaders support, including Model shaders and Postprocessing shaders
|
||||||
* Powerful math module for Vector and Matrix operations: [raymath](https://github.com/raysan5/raylib/blob/master/src/raymath.c)
|
* Powerful math module for Vector and Matrix operations: [raymath](https://github.com/raysan5/raylib/blob/master/src/raymath.c)
|
||||||
* Audio loading and playing with streaming support (WAV, OGG, XM, MOD)
|
* Audio loading and playing with streaming support and mixing channels (WAV, OGG, XM, MOD)
|
||||||
* Custom color palette for fancy visuals on raywhite background
|
* VR stereo rendering support with configurable HMD device parameters
|
||||||
* Multiple platforms support: Windows, Linux, Mac, **Android**, **Raspberry Pi**, **HTML5** and **Oculus Rift CV1**
|
* Multiple platforms support: Windows, Linux, Mac, **Android**, **Raspberry Pi**, **HTML5** and **Oculus Rift CV1**
|
||||||
|
* Custom color palette for fancy visuals on raywhite background
|
||||||
|
* Minimal external dependencies (GLFW3, OpenGL, OpenAL)
|
||||||
|
|
||||||
raylib uses on its core module the outstanding [GLFW3](http://www.glfw.org/) library. The best option by far I found for
|
raylib uses on its core module the outstanding [GLFW3](http://www.glfw.org/) library. The best option by far I found for
|
||||||
multiplatform (Windows, Linux, Mac) window/context and input management (clean, focused, great license, well documented, modern, ...).
|
multiplatform (Windows, Linux, Mac) window/context and input management (clean, focused, great license, well documented, modern, ...).
|
||||||
|
|
@ -171,10 +178,12 @@ multiplatform (Windows, Linux, Mac) window/context and input management (clean,
|
||||||
raylib uses on its [audio](https://github.com/raysan5/raylib/blob/master/src/audio.c) module, [OpenAL Soft](http://kcat.strangesoft.net/openal.html) audio library, in multiple flavours,
|
raylib uses on its [audio](https://github.com/raysan5/raylib/blob/master/src/audio.c) module, [OpenAL Soft](http://kcat.strangesoft.net/openal.html) audio library, in multiple flavours,
|
||||||
to accomodate to Android, Raspberry Pi and HTML5.
|
to accomodate to Android, Raspberry Pi and HTML5.
|
||||||
|
|
||||||
On Android, raylib uses `native_app_glue module` (provided on Android NDK) and native Android libraries to manage window/context, inputs and activity cycle.
|
On Android, raylib uses `native_app_glue module` (provided by Android NDK) and native Android libraries to manage window/context, inputs and activity cycle.
|
||||||
|
|
||||||
On Raspberry Pi, raylib uses Videocore API and EGL for window/context management and raw inputs reading.
|
On Raspberry Pi, raylib uses Videocore API and EGL for window/context management and raw inputs reading.
|
||||||
|
|
||||||
|
On Oculus Rift CV1, raylib uses Oculus PC SDK libraries but only the core C library ([LibOVR](https://github.com/raysan5/raylib/tree/develop/src/external/OculusSDK/LibOVR)); runtime library (LibOVRRT32_1.dll) must be linked at compilation time.
|
||||||
|
|
||||||
raylib is licensed under a zlib/libpng license. View [LICENSE](https://github.com/raysan5/raylib/blob/master/LICENSE.md).
|
raylib is licensed under a zlib/libpng license. View [LICENSE](https://github.com/raysan5/raylib/blob/master/LICENSE.md).
|
||||||
|
|
||||||
tools requirements
|
tools requirements
|
||||||
|
|
@ -196,12 +205,12 @@ Since raylib v1.1, you can download a Windows Installer package for easy install
|
||||||
building source (generate libraylib.a)
|
building source (generate libraylib.a)
|
||||||
--------------------------------------
|
--------------------------------------
|
||||||
|
|
||||||
Check raylib wiki page: [Building source](https://github.com/raysan5/raylib/wiki/Building-source)
|
Check raylib wiki page: [Compile for...](https://github.com/raysan5/raylib/wiki)
|
||||||
|
|
||||||
building examples
|
building examples
|
||||||
-----------------
|
-----------------
|
||||||
|
|
||||||
Check raylib wiki page: [Building examples](https://github.com/raysan5/raylib/wiki/Building-examples)
|
Check raylib wiki page: [Compile for...](https://github.com/raysan5/raylib/wiki)
|
||||||
|
|
||||||
contact
|
contact
|
||||||
-------
|
-------
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@ raylib 1.x
|
||||||
|
|
||||||
raylib 1.5
|
raylib 1.5
|
||||||
|
|
||||||
[DONE] Support Oculus Rift CV1
|
[DONE] Support Oculus Rift CV1 and VR stereo rendering (simulator)
|
||||||
[DONE] Redesign Shaders/Textures system -> New Materials system
|
[DONE] Redesign Shaders/Textures system -> New Materials system
|
||||||
[DONE] Support lighting: Omni, Directional and Spot lights
|
[DONE] Support lighting: Omni, Directional and Spot lights
|
||||||
[DONE] Redesign physics module (physac)
|
[DONE] Redesign physics module (physac)
|
||||||
|
|
|
||||||
|
|
@ -120,8 +120,9 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
|
||||||
# libraries for Debian GNU/Linux desktop compiling
|
# libraries for Debian GNU/Linux desktop compiling
|
||||||
# requires the following packages:
|
# requires the following packages:
|
||||||
# libglfw3-dev libopenal-dev libegl1-mesa-dev
|
# libglfw3-dev libopenal-dev libegl1-mesa-dev
|
||||||
LIBS = -lraylib -lglfw3 -lGL -lopenal -lm -pthread -ldl -lX11 \
|
LIBS = -lraylib -lglfw3 -lGL -lopenal -lm -pthread -ldl
|
||||||
-lXrandr -lXinerama -lXi -lXxf86vm -lXcursor
|
# on XWindow could require also below libraries, just uncomment
|
||||||
|
#LIBS += -lX11 -lXrandr -lXinerama -lXi -lXxf86vm -lXcursor
|
||||||
else
|
else
|
||||||
ifeq ($(PLATFORM_OS),OSX)
|
ifeq ($(PLATFORM_OS),OSX)
|
||||||
# libraries for OS X 10.9 desktop compiling
|
# libraries for OS X 10.9 desktop compiling
|
||||||
|
|
@ -208,6 +209,7 @@ EXAMPLES = \
|
||||||
shaders_standard_lighting \
|
shaders_standard_lighting \
|
||||||
audio_sound_loading \
|
audio_sound_loading \
|
||||||
audio_music_stream \
|
audio_music_stream \
|
||||||
|
audio_module_playing \
|
||||||
fix_dylib \
|
fix_dylib \
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -434,6 +436,10 @@ audio_sound_loading: audio_sound_loading.c
|
||||||
audio_music_stream: audio_music_stream.c
|
audio_music_stream: audio_music_stream.c
|
||||||
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
|
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
|
||||||
|
|
||||||
|
# compile [audio] example - module playing (OGG)
|
||||||
|
audio_module_playing: audio_module_playing.c
|
||||||
|
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
|
||||||
|
|
||||||
# fix dylib install path name for each executable (MAC)
|
# fix dylib install path name for each executable (MAC)
|
||||||
fix_dylib:
|
fix_dylib:
|
||||||
ifeq ($(PLATFORM_OS),OSX)
|
ifeq ($(PLATFORM_OS),OSX)
|
||||||
|
|
|
||||||
138
examples/audio_module_playing.c
Normal file
138
examples/audio_module_playing.c
Normal file
|
|
@ -0,0 +1,138 @@
|
||||||
|
/*******************************************************************************************
|
||||||
|
*
|
||||||
|
* raylib [audio] example - Module playing (streaming)
|
||||||
|
*
|
||||||
|
* NOTE: This example requires OpenAL Soft library installed
|
||||||
|
*
|
||||||
|
* This example has been created using raylib 1.5 (www.raylib.com)
|
||||||
|
* raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)
|
||||||
|
*
|
||||||
|
* Copyright (c) 2016 Ramon Santamaria (@raysan5)
|
||||||
|
*
|
||||||
|
********************************************************************************************/
|
||||||
|
|
||||||
|
#include "raylib.h"
|
||||||
|
|
||||||
|
#define MAX_CIRCLES 64
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
Vector2 position;
|
||||||
|
float radius;
|
||||||
|
float alpha;
|
||||||
|
float speed;
|
||||||
|
Color color;
|
||||||
|
} CircleWave;
|
||||||
|
|
||||||
|
int main()
|
||||||
|
{
|
||||||
|
// Initialization
|
||||||
|
//--------------------------------------------------------------------------------------
|
||||||
|
int screenWidth = 800;
|
||||||
|
int screenHeight = 450;
|
||||||
|
|
||||||
|
InitWindow(screenWidth, screenHeight, "raylib [audio] example - module playing (streaming)");
|
||||||
|
|
||||||
|
InitAudioDevice(); // Initialize audio device
|
||||||
|
|
||||||
|
Color colors[14] = { ORANGE, RED, GOLD, LIME, BLUE, VIOLET, BROWN, LIGHTGRAY, PINK,
|
||||||
|
YELLOW, GREEN, SKYBLUE, PURPLE, BEIGE };
|
||||||
|
|
||||||
|
// Creates ome circles for visual effect
|
||||||
|
CircleWave circles[MAX_CIRCLES];
|
||||||
|
|
||||||
|
for (int i = MAX_CIRCLES - 1; i >= 0; i--)
|
||||||
|
{
|
||||||
|
circles[i].alpha = 0.0f;
|
||||||
|
circles[i].radius = GetRandomValue(10, 40);
|
||||||
|
circles[i].position.x = GetRandomValue(circles[i].radius, screenWidth - circles[i].radius);
|
||||||
|
circles[i].position.y = GetRandomValue(circles[i].radius, screenHeight - circles[i].radius);
|
||||||
|
circles[i].speed = (float)GetRandomValue(1, 100)/20000.0f;
|
||||||
|
circles[i].color = colors[GetRandomValue(0, 13)];
|
||||||
|
}
|
||||||
|
|
||||||
|
// Load postprocessing bloom shader
|
||||||
|
Shader shader = LoadShader("resources/shaders/glsl330/base.vs",
|
||||||
|
"resources/shaders/glsl330/bloom.fs");
|
||||||
|
|
||||||
|
// Create a RenderTexture2D to be used for render to texture
|
||||||
|
RenderTexture2D target = LoadRenderTexture(screenWidth, screenHeight);
|
||||||
|
|
||||||
|
PlayMusicStream(0, "resources/audio/2t2m_spa.xm"); // Play module stream
|
||||||
|
|
||||||
|
float timePlayed = 0.0f;
|
||||||
|
|
||||||
|
SetTargetFPS(60); // Set our game to run at 60 frames-per-second
|
||||||
|
//--------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
// Main game loop
|
||||||
|
while (!WindowShouldClose()) // Detect window close button or ESC key
|
||||||
|
{
|
||||||
|
// Update
|
||||||
|
//----------------------------------------------------------------------------------
|
||||||
|
for (int i = MAX_CIRCLES - 1; i >= 0; i--)
|
||||||
|
{
|
||||||
|
circles[i].alpha += circles[i].speed;
|
||||||
|
circles[i].radius += circles[i].speed*10.0f;
|
||||||
|
|
||||||
|
if (circles[i].alpha > 1.0f) circles[i].speed *= -1;
|
||||||
|
|
||||||
|
if (circles[i].alpha <= 0.0f)
|
||||||
|
{
|
||||||
|
circles[i].alpha = 0.0f;
|
||||||
|
circles[i].radius = GetRandomValue(10, 40);
|
||||||
|
circles[i].position.x = GetRandomValue(circles[i].radius, screenWidth - circles[i].radius);
|
||||||
|
circles[i].position.y = GetRandomValue(circles[i].radius, screenHeight - circles[i].radius);
|
||||||
|
circles[i].color = colors[GetRandomValue(0, 13)];
|
||||||
|
circles[i].speed = (float)GetRandomValue(1, 100)/20000.0f;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get timePlayed scaled to bar dimensions
|
||||||
|
timePlayed = (GetMusicTimePlayed(0)/GetMusicTimeLength(0)*(screenWidth - 40))*2;
|
||||||
|
|
||||||
|
UpdateMusicStream(0); // Update music buffer with new stream data
|
||||||
|
//----------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
// Draw
|
||||||
|
//----------------------------------------------------------------------------------
|
||||||
|
BeginDrawing();
|
||||||
|
|
||||||
|
ClearBackground(BLACK);
|
||||||
|
|
||||||
|
BeginTextureMode(target); // Enable drawing to texture
|
||||||
|
|
||||||
|
for (int i = MAX_CIRCLES - 1; i >= 0; i--)
|
||||||
|
{
|
||||||
|
DrawCircleV(circles[i].position, circles[i].radius, Fade(circles[i].color, circles[i].alpha));
|
||||||
|
}
|
||||||
|
|
||||||
|
EndTextureMode(); // End drawing to texture (now we have a texture available for next passes)
|
||||||
|
|
||||||
|
BeginShaderMode(shader);
|
||||||
|
|
||||||
|
// NOTE: Render texture must be y-flipped due to default OpenGL coordinates (left-bottom)
|
||||||
|
DrawTextureRec(target.texture, (Rectangle){ 0, 0, target.texture.width, -target.texture.height }, (Vector2){ 0, 0 }, WHITE);
|
||||||
|
|
||||||
|
EndShaderMode();
|
||||||
|
|
||||||
|
// Draw time bar
|
||||||
|
DrawRectangle(20, screenHeight - 20 - 12, screenWidth - 40, 12, LIGHTGRAY);
|
||||||
|
DrawRectangle(20, screenHeight - 20 - 12, (int)timePlayed, 12, MAROON);
|
||||||
|
DrawRectangleLines(20, screenHeight - 20 - 12, screenWidth - 40, 12, WHITE);
|
||||||
|
|
||||||
|
EndDrawing();
|
||||||
|
//----------------------------------------------------------------------------------
|
||||||
|
}
|
||||||
|
|
||||||
|
// De-Initialization
|
||||||
|
//--------------------------------------------------------------------------------------
|
||||||
|
UnloadShader(shader); // Unload shader
|
||||||
|
UnloadRenderTexture(target); // Unload render texture
|
||||||
|
|
||||||
|
CloseAudioDevice(); // Close audio device (music streaming is automatically stopped)
|
||||||
|
|
||||||
|
CloseWindow(); // Close window and OpenGL context
|
||||||
|
//--------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
BIN
examples/audio_module_playing.png
Normal file
BIN
examples/audio_module_playing.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 210 KiB |
74
examples/audio_standalone.c
Normal file
74
examples/audio_standalone.c
Normal file
|
|
@ -0,0 +1,74 @@
|
||||||
|
/*******************************************************************************************
|
||||||
|
*
|
||||||
|
* raylib [audio] example - Using audio module as standalone module
|
||||||
|
*
|
||||||
|
* NOTE: This example does not require any graphic device, it can run directly on console.
|
||||||
|
*
|
||||||
|
* [audio] module requires some external libs:
|
||||||
|
* OpenAL Soft - Audio device management lib (http://kcat.strangesoft.net/openal.html)
|
||||||
|
* stb_vorbis - Ogg audio files loading (http://www.nothings.org/stb_vorbis/)
|
||||||
|
* jar_xm - XM module file loading
|
||||||
|
* jar_mod - MOD audio file loading
|
||||||
|
*
|
||||||
|
* Compile audio module using:
|
||||||
|
* gcc -c audio.c stb_vorbis.c -Wall -std=c99 -DAUDIO_STANDALONE
|
||||||
|
*
|
||||||
|
* Compile example using:
|
||||||
|
* gcc -o $(NAME_PART).exe $(FILE_NAME) audio.o stb_vorbis.o -lopenal32 -std=c99
|
||||||
|
*
|
||||||
|
* This example has been created using raylib 1.5 (www.raylib.com)
|
||||||
|
* raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)
|
||||||
|
*
|
||||||
|
* Copyright (c) 2015 Ramon Santamaria (@raysan5)
|
||||||
|
*
|
||||||
|
********************************************************************************************/
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <conio.h> // Windows only, no stardard library
|
||||||
|
|
||||||
|
#include "audio.h"
|
||||||
|
|
||||||
|
#define KEY_ESCAPE 27
|
||||||
|
|
||||||
|
int main()
|
||||||
|
{
|
||||||
|
unsigned char key;
|
||||||
|
|
||||||
|
InitAudioDevice();
|
||||||
|
|
||||||
|
Sound fxWav = LoadSound("resources/audio/weird.wav"); // Load WAV audio file
|
||||||
|
Sound fxOgg = LoadSound("resources/audio/tanatana.ogg"); // Load OGG audio file
|
||||||
|
|
||||||
|
PlayMusicStream(0, "resources/audio/guitar_noodling.ogg");
|
||||||
|
|
||||||
|
printf("\nPress s or d to play sounds...\n");
|
||||||
|
|
||||||
|
while (key != KEY_ESCAPE)
|
||||||
|
{
|
||||||
|
if (kbhit()) key = getch();
|
||||||
|
|
||||||
|
if (key == 's')
|
||||||
|
{
|
||||||
|
PlaySound(fxWav);
|
||||||
|
key = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (key == 'd')
|
||||||
|
{
|
||||||
|
PlaySound(fxOgg);
|
||||||
|
key = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
UpdateMusicStream(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
UnloadSound(fxWav); // Unload sound data
|
||||||
|
UnloadSound(fxOgg); // Unload sound data
|
||||||
|
|
||||||
|
CloseAudioDevice();
|
||||||
|
|
||||||
|
printf("\n\nPress ENTER to close...");
|
||||||
|
getchar();
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
BIN
examples/core_2d_camera.png
Normal file
BIN
examples/core_2d_camera.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 21 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 17 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 25 KiB |
|
|
@ -68,8 +68,18 @@ int main()
|
||||||
|
|
||||||
Begin3dMode(camera);
|
Begin3dMode(camera);
|
||||||
|
|
||||||
DrawCube(cubePosition, cubeSize.x, cubeSize.y, cubeSize.z, GRAY);
|
if (collision)
|
||||||
DrawCubeWires(cubePosition, cubeSize.x, cubeSize.y, cubeSize.z, DARKGRAY);
|
{
|
||||||
|
DrawCube(cubePosition, cubeSize.x, cubeSize.y, cubeSize.z, RED);
|
||||||
|
DrawCubeWires(cubePosition, cubeSize.x, cubeSize.y, cubeSize.z, MAROON);
|
||||||
|
|
||||||
|
DrawCubeWires(cubePosition, cubeSize.x + 0.2f, cubeSize.y + 0.2f, cubeSize.z + 0.2f, GREEN);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
DrawCube(cubePosition, cubeSize.x, cubeSize.y, cubeSize.z, GRAY);
|
||||||
|
DrawCubeWires(cubePosition, cubeSize.x, cubeSize.y, cubeSize.z, DARKGRAY);
|
||||||
|
}
|
||||||
|
|
||||||
DrawRay(ray, MAROON);
|
DrawRay(ray, MAROON);
|
||||||
|
|
||||||
|
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 24 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 15 KiB |
|
|
@ -21,6 +21,8 @@ int main()
|
||||||
int screenWidth = 1080;
|
int screenWidth = 1080;
|
||||||
int screenHeight = 600;
|
int screenHeight = 600;
|
||||||
|
|
||||||
|
// NOTE: screenWidth/screenHeight should match VR device aspect ratio
|
||||||
|
|
||||||
InitWindow(screenWidth, screenHeight, "raylib [core] example - oculus rift");
|
InitWindow(screenWidth, screenHeight, "raylib [core] example - oculus rift");
|
||||||
|
|
||||||
// NOTE: If device is not available, it fallbacks to default device (simulator)
|
// NOTE: If device is not available, it fallbacks to default device (simulator)
|
||||||
|
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 151 KiB After Width: | Height: | Size: 173 KiB |
BIN
examples/core_world_screen.png
Normal file
BIN
examples/core_world_screen.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 23 KiB |
|
|
@ -49,7 +49,7 @@ int main()
|
||||||
|
|
||||||
DrawModel(dwarf, position, 2.0f, WHITE); // Draw 3d model with texture
|
DrawModel(dwarf, position, 2.0f, WHITE); // Draw 3d model with texture
|
||||||
|
|
||||||
DrawGrid(10, 1.0f); // Draw a grid
|
DrawGrid(10, 1.0f); // Draw a grid
|
||||||
|
|
||||||
DrawGizmo(position); // Draw gizmo
|
DrawGizmo(position); // Draw gizmo
|
||||||
|
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,196 +0,0 @@
|
||||||
/********************************************************************************//**
|
|
||||||
\file OVR_CAPI_Util.h
|
|
||||||
\brief This header provides LibOVR utility function declarations
|
|
||||||
\copyright Copyright 2015-2016 Oculus VR, LLC All Rights reserved.
|
|
||||||
*************************************************************************************/
|
|
||||||
|
|
||||||
#ifndef OVR_CAPI_Util_h
|
|
||||||
#define OVR_CAPI_Util_h
|
|
||||||
|
|
||||||
|
|
||||||
#include "../OVR_CAPI.h"
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/// Enumerates modifications to the projection matrix based on the application's needs.
|
|
||||||
///
|
|
||||||
/// \see ovrMatrix4f_Projection
|
|
||||||
///
|
|
||||||
typedef enum ovrProjectionModifier_
|
|
||||||
{
|
|
||||||
/// Use for generating a default projection matrix that is:
|
|
||||||
/// * Right-handed.
|
|
||||||
/// * Near depth values stored in the depth buffer are smaller than far depth values.
|
|
||||||
/// * Both near and far are explicitly defined.
|
|
||||||
/// * With a clipping range that is (0 to w).
|
|
||||||
ovrProjection_None = 0x00,
|
|
||||||
|
|
||||||
/// Enable if using left-handed transformations in your application.
|
|
||||||
ovrProjection_LeftHanded = 0x01,
|
|
||||||
|
|
||||||
/// After the projection transform is applied, far values stored in the depth buffer will be less than closer depth values.
|
|
||||||
/// NOTE: Enable only if the application is using a floating-point depth buffer for proper precision.
|
|
||||||
ovrProjection_FarLessThanNear = 0x02,
|
|
||||||
|
|
||||||
/// When this flag is used, the zfar value pushed into ovrMatrix4f_Projection() will be ignored
|
|
||||||
/// NOTE: Enable only if ovrProjection_FarLessThanNear is also enabled where the far clipping plane will be pushed to infinity.
|
|
||||||
ovrProjection_FarClipAtInfinity = 0x04,
|
|
||||||
|
|
||||||
/// Enable if the application is rendering with OpenGL and expects a projection matrix with a clipping range of (-w to w).
|
|
||||||
/// Ignore this flag if your application already handles the conversion from D3D range (0 to w) to OpenGL.
|
|
||||||
ovrProjection_ClipRangeOpenGL = 0x08,
|
|
||||||
} ovrProjectionModifier;
|
|
||||||
|
|
||||||
|
|
||||||
/// Return values for ovr_Detect.
|
|
||||||
///
|
|
||||||
/// \see ovr_Detect
|
|
||||||
///
|
|
||||||
typedef struct OVR_ALIGNAS(8) ovrDetectResult_
|
|
||||||
{
|
|
||||||
/// Is ovrFalse when the Oculus Service is not running.
|
|
||||||
/// This means that the Oculus Service is either uninstalled or stopped.
|
|
||||||
/// IsOculusHMDConnected will be ovrFalse in this case.
|
|
||||||
/// Is ovrTrue when the Oculus Service is running.
|
|
||||||
/// This means that the Oculus Service is installed and running.
|
|
||||||
/// IsOculusHMDConnected will reflect the state of the HMD.
|
|
||||||
ovrBool IsOculusServiceRunning;
|
|
||||||
|
|
||||||
/// Is ovrFalse when an Oculus HMD is not detected.
|
|
||||||
/// If the Oculus Service is not running, this will be ovrFalse.
|
|
||||||
/// Is ovrTrue when an Oculus HMD is detected.
|
|
||||||
/// This implies that the Oculus Service is also installed and running.
|
|
||||||
ovrBool IsOculusHMDConnected;
|
|
||||||
|
|
||||||
OVR_UNUSED_STRUCT_PAD(pad0, 6) ///< \internal struct padding
|
|
||||||
|
|
||||||
} ovrDetectResult;
|
|
||||||
|
|
||||||
OVR_STATIC_ASSERT(sizeof(ovrDetectResult) == 8, "ovrDetectResult size mismatch");
|
|
||||||
|
|
||||||
|
|
||||||
/// Detects Oculus Runtime and Device Status
|
|
||||||
///
|
|
||||||
/// Checks for Oculus Runtime and Oculus HMD device status without loading the LibOVRRT
|
|
||||||
/// shared library. This may be called before ovr_Initialize() to help decide whether or
|
|
||||||
/// not to initialize LibOVR.
|
|
||||||
///
|
|
||||||
/// \param[in] timeoutMilliseconds Specifies a timeout to wait for HMD to be attached or 0 to poll.
|
|
||||||
///
|
|
||||||
/// \return Returns an ovrDetectResult object indicating the result of detection.
|
|
||||||
///
|
|
||||||
/// \see ovrDetectResult
|
|
||||||
///
|
|
||||||
OVR_PUBLIC_FUNCTION(ovrDetectResult) ovr_Detect(int timeoutMilliseconds);
|
|
||||||
|
|
||||||
// On the Windows platform,
|
|
||||||
#ifdef _WIN32
|
|
||||||
/// This is the Windows Named Event name that is used to check for HMD connected state.
|
|
||||||
#define OVR_HMD_CONNECTED_EVENT_NAME L"OculusHMDConnected"
|
|
||||||
#endif // _WIN32
|
|
||||||
|
|
||||||
|
|
||||||
/// Used to generate projection from ovrEyeDesc::Fov.
|
|
||||||
///
|
|
||||||
/// \param[in] fov Specifies the ovrFovPort to use.
|
|
||||||
/// \param[in] znear Distance to near Z limit.
|
|
||||||
/// \param[in] zfar Distance to far Z limit.
|
|
||||||
/// \param[in] projectionModFlags A combination of the ovrProjectionModifier flags.
|
|
||||||
///
|
|
||||||
/// \return Returns the calculated projection matrix.
|
|
||||||
///
|
|
||||||
/// \see ovrProjectionModifier
|
|
||||||
///
|
|
||||||
OVR_PUBLIC_FUNCTION(ovrMatrix4f) ovrMatrix4f_Projection(ovrFovPort fov, float znear, float zfar, unsigned int projectionModFlags);
|
|
||||||
|
|
||||||
|
|
||||||
/// Extracts the required data from the result of ovrMatrix4f_Projection.
|
|
||||||
///
|
|
||||||
/// \param[in] projection Specifies the project matrix from which to extract ovrTimewarpProjectionDesc.
|
|
||||||
/// \param[in] projectionModFlags A combination of the ovrProjectionModifier flags.
|
|
||||||
/// \return Returns the extracted ovrTimewarpProjectionDesc.
|
|
||||||
/// \see ovrTimewarpProjectionDesc
|
|
||||||
///
|
|
||||||
OVR_PUBLIC_FUNCTION(ovrTimewarpProjectionDesc) ovrTimewarpProjectionDesc_FromProjection(ovrMatrix4f projection, unsigned int projectionModFlags);
|
|
||||||
|
|
||||||
|
|
||||||
/// Generates an orthographic sub-projection.
|
|
||||||
///
|
|
||||||
/// Used for 2D rendering, Y is down.
|
|
||||||
///
|
|
||||||
/// \param[in] projection The perspective matrix that the orthographic matrix is derived from.
|
|
||||||
/// \param[in] orthoScale Equal to 1.0f / pixelsPerTanAngleAtCenter.
|
|
||||||
/// \param[in] orthoDistance Equal to the distance from the camera in meters, such as 0.8m.
|
|
||||||
/// \param[in] HmdToEyeOffsetX Specifies the offset of the eye from the center.
|
|
||||||
///
|
|
||||||
/// \return Returns the calculated projection matrix.
|
|
||||||
///
|
|
||||||
OVR_PUBLIC_FUNCTION(ovrMatrix4f) ovrMatrix4f_OrthoSubProjection(ovrMatrix4f projection, ovrVector2f orthoScale,
|
|
||||||
float orthoDistance, float HmdToEyeOffsetX);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/// Computes offset eye poses based on headPose returned by ovrTrackingState.
|
|
||||||
///
|
|
||||||
/// \param[in] headPose Indicates the HMD position and orientation to use for the calculation.
|
|
||||||
/// \param[in] hmdToEyeOffset Can be ovrEyeRenderDesc.HmdToEyeOffset returned from
|
|
||||||
/// ovr_GetRenderDesc. For monoscopic rendering, use a vector that is the average
|
|
||||||
/// of the two vectors for both eyes.
|
|
||||||
/// \param[out] outEyePoses If outEyePoses are used for rendering, they should be passed to
|
|
||||||
/// ovr_SubmitFrame in ovrLayerEyeFov::RenderPose or ovrLayerEyeFovDepth::RenderPose.
|
|
||||||
///
|
|
||||||
OVR_PUBLIC_FUNCTION(void) ovr_CalcEyePoses(ovrPosef headPose,
|
|
||||||
const ovrVector3f hmdToEyeOffset[2],
|
|
||||||
ovrPosef outEyePoses[2]);
|
|
||||||
|
|
||||||
|
|
||||||
/// Returns the predicted head pose in outHmdTrackingState and offset eye poses in outEyePoses.
|
|
||||||
///
|
|
||||||
/// This is a thread-safe function where caller should increment frameIndex with every frame
|
|
||||||
/// and pass that index where applicable to functions called on the rendering thread.
|
|
||||||
/// Assuming outEyePoses are used for rendering, it should be passed as a part of ovrLayerEyeFov.
|
|
||||||
/// The caller does not need to worry about applying HmdToEyeOffset to the returned outEyePoses variables.
|
|
||||||
///
|
|
||||||
/// \param[in] hmd Specifies an ovrSession previously returned by ovr_Create.
|
|
||||||
/// \param[in] frameIndex Specifies the targeted frame index, or 0 to refer to one frame after
|
|
||||||
/// the last time ovr_SubmitFrame was called.
|
|
||||||
/// \param[in] latencyMarker Specifies that this call is the point in time where
|
|
||||||
/// the "App-to-Mid-Photon" latency timer starts from. If a given ovrLayer
|
|
||||||
/// provides "SensorSampleTimestamp", that will override the value stored here.
|
|
||||||
/// \param[in] hmdToEyeOffset Can be ovrEyeRenderDesc.HmdToEyeOffset returned from
|
|
||||||
/// ovr_GetRenderDesc. For monoscopic rendering, use a vector that is the average
|
|
||||||
/// of the two vectors for both eyes.
|
|
||||||
/// \param[out] outEyePoses The predicted eye poses.
|
|
||||||
/// \param[out] outSensorSampleTime The time when this function was called. May be NULL, in which case it is ignored.
|
|
||||||
///
|
|
||||||
OVR_PUBLIC_FUNCTION(void) ovr_GetEyePoses(ovrSession session, long long frameIndex, ovrBool latencyMarker,
|
|
||||||
const ovrVector3f hmdToEyeOffset[2],
|
|
||||||
ovrPosef outEyePoses[2],
|
|
||||||
double* outSensorSampleTime);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/// Tracking poses provided by the SDK come in a right-handed coordinate system. If an application
|
|
||||||
/// is passing in ovrProjection_LeftHanded into ovrMatrix4f_Projection, then it should also use
|
|
||||||
/// this function to flip the HMD tracking poses to be left-handed.
|
|
||||||
///
|
|
||||||
/// While this utility function is intended to convert a left-handed ovrPosef into a right-handed
|
|
||||||
/// coordinate system, it will also work for converting right-handed to left-handed since the
|
|
||||||
/// flip operation is the same for both cases.
|
|
||||||
///
|
|
||||||
/// \param[in] inPose that is right-handed
|
|
||||||
/// \param[out] outPose that is requested to be left-handed (can be the same pointer to inPose)
|
|
||||||
///
|
|
||||||
OVR_PUBLIC_FUNCTION(void) ovrPosef_FlipHandedness(const ovrPosef* inPose, ovrPosef* outPose);
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
} /* extern "C" */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#endif // Header include guard
|
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue