X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGraphic%2FModels.hpp;h=de4526e14e1fd69ffb465c5ecebfeac4e87c08e3;hb=cd451341c5ee01374268559885871ca9d454cbd0;hp=27f3c7da62adb39a2800845048d7e0f8789a9c51;hpb=cf610b0dfbf15ffafaefcae72a44957095fd7740;p=lugaru.git diff --git a/Source/Graphic/Models.hpp b/Source/Graphic/Models.hpp index 27f3c7d..de4526e 100644 --- a/Source/Graphic/Models.hpp +++ b/Source/Graphic/Models.hpp @@ -119,14 +119,14 @@ public: int SphereCheckPossible(XYZ *p1, float radius, XYZ *move, float *rotate); int LineCheck(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); + int LineCheckSlidePossible(XYZ *p1, XYZ *p2, XYZ *move, float *rotate); void UpdateVertexArray(); void UpdateVertexArrayNoTex(); void UpdateVertexArrayNoTexNoNorm(); bool loadnotex(const std::string& filename); bool loadraw(const std::string& filename); - bool load(const std::string& filename, bool texture); - bool loaddecal(const std::string& filename, bool texture); + bool load(const std::string& filename); + bool loaddecal(const std::string& filename); void Scale(float xscale, float yscale, float zscale); void FlipTexCoords(); void UniformTexCoords();