X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fui%2Fui.cpp;h=f7dcc027c6805349f8de1ad3a684d2a5e56dd88e;hb=d921cba26f21e4a75b22f5e9d9be988707bf6a8f;hp=4cd660624cdeebd25f0f0f9c4c1a79278ca2c7bb;hpb=392826deaf802ac0960ed3924a3f98b9d18d381b;p=blobs.git

diff --git a/src/ui/ui.cpp b/src/ui/ui.cpp
index 4cd6606..f7dcc02 100644
--- a/src/ui/ui.cpp
+++ b/src/ui/ui.cpp
@@ -30,6 +30,9 @@ CreaturePanel::CreaturePanel(app::Assets &assets)
 , age(new Label(assets.fonts.medium))
 , mass(new Label(assets.fonts.medium))
 , goal(new Label(assets.fonts.medium))
+, pos(new Label(assets.fonts.medium))
+, tile(new Label(assets.fonts.medium))
+, head(new Label(assets.fonts.medium))
 , composition(new Panel)
 , stats{nullptr}
 , props{nullptr}
@@ -68,6 +71,32 @@ CreaturePanel::CreaturePanel(app::Assets &assets)
 		->Add(info_label_panel)
 		->Add(info_value_panel);
 
+	Label *pos_label = new Label(assets.fonts.medium);
+	pos_label->Text("Pos");
+	Label *tile_label = new Label(assets.fonts.medium);
+	tile_label->Text("Tile");
+	Label *head_label = new Label(assets.fonts.medium);
+	head_label->Text("Heading");
+
+	Panel *loc_label_panel = new Panel;
+	loc_label_panel
+		->Direction(Panel::VERTICAL)
+		->Add(pos_label)
+		->Add(tile_label)
+		->Add(head_label);
+	Panel *loc_value_panel = new Panel;
+	loc_value_panel
+		->Direction(Panel::VERTICAL)
+		->Add(pos)
+		->Add(tile)
+		->Add(head);
+	Panel *loc_panel = new Panel;
+	loc_panel
+		->Direction(Panel::HORIZONTAL)
+		->Spacing(10.0f)
+		->Add(loc_label_panel)
+		->Add(loc_value_panel);
+
 	Label *stat_label[7];
 	for (int i = 0; i < 7; ++i) {
 		stat_label[i] = new Label(assets.fonts.medium);
@@ -91,6 +120,8 @@ CreaturePanel::CreaturePanel(app::Assets &assets)
 		->Spacing(2)
 		->Direction(Panel::VERTICAL);
 	Panel *stat_meter_panel = new Panel;
+	stat_label[0]->Layout();
+	stats[0]->Layout();
 	stat_meter_panel
 		->Spacing(stat_label[0]->Size().y - stats[0]->Size().y + 2)
 		->Direction(Panel::VERTICAL);
@@ -105,8 +136,8 @@ CreaturePanel::CreaturePanel(app::Assets &assets)
 		->Add(stat_label_panel)
 		->Add(stat_meter_panel);
 
-	Label *prop_label[8];
-	for (int i = 0; i < 8; ++i) {
+	Label *prop_label[9];
+	for (int i = 0; i < 9; ++i) {
 		prop_label[i] = new Label(assets.fonts.medium);
 		props[i] = new Label(assets.fonts.medium);
 	}
@@ -117,7 +148,8 @@ CreaturePanel::CreaturePanel(app::Assets &assets)
 	prop_label[4]->Text("Lifetime");
 	prop_label[5]->Text("Fertility");
 	prop_label[6]->Text("Mutability");
-	prop_label[7]->Text("Offspring mass");
+	prop_label[7]->Text("Adaptability");
+	prop_label[8]->Text("Offspring mass");
 
 	Panel *prop_label_panel = new Panel;
 	prop_label_panel
@@ -127,7 +159,7 @@ CreaturePanel::CreaturePanel(app::Assets &assets)
 	prop_meter_panel
 		->Spacing(2)
 		->Direction(Panel::VERTICAL);
-	for (int i = 0; i < 8; ++i) {
+	for (int i = 0; i < 9; ++i) {
 		prop_label_panel->Add(prop_label[i]);
 		prop_meter_panel->Add(props[i]);
 	}
@@ -141,6 +173,7 @@ CreaturePanel::CreaturePanel(app::Assets &assets)
 	panel
 		.Add(name)
 		->Add(info_panel)
+		->Add(loc_panel)
 		->Add(composition)
 		->Add(stat_panel)
 		->Add(prop_panel)
@@ -191,6 +224,10 @@ void CreaturePanel::Draw(graphics::Viewport &viewport) noexcept {
 		goal->Text(c->Goals()[0]->Describe());
 	}
 
+	pos->Text(VectorString(c->GetSituation().Position(), 2));
+	tile->Text(c->GetSituation().GetTileType().label);
+	head->Text(VectorString(c->GetSituation().Heading(), 2));
+
 	const creature::Composition &comp = c->GetComposition();
 	if (comp.size() < components.size()) {
 		composition->Clear();
@@ -235,10 +272,12 @@ void CreaturePanel::Draw(graphics::Viewport &viewport) noexcept {
 	props[4]->Text(TimeString(c->Lifetime()));
 	props[5]->Text(PercentageString(c->Fertility()));
 	props[6]->Text(PercentageString(c->Mutability()));
-	props[7]->Text(MassString(c->OffspringMass()));
+	props[7]->Text(PercentageString(c->Adaptability()));
+	props[8]->Text(MassString(c->OffspringMass()));
 
 	const glm::vec2 margin(20.0f);
 	panel.Position(glm::vec2(viewport.Width() - margin.x - panel.Size().x, margin.y));
+	panel.Layout();
 	panel.Draw(assets, viewport);
 }
 
@@ -302,24 +341,7 @@ void RecordsPanel::Draw(graphics::Viewport &viewport) noexcept {
 	int i = 0;
 	for (const auto &r : sim.Records()) {
 		if (!r) continue;
-		switch (r.type) {
-			default:
-			case world::Record::VALUE:
-				records[i]->Text(DecimalString(r.value, 2));
-				break;
-			case world::Record::LENGTH:
-				records[i]->Text(LengthString(r.value));
-				break;
-			case world::Record::MASS:
-				records[i]->Text(MassString(r.value));
-				break;
-			case world::Record::PERCENTAGE:
-				records[i]->Text(PercentageString(r.value));
-				break;
-			case world::Record::TIME:
-				records[i]->Text(TimeString(r.value));
-				break;
-		}
+		records[i]->Text(r.ValueString());
 		std::string str(r.holder->Name());
 		bool first = true;
 		for (auto p : r.holder->Parents()) {
@@ -337,6 +359,7 @@ void RecordsPanel::Draw(graphics::Viewport &viewport) noexcept {
 
 	const glm::vec2 margin(20.0f);
 	panel.Position(glm::vec2(margin.x, margin.y));
+	panel.Layout();
 	panel.Draw(sim.Assets(), viewport);
 }
 
@@ -386,6 +409,7 @@ void TimePanel::Draw(graphics::Viewport &viewport) noexcept {
 
 	const glm::vec2 margin(20.0f);
 	panel.Position(glm::vec2(margin.x, viewport.Height() - margin.y - panel.Size().y));
+	panel.Layout();
 	panel.Draw(sim.Assets(), viewport);
 }