From 47334c555dacbe74e9ff195c66998bfb542b60df Mon Sep 17 00:00:00 2001
From: cignoni <paolo.cignoni@isti.cnr.it>
Date: Sun, 12 Jun 2016 21:10:46 +0000
Subject: [PATCH] Small change to make the bbox function in segment equal to
 the other vcg object (getbbox instead of bbox)

---
 apps/sample/space_index_2d/space_index_2d.cpp | 12 +++++++-----
 apps/sample/space_index_2d/space_index_2d.pro | 14 +++-----------
 vcg/space/index/grid_static_ptr2d.h           | 12 ++++++++----
 vcg/space/segment2.h                          |  6 ++----
 4 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/apps/sample/space_index_2d/space_index_2d.cpp b/apps/sample/space_index_2d/space_index_2d.cpp
index 0902e26e..a2d731e6 100644
--- a/apps/sample/space_index_2d/space_index_2d.cpp
+++ b/apps/sample/space_index_2d/space_index_2d.cpp
@@ -169,11 +169,13 @@ MySegmentType * DoRay(MyRayType & _r,
 void GetInBoxSegmentsBruteF( vcg::Box2<MyScalarType> bbox,
                              std::vector<MySegmentType*> &result)
 {
-    for (size_t i=0;i<AllocatedSeg.size();i++)
-    {
-        if (!AllocatedSeg[i].BBox().Collide(bbox))continue;
-        result.push_back(&AllocatedSeg[i]);
-    }
+  vcg::Box2<MyScalarType> ibbox;
+  for (size_t i=0;i<AllocatedSeg.size();i++)
+  {
+    AllocatedSeg[i].GetBBox(ibbox);
+    if (!ibbox.Collide(bbox)) continue;
+    result.push_back(&AllocatedSeg[i]);
+  }
 }
 
 MySegmentType* GetClosesestSegmentBruteF(MyCoordType & _p,
diff --git a/apps/sample/space_index_2d/space_index_2d.pro b/apps/sample/space_index_2d/space_index_2d.pro
index 21fcc36f..29276194 100644
--- a/apps/sample/space_index_2d/space_index_2d.pro
+++ b/apps/sample/space_index_2d/space_index_2d.pro
@@ -1,15 +1,7 @@
-######################################################################
-# Automatically generated by qmake (2.00a) ven 24. giu 14:14:20 2005
-######################################################################
-
-TARGET = test_hash2d
-DEPENDPATH += . 
-INCLUDEPATH += . ../../..
-CONFIG += console stl
-TEMPLATE = app
+include(../common.pri)
+TARGET = space_index_2d
 HEADERS += ../../../vcg/space/index/grid_static_ptr2d.h\
            ../../../vcg/space/index/closest2d.h\
            ../../../vcg/space/index/space_iterators2d.h\
            ../../../vcg/space/index/grid_closest2d.h
-
-SOURCES += test_hash2d.cpp
+SOURCES += space_index_2d.cpp
diff --git a/vcg/space/index/grid_static_ptr2d.h b/vcg/space/index/grid_static_ptr2d.h
index 5a83780e..a372617c 100644
--- a/vcg/space/index/grid_static_ptr2d.h
+++ b/vcg/space/index/grid_static_ptr2d.h
@@ -85,7 +85,8 @@ private:
         OBJITER IteObj;
         for (IteObj=_oBegin;IteObj!=_oEnd;IteObj++)
         {
-            Box2<ScalarType> Box2D=(*IteObj).BBox();
+            Box2<ScalarType> Box2D;
+            (*IteObj).GetBBox(Box2D);
 
             //get index of intersected cells
             Point2i minIndex=this->GridP(Box2D.min);
@@ -134,12 +135,15 @@ public:
     inline void Set(const OBJITER & _oBegin,
                     const OBJITER & _oEnd)
     {
-      Box2x bbox;
+      Box2x bbox,ibbox;
 
       OBJITER IteObj;
       for (IteObj=_oBegin;IteObj!=_oEnd;IteObj++)
-          bbox.Add((*IteObj).BBox());
-
+      {
+        (*IteObj).GetBBox(ibbox);
+        bbox.Add(ibbox);
+      }
+      
       ScalarType diag=bbox.Diag();
       bbox.Offset(diag*0.01);
       Set<OBJITER>(_oBegin,_oEnd,bbox);
diff --git a/vcg/space/segment2.h b/vcg/space/segment2.h
index 3e439a86..37ce7310 100644
--- a/vcg/space/segment2.h
+++ b/vcg/space/segment2.h
@@ -91,12 +91,10 @@ public:
     inline PointType MidPoint( ) const
     { return ( _p0 +  _p1) / ScalarType(2.0) ; }
       /// return the bounding box
-    inline Box2<ScalarType> BBox( ) const
+    inline void GetBBox(  Box2<ScalarType> &t) const
     {
-      Box2<ScalarType> t;
-      t.Add(_p0);
+      t.Set(_p0);
       t.Add(_p1);
-      return t;
     }
         /// returns segment length
     ScalarType Length()