X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FModels.cpp;h=ee55d9fbf3ef5894f269e109872d01ec43c7a3ab;hb=1bbb44900613dcf8d7ec2d24c5ec3f04467b4281;hp=b1be7f596ee76cc8d491d8f11559be1f5f086cb7;hpb=0cca0c495c7dc29d134a10d7eed5de1f377c99bf;p=lugaru.git diff --git a/Source/Models.cpp b/Source/Models.cpp index b1be7f5..ee55d9f 100644 --- a/Source/Models.cpp +++ b/Source/Models.cpp @@ -500,7 +500,7 @@ bool Model::load(char *filename,bool texture ) type = normaltype; color=0; - tfile=fopen( filename, "rb" ); + tfile=fopen( ConvertFileName(filename), "rb" ); // read model settings @@ -952,11 +952,11 @@ void Model::draw() if(color)glInterleavedArrays( GL_T2F_C3F_V3F,8*sizeof(GLfloat),&vArray[0]); glBindTexture(GL_TEXTURE_2D,(unsigned long)textureptr); -#ifndef WIN32 +#if PLATFORM_MACOSX glLockArraysEXT( 0, TriangleNum*3); #endif glDrawArrays(GL_TRIANGLES, 0, TriangleNum*3); -#ifndef WIN32 +#if PLATFORM_MACOSX glUnlockArraysEXT(); #endif @@ -1527,3 +1527,4 @@ Model::Model() type=nothing; } +