Browse Source

Enabled World Hopping, documented BoundingVolume.

Also removed Entity.h
Thomas Buck 11 years ago
parent
commit
a1b95e662d
5 changed files with 31 additions and 167 deletions
  1. 4
    0
      ChangeLog
  2. 1
    1
      Doxyfile
  3. 24
    74
      include/BoundingVolume.h
  4. 0
    91
      include/Entity.h
  5. 2
    1
      src/OpenRaider.cpp

+ 4
- 0
ChangeLog View File

@@ -5,7 +5,11 @@
5 5
 
6 6
  OpenRaider (0.1.2) xythobuz <xythobuz@xythobuz.de>
7 7
 
8
+	[ 20140118 ]
9
+	* Removed unused (and pretty empty) Entity class
10
+
8 11
 	[ 20140117 ]
12
+	* Reenabled room hopping on launch
9 13
 	* Now using C++11 standard.
10 14
 	* Turned on many more warnings and silenced some of them.
11 15
 	* Removed empty Quaternion Unit Test

+ 1
- 1
Doxyfile View File

@@ -369,7 +369,7 @@ INLINE_SIMPLE_STRUCTS  = YES
369 369
 # types are typedef'ed and only the typedef is referenced, never the tag name.
370 370
 # The default value is: NO.
371 371
 
372
-TYPEDEF_HIDES_STRUCT   = NO
372
+TYPEDEF_HIDES_STRUCT   = YES
373 373
 
374 374
 # The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
375 375
 # cache is used to resolve symbols given their name and scope. Since this can be

+ 24
- 74
include/BoundingVolume.h View File

@@ -1,90 +1,40 @@
1
-/* -*- Mode: C++; tab-width: 3; indent-tabs-mode: t; c-basic-offset: 3 -*- */
2
-/*================================================================
1
+/*!
2
+ * \file include/BoundingVolume.h
3
+ * \brief Bounding volume class for world/vis/culling/clipping/collision stuff.
3 4
  *
4
- * Project : libHel
5
- * Author  : Terry 'Mongoose' Hendrix II
6
- * Website : http://www.westga.edu/~stu7440/
7
- * Email   : stu7440@westga.edu
8
- * Object  : BoundingVolume
9
- * License : No use w/o permission (C) 2002 Mongoose
10
- * Comments: Bounding volume class for world/vis
11
- *           culling/clipping/collision stuff
12
- *
13
- *
14
- *           This file was generated using Mongoose's C++
15
- *           template generator script.  <stu7440@westga.edu>
16
- *
17
- *-- Test Defines -----------------------------------------------
18
- *
19
- * UNIT_TEST_BOUNDINGVOLUME - Builds BoundingVolume class unit test
20
- *
21
- *-- History ------------------------------------------------
22
- *
23
- * 2002.11.27:
24
- * Mongoose - Created
25
- ================================================================*/
26
-
5
+ * \author Mongoose
6
+ */
27 7
 
28 8
 #ifndef _BOUNDINGVOLUME_H_
29 9
 #define _BOUNDINGVOLUME_H_
30 10
 
31 11
 #include <MatMath.h>
32 12
 
