X-Git-Url: https://git.jsancho.org/?p=lugaru.git;a=blobdiff_plain;f=Source%2FObjects%2FObject.hpp;h=61ba4abb30917e6f668dbe7c13f9e7c574803f4d;hp=d8ce273faeff31b2636844b9c175ac6c1129f8af;hb=6a8cb464330e92163c8feaf101b8b5837c973bba;hpb=5fca41ab430df85d6dd620a7f4130df01bc1430f diff --git a/Source/Objects/Object.hpp b/Source/Objects/Object.hpp index d8ce273..61ba4ab 100644 --- a/Source/Objects/Object.hpp +++ b/Source/Objects/Object.hpp @@ -23,10 +23,10 @@ along with Lugaru. If not, see . #include "Environment/Lights.hpp" #include "Environment/Terrain.hpp" -#include "Graphic/gamegl.hpp" #include "Graphic/Models.hpp" #include "Graphic/Sprite.hpp" #include "Graphic/Texture.hpp" +#include "Graphic/gamegl.hpp" #include "Math/Frustum.hpp" #include "Math/XYZ.hpp" #include "Utils/ImageIO.hpp" @@ -39,7 +39,8 @@ along with Lugaru. If not, see . #define max_objects 300 -enum object_type { +enum object_type +{ boxtype = 0, weirdtype = 1, spiketype = 2, @@ -55,7 +56,6 @@ enum object_type { firetype = 13 }; - class Object { public: @@ -94,7 +94,7 @@ public: static void ComputeRadius(); static void AddObjectsToTerrain(); static void LoadObjectsFromFile(FILE* tfile, bool skip); - static void SphereCheckPossible(XYZ *p1, float radius); + static void SphereCheckPossible(XYZ* p1, float radius); static void DeleteObject(int which); static void MakeObject(int atype, XYZ where, float ayaw, float apitch, float ascale); static void Draw(); @@ -114,4 +114,3 @@ private: }; #endif -