X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FModels.cpp;h=b006c6db2dbe398d108e9e4049d1a65cd1fa8138;hb=44146d06c780d3aaa283672fedb08b8870ebe1b9;hp=b1be7f596ee76cc8d491d8f11559be1f5f086cb7;hpb=0cca0c495c7dc29d134a10d7eed5de1f377c99bf;p=lugaru.git diff --git a/Source/Models.cpp b/Source/Models.cpp index b1be7f5..b006c6d 100644 --- a/Source/Models.cpp +++ b/Source/Models.cpp @@ -1,3 +1,24 @@ +/* +Copyright (C) 2003, 2010 - Wolfire Games + +This file is part of Lugaru. + +Lugaru is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + #include "Models.h" //#include "altivec.h" #include "Game.h" @@ -500,7 +521,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 +973,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 +1548,4 @@ Model::Model() type=nothing; } +