AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-19 12:35:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix some texture bleeding of mipmaps with opengl

Browse Source
This commit is contained in:
UnknownShadow200 2017-08-23 14:20:19 +10:00
parent 3181051ec5
commit b346307ef3
3 changed files with 5 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
ClassicalSharp/GraphicsAPI/OpenGLApi.cs
View File

@ -167,48 +167,19 @@ namespace ClassicalSharp.GraphicsAPI {
GL.BindTexture(TextureTarget.Texture2D, texId);
GL.TexParameteri(TextureTarget.Texture2D, TextureParameterName.MagFilter, (int)TextureFilter.Nearest);
if (mipmaps) {
if (mipmaps && AutoMipmaps) {
GL.TexParameteri(TextureTarget.Texture2D, TextureParameterName.MinFilter, (int)TextureFilter.NearestMipmapLinear);
GL.TexParameteri(TextureTarget.Texture2D, TextureParameterName.GenerateMipmap, 1);
GL.TexParameteri(TextureTarget.Texture2D, TextureParameterName.TextureMaxLevel, 4);
} else {
GL.TexParameteri(TextureTarget.Texture2D, TextureParameterName.MinFilter, (int)TextureFilter.Nearest);
}
GL.TexImage2D(TextureTarget.Texture2D, 0, PixelInternalFormat.Rgba, width, height,
GlPixelFormat.Bgra, PixelType.UnsignedByte, scan0);
if (mipmaps) {
int lvl = 1, lvlWidth = width, lvlHeight = height;
while (lvlWidth > 1 || lvlHeight > 1) {
if (lvlWidth > 1) lvlWidth /= 2;
if (lvlHeight > 1) lvlHeight /= 2;
MipmapLevel(lvlWidth, lvlHeight, lvl, width, height, scan0);
lvl++;
}
}
return texId;
}
unsafe void MipmapLevel(int lvlWidth, int lvlHeight, int lvl, int width, int height, IntPtr scan0) {
int[] lblPixels = new int[lvlWidth * lvlHeight];
fixed (int* lvlPtr = lblPixels) {
int* baseSrc = (int*)scan0, baseDst = (int*)lvlPtr;
for (int y = 0; y < lvlHeight; y++) {
int srcY = y * height / lvlHeight;
int* src = baseSrc + srcY * width;
int* dst = baseDst + y * lvlWidth;
for (int x = 0; x < lvlWidth; x++) {
dst[x] = src[x * width / lvlWidth];
}
}
GL.TexImage2D(TextureTarget.Texture2D, lvl, PixelInternalFormat.Rgba, lvlWidth, lvlHeight,
GlPixelFormat.Bgra, PixelType.UnsignedByte, (IntPtr)lvlPtr);
}
}
public override void BindTexture(int texture) {
GL.BindTexture(TextureTarget.Texture2D, texture);
}

1
OpenTK/Graphics/OpenGL/GLEnums.cs
View File

@ -288,6 +288,7 @@ namespace OpenTK.Graphics.OpenGL
public enum TextureParameterName : int {
MagFilter = 0x2800,
MinFilter = 0x2801,
TextureMaxLevel = 0x813D,
GenerateMipmap = 0x8191,
}

1
OpenTK/SharpDX.Direct3D/Enumerations.cs
View File

@ -367,6 +367,7 @@ namespace SharpDX.Direct3D9 {
MagFilter = 5,
MinFilter = 6,
MipFilter = 7,
MaxMipLevel = 9,
}
[Flags]