AstralTransRocketries/Cubyz
1
0
Fork 0
mirror of https://github.com/PixelGuys/Cubyz.git synced 2025-09-09 03:59:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Simplify obj parsing code

Browse Source
This commit is contained in:
IntegratedQuantum 2025-06-14 11:00:02 +02:00
parent ce9e0dc4ef
commit e17e6e2067
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/models.zig
View File

@ -235,14 +235,8 @@ pub const Model = struct {
var quadFaces = main.List(Quad).init(main.stackAllocator); var quadFaces = main.List(Quad).init(main.stackAllocator);
defer quadFaces.deinit(); defer quadFaces.deinit();
var fixed_buffer = std.io.fixedBufferStream(data); var splitIterator = std.mem.splitScalar(u8, data, '\n');
var buf_reader = std.io.bufferedReader(fixed_buffer.reader()); while(splitIterator.next()) |lineUntrimmed| {
var in_stream = buf_reader.reader();
var buf: [128]u8 = undefined;
while(in_stream.readUntilDelimiterOrEof(&buf, '\n') catch |e| blk: {
std.log.err("Error reading line while loading model: {any}", .{e});
break :blk null;
}) |lineUntrimmed| {
if(lineUntrimmed.len < 3) if(lineUntrimmed.len < 3)
continue; continue;
@ -264,8 +258,7 @@ pub const Model = struct {
break :blk 0; break :blk 0;
}; };
} }
const coordsCorrect: Vec3f = .{coords[0], coords[1], coords[2]}; vertices.append(coords);
vertices.append(coordsCorrect);
} else if(std.mem.eql(u8, line[0..3], "vn ")) { } else if(std.mem.eql(u8, line[0..3], "vn ")) {
var coordsIter = std.mem.splitScalar(u8, line[3..], ' '); var coordsIter = std.mem.splitScalar(u8, line[3..], ' ');
var norm: Vec3f = undefined; var norm: Vec3f = undefined;
@ -276,8 +269,7 @@ pub const Model = struct {
break :blk 0; break :blk 0;
}; };
} }
const normCorrect: Vec3f = .{norm[0], norm[1], norm[2]}; normals.append(norm);
normals.append(normCorrect);
} else if(std.mem.eql(u8, line[0..3], "vt ")) { } else if(std.mem.eql(u8, line[0..3], "vt ")) {
var coordsIter = std.mem.splitScalar(u8, line[3..], ' '); var coordsIter = std.mem.splitScalar(u8, line[3..], ' ');
var uv: Vec2f = undefined; var uv: Vec2f = undefined;
@ -288,7 +280,7 @@ pub const Model = struct {
break :blk 0; break :blk 0;
}; };
} }
uvs.append(.{uv[0], uv[1]}); uvs.append(uv);
} else if(std.mem.eql(u8, line[0..2], "f ")) { } else if(std.mem.eql(u8, line[0..2], "f ")) {
var coordsIter = std.mem.splitScalar(u8, line[2..], ' '); var coordsIter = std.mem.splitScalar(u8, line[2..], ' ');
var faceData: [3][4]usize = undefined; var faceData: [3][4]usize = undefined;