From: Daniel Karbach <daniel.karbach@localhorst.tv>
Date: Sat, 9 Dec 2017 10:49:18 +0000 (+0100)
Subject: track top ten for each record
X-Git-Url: http://git.localhorst.tv/?p=blobs.git;a=commitdiff_plain;h=1f8fe0fd81053821f26787e9809cd1a13f747819

track top ten for each record
---

diff --git a/src/app/states.cpp b/src/app/states.cpp
index eff36da..bec6da1 100644
--- a/src/app/states.cpp
+++ b/src/app/states.cpp
@@ -30,6 +30,9 @@ MasterState::MasterState(Assets &assets, world::Simulation &sim) noexcept
 , remain(0)
 , thirds(0)
 , paused(false) {
+	cp.ZIndex(10.0f);
+	rp.ZIndex(20.0f);
+	tp.ZIndex(30.0f);
 }
 
 MasterState::~MasterState() noexcept {
@@ -89,11 +92,13 @@ int MasterState::FrameMS() const noexcept {
 void MasterState::OnKeyDown(const SDL_KeyboardEvent &e) {
 	if (e.keysym.sym == SDLK_p) {
 		paused = !paused;
+	} else if (e.keysym.sym == SDLK_F1) {
+		rp.Toggle();
 	}
 }
 
 void MasterState::OnMouseDown(const SDL_MouseButtonEvent &e) {
-	if (e.button == SDL_BUTTON_RIGHT && cp.Shown()) {
+	if (e.button == SDL_BUTTON_RIGHT) {
 		SDL_SetRelativeMouseMode(SDL_TRUE);
 		cam_dragging = true;
 	}
@@ -139,7 +144,11 @@ void MasterState::OnMouseWheel(const SDL_MouseWheelEvent &e) {
 	constexpr double zoom_scale = -1.0;
 	constexpr double zoom_base = 1.125;
 	cam_orient.z = glm::clamp(cam_orient.z + double(e.x) * roll_scale, PI * -0.5, PI * 0.5);
-	cam_tgt_dist = std::max(cp.GetCreature().Size() * 2.0, cam_tgt_dist * std::pow(zoom_base, double(e.y) * zoom_scale));
+	if (cp.Shown()) {
+		cam_tgt_dist = std::max(cp.GetCreature().Size() * 2.0, cam_tgt_dist * std::pow(zoom_base, double(e.y) * zoom_scale));
+	} else {
+		cam_tgt_dist = std::max(1.0, cam_tgt_dist * std::pow(zoom_base, double(e.y) * zoom_scale));
+	}
 }
 
 void MasterState::OnRender(graphics::Viewport &viewport) {
diff --git a/src/ui/CreaturePanel.hpp b/src/ui/CreaturePanel.hpp
index 719af40..be12348 100644
--- a/src/ui/CreaturePanel.hpp
+++ b/src/ui/CreaturePanel.hpp
@@ -40,6 +40,8 @@ public:
 	bool Shown() const noexcept { return c; }
 	const creature::Creature &GetCreature() const noexcept { return *c; }
 
+	void ZIndex(float z) noexcept { panel.ZIndex(z); }
+
 	void Draw(graphics::Viewport &) noexcept;
 
 private:
diff --git a/src/ui/RecordsPanel.hpp b/src/ui/RecordsPanel.hpp
index 032ad56..150a7a0 100644
--- a/src/ui/RecordsPanel.hpp
+++ b/src/ui/RecordsPanel.hpp
@@ -24,12 +24,19 @@ public:
 public:
 	void Draw(graphics::Viewport &) noexcept;
 
+	void Show() noexcept { shown = true; }
+	void Hide() noexcept { shown = false; }
+	void Toggle() noexcept { shown = !shown; }
+	bool Shown() const noexcept { return shown; }
+
+	void ZIndex(float z) noexcept { panel.ZIndex(z); }
+
 private:
 	world::Simulation &sim;
-	Label *live;
 	std::vector<Label *> records;
 	std::vector<Label *> holders;
 	Panel panel;
+	bool shown;
 
 };
 
diff --git a/src/ui/TimePanel.hpp b/src/ui/TimePanel.hpp
index a150cf3..5299e56 100644
--- a/src/ui/TimePanel.hpp
+++ b/src/ui/TimePanel.hpp
@@ -27,9 +27,12 @@ public:
 	void UnsetBody() noexcept { body = nullptr; }
 	void Draw(graphics::Viewport &) noexcept;
 
+	void ZIndex(float z) noexcept { panel.ZIndex(z); }
+
 private:
 	world::Simulation &sim;
 	world::Body *body;
+	Label *live;
 	Label *time;
 	Label *clock;
 	Panel panel;
diff --git a/src/ui/ui.cpp b/src/ui/ui.cpp
index f7dcc02..98445b4 100644
--- a/src/ui/ui.cpp
+++ b/src/ui/ui.cpp
@@ -180,7 +180,7 @@ CreaturePanel::CreaturePanel(app::Assets &assets)
 		->Padding(glm::vec2(10.0f))
 		->Spacing(10.0f)
 		->Direction(Panel::VERTICAL)
-		->Background(glm::vec4(0.7f, 0.7f, 0.7f, 1.0f));
+		->Background(glm::vec4(1.0f, 1.0f, 1.0f, 0.7f));
 }
 
 CreaturePanel::~CreaturePanel() {
@@ -284,77 +284,82 @@ void CreaturePanel::Draw(graphics::Viewport &viewport) noexcept {
 
 RecordsPanel::RecordsPanel(world::Simulation &sim)
 : sim(sim)
-, live(new Label(sim.Assets().fonts.medium))
 , records()
 , holders()
-, panel() {
-	Label *live_label = new Label(sim.Assets().fonts.medium);
-	live_label->Text("Creatures alive");
-
-	Panel *label_panel = new Panel;
-	label_panel
-		->Direction(Panel::VERTICAL)
-		->Add(live_label);
+, panel()
+, shown(true) {
+	Label *rank_label = new Label(sim.Assets().fonts.medium);
+	rank_label->Text("Rank");
 
-	Panel *value_panel = new Panel;
-	value_panel
-		->Direction(Panel::VERTICAL)
-		->Add(live);
-
-	Label *holder_label = new Label(sim.Assets().fonts.medium);
-	holder_label->Text("Holder");
-	Panel *holder_panel = new Panel;
-	holder_panel
+	Panel *rank_panel = new Panel;
+	rank_panel
 		->Direction(Panel::VERTICAL)
-		->Add(holder_label);
+		->Add(rank_label);
 
-	records.reserve(sim.Records().size());
-	for (const auto &r : sim.Records()) {
-		Label *label = new Label(sim.Assets().fonts.medium);
-		label->Text(r.name + " record");
-		label_panel->Add(label);
-		Label *value = new Label(sim.Assets().fonts.medium);
-		value->Text("none");
-		value_panel->Add(value);
-		records.push_back(value);
-		Label *holder = new Label(sim.Assets().fonts.medium);
-		holder->Text("nobody");
-		holder_panel->Add(holder);
-		holders.push_back(holder);
+	for (int i = 0; i < world::Record::MAX; ++i) {
+		rank_label = new Label(sim.Assets().fonts.medium);
+		rank_label->Text(std::to_string(i + 1));
+		rank_panel->Add(rank_label);
 	}
 
 	panel
 		.Direction(Panel::HORIZONTAL)
 		->Padding(glm::vec2(10.0f))
-		->Spacing(10.0f)
-		->Background(glm::vec4(0.7f, 0.7f, 0.7f, 1.0f))
-		->Add(label_panel)
-		->Add(value_panel)
-		->Add(holder_panel);
+		->Spacing(45.0f)
+		->Background(glm::vec4(1.0f, 1.0f, 1.0f, 0.7f))
+		->Add(rank_panel);
+
+	records.reserve(sim.Records().size() * (world::Record::MAX + 1));
+	holders.reserve(sim.Records().size() * (world::Record::MAX + 1));
+	int ri = 0;
+	for (const auto &r : sim.Records()) {
+		Label *rec_label = new Label(sim.Assets().fonts.medium);
+		rec_label->Text(r.name);
+		Label *by_label = new Label(sim.Assets().fonts.medium);
+		by_label->Text("By");
+		Panel *rec_panel = new Panel;
+		rec_panel
+			->Direction(Panel::VERTICAL)
+			->Add(rec_label);
+		Panel *by_panel = new Panel;
+		by_panel
+			->Direction(Panel::VERTICAL)
+			->Add(by_label);
+		for (int i = 0; i < world::Record::MAX; ++i) {
+			Label *val_label = new Label(sim.Assets().fonts.medium);
+			rec_panel->Add(val_label);
+			records.push_back(val_label);
+			Label *holder_label = new Label(sim.Assets().fonts.medium);
+			by_panel->Add(holder_label);
+			holders.push_back(holder_label);
+		}
+		Panel *group_panel = new Panel;
+		group_panel
+			->Direction(Panel::HORIZONTAL)
+			->Spacing(10.0f)
+			->Add(rec_panel)
+			->Add(by_panel);
+		panel.Add(group_panel);
+		++ri;
+	}
 }
 
 RecordsPanel::~RecordsPanel() {
 }
 
 void RecordsPanel::Draw(graphics::Viewport &viewport) noexcept {
-	live->Text(NumberString(sim.LiveCreatures().size()));
-	int i = 0;
+	if (!shown) return;
+
+	int ri = 0;
 	for (const auto &r : sim.Records()) {
-		if (!r) continue;
-		records[i]->Text(r.ValueString());
-		std::string str(r.holder->Name());
-		bool first = true;
-		for (auto p : r.holder->Parents()) {
-			if (first) {
-				first = false;
-				str += " of ";
-			} else {
-				str += " and ";
+		for (int i = 0; i < world::Record::MAX; ++i) {
+			if (!r.rank[i]) {
+				break;
 			}
-			str += p->Name();
+			records[ri * world::Record::MAX + i]->Text(r.ValueString(i));
+			holders[ri * world::Record::MAX + i]->Text(r.rank[i].holder->Name());
 		}
-		holders[i]->Text(str);
-		++i;
+		++ri;
 	}
 
 	const glm::vec2 margin(20.0f);
@@ -367,9 +372,12 @@ void RecordsPanel::Draw(graphics::Viewport &viewport) noexcept {
 TimePanel::TimePanel(world::Simulation &sim)
 : sim(sim)
 , body(nullptr)
+, live(new Label(sim.Assets().fonts.medium))
 , time(new Label(sim.Assets().fonts.medium))
 , clock(new Label(sim.Assets().fonts.medium))
 , panel() {
+	Label *live_label = new Label(sim.Assets().fonts.medium);
+	live_label->Text("Alive");
 	Label *time_label = new Label(sim.Assets().fonts.medium);
 	time_label->Text("Time");
 	Label *clock_label = new Label(sim.Assets().fonts.medium);
@@ -378,12 +386,14 @@ TimePanel::TimePanel(world::Simulation &sim)
 	Panel *label_panel = new Panel;
 	label_panel
 		->Direction(Panel::VERTICAL)
+		->Add(live_label)
 		->Add(time_label)
 		->Add(clock_label);
 
 	Panel *value_panel = new Panel;
 	value_panel
 		->Direction(Panel::VERTICAL)
+		->Add(live)
 		->Add(time)
 		->Add(clock);
 
@@ -391,7 +401,7 @@ TimePanel::TimePanel(world::Simulation &sim)
 		.Direction(Panel::HORIZONTAL)
 		->Padding(glm::vec2(10.0f))
 		->Spacing(10.0f)
-		->Background(glm::vec4(0.7f, 0.7f, 0.7f, 1.0f))
+		->Background(glm::vec4(1.0f, 1.0f, 1.0f, 0.7f))
 		->Add(label_panel)
 		->Add(value_panel);
 }
@@ -400,6 +410,7 @@ TimePanel::~TimePanel() {
 }
 
 void TimePanel::Draw(graphics::Viewport &viewport) noexcept {
+	live->Text(NumberString(sim.LiveCreatures().size()));
 	time->Text(TimeString(sim.Time()));
 	if (body) {
 		clock->Text(TimeString(std::fmod(sim.Time(), body->RotationalPeriod())));
diff --git a/src/world/Record.hpp b/src/world/Record.hpp
index 0f4ea7d..f90e9f0 100644
--- a/src/world/Record.hpp
+++ b/src/world/Record.hpp
@@ -12,10 +12,9 @@ namespace world {
 
 struct Record {
 
+	static constexpr int MAX = 10;
+
 	std::string name = "";
-	creature::Creature *holder = nullptr;
-	double value = 0.0;
-	double time = 0.0;
 	enum Type {
 		VALUE,
 		LENGTH,
@@ -23,10 +22,27 @@ struct Record {
 		PERCENTAGE,
 		TIME,
 	} type = VALUE;
+	struct Rank {
+		creature::Creature *holder = nullptr;
+		double value = 0.0;
+		double time = 0.0;
+		operator bool() const noexcept { return holder; }
+	} rank[MAX];
+
+	operator bool() const noexcept { return rank[0]; }
+
+	Rank *begin() noexcept { return rank; }
+	const Rank *begin() const noexcept { return rank; }
+	const Rank *cbegin() const noexcept { return rank; }
+
+	Rank *end() noexcept { return rank + 10; }
+	const Rank *end() const noexcept { return rank + 10; }
+	const Rank *cend() const noexcept { return rank + 10; }
 
-	operator bool() const noexcept { return holder; }
+	/// update hiscore table, returns rank of given creature or -1 if not ranked
+	int Update(creature::Creature &, double value, double time) noexcept;
 
-	std::string ValueString() const;
+	std::string ValueString(int i) const;
 
 };
 
diff --git a/src/world/Simulation.hpp b/src/world/Simulation.hpp
index 50f06b4..3be86a7 100644
--- a/src/world/Simulation.hpp
+++ b/src/world/Simulation.hpp
@@ -65,7 +65,7 @@ public:
 
 	const std::vector<Record> &Records() const noexcept { return records; }
 	void CheckRecords(creature::Creature &) noexcept;
-	void LogRecord(const Record &rold, const Record &rnew);
+	void LogRecord(const Record &);
 
 	std::ostream &Log();
 
diff --git a/src/world/sim.cpp b/src/world/sim.cpp
index b23790d..350d244 100644
--- a/src/world/sim.cpp
+++ b/src/world/sim.cpp
@@ -14,19 +14,58 @@
 namespace blobs {
 namespace world {
 
-std::string Record::ValueString() const {
+int Record::Update(creature::Creature &c, double value, double time) noexcept {
+	int found = -1;
+	for (int i = 0; i < MAX; ++i) {
+		if (value > rank[i].value) {
+			found = i;
+			break;
+		}
+	}
+	if (found < 0) {
+		return -1;
+	}
+	int previous = -1;
+	for (int i = 0; i < MAX; ++i) {
+		if (rank[i].holder == &c) {
+			previous = i;
+			break;
+		}
+	}
+	if (previous < 0) {
+		// move all below down by one
+		std::copy_backward(rank + found, rank + MAX - 1, rank + MAX);
+	} else if (found > previous) {
+		// better than last, but not an improvement
+		// this ensures only one slot occupied per creature
+		return found;
+	} else if (found < previous) {
+		// move all in between down by one
+		std::copy_backward(rank + found, rank + previous, rank + previous + 1);
+	}
+	// insert new
+	rank[found].holder = &c;
+	rank[found].value = value;
+	rank[found].time = time;
+	return found;
+}
+
+std::string Record::ValueString(int i) const {
+	if (i < 0 || i >= MAX || !rank[i].holder) {
+		return "—";
+	}
 	switch (type) {
 		default:
 		case VALUE:
-			return ui::DecimalString(value, 2);
+			return ui::DecimalString(rank[i].value, 2);
 		case LENGTH:
-			return ui::LengthString(value);
+			return ui::LengthString(rank[i].value);
 		case MASS:
-			return ui::MassString(value);
+			return ui::MassString(rank[i].value);
 		case PERCENTAGE:
-			return ui::PercentageString(value);
+			return ui::PercentageString(rank[i].value);
 		case TIME:
-			return ui::TimeString(value);
+			return ui::TimeString(rank[i].value);
 	}
 }
 
@@ -101,76 +140,62 @@ void Simulation::SetDead(creature::Creature *c) {
 }
 
 void Simulation::CheckRecords(creature::Creature &c) noexcept {
-	if (c.Age() > records[0].value) {
-		Record rold(records[0]);
-		records[0].value = c.Age();
-		records[0].time = Time();
-		records[0].holder = &c;
-		if (rold.holder && rold.holder != &c) {
-			LogRecord(rold, records[0]);
+	{ // age
+		creature::Creature *prev = records[0].rank[0].holder;
+		int rank = records[0].Update(c, c.Age(), time);
+		if (rank == 0 && prev && prev != &c) {
+			LogRecord(records[0]);
 		}
 	}
-	if (c.Mass() > records[1].value) {
-		Record rold(records[1]);
-		records[1].value = c.Mass();
-		records[1].time = Time();
-		records[1].holder = &c;
-		if (rold.holder && rold.holder != &c) {
-			LogRecord(rold, records[1]);
+	{ // mass
+		creature::Creature *prev = records[1].rank[0].holder;
+		int rank = records[1].Update(c, c.Mass(), time);
+		if (rank == 0 && prev && prev != &c) {
+			LogRecord(records[1]);
 		}
 	}
-	if (c.Size() > records[2].value) {
-		Record rold(records[2]);
-		records[2].value = c.Size();
-		records[2].time = Time();
-		records[2].holder = &c;
-		if (rold.holder && rold.holder != &c) {
-			LogRecord(rold, records[2]);
+	{ // size
+		creature::Creature *prev = records[2].rank[0].holder;
+		int rank = records[2].Update(c, c.Size(), time);
+		if (rank == 0 && prev && prev != &c) {
+			LogRecord(records[2]);
 		}
 	}
-	if (c.Strength() > records[3].value) {
-		Record rold(records[3]);
-		records[3].value = c.Strength();
-		records[3].time = Time();
-		records[3].holder = &c;
-		if (rold.holder && rold.holder != &c) {
-			LogRecord(rold, records[3]);
+	{ // strength
+		creature::Creature *prev = records[3].rank[0].holder;
+		int rank = records[3].Update(c, c.Strength(), time);
+		if (rank == 0 && prev && prev != &c) {
+			LogRecord(records[3]);
 		}
 	}
-	if (c.Stamina() > records[4].value) {
-		Record rold(records[4]);
-		records[4].value = c.Stamina();
-		records[4].time = Time();
-		records[4].holder = &c;
-		if (rold.holder && rold.holder != &c) {
-			LogRecord(rold, records[4]);
+	{ // stamina
+		creature::Creature *prev = records[4].rank[0].holder;
+		int rank = records[4].Update(c, c.Stamina(), time);
+		if (rank == 0 && prev && prev != &c) {
+			LogRecord(records[4]);
 		}
 	}
-	if (c.Dexerty() > records[5].value) {
-		Record rold(records[5]);
-		records[5].value = c.Dexerty();
-		records[5].time = Time();
-		records[5].holder = &c;
-		if (rold.holder && rold.holder != &c) {
-			LogRecord(rold, records[5]);
+	{ // dexerty
+		creature::Creature *prev = records[5].rank[0].holder;
+		int rank = records[5].Update(c, c.Dexerty(), time);
+		if (rank == 0 && prev && prev != &c) {
+			LogRecord(records[5]);
 		}
 	}
-	if (c.Intelligence() > records[6].value) {
-		Record rold(records[6]);
-		records[6].value = c.Intelligence();
-		records[6].time = Time();
-		records[6].holder = &c;
-		if (rold.holder && rold.holder != &c) {
-			LogRecord(rold, records[6]);
+	{ // intelligence
+		creature::Creature *prev = records[6].rank[0].holder;
+		int rank = records[6].Update(c, c.Intelligence(), time);
+		if (rank == 0 && prev && prev != &c) {
+			LogRecord(records[6]);
 		}
 	}
 }
 
-void Simulation::LogRecord(const Record &rold, const Record &rnew) {
-	Log() << "at age " << ui::TimeString(rnew.holder->Age()) << " "
-		<< rnew.holder->Name() << " broke the " << rnew.name << " record of "
-		<< rold.ValueString() << " by " << rold.holder->Name()
-		<< " (established " << ui::TimeString(rold.time) << ")" << std::endl;
+void Simulation::LogRecord(const Record &r) {
+	Log() << "at age " << ui::TimeString(r.rank[0].holder->Age()) << " "
+		<< r.rank[0].holder->Name() << " broke the " << r.name << " record of "
+		<< r.ValueString(1) << " by " << r.rank[1].holder->Name()
+		<< " (established " << ui::TimeString(r.rank[1].time) << ")" << std::endl;
 }
 
 std::ostream &Simulation::Log() {