Changeset 2751 for GTP/trunk/App/Demos/Vis/CHC_revisited/common.h

Timestamp:

06/10/08 13:15:59 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/CHC_revisited/common.h (modified) (10 diffs)

GTP/trunk/App/Demos/Vis/CHC_revisited/common.h

@@ -1 @@
-/**
-
-This file contains various macros, templates and constants for the ERS system.
-
-@author Jiri Bittner
+/** This file contains various macros, templates and constants for the ERS system.
+    @author Jiri Bittner
 */
 
@@ -19 +16 @@
 
 
-//namespace GtpVisibilityPreprocessor {
-
+namespace CHCDemo 
+{
+
+struct Triangle3;
   
 #if defined(_MSC_VER)
@@ -54 +53 @@
 #include <values.h>
 #else // __WATCOMC__
-#define M_PI        3.14159265358979323846
+#define M_PI        3.14159265358979323846F
 #define MAXFLOAT    3.40282347e+37F
 #endif // __WATCOMC__
@@ -119 +118 @@
 #endif // NULL
 
-//ostream& operator<<(ostream &s,const BaseC &c);
-
 typedef float Real;
 typedef unsigned char byte;
 
-//#ifndef FALSE
-//#define FALSE 0
-//#define TRUE !0
-//#endif
-
-#ifndef __GNUG__
-// typedef int bool;
-#endif
 
 #ifndef getch
@@ -137 +126 @@
 #endif
 
-
 #define TRASH 1.0e-5
 
-#ifndef PI
-#define PI    3.14159265358979323846f
-#endif
-
-#define MIN_FLOAT -1e30f
-#define MAX_FLOAT  1e30f
-
-
-// tolerance value for polygon area
-#define AREA_LIMIT 0.0001f
-
+// delete a pointer and set to NULL
 #ifndef DEL_PTR
 #define DEL_PTR(ptr) do {if (ptr) {        \
@@ -157 +135 @@
                      while (0)
 #endif
+
+
 // Clears a container (i.e., a vector of pointers) and deletes the pointers
-#if 0
 #ifndef CLEAR_CONTAINER
-#define CLEAR_CONTAINER(co) do { while (!(co).empty()) {   \
-                                                           DEL_PTR((co).back());     \
-                                                                   (co).pop_back();}}      \
-                                                        while (0)
-#endif
-
-#else
-
-#ifndef CLEAR_CONTAINER
-#define CLEAR_CONTAINER(co) do { for (int _i = 0; _i < (int)(co).size(); ++ _i) { \
+#define CLEAR_CONTAINER(co) do { for (size_t _i = 0; _i < (int)(co).size(); ++ _i) { \
         DEL_PTR((co)[_i]);} \
         (co).clear(); } \
@@ -175 +145 @@
 #endif
 
-#endif
-
-
-inline
-int signum(const Real a, const Real thresh = TRASH)
+
+inline int signum(const Real a, const Real thresh = TRASH)
 {
   if (a>thresh)
@@ -320 +287 @@
 inline Real Deg2Rad(const Real a)
 {
-   return a * (PI / 180.0f);
+   return a * (M_PI / 180.0f);
 }
 
 inline Real Rad2Deg(const Real a) {
-  return a*(180.0f/PI);
+  return a * (180.0f/M_PI);
 }
   
@@ -335 +302 @@
 
 
-// -------------------------------------------------------------------
-// Limits.
-//  This class encapsulates all the concessions to Realing-point
-//  error made by ray tracers.
-// -------------------------------------------------------------------
-
-class Limits {
+/** Limits.
+    This class encapsulates all the concessions to Realing-point
+        error made by ray tracers.
+*/
+class Limits 
+{
 public:
-  // This is the number used to reject too-close intersections.
-  // The default value is 1.0.
-  static Real Threshold;
-
-  // This is a "small" number.  Less than this number is assumed to
-  // be 0, when such things matter.
-  // The default value is 0.1.
-  static Real Small;
-
-  // This is an impractically "large" number, used for intersection
-  // parameters out to infinity (e.g. the span resulting from an
-  // FindAllIntersections operation on a plane).
-  // The default value is 100000.
-  static Real Infinity;
+        // This is the number used to reject too-close intersections.
+        // The default value is 1.0.
+        static Real Threshold;
+
+        // This is a "small" number.  Less than this number is assumed to
+        // be 0, when such things matter.
+        // The default value is 0.1.
+        static Real Small;
+
+        // This is an impractically "large" number, used for intersection
+        // parameters out to infinity (e.g. the span resulting from an
+        // FindAllIntersections operation on a plane).
+        // The default value is 100000.
+        static Real Infinity;
 };
 
@@ -488 +454 @@
 
 
-//}
-
-#endif
-
-
-
-
-
-
-
-
+typedef std::vector<Triangle3> TriangleContainer;
+
+}
+
+#endif
+
+
+
+
+
+
+
+