ruby_rpg 0.0.4 → 0.0.5

data/lib/engine/shaders/colour_frag.glsl

@@ -1,9 +1,9 @@
-#version 330 core
-
-out vec4 FragColour;
-in vec4 ourColour;
-
-void main()
-{
-    FragColour = ourColour;
+#version 330 core
+
+out vec4 FragColour;
+in vec4 ourColour;
+
+void main()
+{
+    FragColour = ourColour;
 }

data/lib/engine/shaders/colour_vertex.glsl

@@ -1,14 +1,14 @@
-#version 330 core
-layout (location = 0) in vec3 aPos;
-
-uniform vec3 colour;
-out vec4 ourColour;
-
-uniform mat4 camera;
-uniform mat4 model;
-
-void main()
-{
-    gl_Position = camera * model * vec4(aPos, 1.0);
-    ourColour = vec4(colour, 1.0);
+#version 330 core
+layout (location = 0) in vec3 aPos;
+
+uniform vec3 colour;
+out vec4 ourColour;
+
+uniform mat4 camera;
+uniform mat4 model;
+
+void main()
+{
+    gl_Position = camera * model * vec4(aPos, 1.0);
+    ourColour = vec4(colour, 1.0);
 }

data/lib/engine/shaders/mesh_frag.glsl

@@ -1,102 +1,102 @@
-#version 330 core
-
-in vec2 TexCoord;
-in vec3 Normal;
-in vec3 Tangent;
-in vec3 FragPos;
-
-out vec4 color;
-
-uniform sampler2D image;
-uniform sampler2D normalMap;
-uniform vec3 cameraPos;
-uniform float diffuseStrength;
-uniform float specularStrength;
-uniform float specularPower;
-uniform vec3 ambientLight;
-
-struct DirectionalLight {
-    vec3 direction;
-    vec3 colour;
-};
-#define NR_DIRECTIONAL_LIGHTS 4
-uniform DirectionalLight directionalLights[NR_DIRECTIONAL_LIGHTS];
-
-struct PointLight {
-    vec3 position;
-    float sqrRange;
-    vec3 colour;
-};
-#define NR_POINT_LIGHTS 16
-uniform PointLight pointLights[NR_POINT_LIGHTS];
-
-vec3 CalcPointLight(PointLight light, vec3 normal, vec3 fragPos, vec3 viewDir)
-{
-    vec3 lightOffset = light.position - fragPos;
-    float sqrDistance = dot(lightOffset, lightOffset);
-    vec3 lightDir = normalize(lightOffset);
-    float diff = max(dot(normal, lightDir), 0.0);
-
-    vec3 reflectDir = reflect(lightDir, normal);
-    float spec = pow(max(dot(-viewDir, reflectDir), 0.0), specularPower);
-
-    float attenuation = light.sqrRange / sqrDistance;
-
-    float diffuse = diff * diffuseStrength;
-    float specular = spec * specularStrength;
-
-    return light.colour * (diffuse + specular) * attenuation;
-}
-
-vec3 CalcDirectionalLight(DirectionalLight light, vec3 normal, vec3 fragPos, vec3 viewDir)
-{
-    float diff = max(dot(normal, -light.direction), 0.0);
-
-    vec3 reflectDir = reflect(-light.direction, normal);
-    float spec = pow(max(dot(-viewDir, reflectDir), 0.0), specularPower);
-
-    float diffuse = diff * diffuseStrength;
-    float specular = spec * specularStrength;
-
-    return light.colour * (diffuse + specular);
-}
-
-void main()
-{
-    vec3 sampledNormal = texture(normalMap, TexCoord).rgb * 2.0 - 1.0;
-    if ( sampledNormal.r + sampledNormal.g + sampledNormal.b <= 0)
-    {
-        sampledNormal = vec3(0.0, 0.0, 1.0);
-    }
-    vec3 n = normalize(Normal);
-    vec3 t = normalize(Tangent);
-    vec3 norm = n;
-    if ( length(t) > 0.0 )
-    {
-        vec3 b = cross(t, n);
-        mat3 TBN = mat3(t, b, n);
-        norm = normalize(TBN * normalize(sampledNormal));
-    }
-    vec3 viewDir = normalize(cameraPos - FragPos);
-
-    vec3 result = ambientLight;
-
-    for (int i = 0; i < NR_POINT_LIGHTS; i++) {
-        if (pointLights[i].sqrRange == 0.0)
-        {
-            break;
-        }
-        result += CalcPointLight(pointLights[i], norm, FragPos, viewDir);
-    }
-
-    for (int i = 0; i < NR_DIRECTIONAL_LIGHTS; i++) {
-        if (directionalLights[i].colour == vec3(0.0))
-        {
-            break;
-        }
-        result += CalcDirectionalLight(directionalLights[i], norm, FragPos, viewDir);
-    }
-
-    vec4 tex = texture(image, TexCoord);
-    color = tex * vec4(result, 1.0);
-}
+#version 330 core
+
+in vec2 TexCoord;
+in vec3 Normal;
+in vec3 Tangent;
+in vec3 FragPos;
+
+out vec4 color;
+
+uniform sampler2D image;
+uniform sampler2D normalMap;
+uniform vec3 cameraPos;
+uniform float diffuseStrength;
+uniform float specularStrength;
+uniform float specularPower;
+uniform vec3 ambientLight;
+
+struct DirectionalLight {
+    vec3 direction;
+    vec3 colour;
+};
+#define NR_DIRECTIONAL_LIGHTS 4
+uniform DirectionalLight directionalLights[NR_DIRECTIONAL_LIGHTS];
+
+struct PointLight {
+    vec3 position;
+    float sqrRange;
+    vec3 colour;
+};
+#define NR_POINT_LIGHTS 16
+uniform PointLight pointLights[NR_POINT_LIGHTS];
+
+vec3 CalcPointLight(PointLight light, vec3 normal, vec3 fragPos, vec3 viewDir)
+{
+    vec3 lightOffset = light.position - fragPos;
+    float sqrDistance = dot(lightOffset, lightOffset);
+    vec3 lightDir = normalize(lightOffset);
+    float diff = max(dot(normal, lightDir), 0.0);
+
+    vec3 reflectDir = reflect(lightDir, normal);
+    float spec = pow(max(dot(-viewDir, reflectDir), 0.0), specularPower);
+
+    float attenuation = light.sqrRange / sqrDistance;
+
+    float diffuse = diff * diffuseStrength;
+    float specular = spec * specularStrength;
+
+    return light.colour * (diffuse + specular) * attenuation;
+}
+
+vec3 CalcDirectionalLight(DirectionalLight light, vec3 normal, vec3 fragPos, vec3 viewDir)
+{
+    float diff = max(dot(normal, -light.direction), 0.0);
+
+    vec3 reflectDir = reflect(-light.direction, normal);
+    float spec = pow(max(dot(-viewDir, reflectDir), 0.0), specularPower);
+
+    float diffuse = diff * diffuseStrength;
+    float specular = spec * specularStrength;
+
+    return light.colour * (diffuse + specular);
+}
+
+void main()
+{
+    vec3 sampledNormal = texture(normalMap, TexCoord).rgb * 2.0 - 1.0;
+    if ( sampledNormal.r + sampledNormal.g + sampledNormal.b <= 0)
+    {
+        sampledNormal = vec3(0.0, 0.0, 1.0);
+    }
+    vec3 n = normalize(Normal);
+    vec3 t = normalize(Tangent);
+    vec3 norm = n;
+    if ( length(t) > 0.0 )
+    {
+        vec3 b = cross(t, n);
+        mat3 TBN = mat3(t, b, n);
+        norm = normalize(TBN * normalize(sampledNormal));
+    }
+    vec3 viewDir = normalize(cameraPos - FragPos);
+
+    vec3 result = ambientLight;
+
+    for (int i = 0; i < NR_POINT_LIGHTS; i++) {
+        if (pointLights[i].sqrRange == 0.0)
+        {
+            break;
+        }
+        result += CalcPointLight(pointLights[i], norm, FragPos, viewDir);
+    }
+
+    for (int i = 0; i < NR_DIRECTIONAL_LIGHTS; i++) {
+        if (directionalLights[i].colour == vec3(0.0))
+        {
+            break;
+        }
+        result += CalcDirectionalLight(directionalLights[i], norm, FragPos, viewDir);
+    }
+
+    vec4 tex = texture(image, TexCoord);
+    color = tex * vec4(result, 1.0);
+}

data/lib/engine/shaders/mesh_vertex.glsl

@@ -1,25 +1,25 @@
-#version 330 core
-
-// <vec2 position, vec2 texCoords, vec3 normal, vec3 tangent>
-layout (location = 0) in vec3 vertex;
-layout (location = 1) in vec2 texCoord;
-layout (location = 2) in vec3 normal;
-layout (location = 3) in vec3 tangent;
-layout (location = 7) in mat4 model;
-
-out vec2 TexCoord;
-out vec3 Normal;
-out vec3 Tangent;
-out vec3 FragPos;
-
-uniform mat4 camera;
-
-void main()
-{
-    TexCoord = texCoord;
-    mat3 normalMatrix = mat3(transpose(inverse(model)));
-    Normal = normalMatrix * normal;
-    Tangent = normalMatrix * tangent;
-    FragPos = vec3(model * vec4(vertex, 1.0));
-    gl_Position = camera * model * vec4(vertex, 1.0);
-}
+#version 330 core
+
+// <vec2 position, vec2 texCoords, vec3 normal, vec3 tangent>
+layout (location = 0) in vec3 vertex;
+layout (location = 1) in vec2 texCoord;
+layout (location = 2) in vec3 normal;
+layout (location = 3) in vec3 tangent;
+layout (location = 7) in mat4 model;
+
+out vec2 TexCoord;
+out vec3 Normal;
+out vec3 Tangent;
+out vec3 FragPos;
+
+uniform mat4 camera;
+
+void main()
+{
+    TexCoord = texCoord;
+    mat3 normalMatrix = mat3(transpose(inverse(model)));
+    Normal = normalMatrix * normal;
+    Tangent = normalMatrix * tangent;
+    FragPos = vec3(model * vec4(vertex, 1.0));
+    gl_Position = camera * model * vec4(vertex, 1.0);
+}

data/lib/engine/shaders/skybox_frag.glsl

@@ -1,12 +1,12 @@
-#version 330 core
-
-in vec3 FragPos;
-out vec4 color;
-
-void main()
-{
-    vec4 ground = vec4(0.541176, 0.709804, 0.286275, 1);
-    vec4 sky = vec4(0.2, 0.6, 0.8, 1);
-    float mixFactor = clamp(FragPos.y / 2.0, 0.0, 1.0);
-    color = mix(ground, sky, mixFactor);
-}
+#version 330 core
+
+in vec3 FragPos;
+out vec4 color;
+
+void main()
+{
+    vec4 ground = vec4(0.541176, 0.709804, 0.286275, 1);
+    vec4 sky = vec4(0.2, 0.6, 0.8, 1);
+    float mixFactor = clamp(FragPos.y / 2.0, 0.0, 1.0);
+    color = mix(ground, sky, mixFactor);
+}

data/lib/engine/shaders/skybox_vert.glsl

@@ -1,14 +1,14 @@
-#version 330 core
-
-layout (location = 0) in vec3 vertex;
-layout (location = 7) in mat4 model;
-
-out vec3 FragPos;
-
-uniform mat4 camera;
-
-void main()
-{
-    FragPos = vec3(model * vec4(vertex, 1.0));
-    gl_Position = camera * model * vec4(vertex, 1.0);
-}
+#version 330 core
+
+layout (location = 0) in vec3 vertex;
+layout (location = 7) in mat4 model;
+
+out vec3 FragPos;
+
+uniform mat4 camera;
+
+void main()
+{
+    FragPos = vec3(model * vec4(vertex, 1.0));
+    gl_Position = camera * model * vec4(vertex, 1.0);
+}

data/lib/engine/shaders/sprite_frag.glsl

@@ -1,17 +1,17 @@
-#version 330 core
-in vec2 TexCoords;
-out vec4 color;
-
-uniform sampler2D image;
-uniform vec3 spriteColor;
-uniform vec4 frameCoords;
-
-void main()
-{
-    vec2 interpolatedCoords = vec2(frameCoords.x + (TexCoords.x * frameCoords.z), frameCoords.y + TexCoords.y * frameCoords.w);;
-    vec4 texColor = texture(image, interpolatedCoords);
-    if(texColor.a < 0.05)
-        discard;
-    else
-        color = vec4(spriteColor, 1.0) * texColor;
-}
+#version 330 core
+in vec2 TexCoords;
+out vec4 color;
+
+uniform sampler2D image;
+uniform vec3 spriteColor;
+uniform vec4 frameCoords;
+
+void main()
+{
+    vec2 interpolatedCoords = vec2(frameCoords.x + (TexCoords.x * frameCoords.z), frameCoords.y + TexCoords.y * frameCoords.w);;
+    vec4 texColor = texture(image, interpolatedCoords);
+    if(texColor.a < 0.05)
+        discard;
+    else
+        color = vec4(spriteColor, 1.0) * texColor;
+}

data/lib/engine/shaders/sprite_vertex.glsl

@@ -1,16 +1,16 @@
-#version 330 core
-
-// <vec3 position, vec2 texCoords>
-layout (location = 0) in vec3 vertex;
-layout (location = 1) in vec2 texCoord;
-
-out vec2 TexCoords;
-
-uniform mat4 camera;
-uniform mat4 model;
-
-void main()
-{
-    TexCoords = texCoord;
-    gl_Position = camera * model * vec4(vertex, 1.0);
+#version 330 core
+
+// <vec3 position, vec2 texCoords>
+layout (location = 0) in vec3 vertex;
+layout (location = 1) in vec2 texCoord;
+
+out vec2 TexCoords;
+
+uniform mat4 camera;
+uniform mat4 model;
+
+void main()
+{
+    TexCoords = texCoord;
+    gl_Position = camera * model * vec4(vertex, 1.0);
 }

data/lib/engine/shaders/text_frag.glsl

@@ -1,15 +1,15 @@
-#version 330 core
-
-out vec4 color;
-
-in vec2 TexCoords;
-
-uniform sampler2D fontTexture;
-
-void main()
-{
-    vec4 textureColor = texture(fontTexture, TexCoords);
-    if(textureColor.a < 0.1)
-        discard;
-    color = vec4(1.0, 1.0, 1.0, textureColor.a);
-}
+#version 330 core
+
+out vec4 color;
+
+in vec2 TexCoords;
+
+uniform sampler2D fontTexture;
+
+void main()
+{
+    vec4 textureColor = texture(fontTexture, TexCoords);
+    if(textureColor.a < 0.1)
+        discard;
+    color = vec4(1.0, 1.0, 1.0, textureColor.a);
+}

data/lib/engine/shaders/text_vertex.glsl

@@ -1,31 +1,31 @@
-#version 330 core
-
-// <vec3 position, vec2 texCoords>
-layout (location = 0) in vec3 vertex;
-layout (location = 1) in vec2 texCoords;
-layout (location = 2) in int textIndex;
-layout (location = 3) in vec2 offset;
-
-uniform mat4 camera;
-uniform mat4 model;
-
-out vec2 TexCoords;
-
-vec2 getTexCoords()
-{
-    int x = textIndex / 16;
-    int y = textIndex % 16;
-    return (vec2(x, y) + texCoords) / 16.0;
-}
-
-vec3 quadPosition()
-{
-    return vertex + vec3(offset.x, offset.y, 0);
-}
-
-
-void main()
-{
-    gl_Position = camera * model * vec4(quadPosition(), 1.0);
-    TexCoords = getTexCoords();
-}
+#version 330 core
+
+// <vec3 position, vec2 texCoords>
+layout (location = 0) in vec3 vertex;
+layout (location = 1) in vec2 texCoords;
+layout (location = 2) in int textIndex;
+layout (location = 3) in vec2 offset;
+
+uniform mat4 camera;
+uniform mat4 model;
+
+out vec2 TexCoords;
+
+vec2 getTexCoords()
+{
+    int x = textIndex / 16;
+    int y = textIndex % 16;
+    return (vec2(x, y) + texCoords) / 16.0;
+}
+
+vec3 quadPosition()
+{
+    return vertex + vec3(offset.x, offset.y, 0);
+}
+
+
+void main()
+{
+    gl_Position = camera * model * vec4(quadPosition(), 1.0);
+    TexCoords = getTexCoords();
+}

data/lib/engine/shaders/ui_sprite_frag.glsl

@@ -1,15 +1,15 @@
-#version 330 core
-in vec2 TexCoords;
-out vec4 color;
-
-uniform sampler2D image;
-uniform vec4 spriteColor;
-
-void main()
-{
-    vec4 texColor = texture(image, TexCoords);
-    if(texColor.a < 0.05)
-        discard;
-    else
-        color = spriteColor * texColor;
-}
+#version 330 core
+in vec2 TexCoords;
+out vec4 color;
+
+uniform sampler2D image;
+uniform vec4 spriteColor;
+
+void main()
+{
+    vec4 texColor = texture(image, TexCoords);
+    if(texColor.a < 0.05)
+        discard;
+    else
+        color = spriteColor * texColor;
+}

data/lib/engine/shaders/ui_sprite_vertex.glsl

@@ -1,16 +1,16 @@
-#version 330 core
-
-// <vec3 position, vec2 texCoords>
-layout (location = 0) in vec3 vertex;
-layout (location = 1) in vec2 texCoord;
-
-out vec2 TexCoords;
-
-uniform mat4 camera;
-uniform mat4 model;
-
-void main()
-{
-    TexCoords = texCoord;
-    gl_Position = camera * model * vec4(vertex, 1.0);
+#version 330 core
+
+// <vec3 position, vec2 texCoords>
+layout (location = 0) in vec3 vertex;
+layout (location = 1) in vec2 texCoord;
+
+out vec2 TexCoords;
+
+uniform mat4 camera;
+uniform mat4 model;
+
+void main()
+{
+    TexCoords = texCoord;
+    gl_Position = camera * model * vec4(vertex, 1.0);
 }