X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2Fapp.cpp;h=3111091377afe0fd0ccd25fa75b6a18bd5952e45;hb=745729c1935276e6f49d108a0a465214aa93c3cb;hp=1c4b4db7dbdef47a1bae2ccf4aedf5017daf789f;hpb=50f35affb16c78bd3d0b420f5ba37d74fcac391f;p=blank.git

diff --git a/src/app/app.cpp b/src/app/app.cpp
index 1c4b4db..3111091 100644
--- a/src/app/app.cpp
+++ b/src/app/app.cpp
@@ -2,6 +2,8 @@
 #include "Assets.hpp"
 #include "FrameCounter.hpp"
 
+#include "init.hpp"
+#include "../audio/Sound.hpp"
 #include "../graphics/Font.hpp"
 #include "../world/BlockType.hpp"
 #include "../world/Entity.hpp"
@@ -26,18 +28,23 @@ string get_asset_path() {
 
 namespace blank {
 
-Application::Application(const Config &config)
-: init(config.doublebuf, config.multisampling)
+Application::Application(Window &win, const Config &config)
+: window(win)
 , viewport()
 , assets(get_asset_path())
+, audio()
 , counter()
 , world(config.world)
-, interface(config.interface, assets, counter, world)
+, interface(config.interface, assets, audio, counter, world)
 , test_controller(MakeTestEntity(world))
 , running(false) {
 	viewport.VSync(config.vsync);
 }
 
+Application::~Application() {
+	audio.StopAll();
+}
+
 Entity &Application::MakeTestEntity(World &world) {
 	Entity &e = world.AddEntity();
 	e.Name("test");
@@ -81,7 +88,7 @@ void Application::RunS(size_t n, size_t t) {
 void Application::Run() {
 	running = true;
 	Uint32 last = SDL_GetTicks();
-	init.window.GrabMouse();
+	window.GrabMouse();
 	while (running) {
 		Uint32 now = SDL_GetTicks();
 		int delta = now - last;
@@ -138,10 +145,10 @@ void Application::HandleEvents() {
 void Application::Handle(const SDL_WindowEvent &event) {
 	switch (event.event) {
 		case SDL_WINDOWEVENT_FOCUS_GAINED:
-			init.window.GrabMouse();
+			window.GrabMouse();
 			break;
 		case SDL_WINDOWEVENT_FOCUS_LOST:
-			init.window.ReleaseMouse();
+			window.ReleaseMouse();
 			break;
 		case SDL_WINDOWEVENT_RESIZED:
 			viewport.Resize(event.data1, event.data2);
@@ -156,6 +163,14 @@ void Application::Update(int dt) {
 	interface.Update(dt);
 	test_controller.Update(dt);
 	world.Update(dt);
+
+	glm::mat4 trans = world.Player().Transform(Chunk::Pos(0, 0, 0));
+	glm::vec3 dir(trans * glm::vec4(0.0f, 0.0f, -1.0f, 0.0f));
+	glm::vec3 up(trans * glm::vec4(0.0f, 1.0f, 0.0f, 0.0f));
+	audio.Position(world.Player().Position());
+	audio.Velocity(world.Player().Velocity());
+	audio.Orientation(dir, up);
+
 	counter.ExitUpdate();
 }
 
@@ -169,12 +184,13 @@ void Application::Render() {
 	interface.Render(viewport);
 
 	counter.ExitRender();
-	init.window.Flip();
+	window.Flip();
 }
 
 
 Assets::Assets(const string &base)
-: fonts(base + "fonts/") {
+: fonts(base + "fonts/")
+, sounds(base + "sounds/") {
 
 }
 
@@ -183,6 +199,11 @@ Font Assets::LoadFont(const string &name, int size) const {
 	return Font(full.c_str(), size);
 }
 
+Sound Assets::LoadSound(const string &name) const {
+	string full = sounds + name + ".wav";
+	return Sound(full.c_str());
+}
+
 
 void FrameCounter::EnterFrame() noexcept {
 	last_enter = SDL_GetTicks();
@@ -194,7 +215,7 @@ void FrameCounter::EnterHandle() noexcept {
 }
 
 void FrameCounter::ExitHandle() noexcept {
-	running.handle += Tick();
+	current.handle = Tick();
 }
 
 void FrameCounter::EnterUpdate() noexcept {
@@ -202,7 +223,7 @@ void FrameCounter::EnterUpdate() noexcept {
 }
 
 void FrameCounter::ExitUpdate() noexcept {
-	running.update += Tick();
+	current.update = Tick();
 }
 
 void FrameCounter::EnterRender() noexcept {
@@ -210,19 +231,19 @@ void FrameCounter::EnterRender() noexcept {
 }
 
 void FrameCounter::ExitRender() noexcept {
-	running.render += Tick();
+	current.render = Tick();
 }
 
 void FrameCounter::ExitFrame() noexcept {
 	Uint32 now = SDL_GetTicks();
-	running.total += now - last_enter;
+	current.total = now - last_enter;
+	current.running = current.handle + current.update + current.render;
+	current.waiting = current.total - current.running;
+	Accumulate();
+
 	++cur_frame;
 	if (cur_frame >= NUM_FRAMES) {
-		avg.handle = running.handle * factor;
-		avg.update = running.update * factor;
-		avg.render = running.render * factor;
-		avg.total = running.total * factor;
-		running = Frame<int>{};
+		Push();
 		cur_frame = 0;
 		changed = true;
 	} else {
@@ -237,14 +258,35 @@ int FrameCounter::Tick() noexcept {
 	return delta;
 }
 
-void FrameCounter::Print(std::ostream &out) const {
-	out << "frame:     " << AvgFrame() << std::endl;
-	out << "  handle:  " << AvgHandle() << std::endl;
-	out << "  update:  " << AvgUpdate() << std::endl;
-	out << "  render:  " << AvgRender() << std::endl;
-	out << "  running: " << AvgRunning() << std::endl;
-	out << "  waiting: " << AvgWaiting() << std::endl;
-	out << std::endl;
+void FrameCounter::Accumulate() noexcept {
+	sum.handle += current.handle;
+	sum.update += current.update;
+	sum.render += current.render;
+	sum.running += current.running;
+	sum.waiting += current.waiting;
+	sum.total += current.total;
+
+	max.handle = std::max(current.handle, max.handle);
+	max.update = std::max(current.update, max.update);
+	max.render = std::max(current.render, max.render);
+	max.running = std::max(current.running, max.running);
+	max.waiting = std::max(current.waiting, max.waiting);
+	max.total = std::max(current.total, max.total);
+
+	current = Frame<int>();
+}
+
+void FrameCounter::Push() noexcept {
+	peak = max;
+	avg.handle = sum.handle * factor;
+	avg.update = sum.update * factor;
+	avg.render = sum.render * factor;
+	avg.running = sum.running * factor;
+	avg.waiting = sum.waiting * factor;
+	avg.total = sum.total * factor;
+
+	sum = Frame<int>();
+	max = Frame<int>();
 }
 
 }