mirror of
https://github.com/ddnet/ddnet.git
synced 2024-09-20 09:34:19 +00:00
should compile on windows now
This commit is contained in:
parent
aaf75f5239
commit
e2de77ea14
|
@ -17,6 +17,7 @@
|
||||||
/* compressed textures */
|
/* compressed textures */
|
||||||
#define GL_COMPRESSED_RGB_ARB 0x84ED
|
#define GL_COMPRESSED_RGB_ARB 0x84ED
|
||||||
#define GL_COMPRESSED_RGBA_ARB 0x84EE
|
#define GL_COMPRESSED_RGBA_ARB 0x84EE
|
||||||
|
#define GL_COMPRESSED_ALPHA_ARB 0x84E9
|
||||||
|
|
||||||
#define TEXTURE_MAX_ANISOTROPY_EXT 0x84FE
|
#define TEXTURE_MAX_ANISOTROPY_EXT 0x84FE
|
||||||
|
|
||||||
|
|
|
@ -16,6 +16,10 @@ extern "C" {
|
||||||
|
|
||||||
#include "../g_version.h"
|
#include "../g_version.h"
|
||||||
|
|
||||||
|
#ifndef M_PI
|
||||||
|
#define M_PI 3.14159265358979323846
|
||||||
|
#endif
|
||||||
|
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
CONSOLE_CLOSED,
|
CONSOLE_CLOSED,
|
||||||
|
@ -28,7 +32,7 @@ static unsigned int console_input_len = 0;
|
||||||
static char console_input[256] = {0};
|
static char console_input[256] = {0};
|
||||||
static int console_state = CONSOLE_CLOSED;
|
static int console_state = CONSOLE_CLOSED;
|
||||||
static float state_change_end = 0.0f;
|
static float state_change_end = 0.0f;
|
||||||
static const float state_change_duration = 0.2f;
|
static const float state_change_duration = 0.1f;
|
||||||
|
|
||||||
static char backlog[256][256] = {{0}};
|
static char backlog[256][256] = {{0}};
|
||||||
static int backlog_len;
|
static int backlog_len;
|
||||||
|
@ -175,7 +179,7 @@ void console_toggle()
|
||||||
static float console_scale_func(float t)
|
static float console_scale_func(float t)
|
||||||
{
|
{
|
||||||
//return t;
|
//return t;
|
||||||
return cosf((1.0f-t)*M_PI*0.5f);
|
return sinf(acosf(1.0f-t));
|
||||||
}
|
}
|
||||||
|
|
||||||
void console_render()
|
void console_render()
|
||||||
|
|
|
@ -557,8 +557,6 @@ static void menu2_render_background()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
extern "C" void *gfx_font_set;
|
|
||||||
|
|
||||||
void render_loading(float percent)
|
void render_loading(float percent)
|
||||||
{
|
{
|
||||||
// need up date this here to get correct
|
// need up date this here to get correct
|
||||||
|
@ -1743,24 +1741,6 @@ int menu2_render()
|
||||||
RECT screen = *ui_screen();
|
RECT screen = *ui_screen();
|
||||||
gfx_mapscreen(screen.x, screen.y, screen.w, screen.h);
|
gfx_mapscreen(screen.x, screen.y, screen.w, screen.h);
|
||||||
|
|
||||||
if (0)
|
|
||||||
{
|
|
||||||
gfx_clear(0.65f,0.78f,0.9f);
|
|
||||||
|
|
||||||
|
|
||||||
for (int i = 0; i < 24; i++)
|
|
||||||
{
|
|
||||||
float size = i * 0.5 + 8;
|
|
||||||
char temp[64];
|
|
||||||
sprintf(temp, "%f: Ingen tomte i jul", size);
|
|
||||||
gfx_text(0, 50, 10 + i*int(size), size, temp, -1);
|
|
||||||
gfx_text(gfx_font_set, 400, 10 + i*int(size), size, temp, -1);
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
static bool first = true;
|
static bool first = true;
|
||||||
if(first)
|
if(first)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue