Skip to content

Commit

Permalink
Shell: Player markers using label widgets
Browse files Browse the repository at this point in the history
  • Loading branch information
@skyjake
skyjake committed Sep 15, 2019
1 parent 8e7949b commit 9322053
Show file tree
Hide file tree
Showing 2 changed files with 108 additions and 21 deletions.
1 change: 1 addition & 0 deletions doomsday/libs/doomsdaygui/include/doomsday/gui/mapoutlinewidget.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ class MapOutlineWidget : public de::GuiWidget
// Events.
void drawContent() override;
void update() override;
void viewResized() override;

protected:
void glInit() override;
Expand Down
128 changes: 107 additions & 21 deletions doomsday/libs/doomsdaygui/src/mapoutlinewidget.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,29 @@ DE_GUI_PIMPL(MapOutlineWidget)
using Player = network::PlayerInfoPacket::Player;
using Players = network::PlayerInfoPacket::Players;

struct Marker {
LabelWidget * label;
AnimationRule *pos[2];
};

network::MapOutlinePacket outlinePacket;

ProgressWidget *progress; // shown initially, before outline received
DotPath oneSidedColorId{"inverted.altaccent"};
DotPath twoSidedColorId{"altaccent"};

// Outline.
Rectanglei mapBounds;
Players players;
Map<int, Vec2i> oldPlayerPositions;
Rectanglei mapBounds;
DefaultVertexBuf *outlineVBuf = nullptr;

// Player markers.
Players players;
Map<int, Vec2i> oldPlayerPositions;
Map<int, Marker> playerLabels; // number and name on a round rect background
DefaultVertexBuf *plrVBuf = nullptr; // tick marks

// Drawing.
DefaultVertexBuf *vbuf = nullptr;
DefaultVertexBuf *plrVbuf = nullptr;
Drawable drawable;
Drawable drawable;
GLUniform uMvpMatrix { "uMvpMatrix", GLUniform::Mat4 };
GLUniform uColor { "uColor", GLUniform::Vec4 };
Animation mapOpacity { 0, Animation::Linear };
Expand All @@ -58,8 +66,8 @@ DE_GUI_PIMPL(MapOutlineWidget)

void glInit()
{
drawable.addBuffer(vbuf = new DefaultVertexBuf);
drawable.addBuffer(plrVbuf = new DefaultVertexBuf);
drawable.addBuffer(outlineVBuf = new DefaultVertexBuf);
// drawable.addBuffer(plrVBuf = new DefaultVertexBuf);

shaders().build(drawable.program(), "generic.textured.color_ucolor")
<< uMvpMatrix << uColor << uAtlas();
Expand All @@ -68,13 +76,13 @@ DE_GUI_PIMPL(MapOutlineWidget)
void glDeinit()
{
drawable.clear();
vbuf = nullptr;
plrVbuf = nullptr;
outlineVBuf = nullptr;
plrVBuf = nullptr;
}

void makeOutline(const network::MapOutlinePacket &mapOutline)
{
if (!vbuf) return;
if (!outlineVBuf) return;

progress->setOpacity(0, 0.5);
mapOpacity.setValue(1, 0.5);
Expand Down Expand Up @@ -114,36 +122,109 @@ DE_GUI_PIMPL(MapOutlineWidget)
// vtx.pos = mapBounds.topLeft; verts << vtx;
// vtx.pos = mapBounds.bottomRight; verts << vtx;

vbuf->setVertices(gfx::Lines, verts, gfx::Static);
outlineVBuf->setVertices(gfx::Lines, verts, gfx::Static);
}

Vec2f playerViewPosition(int plrNum) const
{
if (players.contains(plrNum))
{
const auto &plr = players[plrNum];
Vec3f pos = (modelMatrix() * Vec4f(plr.position.x, plr.position.y, 0.0f, 1.0f))
.toEuclidean();
return pos;
}
return {};
}

void updatePlayerPositions()
{
for (const auto &plr : players)
{
auto mark = playerLabels.find(plr.first);
if (mark != playerLabels.end())
{
const auto pos = playerViewPosition(plr.first);
mark->second.pos[0]->set(pos.x);
mark->second.pos[1]->set(pos.y);
}
}
}

void makePlayers()
{
if (!plrVbuf) return;
// Create the player labels.
{
// Add new labels.
for (const auto &plr : players)
{
const int plrNum = plr.first;
const Vec2f pos = playerViewPosition(plrNum);
if (!playerLabels.contains(plrNum))
{
Marker mark;
mark.label = &self().addNew<LabelWidget>();
mark.pos[0] = new AnimationRule(pos.x);
mark.pos[1] = new AnimationRule(pos.y);
mark.label->setSizePolicy(ui::Expand, ui::Expand);
mark.label->set(Background(style().colors().colorf("background"),
Background::GradientFrameWithRoundedFill));
mark.label->setFont("small");
mark.label->setText(Stringf("%d: %s", plr.second.number, plr.second.name.c_str()));
mark.label->margins().set("unit");
mark.label->rule().setAnchorPoint({0.5f, 0.0f});
mark.label->rule()
.setInput(Rule::AnchorX, *mark.pos[0])
.setInput(Rule::AnchorY, *mark.pos[1]);
playerLabels.insert(plrNum, mark);
}
else
{
// Update positions.
auto &mark = playerLabels[plrNum];
mark.pos[0]->set(pos.x, 500_ms);
mark.pos[1]->set(pos.y, 500_ms);
}
}
// Remove old labels.
for (auto i = playerLabels.begin(); i != playerLabels.end(); )
{
if (!players.contains(i->first))
{
GuiWidget::destroy(i->second.label);
releaseRef(i->second.pos[0]);
releaseRef(i->second.pos[1]);
i = playerLabels.erase(i);
}
else
{
++i;
}
}
}

if (!plrVBuf) return;

root().window().glActivate();

DefaultVertexBuf::Builder verts;
for (const auto &plrPos : players)
for (const auto &plr : players)
{
// Position dot.

// Gradient line to previous position.

// Line to label.

// Label background.

// Number and name label.
}
plrVbuf->setVertices(gfx::TriangleStrip, verts, gfx::Static);
plrVBuf->setVertices(gfx::TriangleStrip, verts, gfx::Static);

root().window().glDone();
}

Mat4f modelMatrix() const
{
DE_ASSERT(vbuf);
DE_ASSERT(outlineVBuf);

if (mapBounds.isNull()) return Mat4f();

Expand Down Expand Up @@ -200,7 +281,7 @@ void MapOutlineWidget::setPlayerInfo(const network::PlayerInfoPacket &plrInfo)
void MapOutlineWidget::drawContent()
{
GuiWidget::drawContent();
if (d->vbuf && d->vbuf->count())
if (d->outlineVBuf && d->outlineVBuf->count())
{
auto &painter = root().painter();
painter.flush();
Expand All @@ -215,14 +296,19 @@ void MapOutlineWidget::drawContent()
void MapOutlineWidget::update()
{
GuiWidget::update();

if (geometryRequested())
{
d->makeOutline(d->outlinePacket);
requestGeometry(false);
}
}

void MapOutlineWidget::viewResized()
{
GuiWidget::viewResized();
d->updatePlayerPositions();
}

void MapOutlineWidget::glInit()
{
GuiWidget::glInit();
Expand Down

0 comments on commit 9322053

Please sign in to comment.