From 46781b9627df4a72b182ee3eae5bacecc09dbde1 Mon Sep 17 00:00:00 2001 From: hyzboy Date: Mon, 9 Oct 2023 02:21:56 +0800 Subject: [PATCH] used "VertexInput" state in .mtl file-format. --- ShaderLibrary/Std2D/PureTexture2D.mtl | 8 +++----- ShaderLibrary/Std2D/RectTexture2D.mtl | 8 +++----- ShaderLibrary/Std2D/RectTexture2DArray.mtl | 8 +++----- ShaderLibrary/Std2D/VertexColor2D.mtl | 8 +++----- ShaderLibrary/Std3D/VertexColor3D.mtl | 7 +++---- ShaderLibrary/Std3D/VertexLum3D.mtl | 8 +++----- 6 files changed, 18 insertions(+), 29 deletions(-) diff --git a/ShaderLibrary/Std2D/PureTexture2D.mtl b/ShaderLibrary/Std2D/PureTexture2D.mtl index 0195498b..974bc8f0 100644 --- a/ShaderLibrary/Std2D/PureTexture2D.mtl +++ b/ShaderLibrary/Std2D/PureTexture2D.mtl @@ -2,12 +2,10 @@ Name PureTexture2D Base Std2D -#Vertex -Input -{ - vec2 TexCoord -} +#VertexInput +vec2 TexCoord +#Vertex Output { vec2 TexCoord diff --git a/ShaderLibrary/Std2D/RectTexture2D.mtl b/ShaderLibrary/Std2D/RectTexture2D.mtl index 00c1f21a..cf9cbb72 100644 --- a/ShaderLibrary/Std2D/RectTexture2D.mtl +++ b/ShaderLibrary/Std2D/RectTexture2D.mtl @@ -3,12 +3,10 @@ Name RectTexture2D Base Std2D Prim SolidRectangles,WireRectangles -#Vertex -Input -{ - vec4 TexCoord -} +#VertexInput +vec4 TexCoord +#Vertex Output { vec4 TexCoord diff --git a/ShaderLibrary/Std2D/RectTexture2DArray.mtl b/ShaderLibrary/Std2D/RectTexture2DArray.mtl index a2f9f92d..42538e17 100644 --- a/ShaderLibrary/Std2D/RectTexture2DArray.mtl +++ b/ShaderLibrary/Std2D/RectTexture2DArray.mtl @@ -11,12 +11,10 @@ Code uvec4 id; } -#Vertex -Input -{ - vec4 TexCoord -} +#VertexInput +vec4 TexCoord +#Vertex Output { vec4 TexCoord diff --git a/ShaderLibrary/Std2D/VertexColor2D.mtl b/ShaderLibrary/Std2D/VertexColor2D.mtl index f65316f5..49851971 100644 --- a/ShaderLibrary/Std2D/VertexColor2D.mtl +++ b/ShaderLibrary/Std2D/VertexColor2D.mtl @@ -2,12 +2,10 @@ Name VertexColor2D Base Std2D -#Vertex -Input -{ - vec4 Color -} +#VertexInput +vec4 Color +#Vertex Output { vec4 Color diff --git a/ShaderLibrary/Std3D/VertexColor3D.mtl b/ShaderLibrary/Std3D/VertexColor3D.mtl index b4d37d20..05b44eee 100644 --- a/ShaderLibrary/Std3D/VertexColor3D.mtl +++ b/ShaderLibrary/Std3D/VertexColor3D.mtl @@ -2,11 +2,10 @@ Name VertexColor3D Base Std3D +#VertexInput +vec4 Color + #Vertex -Input -{ - vec4 Color -} Output { diff --git a/ShaderLibrary/Std3D/VertexLum3D.mtl b/ShaderLibrary/Std3D/VertexLum3D.mtl index 30b417cf..1e131bd1 100644 --- a/ShaderLibrary/Std3D/VertexLum3D.mtl +++ b/ShaderLibrary/Std3D/VertexLum3D.mtl @@ -10,12 +10,10 @@ Code vec4 Color } -#Vertex -Input -{ - float Luminance -} +#VertexInput +float Luminance +#Vertex Output { vec4 Color