X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGraphic%2FModels.hpp;h=e6dbb50030994710872572c5334d60b10396cc10;hb=6a8cb464330e92163c8feaf101b8b5837c973bba;hp=cb5bcdafdf4c3b953991dedc8951c2e4b23f3193;hpb=afdb97f1c3e430801a1fd0c1b04a8a2102e8f1ac;p=lugaru.git diff --git a/Source/Graphic/Models.hpp b/Source/Graphic/Models.hpp index cb5bcda..e6dbb50 100644 --- a/Source/Graphic/Models.hpp +++ b/Source/Graphic/Models.hpp @@ -1,6 +1,6 @@ /* Copyright (C) 2003, 2010 - Wolfire Games -Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file) +Copyright (C) 2010-2017 - Lugaru contributors (see AUTHORS file) This file is part of Lugaru. @@ -22,8 +22,8 @@ along with Lugaru. If not, see . #define _MODELS_HPP_ #include "Environment/Terrain.hpp" -#include "Graphic/gamegl.hpp" #include "Graphic/Texture.hpp" +#include "Graphic/gamegl.hpp" #include "Math/XYZ.hpp" #include "Utils/binio.h" @@ -35,9 +35,10 @@ along with Lugaru. If not, see . // // Textures List // -typedef struct { +typedef struct +{ long xsz, ysz; - GLubyte *txt; + GLubyte* txt; } ModelTexture; // @@ -96,15 +97,15 @@ public: Model(); ~Model(); void DeleteDecal(int which); - void MakeDecal(decal_type atype, XYZ *where, float *size, float *opacity, float *rotation); + void MakeDecal(decal_type atype, XYZ* where, float* size, float* opacity, float* rotation); void MakeDecal(decal_type atype, XYZ where, float size, float opacity, float rotation); const XYZ& getTriangleVertex(unsigned triangleId, unsigned vertexId) const; void drawdecals(Texture shadowtexture, Texture bloodtexture, Texture bloodtexture2, Texture breaktexture); - 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 LineCheckPossible(XYZ *p1, XYZ *p2, XYZ *p, XYZ *move, float *rotate); - int LineCheckSlidePossible(XYZ *p1, XYZ *p2, XYZ *move, float *rotate); + 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 LineCheckPossible(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();