From bed5b7e568a6dfbde9e4b3fa4d7ef15929fb0ce6 Mon Sep 17 00:00:00 2001
From: Massimiliano Corsini maxcorsini <massimiliano.corsini@isti.cnr.it>
Date: Mon, 10 Dec 2007 11:45:40 +0000
Subject: [PATCH] *** empty log message ***

---
 src/meshlab/shadersrm/cartoon.rfx | 63 +++++++++++++++----------------
 1 file changed, 31 insertions(+), 32 deletions(-)

diff --git a/src/meshlab/shadersrm/cartoon.rfx b/src/meshlab/shadersrm/cartoon.rfx
index af3327105..495cb0faf 100644
--- a/src/meshlab/shadersrm/cartoon.rfx
+++ b/src/meshlab/shadersrm/cartoon.rfx
@@ -897,13 +897,13 @@
    <RmRegistryBranch NAME="RM_LOCAL" API="" XML_VERSION="RenderMonkey 1.71">
     <RmRegistryBranch NAME="WORKSPACE" API="" XML_VERSION="RenderMonkey 1.71">
      <RmStringVariable NAME="LAST_SAVE" API="" ARTIST_EDITABLE="FALSE" VARIABLE_SEMANTIC=""><RmTextDataBlock TYPE="TEXT"><![CDATA[
-6/12/2007 12:22:55]]></RmTextDataBlock></RmStringVariable>
+10/12/2007 12:30:41]]></RmTextDataBlock></RmStringVariable>
      <RmStringVariable NAME="VERSION" API="" ARTIST_EDITABLE="FALSE" VARIABLE_SEMANTIC=""><RmTextDataBlock TYPE="TEXT"><![CDATA[
 RenderMonkey Version 1.71 (build 59)]]></RmTextDataBlock></RmStringVariable>
      <RmStringVariable NAME="XML_VERSION" API="" ARTIST_EDITABLE="FALSE" VARIABLE_SEMANTIC=""><RmTextDataBlock TYPE="TEXT"><![CDATA[
 RenderMonkey 1.71]]></RmTextDataBlock></RmStringVariable>
      <RmStringVariable NAME="BASE_WORKSPACE_PATH" API="" ARTIST_EDITABLE="FALSE" VARIABLE_SEMANTIC=""><RmTextDataBlock TYPE="TEXT"><![CDATA[
-C:\Documents and Settings\corsini\Desktop\]]></RmTextDataBlock></RmStringVariable>
+C:\vclab\projects\meshlab\src\meshlab\shadersrm\]]></RmTextDataBlock></RmStringVariable>
     </RmRegistryBranch>
     <RmRegistryBranch NAME="RM_PLUGIN" API="" XML_VERSION="RenderMonkey 1.71"><RmTextDataBlock TYPE="TEXT"><![CDATA[
 <DockingPaneLayouts><Application_Layout><Pane-1><Type>0</Type><DockingCX>250</DockingCX><DockingCY>250</DockingCY><Title>Artist Editor</Title><ID>1001</ID><IconID>-1</IconID><Options>0</Options><DockingHolder>7</DockingHolder><FloatingHolder>0</FloatingHolder><LastHolder>7</LastHolder></Pane-1><Pane-2><Type>2</Type><DockingCX>0</DockingCX><DockingCY>0</DockingCY><Horiz>0</Horiz><Pane-1>3</Pane-1><Pane-2>8</Pane-2><Panes>2</Panes></Pane-2><Pane-3><Type>2</Type><DockingCX>0</DockingCX><DockingCY>628</DockingCY><Horiz>1</Horiz><Pane-1>4</Pane-1><Pane-2>6</Pane-2><Pane-3>7</Pane-3><Panes>3</Panes></Pane-3><Pane-4><Type>1</Type><DockingCX>250</DockingCX><DockingCY>250</DockingCY><Selected>5</Selected><Panes>1</Panes><Pane-1>5</Pane-1></Pane-4><Pane-5><Type>0</Type><DockingCX>250</DockingCX><DockingCY>250</DockingCY><Title>Workspace</Title><ID>1000</ID><IconID>-1</IconID><Options>0</Options><DockingHolder>4</DockingHolder><FloatingHolder>0</FloatingHolder><LastHolder>4</LastHolder></Pane-5><Pane-6><Type>4</Type><DockingCX>0</DockingCX><DockingCY>0</DockingCY></Pane-6><Pane-7><Type>1</Type><DockingCX>250</DockingCX><DockingCY>250</DockingCY><Selected>0</Selected><Panes>0</Panes></Pane-7><Pane-8><Type>1</Type><DockingCX>250</DockingCX><DockingCY>250</DockingCY><Selected>9</Selected><Panes>1</Panes><Pane-1>9</Pane-1></Pane-8><Pane-9><Type>0</Type><DockingCX>250</DockingCX><DockingCY>250</DockingCY><Title>Output</Title><ID>1002</ID><IconID>-1</IconID><Options>0</Options><DockingHolder>8</DockingHolder><FloatingHolder>0</FloatingHolder><LastHolder>8</LastHolder></Pane-9><Summary><TopContainer>2</TopContainer><Client>6</Client><Panes>9</Panes></Summary></Application_Layout></DockingPaneLayouts>
@@ -919,7 +919,7 @@ C:\Documents and Settings\corsini\Desktop\]]></RmTextDataBlock></RmStringVariabl
         <RmIntegerVariable NAME="Width" API="" ARTIST_EDITABLE="FALSE" VARIABLE_SEMANTIC="" VALUE="350" MIN="-10" MAX="10" CLAMP="FALSE"/>
         <RmIntegerVariable NAME="Height" API="" ARTIST_EDITABLE="FALSE" VARIABLE_SEMANTIC="" VALUE="350" MIN="-10" MAX="10" CLAMP="FALSE"/>
         <RmIntegerVariable NAME="ShowStatus" API="" ARTIST_EDITABLE="FALSE" VARIABLE_SEMANTIC="" VALUE="1" MIN="-10" MAX="10" CLAMP="FALSE"/>
