From 9e0211312e50bbd5ac19a48dd6ef32b58063dbc2 Mon Sep 17 00:00:00 2001
From: Erik Hofman <erik@ehofman.com>
Date: Thu, 13 Apr 2023 08:25:07 +0200
Subject: [PATCH] Follow the new shader guide style

---
 ...canvas-color-ramp.frag => canvas_color_ramp.frag} |  5 +++--
 ...canvas-color-ramp.vert => canvas_color_ramp.vert} |  7 ++++---
 .../{canvas-pipeline.frag => canvas_pipeline.frag}   | 12 ++++++------
 .../{canvas-pipeline.vert => canvas_pipeline.vert}   |  7 ++++---
 4 files changed, 17 insertions(+), 14 deletions(-)
 rename gui/shaders/{canvas-color-ramp.frag => canvas_color_ramp.frag} (65%)
 rename gui/shaders/{canvas-color-ramp.vert => canvas_color_ramp.vert} (71%)
 rename gui/shaders/{canvas-pipeline.frag => canvas_pipeline.frag} (89%)
 rename gui/shaders/{canvas-pipeline.vert => canvas_pipeline.vert} (99%)

diff --git a/gui/shaders/canvas-color-ramp.frag b/gui/shaders/canvas_color_ramp.frag
similarity index 65%
rename from gui/shaders/canvas-color-ramp.frag
rename to gui/shaders/canvas_color_ramp.frag
index 803838d90..1b733ed98 100644
--- a/gui/shaders/canvas-color-ramp.frag
+++ b/gui/shaders/canvas_color_ramp.frag
@@ -1,9 +1,10 @@
 // -*-C++-*-
-#version 330
+#version 330 core
 
-in  vec4 interpolateColor;
 out vec4 fragColor;
 
+in vec4 interpolateColor;
+
 void main()
 {
     fragColor = interpolateColor;
diff --git a/gui/shaders/canvas-color-ramp.vert b/gui/shaders/canvas_color_ramp.vert
similarity index 71%
rename from gui/shaders/canvas-color-ramp.vert
rename to gui/shaders/canvas_color_ramp.vert
index 9b5e5b309..e28054afb 100644
--- a/gui/shaders/canvas-color-ramp.vert
+++ b/gui/shaders/canvas_color_ramp.vert
@@ -1,10 +1,11 @@
 // -*-C++-*-
-#version 330
+#version 330 core
 
-in  vec2 step;
-in  vec4 stepColor;
 out vec4 interpolateColor;
 
+in vec2 step;
+in vec4 stepColor;
+
 void main()
 {
     gl_Position = vec4(step.xy, 0, 1);
diff --git a/gui/shaders/canvas-pipeline.frag b/gui/shaders/canvas_pipeline.frag
similarity index 89%
rename from gui/shaders/canvas-pipeline.frag
rename to gui/shaders/canvas_pipeline.frag
index 7bc229eac..f5bd52804 100644
--- a/gui/shaders/canvas-pipeline.frag
+++ b/gui/shaders/canvas_pipeline.frag
@@ -16,16 +16,16 @@ in vec2 texImageCoord;
 in vec2 paintCoord;
 
 uniform int drawMode;
-uniform sampler2D imageSampler;
 uniform int imageMode;
 uniform int paintType;
 uniform vec4 paintColor;
 uniform vec2 paintParams[3];
+uniform vec4 scaleFactorBias[2];
+uniform sampler2D imageSampler;
 uniform sampler2D rampSampler;
 uniform sampler2D patternSampler;
-uniform vec4 scaleFactorBias[2];
 
-float linearGradient(vec2 fragCoord, vec2 p0, vec2 p1){
+float linear_gradient(vec2 fragCoord, vec2 p0, vec2 p1){
 
     float x  = fragCoord.x;
     float y  = fragCoord.y;
@@ -41,7 +41,7 @@ float linearGradient(vec2 fragCoord, vec2 p0, vec2 p1){
      /  ( dx*dx + dy*dy );
 }
 
-float radialGradient(vec2 fragCoord, vec2 centerCoord, vec2 focalCoord, float r){
+float radial_gradient(vec2 fragCoord, vec2 centerCoord, vec2 focalCoord, float r){
 
     float x   = fragCoord.x;
     float y   = fragCoord.y;
@@ -68,7 +68,7 @@ void main()
         {
             vec2  x0 = paintParams[0];
             vec2  x1 = paintParams[1];
-            float factor = linearGradient(paintCoord, x0, x1);
+            float factor = linear_gradient(paintCoord, x0, x1);
             col = texture(rampSampler, vec2(factor, 0.5));
         }
         break;
@@ -77,7 +77,7 @@ void main()
             vec2  center = paintParams[0];
             vec2  focal  = paintParams[1];
             float radius = paintParams[2].x;
-            float factor = radialGradient(paintCoord, center, focal, radius);
+            float factor = radial_gradient(paintCoord, center, focal, radius);
             col = texture(rampSampler, vec2(factor, 0.5));
         }
         break;
diff --git a/gui/shaders/canvas-pipeline.vert b/gui/shaders/canvas_pipeline.vert
similarity index 99%
rename from gui/shaders/canvas-pipeline.vert
rename to gui/shaders/canvas_pipeline.vert
index 6aeeab3e9..cf21e9647 100644
--- a/gui/shaders/canvas-pipeline.vert
+++ b/gui/shaders/canvas_pipeline.vert
@@ -1,15 +1,16 @@
 // -*-C++-*-
 #version 330 core
 
+out vec2 texImageCoord;
+out vec2 paintCoord;
+
 in vec2 pos;
 in vec2 textureUV;
+
 uniform mat4 sh_Model;
 uniform mat4 sh_Ortho;
 uniform mat3 paintInverted;
 
-out vec2 texImageCoord;
-out vec2 paintCoord;
-
 void main()
 {
     gl_Position = vec4(pos, 0, 1);