Skip to content

Refactor eye data to a separate struct #2184

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

Merged
merged 4 commits into from
Nov 5, 2025
Merged

Refactor eye data to a separate struct #2184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d37910
Refactor eye data to a separate struct
codemob-dev Nov 1, 2025
a42ba22
Rename eyeData
codemob-dev Nov 2, 2025
4e4aa32
Use default values
codemob-dev Nov 5, 2025
a7d3aaf
Merge branch 'master' into physics-refactoring
codemob-dev Nov 5, 2025
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
38 changes: 19 additions & 19 deletions src/game.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,11 +408,19 @@ pub const DamageType = enum(u8) {
};

pub const Player = struct { // MARK: Player
pub const EyeData = struct {
pos: Vec3d = .{0, 0, 0},
vel: Vec3d = .{0, 0, 0},
coyote: f64 = 0.0,
step: @Vector(3, bool) = .{false, false, false},
box: collision.Box = .{
.min = -Vec3d{standingBoundingBoxExtent[0]*0.2, standingBoundingBoxExtent[1]*0.2, 0.6},
.max = Vec3d{standingBoundingBoxExtent[0]*0.2, standingBoundingBoxExtent[1]*0.2, 0.9 - 0.05},
},
desiredPos: Vec3d = .{0, 0, 1.7 - standingBoundingBoxExtent[2]},
};
pub var super: main.server.Entity = .{};
pub var eyePos: Vec3d = .{0, 0, 0};
pub var eyeVel: Vec3d = .{0, 0, 0};
pub var eyeCoyote: f64 = 0;
pub var eyeStep: @Vector(3, bool) = .{false, false, false};
pub var eye: EyeData = .{};
pub var crouching: bool = false;
pub var id: u32 = 0;
pub var gamemode: Atomic(Gamemode) = .init(.creative);
Expand Down Expand Up @@ -446,11 +454,6 @@ pub const Player = struct { // MARK: Player
.min = -standingBoundingBoxExtent,
.max = standingBoundingBoxExtent,
};
pub var eyeBox: collision.Box = .{
.min = -Vec3d{standingBoundingBoxExtent[0]*0.2, standingBoundingBoxExtent[1]*0.2, 0.6},
.max = Vec3d{standingBoundingBoxExtent[0]*0.2, standingBoundingBoxExtent[1]*0.2, 0.9 - 0.05},
};
pub var desiredEyePos: Vec3d = .{0, 0, 1.7 - standingBoundingBoxExtent[2]};
pub const jumpHeight = 1.25;

fn loadFrom(zon: ZonElement) void {
Expand Down Expand Up @@ -478,19 +481,19 @@ pub const Player = struct { // MARK: Player
pub fn getEyePosBlocking() Vec3d {
mutex.lock();
defer mutex.unlock();
return eyePos + super.pos + desiredEyePos;
return eye.pos + super.pos + eye.desiredPos;
}

pub fn getEyeVelBlocking() Vec3d {
mutex.lock();
defer mutex.unlock();
return eyeVel;
return eye.vel;
}

pub fn getEyeCoyoteBlocking() f64 {
mutex.lock();
defer mutex.unlock();
return eyeCoyote;
return eye.coyote;
}

pub fn getJumpCoyoteBlocking() f64 {
Expand Down Expand Up @@ -547,11 +550,8 @@ pub const Player = struct { // MARK: Player
Player.super.health = Player.super.maxHealth;
Player.super.energy = Player.super.maxEnergy;

Player.eyePos = .{0, 0, 0};
Player.eyeVel = .{0, 0, 0};
Player.eyeCoyote = 0;
Player.eye = .{};
Player.jumpCoyote = 0;
Player.eyeStep = .{false, false, false};
}

pub fn breakBlock(deltaTime: f64) void {
Expand Down Expand Up @@ -878,7 +878,7 @@ pub fn update(deltaTime: f64) void { // MARK: update()
jumping = true;
Player.jumpCooldown = Player.jumpCooldownConstant;
if(!Player.onGround) {
Player.eyeCoyote = 0;
Player.eye.coyote = 0;
}
Player.jumpCoyote = 0;
} else if(!KeyBoard.key("fall").pressed) {
Expand Down Expand Up @@ -955,11 +955,11 @@ pub fn update(deltaTime: f64) void { // MARK: update()
.min = -Player.outerBoundingBoxExtent,
.max = Player.outerBoundingBoxExtent,
};
Player.eyeBox = .{
Player.eye.box = .{
.min = -Vec3d{Player.outerBoundingBoxExtent[0]*0.2, Player.outerBoundingBoxExtent[1]*0.2, Player.outerBoundingBoxExtent[2] - 0.2},
.max = Vec3d{Player.outerBoundingBoxExtent[0]*0.2, Player.outerBoundingBoxExtent[1]*0.2, Player.outerBoundingBoxExtent[2] - 0.05},
};
Player.desiredEyePos = (Vec3d{0, 0, 1.3 - Player.crouchingBoundingBoxExtent[2]} - Vec3d{0, 0, 1.7 - Player.standingBoundingBoxExtent[2]})*@as(Vec3f, @splat(smoothPerc)) + Vec3d{0, 0, 1.7 - Player.standingBoundingBoxExtent[2]};
Player.eye.desiredPos = (Vec3d{0, 0, 1.3 - Player.crouchingBoundingBoxExtent[2]} - Vec3d{0, 0, 1.7 - Player.standingBoundingBoxExtent[2]})*@as(Vec3f, @splat(smoothPerc)) + Vec3d{0, 0, 1.7 - Player.standingBoundingBoxExtent[2]};
}

physics.update(deltaTime, acc, jumping);
Expand Down
2 changes: 1 addition & 1 deletion src/itemdrop.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,7 @@ pub const ItemDisplayManager = struct { // MARK: ItemDisplayManager
if(deltaTime == 0) return;
const dt: f32 = @floatCast(deltaTime);

var playerVel: Vec3f = .{@floatCast((game.Player.super.vel[2]*0.009 + game.Player.eyeVel[2]*0.0075)), 0, 0};
var playerVel: Vec3f = .{@floatCast((game.Player.super.vel[2]*0.009 + game.Player.eye.vel[2]*0.0075)), 0, 0};
playerVel = vec.clampMag(playerVel, 0.32);

// TODO: add *smooth* item sway
Expand Down
62 changes: 31 additions & 31 deletions src/physics.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,10 @@ pub fn update(deltaTime: f64, inputAcc: Vec3d, jumping: bool) void { // MARK: up
30,
30,
};
const strength = (-Player.eyePos)/(Player.eyeBox.max - Player.eyeBox.min);
const strength = (-Player.eye.pos)/(Player.eye.box.max - Player.eye.box.min);
const force = strength*forceMultipliers;
const friction = frictionMultipliers;
springConstants += forceMultipliers/(Player.eyeBox.max - Player.eyeBox.min);
springConstants += forceMultipliers/(Player.eye.box.max - Player.eye.box.min);
directionalFrictionCoefficients += @floatCast(friction);
acc += force;
}
Expand All @@ -97,21 +97,21 @@ pub fn update(deltaTime: f64, inputAcc: Vec3d, jumping: bool) void { // MARK: up
// dx/dt = v
// Where a is the acceleration, k is the spring constant and λ is the friction coefficient
inline for(0..3) |i| blk: {
if(Player.eyeStep[i]) {
const oldPos = Player.eyePos[i];
const newPos = oldPos + Player.eyeVel[i]*deltaTime;
if(newPos*std.math.sign(Player.eyeVel[i]) <= -0.1) {
Player.eyePos[i] = newPos;
if(Player.eye.step[i]) {
const oldPos = Player.eye.pos[i];
const newPos = oldPos + Player.eye.vel[i]*deltaTime;
if(newPos*std.math.sign(Player.eye.vel[i]) <= -0.1) {
Player.eye.pos[i] = newPos;
break :blk;
} else {
Player.eyeStep[i] = false;
Player.eye.step[i] = false;
}
}
if(i == 2 and Player.eyeCoyote > 0) {
if(i == 2 and Player.eye.coyote > 0) {
break :blk;
}
const frictionCoefficient = directionalFrictionCoefficients[i];
const v_0 = Player.eyeVel[i];
const v_0 = Player.eye.vel[i];
const k = springConstants[i];
const a = acc[i];
// here we need to solve the full equation:
Expand Down Expand Up @@ -141,8 +141,8 @@ pub fn update(deltaTime: f64, inputAcc: Vec3d, jumping: bool) void { // MARK: up
// x(t) = a/k + c_1 e^(1/2 t (-c_3 - λ)) + c_2 e^(1/2 t (c_3 - λ))
const firstTerm = c_1.mul((c_3.negate().subScalar(frictionCoefficient)).mulScalar(deltaTime/2).exp());
const secondTerm = c_2.mul((c_3.subScalar(frictionCoefficient)).mulScalar(deltaTime/2).exp());
Player.eyeVel[i] = firstTerm.mul(c_3.negate().subScalar(frictionCoefficient).mulScalar(0.5)).add(secondTerm.mul((c_3.subScalar(frictionCoefficient)).mulScalar(0.5))).val[0];
Player.eyePos[i] += firstTerm.add(secondTerm).addScalar(a/k).val[0];
Player.eye.vel[i] = firstTerm.mul(c_3.negate().subScalar(frictionCoefficient).mulScalar(0.5)).add(secondTerm.mul((c_3.subScalar(frictionCoefficient)).mulScalar(0.5))).val[0];
Player.eye.pos[i] += firstTerm.add(secondTerm).addScalar(a/k).val[0];
}
}

Expand All @@ -155,7 +155,7 @@ pub fn update(deltaTime: f64, inputAcc: Vec3d, jumping: bool) void { // MARK: up
if(Player.super.vel[2] > 0) {
steppingHeight = Player.super.vel[2]*Player.super.vel[2]/gravity/2;
}
steppingHeight = @min(steppingHeight, Player.eyePos[2] - Player.eyeBox.min[2]);
steppingHeight = @min(steppingHeight, Player.eye.pos[2] - Player.eye.box.min[2]);

const slipLimit = 0.25*Player.currentFriction;

Expand Down Expand Up @@ -186,17 +186,17 @@ pub fn update(deltaTime: f64, inputAcc: Vec3d, jumping: bool) void { // MARK: up

const stepAmount = xMovement[2] + yMovement[2];
if(stepAmount > 0) {
if(Player.eyeCoyote <= 0) {
Player.eyeVel[2] = @max(1.5*vec.length(Player.super.vel), Player.eyeVel[2], 4);
Player.eyeStep[2] = true;
if(Player.eye.coyote <= 0) {
Player.eye.vel[2] = @max(1.5*vec.length(Player.super.vel), Player.eye.vel[2], 4);
Player.eye.step[2] = true;
if(Player.super.vel[2] > 0) {
Player.eyeVel[2] = Player.super.vel[2];
Player.eyeStep[2] = false;
Player.eye.vel[2] = Player.super.vel[2];
Player.eye.step[2] = false;
}
} else {
Player.eyeCoyote = 0;
Player.eye.coyote = 0;
}
Player.eyePos[2] -= stepAmount;
Player.eye.pos[2] -= stepAmount;
move[2] = -0.01;
Player.onGround = true;
}
Expand All @@ -207,12 +207,12 @@ pub fn update(deltaTime: f64, inputAcc: Vec3d, jumping: bool) void { // MARK: up
if(collision.collides(.client, .z, -move[2], Player.super.pos, hitBox)) |box| {
if(move[2] < 0) {
if(!wasOnGround) {
Player.eyeVel[2] = Player.super.vel[2];
Player.eyePos[2] -= (box.max[2] - hitBox.min[2] - Player.super.pos[2]);
Player.eye.vel[2] = Player.super.vel[2];
Player.eye.pos[2] -= (box.max[2] - hitBox.min[2] - Player.super.pos[2]);
}
Player.onGround = true;
Player.super.pos[2] = box.max[2] - hitBox.min[2];
Player.eyeCoyote = 0;
Player.eye.coyote = 0;
} else {
Player.super.pos[2] = box.min[2] - hitBox.max[2];
}
Expand All @@ -226,7 +226,7 @@ pub fn update(deltaTime: f64, inputAcc: Vec3d, jumping: bool) void { // MARK: up
velocityChange = Player.super.vel[2]*@as(f64, @floatCast(1 - bounciness));
Player.super.vel[2] = -Player.super.vel[2]*bounciness;
Player.jumpCoyote = Player.jumpCoyoteTimeConstant + deltaTime;
Player.eyeVel[2] *= 2;
Player.eye.vel[2] *= 2;
} else {
velocityChange = Player.super.vel[2];
Player.super.vel[2] = 0;
Expand All @@ -244,19 +244,19 @@ pub fn update(deltaTime: f64, inputAcc: Vec3d, jumping: bool) void { // MARK: up
// If the player drops off a ledge, they might just be walking over a small gap, so lock the y position of the eyes that long.
// This calculates how long the player has to fall until we know they're not walking over a small gap.
// We add deltaTime because we subtract deltaTime at the bottom of update
Player.eyeCoyote = @sqrt(2*Player.steppingHeight()[2]/gravity) + deltaTime;
Player.eye.coyote = @sqrt(2*Player.steppingHeight()[2]/gravity) + deltaTime;
Player.jumpCoyote = Player.jumpCoyoteTimeConstant + deltaTime;
Player.eyePos[2] -= move[2];
} else if(Player.eyeCoyote > 0) {
Player.eyePos[2] -= move[2];
Player.eye.pos[2] -= move[2];
} else if(Player.eye.coyote > 0) {
Player.eye.pos[2] -= move[2];
}
collision.touchBlocks(&Player.super, hitBox, .client, deltaTime);
} else {
Player.super.pos += move;
}

// Clamp the eyePosition and subtract eye coyote time.
Player.eyePos = @max(Player.eyeBox.min, @min(Player.eyePos, Player.eyeBox.max));
Player.eyeCoyote -= deltaTime;
// Clamp the eye.position and subtract eye coyote time.
Player.eye.pos = @max(Player.eye.box.min, @min(Player.eye.pos, Player.eye.box.max));
Player.eye.coyote -= deltaTime;
Player.jumpCoyote -= deltaTime;
}