From 4e6e2916245e78da3519c41b8a112e292079f62e Mon Sep 17 00:00:00 2001 From: Snowdream Date: Wed, 20 Jul 2022 02:55:04 -0400 Subject: [PATCH] Revert adding Bitmap#v_flip/h_flip --- binding/bitmap-binding.cpp | 22 ---------------- src/display/bitmap.cpp | 51 -------------------------------------- src/display/bitmap.h | 3 --- 3 files changed, 76 deletions(-) diff --git a/binding/bitmap-binding.cpp b/binding/bitmap-binding.cpp index 35f175e5..b8c7b086 100644 --- a/binding/bitmap-binding.cpp +++ b/binding/bitmap-binding.cpp @@ -225,26 +225,6 @@ RB_METHOD(bitmapSetPixel) { return self; } -RB_METHOD(bitmapHFlip) { - RB_UNUSED_PARAM; - - Bitmap *b = getPrivateData(self); - - b->hFlip(); - - return Qnil; -} - -RB_METHOD(bitmapVFlip) { - RB_UNUSED_PARAM; - - Bitmap *b = getPrivateData(self); - - b->vFlip(); - - return Qnil; -} - RB_METHOD(bitmapHueChange) { Bitmap *b = getPrivateData(self); @@ -760,8 +740,6 @@ void bitmapBindingInit() { _rb_define_method(klass, "clear", bitmapClear); _rb_define_method(klass, "get_pixel", bitmapGetPixel); _rb_define_method(klass, "set_pixel", bitmapSetPixel); - _rb_define_method(klass, "h_flip", bitmapHFlip); - _rb_define_method(klass, "v_flip", bitmapVFlip); _rb_define_method(klass, "hue_change", bitmapHueChange); _rb_define_method(klass, "draw_text", bitmapDrawText); _rb_define_method(klass, "text_size", bitmapTextSize); diff --git a/src/display/bitmap.cpp b/src/display/bitmap.cpp index 8e87f23e..f4e2558d 100644 --- a/src/display/bitmap.cpp +++ b/src/display/bitmap.cpp @@ -398,41 +398,6 @@ struct BitmapPrivate self->modified(); } - - void flip(const IntRect &srcRect) - { - TEXFBO ¤t = getGLTypes(); - TEXFBO newTex = shState->texPool().request(current.width, current.height); - - SimpleShader &shader = shState->shaders().simple; - shader.bind(); - shader.setTexOffsetX(0); - bindTexture(shader); - - Quad &quad = shState->gpQuad(); - quad.setTexPosRect(srcRect, IntRect(0, 0, current.width, current.height)); - quad.setColor(Vec4(1, 1, 1, 1)); - - glState.blend.pushSet(false); - pushSetViewport(shader); - - FBO::bind(newTex.fbo); - blitQuad(quad); - - popViewport(); - glState.blend.pop(); - - if (!animation.enabled) { - shState->texPool().release(gl); - gl = newTex; - } - else { - shState->texPool().release(animation.frames[animation.currentFrameI()]); - animation.frames[animation.currentFrameI()] = newTex; - } - - onModified(); - } }; struct BitmapOpenHandler : FileSystem::OpenHandler @@ -1313,22 +1278,6 @@ void Bitmap::setPixel(int x, int y, const Color &color) p->onModified(false); } -void Bitmap::vFlip() { - guardDisposed(); - GUARD_MEGA; - - TEXFBO ¤t = getGLTypes(); - p->flip(IntRect(0, current.height, current.width, -current.height)); -} - -void Bitmap::hFlip() { - guardDisposed(); - GUARD_MEGA; - - TEXFBO ¤t = getGLTypes(); - p->flip(IntRect(current.width, 0, -current.width, current.height)); -} - bool Bitmap::getRaw(void *output, int output_size) { if (output_size != width()*height()*4) return false; diff --git a/src/display/bitmap.h b/src/display/bitmap.h index 7fca122a..8d51d774 100644 --- a/src/display/bitmap.h +++ b/src/display/bitmap.h @@ -87,9 +87,6 @@ public: Color getPixel(int x, int y) const; void setPixel(int x, int y, const Color &color); - void vFlip(); - void hFlip(); - bool getRaw(void *output, int output_size); void replaceRaw(void *pixel_data, int size); void saveToFile(const char *filename);