LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-20 12:40:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

newFont and setFont now have a default size argument once again

Browse Source
This commit is contained in:
Bart van Strien
2010-11-05 08:14:34 +01:00
parent 9c4f04cc5c
commit 20f5706005
2 changed files with 51 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/scripts/graphics.lua
+6 -6
View File
@@ -1245,23 +1245,23 @@ AAIAAAxQCuxfDzz1AB8IAAAAAAC6ufC4AAAAALrCZ5H+if4dCkwHbQAAAAgAAQAAAAAAAA==
]] ]]
love.graphics.newFont = function(font, size) love.graphics.newFont = function(font, size)
if type(font) == "number" then if type(font) == "number" or not font then
size = font size = font
font = love.filesystem.newFileData(vera_ttf_b64, "Vera.ttf", "base64") font = love.filesystem.newFileData(vera_ttf_b64, "Vera.ttf", "base64")
end end
return love.graphics.newFont1(font, size) return love.graphics.newFont1(font, size or 12)
end end
love.graphics.setFont = function(font, size) love.graphics.setFont = function(font, size)
if type(font) == "number" then if type(font) == "number" or not font then
size = font size = font
font = love.filesystem.newFileData(vera_ttf_b64, "Vera.ttf", "base64") font = love.filesystem.newFileData(vera_ttf_b64, "Vera.ttf", "base64")
end end
return love.graphics.setFont1(font, size) return love.graphics.setFont1(font, size or 12)
end end
love.graphics.print = function (...) love.graphics.print = function (...)
if not love.graphics.getFont() then if not love.graphics.getFont() then
love.graphics.setFont(12) love.graphics.setFont(12)
end end
love.graphics.print1(...) love.graphics.print1(...)
@@ -1269,7 +1269,7 @@ AAIAAAxQCuxfDzz1AB8IAAAAAAC6ufC4AAAAALrCZ5H+if4dCkwHbQAAAAgAAQAAAAAAAA==
end end
love.graphics.printf = function (...) love.graphics.printf = function (...)
if not love.graphics.getFont() then if not love.graphics.getFont() then
love.graphics.setFont(12) love.graphics.setFont(12)
end end
love.graphics.printf1(...) love.graphics.printf1(...)
src/scripts/graphics.lua.h
+45 -43
View File
@@ -6114,23 +6114,25 @@ const unsigned char graphics_lua[] =
0x65,0x77,0x46,0x6F,0x6E,0x74,0x20,0x3D,0x20,0x66,0x75,0x6E,0x63,0x74,0x69, 0x65,0x77,0x46,0x6F,0x6E,0x74,0x20,0x3D,0x20,0x66,0x75,0x6E,0x63,0x74,0x69,
0x6F,0x6E,0x28,0x66,0x6F,0x6E,0x74,0x2C,0x20,0x73,0x69,0x7A,0x65,0x29,0x0D, 0x6F,0x6E,0x28,0x66,0x6F,0x6E,0x74,0x2C,0x20,0x73,0x69,0x7A,0x65,0x29,0x0D,
0x0A,0x09,0x09,0x69,0x66,0x20,0x74,0x79,0x70,0x65,0x28,0x66,0x6F,0x6E,0x74, 0x0A,0x09,0x09,0x69,0x66,0x20,0x74,0x79,0x70,0x65,0x28,0x66,0x6F,0x6E,0x74,
0x29,0x20,0x3D,0x3D,0x20,0x22,0x6E,0x75,0x6D,0x62,0x65,0x72,0x22,0x20,0x74, 0x29,0x20,0x3D,0x3D,0x20,0x22,0x6E,0x75,0x6D,0x62,0x65,0x72,0x22,0x20,0x6F,
0x68,0x65,0x6E,0x0D,0x0A,0x09,0x09,0x09,0x73,0x69,0x7A,0x65,0x20,0x3D,0x20, 0x72,0x20,0x6E,0x6F,0x74,0x20,0x66,0x6F,0x6E,0x74,0x20,0x74,0x68,0x65,0x6E,
0x66,0x6F,0x6E,0x74,0x0D,0x0A,0x09,0x09,0x09,0x66,0x6F,0x6E,0x74,0x20,0x3D, 0x0D,0x0A,0x09,0x09,0x09,0x73,0x69,0x7A,0x65,0x20,0x3D,0x20,0x66,0x6F,0x6E,
0x20,0x6C,0x6F,0x76,0x65,0x2E,0x66,0x69,0x6C,0x65,0x73,0x79,0x73,0x74,0x65, 0x74,0x0D,0x0A,0x09,0x09,0x09,0x66,0x6F,0x6E,0x74,0x20,0x3D,0x20,0x6C,0x6F,
0x6D,0x2E,0x6E,0x65,0x77,0x46,0x69,0x6C,0x65,0x44,0x61,0x74,0x61,0x28,0x76, 0x76,0x65,0x2E,0x66,0x69,0x6C,0x65,0x73,0x79,0x73,0x74,0x65,0x6D,0x2E,0x6E,
0x65,0x72,0x61,0x5F,0x74,0x74,0x66,0x5F,0x62,0x36,0x34,0x2C,0x20,0x22,0x56, 0x65,0x77,0x46,0x69,0x6C,0x65,0x44,0x61,0x74,0x61,0x28,0x76,0x65,0x72,0x61,
0x65,0x72,0x61,0x2E,0x74,0x74,0x66,0x22,0x2C,0x20,0x22,0x62,0x61,0x73,0x65, 0x5F,0x74,0x74,0x66,0x5F,0x62,0x36,0x34,0x2C,0x20,0x22,0x56,0x65,0x72,0x61,
0x36,0x34,0x22,0x29,0x0D,0x0A,0x09,0x09,0x65,0x6E,0x64,0x0D,0x0A,0x09,0x09, 0x2E,0x74,0x74,0x66,0x22,0x2C,0x20,0x22,0x62,0x61,0x73,0x65,0x36,0x34,0x22,
0x72,0x65,0x74,0x75,0x72,0x6E,0x20,0x6C,0x6F,0x76,0x65,0x2E,0x67,0x72,0x61, 0x29,0x0D,0x0A,0x09,0x09,0x65,0x6E,0x64,0x0D,0x0A,0x09,0x09,0x72,0x65,0x74,
0x70,0x68,0x69,0x63,0x73,0x2E,0x6E,0x65,0x77,0x46,0x6F,0x6E,0x74,0x31,0x28, 0x75,0x72,0x6E,0x20,0x6C,0x6F,0x76,0x65,0x2E,0x67,0x72,0x61,0x70,0x68,0x69,
0x66,0x6F,0x6E,0x74,0x2C,0x20,0x73,0x69,0x7A,0x65,0x29,0x0D,0x0A,0x09,0x65, 0x63,0x73,0x2E,0x6E,0x65,0x77,0x46,0x6F,0x6E,0x74,0x31,0x28,0x66,0x6F,0x6E,
0x6E,0x64,0x0D,0x0A,0x0D,0x0A,0x09,0x6C,0x6F,0x76,0x65,0x2E,0x67,0x72,0x61, 0x74,0x2C,0x20,0x73,0x69,0x7A,0x65,0x20,0x6F,0x72,0x20,0x31,0x32,0x29,0x0D,
0x70,0x68,0x69,0x63,0x73,0x2E,0x73,0x65,0x74,0x46,0x6F,0x6E,0x74,0x20,0x3D, 0x0A,0x09,0x65,0x6E,0x64,0x0D,0x0A,0x0D,0x0A,0x09,0x6C,0x6F,0x76,0x65,0x2E,
0x20,0x66,0x75,0x6E,0x63,0x74,0x69,0x6F,0x6E,0x28,0x66,0x6F,0x6E,0x74,0x2C, 0x67,0x72,0x61,0x70,0x68,0x69,0x63,0x73,0x2E,0x73,0x65,0x74,0x46,0x6F,0x6E,
0x20,0x73,0x69,0x7A,0x65,0x29,0x0D,0x0A,0x09,0x09,0x69,0x66,0x20,0x74,0x79, 0x74,0x20,0x3D,0x20,0x66,0x75,0x6E,0x63,0x74,0x69,0x6F,0x6E,0x28,0x66,0x6F,
0x70,0x65,0x28,0x66,0x6F,0x6E,0x74,0x29,0x20,0x3D,0x3D,0x20,0x22,0x6E,0x75, 0x6E,0x74,0x2C,0x20,0x73,0x69,0x7A,0x65,0x29,0x0D,0x0A,0x09,0x09,0x69,0x66,
0x6D,0x62,0x65,0x72,0x22,0x20,0x74,0x68,0x65,0x6E,0x0D,0x0A,0x09,0x09,0x09, 0x20,0x74,0x79,0x70,0x65,0x28,0x66,0x6F,0x6E,0x74,0x29,0x20,0x3D,0x3D,0x20,
0x22,0x6E,0x75,0x6D,0x62,0x65,0x72,0x22,0x20,0x6F,0x72,0x20,0x6E,0x6F,0x74,
0x20,0x66,0x6F,0x6E,0x74,0x20,0x74,0x68,0x65,0x6E,0x0D,0x0A,0x09,0x09,0x09,
0x73,0x69,0x7A,0x65,0x20,0x3D,0x20,0x66,0x6F,0x6E,0x74,0x0D,0x0A,0x09,0x09, 0x73,0x69,0x7A,0x65,0x20,0x3D,0x20,0x66,0x6F,0x6E,0x74,0x0D,0x0A,0x09,0x09,
0x09,0x66,0x6F,0x6E,0x74,0x20,0x3D,0x20,0x6C,0x6F,0x76,0x65,0x2E,0x66,0x69, 0x09,0x66,0x6F,0x6E,0x74,0x20,0x3D,0x20,0x6C,0x6F,0x76,0x65,0x2E,0x66,0x69,
0x6C,0x65,0x73,0x79,0x73,0x74,0x65,0x6D,0x2E,0x6E,0x65,0x77,0x46,0x69,0x6C, 0x6C,0x65,0x73,0x79,0x73,0x74,0x65,0x6D,0x2E,0x6E,0x65,0x77,0x46,0x69,0x6C,
@@ -6140,35 +6142,35 @@ const unsigned char graphics_lua[] =
0x65,0x6E,0x64,0x0D,0x0A,0x09,0x09,0x72,0x65,0x74,0x75,0x72,0x6E,0x20,0x6C, 0x65,0x6E,0x64,0x0D,0x0A,0x09,0x09,0x72,0x65,0x74,0x75,0x72,0x6E,0x20,0x6C,
0x6F,0x76,0x65,0x2E,0x67,0x72,0x61,0x70,0x68,0x69,0x63,0x73,0x2E,0x73,0x65, 0x6F,0x76,0x65,0x2E,0x67,0x72,0x61,0x70,0x68,0x69,0x63,0x73,0x2E,0x73,0x65,
0x74,0x46,0x6F,0x6E,0x74,0x31,0x28,0x66,0x6F,0x6E,0x74,0x2C,0x20,0x73,0x69, 0x74,0x46,0x6F,0x6E,0x74,0x31,0x28,0x66,0x6F,0x6E,0x74,0x2C,0x20,0x73,0x69,
0x7A,0x65,0x29,0x0D,0x0A,0x09,0x65,0x6E,0x64,0x0D,0x0A,0x0D,0x0A,0x09,0x6C, 0x7A,0x65,0x20,0x6F,0x72,0x20,0x31,0x32,0x29,0x0D,0x0A,0x09,0x65,0x6E,0x64,
0x6F,0x76,0x65,0x2E,0x67,0x72,0x61,0x70,0x68,0x69,0x63,0x73,0x2E,0x70,0x72, 0x0D,0x0A,0x0D,0x0A,0x09,0x6C,0x6F,0x76,0x65,0x2E,0x67,0x72,0x61,0x70,0x68,
0x69,0x6E,0x74,0x20,0x3D,0x20,0x66,0x75,0x6E,0x63,0x74,0x69,0x6F,0x6E,0x20, 0x69,0x63,0x73,0x2E,0x70,0x72,0x69,0x6E,0x74,0x20,0x3D,0x20,0x66,0x75,0x6E,
0x28,0x2E,0x2E,0x2E,0x29,0x0D,0x0A,0x09,0x09,0x69,0x66,0x20,0x6E,0x6F,0x74, 0x63,0x74,0x69,0x6F,0x6E,0x20,0x28,0x2E,0x2E,0x2E,0x29,0x0D,0x0A,0x09,0x09,
0x20,0x6C,0x6F,0x76,0x65,0x2E,0x67,0x72,0x61,0x70,0x68,0x69,0x63,0x73,0x2E, 0x69,0x66,0x20,0x6E,0x6F,0x74,0x20,0x6C,0x6F,0x76,0x65,0x2E,0x67,0x72,0x61,
0x67,0x65,0x74,0x46,0x6F,0x6E,0x74,0x28,0x29,0x20,0x74,0x68,0x65,0x6E,0x20, 0x70,0x68,0x69,0x63,0x73,0x2E,0x67,0x65,0x74,0x46,0x6F,0x6E,0x74,0x28,0x29,
0x0D,0x0A,0x09,0x09,0x09,0x6C,0x6F,0x76,0x65,0x2E,0x67,0x72,0x61,0x70,0x68, 0x20,0x74,0x68,0x65,0x6E,0x0D,0x0A,0x09,0x09,0x09,0x6C,0x6F,0x76,0x65,0x2E,
0x69,0x63,0x73,0x2E,0x73,0x65,0x74,0x46,0x6F,0x6E,0x74,0x28,0x31,0x32,0x29,
0x0D,0x0A,0x09,0x09,0x65,0x6E,0x64,0x0D,0x0A,0x09,0x09,0x6C,0x6F,0x76,0x65,
0x2E,0x67,0x72,0x61,0x70,0x68,0x69,0x63,0x73,0x2E,0x70,0x72,0x69,0x6E,0x74,
0x31,0x28,0x2E,0x2E,0x2E,0x29,0x0D,0x0A,0x09,0x09,0x6C,0x6F,0x76,0x65,0x2E,
0x67,0x72,0x61,0x70,0x68,0x69,0x63,0x73,0x2E,0x70,0x72,0x69,0x6E,0x74,0x20,
0x3D,0x20,0x6C,0x6F,0x76,0x65,0x2E,0x67,0x72,0x61,0x70,0x68,0x69,0x63,0x73,
0x2E,0x70,0x72,0x69,0x6E,0x74,0x31,0x0D,0x0A,0x09,0x65,0x6E,0x64,0x0D,0x0A,
0x0D,0x0A,0x09,0x6C,0x6F,0x76,0x65,0x2E,0x67,0x72,0x61,0x70,0x68,0x69,0x63,
0x73,0x2E,0x70,0x72,0x69,0x6E,0x74,0x66,0x20,0x3D,0x20,0x66,0x75,0x6E,0x63,
0x74,0x69,0x6F,0x6E,0x20,0x28,0x2E,0x2E,0x2E,0x29,0x0D,0x0A,0x09,0x09,0x69,
0x66,0x20,0x6E,0x6F,0x74,0x20,0x6C,0x6F,0x76,0x65,0x2E,0x67,0x72,0x61,0x70,
0x68,0x69,0x63,0x73,0x2E,0x67,0x65,0x74,0x46,0x6F,0x6E,0x74,0x28,0x29,0x20,
0x74,0x68,0x65,0x6E,0x20,0x0D,0x0A,0x09,0x09,0x09,0x6C,0x6F,0x76,0x65,0x2E,
0x67,0x72,0x61,0x70,0x68,0x69,0x63,0x73,0x2E,0x73,0x65,0x74,0x46,0x6F,0x6E, 0x67,0x72,0x61,0x70,0x68,0x69,0x63,0x73,0x2E,0x73,0x65,0x74,0x46,0x6F,0x6E,
0x74,0x28,0x31,0x32,0x29,0x0D,0x0A,0x09,0x09,0x65,0x6E,0x64,0x0D,0x0A,0x09, 0x74,0x28,0x31,0x32,0x29,0x0D,0x0A,0x09,0x09,0x65,0x6E,0x64,0x0D,0x0A,0x09,
0x09,0x6C,0x6F,0x76,0x65,0x2E,0x67,0x72,0x61,0x70,0x68,0x69,0x63,0x73,0x2E, 0x09,0x6C,0x6F,0x76,0x65,0x2E,0x67,0x72,0x61,0x70,0x68,0x69,0x63,0x73,0x2E,
0x70,0x72,0x69,0x6E,0x74,0x66,0x31,0x28,0x2E,0x2E,0x2E,0x29,0x0D,0x0A,0x09, 0x70,0x72,0x69,0x6E,0x74,0x31,0x28,0x2E,0x2E,0x2E,0x29,0x0D,0x0A,0x09,0x09,
0x09,0x6C,0x6F,0x76,0x65,0x2E,0x67,0x72,0x61,0x70,0x68,0x69,0x63,0x73,0x2E, 0x6C,0x6F,0x76,0x65,0x2E,0x67,0x72,0x61,0x70,0x68,0x69,0x63,0x73,0x2E,0x70,
0x70,0x72,0x69,0x6E,0x74,0x66,0x20,0x3D,0x20,0x6C,0x6F,0x76,0x65,0x2E,0x67, 0x72,0x69,0x6E,0x74,0x20,0x3D,0x20,0x6C,0x6F,0x76,0x65,0x2E,0x67,0x72,0x61,
0x72,0x61,0x70,0x68,0x69,0x63,0x73,0x2E,0x70,0x72,0x69,0x6E,0x74,0x66,0x31, 0x70,0x68,0x69,0x63,0x73,0x2E,0x70,0x72,0x69,0x6E,0x74,0x31,0x0D,0x0A,0x09,
0x0D,0x0A,0x09,0x65,0x6E,0x64,0x0D,0x0A,0x0D,0x0A,0x65,0x6E,0x64,0x0D,0x0A, 0x65,0x6E,0x64,0x0D,0x0A,0x0D,0x0A,0x09,0x6C,0x6F,0x76,0x65,0x2E,0x67,0x72,
0x61,0x70,0x68,0x69,0x63,0x73,0x2E,0x70,0x72,0x69,0x6E,0x74,0x66,0x20,0x3D,
0x20,0x66,0x75,0x6E,0x63,0x74,0x69,0x6F,0x6E,0x20,0x28,0x2E,0x2E,0x2E,0x29,
0x0D,0x0A,0x09,0x09,0x69,0x66,0x20,0x6E,0x6F,0x74,0x20,0x6C,0x6F,0x76,0x65,
0x2E,0x67,0x72,0x61,0x70,0x68,0x69,0x63,0x73,0x2E,0x67,0x65,0x74,0x46,0x6F,
0x6E,0x74,0x28,0x29,0x20,0x74,0x68,0x65,0x6E,0x0D,0x0A,0x09,0x09,0x09,0x6C,
0x6F,0x76,0x65,0x2E,0x67,0x72,0x61,0x70,0x68,0x69,0x63,0x73,0x2E,0x73,0x65,
0x74,0x46,0x6F,0x6E,0x74,0x28,0x31,0x32,0x29,0x0D,0x0A,0x09,0x09,0x65,0x6E,
0x64,0x0D,0x0A,0x09,0x09,0x6C,0x6F,0x76,0x65,0x2E,0x67,0x72,0x61,0x70,0x68,
0x69,0x63,0x73,0x2E,0x70,0x72,0x69,0x6E,0x74,0x66,0x31,0x28,0x2E,0x2E,0x2E,
0x29,0x0D,0x0A,0x09,0x09,0x6C,0x6F,0x76,0x65,0x2E,0x67,0x72,0x61,0x70,0x68,
0x69,0x63,0x73,0x2E,0x70,0x72,0x69,0x6E,0x74,0x66,0x20,0x3D,0x20,0x6C,0x6F,
0x76,0x65,0x2E,0x67,0x72,0x61,0x70,0x68,0x69,0x63,0x73,0x2E,0x70,0x72,0x69,
0x6E,0x74,0x66,0x31,0x0D,0x0A,0x09,0x65,0x6E,0x64,0x0D,0x0A,0x0D,0x0A,0x65,
0x6E,0x64,0x0D,0x0A,
}; };
// [/graphics.lua] // [/graphics.lua]