Explorar el Código

Store the vera font as file data, instead of doing that every time it is loaded

Bart van Strien hace 14 años
padre
commit
f9077ee1a6
Se han modificado 2 ficheros con 11 adiciones y 17 borrados
  1. 4 4
      src/scripts/graphics.lua
  2. 7 13
      src/scripts/graphics.lua.h

+ 4 - 4
src/scripts/graphics.lua

@@ -20,7 +20,7 @@ misrepresented as being the original software.
 
 
 do
 do
 
 
-	local vera_ttf_b64 = [[
+	local vera_ttf = love.filesystem.newFileData([[
 	AAEAAAARAQAABAAQT1MvMrRf9GMAAOtwAAAAVlBDTFTRil6XAADryAAAADZjbWFwpMPooAAA
 	AAEAAAARAQAABAAQT1MvMrRf9GMAAOtwAAAAVlBDTFTRil6XAADryAAAADZjbWFwpMPooAAA
 	sWwAAANYY3Z0IP/THTkAAB78AAAB/GZwZ23ntPHEAAAmYAAAAItnYXNwAAcABwABAUgAAAAM
 	sWwAAANYY3Z0IP/THTkAAB78AAAB/GZwZ23ntPHEAAAmYAAAAItnYXNwAAcABwABAUgAAAAM
 	Z2x5Zgx0Qc8AACbsAACKfmhkbXg08CEOAADsAAAAFUhoZWFk3YSi0AABAVQAAAA2aGhlYRBF
 	Z2x5Zgx0Qc8AACbsAACKfmhkbXg08CEOAADsAAAAFUhoZWFk3YSi0AABAVQAAAA2aGhlYRBF
@@ -1242,12 +1242,12 @@ do
 	DhwPDwkJFw4REQUSCwsSEg4JCQ8mExITEhIICAgIFhYWFRUVCA4ODg4ODg4ODg4QCBIPEw8J
 	DhwPDwkJFw4REQUSCwsSEg4JCQ8mExITEhIICAgIFhYWFRUVCA4ODg4ODg4ODg4QCBIPEw8J
 	FhERERESFxcLCwsbGxsWEggSDxQPFA8SCgkSDg4ODg4OCw4OAAAAAAACAAgAAv//AAMAAQAA
 	FhERERESFxcLCwsbGxsWEggSDxQPFA8SCgkSDg4ODg4OCw4OAAAAAAACAAgAAv//AAMAAQAA
 	AAIAAAxQCuxfDzz1AB8IAAAAAAC6ufC4AAAAALrCZ5H+if4dCkwHbQAAAAgAAQAAAAAAAA==
 	AAIAAAxQCuxfDzz1AB8IAAAAAAC6ufC4AAAAALrCZ5H+if4dCkwHbQAAAAgAAQAAAAAAAA==
-	]]
+	]], "Vera.ttf", "base64")
 
 
 	love.graphics.newFont = function(font, size)
 	love.graphics.newFont = function(font, size)
 		if type(font) == "number" or not font then
 		if type(font) == "number" or not font then
 			size = font
 			size = font
-			font = love.filesystem.newFileData(vera_ttf_b64, "Vera.ttf", "base64")
+			font = vera_ttf
 		end
 		end
 		return love.graphics.newFont1(font, size or 12)
 		return love.graphics.newFont1(font, size or 12)
 	end
 	end
@@ -1255,7 +1255,7 @@ do
 	love.graphics.setFont = function(font, size)
 	love.graphics.setFont = function(font, size)
 		if type(font) == "number" or not font then
 		if type(font) == "number" or not font then
 			size = font
 			size = font
-			font = love.filesystem.newFileData(vera_ttf_b64, "Vera.ttf", "base64")
+			font = vera_ttf
 		end
 		end
 		return love.graphics.setFont1(font, size or 12)
 		return love.graphics.setFont1(font, size or 12)
 	end
 	end

+ 7 - 13
src/scripts/graphics.lua.h

