cleanup bitmap class, nto sure if i will even keep it yet
This commit is contained in:
@@ -175,50 +175,6 @@ void CreateAllGfxData(char *romData, char *allgfx16Ptr) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Bitmap::Bitmap(int width, int height, char *data)
|
|
||||||
: width_(width), height_(height), pixel_data_(data) {}
|
|
||||||
|
|
||||||
int Bitmap::GetWidth() { return width_; }
|
|
||||||
int Bitmap::GetHeight() { return height_; }
|
|
||||||
|
|
||||||
// Simple helper function to load an image into a OpenGL texture with common
|
|
||||||
// settings
|
|
||||||
bool Bitmap::LoadBitmapFromROM(unsigned char *texture_data, int *out_width,
|
|
||||||
int *out_height) {
|
|
||||||
// // Load from file
|
|
||||||
// int image_width = 0;
|
|
||||||
// int image_height = 0;
|
|
||||||
// if (texture_data == NULL) return false;
|
|
||||||
|
|
||||||
// // Create a OpenGL texture identifier
|
|
||||||
// GLuint image_texture;
|
|
||||||
// glGenTextures(1, &image_texture);
|
|
||||||
// glBindTexture(GL_TEXTURE_2D, image_texture);
|
|
||||||
|
|
||||||
// // Setup filtering parameters for display
|
|
||||||
// glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
|
|
||||||
// glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
|
|
||||||
// glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S,
|
|
||||||
// GL_CLAMP_TO_EDGE); // This is required on WebGL for non
|
|
||||||
// // power-of-two textures
|
|
||||||
// glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); //
|
|
||||||
// Same
|
|
||||||
|
|
||||||
// // Upload pixels into texture
|
|
||||||
// #if defined(GL_UNPACK_ROW_LENGTH) && !defined(__EMSCRIPTEN__)
|
|
||||||
// glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
|
|
||||||
// #endif
|
|
||||||
// glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, image_width, image_height, 0,
|
|
||||||
// GL_RGBA,
|
|
||||||
// GL_UNSIGNED_BYTE, texture_data);
|
|
||||||
|
|
||||||
// *out_texture = image_texture;
|
|
||||||
// *out_width = image_width;
|
|
||||||
// *out_height = image_height;
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace Graphics
|
} // namespace Graphics
|
||||||
} // namespace Application
|
} // namespace Application
|
||||||
} // namespace yaze
|
} // namespace yaze
|
||||||
|
|||||||
@@ -3,8 +3,6 @@
|
|||||||
|
|
||||||
#include <SDL2/SDL.h>
|
#include <SDL2/SDL.h>
|
||||||
|
|
||||||
#include <memory>
|
|
||||||
|
|
||||||
#include "Core/constants.h"
|
#include "Core/constants.h"
|
||||||
|
|
||||||
namespace yaze {
|
namespace yaze {
|
||||||
@@ -14,13 +12,11 @@ namespace Graphics {
|
|||||||
class Bitmap {
|
class Bitmap {
|
||||||
public:
|
public:
|
||||||
Bitmap() = default;
|
Bitmap() = default;
|
||||||
Bitmap(int width, int height, char *data);
|
Bitmap(int width, int height, char *data)
|
||||||
|
: width_(width), height_(height), pixel_data_(data) {}
|
||||||
|
|
||||||
int GetWidth();
|
int GetWidth() const { return width_; }
|
||||||
int GetHeight();
|
int GetHeight() const { return height_; }
|
||||||
|
|
||||||
bool LoadBitmapFromROM(unsigned char *texture_data, int *out_width,
|
|
||||||
int *out_height);
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
int width_;
|
int width_;
|
||||||
|
|||||||
Reference in New Issue
Block a user