From f81139a6cb6b9966d007931e1b85d20ca6bc4b74 Mon Sep 17 00:00:00 2001 From: Altagos Date: Sat, 20 Apr 2024 13:22:48 +0200 Subject: [PATCH] rename --- src/camera.zig | 2 +- src/hittable.zig | 4 ++-- src/hittable/sphere.zig | 2 +- src/interval.zig | 10 ++++++++++ src/material.zig | 2 +- src/rayray.zig | 2 +- src/tracer.zig | 4 ++-- 7 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/camera.zig b/src/camera.zig index 3c6ea12..950d192 100644 --- a/src/camera.zig +++ b/src/camera.zig @@ -5,7 +5,7 @@ const zigimg = @import("zigimg"); const color = zigimg.color; const zm = @import("zmath"); -pub const Ray = @import("ray.zig"); +pub const Ray = @import("Ray.zig"); const util = @import("util.zig"); const log = std.log.scoped(.camera); diff --git a/src/hittable.zig b/src/hittable.zig index 6a07c6d..88f4393 100644 --- a/src/hittable.zig +++ b/src/hittable.zig @@ -4,10 +4,10 @@ const zm = @import("zmath"); const IntervalF32 = @import("interval.zig").IntervalF32; const Material = @import("material.zig").Material; -const Ray = @import("ray.zig"); +const Ray = @import("Ray.zig"); // Hittable Objects -pub const Sphere = @import("hittable/sphere.zig"); +pub const Sphere = @import("hittable/Sphere.zig"); pub const HitRecord = struct { p: zm.Vec, diff --git a/src/hittable/sphere.zig b/src/hittable/sphere.zig index c445ea8..f9d19e1 100644 --- a/src/hittable/sphere.zig +++ b/src/hittable/sphere.zig @@ -1,7 +1,7 @@ const zm = @import("zmath"); const IntervalF32 = @import("../interval.zig").IntervalF32; -const Ray = @import("../ray.zig"); +const Ray = @import("../Ray.zig"); const HitRecord = @import("../hittable.zig").HitRecord; const Material = @import("../material.zig").Material; diff --git a/src/interval.zig b/src/interval.zig index a267dc3..b80c420 100644 --- a/src/interval.zig +++ b/src/interval.zig @@ -96,6 +96,11 @@ fn IntInterval(comptime T: type) type { return x; } + pub fn expand(self: *const Self, delta: T) Interval { + const padding = delta / 2; + return .{ .min = self.min - padding, .max = self.max + padding }; + } + pub fn iter(self: *const Self) Iterator { return Iterator{ .interval = self.*, @@ -132,5 +137,10 @@ fn FloatInterval(comptime T: type) type { if (x > self.max) return self.max; return x; } + + pub fn expand(self: *const Self, delta: T) Interval { + const padding = delta / 2; + return .{ .min = self.min - padding, .max = self.max + padding }; + } }; } diff --git a/src/material.zig b/src/material.zig index 2bbe963..4aaf1e5 100644 --- a/src/material.zig +++ b/src/material.zig @@ -3,7 +3,7 @@ const math = @import("std").math; const zm = @import("zmath"); const hittable = @import("hittable.zig"); -const Ray = @import("ray.zig"); +const Ray = @import("Ray.zig"); const util = @import("util.zig"); pub const Material = union(enum) { diff --git a/src/rayray.zig b/src/rayray.zig index ee638bc..7cdd5b3 100644 --- a/src/rayray.zig +++ b/src/rayray.zig @@ -4,7 +4,7 @@ const spall = @import("spall"); const zigimg = @import("zigimg"); const color = zigimg.color; -pub const Camera = @import("camera.zig"); +pub const Camera = @import("Camera.zig"); pub const hittable = @import("hittable.zig"); const IntervalUsize = @import("interval.zig").IntervalUsize; pub const material = @import("material.zig"); diff --git a/src/tracer.zig b/src/tracer.zig index 180be41..3a6db92 100644 --- a/src/tracer.zig +++ b/src/tracer.zig @@ -4,10 +4,10 @@ const spall = @import("spall"); const zigimg = @import("zigimg"); const zm = @import("zmath"); -const Camera = @import("camera.zig"); +const Camera = @import("Camera.zig"); const hittable = @import("hittable.zig"); const material = @import("material.zig"); -const Ray = @import("ray.zig"); +const Ray = @import("Ray.zig"); const util = @import("util.zig"); const interval = @import("interval.zig"); -- 2.51.2