[Bf-blender-cvs] [ddd36a2] openvdb: Cleanup.
Kévin Dietrich
noreply at git.blender.org
Fri Jun 5 14:07:07 CEST 2015
Commit: ddd36a24a97349cedc5ee93d3f3e310a180b9ed5
Author: Kévin Dietrich
Date: Mon May 18 22:17:00 2015 +0200
Branches: openvdb
https://developer.blender.org/rBddd36a24a97349cedc5ee93d3f3e310a180b9ed5
Cleanup.
===================================================================
M intern/cycles/render/openvdb.cpp
M intern/cycles/render/openvdb.h
===================================================================
diff --git a/intern/cycles/render/openvdb.cpp b/intern/cycles/render/openvdb.cpp
index d2972f6..5281d78 100644
--- a/intern/cycles/render/openvdb.cpp
+++ b/intern/cycles/render/openvdb.cpp
@@ -271,44 +271,17 @@ OpenVDBManager::~OpenVDBManager()
{
}
-int OpenVDBManager::find_existing_slot(const string &filename, const string &name, int sampling, int grid_type)
+int OpenVDBManager::add_volume(const string &/*filename*/, const string &/*name*/, int /*sampling*/, int /*grid_type*/)
{
- (void)filename;
- (void)name;
- (void)sampling;
-
return -1;
}
-int OpenVDBManager::add_volume(const string &filename, const string &name, int sampling, int grid_type)
+void OpenVDBManager::device_update(Device */*device*/, DeviceScene */*dscene*/, Scene */*scene*/, Progress &/*progress*/)
{
- (void)filename;
- (void)name;
- (void)sampling;
- (void)grid_type;
-
- return -1;
}
-void OpenVDBManager::device_update(Device *device, DeviceScene *dscene, Scene *scene, Progress &progress)
-{
- (void)device;
- (void)dscene;
- (void)scene;
- (void)progress;
-}
-
-void OpenVDBManager::device_free(Device *device, DeviceScene *dscene)
-{
- (void)device;
- (void)dscene;
-}
-
-void OpenVDBManager::delete_sampler(int grid_type, int sampling, size_t slot)
+void OpenVDBManager::device_free(Device */*device*/, DeviceScene */*dscene*/)
{
- (void)grid_type;
- (void)sampling;
- (void)slot;
}
#endif
diff --git a/intern/cycles/render/openvdb.h b/intern/cycles/render/openvdb.h
index 946fc46..8494ba1 100644
--- a/intern/cycles/render/openvdb.h
+++ b/intern/cycles/render/openvdb.h
@@ -36,18 +36,24 @@ class OpenVDBManager {
int slot;
};
+#ifdef WITH_OPENVDB
+ vector<GridDescription> current_grids;
+ vector<openvdb::FloatGrid::Ptr> scalar_grids;
+ vector<openvdb::Vec3SGrid::Ptr> vector_grids;
+
size_t add_scalar_grid(openvdb::FloatGrid::Ptr grid, int sampling);
size_t add_vector_grid(openvdb::Vec3SGrid::Ptr grid, int sampling);
+ void delete_sampler(int grid_type, int sampling, size_t slot);
void add_grid_description(const string &filename, const string &name, int sampling, int slot);
+ int find_existing_slot(const string &filename, const string &name, int sampling, int grid_type);
+#endif
public:
OpenVDBManager();
~OpenVDBManager();
int add_volume(const string &filename, const string &name, int sampling, int grid_type);
- int find_existing_slot(const string &filename, const string &name, int sampling, int grid_type);
- void delete_sampler(int grid_type, int sampling, size_t slot);
void device_update(Device *device, DeviceScene *dscene, Scene *scene, Progress& progress);
void device_free(Device *device, DeviceScene *dscene);
@@ -55,10 +61,6 @@ public:
bool need_update;
#ifdef WITH_OPENVDB
- vector<GridDescription> current_grids;
- vector<openvdb::FloatGrid::Ptr> scalar_grids;
- vector<openvdb::Vec3SGrid::Ptr> vector_grids;
-
vector<vdb_fsampler_p*> float_samplers_p;
vector<vdb_fsampler_b*> float_samplers_b;
vector<vdb_vsampler_p*> vec3s_samplers_p;
More information about the Bf-blender-cvs
mailing list