(XDK1) Build fixes

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

View File

@ -248,14 +248,14 @@ float inExpo(float t, float b, float c, float d)
{
if (t == 0)
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)
{
if (t == d)
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)
@ -266,8 +266,8 @@ float inOutExpo(float t, float b, float c, float d)
return b + c;
t = t / d * 2;
if (t < 1)
return c / 2 * pow(2, 10 * (t - 1)) + b - c * 0.0005;
return c / 2 * 1.0005 * (-pow(2, -10 * (t - 1)) + 2) + b;
return c / 2 * powf(2, 10 * (t - 1)) + b - c * 0.0005;
return c / 2 * 1.0005 * (-powf(2, -10 * (t - 1)) + 2) + b;
}
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)
{
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)
{
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)

View File

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

View File

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