X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FObjects%2FObject.hpp;h=61ba4abb30917e6f668dbe7c13f9e7c574803f4d;hb=7aa870825c0e851e69703d9730e20db6eb94a675;hp=11935fe6858977eb19c9893a7cb3f162c3c79281;hpb=7d7660368e11ce4a2423f23ecba4ffc5103c4798;p=lugaru.git
diff --git a/Source/Objects/Object.hpp b/Source/Objects/Object.hpp
index 11935fe..61ba4ab 100644
--- a/Source/Objects/Object.hpp
+++ b/Source/Objects/Object.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.
@@ -23,12 +23,12 @@ 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/Quaternions.hpp"
+#include "Math/XYZ.hpp"
#include "Utils/ImageIO.hpp"
#include
@@ -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
-