[Bf-blender-cvs] [365bf103d1f] master: Volumes: support lower resolution in viewport
Jacques Lucke
noreply at git.blender.org
Thu Oct 1 17:59:47 CEST 2020
Commit: 365bf103d1f66824180a592c11cb4181c5791719
Author: Jacques Lucke
Date: Thu Oct 1 17:58:43 2020 +0200
Branches: master
https://developer.blender.org/rB365bf103d1f66824180a592c11cb4181c5791719
Volumes: support lower resolution in viewport
The adds a new option to simplify volumes in the viewport.
The setting can be found in the Simplify panel in the render properties.
Volume objects use OpenVDB grids, which are sparse. For rendering,
we have to convert sparse grids to dense grids (for now). Those require
significantly more memory. Therefore, it's often a good idea to reduce
the resolution of volumes in the viewport.
Reviewers: brecht
Differential Revision: https://developer.blender.org/D9040
Ref T73201.
===================================================================
M intern/cycles/blender/addon/ui.py
M release/scripts/startup/bl_ui/properties_render.py
M source/blender/blenkernel/BKE_blender_version.h
M source/blender/blenkernel/BKE_volume_render.h
M source/blender/blenkernel/intern/volume_render.cc
M source/blender/blenloader/intern/versioning_290.c
M source/blender/draw/intern/draw_cache_impl_volume.c
M source/blender/makesdna/DNA_scene_defaults.h
M source/blender/makesdna/DNA_scene_types.h
M source/blender/makesrna/intern/rna_scene.c
===================================================================
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 167a359e62e..11c89a70ad9 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -2082,6 +2082,7 @@ class CYCLES_RENDER_PT_simplify_viewport(CyclesButtonsPanel, Panel):
col.prop(rd, "simplify_child_particles", text="Child Particles")
col.prop(cscene, "texture_limit", text="Texture Limit")
col.prop(cscene, "ao_bounces", text="AO Bounces")
+ col.prop(rd, "simplify_volumes", text="Volume Resolution")
class CYCLES_RENDER_PT_simplify_render(CyclesButtonsPanel, Panel):
diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py
index 7995cf21877..1c52001f32e 100644
--- a/release/scripts/startup/bl_ui/properties_render.py
+++ b/release/scripts/startup/bl_ui/properties_render.py
@@ -656,6 +656,9 @@ class RENDER_PT_simplify_viewport(RenderButtonsPanel, Panel):
col = flow.column()
col.prop(rd, "simplify_child_particles", text="Max Child Particles")
+ col = flow.column()
+ col.prop(rd, "simplify_volumes", text="Volume Resolution")
+
class RENDER_PT_simplify_render(RenderButtonsPanel, Panel):
bl_label = "Render"
diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h
index e43043b034f..bd10deb216b 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -39,7 +39,7 @@ extern "C" {
/* Blender file format version. */
#define BLENDER_FILE_VERSION BLENDER_VERSION
-#define BLENDER_FILE_SUBVERSION 6
+#define BLENDER_FILE_SUBVERSION 7
/* Minimum Blender version that supports reading file written with the current
* version. Older Blender versions will test this and show a warning if the file
diff --git a/source/blender/blenkernel/BKE_volume_render.h b/source/blender/blenkernel/BKE_volume_render.h
index 593f296135c..815374105f5 100644
--- a/source/blender/blenkernel/BKE_volume_render.h
+++ b/source/blender/blenkernel/BKE_volume_render.h
@@ -34,19 +34,19 @@ struct VolumeGrid;
/* Dense Voxels */
-bool BKE_volume_grid_dense_bounds(const struct Volume *volume,
+typedef struct DenseFloatVolumeGrid {
+ VolumeGridType type;
+ int resolution[3];
+ float texture_to_object[4][4];
+ int channels;
+ float *voxels;
+} DenseFloatVolumeGrid;
+
+bool BKE_volume_grid_dense_floats(const struct Volume *volume,
struct VolumeGrid *volume_grid,
- int64_t min[3],
- int64_t max[3]);
-void BKE_volume_grid_dense_transform_matrix(const struct VolumeGrid *volume_grid,
- const int64_t min[3],
- const int64_t max[3],
- float matrix[4][4]);
-void BKE_volume_grid_dense_voxels(const struct Volume *volume,
- struct VolumeGrid *volume_grid,
- const int64_t min[3],
- const int64_t max[3],
- float *voxels);
+ const float resolution_factor,
+ DenseFloatVolumeGrid *r_dense_grid);
+void BKE_volume_dense_float_grid_clear(DenseFloatVolumeGrid *dense_grid);
/* Wireframe */
diff --git a/source/blender/blenkernel/intern/volume_render.cc b/source/blender/blenkernel/intern/volume_render.cc
index b773452b6a8..abbff2f27cf 100644
--- a/source/blender/blenkernel/intern/volume_render.cc
+++ b/source/blender/blenkernel/intern/volume_render.cc
@@ -34,136 +34,181 @@
#ifdef WITH_OPENVDB
# include <openvdb/openvdb.h>
# include <openvdb/tools/Dense.h>
+# include <openvdb/tools/GridTransformer.h>
#endif
/* Dense Voxels */
-bool BKE_volume_grid_dense_bounds(const Volume *volume,
- VolumeGrid *volume_grid,
- int64_t min[3],
- int64_t max[3])
-{
#ifdef WITH_OPENVDB
- openvdb::GridBase::ConstPtr grid = BKE_volume_grid_openvdb_for_read(volume, volume_grid);
- openvdb::CoordBBox bbox = grid->evalActiveVoxelBoundingBox();
- if (!bbox.empty()) {
- /* OpenVDB bbox is inclusive, so add 1 to convert. */
- min[0] = bbox.min().x();
- min[1] = bbox.min().y();
- min[2] = bbox.min().z();
- max[0] = bbox.max().x() + 1;
- max[1] = bbox.max().y() + 1;
- max[2] = bbox.max().z() + 1;
- return true;
+/**
+ * Returns a grid of the same type as the input, but with more/less resolution. If
+ * resolution_factor is 1/2, the resolution on each axis is halved. The transform of the returned
+ * grid is adjusted to match the original grid. */
+template<typename GridType>
+static typename GridType::Ptr create_grid_with_changed_resolution(
+ const openvdb::GridBase &old_grid, const float resolution_factor)
+{
+ BLI_assert(resolution_factor > 0.0f);
+ BLI_assert(old_grid.isType<GridType>());
+
+ openvdb::Mat4R xform;
+ xform.setToScale(openvdb::Vec3d(resolution_factor));
+ openvdb::tools::GridTransformer transformer{xform};
+
+ typename GridType::Ptr new_grid = GridType::create();
+ transformer.transformGrid<openvdb::tools::BoxSampler>(static_cast<const GridType &>(old_grid),
+ *new_grid);
+ new_grid->transform() = old_grid.transform();
+ new_grid->transform().preScale(1.0f / resolution_factor);
+ return new_grid;
+}
+
+static openvdb::GridBase::Ptr create_grid_with_changed_resolution(
+ const VolumeGridType grid_type,
+ const openvdb::GridBase &old_grid,
+ const float resolution_factor)
+{
+ switch (grid_type) {
+ case VOLUME_GRID_BOOLEAN:
+ return create_grid_with_changed_resolution<openvdb::BoolGrid>(old_grid, resolution_factor);
+ case VOLUME_GRID_FLOAT:
+ return create_grid_with_changed_resolution<openvdb::FloatGrid>(old_grid, resolution_factor);
+ case VOLUME_GRID_DOUBLE:
+ return create_grid_with_changed_resolution<openvdb::DoubleGrid>(old_grid, resolution_factor);
+ case VOLUME_GRID_INT:
+ return create_grid_with_changed_resolution<openvdb::Int32Grid>(old_grid, resolution_factor);
+ case VOLUME_GRID_INT64:
+ return create_grid_with_changed_resolution<openvdb::Int64Grid>(old_grid, resolution_factor);
+ case VOLUME_GRID_MASK:
+ return create_grid_with_changed_resolution<openvdb::MaskGrid>(old_grid, resolution_factor);
+ case VOLUME_GRID_VECTOR_FLOAT:
+ return create_grid_with_changed_resolution<openvdb::Vec3fGrid>(old_grid, resolution_factor);
+ case VOLUME_GRID_VECTOR_DOUBLE:
+ return create_grid_with_changed_resolution<openvdb::Vec3dGrid>(old_grid, resolution_factor);
+ case VOLUME_GRID_VECTOR_INT:
+ return create_grid_with_changed_resolution<openvdb::Vec3IGrid>(old_grid, resolution_factor);
+ case VOLUME_GRID_STRING:
+ case VOLUME_GRID_POINTS:
+ case VOLUME_GRID_UNKNOWN:
+ /* Can't do this. */
+ break;
}
-#else
- UNUSED_VARS(volume, volume_grid);
-#endif
+ return {};
+}
- min[0] = 0;
- min[1] = 0;
- min[2] = 0;
- max[0] = 0;
- max[1] = 0;
- max[2] = 0;
- return false;
+template<typename GridType, typename VoxelType>
+static void extract_dense_voxels(const openvdb::GridBase &grid,
+ const openvdb::CoordBBox bbox,
+ VoxelType *r_voxels)
+{
+ BLI_assert(grid.isType<GridType>());
+ openvdb::tools::Dense<VoxelType, openvdb::tools::LayoutXYZ> dense(bbox, r_voxels);
+ openvdb::tools::copyToDense(static_cast<const GridType &>(grid), dense);
}
-/* Transform matrix from unit cube to object space, for 3D texture sampling. */
-void BKE_volume_grid_dense_transform_matrix(const VolumeGrid *volume_grid,
- const int64_t min[3],
- const int64_t max[3],
- float mat[4][4])
+static void extract_dense_float_voxels(const VolumeGridType grid_type,
+ const openvdb::GridBase &grid,
+ const openvdb::CoordBBox &bbox,
+ float *r_voxels)
{
-#ifdef WITH_OPENVDB
- float index_to_world[4][4];
- BKE_volume_grid_transform_matrix(volume_grid, index_to_world);
+ switch (grid_type) {
+ case VOLUME_GRID_BOOLEAN:
+ return extract_dense_voxels<openvdb::BoolGrid, float>(grid, bbox, r_voxels);
+ case VOLUME_GRID_FLOAT:
+ return extract_dense_voxels<openvdb::FloatGrid, float>(grid, bbox, r_voxels);
+ case VOLUME_GRID_DOUBLE:
+ return extract_dense_voxels<openvdb::DoubleGrid, float>(grid, bbox, r_voxels);
+ case VOLUME_GRID_INT:
+ return extract_dense_voxels<openvdb::Int32Grid, float>(grid, bbox, r_voxels);
+ case VOLUME_GRID_INT64:
+ return extract_dense_voxels<openvdb::Int64Grid, float>(grid, bbox, r_voxels);
+ case VOLUME_GRID_MASK:
+ return extract_dense_voxels<openvdb::MaskGrid, float>(grid, bbox, r_voxels);
+ case VOLUME_GRID_VECTOR_FLOAT:
+ return extract_dense_voxels<openvdb::Vec3fGrid, openvdb::Vec3f>(
+ grid, bbox, reinterpret_cast<openvdb::Vec3f *>(r_voxels));
+ case VOLUME_GRID_VECTOR_DOUBLE:
+ return extract_dense_voxels<openvdb::Vec3dGrid, openvdb::Vec3f>(
+ grid, bbox, reinterpret_cast<openvdb::Vec3f *>(r_voxels));
+ case VOLUME_GRID_VECTOR_INT:
+ return extract_dense_voxels<openvdb::Vec3IGrid, openvdb::Vec3f>(
+ grid, bbox, reinterpret_cast<openvdb::Vec3f *>(r_voxels));
+ case VOLUME_GRID_STRING:
+ case VOLUME_GRID_POINTS:
+ case VOLUME_GRID_UNKNOWN:
+ /* Zero channels to copy. */
+ break;
+ }
+ return;
+}
+
+static void create_texture_to_object_matrix(const openvdb::Mat4d &grid_transform,
+ const openvdb::CoordBBox &bbox,
+ float r_texture_to_object[4][4])
+{
+ float index_to_object[4][4];
+ memcpy(index_to_object, openvdb::Mat
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list