[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57368] trunk/blender: Cycles / Wavelength to RGB node:
Thomas Dinges
blender at dingto.org
Mon Jun 10 23:55:41 CEST 2013
Revision: 57368
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57368
Author: dingto
Date: 2013-06-10 21:55:41 +0000 (Mon, 10 Jun 2013)
Log Message:
-----------
Cycles / Wavelength to RGB node:
* Added a node to convert wavelength (in nanometers, from 380nm to 780nm) to RGB values. This can be useful to match real world colors easier.
* Code cleanup:
** Moved color functions (xyz and hsv) into dedicated utility files.
** Remove svm_lerp(), use interp() instead.
Documentation:
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/More#Wavelength
Example render:
http://www.pasteall.org/pic/show.php?id=53202
This is part of my GSoC 2013. (revisions 57322, 57326, 57335 and 57367 from soc-2013-dingto).
Modified Paths:
--------------
trunk/blender/intern/cycles/blender/blender_shader.cpp
trunk/blender/intern/cycles/kernel/CMakeLists.txt
trunk/blender/intern/cycles/kernel/shaders/CMakeLists.txt
trunk/blender/intern/cycles/kernel/shaders/node_color.h
trunk/blender/intern/cycles/kernel/shaders/node_sky_texture.osl
trunk/blender/intern/cycles/kernel/svm/svm.h
trunk/blender/intern/cycles/kernel/svm/svm_hsv.h
trunk/blender/intern/cycles/kernel/svm/svm_mix.h
trunk/blender/intern/cycles/kernel/svm/svm_sky.h
trunk/blender/intern/cycles/kernel/svm/svm_types.h
trunk/blender/intern/cycles/render/nodes.cpp
trunk/blender/intern/cycles/render/nodes.h
trunk/blender/intern/cycles/util/util_color.h
trunk/blender/release/scripts/startup/nodeitems_builtins.py
trunk/blender/source/blender/blenkernel/BKE_node.h
trunk/blender/source/blender/blenkernel/intern/node.c
trunk/blender/source/blender/nodes/CMakeLists.txt
trunk/blender/source/blender/nodes/NOD_shader.h
trunk/blender/source/blender/nodes/NOD_static_types.h
Added Paths:
-----------
trunk/blender/intern/cycles/kernel/shaders/node_wavelength.osl
trunk/blender/intern/cycles/kernel/svm/svm_wavelength.h
trunk/blender/source/blender/nodes/shader/nodes/node_shader_wavelength.c
Modified: trunk/blender/intern/cycles/blender/blender_shader.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_shader.cpp 2013-06-10 21:35:32 UTC (rev 57367)
+++ trunk/blender/intern/cycles/blender/blender_shader.cpp 2013-06-10 21:55:41 UTC (rev 57368)
@@ -397,6 +397,9 @@
wire->use_pixel_size = b_wireframe_node.use_pixel_size();
node = wire;
}
+ else if (b_node.is_a(&RNA_ShaderNodeWavelength)) {
+ node = new WavelengthNode();
+ }
else if (b_node.is_a(&RNA_ShaderNodeLightPath)) {
node = new LightPathNode();
}
Modified: trunk/blender/intern/cycles/kernel/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/kernel/CMakeLists.txt 2013-06-10 21:35:32 UTC (rev 57367)
+++ trunk/blender/intern/cycles/kernel/CMakeLists.txt 2013-06-10 21:55:41 UTC (rev 57368)
@@ -80,6 +80,7 @@
svm/svm_displace.h
svm/svm_fresnel.h
svm/svm_wireframe.h
+ svm/svm_wavelength.h
svm/svm_gamma.h
svm/svm_brightness.h
svm/svm_geometry.h
Modified: trunk/blender/intern/cycles/kernel/shaders/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/CMakeLists.txt 2013-06-10 21:35:32 UTC (rev 57367)
+++ trunk/blender/intern/cycles/kernel/shaders/CMakeLists.txt 2013-06-10 21:55:41 UTC (rev 57368)
@@ -67,6 +67,7 @@
node_velvet_bsdf.osl
node_voronoi_texture.osl
node_ward_bsdf.osl
+ node_wavelength.osl
node_wave_texture.osl
node_wireframe.osl
)
Modified: trunk/blender/intern/cycles/kernel/shaders/node_color.h
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_color.h 2013-06-10 21:35:32 UTC (rev 57367)
+++ trunk/blender/intern/cycles/kernel/shaders/node_color.h 2013-06-10 21:55:41 UTC (rev 57368)
@@ -58,6 +58,26 @@
/* Color Operations */
+color xyY_to_xyz(float x, float y, float Y)
+{
+ float X, Z;
+
+ if (y != 0.0) X = (x / y) * Y;
+ else X = 0.0;
+
+ if (y != 0.0 && Y != 0.0) Z = ((1.0 - x - y) / y) * Y;
+ else Z = 0.0;
+
+ return color(X, Y, Z);
+}
+
+color xyz_to_rgb(float x, float y, float z)
+{
+ return color( 3.240479 * x + -1.537150 * y + -0.498535 * z,
+ -0.969256 * x + 1.875991 * y + 0.041556 * z,
+ 0.055648 * x + -0.204043 * y + 1.057311 * z);
+}
+
color rgb_to_hsv(color rgb)
{
float cmax, cmin, h, s, v, cdelta;
Modified: trunk/blender/intern/cycles/kernel/shaders/node_sky_texture.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_sky_texture.osl 2013-06-10 21:35:32 UTC (rev 57367)
+++ trunk/blender/intern/cycles/kernel/shaders/node_sky_texture.osl 2013-06-10 21:55:41 UTC (rev 57368)
@@ -17,6 +17,7 @@
*/
#include "stdosl.h"
+#include "node_color.h"
struct KernelSunSky {
/* sun direction in spherical and cartesian */
@@ -28,26 +29,6 @@
float perez_Y[5], perez_x[5], perez_y[5];
};
-color xyY_to_xyz(float x, float y, float Y)
-{
- float X, Z;
-
- if (y != 0.0) X = (x / y) * Y;
- else X = 0.0;
-
- if (y != 0.0 && Y != 0.0) Z = ((1.0 - x - y) / y) * Y;
- else Z = 0.0;
-
- return color(X, Y, Z);
-}
-
-color xyz_to_rgb(float x, float y, float z)
-{
- return color( 3.240479 * x + -1.537150 * y + -0.498535 * z,
- -0.969256 * x + 1.875991 * y + 0.041556 * z,
- 0.055648 * x + -0.204043 * y + 1.057311 * z);
-}
-
float sky_angle_between(float thetav, float phiv, float theta, float phi)
{
float cospsi = sin(thetav) * sin(theta) * cos(phi - phiv) + cos(thetav) * cos(theta);
Copied: trunk/blender/intern/cycles/kernel/shaders/node_wavelength.osl (from rev 57322, branches/soc-2013-dingto/intern/cycles/kernel/shaders/node_wavelength.osl)
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_wavelength.osl (rev 0)
+++ trunk/blender/intern/cycles/kernel/shaders/node_wavelength.osl 2013-06-10 21:55:41 UTC (rev 57368)
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2013, Blender Foundation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "stdosl.h"
+
+shader node_wavelength(
+ float Wavelength = 500.0,
+ output color Color = 0.0)
+{
+ Color = wavelength_color(Wavelength);
+}
+
Modified: trunk/blender/intern/cycles/kernel/svm/svm.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/svm.h 2013-06-10 21:35:32 UTC (rev 57367)
+++ trunk/blender/intern/cycles/kernel/svm/svm.h 2013-06-10 21:55:41 UTC (rev 57368)
@@ -152,6 +152,7 @@
#include "svm_displace.h"
#include "svm_fresnel.h"
#include "svm_wireframe.h"
+#include "svm_wavelength.h"
#include "svm_camera.h"
#include "svm_geometry.h"
#include "svm_hsv.h"
@@ -362,6 +363,9 @@
svm_node_wireframe(kg, sd, stack, node.y, node.z, node.w);
break;
#ifdef __EXTRA_NODES__
+ case NODE_WAVELENGTH:
+ svm_node_wavelength(sd, stack, node.y, node.z);
+ break;
case NODE_SET_DISPLACEMENT:
svm_node_set_displacement(sd, stack, node.y);
break;
Modified: trunk/blender/intern/cycles/kernel/svm/svm_hsv.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/svm_hsv.h 2013-06-10 21:35:32 UTC (rev 57367)
+++ trunk/blender/intern/cycles/kernel/svm/svm_hsv.h 2013-06-10 21:55:41 UTC (rev 57368)
@@ -21,80 +21,6 @@
CCL_NAMESPACE_BEGIN
-__device float3 rgb_to_hsv(float3 rgb)
-{
- float cmax, cmin, h, s, v, cdelta;
- float3 c;
-
- cmax = fmaxf(rgb.x, fmaxf(rgb.y, rgb.z));
- cmin = min(rgb.x, min(rgb.y, rgb.z));
- cdelta = cmax - cmin;
-
- v = cmax;
-
- if(cmax != 0.0f) {
- s = cdelta/cmax;
- }
- else {
- s = 0.0f;
- h = 0.0f;
- }
-
- if(s == 0.0f) {
- h = 0.0f;
- }
- else {
- float3 cmax3 = make_float3(cmax, cmax, cmax);
- c = (cmax3 - rgb)/cdelta;
-
- if(rgb.x == cmax) h = c.z - c.y;
- else if(rgb.y == cmax) h = 2.0f + c.x - c.z;
- else h = 4.0f + c.y - c.x;
-
- h /= 6.0f;
-
- if(h < 0.0f)
- h += 1.0f;
- }
-
- return make_float3(h, s, v);
-}
-
-__device float3 hsv_to_rgb(float3 hsv)
-{
- float i, f, p, q, t, h, s, v;
- float3 rgb;
-
- h = hsv.x;
- s = hsv.y;
- v = hsv.z;
-
- if(s == 0.0f) {
- rgb = make_float3(v, v, v);
- }
- else {
- if(h == 1.0f)
- h = 0.0f;
-
- h *= 6.0f;
- i = floorf(h);
- f = h - i;
- rgb = make_float3(f, f, f);
- p = v*(1.0f-s);
- q = v*(1.0f-(s*f));
- t = v*(1.0f-(s*(1.0f-f)));
-
- if(i == 0.0f) rgb = make_float3(v, t, p);
- else if(i == 1.0f) rgb = make_float3(q, v, p);
- else if(i == 2.0f) rgb = make_float3(p, v, t);
- else if(i == 3.0f) rgb = make_float3(p, q, v);
- else if(i == 4.0f) rgb = make_float3(t, p, v);
- else rgb = make_float3(v, p, q);
- }
-
- return rgb;
-}
-
__device void svm_node_hsv(KernelGlobals *kg, ShaderData *sd, float *stack, uint in_color_offset, uint fac_offset, uint out_color_offset, int *offset)
{
/* read extra data */
Modified: trunk/blender/intern/cycles/kernel/svm/svm_mix.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/svm_mix.h 2013-06-10 21:35:32 UTC (rev 57367)
+++ trunk/blender/intern/cycles/kernel/svm/svm_mix.h 2013-06-10 21:55:41 UTC (rev 57368)
@@ -16,28 +16,21 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include "svm_hsv.h"
-
CCL_NAMESPACE_BEGIN
-__device float3 svm_lerp(const float3 a, const float3 b, float t)
-{
- return (a * (1.0f - t) + b * t);
-}
-
__device float3 svm_mix_blend(float t, float3 col1, float3 col2)
{
- return svm_lerp(col1, col2, t);
+ return interp(col1, col2, t);
}
__device float3 svm_mix_add(float t, float3 col1, float3 col2)
{
- return svm_lerp(col1, col1 + col2, t);
+ return interp(col1, col1 + col2, t);
}
__device float3 svm_mix_mul(float t, float3 col1, float3 col2)
{
- return svm_lerp(col1, col1 * col2, t);
+ return interp(col1, col1 * col2, t);
}
__device float3 svm_mix_screen(float t, float3 col1, float3 col2)
@@ -75,7 +68,7 @@
__device float3 svm_mix_sub(float t, float3 col1, float3 col2)
{
- return svm_lerp(col1, col1 - col2, t);
+ return interp(col1, col1 - col2, t);
}
__device float3 svm_mix_div(float t, float3 col1, float3 col2)
@@ -93,7 +86,7 @@
__device float3 svm_mix_diff(float t, float3 col1, float3 col2)
{
- return svm_lerp(col1, fabs(col1 - col2), t);
+ return interp(col1, fabs(col1 - col2), t);
}
__device float3 svm_mix_dark(float t, float3 col1, float3 col2)
@@ -191,7 +184,7 @@
hsv.x = hsv2.x;
float3 tmp = hsv_to_rgb(hsv);
- outcol = svm_lerp(outcol, tmp, t);
+ outcol = interp(outcol, tmp, t);
}
return outcol;
@@ -238,7 +231,7 @@
hsv.y = hsv2.y;
float3 tmp = hsv_to_rgb(hsv);
- outcol = svm_lerp(outcol, tmp, t);
+ outcol = interp(outcol, tmp, t);
}
return outcol;
Modified: trunk/blender/intern/cycles/kernel/svm/svm_sky.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/svm_sky.h 2013-06-10 21:35:32 UTC (rev 57367)
+++ trunk/blender/intern/cycles/kernel/svm/svm_sky.h 2013-06-10 21:55:41 UTC (rev 57368)
@@ -18,26 +18,6 @@
CCL_NAMESPACE_BEGIN
-__device float3 xyY_to_xyz(float x, float y, float Y)
-{
- float X, Z;
-
- if(y != 0.0f) X = (x / y) * Y;
- else X = 0.0f;
-
- if(y != 0.0f && Y != 0.0f) Z = (1.0f - x - y) / y * Y;
- else Z = 0.0f;
-
- return make_float3(X, Y, Z);
-}
-
-__device float3 xyz_to_rgb(float x, float y, float z)
-{
- return make_float3(3.240479f * x + -1.537150f * y + -0.498535f * z,
- -0.969256f * x + 1.875991f * y + 0.041556f * z,
- 0.055648f * x + -0.204043f * y + 1.057311f * z);
-}
-
/*
* "A Practical Analytic Model for Daylight"
* A. J. Preetham, Peter Shirley, Brian Smits
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list