X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGraphic%2FModels.cpp;h=1e5947277b70d4fb2ed0a0ca3794d0191bafbd1e;hb=a3775aa01cd00672b37785365675f6842b9db2dc;hp=4f1d91c4ba3bc40702ecb2bce84a6a2819fa685e;hpb=5dfd07829a5eecc87d100dd8825a81eafbaa86be;p=lugaru.git diff --git a/Source/Graphic/Models.cpp b/Source/Graphic/Models.cpp index 4f1d91c..1e59472 100644 --- a/Source/Graphic/Models.cpp +++ b/Source/Graphic/Models.cpp @@ -930,15 +930,7 @@ void Model::drawdifftex(GLuint texture) glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT ); glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT ); - -#ifndef WIN32 - glLockArraysEXT( 0, TriangleNum * 3); -#endif glDrawArrays(GL_TRIANGLES, 0, TriangleNum * 3); -#ifndef WIN32 - glUnlockArraysEXT(); -#endif - if (!color) glDisableClientState(GL_NORMAL_ARRAY); @@ -962,15 +954,7 @@ void Model::drawdifftex(Texture texture) glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT ); glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT ); - -#ifndef WIN32 - glLockArraysEXT( 0, TriangleNum * 3); -#endif glDrawArrays(GL_TRIANGLES, 0, TriangleNum * 3); -#ifndef WIN32 - glUnlockArraysEXT(); -#endif - if (!color) glDisableClientState(GL_NORMAL_ARRAY); @@ -1374,7 +1358,6 @@ void Model::MakeDecal(int atype, XYZ where, float size, float opacity, float rot Model::~Model() { deallocate(); - textureptr.destroy(); } void Model::deallocate()