plop

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

game/engines/default/engine/ui/Base.lua

@@ -41,8 +41,13 @@ function _M:init(t, no_gen)
 	self.key = KeyBind.new()
 
 	if t.font then
-		self.font = core.display.newFont(t.font[1], t.font[2])
-		self.font_h = self.font:lineSkip()
+		if type(t.font) == "table" then
+			self.font = core.display.newFont(t.font[1], t.font[2])
+			self.font_h = self.font:lineSkip()
+		else
+			self.font = t.font
+			self.font_h = self.font:lineSkip()
+		end
 	end
 
 	if not no_gen then self:generate() end

game/modules/boot/data/gfx/shaders/main_fbo.frag

@@ -68,7 +68,7 @@ void main(void)
 				}
 			}
 		}
-		sample /= float((motionblur*1.5) * ((motionblur*0.5));
+		sample /= (motionblur*1.5) * (motionblur*0.5);
 //		gl_FragColor = sample * (0.3 + noise * 0.7);
 		gl_FragColor = sample;
 	}

game/modules/boot/dialogs/MainMenu.lua

@@ -47,7 +47,7 @@ function _M:init()
 	}
 
 	self.c_background = Button.new{text=game.stopped and "Enable background" or "Disable background", width=150, fct=function() self:switchBackground() end}
-	self.c_version = Textzone.new{auto_width=true, auto_height=true, text=("#{bold}##B9E100#T-Engine4 version: %d.%d.%d"):format(engine.version[1], engine.version[2], engine.version[3])}
+	self.c_version = Textzone.new{font=self.font_bold, auto_width=true, auto_height=true, text=("#B9E100#T-Engine4 version: %d.%d.%d"):format(engine.version[1], engine.version[2], engine.version[3])}
 
 	if profile.auth then
 		self.logged_url = "http://te4.org/players/"..profile.auth.page

game/modules/tome/data/gfx/shaders/main_fbo.frag

@@ -89,7 +89,7 @@ void main(void)
 				sample += texture2D(tex, vec2(gl_TexCoord[0].xy+vec2(float(i)*offset.x, float(j)*offset.y)));
 			}
 		}
-		sample /= float((blur*2.0) * (blur*2.0));
+		sample /= (blur*2.0) * (blur*2.0);
 		gl_FragColor = sample;
 	}