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

Allow breaking single torches and carpets from a given block, instead of breaking all at once.

Browse Source 
fixes #798
This commit is contained in:
IntegratedQuantum 2024-11-25 17:52:49 +01:00
parent 0d50346fad
commit 994d2c93ea
1 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/rotation.zig
View File

@ -680,20 +680,33 @@ pub const RotationModes = struct {
return true;
}
pub fn rayIntersection(block: Block, _: ?main.items.Item, relativePlayerPos: Vec3f, playerDir: Vec3f) ?RayIntersectionResult {
fn closestRay(comptime typ: enum{bit, intersection}, block: Block, _: ?main.items.Item, relativePlayerPos: Vec3f, playerDir: Vec3f) if(typ == .intersection) ?RayIntersectionResult else u16 {
var result: ?RayIntersectionResult = null;
var resultBit: u16 = 0;
for([_]u16{1, 2, 4, 8, 16}) |bit| {
if(block.data & bit != 0) {
const modelIndex = blocks.meshes.modelIndexStart(block) + bit - 1;
if(RotationMode.DefaultFunctions.rayModelIntersection(modelIndex, relativePlayerPos, playerDir)) |intersection| {
if(result == null or result.?.distance > intersection.distance) {
result = intersection;
resultBit = bit;
}
}
}
}
if(typ == .bit) return resultBit;
return result;
}
pub fn rayIntersection(block: Block, item: ?main.items.Item, relativePlayerPos: Vec3f, playerDir: Vec3f) ?RayIntersectionResult {
return closestRay(.intersection, block, item, relativePlayerPos, playerDir);
}
pub fn onBlockBreaking(item: ?main.items.Item, relativePlayerPos: Vec3f, playerDir: Vec3f, currentData: *Block) void {
const bit = closestRay(.bit, currentData.*, item, relativePlayerPos, playerDir);
currentData.data &= ~bit;
if(currentData.data == 0) currentData.typ = 0;
}
};
pub const Carpet = struct { // MARK: Carpet
pub const id: []const u8 = "carpet";
@ -823,20 +836,33 @@ pub const RotationModes = struct {
return true;
}
pub fn rayIntersection(block: Block, _: ?main.items.Item, relativePlayerPos: Vec3f, playerDir: Vec3f) ?RayIntersectionResult {
fn closestRay(comptime typ: enum{bit, intersection}, block: Block, _: ?main.items.Item, relativePlayerPos: Vec3f, playerDir: Vec3f) if(typ == .intersection) ?RayIntersectionResult else u16 {
var result: ?RayIntersectionResult = null;
var resultBit: u16 = 0;
for([_]u16{1, 2, 4, 8, 16, 32}) |bit| {
if(block.data & bit != 0) {
const modelIndex = blocks.meshes.modelIndexStart(block) + bit - 1;
if(RotationMode.DefaultFunctions.rayModelIntersection(modelIndex, relativePlayerPos, playerDir)) |intersection| {
if(result == null or result.?.distance > intersection.distance) {
result = intersection;
resultBit = bit;
}
}
}
}
if(typ == .bit) return resultBit;
return result;
}
pub fn rayIntersection(block: Block, item: ?main.items.Item, relativePlayerPos: Vec3f, playerDir: Vec3f) ?RayIntersectionResult {
return closestRay(.intersection, block, item, relativePlayerPos, playerDir);
}
pub fn onBlockBreaking(item: ?main.items.Item, relativePlayerPos: Vec3f, playerDir: Vec3f, currentData: *Block) void {
const bit = closestRay(.bit, currentData.*, item, relativePlayerPos, playerDir);
currentData.data &= ~bit;
if(currentData.data == 0) currentData.typ = 0;
}
};
};