Changeset 723
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/image.cpp
r714 r723 25 25 26 26 #include "core.h" 27 #include "lolgl.h"28 27 29 28 namespace lol -
trunk/src/input.cpp
r686 r723 61 61 vec2 Input::GetAxis(int axis) 62 62 { 63 float invsqrt2 = sqrtf(0.5f);64 63 vec2 ret; 65 64 … … 72 71 ret.y += up; 73 72 if (left && up) 74 ret = ret * invsqrt2;73 ret = ret * sqrtf(0.5f); 75 74 #else 76 75 ret = 0; -
trunk/src/lolgl.h
r697 r723 42 42 # endif 43 43 #elif defined HAVE_GLES_1X 44 # include <GLES/gl.h> 45 # include <GLES/glext.h> 44 # if defined __APPLE__ && defined __MACH__ 45 # include <OpenGLES/ES1/gl.h> 46 # include <OpenGLES/ES1/glext.h> 47 # else 48 # include <GLES/gl.h> 49 # include <GLES/glext.h> 50 # endif 46 51 #elif defined HAVE_GLES_2X 47 # include <GLES2/gl2.h> 48 # include <GLES2/gl2ext.h> 52 # if defined __APPLE__ && defined __MACH__ 53 # include <OpenGLES/ES2/gl.h> 54 # include <OpenGLES/ES2/glext.h> 55 # else 56 # include <GLES2/gl2.h> 57 # include <GLES2/gl2ext.h> 58 # endif 49 59 #endif 50 60 -
trunk/src/sample.cpp
r686 r723 16 16 #include <cstdio> 17 17 #include <cmath> 18 #include <cstring> 18 19 19 20 #if defined USE_SDL -
trunk/src/timer.cpp
r686 r723 17 17 #include <stdint.h> 18 18 19 #if defined __linux__ 19 #if defined __linux__ || defined __APPLE__ 20 20 # include <sys/time.h> 21 21 # include <unistd.h> … … 43 43 TimerData() 44 44 { 45 #if defined __linux__ 45 #if defined __linux__ || defined __APPLE__ 46 46 gettimeofday(&tv0, NULL); 47 47 #elif defined _WIN32 … … 59 59 { 60 60 float ret, towait; 61 #if defined __linux__ 61 #if defined __linux__ || defined __APPLE__ 62 62 struct timeval tv; 63 63 gettimeofday(&tv, NULL); … … 91 91 } 92 92 93 #if defined __linux__ 93 #if defined __linux__ || defined __APPLE__ 94 94 struct timeval tv0; 95 95 #elif defined _WIN32
Note: See TracChangeset
for help on using the changeset viewer.