@@ -80,8 +80,9 @@ const unsigned char graphics_lua[] =
 	0x6e, 0x2e, 0x0a,
 	0x6e, 0x2e, 0x0a,
 	0x2d, 0x2d, 0x5d, 0x5d, 0x0a,0x0a,
 	0x2d, 0x2d, 0x5d, 0x5d, 0x0a,0x0a,
 	0x64, 0x6f, 0x0a,0x0a,
 	0x64, 0x6f, 0x0a,0x0a,
-	0x09, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x76, 0x65, 0x72, 0x61, 0x5f, 0x74, 0x74, 0x66, 0x5f, 0x62, 0x36, 
-	0x34, 0x20, 0x3d, 0x20, 0x5b, 0x5b, 0x0a,
+	0x09, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x76, 0x65, 0x72, 0x61, 0x5f, 0x74, 0x74, 0x66, 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, 0x65, 0x44, 0x61, 0x74, 0x61, 0x28, 0x5b, 0x5b, 0x0a,
 	0x09, 0x41, 0x41, 0x45, 0x41, 0x41, 0x41, 0x41, 0x52, 0x41, 0x51, 0x41, 0x41, 0x42, 0x41, 0x41, 0x51, 0x54, 
 	0x09, 0x41, 0x41, 0x45, 0x41, 0x41, 0x41, 0x41, 0x52, 0x41, 0x51, 0x41, 0x41, 0x42, 0x41, 0x41, 0x51, 0x54, 
 	0x31, 0x4d, 0x76, 0x4d, 0x72, 0x52, 0x66, 0x39, 0x47, 0x4d, 0x41, 0x41, 0x4f, 0x74, 0x77, 0x41, 0x41, 0x41, 
 	0x31, 0x4d, 0x76, 0x4d, 0x72, 0x52, 0x66, 0x39, 0x47, 0x4d, 0x41, 0x41, 0x4f, 0x74, 0x77, 0x41, 0x41, 0x41, 
 	0x41, 0x56, 0x6c, 0x42, 0x44, 0x54, 0x46, 0x54, 0x52, 0x69, 0x6c, 0x36, 0x58, 0x41, 0x41, 0x44, 0x72, 0x79, 
 	0x41, 0x56, 0x6c, 0x42, 0x44, 0x54, 0x46, 0x54, 0x52, 0x69, 0x6c, 0x36, 0x58, 0x41, 0x41, 0x44, 0x72, 0x79, 
@@ -6187,7 +6188,8 @@ const unsigned char graphics_lua[] =
 	0x41, 0x41, 0x4c, 0x72, 0x43, 0x5a, 0x35, 0x48, 0x2b, 0x69, 0x66, 0x34, 0x64, 0x43, 0x6b, 0x77, 0x48, 0x62, 
 	0x41, 0x41, 0x4c, 0x72, 0x43, 0x5a, 0x35, 0x48, 0x2b, 0x69, 0x66, 0x34, 0x64, 0x43, 0x6b, 0x77, 0x48, 0x62, 
 	0x51, 0x41, 0x41, 0x41, 0x41, 0x67, 0x41, 0x41, 0x51, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x3d, 
 	0x51, 0x41, 0x41, 0x41, 0x41, 0x67, 0x41, 0x41, 0x51, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x3d, 
 	0x3d, 0x0a,
 	0x3d, 0x0a,
-	0x09, 0x5d, 0x5d, 0x0a,0x0a,
+	0x09, 0x5d, 0x5d, 0x2c, 0x20, 0x22, 0x56, 0x65, 0x72, 0x61, 0x2e, 0x74, 0x74, 0x66, 0x22, 0x2c, 0x20, 0x22, 
+	0x62, 0x61, 0x73, 0x65, 0x36, 0x34, 0x22, 0x29, 0x0a,0x0a,
 	0x09, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x73, 0x2e, 0x6e, 0x65, 0x77, 
 	0x09, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x73, 0x2e, 0x6e, 0x65, 0x77, 
 	0x46, 0x6f, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x66, 0x6f, 
 	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, 0x0a,
 	0x6e, 0x74, 0x2c, 0x20, 0x73, 0x69, 0x7a, 0x65, 0x29, 0x0a,
