[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42742] trunk/blender/source/blender: patch [#28094] New equirectangular world texture mapping option

[Campbell Barton]

Revision: 42742
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42742
Author:   campbellbarton
Date:     2011-12-19 23:52:17 +0000 (Mon, 19 Dec 2011)
Log Message:
-----------
patch [#28094] New equirectangular world texture mapping option

Modified Paths:
--------------
    trunk/blender/source/blender/makesdna/DNA_world_types.h
    trunk/blender/source/blender/makesrna/intern/rna_world.c
    trunk/blender/source/blender/render/intern/source/render_texture.c

Modified: trunk/blender/source/blender/makesdna/DNA_world_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_world_types.h	2011-12-19 22:55:04 UTC (rev 42741)
+++ trunk/blender/source/blender/makesdna/DNA_world_types.h	2011-12-19 23:52:17 UTC (rev 42742)
@@ -181,6 +181,7 @@
 #define TEXCO_ANGMAP	64
 #define TEXCO_H_SPHEREMAP	256
 #define TEXCO_H_TUBEMAP	1024
+#define TEXCO_EQUIRECTMAP 2048
 
 /* mapto */
 #define WOMAP_BLEND		1

Modified: trunk/blender/source/blender/makesrna/intern/rna_world.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_world.c	2011-12-19 22:55:04 UTC (rev 42741)
+++ trunk/blender/source/blender/makesrna/intern/rna_world.c	2011-12-19 23:52:17 UTC (rev 42742)
@@ -143,6 +143,7 @@
 		{TEXCO_GLOB, "GLOBAL", 0, "Global", "Use global coordinates for the texture coordinates (interior mist)"},
 		{TEXCO_ANGMAP, "ANGMAP", 0, "AngMap", "Use 360 degree angular coordinates, e.g. for spherical light probes"},
 		{TEXCO_H_SPHEREMAP, "SPHERE", 0, "Sphere", "For 360 degree panorama sky, spherical mapped, only top half"},
+		{TEXCO_EQUIRECTMAP, "EQUIRECT", 0, "Equirectangular", "For 360 degree panorama sky, equirectangular mapping"},
 		{TEXCO_H_TUBEMAP, "TUBE", 0, "Tube", "For 360 degree panorama sky, cylindrical mapped, only top half"},
 		{TEXCO_OBJECT, "OBJECT", 0, "Object", "Use linked object's coordinates for texture coordinates"},
 		{0, NULL, 0, NULL, NULL}};

Modified: trunk/blender/source/blender/render/intern/source/render_texture.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/render_texture.c	2011-12-19 22:55:04 UTC (rev 42741)
+++ trunk/blender/source/blender/render/intern/source/render_texture.c	2011-12-19 23:52:17 UTC (rev 42742)
@@ -3083,6 +3083,12 @@
 					continue;
 				}
 				break;
+			case TEXCO_EQUIRECTMAP:
+				tempvec[0]= atan2f(lo[0], lo[2]) / (float)M_PI;
+				tempvec[1]= 1.0f - 2.0f*saacos(lo[1]) / (float)M_PI;
+				tempvec[2]= 0.0f;
+				co= tempvec;
+				break;
 			case TEXCO_OBJECT:
 				if(mtex->object) {
 					copy_v3_v3(tempvec, lo);