]> git.localhorst.tv Git - blobs.git/blobdiff - src/ui/ui.cpp
reorder record panel
[blobs.git] / src / ui / ui.cpp
index 11b63d87f6798d97d01be0d491d253e0a2ccaf63..126e3079b37fac1c9022298f7dd3831ee9bfa56e 100644 (file)
@@ -29,7 +29,11 @@ CreaturePanel::CreaturePanel(app::Assets &assets)
 , born(new Label(assets.fonts.medium))
 , age(new Label(assets.fonts.medium))
 , mass(new Label(assets.fonts.medium))
+, size(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}
@@ -42,6 +46,8 @@ CreaturePanel::CreaturePanel(app::Assets &assets)
        age_label->Text("Age");
        Label *mass_label = new Label(assets.fonts.medium);
        mass_label->Text("Mass");
+       Label *size_label = new Label(assets.fonts.medium);
+       size_label->Text("Size");
        Label *goal_label = new Label(assets.fonts.medium);
        goal_label->Text("Goal");
 
@@ -52,6 +58,7 @@ CreaturePanel::CreaturePanel(app::Assets &assets)
                ->Add(born_label)
                ->Add(age_label)
                ->Add(mass_label)
+               ->Add(size_label)
                ->Add(goal_label);
        Panel *info_value_panel = new Panel;
        info_value_panel
@@ -60,6 +67,7 @@ CreaturePanel::CreaturePanel(app::Assets &assets)
                ->Add(born)
                ->Add(age)
                ->Add(mass)
+               ->Add(size)
                ->Add(goal);
        Panel *info_panel = new Panel;
        info_panel
@@ -68,6 +76,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);
@@ -144,13 +178,14 @@ CreaturePanel::CreaturePanel(app::Assets &assets)
        panel
                .Add(name)
                ->Add(info_panel)
+               ->Add(loc_panel)
                ->Add(composition)
                ->Add(stat_panel)
                ->Add(prop_panel)
                ->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() {
@@ -159,7 +194,6 @@ CreaturePanel::~CreaturePanel() {
 
 void CreaturePanel::Show(creature::Creature &cr) {
        c = &cr;
-       name->Text(c->Name());
        born->Text(TimeString(c->Born()));
 
        if (c->Parents().empty()) {
@@ -186,29 +220,32 @@ void CreaturePanel::Hide() noexcept {
 void CreaturePanel::Draw(graphics::Viewport &viewport) noexcept {
        if (!c) return;
 
+       name->Text(c->Name());
        age->Text(TimeString(c->Age()));
        mass->Text(MassString(c->Mass()));
+       size->Text(LengthString(c->Size()));
        if (c->Goals().empty()) {
                goal->Text("none");
        } else {
                goal->Text(c->Goals()[0]->Describe());
        }
 
+       pos->Text(VectorString(c->GetSituation().Position(), 2));
+       tile->Text(c->GetSituation().GetTileType().label + (
+               c->GetSituation().OnGround()
+                       ? (c->GetSituation().Moving() ? " (moving)" : " (standing)")
+                       : (c->GetSituation().Moving() ? " (flying)" : " (hovering)")
+       ));
+       head->Text(VectorString(c->GetSituation().Heading(), 2));
+
        const creature::Composition &comp = c->GetComposition();
        if (comp.size() < components.size()) {
+               components.clear();
                composition->Clear();
-               while (comp.size() < components.size()) {
-                       delete components.back();
-                       components.pop_back();
-               }
-               for (auto l : components) {
-                       composition->Add(l);
-               }
-       } else {
-               while (comp.size() > components.size()) {
-                       components.emplace_back(new Label(assets.fonts.medium));
-                       composition->Add(components.back());
-               }
+       }
+       while (comp.size() > components.size()) {
+               components.emplace_back(new Label(assets.fonts.medium));
+               composition->Add(components.back());
        }
        {
                int i = 0;
@@ -231,12 +268,12 @@ void CreaturePanel::Draw(graphics::Viewport &viewport) noexcept {
                }
        }
 
-       props[0]->Text(DecimalString(c->Strength(), 2));
-       props[1]->Text(DecimalString(c->Stamina(), 2));
-       props[2]->Text(DecimalString(c->Dexerty(), 2));
-       props[3]->Text(DecimalString(c->Intelligence(), 2));
+       props[0]->Text(DecimalString(c->Strength(), 2) + " / " + DecimalString(c->GetProperties().Strength(), 2));
+       props[1]->Text(DecimalString(c->Stamina(), 2) + " / " + DecimalString(c->GetProperties().Stamina(), 2));
+       props[2]->Text(DecimalString(c->Dexerty(), 2) + " / " + DecimalString(c->GetProperties().Dexerty(), 2));
+       props[3]->Text(DecimalString(c->Intelligence(), 2) + " / " + DecimalString(c->GetProperties().Intelligence(), 2));
        props[4]->Text(TimeString(c->Lifetime()));
-       props[5]->Text(PercentageString(c->Fertility()));
+       props[5]->Text(PercentageString(c->Fertility()) + " / " + PercentageString(c->GetProperties().Fertility()));
        props[6]->Text(PercentageString(c->Mutability()));
        props[7]->Text(PercentageString(c->Adaptability()));
        props[8]->Text(MassString(c->OffspringMass()));
@@ -250,77 +287,88 @@ 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()
+, shown(true) {
+       Label *rank_label = new Label(sim.Assets().fonts.medium);
+       rank_label->Text("Rank");
 
-       Panel *label_panel = new Panel;
-       label_panel
+       Panel *rank_panel = new Panel;
+       rank_panel
                ->Direction(Panel::VERTICAL)
-               ->Add(live_label);
+               ->Add(rank_label);
 
-       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
-               ->Direction(Panel::VERTICAL)
-               ->Add(holder_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()) {
+               Panel *by_panel = new Panel;
+               by_panel
+                       ->Direction(Panel::VERTICAL);
+               Panel *val_panel = new Panel;
+               val_panel
+                       ->Direction(Panel::VERTICAL);
+               Panel *tab_panel = new Panel;
+               tab_panel
+                       ->Direction(Panel::HORIZONTAL)
+                       ->Spacing(10.0f)
+                       ->Add(by_panel)
+                       ->Add(val_panel);
+               Label *rec_label = new Label(sim.Assets().fonts.medium);
+               rec_label->Text(r.name);
+               Panel *rec_panel = new Panel;
+               rec_panel
+                       ->Direction(Panel::VERTICAL)
+                       ->Add(rec_label)
+                       ->Add(tab_panel);
+               for (int i = 0; i < world::Record::MAX; ++i) {
+                       Label *val_label = new Label(sim.Assets().fonts.medium);
+                       val_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);
+               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);
@@ -333,9 +381,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);
@@ -344,12 +395,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);
 
@@ -357,7 +410,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);
 }
@@ -366,6 +419,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())));