evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump shader versions

Browse Source 
#78
This commit is contained in:
Kae 2024-07-07 07:32:06 +10:00
parent d313a3ceb3
commit bc2e805d01
5 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
assets/opensb/rendering/effects/interface.frag
View File

@ -1,4 +1,4 @@
#version 130 #version 140
uniform sampler2D texture0; uniform sampler2D texture0;
uniform sampler2D texture1; uniform sampler2D texture1;
@ -14,13 +14,13 @@ out vec4 outColor;
void main() { void main() {
vec4 texColor; vec4 texColor;
if (fragmentTextureIndex == 3) if (fragmentTextureIndex == 3)
texColor = texture2D(texture3, fragmentTextureCoordinate); texColor = texture(texture3, fragmentTextureCoordinate);
else if (fragmentTextureIndex == 2) else if (fragmentTextureIndex == 2)
texColor = texture2D(texture2, fragmentTextureCoordinate); texColor = texture(texture2, fragmentTextureCoordinate);
else if (fragmentTextureIndex == 1) else if (fragmentTextureIndex == 1)
texColor = texture2D(texture1, fragmentTextureCoordinate); texColor = texture(texture1, fragmentTextureCoordinate);
else else
texColor = texture2D(texture0, fragmentTextureCoordinate); texColor = texture(texture0, fragmentTextureCoordinate);
if (texColor.a <= 0.0) if (texColor.a <= 0.0)
discard; discard;

2
assets/opensb/rendering/effects/interface.vert
View File

@ -1,4 +1,4 @@
#version 130 #version 140
uniform vec2 textureSize0; uniform vec2 textureSize0;
uniform vec2 textureSize1; uniform vec2 textureSize1;

20
assets/opensb/rendering/effects/world.frag
View File

@ -1,4 +1,4 @@
#version 130 #version 140
uniform sampler2D texture0; uniform sampler2D texture0;
uniform sampler2D texture1; uniform sampler2D texture1;
@ -27,7 +27,7 @@ vec4 cubic(float v) {
return vec4(x, y, z, w); return vec4(x, y, z, w);
} }
vec4 bicubicSample(sampler2D texture, vec2 texcoord, vec2 texscale) { vec4 bicubicSample(sampler2D tex, vec2 texcoord, vec2 texscale) {
texcoord = texcoord - vec2(0.5, 0.5); texcoord = texcoord - vec2(0.5, 0.5);
float fx = fract(texcoord.x); float fx = fract(texcoord.x);
@ -42,10 +42,10 @@ vec4 bicubicSample(sampler2D texture, vec2 texcoord, vec2 texscale) {
vec4 s = vec4(xcubic.x + xcubic.y, xcubic.z + xcubic.w, ycubic.x + ycubic.y, ycubic.z + ycubic.w); vec4 s = vec4(xcubic.x + xcubic.y, xcubic.z + xcubic.w, ycubic.x + ycubic.y, ycubic.z + ycubic.w);
vec4 offset = c + vec4(xcubic.y, xcubic.w, ycubic.y, ycubic.w) / s; vec4 offset = c + vec4(xcubic.y, xcubic.w, ycubic.y, ycubic.w) / s;
vec4 sample0 = texture2D(texture, vec2(offset.x, offset.z) * texscale); vec4 sample0 = texture(tex, vec2(offset.x, offset.z) * texscale);
vec4 sample1 = texture2D(texture, vec2(offset.y, offset.z) * texscale); vec4 sample1 = texture(tex, vec2(offset.y, offset.z) * texscale);
vec4 sample2 = texture2D(texture, vec2(offset.x, offset.w) * texscale); vec4 sample2 = texture(tex, vec2(offset.x, offset.w) * texscale);
vec4 sample3 = texture2D(texture, vec2(offset.y, offset.w) * texscale); vec4 sample3 = texture(tex, vec2(offset.y, offset.w) * texscale);
float sx = s.x / (s.x + s.y); float sx = s.x / (s.x + s.y);
float sy = s.z / (s.z + s.w); float sy = s.z / (s.z + s.w);
@ -67,13 +67,13 @@ vec3 sampleLight(vec2 coord, vec2 scale) {
void main() { void main() {
vec4 texColor; vec4 texColor;
if (fragmentTextureIndex == 3) if (fragmentTextureIndex == 3)
texColor = texture2D(texture3, fragmentTextureCoordinate); texColor = texture(texture3, fragmentTextureCoordinate);
else if (fragmentTextureIndex == 2) else if (fragmentTextureIndex == 2)
texColor = texture2D(texture2, fragmentTextureCoordinate); texColor = texture(texture2, fragmentTextureCoordinate);
else if (fragmentTextureIndex == 1) else if (fragmentTextureIndex == 1)
texColor = texture2D(texture1, fragmentTextureCoordinate); texColor = texture(texture1, fragmentTextureCoordinate);
else else
texColor = texture2D(texture0, fragmentTextureCoordinate); texColor = texture(texture0, fragmentTextureCoordinate);
if (texColor.a <= 0.0) if (texColor.a <= 0.0)
discard; discard;

2
assets/opensb/rendering/effects/world.vert
View File

@ -1,4 +1,4 @@
#version 130 #version 140
uniform vec2 textureSize0; uniform vec2 textureSize0;
uniform vec2 textureSize1; uniform vec2 textureSize1;

12
source/application/StarRenderer_opengl.cpp
View File

@ -8,7 +8,7 @@ namespace Star {
size_t const MultiTextureCount = 4; size_t const MultiTextureCount = 4;
char const* DefaultVertexShader = R"SHADER( char const* DefaultVertexShader = R"SHADER(
#version 130 #version 140
uniform vec2 textureSize0; uniform vec2 textureSize0;
uniform vec2 textureSize1; uniform vec2 textureSize1;
@ -49,7 +49,7 @@ void main() {
)SHADER"; )SHADER";
char const* DefaultFragmentShader = R"SHADER( char const* DefaultFragmentShader = R"SHADER(
#version 130 #version 140
uniform sampler2D texture0; uniform sampler2D texture0;
uniform sampler2D texture1; uniform sampler2D texture1;
@ -65,13 +65,13 @@ out vec4 outColor;
void main() { void main() {
vec4 texColor; vec4 texColor;
if (fragmentTextureIndex == 3) if (fragmentTextureIndex == 3)
texColor = texture2D(texture3, fragmentTextureCoordinate); texColor = texture(texture3, fragmentTextureCoordinate);
else if (fragmentTextureIndex == 2) else if (fragmentTextureIndex == 2)
texColor = texture2D(texture2, fragmentTextureCoordinate); texColor = texture(texture2, fragmentTextureCoordinate);
else if (fragmentTextureIndex == 1) else if (fragmentTextureIndex == 1)
texColor = texture2D(texture1, fragmentTextureCoordinate); texColor = texture(texture1, fragmentTextureCoordinate);
else else
texColor = texture2D(texture0, fragmentTextureCoordinate); texColor = texture(texture0, fragmentTextureCoordinate);
if (texColor.a <= 0.0) if (texColor.a <= 0.0)
discard; discard;