From 636658791a71d3e22112c7f7a7b0465fcec848c4 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Wed, 30 Jun 2010 13:50:00 +0000
Subject: [PATCH] fix main FBO
git-svn-id: http://svn.net-core.org/repos/t-engine4@870 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/engine/Shader.lua | 10 +++++-----
game/modules/tome/class/Game.lua | 4 ++--
src/core_lua.c | 2 ++
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/game/engine/Shader.lua b/game/engine/Shader.lua
index b7dba23d58..c6cea87112 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 084ed7230e..40e5d81c0f 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 552fd1968c..0b82f40e9f 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;
}
--
GitLab