mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-10-04 18:41:51 +00:00
Added graphics/ImageData class
This commit is contained in:
parent
a91fbe7166
commit
ffd3e3f852
9 changed files with 110 additions and 61 deletions
|
|
@ -1,15 +1,18 @@
|
|||
#include "Texture.h"
|
||||
#include <GL/glew.h>
|
||||
#include <stdexcept>
|
||||
|
||||
#include "ImageData.h"
|
||||
|
||||
Texture::Texture(unsigned int id, int width, int height) : id(id), width(width), height(height) {
|
||||
}
|
||||
|
||||
Texture::Texture(unsigned char* data, int width, int height) : width(width), height(height) {
|
||||
Texture::Texture(unsigned char* data, int width, int height, uint format) : width(width), height(height) {
|
||||
glGenTextures(1, &id);
|
||||
glBindTexture(GL_TEXTURE_2D, id);
|
||||
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
|
||||
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0,
|
||||
GL_RGBA, GL_UNSIGNED_BYTE, (GLvoid *) data);
|
||||
glTexImage2D(GL_TEXTURE_2D, 0, format, width, height, 0,
|
||||
format, GL_UNSIGNED_BYTE, (GLvoid *) data);
|
||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
|
||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
|
||||
glBindTexture(GL_TEXTURE_2D, 0);
|
||||
|
|
@ -21,7 +24,6 @@ Texture::~Texture() {
|
|||
|
||||
void Texture::bind(){
|
||||
glBindTexture(GL_TEXTURE_2D, id);
|
||||
// glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, id);
|
||||
}
|
||||
|
||||
void Texture::reload(unsigned char* data){
|
||||
|
|
@ -30,3 +32,15 @@ void Texture::reload(unsigned char* data){
|
|||
GL_RGBA, GL_UNSIGNED_BYTE, (GLvoid *) data);
|
||||
glBindTexture(GL_TEXTURE_2D, 0);
|
||||
}
|
||||
|
||||
Texture* Texture::from(const ImageData* image) {
|
||||
uint format;
|
||||
const void* data = image->getData();
|
||||
switch (image->getFormat()) {
|
||||
case ImageFormat::rgb888: format = GL_RGB; break;
|
||||
case ImageFormat::rgba8888: format = GL_RGBA; break;
|
||||
default:
|
||||
throw std::runtime_error("unsupported image data format");
|
||||
}
|
||||
return new Texture((unsigned char*)data, image->getWidth(), image->getHeight(), format);
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue