Skip to content

Remove getAtIndex and getChildAtIndex from zon.zig #3213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
H41ogen wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove getAtIndex and getChildAtIndex from zon.zig #3213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions src/items.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -759,9 +759,10 @@ pub const ProceduralItem = struct { // MARK: ProceduralItem
}

fn extractItemsFromZon(zonArray: ZonElement) [craftingGridSize]?BaseItemIndex {
var items: [craftingGridSize]?BaseItemIndex = undefined;
for (&items, 0..) |*item, i| {
item.* = .fromId(zonArray.getAtIndex([]const u8, i, "null"));
const itemZonArray = zonArray.toSlice();
var items: [craftingGridSize]?BaseItemIndex = @splat(null);
for (&items, itemZonArray) |*item, itemZon| {
item.* = .fromId(itemZon.as([]const u8) orelse "null");
if (item.* != null and item.*.?.material() == null) item.* = null;
}
return items;
Expand Down Expand Up @@ -1307,10 +1308,11 @@ pub fn registerProceduralItem(assetFolder: []const u8, id: []const u8, zon: ZonE
val.destination = ProceduralItemProperty.fromString(paramZon.get([]const u8, "destination", "not specified"));
val.resultScale = paramZon.get(f32, "factor", 1.0);
val.method = PropertyMatrix.Method.fromString(paramZon.get([]const u8, "method", "not specified")) orelse .sum;
const matrixZon = paramZon.getChild("matrix");
const weightMatrix = paramZon.getChild("matrix").toSlice();
@memset(&val.weights, 0.0);
var total_weight: f32 = 0.0;
for (0..25) |i| {
val.weights[i] = matrixZon.getAtIndex(f32, i, 0.0);
for (weightMatrix, 0..25) |weightZon, i| {
if (weightZon.as(f32)) |weight| val.weights[i] = weight;
}
for (0..25) |i| {
total_weight += val.weights[i];
Expand Down
24 changes: 0 additions & 24 deletions src/zon.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,30 +27,6 @@ pub const ZonElement = union(enum) { // MARK: Zon
return .{.array = list};
}

pub fn getAtIndex(self: *const ZonElement, comptime T: type, index: usize, replacement: T) T {
if (self.* != .array) {
return replacement;
} else {
if (index < self.array.items.len) {
return self.array.items[index].as(T) orelse replacement;
} else {
return replacement;
}
}
}

pub fn getChildAtIndex(self: *const ZonElement, index: usize) ZonElement {
if (self.* != .array) {
return .null;
} else {
if (index < self.array.items.len) {
return self.array.items[index];
} else {
return .null;
}
}
}

pub fn get(self: *const ZonElement, comptime T: type, key: []const u8, replacement: T) T {
if (self.* != .object) {
return replacement;
Expand Down
Loading