@@ -6195,11 +6197,7 @@ const unsigned char graphics_lua[] =
 	0x20, 0x22, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x20, 0x6f, 0x72, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x66, 
 	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, 0x0a,
 	0x6f, 0x6e, 0x74, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a,
 	0x09, 0x09, 0x09, 0x73, 0x69, 0x7a, 0x65, 0x20, 0x3d, 0x20, 0x66, 0x6f, 0x6e, 0x74, 0x0a,
 	0x09, 0x09, 0x09, 0x73, 0x69, 0x7a, 0x65, 0x20, 0x3d, 0x20, 0x66, 0x6f, 0x6e, 0x74, 0x0a,
-	0x09, 0x09, 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, 0x65, 0x44, 0x61, 0x74, 
-	0x61, 0x28, 0x76, 0x65, 0x72, 0x61, 0x5f, 0x74, 0x74, 0x66, 0x5f, 0x62, 0x36, 0x34, 0x2c, 0x20, 0x22, 0x56, 
-	0x65, 0x72, 0x61, 0x2e, 0x74, 0x74, 0x66, 0x22, 0x2c, 0x20, 0x22, 0x62, 0x61, 0x73, 0x65, 0x36, 0x34, 0x22, 
-	0x29, 0x0a,
+	0x09, 0x09, 0x09, 0x66, 0x6f, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x76, 0x65, 0x72, 0x61, 0x5f, 0x74, 0x74, 0x66, 0x0a,
 	0x09, 0x09, 0x65, 0x6e, 0x64, 0x0a,
 	0x09, 0x09, 0x65, 0x6e, 0x64, 0x0a,
 	0x09, 0x09, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x67, 0x72, 0x61, 0x70, 
 	0x09, 0x09, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x67, 0x72, 0x61, 0x70, 
 	0x68, 0x69, 0x63, 0x73, 0x2e, 0x6e, 0x65, 0x77, 0x46, 0x6f, 0x6e, 0x74, 0x31, 0x28, 0x66, 0x6f, 0x6e, 0x74, 
 	0x68, 0x69, 0x63, 0x73, 0x2e, 0x6e, 0x65, 0x77, 0x46, 0x6f, 0x6e, 0x74, 0x31, 0x28, 0x66, 0x6f, 0x6e, 0x74, 
@@ -6212,11 +6210,7 @@ const unsigned char graphics_lua[] =
 	0x20, 0x22, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x20, 0x6f, 0x72, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x66, 
 	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, 0x0a,
 	0x6f, 0x6e, 0x74, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a,
 	0x09, 0x09, 0x09, 0x73, 0x69, 0x7a, 0x65, 0x20, 0x3d, 0x20, 0x66, 0x6f, 0x6e, 0x74, 0x0a,
 	0x09, 0x09, 0x09, 0x73, 0x69, 0x7a, 0x65, 0x20, 0x3d, 0x20, 0x66, 0x6f, 0x6e, 0x74, 0x0a,
-	0x09, 0x09, 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, 0x65, 0x44, 0x61, 0x74, 
-	0x61, 0x28, 0x76, 0x65, 0x72, 0x61, 0x5f, 0x74, 0x74, 0x66, 0x5f, 0x62, 0x36, 0x34, 0x2c, 0x20, 0x22, 0x56, 
-	0x65, 0x72, 0x61, 0x2e, 0x74, 0x74, 0x66, 0x22, 0x2c, 0x20, 0x22, 0x62, 0x61, 0x73, 0x65, 0x36, 0x34, 0x22, 
-	0x29, 0x0a,
+	0x09, 0x09, 0x09, 0x66, 0x6f, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x76, 0x65, 0x72, 0x61, 0x5f, 0x74, 0x74, 0x66, 0x0a,
 	0x09, 0x09, 0x65, 0x6e, 0x64, 0x0a,
 	0x09, 0x09, 0x65, 0x6e, 0x64, 0x0a,
 	0x09, 0x09, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x67, 0x72, 0x61, 0x70, 
 	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, 0x74, 0x46, 0x6f, 0x6e, 0x74, 0x31, 0x28, 0x66, 0x6f, 0x6e, 0x74, 
 	0x68, 0x69, 0x63, 0x73, 0x2e, 0x73, 0x65, 0x74, 0x46, 0x6f, 0x6e, 0x74, 0x31, 0x28, 0x66, 0x6f, 0x6e, 0x74,