sprites pack would generate multiple textures. WIP

Author: cloudwu

3rd/sokol

@@ -851,8 +851,8 @@ sokol_main(int argc, char* argv[]) {
 	d.cleanup_cb = app_cleanup;
 	d.event_cb = app_event;
 	d.logger.func = log_func;
-	d.win32_console_utf8 = 1;
-	d.win32_console_attach = 1;
+	d.win32.console_utf8 = 1;
+	d.win32.console_attach = 1;
 	d.alpha = 0;
 
 	// init L

src/entry.c

@@ -49,21 +49,26 @@ function S.loadbundle(filename)
 	return b
 end
 
--- todo: packing should be out of loader 
 function S.pack()
 	local texid, n = sprite_bank:pack()
-
-	local r = sprite_bank:altas(texid)
-	for id,v in pairs(r) do
-		local x = v >> 32
-		local y = v & 0xffffffff
-		local obj = sprite[id]
-		local c = filecache[obj.filename]
-		local data = image.canvas(c.data, c.w, c.h, obj.cx, obj.cy, obj.cw, obj.ch)
-		local w, h, ptr = image.canvas_size(data)
-		r[id] = { id = id, data = ptr, x = x, y = y, w = w, h = h, stride = c.w * 4, dx = obj.x, dy = obj.y }
+	-- upload rects into n textures, [texid, texid + n)
+	local results = {}
+	local texid_from = texid
+	for i = 1, n do
+		local r = sprite_bank:altas(texid)
+		for id,v in pairs(r) do
+			local x = v >> 32
+			local y = v & 0xffffffff
+			local obj = sprite[id]
+			local c = filecache[obj.filename]
+			local data = image.canvas(c.data, c.w, c.h, obj.cx, obj.cy, obj.cw, obj.ch)
+			local w, h, ptr = image.canvas_size(data)
+			r[id] = { id = id, data = ptr, x = x, y = y, w = w, h = h, stride = c.w * 4, dx = obj.x, dy = obj.y }
+		end
+		texid = texid + 1
+		results[i] = r
 	end
-	return r
+	return results, texid_from
 end
 
 function S.write(id, filename)

src/service/loader.lua

@@ -141,6 +141,7 @@ function S.app(settings)
 	end
 end
 
+-- todo: update mutiple images
 local update_image
 local function delay_update_image(imgmem)
 	function update_image()
@@ -229,7 +230,9 @@ end
 function S.load_sprites(name)
 	local loader = ltask.uniqueservice "loader"
 	local spr = ltask.call(loader, "loadbundle", name)
-	local rect = ltask.call(loader, "pack")
+	local rects = ltask.call(loader, "pack")
+	-- todo : load multiple textures
+	local rect = rects[1]
 
 	local imgmem = image.new(setting.texture_size, setting.texture_size)
 	local canvas = imgmem:canvas()