ra 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b56b6d752ce23d6484526702a0702d865bfad49f0209a40a8e597adf7a3c1b13
-  data.tar.gz: e45c8ddc28b1723f9e2a114386a2a0927026e9cf2cb54a38f438f3583d84710c
+  metadata.gz: 96608d9848ea1181d69813cd6a37cfcc5cb0ac04564048ed4b2a9d6f4af27414
+  data.tar.gz: a1bfbd9254cc6c56abab623bdf65d9a3282904c4b43039c3609934a2d8d273b1
 SHA512:
-  metadata.gz: 0b2723e84ab6a64a4036615d298e733714838a754aecd59e0146eef97bd7b3c01374a3a9b4e145e9bb3ac437fe6499b41d819bf3fb79be92494bd2a2629c6f39
-  data.tar.gz: 1f74e78ddc9fbd2c61e231601d08519a8279279418ce8df0e8d6528a183412e09bbbfd138cbb3cd15fcb96979cac30b312520b3694b2c1232d394a1598dcfa57
+  metadata.gz: b63eba61eb50a16fc55388b409b27dde40e092009f920ffe614fb15e29683ac58b129a2bf3848c0944b220ed2b6aca1cfb434a2441d050a601a801fb60c5e0ae
+  data.tar.gz: 004eb7ca2f72a3804f62332f1f909cd2875dbc46928ea6392e22b32a34ae5a3ea55117a6bda5dfd15b84b33d8f1c3d990517b10b1d64ed08497e3fe5b8619750

data/exe/ra

@@ -8,8 +8,8 @@ require 'slop'
 config = Slop.parse(ARGV) do |options|
   options.banner = 'Usage: ra -w 2560 -h 2048 | convert - sample.avif'
 
-  options.integer '-w', '--width', 'width', default: 1280
-  options.integer '-h', '--height', 'height', default: 1024
+  options.integer '-w', '--width', 'width', default: 2560
+  options.integer '-h', '--height', 'height', default: 2048
   options.integer '-fov', 'degrees', default: 60
 
   options.on('--help', 'help') do
