Fix a rare freeze when particles are on screen

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

game/engines/default/engine/Particles.lua

@@ -23,6 +23,8 @@ require "engine.class"
 -- Used by engine.Map
 module(..., package.seeall, class.make)
 
+local __particles_gl = {}
+
 --- Make a particle emitter
 function _M:init(def, radius, args)
 	self.args = args
@@ -87,10 +89,21 @@ end
 local foo = {}
 function _M:loaded()
 	local base_size = nil
+	local gl = nil
 	if type(self.def) == "string" then
+		local f, err = loadfile("/data/gfx/particles/"..self.def..".lua")
+		if not f and err then error(err) end
+		local t = self.args or {}
+		local _
+		setfenv(f, setmetatable(t, {__index=_G}))
+		_, _ , _, gl, _ = f()
 	else error("unsupported particle type: "..type(self.def))
 	end
 
+	gl = gl or "particle"
+	if not __particles_gl[gl] then __particles_gl[gl] = core.display.loadImage("/data/gfx/"..gl..".png"):glTexture() end
+	gl = __particles_gl[gl]
+
 	-- Zoom accordingly
 	self.base_size = base_size
 	self:updateZoom()
@@ -100,7 +113,7 @@ function _M:loaded()
 	args = args.."tile_w="..engine.Map.tile_w.."\ntile_h="..engine.Map.tile_h
 
 	self.update = fct
-	self.ps = core.particles.newEmitter("/data/gfx/particles/"..self.def..".lua", args, self.zoom, config.settings.particles_density or 100)
+	self.ps = core.particles.newEmitter("/data/gfx/particles/"..self.def..".lua", args, self.zoom, config.settings.particles_density or 100, gl)
 end
 
 function _M:updateZoom()

game/modules/tome/class/Actor.lua

@@ -842,7 +842,8 @@ function _M:tooltip(x, y, seen_by)
 	end
 
 	local ts = tstring{}
-	ts:add({"uid",self.uid}) ts:merge(rank_color:toTString()) ts:add(self.name, {"color", "WHITE"}, {"font","italic"}, "(", self.female and "female" or "male", ")", {"font","normal"}, true)
+	ts:add({"uid",self.uid}) ts:merge(rank_color:toTString()) ts:add(self.name, {"color", "WHITE"})
+	if self.type == "humanoid" or self.type == "giant" then ts:add({"font","italic"}, "(", self.female and "female" or "male", ")", {"font","normal"}, true) end
 	ts:add(self.type:capitalize(), " / ", self.subtype:capitalize(), true)
 	ts:add("Rank: ") ts:merge(rank_color:toTString()) ts:add(rank, {"color", "WHITE"}, true)
 	ts:add({"color", 0, 255, 255}, ("Level: %d"):format(self.level), {"color", "WHITE"}, true)

src/particles.c

@@ -82,6 +82,7 @@ static int particles_new(lua_State *L)
 	const char *args = luaL_checkstring(L, 2);
 	// float zoom = luaL_checknumber(L, 3);
 	int density = luaL_checknumber(L, 4);
+	GLuint *texture = (GLuint*)auxiliar_checkclass(L, "gl{texture}", 5);
 
 	particles_type *ps = (particles_type*)lua_newuserdata(L, sizeof(particles_type));
 	auxiliar_setclass(L, "core{particles}", -1);
@@ -98,6 +99,7 @@ static int particles_new(lua_State *L)
 	ps->colors = NULL;
 	ps->particles = NULL;
 	ps->init = FALSE;
+	ps->texture = *texture;
 
 	thread_add(ps);
 	return 1;
@@ -147,35 +149,6 @@ static int particles_die(lua_State *L)
 	return 1;
 }
 
-// Load a texture for the particle system; runs in the main thread
-extern void make_texture_for_surface(SDL_Surface *s, int *fw, int *fh);
-extern void copy_surface_to_texture(SDL_Surface *s);
-GLuint particle_load_texture(const char *file)
-{
-	char path[512];
-	char *base = "/data/gfx/";
-	strcpy(path, base);
-	strcpy(path + strlen(base), file);
-	strcpy(path + strlen(base) + strlen(file), ".png");
-
-	SDL_Surface *s = IMG_Load_RW(PHYSFSRWOPS_openRead(path), TRUE);
-	if (!s) return 0;
-
-	GLuint t = 0;
-	glGenTextures(1, &t);
-	tglBindTexture(GL_TEXTURE_2D, t);
-
-	int fw, fh;
-	make_texture_for_surface(s, &fw, &fh);
-	copy_surface_to_texture(s);
-
-	SDL_FreeSurface(s);
-
-	printf("Loaded texture for particles: %s => %d\n", path, t);
-
-	return t;
-}
-
 // Runs into main thread
 static int particles_to_screen(lua_State *L)
 {
@@ -191,30 +164,8 @@ static int particles_to_screen(lua_State *L)
 
 	SDL_mutexP(ps->lock);
 
-	// Load the texture the first time
-	if (ps->texture_name)
-	{
-		lua_rawgeti(L, LUA_REGISTRYINDEX, textures_ref);
-		lua_pushstring(L, ps->texture_name);
-		lua_gettable(L, -2);
-
-		if (lua_isnumber(L, -1)) // Use an existing texture
-		{
-			ps->texture = lua_tonumber(L, -1);
-			lua_pop(L, 1);
-		}
-		else // Load a new texture
-		{
-			lua_pop(L, 1);
-			ps->texture = particle_load_texture(ps->texture_name);
-			lua_pushstring(L, ps->texture_name);
-			lua_pushnumber(L, ps->texture);
-			lua_settable(L, -3);
-			free((char*)ps->texture_name);
-			ps->texture_name = NULL;
-		}
-		lua_pop(L, 1);
-	}
+	// No texture? abord
+	if (!ps->texture) return 0;
 
 	glBindTexture(GL_TEXTURE_2D, ps->texture);
 	glTexCoordPointer(2, GL_SHORT, 0, texcoords);
@@ -651,11 +602,6 @@ void thread_particle_init(particle_thread *pt, plist *l)
 	ps->texcoords = calloc(2*4*batch, sizeof(GLshort));
 	ps->particles = calloc(nb, sizeof(particle_type));
 
-	if (lua_isstring(L, 4))
-		ps->texture_name = strdup(lua_tostring(L, 4));
-	else
-		ps->texture_name = strdup("particle");
-
 	// Locate the updator
 	lua_pushvalue(L, 2);
 	l->updator_ref = luaL_ref(L, LUA_REGISTRYINDEX);

src/particles.h

@@ -44,7 +44,6 @@ typedef struct {
 	// W by main, R by thread
 	const char *name_def;
 	const char *args;
-	const char *texture_name;
 	float zoom;
 
 	// R/W only by thread