From 1b773ad2c250e09c09c065eb3eec64bfebde09ca Mon Sep 17 00:00:00 2001 From: chai Date: Fri, 18 May 2018 14:39:38 +0800 Subject: =?UTF-8?q?=E4=BF=AE=E6=94=B9userdata=E5=88=9B=E5=BB=BA=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/libjin/render/canvas.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/libjin/render/canvas.cpp') diff --git a/src/libjin/render/canvas.cpp b/src/libjin/render/canvas.cpp index 376c076..89d0d77 100644 --- a/src/libjin/render/canvas.cpp +++ b/src/libjin/render/canvas.cpp @@ -6,26 +6,26 @@ namespace jin { namespace render { - Canvas::Canvas() :Drawable() + Canvas::Canvas(int w, int h) + : Drawable(w, h) { + init(); } Canvas::~Canvas() { } - // no canvas has binded shared GLint Canvas::cur = -1; - bool Canvas::init(int w, int h) + bool Canvas::init() { - Drawable::init(w, h); - Drawable::setVertices( + setVertices( new float [DRAWABLE_V_SIZE] { 0, 0, - 0, (float)h, - (float)w, (float)h, - (float)w, 0, + 0, (float)height, + (float)width, (float)height, + (float)width, 0, }, new float [DRAWABLE_V_SIZE] { 0, 1, @@ -47,7 +47,7 @@ namespace render glBindTexture(GL_TEXTURE_2D, texture); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL); glBindTexture(GL_TEXTURE_2D, 0); glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, 0); -- cgit v1.1-26-g67d0