Add high and low to BoundRect

Author: phma

boundrect.cpp

@@ -3,7 +3,7 @@
 /* boundrect.cpp - bounding rectangles                */
 /*                                                    */
 /******************************************************/
-/* Copyright 2019 Pierre Abbat.
+/* Copyright 2019,2020 Pierre Abbat.
  * This file is part of Wolkenbase.
  * 
  * Wolkenbase is free software: you can redistribute it and/or modify
@@ -26,23 +26,23 @@
 BoundRect::BoundRect()
 {
   int i;
-  for (i=0;i<4;i++)
+  for (i=0;i<6;i++)
     bounds[i]=INFINITY;
   orientation=0;
 }
 
 BoundRect::BoundRect(int ori)
 {
   int i;
-  for (i=0;i<4;i++)
+  for (i=0;i<6;i++)
     bounds[i]=INFINITY;
   orientation=ori;
 }
 
 void BoundRect::clear()
 {
   int i;
-  for (i=0;i<4;i++)
+  for (i=0;i<6;i++)
     bounds[i]=INFINITY;
 }
 
@@ -56,14 +56,18 @@ int BoundRect::getOrientation()
   return orientation;
 }
 
-void BoundRect::include(xy obj)
+void BoundRect::include(xyz obj)
 {
   int i;
   double newbound;
   for (i=0;i<4;i++)
   {
-    newbound=obj.dirbound(i*DEG90-orientation);
+    newbound=xy(obj).dirbound(i*DEG90-orientation);
     if (newbound<bounds[i])
       bounds[i]=newbound;
   }
+  if (obj.elev()<bounds[4])
+    bounds[4]=obj.elev();
+  if (-obj.elev()<bounds[5])
+    bounds[5]=-obj.elev();
 }

boundrect.h

@@ -3,7 +3,7 @@
 /* boundrect.h - bounding rectangles                  */
 /*                                                    */
 /******************************************************/
-/* Copyright 2019 Pierre Abbat.
+/* Copyright 2019,2020 Pierre Abbat.
  * This file is part of Wolkenbase.
  * 
  * Wolkenbase is free software: you can redistribute it and/or modify
@@ -29,15 +29,15 @@ class BoundRect
 {
 private:
   int orientation;
-  std::array<double,4> bounds;
-  // The four numbers are left, bottom, -right, and -top.
+  std::array<double,6> bounds;
+  // The six numbers are left, bottom, -right, -top, low, and -high.
 public:
   BoundRect();
   BoundRect(int ori);
   void clear();
   void setOrientation(int ori);
   int getOrientation();
-  void include(xy obj);
+  void include(xyz obj);
   double left()
   {
     return bounds[0];
@@ -54,5 +54,13 @@ class BoundRect
   {
     return -bounds[3];
   }
+  double low()
+  {
+    return bounds[4];
+  }
+  double high()
+  {
+    return -bounds[5];
+  }
 };
 #endif