StreetLight
/
wired
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bugs with wires

master
Louis Pearson 2022-01-29 12:48:07 -07:00
parent af17f8372c
commit 2136f6bf93
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
/zig-cache /zig-cache
/zig-out /zig-out
/src/zig-cache/

9
src/main.zig
View File

@ -517,10 +517,10 @@ fn updateCircuit() void {
for (wires.slice()) |*wire| { for (wires.slice()) |*wire| {
const begin = wire.begin(); const begin = wire.begin();
const end = wire.end(); const end = wire.end();
if (!begin.pinned and !end.pinned) continue;
const cellBegin = util.world2cell(begin.pos); const cellBegin = util.world2cell(begin.pos);
const cellEnd = util.world2cell(end.pos); const cellEnd = util.world2cell(end.pos);
if (circuit.isEnabled(cellBegin) or circuit.isEnabled(cellEnd)) wire.enabled = true; if ((circuit.isEnabled(cellBegin) and begin.pinned) or
(circuit.isEnabled(cellEnd) and end.pinned)) wire.enabled = true;
} }
map.reset(&assets.solid); map.reset(&assets.solid);
const enabledDoors = circuit.enabledDoors(); const enabledDoors = circuit.enabledDoors();
@ -532,7 +532,7 @@ fn updateCircuit() void {
fn wirePhysicsProcess(dt: f32, wire: *Wire) void { fn wirePhysicsProcess(dt: f32, wire: *Wire) void {
var nodes = wire.nodes.slice(); var nodes = wire.nodes.slice();
if (nodes.len == 0) return; if (nodes.len == 0) return;
if (!inView(wire.begin().pos) or !inView(wire.end().pos)) return; if (!inView(wire.begin().pos) and !inView(wire.end().pos)) return;
var physics = Physics{ .gravity = Vec2f{ 0, 0.25 }, .friction = Vec2f{ 0.1, 0.1 } }; var physics = Physics{ .gravity = Vec2f{ 0, 0.25 }, .friction = Vec2f{ 0.1, 0.1 } };
var kinematic = Kinematic{ .col = AABB{ .pos = Vec2f{ -1, -1 }, .size = Vec2f{ 1, 1 } } }; var kinematic = Kinematic{ .col = AABB{ .pos = Vec2f{ -1, -1 }, .size = Vec2f{ 1, 1 } } };
@ -583,10 +583,9 @@ fn constrainNodes(prevNode: *Pos, node: *Pos) void {
} }
fn wireDrawProcess(_: f32, wire: *Wire) void { fn wireDrawProcess(_: f32, wire: *Wire) void {
if (!inView(wire.begin().pos) or !inView(wire.end().pos)) return;
var nodes = wire.nodes.slice(); var nodes = wire.nodes.slice();
if (nodes.len == 0) return; if (nodes.len == 0) return;
if (!inView(nodes[0].pos)) return; if (!inView(wire.begin().pos) and !inView(wire.end().pos)) return;
w4.DRAW_COLORS.* = if (wire.enabled) 0x0002 else 0x0003; w4.DRAW_COLORS.* = if (wire.enabled) 0x0002 else 0x0003;
for (nodes) |node, i| { for (nodes) |node, i| {