server_common/recastnavigation_v1.6.0
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated VC project, fixed W4 warnings in slideshow stuff.

Browse Source
This commit is contained in:
Mikko Mononen 2010-04-13 13:18:40 +00:00
parent d6d51b73ee
commit 7f11a61066
6 changed files with 58 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
RecastDemo/Bin/Recast.exe
View File

Binary file not shown.

20
RecastDemo/Build/VC9/Recast.vcproj
View File

@ -299,6 +299,10 @@
RelativePath="..\..\Include\ConvexVolumeTool.h" RelativePath="..\..\Include\ConvexVolumeTool.h"
> >
</File> </File>
<File
RelativePath="..\..\Include\Filelist.h"
>
</File>
<File <File
RelativePath="..\..\Include\imgui.h" RelativePath="..\..\Include\imgui.h"
> >
@ -343,6 +347,14 @@
RelativePath="..\..\Include\Sample_TileMesh.h" RelativePath="..\..\Include\Sample_TileMesh.h"
> >
</File> </File>
<File
RelativePath="..\..\Include\SlideShow.h"
>
</File>
<File
RelativePath="..\..\Contrib\stb_image.h"
>
</File>
<File <File
RelativePath="..\..\Contrib\stb_truetype.h" RelativePath="..\..\Contrib\stb_truetype.h"
> >
@ -363,6 +375,10 @@
RelativePath="..\..\Source\ConvexVolumeTool.cpp" RelativePath="..\..\Source\ConvexVolumeTool.cpp"
> >
</File> </File>
<File
RelativePath="..\..\Source\Filelist.cpp"
>
</File>
<File <File
RelativePath="..\..\Source\imgui.cpp" RelativePath="..\..\Source\imgui.cpp"
> >
@ -411,6 +427,10 @@
RelativePath="..\..\Source\Sample_TileMesh.cpp" RelativePath="..\..\Source\Sample_TileMesh.cpp"
> >
</File> </File>
<File
RelativePath="..\..\Source\SlideShow.cpp"
>
</File>
<File <File
RelativePath="..\..\Source\TestCase.cpp" RelativePath="..\..\Source\TestCase.cpp"
> >

64
RecastDemo/Contrib/stb_image.h
View File