33
-
34
-class BoundingSphere
35
-{
13
+/*!
14
+ * \brief Defines a 3D sphere.
15
+ */
16
+class BoundingSphere {
36 17
 public:
37
-	vec3_t mCenter;            /* Center of bounding sphere */
38
-
39
-	vec_t mRadius;             /* Raduis of bounding sphere */
18
+    vec3_t mCenter; //!< Center of bounding sphere
19
+    vec_t mRadius; //!< Raduis of bounding sphere
40 20
 };
41 21
 
42
-
43
-class BoundingBox
44
-{
22
+/*!
23
+ * \brief Defines a 3D rectangle.
24
+ */
25
+class BoundingBox {
45 26
 public:
46
-	vec3_t mMin;           /* Bounding box MIN point */
47
-
48
-	vec3_t mMax;           /* Bounding box MAX point */
27
+    vec3_t mMin; //!< Bounding box MIN point
28
+    vec3_t mMax; //!< Bounding box MAX point
49 29
 };
50 30
 
51
-
52
-class BoundingVolume
53
-{
54
- public:
55
-
56
-	////////////////////////////////////////////////////////////
57
-	// Constructors
58
-	////////////////////////////////////////////////////////////
59
-
60
-
61
-	////////////////////////////////////////////////////////////
62
-	// Public Accessors
63
-	////////////////////////////////////////////////////////////
64
-
65
-
66
-	////////////////////////////////////////////////////////////
67
-	// Public Mutators
68
-	////////////////////////////////////////////////////////////
69
-
70
-
71
-	BoundingSphere mSphere;    /* Bounding sphere of this volume */
72
-
73
-	BoundingBox mBox;          /* Bounding box of this volume */
74
-
75
- private:
76
-
77
-	////////////////////////////////////////////////////////////
78
-	// Private Accessors
79
-	////////////////////////////////////////////////////////////
80
-
81
-
82
-	////////////////////////////////////////////////////////////
83
-	// Private Mutators
84
-	////////////////////////////////////////////////////////////
85
-
86
-
87
-	/* */
31
+/*!
32
+ * \brief Defines a 3D sphere and/or rectangle.
33
+ */
34
+class BoundingVolume {
35
+public:
36
+    BoundingSphere mSphere; //!< Bounding sphere of this volume
37
+    BoundingBox mBox; //!< Bounding box of this volume
88 38
 };
89 39
 
90 40
 #endif

+ 0
- 91
include/Entity.h View File

@@ -1,91 +0,0 @@
1
-/* -*- Mode: C++; tab-width: 3; indent-tabs-mode: t; c-basic-offset: 3 -*- */
2
-/*================================================================
3
- *
4
- * Project : Hel
5
- * Author  : Terry 'Mongoose' Hendrix II
6
- * Website : http://www.westga.edu/~stu7440/
7
- * Email   : stu7440@westga.edu
8
- * Object  : Entity
9
- * License : No use w/o permission (C) 2002 Mongoose
10
- * Comments: This is the base thing class
11
- *
12
- *
13
- *           This file was generated using Mongoose's C++
14
- *           template generator script.  <stu7440@westga.edu>
15
- *
16
- *-- Test Defines -----------------------------------------------
17
- *
18
- * UNIT_TEST_ENTITY - Builds Entity class as a console unit test
19
- *
20
- *-- History ------------------------------------------------
21
- *
22
- * 2002.11.09:
23
- * Mongoose - Created
24
- ================================================================*/
25
-
26
-
27
-#ifndef _ENTITY_H_
28
-#define _ENTITY_H_
29
-
30
-#include <MatMath.h>
31
-#include <BoundingVolume.h>
32
-#include <Quaternion.h>
33
-#include <Vector3d.h>
34
-#include <Mass.h>
35
-
36
-
37
-typedef enum
38
-{
39
-	EntityFlag_Visible    = 1,
40
-	EntityFlag_Collision  = 2,
41
-	EntityFlag_Particle   = 4,
42
-	EntityFlag_World      = 8
43
-
44
-} EntityFlag;
45
-
46
-
47
-class Entity
48
-{
49
- public:
50
-
51
-	////////////////////////////////////////////////////////////
52
-	// Constructors
53
-	////////////////////////////////////////////////////////////
54
-
55
-
56
-	////////////////////////////////////////////////////////////
57
-	// Public Accessors
58
-	////////////////////////////////////////////////////////////
59
-
60
-
61
-
62
-	////////////////////////////////////////////////////////////
63
-	// Public Mutators
64
-	////////////////////////////////////////////////////////////
65
-
66
-
67
-	unsigned int mId;          /* Unique identifier */
68
-
69
-	Vector3d mPos;             /* World position */
70
-
71
-	Quaternion mOrientation;	/* Orientation (Pitch, Yaw, Roll) */
72
-
73
-	BoundingVolume mVolume;		/* Bounding volume of entity */
74
-
75
-	Mass mMass;						/* Mass of this entity */
76
-
77
-	EntityFlag mFlag;	 			/* Flags of this entity */
78
-
79
- private:
80
-
81
-	////////////////////////////////////////////////////////////
82
-	// Private Accessors
83
-	////////////////////////////////////////////////////////////
84
-
85
-
86
-	////////////////////////////////////////////////////////////
87
-	// Private Mutators
88
-	////////////////////////////////////////////////////////////
89
-};
90
-
91
-#endif

+ 2
- 1
src/OpenRaider.cpp View File

@@ -902,7 +902,8 @@ void OpenRaider::start()
902 902
 	initSound();
903 903
 
904 904
 	// Old room movement
905
-	//gWorld.setFlag(World::fEnableHopping);
905
+	gWorld.setFlag(World::fEnableHopping);
906
+    // reenabled, what should be the new room movement? --xythobuz
906 907
 
907 908
 	resetTicks();
908 909
 

Loading…
Cancel
Save