YourWishes/Dawn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New textures

Browse Source
This commit is contained in:
Dominic Masters
2023-06-20 23:57:22 -07:00
parent e2e4732938
commit 160aa43973
9 changed files with 76 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/dawnopengl/display/Texture.cpp
View File

@ -122,34 +122,36 @@ void Texture::updateTextureProperties() {
) {
switch(filter) {
case TEXTURE_FILTER_MODE_NEAREST: {
switch(mapFilterMode) {
case TEXTURE_FILTER_MODE_NEAREST:
glTexParameteri(GL_TEXTURE_2D, minMag, GL_NEAREST_MIPMAP_NEAREST);
break;
glTexParameteri(GL_TEXTURE_2D, minMag, GL_NEAREST);
// switch(mapFilterMode) {
// case TEXTURE_FILTER_MODE_NEAREST:
// glTexParameteri(GL_TEXTURE_2D, minMag, GL_NEAREST_MIPMAP_NEAREST);
// break;
case TEXTURE_FILTER_MODE_LINEAR:
glTexParameteri(GL_TEXTURE_2D, minMag, GL_LINEAR_MIPMAP_NEAREST);
break;
// case TEXTURE_FILTER_MODE_LINEAR:
// glTexParameteri(GL_TEXTURE_2D, minMag, GL_LINEAR_MIPMAP_NEAREST);
// break;
default:
assertUnreachable();
}
// default:
// assertUnreachable();
// }
break;
}
case TEXTURE_FILTER_MODE_LINEAR: {
switch(mapFilterMode) {
case TEXTURE_FILTER_MODE_NEAREST:
glTexParameteri(GL_TEXTURE_2D, minMag, GL_NEAREST_MIPMAP_LINEAR);
break;
glTexParameteri(GL_TEXTURE_2D, minMag, GL_LINEAR);
// switch(mapFilterMode) {
// case TEXTURE_FILTER_MODE_NEAREST:
// glTexParameteri(GL_TEXTURE_2D, minMag, GL_NEAREST_MIPMAP_LINEAR);
// break;
case TEXTURE_FILTER_MODE_LINEAR:
glTexParameteri(GL_TEXTURE_2D, minMag, GL_LINEAR_MIPMAP_LINEAR);
break;
// case TEXTURE_FILTER_MODE_LINEAR:
// glTexParameteri(GL_TEXTURE_2D, minMag, GL_LINEAR_MIPMAP_LINEAR);
// break;
default:
assertUnreachable();
}
// default:
// assertUnreachable();
// }
break;
}

1
src/dawnopengl/scene/components/display/material/SimpleTexturedMaterial.cpp
View File

@ -38,7 +38,6 @@ std::vector<struct ShaderPassItem> SimpleTexturedMaterial::getRenderPasses(IRend
onlyPass.renderFlags = (
RENDER_MANAGER_RENDER_FLAG_BLEND
// RENDER_MANAGER_RENDER_FLAG_DEPTH_TEST
);
if(this->texture != nullptr) {