[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52493] trunk/blender/intern/cycles/kernel /shaders: Fix cycles OSL wrong reflection texture coordinate.
Brecht Van Lommel
brechtvanlommel at pandora.be
Thu Nov 22 23:24:37 CET 2012
Revision: 52493
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52493
Author: blendix
Date: 2012-11-22 22:24:34 +0000 (Thu, 22 Nov 2012)
Log Message:
-----------
Fix cycles OSL wrong reflection texture coordinate.
Modified Paths:
--------------
trunk/blender/intern/cycles/kernel/shaders/node_environment_texture.osl
trunk/blender/intern/cycles/kernel/shaders/node_texture_coordinate.osl
Modified: trunk/blender/intern/cycles/kernel/shaders/node_environment_texture.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_environment_texture.osl 2012-11-22 22:13:27 UTC (rev 52492)
+++ trunk/blender/intern/cycles/kernel/shaders/node_environment_texture.osl 2012-11-22 22:24:34 UTC (rev 52493)
@@ -19,14 +19,16 @@
#include "stdosl.h"
#include "node_color.h"
-vector environment_texture_direction_to_equirectangular(vector dir) {
+vector environment_texture_direction_to_equirectangular(vector dir)
+{
float u = -atan2(dir[1], dir[0])/(2.0*M_PI) + 0.5;
float v = atan2(dir[2], hypot(dir[0], dir[1]))/M_PI + 0.5;
return vector(u, v, 0.0);
}
-vector environment_texture_direction_to_mirrorball(vector dir) {
+vector environment_texture_direction_to_mirrorball(vector dir)
+{
dir[1] -= 1.0;
float div = 2.0*sqrt(max(-0.5*dir[1], 0.0));
Modified: trunk/blender/intern/cycles/kernel/shaders/node_texture_coordinate.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_texture_coordinate.osl 2012-11-22 22:13:27 UTC (rev 52492)
+++ trunk/blender/intern/cycles/kernel/shaders/node_texture_coordinate.osl 2012-11-22 22:24:34 UTC (rev 52493)
@@ -56,7 +56,7 @@
Camera = transform("camera", P);
Window = transform("NDC", P);
Normal = transform("world", "object", NormalIn);
- Reflection = reflect(I, NormalIn);
+ Reflection = -reflect(I, NormalIn);
}
if (bump_offset == "dx") {
More information about the Bf-blender-cvs
mailing list