BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

MipMapping all textures

Browse Source
This commit is contained in:
Tleety
2016-02-10 10:46:27 +01:00
parent 64e7bb1e94
commit 03d77beff9
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Engine/Rendering/DrawBloomPass.cpp
+5 -5
View File
@@ -98,18 +98,18 @@ void DrawBloomPass::Draw(GLuint texture)
ImGui::SliderInt("Iterations", &m_Iterations, 0, 10); ImGui::SliderInt("Iterations", &m_Iterations, 0, 10);
if (m_DebugTextureToDraw == 1) if (m_DebugTextureToDraw == 1)
BlurOneMipMapLevel(&texture, m_Iterations, 0); BlurOneMipMapLevel(&texture, m_Iterations, 1);
else if (m_DebugTextureToDraw == 2) else if (m_DebugTextureToDraw == 2)
BlurOneMipMapLevel(&texture, m_Iterations, 1); BlurOneMipMapLevel(&texture, m_Iterations, 2);
else if (m_DebugTextureToDraw == 3) else if (m_DebugTextureToDraw == 3)
BlurOneMipMapLevel(&texture, m_Iterations, 2);
else if (m_DebugTextureToDraw == 4)
BlurOneMipMapLevel(&texture, m_Iterations, 3); BlurOneMipMapLevel(&texture, m_Iterations, 3);
else if (m_DebugTextureToDraw == 4)
BlurOneMipMapLevel(&texture, m_Iterations, 4);
else if (m_DebugTextureToDraw == 0) { else if (m_DebugTextureToDraw == 0) {
BlurOneMipMapLevel(&texture, m_Iterations, 0);
BlurOneMipMapLevel(&texture, m_Iterations, 1); BlurOneMipMapLevel(&texture, m_Iterations, 1);
BlurOneMipMapLevel(&texture, m_Iterations, 2); BlurOneMipMapLevel(&texture, m_Iterations, 2);
BlurOneMipMapLevel(&texture, m_Iterations, 3); BlurOneMipMapLevel(&texture, m_Iterations, 3);
BlurOneMipMapLevel(&texture, m_Iterations, 4);
} }
} }
src/Engine/Rendering/Texture.cpp
+3 -1
View File
@@ -29,10 +29,12 @@ Texture::Texture(std::string path)
glGenTextures(1, &m_Texture); glGenTextures(1, &m_Texture);
glBindTexture(GL_TEXTURE_2D, m_Texture); glBindTexture(GL_TEXTURE_2D, m_Texture);
glPixelStorei(GL_UNPACK_ALIGNMENT, 1); glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
//glTexStorage2D(GL_TEXTURE_2D, 4, GL_RGBA8, image.Width, image.Height);
glTexImage2D(GL_TEXTURE_2D, 0, format, image.Width, image.Height, 0, format, GL_UNSIGNED_BYTE, image.Data); glTexImage2D(GL_TEXTURE_2D, 0, format, image.Width, image.Height, 0, format, GL_UNSIGNED_BYTE, image.Data);
glGenerateMipmap(GL_TEXTURE_2D);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
GLERROR("Texture load"); GLERROR("Texture load");
} }