MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changes to fixes based on feedback

Browse Source
This commit is contained in:
Jeffery Myers 2021-02-20 13:39:22 -08:00
parent 81a7650e8d
commit 69cd659172
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
examples/others/easings.h
View File

@ -107,9 +107,9 @@ EASEDEF float EaseLinearOut(float t, float b, float c, float d) { return (c*t/d
EASEDEF float EaseLinearInOut(float t,float b, float c, float d) { return (c*t/d + b); } EASEDEF float EaseLinearInOut(float t,float b, float c, float d) { return (c*t/d + b); }
// Sine Easing functions // Sine Easing functions
EASEDEF float EaseSineIn(float t, float b, float c, float d) { return (-c*(float)cosf(t/d*(PI/2.0f)) + c + b); } EASEDEF float EaseSineIn(float t, float b, float c, float d) { return (-c*cosf(t/d*(PI/2.0f)) + c + b); }
EASEDEF float EaseSineOut(float t, float b, float c, float d) { return (c* (float)sinf(t/d*(PI/2.0f)) + b); } EASEDEF float EaseSineOut(float t, float b, float c, float d) { return (c*sinf(t/d*(PI/2.0f)) + b); }
EASEDEF float EaseSineInOut(float t, float b, float c, float d) { return (-c/2.0f*((float)cosf(PI*t/d) - 1.0f) + b); } EASEDEF float EaseSineInOut(float t, float b, float c, float d) { return (-c/2.0f*(cosf(PI*t/d) - 1.0f) + b); }
// Circular Easing functions // Circular Easing functions
EASEDEF float EaseCircIn(float t, float b, float c, float d) { t /= d; return (-c*(sqrtf(1.0f - t*t) - 1.0f) + b); } EASEDEF float EaseCircIn(float t, float b, float c, float d) { t /= d; return (-c*(sqrtf(1.0f - t*t) - 1.0f) + b); }
@ -139,15 +139,15 @@ EASEDEF float EaseQuadInOut(float t, float b, float c, float d)
} }
// Exponential Easing functions // Exponential Easing functions
EASEDEF float EaseExpoIn(float t, float b, float c, float d) { return (t == 0.0f) ? b : (c * (float)pow(2.0f, 10.0f*(t/d - 1.0f)) + b); } EASEDEF float EaseExpoIn(float t, float b, float c, float d) { return (t == 0.0f) ? b : (c * powf(2.0f, 10.0f*(t/d - 1.0f)) + b); }
EASEDEF float EaseExpoOut(float t, float b, float c, float d) { return (t == d) ? (b + c) : (c * (-(float)pow(2.0f, -10.0f*t/d) + 1.0f) + b); } EASEDEF float EaseExpoOut(float t, float b, float c, float d) { return (t == d) ? (b + c) : (c * (-powf(2.0f, -10.0f*t/d) + 1.0f) + b); }
EASEDEF float EaseExpoInOut(float t, float b, float c, float d) EASEDEF float EaseExpoInOut(float t, float b, float c, float d)
{ {
if (t == 0.0f) return b; if (t == 0.0f) return b;
if (t == d) return (b + c); if (t == d) return (b + c);
if ((t/=d/2.0f) < 1.0f) return (c/2.0f* (float)pow(2.0f, 10.0f*(t - 1.0f)) + b); if ((t/=d/2.0f) < 1.0f) return (c/2.0f* powf(2.0f, 10.0f*(t - 1.0f)) + b);
return (c/2.0f*(-(float)pow(2.0f, -10.0f*(t - 1.0f)) + 2.0f) + b); return (c/2.0f*(-powf(2.0f, -10.0f*(t - 1.0f)) + 2.0f) + b);
} }
// Back Easing functions // Back Easing functions
@ -219,7 +219,7 @@ EASEDEF float EaseElasticIn(float t, float b, float c, float d)
float p = d*0.3f; float p = d*0.3f;
float a = c; float a = c;
float s = p/4.0f; float s = p/4.0f;
float postFix = a* (float)pow(2.0f, 10.0f*(t-=1.0f)); float postFix = a*powf(2.0f, 10.0f*(t-=1.0f));
return (-(postFix*sinf((t*d-s)*(2.0f*PI)/p )) + b); return (-(postFix*sinf((t*d-s)*(2.0f*PI)/p )) + b);
} }
@ -233,7 +233,7 @@ EASEDEF float EaseElasticOut(float t, float b, float c, float d)
float a = c; float a = c;
float s = p/4.0f; float s = p/4.0f;
return (a* (float)pow(2.0f,-10.0f*t)*sinf((t*d-s)*(2.0f*PI)/p) + c + b); return (a*powf(2.0f,-10.0f*t)*sinf((t*d-s)*(2.0f*PI)/p) + c + b);
} }
EASEDEF float EaseElasticInOut(float t, float b, float c, float d) EASEDEF float EaseElasticInOut(float t, float b, float c, float d)
@ -247,11 +247,11 @@ EASEDEF float EaseElasticInOut(float t, float b, float c, float d)
if (t < 1.0f) if (t < 1.0f)
{ {
float postFix = a* (float)pow(2.0f, 10.0f*(t-=1.0f)); float postFix = a*powf(2.0f, 10.0f*(t-=1.0f));
return -0.5f*(postFix*sinf((t*d-s)*(2.0f*PI)/p)) + b; return -0.5f*(postFix*sinf((t*d-s)*(2.0f*PI)/p)) + b;
} }
float postFix = a* (float)pow(2.0f, -10.0f*(t-=1.0f)); float postFix = a*powf(2.0f, -10.0f*(t-=1.0f));
return (postFix*sinf((t*d-s)*(2.0f*PI)/p)*0.5f + c + b); return (postFix*sinf((t*d-s)*(2.0f*PI)/p)*0.5f + c + b);
} }

2
examples/others/raudio_standalone.c
View File

@ -61,7 +61,7 @@
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
// Module Functions Declaration // Module Functions Declaration
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
#if !defined(_WIN32) #if !defined(_MSC_VER)
static int kbhit(void); // Check if a key has been pressed static int kbhit(void); // Check if a key has been pressed
static char getch(); // Get pressed character static char getch(); // Get pressed character
#else #else

2
src/raymath.h
View File

@ -246,7 +246,7 @@ RMDEF float Vector2Distance(Vector2 v1, Vector2 v2)
// Calculate angle from two vectors in X-axis // Calculate angle from two vectors in X-axis
RMDEF float Vector2Angle(Vector2 v1, Vector2 v2) RMDEF float Vector2Angle(Vector2 v1, Vector2 v2)
{ {
float result = (float)atan2f(v2.y - v1.y, v2.x - v1.x)*(180.0f/PI); float result = atan2f(v2.y - v1.y, v2.x - v1.x)*(180.0f/PI);
if (result < 0) result += 360.0f; if (result < 0) result += 360.0f;
return result; return result;
} }