From 07770f3ad369ff47386310b731d349f7af1fe0d9 Mon Sep 17 00:00:00 2001 From: chai Date: Sun, 21 Oct 2018 16:21:16 +0800 Subject: =?UTF-8?q?*=E4=BF=AE=E6=94=B9=E7=BC=96=E8=AF=91=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/libjin/Graphics/je_canvas.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/libjin/Graphics/je_canvas.cpp') diff --git a/src/libjin/Graphics/je_canvas.cpp b/src/libjin/Graphics/je_canvas.cpp index b8553b5..6406e5f 100644 --- a/src/libjin/Graphics/je_canvas.cpp +++ b/src/libjin/Graphics/je_canvas.cpp @@ -1,5 +1,5 @@ #include "../core/je_configuration.h" -#if LIBJIN_MODULES_RENDER +#if defined(jin_graphics) #include "../utils/je_macros.h" #include "je_canvas.h" @@ -34,13 +34,13 @@ namespace JinEngine gl.bindFrameBuffer(fbo); // generate texture save target - texture = gl.genTexture(); - gl.bindTexture(texture); + mTexture = gl.genTexture(); + gl.bindTexture(mTexture); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); gl.texImage(GL_RGBA8, w, h, GL_RGBA, GL_UNSIGNED_BYTE, NULL); gl.bindTexture(0); - glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, 0); + glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, mTexture, 0); GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER); @@ -65,8 +65,8 @@ namespace JinEngine if (isBinded(canvas)) return; current = canvas; gl.bindFrameBuffer(canvas->fbo); - int w = canvas->size.w; - int h = canvas->size.h; + int w = canvas->mSize.w; + int h = canvas->mSize.h; /* set view port to canvas */ glViewport(0, 0, w, h); gl.ProjectionMatrix.setOrtho(0, w, 0, h, -1, 1); @@ -99,4 +99,4 @@ namespace JinEngine } // namespace Graphics } // namespace JinEngine -#endif // LIBJIN_MODULES_RENDER \ No newline at end of file +#endif // defined(jin_graphics) \ No newline at end of file -- cgit v1.1-26-g67d0