music stop callback

progress on shaders
ego staves of wizardry and rared and more expensive


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

game/engine/init.lua

@@ -75,8 +75,12 @@ key:setCurrent()
 -- Load the game module
 game = false
 
+-- Setup resolution
 engine.Game:setResolution(config.settings.window.size)
+
+-- Setup musics
 engine.interface.GameMusic:soundSystemStatus(config.settings.sound.enabled, true)
+core.sound.activateMusicCallback()
 
 -- Load profile configs
 profile = engine.PlayerProfile.new()

game/engine/interface/GameMusic.lua

@@ -66,6 +66,10 @@ function _M:volumeMusic(vol)
 	return core.sound.musicVolume(vol)
 end
 
+--- Called by the C core when the current music stops
+function _M:onMusicStop()
+end
+
 function _M:soundSystemStatus(act, init_setup)
 	if type(act) == "boolean" then
 		core.sound.soundSystemStatus(act)

game/modules/tome/data/general/objects/egos/staves.lua

@@ -51,9 +51,9 @@ newEntity{
 
 newEntity{
 	name = " of wizardry",
-	level_range = {25, 50},
-	rarity = 4,
-	cost = 25,
+	level_range = {30, 50},
+	rarity = 12,
+	cost = 45,
 	wielder = {
 		combat_spellpower = resolvers.mbonus(30, 3),
 		max_mana = resolvers.mbonus(100, 10),

game/modules/tome/data/general/objects/world-artifacts.lua

@@ -64,7 +64,7 @@ newEntity{ base = "BASE_RING",
 			-- Add a lasting map effect
 			game.level.map:addEffect(who,
 				who.x, who.y, duration,
-				DamageType.WAVE, dam,
+				engine.DamageType.WAVE, dam,
 				radius,
 				5, nil,
 				engine.Entity.new{alpha=100, display='', color_br=30, color_bg=60, color_bb=200},

game/modules/tome/data/timed_effects.lua

@@ -189,7 +189,7 @@ newEffect{
 		eff.tmpid = self:addTemporaryValue("never_move", 1)
 	end,
 	on_timeout = function(self, eff)
-		if math.floor(core.fov.distance(self.x, self.y, eff.src.x, eff.src.y)) > 1 then
+		if math.floor(core.fov.distance(self.x, self.y, eff.src.x, eff.src.y)) > 1 or eff.src.dead then
 			return true
 		end
 		self:suffocate(eff.power, eff.src)

src/main.c

@@ -339,6 +339,26 @@ Uint32 redraw_timer(Uint32 interval, void *param)
 	return(interval);
 }
 
+// Calls the lua music callback
+void on_music_stop()
+{
+	if (current_game != LUA_NOREF)
+	{
+		lua_rawgeti(L, LUA_REGISTRYINDEX, current_game);
+		lua_pushstring(L, "onMusicStop");
+		lua_gettable(L, -2);
+		lua_remove(L, -2);
+		if (lua_isfunction(L, -1))
+		{
+			lua_rawgeti(L, LUA_REGISTRYINDEX, current_game);
+			docall(L, 1, 0);
+		}
+		else
+			lua_pop(L, 1);
+	}
+}
+
+
 /* general OpenGL initialization function */
 int initGL()
 {
@@ -630,6 +650,9 @@ int main(int argc, char *argv[])
 					on_redraw();
 					redraw_pending = 0;
 				}
+				else if (event.user.code == 1) {
+					on_music_stop();
+				}
 				break;
 			default:
 				break;

src/music.c

@@ -170,6 +170,32 @@ static int sound_status(lua_State *L)
 	}
 }
 
+static void music_finished()
+{
+	SDL_Event event;
+	SDL_UserEvent userevent;
+
+	/* In this example, our callback pushes an SDL_USEREVENT event
+	 into the queue, and causes ourself to be called again at the
+	 same interval: */
+
+	userevent.type = SDL_USEREVENT;
+	userevent.code = 1;
+	userevent.data1 = NULL;
+	userevent.data2 = NULL;
+
+	event.type = SDL_USEREVENT;
+	event.user = userevent;
+
+	SDL_PushEvent(&event);
+}
+
+static int music_callback(lua_State *L)
+{
+	Mix_HookMusicFinished(music_finished);
+	return 0;
+}
+
 static const struct luaL_reg soundlib[] =
 {
 	{"soundSystemStatus", sound_status},
@@ -178,6 +204,7 @@ static const struct luaL_reg soundlib[] =
 	{"musicStop", music_stop},
 	{"musicVolume", music_volume},
 	{"channelFadeOut", channel_fadeout},
+	{"activateMusicCallback", music_callback},
 	{NULL, NULL},
 };
 

src/shaders.c

@@ -37,10 +37,14 @@ GLuint noise3DTexName = 0;
 GLubyte noise3DTexPtr[128][128][128][4];
 int noise2DTexSize = 128;
 GLuint noise2DTexName = 0;
-GLubyte noise2DTexPtr[128][128][4];
+GLubyte noise2DTexPtr[128][128][3];
 
 void make3DNoiseTexture(void)
 {
+	static bool init = FALSE;
+	if (init) return;
+	init = TRUE;
+
 	int f, i, j, k, inc;
 	TCOD_noise_t noise = TCOD_noise_new(3, TCOD_NOISE_DEFAULT_HURST, TCOD_NOISE_DEFAULT_LACUNARITY);
 	float p[3];
@@ -77,29 +81,25 @@ void make3DNoiseTexture(void)
 	{
 		for (j = 0; j < noise2DTexSize; ++j)
 		{
-			p[0] = i;
-			p[1] = j;
-			p[2] = 1;
-//			float v = ((TCOD_noise_simplex(noise, p) + 1) / 2) * 255;
-			noise2DTexPtr[i][j][0] = i * 2;
-			noise2DTexPtr[i][j][1] = 0;
-			noise2DTexPtr[i][j][2] = 0;
-			noise2DTexPtr[i][j][3] = 255;
+			noise2DTexPtr[i][j][0] = i;
+			noise2DTexPtr[i][j][1] = j;
+			noise2DTexPtr[i][j][2] = 255;
 		}
 	}
 
 	glGenTextures(1, &noise2DTexName);
 	glBindTexture(GL_TEXTURE_2D, noise2DTexName);
-/*	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_R, GL_REPEAT);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-*/	CHECKGL(glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 128, 128, 0, GL_RGBA, GL_UNSIGNED_BYTE, noise2DTexPtr));
+	CHECKGL(glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB8, 128, 128, 0, GL_RGB, GL_UNSIGNED_BYTE, noise2DTexPtr));
 }
 
 void useShader(GLuint p)
 {
+	make3DNoiseTexture();
+
 	CHECKGL(glUseProgramObjectARB(p));
 	GLint i = SDL_GetTicks();
 	CHECKGL(glUniform1ivARB(glGetUniformLocationARB(p, "tick"), 1, &i));
@@ -117,7 +117,6 @@ void useShader(GLuint p)
 	CHECKGL(glUniform1ivARB(glGetUniformLocationARB(p, "noise2d"), 1, &i));
 
 	CHECKGL(glActiveTexture(GL_TEXTURE0));
-//	CHECKGL(glBindTexture(GL_TEXTURE_2D, t));
 }
 
 static GLuint loadShader(const char* code, GLuint type)
@@ -257,7 +256,5 @@ int luaopen_shaders(lua_State *L)
 	auxiliar_newclass(L, "gl{program}", program_reg);
 	luaL_openlib(L, "core.shader", shaderlib, 0);
 
-	make3DNoiseTexture();
-
 	return 1;
 }