Update accelerator interface.

tatsy · Mar 12, 2016 · 05b7653 · 05b7653
1 parent 4935777
commit 05b7653
Show file tree

Hide file tree

Showing 23 changed files with 382 additions and 415 deletions.
diff --git a/include/spica.h b/include/spica.h
@@ -27,7 +27,7 @@
 // --------------------------------------------
 // Accelerators
 // --------------------------------------------
-#include "../sources/accel/bbvh_accel.h"
+#include "../sources/accelerator/spica_accelerator.h"
 
 // --------------------------------------------
 // BxDF

diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt
@@ -41,7 +41,7 @@ process_subdirectory(random)
 process_subdirectory(light)
 process_subdirectory(camera)
 process_subdirectory(scenes)
-process_subdirectory(accel)
+process_subdirectory(accelerator)
 process_subdirectory(material)
 process_subdirectory(texture)
 

diff --git a/sources/accelerator/CMakeLists.txt b/sources/accelerator/CMakeLists.txt
@@ -1,14 +1,16 @@
 set(ACCEL_SOURCES ${ACCEL_SOURCES}
-    ${CMAKE_CURRENT_LIST_DIR}/kdtree.cc
+#    ${CMAKE_CURRENT_LIST_DIR}/kdtree.cc
     ${CMAKE_CURRENT_LIST_DIR}/bvh.cc
-    ${CMAKE_CURRENT_LIST_DIR}/qbvh.cc)
+#    ${CMAKE_CURRENT_LIST_DIR}/qbvh.cc
+)
 
 set(ACCEL_HEADERS ${ACCEL_HEADERS}
     ${CMAKE_CURRENT_LIST_DIR}/spica_accelerator.h
     ${CMAKE_CURRENT_LIST_DIR}/accelerator.h
-    ${CMAKE_CURRENT_LIST_DIR}/kdtree.h
+#    ${CMAKE_CURRENT_LIST_DIR}/kdtree.h
     ${CMAKE_CURRENT_LIST_DIR}/bvh.h
-    ${CMAKE_CURRENT_LIST_DIR}/qbvh.h)
+#    ${CMAKE_CURRENT_LIST_DIR}/qbvh.h
+)
 
 set(SOURCES ${SOURCES} ${ACCEL_SOURCES} PARENT_SCOPE)
 set(HEADERS ${HEADERS} ${ACCEL_HEADERS} PARENT_SCOPE)
diff --git a/sources/accelerator/accelerator.h b/sources/accelerator/accelerator.h
@@ -2,8 +2,8 @@
 #pragma once
 #endif
 
-#ifndef _SPICA_ACCEL_INTERFACE_H_
-#define _SPICA_ACCEL_INTERFACE_H_
+#ifndef _SPICA_ACCELERATOR_H_
+#define _SPICA_ACCELERATOR_H_
 
 #include <vector>
 #include <map>
