diff --git a/src/frontend/BlocksPreview.cpp b/src/frontend/BlocksPreview.cpp index 723cdc10..b400527e 100644 --- a/src/frontend/BlocksPreview.cpp +++ b/src/frontend/BlocksPreview.cpp @@ -35,7 +35,8 @@ ImageData* BlocksPreview::draw( // something went wrong... break; case BlockModel::block: - batch->blockCube(glm::vec3(size * 0.63f), texfaces, glm::vec4(1.0f), !def->rt.emissive); + batch->blockCube(glm::vec3(size * 0.63f), texfaces, + glm::vec4(1.0f), !def->rt.emissive); break; case BlockModel::aabb: batch->blockCube(def->hitbox.size() * glm::vec3(size * 0.63f), diff --git a/src/frontend/InventoryView.cpp b/src/frontend/InventoryView.cpp index 93c2f0bc..050b075e 100644 --- a/src/frontend/InventoryView.cpp +++ b/src/frontend/InventoryView.cpp @@ -153,9 +153,6 @@ void SlotView::draw(Batch2D* batch, Assets* assets) { batch->color = glm::vec4(1.0f); - Viewport viewport(Window::width, Window::height); - GfxContext ctx(nullptr, viewport, batch); - auto previews = frontend->getBlocksAtlas(); auto indices = content->getIndices(); diff --git a/src/graphics/Texture.h b/src/graphics/Texture.h index 595ba411..2dc9064e 100644 --- a/src/graphics/Texture.h +++ b/src/graphics/Texture.h @@ -8,19 +8,19 @@ class ImageData; class Texture { public: - uint id; - int width; - int height; - Texture(uint id, int width, int height); - Texture(ubyte* data, int width, int height, uint format); - ~Texture(); + uint id; + int width; + int height; + Texture(uint id, int width, int height); + Texture(ubyte* data, int width, int height, uint format); + ~Texture(); - void bind(); - void reload(ubyte* data); + void bind(); + void reload(ubyte* data); ImageData* readData(); - static Texture* from(const ImageData* image); + static Texture* from(const ImageData* image); }; #endif /* GRAPHICS_TEXTURE_H_ */