mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-22 16:20:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

(XDK1) Build fixes

Browse Source
This commit is contained in:
twinaphex 2014-10-22 02:05:01 +02:00
parent a6b52d1f1f
commit 3ec3004142
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
frontend/menu/menu_animation.c
View File

@ -248,14 +248,14 @@ float inExpo(float t, float b, float c, float d)
{ {
if (t == 0) if (t == 0)
return b; return b;
return c * pow(2, 10 * (t / d - 1)) + b - c * 0.001; return c * powf(2, 10 * (t / d - 1)) + b - c * 0.001;
} }
float outExpo(float t, float b, float c, float d) float outExpo(float t, float b, float c, float d)
{ {
if (t == d) if (t == d)
return b + c; return b + c;
return c * 1.001 * (-pow(2, -10 * t / d) + 1) + b; return c * 1.001 * (-powf(2, -10 * t / d) + 1) + b;
} }
float inOutExpo(float t, float b, float c, float d) float inOutExpo(float t, float b, float c, float d)
@ -266,8 +266,8 @@ float inOutExpo(float t, float b, float c, float d)
return b + c; return b + c;
t = t / d * 2; t = t / d * 2;
if (t < 1) if (t < 1)
return c / 2 * pow(2, 10 * (t - 1)) + b - c * 0.0005; return c / 2 * powf(2, 10 * (t - 1)) + b - c * 0.0005;
return c / 2 * 1.0005 * (-pow(2, -10 * (t - 1)) + 2) + b; return c / 2 * 1.0005 * (-powf(2, -10 * (t - 1)) + 2) + b;
} }
float outInExpo(float t, float b, float c, float d) float outInExpo(float t, float b, float c, float d)
@ -281,12 +281,12 @@ float outInExpo(float t, float b, float c, float d)
float inCirc(float t, float b, float c, float d) float inCirc(float t, float b, float c, float d)
{ {
return(-c * (sqrt(1 - pow(t / d, 2)) - 1) + b); return(-c * (sqrt(1 - powf(t / d, 2)) - 1) + b);
} }
float outCirc(float t, float b, float c, float d) float outCirc(float t, float b, float c, float d)
{ {
return(c * sqrt(1 - pow(t / d - 1, 2)) + b); return(c * sqrt(1 - powf(t / d - 1, 2)) + b);
} }
float inOutCirc(float t, float b, float c, float d) float inOutCirc(float t, float b, float c, float d)

6
gfx/context/d3d_ctx.cpp
View File

@ -413,21 +413,21 @@ static void gfx_ctx_d3d_get_video_size(void *data, unsigned *width, unsigned *he
*width = 640; *width = 640;
*height = 480; *height = 480;
widescreen_mode = false; widescreen_mode = false;
driver.resolution_hd_enable = true; d3d->resolution_hd_enable = true;
} }
else if(video_mode & XC_VIDEO_FLAGS_HDTV_720p) else if(video_mode & XC_VIDEO_FLAGS_HDTV_720p)
{ {
*width = 1280; *width = 1280;
*height = 720; *height = 720;
widescreen_mode = true; widescreen_mode = true;
driver.resolution_hd_enable = true; d3d->resolution_hd_enable = true;
} }
else if(video_mode & XC_VIDEO_FLAGS_HDTV_1080i) else if(video_mode & XC_VIDEO_FLAGS_HDTV_1080i)
{ {
*width = 1920; *width = 1920;
*height = 1080; *height = 1080;
widescreen_mode = true; widescreen_mode = true;
driver.resolution_hd_enable = true; d3d->resolution_hd_enable = true;
} }
} }
#endif #endif

2
input/xdk_xinput_input_joypad.c
View File

@ -131,7 +131,7 @@ static void xdk_joypad_poll(void)
uint64_t *state_p1, *lifecycle_state; uint64_t *state_p1, *lifecycle_state;
unsigned port; unsigned port;
#if defined(_XBOX1) #if defined(_XBOX1)
unsigned int dwInsertions, dwRemovals, port; unsigned int dwInsertions, dwRemovals;
XGetDeviceChanges(XDEVICE_TYPE_GAMEPAD, XGetDeviceChanges(XDEVICE_TYPE_GAMEPAD,
reinterpret_cast<PDWORD>(&dwInsertions), reinterpret_cast<PDWORD>(&dwInsertions),