new api to count draws calls

@@ -223,11 +223,11 @@ os.exit()
 --]]
 
 -- Load tilesets, to speed up image loads
-Tiles:loadTileset("/data/gfx/ts-npc.lua")
-Tiles:loadTileset("/data/gfx/ts-object.lua")
-Tiles:loadTileset("/data/gfx/ts-trap.lua")
-Tiles:loadTileset("/data/gfx/ts-terrain.lua")
-Tiles:loadTileset("/data/gfx/ts-talents-effects.lua")
+Tiles:loadTileset("/data/gfx/ts-gfx-npc.lua")
+Tiles:loadTileset("/data/gfx/ts-gfx-object.lua")
+Tiles:loadTileset("/data/gfx/ts-gfx-trap.lua")
+Tiles:loadTileset("/data/gfx/ts-gfx-terrain.lua")
+Tiles:loadTileset("/data/gfx/ts-gfx-talents-effects.lua")
 
 -- Factions
 dofile("/data/factions.lua")

@@ -3270,6 +3270,12 @@ static int gl_vertex_toscreen(lua_State *L) {
 	return 0;
 }
 
+static int gl_counts_draws(lua_State *L) {
+	lua_pushnumber(L, nb_draws);
+	nb_draws = 0;
+	return 1;
+}
+
 static const struct luaL_Reg displaylib[] =
 {
 	{"setTextBlended", set_text_aa},
@@ -3315,6 +3321,7 @@ static const struct luaL_Reg displaylib[] =
 	{"glScissor", gl_scissor},
 	{"getScreenshot", sdl_get_png_screenshot},
 	{"glMaxTextureSize", gl_get_max_texture_size},
+	{"countDraws", gl_counts_draws},
 	{NULL, NULL},
 };
 

@@ -63,11 +63,11 @@ extern GLuint gl_c_shader;
 	}
 
 
-// extern int nb_draws;
-// #define glDrawArrays(a, b, c) \
-// 	{ \
-// 	glDrawArrays((a), (b), (c)); nb_draws++; \
-// 	}
+extern int nb_draws;
+#define glDrawArrays(a, b, c) \
+	{ \
+	glDrawArrays((a), (b), (c)); nb_draws++; \
+	}
 
 extern int gl_c_vertices_nb, gl_c_texcoords_nb, gl_c_colors_nb;
 extern GLfloat *gl_c_vertices_ptr;

@@ -52,7 +52,7 @@ end
 
 local gd = require "gd"
 
-local ts_size = 512
+local ts_size = 1024
 
 function makeSet(w, h)
 	local used = {}

 #!/bin/bash
 
 cd game/modules/tome/data/gfx/
-rm -f ts-*
-lua ../../../../../utils/tileset-maker.lua 4096 4096 ts-terrain /data/gfx/ shockbolt/invis.png `find shockbolt/terrain/ -name '*png'`
-lua ../../../../../utils/tileset-maker.lua 2048 2048 ts-npc /data/gfx/ `find shockbolt/npc/ -name '*png'`
-lua ../../../../../utils/tileset-maker.lua 2048 2048 ts-object /data/gfx/ `find shockbolt/object/ -name '*png'`
-lua ../../../../../utils/tileset-maker.lua 1024 512 ts-trap /data/gfx/ `find shockbolt/trap/ -name '*png'`
-lua ../../../../../utils/tileset-maker.lua 4096 2048 ts-talents-effects /data/gfx/ `find talents/ -name '*png'` `find effects/ stats/ -name '*png'`
+rm -f ts-gfx-*
+lua ../../../../../utils/tileset-maker.lua 4096 4096 ts-gfx-terrain /data/gfx/ shockbolt/invis.png `find shockbolt/terrain/ -name '*png'`
+lua ../../../../../utils/tileset-maker.lua 2048 2048 ts-gfx-npc /data/gfx/ `find shockbolt/npc/ -name '*png'`
+lua ../../../../../utils/tileset-maker.lua 2048 2048 ts-gfx-object /data/gfx/ `find shockbolt/object/ -name '*png'`
+lua ../../../../../utils/tileset-maker.lua 1024 512 ts-gfx-trap /data/gfx/ `find shockbolt/trap/ -name '*png'`
+lua ../../../../../utils/tileset-maker.lua 4096 2048 ts-gfx-talents-effects /data/gfx/ `find talents/ -name '*png'` `find effects/ stats/ -name '*png'`

 #!/bin/bash
 
 cd game/engines/default/data/gfx
-rm -f ts-*
-lua ../../../../../utils/tileset-maker-precise.lua ts-metal-ui /data/gfx/ `find metal-ui/ -name '*png'`
+rm -f ts-ui-*
+lua ../../../../../utils/tileset-maker-precise.lua ts-ui-metal /data/gfx/ `find metal-ui/ -name '*png'`
+
+cd -
+cd game/modules/tome/data/gfx
+rm -f ts-ui-*
+lua ../../../../../utils/tileset-maker-precise.lua ts-ui-tome /data/gfx/ `find ui/ -name '*png'`