-        <RmIntegerVariable NAME="Visible" API="" ARTIST_EDITABLE="FALSE" VARIABLE_SEMANTIC="" VALUE="1" MIN="-10" MAX="10" CLAMP="FALSE"/>
+        <RmIntegerVariable NAME="Visible" API="" ARTIST_EDITABLE="FALSE" VARIABLE_SEMANTIC="" VALUE="0" MIN="-10" MAX="10" CLAMP="FALSE"/>
         <RmIntegerVariable NAME="Minimized X" API="" ARTIST_EDITABLE="FALSE" VARIABLE_SEMANTIC="" VALUE="-1" MIN="-10" MAX="10" CLAMP="FALSE"/>
         <RmIntegerVariable NAME="Minimized Y" API="" ARTIST_EDITABLE="FALSE" VARIABLE_SEMANTIC="" VALUE="-1" MIN="-10" MAX="10" CLAMP="FALSE"/>
        </RmRegistryBranch>
@@ -946,6 +946,23 @@ C:\Documents and Settings\corsini\Desktop\]]></RmTextDataBlock></RmStringVariabl
      <RmRegistryBranch NAME="RmTextureGenerator" API="" XML_VERSION="RenderMonkey 1.71">
       <RmRegistryBranch NAME="EditNodeRepository" API="" XML_VERSION="RenderMonkey 1.71"/>
      </RmRegistryBranch>
+     <RmRegistryBranch NAME="RmShaderEditor" API="" XML_VERSION="RenderMonkey 1.71">
+      <RmRegistryBranch NAME="Effect Workspace.NPR Metallic Cartoon.Metallic Cartoon Shader" API="" XML_VERSION="RenderMonkey 1.71">
+       <RmRegistryBranch NAME="Disassembly" API="" XML_VERSION="RenderMonkey 1.71"/>
+       <RmStringVariable NAME="Editing Shader" API="" ARTIST_EDITABLE="FALSE" VARIABLE_SEMANTIC=""><RmTextDataBlock TYPE="TEXT"><![CDATA[
+Fragment Program]]></RmTextDataBlock></RmStringVariable>
+       <RmStringVariable NAME="Editing Pass" API="" ARTIST_EDITABLE="FALSE" VARIABLE_SEMANTIC=""><RmTextDataBlock TYPE="TEXT"><![CDATA[
+Single Pass]]></RmTextDataBlock></RmStringVariable>
+       <RmIntegerVariable NAME="Y" API="" ARTIST_EDITABLE="FALSE" VARIABLE_SEMANTIC="" VALUE="0" MIN="-10" MAX="10" CLAMP="FALSE"/>
+       <RmIntegerVariable NAME="Width" API="" ARTIST_EDITABLE="FALSE" VARIABLE_SEMANTIC="" VALUE="650" MIN="-10" MAX="10" CLAMP="FALSE"/>
+       <RmIntegerVariable NAME="Height" API="" ARTIST_EDITABLE="FALSE" VARIABLE_SEMANTIC="" VALUE="650" MIN="-10" MAX="10" CLAMP="FALSE"/>
+       <RmIntegerVariable NAME="ShowStatus" API="" ARTIST_EDITABLE="FALSE" VARIABLE_SEMANTIC="" VALUE="1" MIN="-10" MAX="10" CLAMP="FALSE"/>
+       <RmIntegerVariable NAME="Visible" API="" ARTIST_EDITABLE="FALSE" VARIABLE_SEMANTIC="" VALUE="1" MIN="-10" MAX="10" CLAMP="FALSE"/>
+       <RmIntegerVariable NAME="Minimized X" API="" ARTIST_EDITABLE="FALSE" VARIABLE_SEMANTIC="" VALUE="-1" MIN="-10" MAX="10" CLAMP="FALSE"/>
+       <RmIntegerVariable NAME="Minimized Y" API="" ARTIST_EDITABLE="FALSE" VARIABLE_SEMANTIC="" VALUE="-1" MIN="-10" MAX="10" CLAMP="FALSE"/>
+       <RmIntegerVariable NAME="X" API="" ARTIST_EDITABLE="FALSE" VARIABLE_SEMANTIC="" VALUE="0" MIN="-10" MAX="10" CLAMP="FALSE"/>
+      </RmRegistryBranch>
+     </RmRegistryBranch>
     </RmRegistryBranch>
    </RmRegistryBranch>
   </RmRegistryBranch>
