diff options
| author | nsfisis <nsfisis@gmail.com> | 2024-04-24 20:30:10 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2024-04-24 20:30:10 +0900 |
| commit | 55bf05f1268c8fbbf7f2fb0b6ed44f76801d6b0f (patch) | |
| tree | d0109b310dddc3edc356484b6a7d0d4f2ab401ae /src/main.zig | |
| parent | ca7da77181c2232a676c730a94906119a9c64f9c (diff) | |
| download | RayTracingInOneWeekend.zig-55bf05f1268c8fbbf7f2fb0b6ed44f76801d6b0f.tar.gz RayTracingInOneWeekend.zig-55bf05f1268c8fbbf7f2fb0b6ed44f76801d6b0f.tar.zst RayTracingInOneWeekend.zig-55bf05f1268c8fbbf7f2fb0b6ed44f76801d6b0f.zip | |
feat: update zig to 0.12.0
Diffstat (limited to 'src/main.zig')
| -rw-r--r-- | src/main.zig | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/main.zig b/src/main.zig index 7ffd9b7..d6b1131 100644 --- a/src/main.zig +++ b/src/main.zig @@ -145,8 +145,8 @@ fn generateTwoSpheres(rng: Random, allocator: anytype) !Hittable { var hittable_objects = ArrayList(Hittable).init(allocator); const checker = try Texture.makeChecker(allocator, rgb(0.2, 0.3, 0.1), rgb(0.9, 0.9, 0.9)); - var mat1 = try allocator.create(Material); - var mat2 = try allocator.create(Material); + const mat1 = try allocator.create(Material); + const mat2 = try allocator.create(Material); mat1.* = .{ .diffuse = .{ .albedo = checker } }; mat2.* = .{ .diffuse = .{ .albedo = checker } }; @@ -161,8 +161,8 @@ fn generateTwoPerlinSpheres(rng: Random, allocator: anytype) !Hittable { var hittable_objects = ArrayList(Hittable).init(allocator); const perlin = try Texture.makeNoise(allocator, 4.0, rng); - var mat1 = try allocator.create(Material); - var mat2 = try allocator.create(Material); + const mat1 = try allocator.create(Material); + const mat2 = try allocator.create(Material); mat1.* = .{ .diffuse = .{ .albedo = perlin } }; mat2.* = .{ .diffuse = .{ .albedo = perlin } }; @@ -176,10 +176,10 @@ fn generateTwoPerlinSpheres(rng: Random, allocator: anytype) !Hittable { fn generateRandomScene(rng: Random, allocator: anytype) !Hittable { var hittable_objects = ArrayList(Hittable).init(allocator); - var mat_ground = try allocator.create(Material); - var mat1 = try allocator.create(Material); - var mat2 = try allocator.create(Material); - var mat3 = try allocator.create(Material); + const mat_ground = try allocator.create(Material); + const mat1 = try allocator.create(Material); + const mat2 = try allocator.create(Material); + const mat3 = try allocator.create(Material); const checker = try Texture.makeChecker(allocator, rgb(0.2, 0.3, 0.1), rgb(0.9, 0.9, 0.9)); @@ -208,7 +208,7 @@ fn generateRandomScene(rng: Random, allocator: anytype) !Hittable { continue; } - var mat_sphere = try allocator.create(Material); + const mat_sphere = try allocator.create(Material); if (choose_mat < 0.8) { // diffuse const albedo = Color.random01(rng).mulV(Color.random01(rng)); @@ -243,7 +243,7 @@ fn generateEarthScene(allocator: anytype) !Hittable { var hittable_objects = ArrayList(Hittable).init(allocator); const earth_texture = try Texture.makeImage(allocator, "assets/sekaichizu.png"); - var earth_surface = try allocator.create(Material); + const earth_surface = try allocator.create(Material); earth_surface.* = .{ .diffuse = .{ .albedo = earth_texture } }; @@ -256,8 +256,8 @@ fn generateSimpleLightScene(rng: Random, allocator: anytype) !Hittable { var hittable_objects = ArrayList(Hittable).init(allocator); const perlin = try Texture.makeNoise(allocator, 4.0, rng); - var mat1 = try allocator.create(Material); - var mat2 = try allocator.create(Material); + const mat1 = try allocator.create(Material); + const mat2 = try allocator.create(Material); mat1.* = .{ .diffuse = .{ .albedo = perlin } }; mat2.* = .{ .diffuse = .{ .albedo = perlin } }; @@ -317,7 +317,7 @@ pub fn main() !void { defer debug.assert(gpa.deinit() == .ok); var rng_ = std.rand.DefaultPrng.init(42); - var rng = rng_.random(); + const rng = rng_.random(); // Image var aspect_ratio: f64 = 3.0 / 2.0; |