@@ -26,13 +26,13 @@ end
 earth = Ra::Pattern::Texture.new(path: File.join(File.dirname(__FILE__), '..', 'textures/earth.avif'))
 
 light_l = Ra::Light.new(
-  position: Vector[+5, +7, -9, Ra::Tuple::POINT],
-  intensity: Ra::Color.uniform(0.4),
+  position: Vector[+5, +3, -9, Ra::Tuple::POINT],
+  intensity: Ra::Color.uniform(0.5),
 )
 
 light_r = Ra::Light.new(
-  position: Vector[-5, +7, -9, Ra::Tuple::POINT],
-  intensity: Ra::Color.uniform(0.8),
+  position: Vector[-5, +3, -9, Ra::Tuple::POINT],
+  intensity: Ra::Color.uniform(0.5),
 )
 
 camera = Ra::Camera.new(
@@ -40,43 +40,53 @@ camera = Ra::Camera.new(
   h: config[:h],
   fov: config[:fov] * Math::PI / 180,
   transform: Ra::Transform.view(
-    from: Vector[0, +1.5, -5.0, Ra::Tuple::POINT],
-    to: Vector[0, 0, +1.0, Ra::Tuple::POINT],
+    from: Vector[0, +1.5, -4.0, Ra::Tuple::POINT],
+    to: Vector[0, 0, 0, Ra::Tuple::POINT],
     up: Vector[0, 1, 0, Ra::Tuple::VECTOR],
   ),
 )
 
 floor = Ra::Shape::Plane.new(
-  material: Ra::Material.new(base: Ra::Pattern::Checkers.new(
-    colors: [
-      Ra::Color.hex('#e2e8f0'),
-      Ra::Color.hex('#94a3b8'),
-    ],
-  )),
+  material: Ra::Material.new(
+    base: Ra::Pattern::Checkers.new(
+      colors: [
+        Ra::Color.hex('#e2e8f0'),
+        Ra::Color.hex('#1e293b'),
+      ],
+    ),
+    reflective: 0.2,
+  ),
+  transform: Ra::Transform
+    .rotate_y(Math::PI / 4)
+    .scale(0.5, 0.5, 0.5),
 )
 
 wall_l = Ra::Shape::Plane.new(
-  material: Ra::Material.new(base: Ra::Pattern::Stripes.new(
-    colors: [
-      Ra::Color.hex('#94a3b8'),
-      Ra::Color.hex('#475569'),
-    ],
-  )),
+  material: Ra::Material.new(
+    base: Ra::Pattern::Stripes.new(
+      colors: [
+        Ra::Color.hex('#f5f5f4'),
+        Ra::Color.hex('#e7e5e4'),
+      ],
+    ),
+  ),
   transform: Ra::Transform
-    .translate(0, 0, +5.0)
+    .translate(0, 0, +3.0)
     .rotate_y(-Math::PI / 4)
     .rotate_x(Math::PI / 2),
 )
 
 wall_r = Ra::Shape::Plane.new(
-  material: Ra::Material.new(base: Ra::Pattern::Stripes.new(
-    colors: [
-      Ra::Color.hex('#94a3b8'),
-      Ra::Color.hex('#475569'),
-    ],
-  )),
+  material: Ra::Material.new(
+    base: Ra::Pattern::Stripes.new(
+      colors: [
+        Ra::Color.hex('#f5f5f4'),
+        Ra::Color.hex('#e7e5e4'),
+      ],
+    ),
+  ),
   transform: Ra::Transform
-    .translate(0, 0, +5.0)
+    .translate(0, 0, +3.0)
     .rotate_y(Math::PI / 4)
     .rotate_x(Math::PI / 2),
 )
@@ -90,23 +100,31 @@ sphere = Ra::Shape::Sphere.new(
 )
 
 cube_l = Ra::Shape::Cube.new(
-  material: Ra::Material.new(base: Ra::Pattern::Gradient.new(
-    color_a: Ra::Color.hex('#f43f5e'),
-    color_b: Ra::Color.hex('#8b5cf6'),
-  )),
+  material: Ra::Material.new(
+    base: Ra::Pattern::Gradient.new(
+      color_a: Ra::Color.hex('#f43f5e'),
+      color_b: Ra::Color.hex('#8b5cf6'),
+    ),
+    reflective: 0.2,
+  ),
   transform: Ra::Transform
-    .translate(+1.0, +0.3, -1.5)
-    .scale(0.3, 0.3, 0.3),
+    .translate(+1.0, +0.3, -1.0)
+    .scale(0.3, 0.3, 0.3)
+    .rotate_y(-Math::PI / 8),
 )
 
 cube_r = Ra::Shape::Cube.new(
-  material: Ra::Material.new(base: Ra::Pattern::Gradient.new(
-    color_a: Ra::Color.hex('#84cc16'),
-    color_b: Ra::Color.hex('#f97316'),
-  )),
+  material: Ra::Material.new(
+    base: Ra::Pattern::Gradient.new(
+      color_a: Ra::Color.hex('#84cc16'),
+      color_b: Ra::Color.hex('#f97316'),
+    ),
+    reflective: 0.5,
+  ),
   transform: Ra::Transform
-    .translate(-1.0, +0.3, -1.5)
-    .scale(0.3, 0.3, 0.3),
+    .translate(-1.0, +0.3, -1.0)
+    .scale(0.3, 0.3, 0.3)
+    .rotate_y(+Math::PI / 8),
 )
 
 lights = [

data/lib/ra/engine.rb

@@ -31,10 +31,7 @@ module Ra
     def draw(x:, y:, canvas:)
       ray = @camera.ray(x:, y:)
 
-      intersections = @world.intersect(ray:)
-      intersection = Intersection.hit(intersections:)
-
-      canvas[x, y] = @world.color(intersection:) if intersection
+      canvas[x, y] = @world.color(ray:)
     end
   end
 end

data/lib/ra/intersection.rb

@@ -38,8 +38,9 @@ module Ra
       point = ray.position(t:)
       eyev = -ray.direction
       normalv = shape.normal(point:)
+      reflectv = Tuple.reflect(ray.direction, normalv)
 
-      Surface.new(shape:, eyev:, normalv:, point:)
+      Surface.new(shape:, eyev:, normalv:, reflectv:, point:)
     end
   end
 end

data/lib/ra/lighting.rb

@@ -53,7 +53,7 @@ module Ra
 
     # @return [Ra::Vector]
     def reflectv
-      @reflectv ||= -(lightv - (normalv * 2 * lightv.dot(normalv)))
+      @reflectv ||= -Tuple.reflect(lightv, normalv)
     end
 
     # @return [Ra::Vector]

data/lib/ra/material.rb

@@ -11,17 +11,24 @@ module Ra
   #    shininess: 200,
   #   )
   class Material
-    attr_accessor :base, :ambient, :diffuse, :specular, :shininess
+    attr_accessor :base, :ambient, :diffuse, :reflective, :specular, :shininess
 
     # @param base [Ra::Color, Ra::Pattern:::Base]
     # @param ambient [Float] between 0.0 and 1.0
     # @param diffuse [Float] between 0.0 and 1.0
+    # @param reflective [Float] between 0.0 and 1.0
     # @param specular [Float] between 0.0 and 1.0
     # @param shininess [Numeric]
-    def initialize(base:, ambient: 0.0, diffuse: 0.8, specular: 0.2, shininess: 80)
+    def initialize(base:, ambient: 0.0, diffuse: 0.8, reflective: 0.0, specular: 0.2, shininess: 80)
+      raise ArgumentError, "ambient=#{ambient} must be between 0 and 1" unless ambient.between?(0, 1)
+      raise ArgumentError, "ambient=#{diffuse} must be between 0 and 1" unless diffuse.between?(0, 1)
+      raise ArgumentError, "ambient=#{reflective} must be between 0 and 1" unless reflective.between?(0, 1)
+      raise ArgumentError, "specular=#{specular} must be between 0 and 1" unless specular.between?(0, 1)
+
       @base = base
       @ambient = ambient
       @diffuse = diffuse
+      @reflective = reflective
       @specular = specular
       @shininess = shininess
     end

data/lib/ra/surface.rb

@@ -3,15 +3,16 @@
 module Ra
   # A surface contains everything needed to apply lighting.
   class Surface
-    attr_accessor :eyev, :normalv, :shape, :point
+    attr_accessor :eyev, :normalv, :reflectv, :shape, :point
 
     # @param eyev [Vector]
     # @param normalv [Vector]
     # @param shape [Ra::Shape]
     # @param point [Vector]
-    def initialize(eyev:, normalv:, shape:, point:)
+    def initialize(eyev:, normalv:, reflectv:, shape:, point:)
       @eyev = eyev
       @normalv = normalv.dot(eyev).negative? ? -normalv : +normalv
+      @reflectv = reflectv
       @shape = shape
       @point = point
     end

data/lib/ra/tuple.rb

@@ -22,5 +22,12 @@ module Ra
         Tuple::VECTOR,
       ]
     end
+
+    # @param vector [Vector]
+    # @param normal [Vector]
+    # @return [Vector]
+    def self.reflect(vector, normal)
+      vector - (normal * 2 * vector.dot(normal))
+    end
   end
 end

data/lib/ra/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ra
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/lib/ra/world.rb

@@ -24,21 +24,39 @@ module Ra
       Intersection.hit(intersections:)
     end
 
-    # @param intersection [Ra::Intersection]
+    # @param ray [Ra::Ray]
     # @return [Ra::Color]
-    def color(intersection:)
+    def color(ray:, remaining: 4)
+      intersection = intersection(ray:)
+      return unless intersection
+
       surface = intersection.surface
-      point = surface.hpoint
 
       colors = @lights.map do |light|
-        shadowed = shadowed?(point:, light:)
-        lighting = Lighting.new(surface:, light:, shadowed:)
+        shadowed = shadowed?(point: surface.hpoint, light:)
+        lighting = Lighting.new(light:, shadowed:, surface:)
         lighting.color
       end
 
-      colors.reduce(&:+)
+      colors.reduce(&:+) + reflect(surface:, remaining:)
+    end
+
+    # @param surface [Ra::Surface]
+    # @param remaining [Integer]
+    # @return [Ra::Color]
+    def reflect(surface:, remaining:)
+      return if remaining.zero?
+
+      material = surface.shape.material
+      return unless material.reflective.positive?
+
+      ray = Ray.new(origin: surface.hpoint, direction: surface.reflectv)
+
+      color = color(ray:, remaining: remaining.pred)
+      color * material.reflective if color
     end
 
+    # @param light [Ra::Light]
     # @param point [Ra::Point]
     def shadowed?(light:, point:)
       vector = light.position - point

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ra
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Kevin Sylvestre