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

Only connect fences to full blocks

Browse Source 
Also removed some debug code.

fixes #814
This commit is contained in:
IntegratedQuantum 2024-12-07 14:59:47 +01:00
parent 8a097804ab
commit 0d56992c22
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/rotation.zig
View File

@ -250,7 +250,7 @@ pub const RotationModes = struct {
const blockBaseModel = blocks.meshes.modelIndexStart(block.*); const blockBaseModel = blocks.meshes.modelIndexStart(block.*);
const neighborBaseModel = blocks.meshes.modelIndexStart(neighborBlock); const neighborBaseModel = blocks.meshes.modelIndexStart(neighborBlock);
const neighborModel = blocks.meshes.model(neighborBlock); const neighborModel = blocks.meshes.model(neighborBlock);
const targetVal = neighborBlock.solid() and (blockBaseModel == neighborBaseModel or main.models.models.items[neighborModel].neighborFacingQuads[neighbor.reverse().toInt()].len != 0); const targetVal = neighborBlock.solid() and (blockBaseModel == neighborBaseModel or main.models.models.items[neighborModel].isNeighborOccluded[neighbor.reverse().toInt()]);
var currentData: FenceData = @bitCast(@as(u4, @truncate(block.data))); var currentData: FenceData = @bitCast(@as(u4, @truncate(block.data)));
switch(neighbor) { switch(neighbor) {
.dirNegX => { .dirNegX => {

11
src/server/terrain/StructureMap.zig
View File

@ -68,17 +68,6 @@ pub const StructureMapFragment = struct {
} }
pub fn deinit(self: *StructureMapFragment) void { pub fn deinit(self: *StructureMapFragment) void {
var actual: usize = 0;
for(self.data) |i| {
actual += i.len*@sizeOf(StructureInternal);
}
var expected: usize = 0;
var it = self.arena.arena.state.buffer_list.first;
while(it) |node| {
expected += node.data;
it = node.next;
}
std.log.err("{} {}", .{expected, actual});
self.arena.deinit(); self.arena.deinit();
main.globalAllocator.destroy(self); main.globalAllocator.destroy(self);
} }