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

diff --git a/src/app/app.cpp b/src/app/app.cpp
index 52a5905..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,29 +28,21 @@ string get_asset_path() {
 
 namespace blank {
 
-Application::Application(const Config &config)
-: init_sdl()
-, init_img()
-, init_ttf()
-, init_gl(config.doublebuf, config.multisampling)
-, window()
-, ctx(window.CreateContext())
-, init_glew()
+Application::Application(Window &win, const Config &config)
+: window(win)
+, viewport()
 , assets(get_asset_path())
+, audio()
 , counter()
-, chunk_prog()
-, entity_prog()
-, sprite_prog()
-, cam()
 , world(config.world)
-, interface(config.interface, assets, counter, world)
+, interface(config.interface, assets, audio, counter, world)
 , test_controller(MakeTestEntity(world))
 , running(false) {
-	if (config.vsync) {
-		GLContext::EnableVSync();
-	}
+	viewport.VSync(config.vsync);
+}
 
-	glClearColor(0.0, 0.0, 0.0, 1.0);
+Application::~Application() {
+	audio.StopAll();
 }
 
 Entity &Application::MakeTestEntity(World &world) {
@@ -157,11 +151,9 @@ void Application::Handle(const SDL_WindowEvent &event) {
 			window.ReleaseMouse();
 			break;
 		case SDL_WINDOWEVENT_RESIZED:
-			cam.Viewport(event.data1, event.data2);
-			interface.Handle(event);
+			viewport.Resize(event.data1, event.data2);
 			break;
 		default:
-			interface.Handle(event);
 			break;
 	}
 }
@@ -171,21 +163,25 @@ 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();
 }
 
 void Application::Render() {
 	// gl implementation may (and will probably) delay vsync blocking until
 	// the first write after flipping, which is this clear call
-	GLContext::Clear();
+	viewport.Clear();
 	counter.EnterRender();
 
-	chunk_prog.SetProjection(cam.Projection());
-	entity_prog.SetProjection(cam.Projection());
-
-	world.Render(chunk_prog, entity_prog);
-
-	interface.Render(entity_prog, sprite_prog);
+	world.Render(viewport);
+	interface.Render(viewport);
 
 	counter.ExitRender();
 	window.Flip();
@@ -193,7 +189,8 @@ void Application::Render() {
 
 
 Assets::Assets(const string &base)
-: fonts(base + "fonts/") {
+: fonts(base + "fonts/")
+, sounds(base + "sounds/") {
 
 }
 
@@ -202,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();
@@ -213,7 +215,7 @@ void FrameCounter::EnterHandle() noexcept {
 }
 
 void FrameCounter::ExitHandle() noexcept {
-	running.handle += Tick();
+	current.handle = Tick();
 }
 
 void FrameCounter::EnterUpdate() noexcept {
@@ -221,7 +223,7 @@ void FrameCounter::EnterUpdate() noexcept {
 }
 
 void FrameCounter::ExitUpdate() noexcept {
-	running.update += Tick();
+	current.update = Tick();
 }
 
 void FrameCounter::EnterRender() noexcept {
@@ -229,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 {
@@ -256,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>();
 }
 
 }