Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 6 additions & 7 deletions src/foundations/scenery/grid/Grid.zig
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
allocator: std.mem.Allocator,
grid: object.object = undefined,
grid_y_scale: math.vector.vec3 = .{ 5000, 1, 1 },
grid_y_translate: math.vector.vec3 = .{ -67, -2500, -5000 },
grid_z_scale: math.vector.vec3 = .{ 5000, 1, 1 },
grid_z_translate: math.vector.vec3 = .{ -68.5, -1071, -2578 },
grid_y_scale: math.vector.vec3 = .{ 100, 0.05, 0.05 },
grid_y_translate: math.vector.vec3 = .{ 0, -50, -51 },
grid_z_scale: math.vector.vec3 = .{ 100, 0.05, 0.05 },
grid_z_translate: math.vector.vec3 = .{ -0.05, -50, -51 },
grid_z_rot: math.vector.vec3 = .{ std.math.pi / 2.0, 0, std.math.pi / 2.0 },

const Grid = @This();
pub const mvp_uniform_name: []const u8 = "f_mvp";

const num_grid_lines: usize = 500;
const grid_len: usize = 2;
const grid_increments: usize = 25;
const num_grid_lines: usize = 101;
const grid_increments: usize = 1;

const grid_vertex_shader: []const u8 = @embedFile("grid_vertex.glsl");
const grid_frag_shader: []const u8 = @embedFile("grid_frag.glsl");
Expand Down
4 changes: 2 additions & 2 deletions src/foundations/scenes/look_at/LookAt.zig
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ pub fn renderCube(self: *LookAt) void {
.{ 1, 0, 1, 1 },
),
};
var m = math.matrix.transformMatrix(math.matrix.identity(), math.matrix.translate(0.0, 10.5, 0.0));
var m = math.matrix.transformMatrix(math.matrix.identity(), math.matrix.translate(2.0, 0.0, 0.0));
m = math.matrix.transformMatrix(
m,
math.matrix.translate(
Expand All @@ -114,7 +114,7 @@ pub fn renderCube(self: *LookAt) void {
m = math.matrix.transformMatrix(m, math.matrix.rotationX(self.ui_state.cube_rot[0]));
m = math.matrix.transformMatrix(m, math.matrix.rotationY(self.ui_state.cube_rot[1]));
m = math.matrix.transformMatrix(m, math.matrix.rotationZ(self.ui_state.cube_rot[2]));
m = math.matrix.transformMatrix(m, math.matrix.uniformScale(1));
m = math.matrix.transformMatrix(m, math.matrix.uniformScale(0.5));
rhi.setUniformMatrix(program, "f_transform", m);
self.view_camera.addProgram(program, "f_mvp");
self.cube = cube;
Expand Down
7 changes: 3 additions & 4 deletions src/foundations/scenes/plane_distance/PlaneDistance.zig
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ pub fn init(allocator: std.mem.Allocator, cfg: *config) *PlaneDistance {
cfg,
pd,
integrator,
.{ 0, 200, -100 },
.{ 5, 30, -30 },
std.math.pi * 0.75,
);
errdefer cam.deinit(allocator);
Expand Down Expand Up @@ -104,14 +104,13 @@ pub fn updatePlaneTransform(self: *PlaneDistance, prog: u32) void {
self.updatePlane(m);
{
var pm = m;
pm = math.matrix.transformMatrix(pm, math.matrix.translate(100, 0, 200));
pm = math.matrix.transformMatrix(pm, math.matrix.translate(10, 0, 20));
pm = math.matrix.transformMatrix(pm, math.matrix.rotationZ(std.math.pi / 2.0));
pm = math.matrix.transformMatrix(pm, math.matrix.uniformScale(10.0));
for (self.pointer.programs()) |p| {
rhi.setUniformMatrix(p, scenery.Pointer.pointer_uniform_name, pm);
}
}
m = math.matrix.transformMatrix(m, math.matrix.scale(200.0, 0.01, 400.0));
m = math.matrix.transformMatrix(m, math.matrix.scale(20.0, 0.01, 40.0));
rhi.setUniformMatrix(prog, "f_plane_transform", m);
}

Expand Down
2 changes: 1 addition & 1 deletion src/foundations/scenes/plane_distance/PlaneDistanceUI.zig
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ rotation: [3]f32 = .{
std.math.pi,
std.math.pi,
},
translate: [3]f32 = .{ -100, -100, -100 },
translate: [3]f32 = .{ 0, 0, -20 },
updated: bool = true,

const PlaneDistanceUI = @This();
Expand Down