Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2011-12-03 00:36:13 +0400
committerDalai Felinto <dfelinto@gmail.com>2011-12-03 00:36:13 +0400
commit78495ddf326af8b2404b9fd652f2ab4f7836f2c2 (patch)
tree6f33d7828918b2f8b40d35f5767adbf55cd6ec4b /intern/cycles/kernel/svm
parent1768a96774093a4b0d4674c683b2fb39564f0ad5 (diff)
CameraData Input Cycles Node
---------------------------- reviewed and approved by Brecht Important note: the camera Z is reverted compared to Blender render. Now it goes from zero (camera) to positive (in front of the camera)
Diffstat (limited to 'intern/cycles/kernel/svm')
-rw-r--r--intern/cycles/kernel/svm/svm.h4
-rw-r--r--intern/cycles/kernel/svm/svm_camera.h43
-rw-r--r--intern/cycles/kernel/svm/svm_types.h3
3 files changed, 49 insertions, 1 deletions
diff --git a/intern/cycles/kernel/svm/svm.h b/intern/cycles/kernel/svm/svm.h
index 004875b0de5..443715600ca 100644
--- a/intern/cycles/kernel/svm/svm.h
+++ b/intern/cycles/kernel/svm/svm.h
@@ -126,6 +126,7 @@ CCL_NAMESPACE_END
#include "svm_convert.h"
#include "svm_displace.h"
#include "svm_fresnel.h"
+#include "svm_camera.h"
#include "svm_geometry.h"
#include "svm_hsv.h"
#include "svm_image.h"
@@ -232,6 +233,9 @@ __device_noinline void svm_eval_nodes(KernelGlobals *kg, ShaderData *sd, ShaderT
svm_node_tex_magic(kg, sd, stack, node, &offset);
break;
#endif
+ case NODE_CAMERA:
+ svm_node_camera(kg, sd, stack, node.y, node.z, node.w);
+ break;
case NODE_GEOMETRY:
svm_node_geometry(sd, stack, node.y, node.z);
break;
diff --git a/intern/cycles/kernel/svm/svm_camera.h b/intern/cycles/kernel/svm/svm_camera.h
new file mode 100644
index 00000000000..cf161ddcd8c
--- /dev/null
+++ b/intern/cycles/kernel/svm/svm_camera.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2011, 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.
+ */
+
+CCL_NAMESPACE_BEGIN
+
+__device void svm_node_camera(KernelGlobals *kg, ShaderData *sd, float *stack, uint out_vector, uint out_zdepth, uint out_distance)
+{
+ float distance;
+ float zdepth;
+ float3 vector;
+
+ Transform tfm = kernel_data.cam.worldtocamera;
+ vector = transform(&tfm, sd->P);
+ zdepth = vector.z;
+ distance = len(vector);
+
+ if (stack_valid(out_vector))
+ stack_store_float3(stack, out_vector, normalize(vector));
+
+ if (stack_valid(out_zdepth))
+ stack_store_float(stack, out_zdepth, zdepth);
+
+ if (stack_valid(out_distance))
+ stack_store_float(stack, out_distance, distance);
+}
+
+CCL_NAMESPACE_END
+
diff --git a/intern/cycles/kernel/svm/svm_types.h b/intern/cycles/kernel/svm/svm_types.h
index 53bba644e41..fcd345b9359 100644
--- a/intern/cycles/kernel/svm/svm_types.h
+++ b/intern/cycles/kernel/svm/svm_types.h
@@ -82,7 +82,8 @@ typedef enum NodeType {
NODE_CLOSURE_VOLUME = 4900,
NODE_SEPARATE_RGB = 5000,
NODE_COMBINE_RGB = 5100,
- NODE_HSV = 5200
+ NODE_HSV = 5200,
+ NODE_CAMERA = 5300
} NodeType;
typedef enum NodeAttributeType {