@@ -18,66 +18,34 @@
 
 namespace spica {
 
-/** Accelerator type enum
+/** Interface for intersection test accelerators.
  *  @ingroup accel_module
- *  @brief Enumerator for acclerator types.
  */
-enum class AccelType : int {
-    KdTree,   /**< K-D tree acclerator */
-    BBVH,     /**< binary BVH accelerator */
-    QBVH      /**< SIMD-acclerated QBVH acclerator */
-};
-
-/** Interface for intersection test accelerators.
-    *  @ingroup accel_module
-    */
-class SPICA_EXPORTS AccelInterface : public Aggregate, Uncopyable {
+class SPICA_EXPORTS Accelerator : public Aggregate, Uncopyable {
 public:
     // Public methods
-    explicit AccelInterface(AccelType type) : type_{ type } {}
-    virtual ~AccelInterface() {}
+    explicit Accelerator(const std::vector<std::shared_ptr<Primitive>>& primitives)
+        : primitives_{ primitives } {}
+    virtual ~Accelerator() {}
     virtual void construct() = 0;
     virtual Bounds3d worldBound() const override {
         return worldBound_;
     }
 
+    inline const std::vector<std::shared_ptr<Primitive>>& primitives() const {
+        return primitives_;
+    }
+
 protected:
     // Protected internal classes
     struct IndexedTriangle;
     struct AxisComparator;
 
     // Protected fields
-    AccelType type_;
+    std::vector<std::shared_ptr<Primitive>> primitives_;
     Bounds3d   worldBound_;
 };
 
-struct AccelInterface::IndexedTriangle {
-    IndexedTriangle()
-        : idx(-1)
-        , tri() {
-    }
-    IndexedTriangle(int i, const Triangle& t)
-        : idx(i)
-        , tri(t) {
-    }
-
-    int idx;
-    Triangle tri;
-};
-
-struct AccelInterface::AxisComparator {
-    int dim;
-    explicit AxisComparator(int dim_ = 0)
-        : dim(dim_)
-    {
-        Assertion(0 <= dim_ && dim_ <= 2, "Dimension must be between 0 and 2");
-    }
-
-    bool operator()(const IndexedTriangle& t1, const IndexedTriangle& t2) const {
-        return t1.tri.gravity()[dim] < t2.tri.gravity()[dim];
-    }
-};
-
 }  // namespace spica
 
-#endif  // _SPICA_ACCEL_INTERFACE_H_
+#endif  // _SPICA_ACCELERATOR_H_
diff --git a/sources/accelerator/bvh.cc b/sources/accelerator/bvh.cc
@@ -1,5 +1,5 @@
 #define SPICA_API_EXPORT
-#include "bbvh_accel.h"
+#include "bvh.h"
 
 #include <stack>
 #include <functional>
@@ -92,10 +92,9 @@ struct BBVHAccel::CompareToBucket {
 };
 
 BBVHAccel::BBVHAccel(const std::vector<std::shared_ptr<Primitive>>& prims,
-                        int maxPrimsInNode)
-    : AccelInterface{ AccelType::BBVH }
+                     int maxPrimsInNode)
+    : Accelerator{ prims }
     , maxPrimInNode_{ maxPrimsInNode }
-    , primitives_{ prims }
     , _root{ nullptr } {
     construct();
 }

diff --git a/sources/accelerator/bvh.h b/sources/accelerator/bvh.h
@@ -7,14 +7,14 @@
 
 #include <memory>
 
