[Bf-blender-cvs] [fe35460] openvdb: Remove dead code.

[Kévin Dietrich]

Commit: fe354606a25ea6270925088429bf51aca62569dc
Author: Kévin Dietrich
Date:   Thu Jul 2 12:42:28 2015 +0200
Branches: openvdb
https://developer.blender.org/rBfe354606a25ea6270925088429bf51aca62569dc

Remove dead code.

===================================================================

M	intern/openvdb/intern/openvdb_dense_convert.cpp
M	intern/openvdb/intern/openvdb_dense_convert.h

===================================================================

diff --git a/intern/openvdb/intern/openvdb_dense_convert.cpp b/intern/openvdb/intern/openvdb_dense_convert.cpp
index 8b9d090..97a8602 100644
--- a/intern/openvdb/intern/openvdb_dense_convert.cpp
+++ b/intern/openvdb/intern/openvdb_dense_convert.cpp
@@ -124,83 +124,12 @@ GridBase *OpenVDB_export_vector_grid(OpenVDBWriter *writer,
 	return vecgrid.get();
 }
 
-class SplitVectorGrid {
-	FloatGrid::Ptr m_grid_x, m_grid_y, m_grid_z;
-
-public:
-	SplitVectorGrid()
-	{}
-
-	void operator()(const Vec3SGrid::Ptr &vecgrid)
-	{
-		Vec3s bg = vecgrid->background();
-		m_grid_x = FloatGrid::create(bg.x());
-		m_grid_y = FloatGrid::create(bg.y());
-		m_grid_z = FloatGrid::create(bg.z());
-
-		if (math::Transform::Ptr xform = vecgrid->transform().copy()) {
-			m_grid_x->setTransform(xform);
-			m_grid_y->setTransform(xform);
-			m_grid_z->setTransform(xform);
-		}
-
-		FloatGrid::Accessor acc_x = m_grid_x->getAccessor(),
-		                    acc_y = m_grid_y->getAccessor(),
-		                    acc_z = m_grid_z->getAccessor();
-
-		CoordBBox bbox;
-		for (Vec3SGrid::ValueOnCIter it = vecgrid->cbeginValueOn(); it; ++it) {
-			if (!it.getBoundingBox(bbox)) continue;
-
-			const Vec3s &val = it.getValue();
-
-			if (it.isTileValue()) {
-				m_grid_x->fill(bbox, val.x());
-				m_grid_y->fill(bbox, val.y());
-				m_grid_z->fill(bbox, val.z());
-			}
-			else {
-				acc_x.setValueOn(bbox.min(), val.x());
-				acc_y.setValueOn(bbox.min(), val.y());
-				acc_z.setValueOn(bbox.min(), val.z());
-			}
-		}
-	}
-
-	const FloatGrid::Ptr &grid_x() { return m_grid_x; }
-    const FloatGrid::Ptr &grid_y() { return m_grid_y; }
-    const FloatGrid::Ptr &grid_z() { return m_grid_z; }
-};
-
 void OpenVDB_import_grid_vector(OpenVDBReader *reader,
                                 const std::string &name,
                                 float **data_x, float **data_y, float **data_z,
                                 const int res[3])
 {
 	Vec3SGrid::Ptr vgrid = gridPtrCast<Vec3SGrid>(reader->getGrid(name));
-
-#if 0
-	SplitVectorGrid vector_split;
-	vector_split(vgrid);
-
-	FloatGrid::Ptr grid[3];
-	math::CoordBBox bbox(Coord(0), Coord(res[0] - 1, res[1] - 1, res[2] - 1));
-
-	grid[0] = vector_split.grid_x();
-	tools::Dense<float, tools::LayoutXYZ> dense_grid_x(bbox);
-	tools::copyToDense(*grid[0], dense_grid_x);
-	*data_x = dense_grid_x.data();
-
-	grid[1] = vector_split.grid_y();
-	tools::Dense<float, tools::LayoutXYZ> dense_grid_y(bbox);
-	tools::copyToDense(*grid[1], dense_grid_y);
-	*data_y = dense_grid_y.data();
-
-	grid[2] = vector_split.grid_z();
-	tools::Dense<float, tools::LayoutXYZ> dense_grid_z(bbox);
-	tools::copyToDense(*grid[2], dense_grid_z);
-	*data_z = dense_grid_z.data();
-#else
 	Vec3SGrid::Accessor acc = vgrid->getAccessor();
 	math::Coord xyz;
 	int &x = xyz[0], &y = xyz[1], &z = xyz[2];
@@ -216,7 +145,6 @@ void OpenVDB_import_grid_vector(OpenVDBReader *reader,
 			}
 		}
 	}
-#endif
 }
 
 void OpenVDB_update_fluid_transform(const char *filename, float matrix[4][4], float matrix_high[4][4])
diff --git a/intern/openvdb/intern/openvdb_dense_convert.h b/intern/openvdb/intern/openvdb_dense_convert.h
index 2def9f2..077d49f 100644
--- a/intern/openvdb/intern/openvdb_dense_convert.h
+++ b/intern/openvdb/intern/openvdb_dense_convert.h
@@ -88,15 +88,9 @@ OpenVDBPrimitive *OpenVDB_import_grid(OpenVDBReader *reader,
 {
 	using namespace openvdb;
 
-	typename GridType::Ptr grid_tmp = gridPtrCast<GridType>(reader->getGrid(name));
-#if 0
-	math::CoordBBox bbox(Coord(0), Coord(res[0] - 1, res[1] - 1, res[2] - 1));
+	typename GridType::Ptr grid = gridPtrCast<GridType>(reader->getGrid(name));
+	typename GridType::Accessor acc = grid->getAccessor();
 
-	tools::Dense<T, tools::LayoutXYZ> dense_grid(bbox);
-	tools::copyToDense(*grid_tmp, dense_grid);
-	memcpy(*data, dense_grid.data(), sizeof(T) * res[0] * res[1] * res[2]);
-#else
-	typename GridType::Accessor acc = grid_tmp->getAccessor();
 	math::Coord xyz;
 	int &x = xyz[0], &y = xyz[1], &z = xyz[2];
 
@@ -108,10 +102,9 @@ OpenVDBPrimitive *OpenVDB_import_grid(OpenVDBReader *reader,
 			}
 		}
 	}
-#endif
 
 	OpenVDBPrimitive *vdb_prim = new OpenVDBPrimitive();
-	vdb_prim->setGrid(grid_tmp);
+	vdb_prim->setGrid(grid);
 
 	return vdb_prim;
 }