Commit 5d87e9d3 authored by Nghia Truong's avatar Nghia Truong
Browse files

COMP: Fix compilation issue when compiling with MSVC 2013

parent 035c8f71
...@@ -38,8 +38,23 @@ template<class CellData> ...@@ -38,8 +38,23 @@ template<class CellData>
class UniformSpatialGrid class UniformSpatialGrid
{ {
public: public:
UniformSpatialGrid() = default;
UniformSpatialGrid(const Vec3r& lowerCorner, const Vec3r& upperCorner, Real cellSize) { initialize(lowerCorner, upperCorner, cellSize); } ///
/// \brief Construct a default grid ([0, 1]^3) with cell size of 1
///
UniformSpatialGrid() : UniformSpatialGrid(Vec3r(0, 0, 0), Vec3r(1, 1, 1), Real(1.0))
{}
///
/// \brief Construct a grid with given corners and cell size
/// \param lowerCorner The lower corner of the grid
/// \param upperCorner The upper corner of the grid
/// \param cellSize The length of grid cell
///
UniformSpatialGrid(const Vec3r& lowerCorner, const Vec3r& upperCorner, Real cellSize)
{
initialize(lowerCorner, upperCorner, cellSize);
}
/// ///
/// \brief Initialize the grid data /// \brief Initialize the grid data
...@@ -215,14 +230,14 @@ public: ...@@ -215,14 +230,14 @@ public:
} }
private: private:
Vec3r m_LowerCorner {0.0, 0.0, 0.0}; Vec3r m_LowerCorner; ///> Lower corner of the grid
Vec3r m_UpperCorner {1.0, 1.0, 1.0}; Vec3r m_UpperCorner; ///> Upper corner of the grid
Real m_CellSize {1.0}; Real m_CellSize; ///> Length of grid cell
Real m_InvCellSize {1.0}; Real m_InvCellSize; ///> Inverse length of grid cell
std::array<unsigned int, 3> m_Resolution {{ 0u, 0u, 0u }}; unsigned int m_NTotalCells; ///> Number of total cells
unsigned int m_NTotalCells { 1u }; std::array<unsigned int, 3> m_Resolution; ///> Grid resolution (number of cells in x/y/z dimensions)
std::vector<CellData> m_CellData; std::vector<CellData> m_CellData; ///> Data stored for each cell
}; };
} // end namespace imstk } // end namespace imstk
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment