X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGraphic%2FModels.hpp;h=58d8649545e04ce703b6d215434df5196b688c2e;hb=88961157fe4a88fb10320b4ce211ca697f639e7e;hp=ecfb3dd8cb46028216f1b14155714796defe2490;hpb=c5c706228593612b864aa7e1ec674bb98e6b8764;p=lugaru.git diff --git a/Source/Graphic/Models.hpp b/Source/Graphic/Models.hpp index ecfb3dd..58d8649 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. @@ -54,19 +54,21 @@ public: #define max_model_decals 300 -#define nothing 0 -#define normaltype 4 -#define notextype 1 -#define rawtype 2 -#define decalstype 3 +enum ModelType +{ + nothing = 0, + notextype = 1, + rawtype = 2, + decalstype = 3, + normaltype = 4 +}; class Model { public: short vertexNum; - bool hastexture; - int type, oldtype; + ModelType type; int* owner; XYZ* vertex; @@ -96,6 +98,7 @@ public: 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); + 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);