alcove exit sound

otse · Oct 28, 2022 · 8677ca8 · 8677ca8
1 parent f32fb37
commit 8677ca8
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 10 deletions.
diff --git a/apps/dark/bin/dark.exe b/apps/dark/bin/dark.exe
diff --git a/apps/dark/bin/imgui.ini b/apps/dark/bin/imgui.ini
@@ -45,7 +45,7 @@ Collapsed=0
 
 [Window][Models]
 Pos=1350,0
-Size=450,1306
+Size=450,1323
 Collapsed=1
 
 [Window][Interiors]

diff --git a/apps/dark/src/dark/dark.cpp b/apps/dark/src/dark/dark.cpp
@@ -30,6 +30,8 @@ bool holding_key(const char *id)
 
 namespace dark
 {
+	bool usePostProcessing = true;
+
 	std::map<const char *, int> keys;
 
 	void darkassert(bool e)
@@ -71,6 +73,7 @@ namespace dark
 		gworldspace = new worldspace(rg);
 		reference_factory<my_reference> factory;
 		gworldspace->build_exteriors(factory);
+		usePostProcessing = false;
 		//if (place)
 		//	place_at_level_start();
 	}

diff --git a/apps/dark/src/dark/dark.h b/apps/dark/src/dark/dark.h
@@ -29,6 +29,8 @@ namespace dark
 
 	extern Draugr *draugrAlcove;
 	extern Monster *meanSkelly;
+
+	extern bool usePostProcessing;
 }
 
 void hero_menu();

diff --git a/apps/dark/src/dark/window.cpp b/apps/dark/src/dark/window.cpp
@@ -20,7 +20,6 @@ GLFWwindow *window = nullptr;
 static bool cursorShowing = false;
 static bool hideOverlays = true;
 static bool f10 = false;
-static bool useFbo = true;
 static bool wireframe = false;
 
 void setupImgui();
@@ -205,7 +204,8 @@ static void toggle_debug()
 
 static void toggle_fbo()
 {
-	useFbo = !useFbo;
+	using namespace dark;
+	usePostProcessing = !usePostProcessing;
 }
 
 static void handle_esc()
@@ -419,7 +419,7 @@ void window_while_test()
 		glViewport(0, 0, width, height);
 		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
-		if (useFbo)
+		if (dark::usePostProcessing)
 			renderTargetDef->Bind();
 		else
 			glBindFramebuffer(GL_FRAMEBUFFER, 0);
@@ -471,7 +471,7 @@ void window_while_test()
 
 		Material::Unuse(nullptr, nullptr);
 
-		if (useFbo)
+		if (dark::usePostProcessing)
 		{
 			glBindFramebuffer(GL_FRAMEBUFFER, 0);
 			quad.Draw(renderTargetDef);
@@ -545,7 +545,7 @@ void window_while()
 		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 		glViewport(0, 0, width, height);
 
-		if (useFbo)
+		if (usePostProcessing)
 		{
 			renderTargetDef->Bind();
 		}
@@ -605,7 +605,7 @@ void window_while()
 
 		glBindFramebuffer(GL_FRAMEBUFFER, 0);
 
-		if (useFbo)
+		if (usePostProcessing)
 		{
 			quad.Draw(renderTargetDef);
 		}

diff --git a/miryks/include/miryks/actors.h b/miryks/include/miryks/actors.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <miryks/miryks.hpp>
+#include <miryks/sound.h>
 #include <miryks/collision_forwards.h>
 #include <miryks/model.h>
 
@@ -13,6 +14,7 @@ namespace miryks
 		record race;
 		reference *start_marker;
 		skeleton *skel;
+		sound *alcoveexit;
 		orientation orientation;
 		SkinnedMesh *helmet2;
 		ModelSkinned *modelSkinned;

diff --git a/miryks/src/monster.cpp b/miryks/src/monster.cpp
@@ -84,6 +84,7 @@ namespace miryks
 		wake = false;
 		sleeping = 0;
 		transition = 0;
+		alcoveexit = new sound("sound\\fx\\npc\\draugr\\alcoveexit\\a\\npc_draugr_alcoveexit_a_02.wav");
 	}
 
 	void Draugr::SetupCollision()
@@ -132,7 +133,6 @@ namespace miryks
 		idle = new animation(keyf);
 		idle->skel = skel;
 		alcove_wake->next = idle;
-
 	}
 
 	void Draugr::Step()
@@ -173,6 +173,8 @@ namespace miryks
 		}
 		else if (skel->anim == alcove_wake)
 		{
+			if (alcove_wake->time >= 1.5 && !alcoveexit->is_playing())
+				alcoveexit->play();
 			transition += delta / alcove_wake->keyf->controllerSequence->C->stop_time;
 			if (transition > 1)
 				transition = 1;

diff --git a/miryks/src/sound.cpp b/miryks/src/sound.cpp
@@ -104,8 +104,10 @@ namespace miryks
 		alListenerfv(AL_ORIENTATION, listenerOri);*/
 
 		// SF_INFO sfinfo;
-		sound aware("sound\\fx\\npc\\draugr\\aware\\npc_draugr_aware_01.wav");
-		aware.play();
+		//sound aware("sound\\fx\\npc\\draugr\\aware\\npc_draugr_aware_01.wav");
+		//aware.play();
+		sound menu("sound\\fx\\ui\\ui_menu_ok.wav");
+		menu.play();
 	};
 
 	wav_file load_wav_file(RES res)