diff options
| author | Ray <raysan5@gmail.com> | 2016-12-22 11:47:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-22 11:47:59 +0100 |
| commit | 4419ee9802d7a45929fb4ecae2163d12fb44f2a7 (patch) | |
| tree | 54862a2fe85937766ca753e32a05642898ca6852 /examples | |
| parent | 060d501cd1a8b591d38b3169ee98c416314261a7 (diff) | |
| parent | aaea2eb9a64ad97c54fe115f6fd132d6a00f76ef (diff) | |
| download | raylib-4419ee9802d7a45929fb4ecae2163d12fb44f2a7.tar.gz raylib-4419ee9802d7a45929fb4ecae2163d12fb44f2a7.zip | |
Merge pull request #210 from ficoos/fixes
Fixes
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/audio_standalone.c | 46 | ||||
| -rw-r--r-- | examples/rlgl_oculus_rift.c | 2 |
2 files changed, 45 insertions, 3 deletions
diff --git a/examples/audio_standalone.c b/examples/audio_standalone.c index 7688b881..d090bb83 100644 --- a/examples/audio_standalone.c +++ b/examples/audio_standalone.c @@ -24,10 +24,52 @@ ********************************************************************************************/ #include <stdio.h> +#if defined(_WIN32) #include <conio.h> // Windows only, no stardard library - +#endif #include "audio.h" +#if defined(__linux) + +#include <stdio.h> +#include <termios.h> +#include <unistd.h> +#include <fcntl.h> + +static int kbhit(void) +{ + struct termios oldt, newt; + int ch; + int oldf; + + tcgetattr(STDIN_FILENO, &oldt); + newt = oldt; + newt.c_lflag &= ~(ICANON | ECHO); + tcsetattr(STDIN_FILENO, TCSANOW, &newt); + oldf = fcntl(STDIN_FILENO, F_GETFL, 0); + fcntl(STDIN_FILENO, F_SETFL, oldf | O_NONBLOCK); + + ch = getchar(); + + tcsetattr(STDIN_FILENO, TCSANOW, &oldt); + fcntl(STDIN_FILENO, F_SETFL, oldf); + + if(ch != EOF) + { + ungetc(ch, stdin); + return 1; + } + + return 0; +} + +static char getch() +{ + return getchar(); +} + +#endif + #define KEY_ESCAPE 27 int main() @@ -78,4 +120,4 @@ int main() //-------------------------------------------------------------------------------------- return 0; -}
\ No newline at end of file +} diff --git a/examples/rlgl_oculus_rift.c b/examples/rlgl_oculus_rift.c index 39dee99e..30ef6f3b 100644 --- a/examples/rlgl_oculus_rift.c +++ b/examples/rlgl_oculus_rift.c @@ -144,7 +144,7 @@ int main(void) { // Update //---------------------------------------------------------------------------------- - UpdateOculusTracking(); + UpdateOculusTracking(&camera); //---------------------------------------------------------------------------------- // Draw |