[Bf-blender-cvs] [334430e] cycles_point_density: Cycles point density: Support for OSL backend

Sergey Sharybin noreply at git.blender.org
Mon Apr 6 20:35:54 CEST 2015


Commit: 334430e1c06fb6f3f51aa442fd100c053363c329
Author: Sergey Sharybin
Date:   Mon Apr 6 23:28:40 2015 +0500
Branches: cycles_point_density
https://developer.blender.org/rB334430e1c06fb6f3f51aa442fd100c053363c329

Cycles point density: Support for OSL backend

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

M	intern/cycles/kernel/shaders/CMakeLists.txt
A	intern/cycles/kernel/shaders/node_voxel_texture.osl
M	intern/cycles/render/nodes.cpp

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

diff --git a/intern/cycles/kernel/shaders/CMakeLists.txt b/intern/cycles/kernel/shaders/CMakeLists.txt
index 0b735ed..8193146 100644
--- a/intern/cycles/kernel/shaders/CMakeLists.txt
+++ b/intern/cycles/kernel/shaders/CMakeLists.txt
@@ -74,6 +74,7 @@ set(SRC_OSL
 	node_vector_transform.osl
 	node_velvet_bsdf.osl
 	node_voronoi_texture.osl
+	node_voxel_texture.osl
 	node_wavelength.osl
 	node_blackbody.osl
 	node_wave_texture.osl
diff --git a/intern/cycles/kernel/shaders/node_voxel_texture.osl b/intern/cycles/kernel/shaders/node_voxel_texture.osl
new file mode 100644
index 0000000..e45af62
--- /dev/null
+++ b/intern/cycles/kernel/shaders/node_voxel_texture.osl
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2011-2015 Blender Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "stdosl.h"
+
+shader node_voxel_texture(
+	string filename = "",
+	string interpolation = "linear",
+	int use_mapping = 0,
+	matrix mapping = matrix(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+	point Vector = P,
+	output float Density = 0,
+	output color Color = 0)
+{
+	point p = Vector;
+	if (use_mapping) {
+		p = transform(mapping, p);
+	}
+	else {
+		p = transform("object", Vector);
+		matrix tfm;
+		if (getattribute("geom:generated_transform", tfm))
+			p = transform(tfm, p);
+	}
+	if(p[0] < 0.0 || p[1] < 0.0 || p[2] < 0.0 ||
+	   p[0] > 1.0 || p[1] > 1.0 || p[2] > 1.0)
+	{
+		Density = 0;
+		Color = color(0, 0, 0);
+	}
+	else {
+		Color = (color)texture3d(filename, p, "wrap", "periodic", "interp", interpolation, "alpha", Density);
+	}
+}
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index 83d6a0d..ab462cb 100644
--- a/intern/cycles/render/nodes.cpp
+++ b/intern/cycles/render/nodes.cpp
@@ -1357,8 +1357,8 @@ void PointDensityTextureNode::compile(SVMCompiler& compiler)
 	ShaderOutput *density_out = output("Density");
 	ShaderOutput *color_out = output("Color");
 
-	bool use_density = !density_out->links.empty();
-	bool use_color = !color_out->links.empty();
+	const bool use_density = !density_out->links.empty();
+	const bool use_color = !color_out->links.empty();
 
 	image_manager = compiler.image_manager;
 
@@ -1404,9 +1404,49 @@ void PointDensityTextureNode::compile(SVMCompiler& compiler)
 	}
 }
 
-void PointDensityTextureNode::compile(OSLCompiler& /*compiler*/)
+void PointDensityTextureNode::compile(OSLCompiler& compiler)
 {
-	/* TODO(sergey): To be supported. */
+	ShaderInput *vector_in = input("Vector");
+	ShaderOutput *density_out = output("Density");
+	ShaderOutput *color_out = output("Color");
+
+	const bool use_density = !density_out->links.empty();
+	const bool use_color = !color_out->links.empty();
+
+	image_manager = compiler.image_manager;
+
+	if (use_density || use_color) {
+		if(slot == -1) {
+			bool is_float, is_linear;
+			slot = image_manager->add_image(filename, builtin_data,
+			                                false, 0,
+			                                is_float, is_linear,
+			                                interpolation,
+			                                true);
+		}
+
+		if(slot != -1) {
+			compiler.parameter("filename", string_printf("@%d", slot).c_str());
+		}
+		if(space == "World") {
+			compiler.parameter("mapping", transform_transpose(tfm));
+			compiler.parameter("use_mapping", 1);
+		}
+		switch (interpolation) {
+			case INTERPOLATION_CLOSEST:
+				compiler.parameter("interpolation", "closest");
+				break;
+			case INTERPOLATION_CUBIC:
+				compiler.parameter("interpolation", "cubic");
+				break;
+			case INTERPOLATION_LINEAR:
+			default:
+				compiler.parameter("interpolation", "linear");
+				break;
+		}
+
+		compiler.add(this, "node_voxel_texture");
+	}
 }
 
 /* Normal */




More information about the Bf-blender-cvs mailing list