X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FModels.h;h=8db72a25ef37688b49622a68b5e0de2214f550f6;hb=cc92cb7b7f9b87cb791c504bf930d622d74db368;hp=6cbb5c5d7a2e3d5d4b79c778a437eafb092765a9;hpb=cd043e3f9e26c2b3406b40a354c2840941e9db7f;p=lugaru.git diff --git a/Source/Models.h b/Source/Models.h index 6cbb5c5..8db72a2 100644 --- a/Source/Models.h +++ b/Source/Models.h @@ -1,5 +1,6 @@ /* Copyright (C) 2003, 2010 - Wolfire Games +Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file) This file is part of Lugaru. @@ -121,7 +122,6 @@ public: int SphereCheck(XYZ *p1, float radius, XYZ *p, XYZ *move, float *rotate); int SphereCheckPossible(XYZ *p1, float radius, XYZ *move, float *rotate); int LineCheck(XYZ *p1, XYZ *p2, XYZ *p, XYZ *move, float *rotate); - int LineCheckSlide(XYZ *p1, XYZ *p2, XYZ *p, XYZ *move, float *rotate); int LineCheckPossible(XYZ *p1, XYZ *p2, XYZ *p, XYZ *move, float *rotate); int LineCheckSlidePossible(XYZ *p1, XYZ *p2, XYZ *p, XYZ *move, float *rotate); void UpdateVertexArray(); @@ -142,7 +142,6 @@ public: void drawdifftex(GLuint texture); void drawdifftex(Texture texture); void drawimmediate(); - void drawdiffteximmediate(GLuint texture); void Rotate(float xang, float yang, float zang); ~Model(); void deallocate();