epicalert/facecam2d
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Add support for webp textures

Browse source 
This allows for models to use lossy textures with an alpha channel,
none of the formats supported by stb_image.h could do this.
This commit is contained in:
Epicalert 2021-02-06 21:19:33 +08:00
parent 25f97e5f90
commit 4ce0e0e10d
No known key found for this signature in database
GPG key ID: CAA46F858D0979BD
3 changed files with 34 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -1,6 +1,8 @@
cmake_minimum_required( VERSION 3.0 ) cmake_minimum_required( VERSION 3.0 )
project( Facecam2D VERSION 0.1.0 ) project( Facecam2D VERSION 0.1.0 )
set( CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake )
find_package( libzip REQUIRED ) find_package( libzip REQUIRED )
find_package( WebP REQUIRED )
find_package( OpenCV REQUIRED ) find_package( OpenCV REQUIRED )
message (STATUS "Found OpenCV at: " ${OpenCV_INCLUDE_DIRS} ) message (STATUS "Found OpenCV at: " ${OpenCV_INCLUDE_DIRS} )
find_package( OpenGL REQUIRED ) find_package( OpenGL REQUIRED )
@ -43,4 +45,4 @@ add_executable( fc2d
src/toml.c src/toml.c
src/tomlcpp.cpp src/tomlcpp.cpp
) )
target_link_libraries( fc2d ${OpenCV_LIBS} ${OPENGL_LIBRARIES} FreeGLUT::freeglut GLEW::glew zip ) target_link_libraries( fc2d ${OpenCV_LIBS} ${OPENGL_LIBRARIES} ${WEBP_LIBRARIES} FreeGLUT::freeglut GLEW::glew zip )

9
cmake/FindWebP.cmake Normal file
View file

@ -0,0 +1,9 @@
find_path( WEBP_INCLUDE_DIR NAMES webp/decode.h )
find_library( WEBP_LIBRARY NAMES webp PATHS /usr/lib /usr/lib64 /lib /lib64 /usr/local/lib )
if (WEBP_INCLUDE_DIR AND WEBP_LIBRARY)
set(WEBP_INCLUDE_DIR ${WEBP_INCLUDE_DIR})
set(WEBP_LIBRARIES ${WEBP_LIBRARY})
set( WEBP_FOUND "TRUE" )
endif (WEBP_INCLUDE_DIR AND WEBP_LIBRARY)

23
src/graphics.cpp
View file

@ -8,6 +8,8 @@
#define STB_IMAGE_IMPLEMENTATION #define STB_IMAGE_IMPLEMENTATION
#include <stb_image.h> #include <stb_image.h>
#include <webp/decode.h>
#include <iostream> #include <iostream>
#include <graphics.hpp> #include <graphics.hpp>
@ -103,7 +105,26 @@ void initTexture (GLuint* texNum, unsigned char* buffer, size_t bufferLength) {
glBindTexture(GL_TEXTURE_2D, *texNum); glBindTexture(GL_TEXTURE_2D, *texNum);
int x, y, channels; int x, y, channels;
GLubyte* pixels = stbi_load_from_memory(buffer, bufferLength, &x, &y, &channels, 4); GLubyte* pixels;
int webp = WebPGetInfo(buffer, bufferLength, &x, &y);
if (webp) {
pixels = WebPDecodeRGBA(buffer, bufferLength, &x, &y);
} else {
//try stb_image (png, jpg, gif, etc)
pixels = stbi_load_from_memory(buffer, bufferLength, &x, &y, &channels, 4);
if (!pixels) {
std::cerr << "Corrupt or unsupported texture format!" << std::endl;
GLubyte defaultPixels[] =
{255, 0, 255, 255, 0, 0, 0, 255,
0, 0, 0, 255, 255, 0, 255, 255 };
pixels = defaultPixels;
x = 2;
y = 2;
}
}
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, x, y, 0, GL_RGBA, GL_UNSIGNED_BYTE, pixels); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, x, y, 0, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);