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

Adjust mesh selection by crosshair (fixes #302) (#323)

Browse Source 
* Adjust mesh selection by crosshair (fixes #302)

* view space is now also z-up. The projection matrix now transforms z-up to y-up.

This makes it more intuitive to use the camera matrix for cpu-side computations. (see #323)

* Correct axes in cameraDir/cameraUp vectors

* Remove f32 arg from degreesToRadians in crosshair selection

* Fix some remaining issues.

---------

Co-authored-by: IntegratedQuantum <jahe788@gmail.com>
This commit is contained in:
archbirdplus 2024-04-16 03:28:45 -07:00 committed by GitHub
parent 3d3a1322cb
commit 5b76d2c33c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/renderer.zig
View File

@ -17,6 +17,8 @@ const network = @import("network.zig");
const settings = @import("settings.zig"); const settings = @import("settings.zig");
const vec = @import("vec.zig"); const vec = @import("vec.zig");
const gpu_performance_measuring = main.gui.windowlist.gpu_performance_measuring; const gpu_performance_measuring = main.gui.windowlist.gpu_performance_measuring;
const crosshair = main.gui.windowlist.crosshair;
const Vec2f = vec.Vec2f;
const Vec3i = vec.Vec3i; const Vec3i = vec.Vec3i;
const Vec3f = vec.Vec3f; const Vec3f = vec.Vec3f;
const Vec3d = vec.Vec3d; const Vec3d = vec.Vec3d;
@ -166,6 +168,29 @@ pub fn render(playerPosition: Vec3d) void {
} }
} }
pub fn crosshairDirection(rotationMatrix: Mat4f, fovY: f32, width: u31, height: u31) Vec3f {
// stolen code from Frustum.init
const invRotationMatrix = rotationMatrix.transpose();
const cameraDir = vec.xyz(invRotationMatrix.mulVec(Vec4f{0, 1, 0, 1}));
const cameraUp = vec.xyz(invRotationMatrix.mulVec(Vec4f{0, 0, 1, 1}));
const cameraRight = vec.xyz(invRotationMatrix.mulVec(Vec4f{1, 0, 0, 1}));
const screenSize = Vec2f{@floatFromInt(width), @floatFromInt(height)};
const screenCoord = (crosshair.window.pos + crosshair.window.contentSize*Vec2f{0.5, 0.5}*@as(Vec2f, @splat(crosshair.window.scale)))*@as(Vec2f, @splat(main.gui.scale));
const halfVSide = std.math.tan(std.math.degreesToRadians(fovY)*0.5);
const halfHSide = halfVSide*screenSize[0]/screenSize[1];
const sides = Vec2f{halfHSide, halfVSide};
const scale = (Vec2f{-1, 1} + Vec2f{2, -2} * screenCoord / screenSize) * sides;
const forwards = cameraDir;
const horizontal = cameraRight * @as(Vec3f, @splat(scale[0]));
const vertical = cameraUp * @as(Vec3f, @splat(scale[1])); // adjust for y coordinate
const adjusted = forwards + horizontal + vertical;
return adjusted;
}
pub fn renderWorld(world: *World, ambientLight: Vec3f, skyColor: Vec3f, playerPos: Vec3d) void { pub fn renderWorld(world: *World, ambientLight: Vec3f, skyColor: Vec3f, playerPos: Vec3d) void {
worldFrameBuffer.bind(); worldFrameBuffer.bind();
gpu_performance_measuring.startQuery(.clear); gpu_performance_measuring.startQuery(.clear);
@ -212,7 +237,8 @@ pub fn renderWorld(world: *World, ambientLight: Vec3f, skyColor: Vec3f, playerPo
// } // }
// } // }
gpu_performance_measuring.startQuery(.chunk_rendering); gpu_performance_measuring.startQuery(.chunk_rendering);
MeshSelection.select(playerPos, game.camera.direction, game.Player.inventory__SEND_CHANGES_TO_SERVER.items[game.Player.selectedSlot]); const direction = crosshairDirection(game.camera.viewMatrix, lastFov, lastWidth, lastHeight);
MeshSelection.select(playerPos, direction, game.Player.inventory__SEND_CHANGES_TO_SERVER.items[game.Player.selectedSlot]);
MeshSelection.render(game.projectionMatrix, game.camera.viewMatrix, playerPos); MeshSelection.render(game.projectionMatrix, game.camera.viewMatrix, playerPos);
chunk_meshing.beginRender(); chunk_meshing.beginRender();