Merge pull request #185 from jovobe/master

Fixes syntax errors in shaders
OsnaCS · Aug 4, 2016 · 70d414a · 70d414a
2 parents 2f09659 + 4c8aea8
commit 70d414a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/client/shader/plants.tcs b/client/shader/plants.tcs
@@ -26,7 +26,7 @@ struct OutputPatch {
     vec3 Color;
 };
 
-out patch OutputPatch oPatch;
+patch out OutputPatch oPatch;
 
 
 
@@ -42,11 +42,6 @@ vec3 ProjectToPlane(vec3 Point, vec3 PlanePoint, vec3 PlaneNormal)
     return (res + 2 * add);
 }
 
-vec3 interpolate3D(vec3 v0, vec3 v1, vec3 v2)
-{
-    return vec3(gl_TessCoord.x) * v0 + vec3(gl_TessCoord.y) * v1 + vec3(gl_TessCoord.z) * v2;
-}
-
 void CalcPositions()
 {
     // The original vertices stay the same

diff --git a/client/shader/plants.tes b/client/shader/plants.tes
@@ -17,7 +17,7 @@ struct OutputPatch {
     vec3 Color;
 };
 
-in patch OutputPatch oPatch;
+patch in OutputPatch oPatch;
 
 out vec3 tePosition;
 out vec3 tes_normal;