X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGraphic%2FModels.cpp;h=38e2447085c528abba18ce2dfe35c2d77332f4bc;hb=3f8ee86c6085b5d6c7ee31b916d0e022239750ab;hp=a9833d05e05c8dc486574cf326b28a405c2f9dc6;hpb=b84825978803615f45a9f128232e62431042aec0;p=lugaru.git diff --git a/Source/Graphic/Models.cpp b/Source/Graphic/Models.cpp index a9833d0..38e2447 100644 --- a/Source/Graphic/Models.cpp +++ b/Source/Graphic/Models.cpp @@ -18,9 +18,10 @@ You should have received a copy of the GNU General Public License along with Lugaru. If not, see . */ -#include "Game.h" -#include "Graphic/Models.h" -#include "Utils/Folders.h" +#include "Graphic/Models.hpp" + +#include "Game.hpp" +#include "Utils/Folders.hpp" extern float multiplier; extern float viewdistance; @@ -929,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); @@ -961,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); @@ -1446,7 +1431,7 @@ void Model::deallocate() free(decalposition); decalposition = 0; -}; +} Model::Model() {