diff --git a/game/engine/Shader.lua b/game/engine/Shader.lua index b7dba23d58b3dda18c3dc228d05c7201de9e012b..c6cea871122754558263fac5ba9fff0e7a948e89 100644 --- a/game/engine/Shader.lua +++ b/game/engine/Shader.lua @@ -128,20 +128,20 @@ end function _M:setUniform(k, v) if type(v) == "number" then - print("[SHADER] setting param", k, v) +-- print("[SHADER] setting param", k, v) self.shad:paramNumber(k, v) elseif type(v) == "table" then if v.texture then - print("[SHADER] setting texture param", k, v.texture) +-- print("[SHADER] setting texture param", k, v.texture) self.shad:paramTexture(k, v.texture, v.is3d) elseif #v == 2 then - print("[SHADER] setting vec2 param", k, v[1], v[2]) +-- print("[SHADER] setting vec2 param", k, v[1], v[2]) self.shad:paramNumber2(k, v[1], v[2]) elseif #v == 3 then - print("[SHADER] setting vec3 param", k, v[1], v[2], v[3]) +-- print("[SHADER] setting vec3 param", k, v[1], v[2], v[3]) self.shad:paramNumber3(k, v[1], v[2], v[3]) elseif #v == 4 then - print("[SHADER] setting vec4 param", k, v[1], v[2], v[3], v[4]) +-- print("[SHADER] setting vec4 param", k, v[1], v[2], v[3], v[4]) self.shad:paramNumber4(k, v[1], v[2], v[3], v[4]) end end diff --git a/game/modules/tome/class/Game.lua b/game/modules/tome/class/Game.lua index 084ed7230ee4c4bb1c3f60864033884dfb059a4d..40e5d81c0fbdc919deeb45f99627366fd9763870 100644 --- a/game/modules/tome/class/Game.lua +++ b/game/modules/tome/class/Game.lua @@ -218,8 +218,8 @@ function _M:setupDisplayMode() self:saveSettings("tome.gfxmode", ("tome.gfxmode = %d\n"):format(self.gfxmode)) -- Create the framebuffer --- self.fbo = core.display.newFBO(Map.viewport.width, Map.viewport.height) --- if self.fbo then self.fbo_shader = Shader.new("main_fbo") end + self.fbo = core.display.newFBO(Map.viewport.width, Map.viewport.height) + if self.fbo then self.fbo_shader = Shader.new("main_fbo") end end function _M:setupMiniMap() diff --git a/src/core_lua.c b/src/core_lua.c index 552fd1968c967da2dd17be566a6cbabd41c82fe1..0b82f40e9f746bbea4b0f23ed23df8810b94ed53 100644 --- a/src/core_lua.c +++ b/src/core_lua.c @@ -1214,6 +1214,7 @@ static int gl_fbo_toscreen(lua_State *L) useShader(*s, 0, 0, w, h, r, g, b, a); } + glDisable(GL_BLEND); glBindTexture(GL_TEXTURE_2D, fbo->texture); glBegin( GL_QUADS ); /* Draw A Quad */ glTexCoord2f(0,1); glVertex2f(0 + x, 0 + y); @@ -1224,6 +1225,7 @@ static int gl_fbo_toscreen(lua_State *L) if (lua_isuserdata(L, 6)) glUseProgramObjectARB(0); if (lua_isnumber(L, 7)) glColor4f(1, 1, 1, 1); + glEnable(GL_BLEND); return 0; }