evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't crash when drawing wires connected to a non-existent node

Browse Source
This commit is contained in:
Kae 2024-05-15 11:53:46 +10:00
parent 2f2c08a8dc
commit 625f0d8fc5
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/frontend/StarWireInterface.cpp
View File

@ -99,6 +99,7 @@ void WirePane::renderImpl() {
auto region = RectF(m_worldClient->clientWindow()); auto region = RectF(m_worldClient->clientWindow());
auto const& camera = m_worldPainter->camera(); auto const& camera = m_worldPainter->camera();
auto badWire = Color::rgbf(0.6f + (float)sin(Time::monotonicTime() * Constants::pi * 2.0) * 0.4f, 0.0f, 0.0f);
auto highWire = Color::Red; auto highWire = Color::Red;
auto lowWire = Color::Red.mix(Color::Black, 0.8f); auto lowWire = Color::Red.mix(Color::Black, 0.8f);
auto white = Color::White.toRgba(); auto white = Color::White.toRgba();
@ -137,9 +138,13 @@ void WirePane::renderImpl() {
auto wire = lowWire; auto wire = lowWire;
Vec2I outPosition = connection.entityLocation; Vec2I outPosition = connection.entityLocation;
if (auto sourceEntity = m_worldClient->atTile<WireEntity>(connection.entityLocation).get(0)) { if (auto sourceEntity = m_worldClient->atTile<WireEntity>(connection.entityLocation).get(0)) {
outPosition += sourceEntity->nodePosition({WireDirection::Output, connection.nodeIndex}); if (connection.nodeIndex < sourceEntity->nodeCount(WireDirection::Output)) {
if (sourceEntity->nodeState(WireNode{WireDirection::Output, connection.nodeIndex})) outPosition += sourceEntity->nodePosition({WireDirection::Output, connection.nodeIndex});
wire = highWire; if (sourceEntity->nodeState(WireNode{WireDirection::Output, connection.nodeIndex}))
wire = highWire;
} else {
wire = badWire;
}
} }
renderWire(centerOfTile(inPosition), centerOfTile(outPosition), wire); renderWire(centerOfTile(inPosition), centerOfTile(outPosition), wire);
@ -158,8 +163,12 @@ void WirePane::renderImpl() {
visitedConnections.contains({connection, {tilePosition, i}}); visitedConnections.contains({connection, {tilePosition, i}});
Vec2I inPosition = connection.entityLocation; Vec2I inPosition = connection.entityLocation;
if (auto sourceEntity = m_worldClient->atTile<WireEntity>(connection.entityLocation).get(0)) if (auto sourceEntity = m_worldClient->atTile<WireEntity>(connection.entityLocation).get(0)) {
inPosition += sourceEntity->nodePosition({WireDirection::Input, connection.nodeIndex}); if (connection.nodeIndex < sourceEntity->nodeCount(WireDirection::Input))
inPosition += sourceEntity->nodePosition({WireDirection::Input, connection.nodeIndex});
else
wire = badWire;
}
renderWire(centerOfTile(outPosition), centerOfTile(inPosition), wire); renderWire(centerOfTile(outPosition), centerOfTile(inPosition), wire);
} }