-#include "accel_interface.h"
+#include "accelerator.h"
 
 namespace spica {
 
 /** Binary BVH accelerator class
     *  @ingroup accel_module
     */
-class SPICA_EXPORTS BBVHAccel : public AccelInterface {
+class SPICA_EXPORTS BBVHAccel : public Accelerator {
 public:
     BBVHAccel(const std::vector<std::shared_ptr<Primitive>> &prims,
               int maxPrimsInNode = 1);
@@ -40,11 +40,8 @@ class SPICA_EXPORTS BBVHAccel : public AccelInterface {
 
     // Private fields
     const int maxPrimInNode_;
-    std::vector<std::shared_ptr<Primitive>> primitives_;
     BBvhNode* _root;
-    //std::vector<Triangle>     _tris;
     std::vector<std::unique_ptr<BBvhNode> > _nodes;
-    //void release();
 
 };  // class BBVHAccel
 

diff --git a/sources/accelerator/kdtree.h b/sources/accelerator/kdtree.h
@@ -7,7 +7,7 @@
 
 #include <vector>
 
-#include "accel_interface.h"
+#include "accelerator.h"
 #include "../core/common.h"
 #include "../core/uncopyable.h"
 
@@ -17,7 +17,7 @@ namespace spica {
  * K-D tree accelerator class
  * @ingroup accel_module
  */
-class SPICA_EXPORTS KdTreeAccel : public AccelInterface {
+class SPICA_EXPORTS KdTreeAccel : public Accelerator {
 private:
     struct KdTreeNode {
         Bounds3d bbox;

diff --git a/sources/accelerator/qbvh.h b/sources/accelerator/qbvh.h
@@ -8,15 +8,15 @@
 #include <vector>
 #include <xmmintrin.h>
 
-#include "accel_interface.h"
+#include "accelerator.h"
 
 namespace spica {
 
 /** 
  * Quad BVH accelerator class
  * @ingroup accel_module
  */
-class SPICA_EXPORTS QBVHAccel : public AccelInterface {
+class SPICA_EXPORTS QBVHAccel : public Accelerator {
 public:
     QBVHAccel();
     virtual ~QBVHAccel();

diff --git a/sources/accelerator/spica_accelerator.h b/sources/accelerator/spica_accelerator.h
@@ -0,0 +1,13 @@
+#ifdef _MSC_VER
+#pragma once
+#endif
+
+#ifndef _SPICA_ACCELERATOR_HEADERS_H_
+#define _SPICA_ACCELERATOR_HEADERS_H_
+
+#include "accelerator.h"
+#include "bvh.h"
+// #include "kdtree.h"
+// #include "qbvh.h"
+
+#endif  // _SPICA_ACCELERATOR_HEADERS_H_
diff --git a/sources/core/bounds3d.h b/sources/core/bounds3d.h
@@ -38,6 +38,7 @@ class Bounds3_ {
 
     void merge(const Bounds3_<T>& b);
     void merge(const Point3_<T>& p);
+    bool inside(const Point3_<T>& p) const;
 
     T area() const;
 

diff --git a/sources/core/bounds3d_detail.h b/sources/core/bounds3d_detail.h
@@ -97,6 +97,13 @@ void Bounds3_<T>::merge(const Point3_<T>& p) {
     posMax_ = Point3_<T>::maximum(p, posMax_);
 }
 
+template <class T>
+bool Bounds3_<T>::inside(const Point3_<T>& p) const {
+    return (posMin_.x() < p.x() && p.x() < posMax_.x() &&
+            posMin_.x() < p.y() && p.x() < posMax_.y() &&
+            posMin_.x() < p.z() && p.x() < posMax_.z());
+}
+
 template <class T>
 T Bounds3_<T>::area() const {
     Vector3_<T> diff = posMax_ - posMin_;

diff --git a/sources/core/engine.cc b/sources/core/engine.cc
@@ -22,7 +22,7 @@
 #include "../random/random.h"
 #include "../random/halton.h"
 
-#include "../accel/bbvh_accel.h"
+#include "../accelerator/spica_accelerator.h"
 #include "../scenes/scene.h"
 
 #include <boost/property_tree/ptree.hpp>

diff --git a/sources/core/primitive.cc b/sources/core/primitive.cc
@@ -3,6 +3,7 @@
 
 #include "../core/interaction.h"
 #include "../shape/shape.h"
+#include "../shape/triangle.h"
 #include "../material/material.h"
 
 namespace spica {

diff --git a/sources/integrator/CMakeLists.txt b/sources/integrator/CMakeLists.txt
@@ -9,10 +9,10 @@ set(SOURCES
     ${CMAKE_CURRENT_LIST_DIR}/directlighting.cc
 #    ${CMAKE_CURRENT_LIST_DIR}/bdpt.cc
 #    ${CMAKE_CURRENT_LIST_DIR}/mlt.cc
-#    ${CMAKE_CURRENT_LIST_DIR}/photon_map.cc
 #    ${CMAKE_CURRENT_LIST_DIR}/ppmprob.cc
     ${CMAKE_CURRENT_LIST_DIR}/sppm.cc
-    ${CMAKE_CURRENT_LIST_DIR}/hierarchical.cc
+#    ${CMAKE_CURRENT_LIST_DIR}/photon_map.cc
+#    ${CMAKE_CURRENT_LIST_DIR}/hierarchical.cc
     PARENT_SCOPE)
 
 set(HEADERS
@@ -27,8 +27,8 @@ set(HEADERS
     ${CMAKE_CURRENT_LIST_DIR}/directlighting.h
 #    ${CMAKE_CURRENT_LIST_DIR}/bdpt.h
 #    ${CMAKE_CURRENT_LIST_DIR}/mlt.h
-#    ${CMAKE_CURRENT_LIST_DIR}/photon_map.h
 #    ${CMAKE_CURRENT_LIST_DIR}/ppmprob.h
     ${CMAKE_CURRENT_LIST_DIR}/sppm.h
-    ${CMAKE_CURRENT_LIST_DIR}/hierarchical.h
+#    ${CMAKE_CURRENT_LIST_DIR}/photon_map.h
+#    ${CMAKE_CURRENT_LIST_DIR}/hierarchical.h
     PARENT_SCOPE)