fix main FBO

git-svn-id: http://svn.net-core.org/repos/t-engine4@870 51575b47-30f0-44d4-a5cc-537603b46e54

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

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()

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;
 }