mirrors/mkxp-z
1
0
Fork 0
mirror of https://github.com/mkxp-z/mkxp-z.git synced 2025-09-10 03:52:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

make the lanczos shader work on macOS

Browse source
This commit is contained in:
Struma 2023-05-08 04:47:24 -04:00
parent 54a94beb8e
commit 359ccd7a0c
3 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
macos/mkxp-z.xcodeproj/project.pbxproj
View file

@ -522,6 +522,8 @@
FE5204172A08E2880070038A /* CoreHaptics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FE5204152A08E27D0070038A /* CoreHaptics.framework */; };
FE5204182A08E28F0070038A /* CoreHaptics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FE5204152A08E27D0070038A /* CoreHaptics.framework */; };
FE5204192A08E2950070038A /* CoreHaptics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FE5204152A08E27D0070038A /* CoreHaptics.framework */; };
FE52041B2A08E58D0070038A /* lanczos3.frag in Resources */ = {isa = PBXBuildFile; fileRef = FE52041A2A08E58D0070038A /* lanczos3.frag */; };
FE52041C2A08E62F0070038A /* lanczos3.frag in CopyFiles */ = {isa = PBXBuildFile; fileRef = FE52041A2A08E58D0070038A /* lanczos3.frag */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@ -737,6 +739,7 @@
3B10ECE12568E83D00372D13 /* simpleColor.frag in CopyFiles */,
3B10ECE22568E83D00372D13 /* simpleColor.vert in CopyFiles */,
3B10ECE32568E83D00372D13 /* simpleMatrix.vert in CopyFiles */,
FE52041C2A08E62F0070038A /* lanczos3.frag in CopyFiles */,
3B10ECE42568E83D00372D13 /* sprite.frag in CopyFiles */,
3B10ECE52568E83D00372D13 /* sprite.vert in CopyFiles */,
3B10ECE62568E83D00372D13 /* tilemap.frag in CopyFiles */,
@ -1108,6 +1111,7 @@
96573E80279152DC002C3E77 /* TouchBar.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = TouchBar.xcassets; path = views/TouchBar.xcassets; sourceTree = "<group>"; };
96D8EDD028728DCA00A331EA /* gamecontrollerdb.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = gamecontrollerdb.txt; path = ../assets/gamecontrollerdb.txt; sourceTree = "<group>"; };
FE5204152A08E27D0070038A /* CoreHaptics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreHaptics.framework; path = System/Library/Frameworks/CoreHaptics.framework; sourceTree = SDKROOT; };
FE52041A2A08E58D0070038A /* lanczos3.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; name = lanczos3.frag; path = ../shader/lanczos3.frag; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -1318,29 +1322,30 @@
children = (
3B10EC942568E7B500372D13 /* bitmapBlit.frag */,
3B10EC9B2568E7B500372D13 /* blur.frag */,
3B10EC912568E7B500372D13 /* blurH.vert */,
3B10EC9A2568E7B500372D13 /* blurV.vert */,
3B10ECA32568E7B600372D13 /* common.h */,
3B10EC8E2568E7B500372D13 /* flashMap.frag */,
3B10EC9F2568E7B500372D13 /* flatColor.frag */,
3B10ECA42568E7B600372D13 /* gray.frag */,
3B10EC932568E7B500372D13 /* hue.frag */,
3B10ECA12568E7B600372D13 /* minimal.vert */,
FE52041A2A08E58D0070038A /* lanczos3.frag */,
3B10EC9C2568E7B500372D13 /* plane.frag */,
3B10EC992568E7B500372D13 /* simple.frag */,
3B10EC9E2568E7B500372D13 /* simple.vert */,
3B10EC8F2568E7B500372D13 /* simpleAlpha.frag */,
3B10EC9D2568E7B500372D13 /* simpleAlphaUni.frag */,
3B10EC8D2568E7B400372D13 /* simpleColor.frag */,
3B10ECA52568E7B600372D13 /* simpleColor.vert */,
3B10EC902568E7B500372D13 /* simpleMatrix.vert */,
3B10EC972568E7B500372D13 /* sprite.frag */,
3B10EC982568E7B500372D13 /* sprite.vert */,
3B10EC952568E7B500372D13 /* tilemap.frag */,
3B10ECA02568E7B600372D13 /* tilemap.vert */,
3B10EC962568E7B500372D13 /* tilemapvx.vert */,
3B10ECA22568E7B600372D13 /* trans.frag */,
3B10EC922568E7B500372D13 /* transSimple.frag */,
3B10ECA32568E7B600372D13 /* common.h */,
3B10EC912568E7B500372D13 /* blurH.vert */,
3B10EC9A2568E7B500372D13 /* blurV.vert */,
3B10ECA12568E7B600372D13 /* minimal.vert */,
3B10EC9E2568E7B500372D13 /* simple.vert */,
3B10ECA52568E7B600372D13 /* simpleColor.vert */,
3B10EC902568E7B500372D13 /* simpleMatrix.vert */,
3B10EC982568E7B500372D13 /* sprite.vert */,
3B10ECA02568E7B600372D13 /* tilemap.vert */,
3B10EC962568E7B500372D13 /* tilemapvx.vert */,
);
name = Shaders;
sourceTree = "<group>";
@ -2052,6 +2057,7 @@
files = (
3B10EC862568E78500372D13 /* icon.png in Resources */,
96D8EDD128728DCE00A331EA /* gamecontrollerdb.txt in Resources */,
FE52041B2A08E58D0070038A /* lanczos3.frag in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

3
shader/common.h
View file

@ -1,9 +1,6 @@
#ifdef GLSLES
#ifdef FRAGMENT_SHADER
/* Only the fragment shader has no default float precision */
precision mediump float;
#endif
#else

14
shader/lanczos3.frag
View file

@ -11,7 +11,7 @@ float lanczos3(float x)
{
x = max(abs(x), 0.00001);
float val = x * 3.141592654;
return sin(val) * sin(val / 3) / (val * val);
return sin(val) * sin(val / 3.0) / (val * val);
}
void main()
@ -19,21 +19,21 @@ void main()
vec2 pixel = v_texCoord * sourceSize + 0.5;
vec2 frac = fract(pixel);
vec2 onePixel = texSizeInv;
pixel = floor(pixel) * texSizeInv - onePixel / 2;
pixel = floor(pixel) * texSizeInv - onePixel / 2.0;
float lanczosX[6];
float sum = 0;
float sum = 0.0;
for(int x = 0; x < 6; x++)
{
lanczosX[x] = lanczos3(x - 2 - frac.x);
lanczosX[x] = lanczos3(float(x) - 2.0 - frac.x);
sum += lanczosX[x];
}
for(int x = 0; x < 6; x++) lanczosX[x] /= sum;
sum = 0;
sum = 0.0;
float lanczosY[6];
for(int y = 0; y < 6; y++)
{
lanczosY[y] = lanczos3(y - 2 - frac.y);
lanczosY[y] = lanczos3(float(y) - 2.0 - frac.y);
sum += lanczosY[y];
}
for(int y = 0; y < 6; y++) lanczosY[y] /= sum;
@ -42,7 +42,7 @@ void main()
{
vec4 colour = vec4(0);
for(int x = -2; x <= 3; x++)
colour += texture2D(texture, pixel + vec2(x * onePixel.x, y * onePixel.y)).rgba * lanczosX[x + 2];
colour += texture2D(texture, pixel + vec2(float(x) * onePixel.x, float(y) * onePixel.y)).rgba * lanczosX[x + 2];
gl_FragColor += colour * lanczosY[y + 2];
}
}