[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53422] trunk/blender: OSL Templates:

[Thomas Dinges]

Revision: 53422
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53422
Author:   dingto
Date:     2012-12-30 03:11:52 +0000 (Sun, 30 Dec 2012)
Log Message:
-----------
OSL Templates:
* Add 3 simple templates:
** empty_shader.osl: A basic shader declaration to start with
** wireframe.osl: Simple wireframe shader
** noise.osl: Simple noise shader, with 3 noise types. 

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_text/text_format_osl.c

Added Paths:
-----------
    trunk/blender/release/scripts/templates_osl/empty_shader.osl
    trunk/blender/release/scripts/templates_osl/noise.osl
    trunk/blender/release/scripts/templates_osl/wireframe.osl

Added: trunk/blender/release/scripts/templates_osl/empty_shader.osl
===================================================================
--- trunk/blender/release/scripts/templates_osl/empty_shader.osl	                        (rev 0)
+++ trunk/blender/release/scripts/templates_osl/empty_shader.osl	2012-12-30 03:11:52 UTC (rev 53422)
@@ -0,0 +1,6 @@
+#include "stdosl.h"
+
+shader name()
+{
+
+}
\ No newline at end of file

Added: trunk/blender/release/scripts/templates_osl/noise.osl
===================================================================
--- trunk/blender/release/scripts/templates_osl/noise.osl	                        (rev 0)
+++ trunk/blender/release/scripts/templates_osl/noise.osl	2012-12-30 03:11:52 UTC (rev 53422)
@@ -0,0 +1,18 @@
+#include <stdosl.h>
+
+shader noise(
+	float Time = 1.0,
+	point Point = P,
+	output float Cell = 0.0,
+	output color Perlin = 0.8,
+	output color UPerlin = 0.8)
+{   
+	/* Cell Noise */
+	Cell = noise("cell", Point);
+	
+    /* Perlin 4D Noise*/
+    Perlin = noise("perlin", Point, Time);
+   
+    /* UPerlin 4D Noise*/
+    UPerlin = noise("uperlin", Point, Time);
+}
\ No newline at end of file

Added: trunk/blender/release/scripts/templates_osl/wireframe.osl
===================================================================
--- trunk/blender/release/scripts/templates_osl/wireframe.osl	                        (rev 0)
+++ trunk/blender/release/scripts/templates_osl/wireframe.osl	2012-12-30 03:11:52 UTC (rev 53422)
@@ -0,0 +1,10 @@
+#include "stdosl.h"
+#include "oslutil.h"
+
+shader wireframe(
+    float Line_Width = 2.0,
+    int Raster = 1,
+    output float Wire = 0.0)
+{
+    Wire = wireframe("triangles", Line_Width, Raster);
+}
\ No newline at end of file

Modified: trunk/blender/source/blender/editors/space_text/text_format_osl.c
===================================================================
--- trunk/blender/source/blender/editors/space_text/text_format_osl.c	2012-12-30 02:51:29 UTC (rev 53421)
+++ trunk/blender/source/blender/editors/space_text/text_format_osl.c	2012-12-30 03:11:52 UTC (rev 53422)
@@ -144,7 +144,7 @@
 	if      (STR_LITERAL_STARTSWITH(string, "shader", 		len)) i = len;
 	else if (STR_LITERAL_STARTSWITH(string, "surface", 		len)) i = len;
 	else if (STR_LITERAL_STARTSWITH(string, "volume", 		len)) i = len;
-	else if (STR_LITERAL_STARTSWITH(string, "displacement", len)) i = len;
+	else if (STR_LITERAL_STARTSWITH(string, "displacement",	len)) i = len;
 	else                                                    i = 0;
 
 	/* If next source char is an identifier (eg. 'i' in "definate") no match */