@@ -961,35 +978,25 @@ $Revision$
      <RmModelReference NAME="Teapot" API=""/>
      <RmGLShader NAME="Vertex Program" API="OpenGL" PIXEL_SHADER="FALSE"><RmShaderCode TYPE="TEXT"><![CDATA[
 uniform vec4 view_position;
-uniform vec4 light0;
-uniform vec4 light1;
-uniform vec4 light2;
 
 varying vec3  vNormal;
-varying vec3  vLight1;
-varying vec3  vLight2;
-varying vec3  vLight3;
+varying vec3  vLight;
 varying vec3  vView;
 
 
 void main(void)
 {
-
-   
-
    // Output transformed vertex position: 
    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;   
 
-   vNormal = gl_Normal ;
+   vNormal = gl_Normal;
 
    // Compute the view vector: 
    vView = normalize( view_position.xyz - gl_Vertex.xyz );
 
-   // Compute vectors to three lights from the current vertex position: 
-   vLight1 = normalize(light0.xyz - gl_Vertex.xyz);   // Light 1
-   vLight2 = normalize(light1.xyz - gl_Vertex.xyz);   // Light 2
-   vLight3 = normalize(light2.xyz - gl_Vertex.xyz);   // Light 3
-   
+   // Compute vectors to the ights from the current vertex position
+   vLight = normalize(gl_LightSource[0].position.xyz - gl_Vertex.xyz);
+
 }]]></RmShaderCode></RmGLShader>
      <RmGLShader NAME="Fragment Program" API="OpenGL" PIXEL_SHADER="TRUE"><RmShaderCode TYPE="TEXT"><![CDATA[
 uniform sampler2D Outline;
@@ -997,23 +1004,18 @@ uniform vec4 Material;
 
 
 varying vec3  vNormal;
-varying vec3  vLight1;
-varying vec3  vLight2;
-varying vec3  vLight3;
+varying vec3  vLight;
 varying vec3  vView;
 
 void main(void)
 {
-  
    vec3 norm = normalize (vNormal);
   
    vec2 texCoord = vec2(1.0 - dot (norm, normalize(vView)), 0.5);
    vec3 outline = texture2D(Outline, texCoord).xyz;
 
-   float lighting = (dot (normalize (vLight1), norm) * 0.5 + 0.5) +
-                    (dot (normalize (vLight2), norm) * 0.5 + 0.5) +
-                    (dot (normalize (vLight3), norm) * 0.5 + 0.5);
-   //lighting = max(0.0, lighting);                    
+   float lighting = (dot (normalize (vLight), norm) * 0.5 + 0.5);
+   lighting = max(0.0, lighting);                    
 
    gl_FragColor = vec4(outline,1.0) * vec4(lighting) * Material; 
 }   
@@ -1032,16 +1034,13 @@ void main(void)
      <RmShaderConstant NAME="view_position" API="" REGISTER="-1"/>
     </RmGLPass>
    </RmOpenGLEffect>
-   <RmVectorVariable NAME="light0" API="" ARTIST_EDITABLE="FALSE" VARIABLE_SEMANTIC="" VALUE_0="-100.000000" VALUE_1="0.000000" VALUE_2="0.000000" VALUE_3="1.000000" MIN="-10.000000" MAX="10.000000" CLAMP="FALSE" NORMALIZE="FALSE"/>
-   <RmVectorVariable NAME="light1" API="" ARTIST_EDITABLE="FALSE" VARIABLE_SEMANTIC="" VALUE_0="100.000000" VALUE_1="-100.000000" VALUE_2="0.000000" VALUE_3="1.000000" MIN="-10.000000" MAX="10.000000" CLAMP="FALSE" NORMALIZE="FALSE"/>
-   <RmVectorVariable NAME="light2" API="" ARTIST_EDITABLE="FALSE" VARIABLE_SEMANTIC="" VALUE_0="0.000000" VALUE_1="0.000000" VALUE_2="100.000000" VALUE_3="1.000000" MIN="-10.000000" MAX="10.000000" CLAMP="FALSE" NORMALIZE="FALSE"/>
    <RmColorVariable NAME="Material" API="" ARTIST_EDITABLE="TRUE" VARIABLE_SEMANTIC="" VALUE_0="0.260816" VALUE_1="0.666667" VALUE_2="0.274381" VALUE_3="1.000000"/>
    <Rm2DTextureVariable NAME="Outline" API="" ARTIST_EDITABLE="TRUE" VARIABLE_SEMANTIC="" FILE_NAME="..\..\..\Program Files\AMD\RenderMonkey 1.71\Examples\Media\Textures\NPR Metallic Outline.png" ORIGIN="0"/>
   </RmEffectGroup>
   <RmMatrixVariable NAME="view_matrix" API="" ARTIST_EDITABLE="FALSE" VARIABLE_SEMANTIC="View" VALUE_0="0.788381" VALUE_1="0.300817" VALUE_2="0.536623" VALUE_3="0.000000" VALUE_4="-0.171521" VALUE_5="0.945186" VALUE_6="-0.277855" VALUE_7="-0.000141" VALUE_8="-0.590792" VALUE_9="0.127013" VALUE_10="0.796764" VALUE_11="199.999985" VALUE_12="0.000000" VALUE_13="0.000000" VALUE_14="0.000000" VALUE_15="1.000000"/>
   <RmMatrixVariable NAME="view_proj_matrix" API="" ARTIST_EDITABLE="FALSE" VARIABLE_SEMANTIC="ViewProjection" VALUE_0="2.132880" VALUE_1="0.664367" VALUE_2="0.448349" VALUE_3="0.000004" VALUE_4="-0.797761" VALUE_5="2.222742" VALUE_6="0.501422" VALUE_7="-0.000433" VALUE_8="-0.120728" VALUE_9="-0.259705" VALUE_10="0.959157" VALUE_11="199.198639" VALUE_12="-0.120607" VALUE_13="-0.259445" VALUE_14="0.958197" VALUE_15="199.999451"/>
-  <RmVectorVariable NAME="view_position" API="" ARTIST_EDITABLE="FALSE" VARIABLE_SEMANTIC="ViewPosition" VALUE_0="-80.481552" VALUE_1="78.257118" VALUE_2="165.525040" VALUE_3="1.000000" MIN="-10.000000" MAX="10.000000" CLAMP="FALSE" NORMALIZE="FALSE"/>
-  <Rm2DTextureVariable NAME="ToonShaderTexture" API="" ARTIST_EDITABLE="TRUE" VARIABLE_SEMANTIC="" FILE_NAME="..\..\..\Program Files\AMD\RenderMonkey 1.71\Examples\Media\Textures\Toon.bmp" ORIGIN="0"/>
+  <RmVectorVariable NAME="view_position" API="" ARTIST_EDITABLE="FALSE" VARIABLE_SEMANTIC="ViewPosition" VALUE_0="0.000000" VALUE_1="0.000000" VALUE_2="200.000000" VALUE_3="1.000000" MIN="-10.000000" MAX="10.000000" CLAMP="FALSE" NORMALIZE="FALSE"/>
+  <Rm2DTextureVariable NAME="ToonShaderTexture" API="" ARTIST_EDITABLE="TRUE" VARIABLE_SEMANTIC="" FILE_NAME="..\..\..\..\..\..\Program Files\AMD\RenderMonkey 1.71\Examples\Media\Textures\Toon.bmp" ORIGIN="0"/>
   <RmStreamMap NAME="PNT Stream Mapping" API="">
    <RmStream NAME="Binormal7" API="" STRIDE="32">
     <RmStreamChannel NAME="Position_0" API="" DATA_SIZE="12" DATA_TYPE="2" REGISTER="0" USAGE="0" USAGE_INDEX="0" ATTRIBUTE_NAME="rm_Vertex"/>
@@ -1049,6 +1048,6 @@ void main(void)
     <RmStreamChannel NAME="TexCoord_0" API="" DATA_SIZE="8" DATA_TYPE="1" REGISTER="2" USAGE="5" USAGE_INDEX="0" ATTRIBUTE_NAME="rm_TexCoord0"/>
    </RmStream>
   </RmStreamMap>
-  <RmModelData NAME="Teapot" API="" FILE_NAME="..\..\..\Program Files\AMD\RenderMonkey 1.71\Examples\Media\models\Teapot.3ds" ORIENTATION="0"/>
+  <RmModelData NAME="Teapot" API="" FILE_NAME="..\..\..\..\..\..\Program Files\AMD\RenderMonkey 1.71\Examples\Media\Models\Teapot.3ds" ORIENTATION="0"/>
  </RmEffectWorkspace>
 </RENDER_MONKEY>