@ -819,13 +819,13 @@ static stbi_uc *hdr_to_ldr(float *data, int x, int y, int comp)
float z = (float) pow(data[i*comp+k]*h2l_scale_i, h2l_gamma_i) * 255 + 0.5f; float z = (float) pow(data[i*comp+k]*h2l_scale_i, h2l_gamma_i) * 255 + 0.5f;
if (z < 0) z = 0; if (z < 0) z = 0;
if (z > 255) z = 255; if (z > 255) z = 255;
output[i*comp + k] = float2int(z); output[i*comp + k] = (stbi_uc)float2int(z);
} }
if (k < comp) { if (k < comp) {
float z = data[i*comp+k] * 255 + 0.5f; float z = data[i*comp+k] * 255 + 0.5f;
if (z < 0) z = 0; if (z < 0) z = 0;
if (z > 255) z = 255; if (z > 255) z = 255;
output[i*comp + k] = float2int(z); output[i*comp + k] = (stbi_uc)float2int(z);
} }
} }
free(data); free(data);
@ -1585,12 +1585,12 @@ typedef uint8 *(*resample_row_func)(uint8 *out, uint8 *in0, uint8 *in1,
#define div4(x) ((uint8) ((x) >> 2)) #define div4(x) ((uint8) ((x) >> 2))
static uint8 *resample_row_1(uint8 *out, uint8 *in_near, uint8 *in_far, int w, int hs) static uint8 *resample_row_1(uint8 * /*out*/, uint8 *in_near, uint8 * /*in_far*/, int /*w*/, int /*hs*/)
{ {
return in_near; return in_near;
} }
static uint8* resample_row_v_2(uint8 *out, uint8 *in_near, uint8 *in_far, int w, int hs) static uint8* resample_row_v_2(uint8 *out, uint8 *in_near, uint8 * in_far, int w, int /*hs*/)
{ {
// need to generate two samples vertically for every one in input // need to generate two samples vertically for every one in input
int i; int i;
@ -1599,7 +1599,7 @@ static uint8* resample_row_v_2(uint8 *out, uint8 *in_near, uint8 *in_far, int w,
return out; return out;
} }
static uint8* resample_row_h_2(uint8 *out, uint8 *in_near, uint8 *in_far, int w, int hs) static uint8* resample_row_h_2(uint8 *out, uint8 *in_near, uint8 * /*in_far*/, int w, int /*hs*/)
{ {
// need to generate two samples horizontally for every one in input // need to generate two samples horizontally for every one in input
int i; int i;
@ -1624,7 +1624,7 @@ static uint8* resample_row_h_2(uint8 *out, uint8 *in_near, uint8 *in_far, int w
#define div16(x) ((uint8) ((x) >> 4)) #define div16(x) ((uint8) ((x) >> 4))
static uint8 *resample_row_hv_2(uint8 *out, uint8 *in_near, uint8 *in_far, int w, int hs) static uint8 *resample_row_hv_2(uint8 *out, uint8 *in_near, uint8 *in_far, int w, int /*hs*/)
{ {
// need to generate 2x2 samples for every one in input // need to generate 2x2 samples for every one in input
int i,t0,t1; int i,t0,t1;
@ -1645,7 +1645,7 @@ static uint8 *resample_row_hv_2(uint8 *out, uint8 *in_near, uint8 *in_far, int w
return out; return out;
} }
static uint8 *resample_row_generic(uint8 *out, uint8 *in_near, uint8 *in_far, int w, int hs) static uint8 *resample_row_generic(uint8 *out, uint8 *in_near, uint8 * /*in_far*/, int w, int hs)
{ {
// resample with nearest-neighbor // resample with nearest-neighbor
int i,j; int i,j;
@ -2498,7 +2498,7 @@ static int compute_transparency(png *z, uint8 tc[3], int out_n)
return 1; return 1;
} }
static int expand_palette(png *a, uint8 *palette, int len, int pal_img_n) static int expand_palette(png *a, uint8 *palette, int /*len*/, int pal_img_n)
{ {
uint32 i, pixel_count = a->s.img_x * a->s.img_y; uint32 i, pixel_count = a->s.img_x * a->s.img_y;
uint8 *p, *temp_out, *orig = a->out; uint8 *p, *temp_out, *orig = a->out;
@ -2903,7 +2903,7 @@ static stbi_uc *bmp_load(stbi *s, int *x, int *y, int *comp, int req_comp)
mr = 0xff << 16; mr = 0xff << 16;
mg = 0xff << 8; mg = 0xff << 8;
mb = 0xff << 0; mb = 0xff << 0;
ma = 0xff << 24; ma = (unsigned int)(0xff << 24);
fake_a = 1; // @TODO: check for cases like alpha value is all 0 and switch it to 255 fake_a = 1; // @TODO: check for cases like alpha value is all 0 and switch it to 255
} else { } else {
mr = 31 << 10; mr = 31 << 10;
@ -2946,9 +2946,9 @@ static stbi_uc *bmp_load(stbi *s, int *x, int *y, int *comp, int req_comp)
int z=0; int z=0;
if (psize == 0 || psize > 256) { free(out); return epuc("invalid", "Corrupt BMP"); } if (psize == 0 || psize > 256) { free(out); return epuc("invalid", "Corrupt BMP"); }
for (i=0; i < psize; ++i) { for (i=0; i < psize; ++i) {
pal[i][2] = get8(s); pal[i][2] = (stbi_uc)get8(s);
pal[i][1] = get8(s); pal[i][1] = (stbi_uc)get8(s);
pal[i][0] = get8(s); pal[i][0] = (stbi_uc)get8(s);
if (hsz != 12) get8(s); if (hsz != 12) get8(s);
pal[i][3] = 255; pal[i][3] = 255;
} }
@ -3004,22 +3004,22 @@ static stbi_uc *bmp_load(stbi *s, int *x, int *y, int *comp, int req_comp)
if (easy) { if (easy) {
for (i=0; i < (int) s->img_x; ++i) { for (i=0; i < (int) s->img_x; ++i) {
int a; int a;
out[z+2] = get8(s); out[z+2] = (uint8)get8(s);
out[z+1] = get8(s); out[z+1] = (uint8)get8(s);
out[z+0] = get8(s); out[z+0] = (uint8)get8(s);
z += 3; z += 3;
a = (easy == 2 ? get8(s) : 255); a = (easy == 2 ? get8(s) : 255);
if (target == 4) out[z++] = a; if (target == 4) out[z++] = (uint8)a;
} }
} else { } else {
for (i=0; i < (int) s->img_x; ++i) { for (i=0; i < (int) s->img_x; ++i) {
uint32 v = (bpp == 16 ? get16le(s) : get32le(s)); uint32 v = (bpp == 16 ? get16le(s) : get32le(s));
int a; int a;
out[z++] = shiftsigned(v & mr, rshift, rcount); out[z++] = (uint8)shiftsigned(v & mr, rshift, rcount);
out[z++] = shiftsigned(v & mg, gshift, gcount); out[z++] = (uint8)shiftsigned(v & mg, gshift, gcount);
out[z++] = shiftsigned(v & mb, bshift, bcount); out[z++] = (uint8)shiftsigned(v & mb, bshift, bcount);
a = (ma ? shiftsigned(v & ma, ashift, acount) : 255); a = (ma ? shiftsigned(v & ma, ashift, acount) : 255);
if (target == 4) out[z++] = a; if (target == 4) out[z++] = (uint8)a;
} }
} }
skip(s, pad); skip(s, pad);
@ -3492,7 +3492,7 @@ static stbi_uc *psd_load(stbi *s, int *x, int *y, int *comp, int req_comp)
len++; len++;
count += len; count += len;
while (len) { while (len) {
*p = get8(s); *p = (uint8)get8(s);
p += 4; p += 4;
len--; len--;
} }
@ -3505,7 +3505,7 @@ static stbi_uc *psd_load(stbi *s, int *x, int *y, int *comp, int req_comp)
val = get8(s); val = get8(s);
count += len; count += len;
while (len) { while (len) {
*p = val; *p = (uint8)val;
p += 4; p += 4;
len--; len--;
} }
@ -3530,7 +3530,7 @@ static stbi_uc *psd_load(stbi *s, int *x, int *y, int *comp, int req_comp)
// Read the data. // Read the data.
count = 0; count = 0;
for (i = 0; i < pixelCount; i++) for (i = 0; i < pixelCount; i++)
*p = get8(s), p += 4; *p = (uint8)get8(s), p += 4;
} }
} }
} }
@ -3613,7 +3613,7 @@ static char *hdr_gettoken(stbi *z, char *buffer)
int len=0; int len=0;
char c = '\0'; char c = '\0';
c = get8(z); c = (char)get8(z);
while (!at_eof(z) && c != '\n') { while (!at_eof(z) && c != '\n') {
buffer[len++] = c; buffer[len++] = c;
@ -3623,7 +3623,7 @@ static char *hdr_gettoken(stbi *z, char *buffer)
; ;
break; break;
} }
c = get8(z); c = (char)get8(z);
} }
buffer[len] = 0; buffer[len] = 0;
@ -3676,7 +3676,7 @@ static float *hdr_load(stbi *s, int *x, int *y, int *comp, int req_comp)
return epf("not HDR", "Corrupt HDR image"); return epf("not HDR", "Corrupt HDR image");
// Parse header // Parse header
while(1) { for(;;) {
token = hdr_gettoken(s,buffer); token = hdr_gettoken(s,buffer);
if (token[0] == 0) break; if (token[0] == 0) break;
if (strcmp(token, "FORMAT=32-bit_rle_rgbe") == 0) valid = 1; if (strcmp(token, "FORMAT=32-bit_rle_rgbe") == 0) valid = 1;
@ -3727,7 +3727,7 @@ static float *hdr_load(stbi *s, int *x, int *y, int *comp, int req_comp)
if (c1 != 2 || c2 != 2 || (len & 0x80)) { if (c1 != 2 || c2 != 2 || (len & 0x80)) {
// not run-length encoded, so we have to actually use THIS data as a decoded // not run-length encoded, so we have to actually use THIS data as a decoded
// pixel (note this can't be a valid pixel--one of RGB must be >= 128) // pixel (note this can't be a valid pixel--one of RGB must be >= 128)
stbi_uc rgbe[4] = { c1,c2,len, get8(s) }; stbi_uc rgbe[4] = { (stbi_uc)c1,(stbi_uc)c2,(stbi_uc)len, (stbi_uc)get8(s) };
hdr_convert(hdr_data, rgbe, req_comp); hdr_convert(hdr_data, rgbe, req_comp);
i = 1; i = 1;
j = 0; j = 0;
@ -3742,17 +3742,17 @@ static float *hdr_load(stbi *s, int *x, int *y, int *comp, int req_comp)
for (k = 0; k < 4; ++k) { for (k = 0; k < 4; ++k) {
i = 0; i = 0;
while (i < width) { while (i < width) {
count = get8(s); count = (unsigned char)get8(s);
if (count > 128) { if (count > 128) {
// Run // Run
value = get8(s); value = (unsigned char)get8(s);
count -= 128; count -= 128;
for (z = 0; z < count; ++z) for (z = 0; z < count; ++z)
scanline[i++ * 4 + k] = value; scanline[i++ * 4 + k] = value;
} else { } else {
// Dump // Dump
for (z = 0; z < count; ++z) for (z = 0; z < count; ++z)
scanline[i++ * 4 + k] = get8(s); scanline[i++ * 4 + k] = (stbi_uc)get8(s);
} }
} }
} }
@ -3794,8 +3794,8 @@ static void writefv(FILE *f, const char *fmt, va_list v)
while (*fmt) { while (*fmt) {
switch (*fmt++) { switch (*fmt++) {
case ' ': break; case ' ': break;
case '1': { uint8 x = va_arg(v, int); write8(f,x); break; } case '1': { uint8 x = (uint8)va_arg(v, int); write8(f,x); break; }
case '2': { int16 x = va_arg(v, int); write8(f,x); write8(f,x>>8); break; } case '2': { int16 x = (int16)va_arg(v, int); write8(f,x); write8(f,x>>8); break; }
case '4': { int32 x = va_arg(v, int); write8(f,x); write8(f,x>>8); write8(f,x>>16); write8(f,x>>24); break; } case '4': { int32 x = va_arg(v, int); write8(f,x); write8(f,x>>8); write8(f,x>>16); write8(f,x>>24); break; }
default: default:
assert(0); assert(0);

2
RecastDemo/Source/Filelist.cpp
View File

@ -64,7 +64,7 @@ void scanDirectory(const char* path, const char* ext, FileList& list)
#ifdef WIN32 #ifdef WIN32
_finddata_t dir; _finddata_t dir;
char pathWithExt[MAX_PATH]; char pathWithExt[260];
long fh; long fh;
strcpy(pathWithExt, path); strcpy(pathWithExt, path);
strcat(pathWithExt, "/*"); strcat(pathWithExt, "/*");

8
RecastDemo/Source/SlideShow.cpp
View File

@ -104,9 +104,9 @@ void SlideShow::setSlide(int n)
if (m_nextSlide > maxIdx) m_nextSlide = maxIdx; if (m_nextSlide > maxIdx) m_nextSlide = maxIdx;
} }
void SlideShow::updateAndDraw(float dt, const float w, const float h) void SlideShow::updateAndDraw(float dt, const float /*w*/, const float /*h*/)
{ {
float slideAlphaTarget = (m_showCurSlide && m_texId) ? 1 : 0; float slideAlphaTarget = (m_showCurSlide && m_texId) ? 1.0f : 0.0f;
if (m_curSlide != m_nextSlide) if (m_curSlide != m_nextSlide)
slideAlphaTarget = 0; slideAlphaTarget = 0;
@ -136,8 +136,8 @@ void SlideShow::updateAndDraw(float dt, const float w, const float h)
glEnable(GL_TEXTURE_RECTANGLE_ARB); glEnable(GL_TEXTURE_RECTANGLE_ARB);
glBindTexture(GL_TEXTURE_RECTANGLE_ARB, m_texId); glBindTexture(GL_TEXTURE_RECTANGLE_ARB, m_texId);
const float tw = m_width; const float tw = (float)m_width;
const float th = m_height; const float th = (float)m_height;
const float hw = tw/2; //w*0.5f; const float hw = tw/2; //w*0.5f;
const float hh = th/2; //h*0.5f; const float hh = th/2; //h*0.5f;

2
RecastDemo/Source/main.cpp
View File

@ -825,7 +825,7 @@ int main(int /*argc*/, char** /*argv*/)
imguiEndScrollArea(); imguiEndScrollArea();
} }
slideShow.updateAndDraw(dt, width, height); slideShow.updateAndDraw(dt, (float)width, (float)height);
// Marker // Marker
if (mposSet && gluProject((GLdouble)mpos[0], (GLdouble)mpos[1], (GLdouble)mpos[2], if (mposSet && gluProject((GLdouble)mpos[0], (GLdouble)mpos[1], (GLdouble)mpos[2],