Merge pull request #58 from quephird/experimental_multiple_lights

Support for multiple lights, including ones with a fade distance
quephird · Nov 29, 2023 · 0f6717a · 0f6717a
2 parents 9da9c78 + ab271c0
commit 0f6717a
Show file tree

Hide file tree

Showing 34 changed files with 382 additions and 148 deletions.
diff --git a/Examples/BallWithAreaLight/BallWithAreaLight.swift b/Examples/BallWithAreaLight/BallWithAreaLight.swift
@@ -11,17 +11,17 @@ import ScintillaLib
 @main
 struct BallWithAreaLight: ScintillaApp {
     var world: World = World {
-        AreaLight(corner: Point(-5, 5, -5),
-                  uVec: Vector(2, 0, 0),
-                  uSteps: 10,
-                  vVec: Vector(0, 2, 0),
-                  vSteps: 10)
         Camera(width: 400,
                height: 400,
                viewAngle: PI/3,
                from: Point(0, 2, -5),
                to: Point(0, 1, 0),
                up: Vector(0, 1, 0))
+        AreaLight(corner: Point(-5, 5, -5),
+                  uVec: Vector(2, 0, 0),
+                  uSteps: 10,
+                  vVec: Vector(0, 2, 0),
+                  vSteps: 10)
         Sphere()
             .translate(0, 1, 0)
             .material(.solidColor(1, 0, 0))

diff --git a/Examples/BarthSextic/BarthSextic.swift b/Examples/BarthSextic/BarthSextic.swift
@@ -14,13 +14,13 @@ let φ: Double = 1.61833987
 @main
 struct BarthSextic: ScintillaApp {
     var world: World = World {
-        PointLight(position: Point(-5, 5, -5))
         Camera(width: 400,
                height: 400,
                viewAngle: PI/3,
                from: Point(0, 0, -5),
                to: Point(0, 0, 0),
                up: Vector(0, 1, 0))
+        PointLight(position: Point(-5, 5, -5))
         ImplicitSurface(center: (0.0, 0.0, 0.0), radius: 2.0) { x, y, z in
             4.0*(φ*φ*x*x-y*y)*(φ*φ*y*y-z*z)*(φ*φ*z*z-x*x) - (1.0+2.0*φ)*(x*x+y*y+z*z-1.0)*(x*x+y*y+z*z-1.0)
         }

diff --git a/Examples/Blob/Blob.swift b/Examples/Blob/Blob.swift
@@ -12,13 +12,13 @@ import ScintillaLib
 @main
 struct Blob: ScintillaApp {
     var world = World {
-        PointLight(position: Point(-10, 10, -10))
         Camera(width: 400,
                height: 400,
                viewAngle: PI/3,
                from: Point(0, 0, -5),
                to: Point(0, 0, 0),
                up: Vector(0, 1, 0))
+        PointLight(position: Point(-10, 10, -10))
         ImplicitSurface(bottomFrontLeft: (-2, -2, -2),
                         topBackRight: (2, 2, 2), { x, y, z in
             x*x + y*y + z*z + sin(4*x) + sin(4*y) + sin(4*z) - 1.0

diff --git a/Examples/Breather/Breather.swift b/Examples/Breather/Breather.swift
@@ -26,13 +26,13 @@ func z(u: Double, v: Double) -> Double {
 @main
 struct Breather: ScintillaApp {
     var world = World {
-        PointLight(position: Point(-10, 10, -10))
         Camera(width: 400,
                height: 400,
                viewAngle: PI/3,
                from: Point(0, 0, -15),
                to: Point(0, 0, 0),
                up: Vector(0, 1, 0))
+        PointLight(position: Point(-10, 10, -10))
         ParametricSurface(bottomFrontLeft: (-8, -5, -5),
                           topBackRight: (8, 5, 5),
                           uRange: (-15, 15),

diff --git a/Examples/Cavatappi/Cavatappi.swift b/Examples/Cavatappi/Cavatappi.swift
@@ -12,13 +12,14 @@ import ScintillaLib
 @main
 struct Cavatappi: ScintillaApp {
     var world = World {
-        PointLight(position: Point(-10, 10, -10))
         Camera(width: 400,
                height: 400,
                viewAngle: PI/3,
                from: Point(0, 7, -15),
                to: Point(0, 7, 0),
                up: Vector(0, 1, 0))
+        PointLight(position: Point(-10, 10, -10))
+        PointLight(position: Point(10, 10, -10))
         ParametricSurface(bottomFrontLeft: (-3.5, 0, -3.5),
                           topBackRight: (3.5, 15.0, 3.5),
                           uRange: (0, 2*PI),

diff --git a/Examples/DecoCube/DecoCube.swift b/Examples/DecoCube/DecoCube.swift
@@ -23,13 +23,13 @@ func decoCubeColor(_ x: Double, _ y: Double, _ z: Double) -> (Double, Double, Do
 @main
 struct DecoCube: ScintillaApp {
     var world = World {
-        PointLight(position: Point(-10, 10, -10))
         Camera(width: 600,
                height: 600,
                viewAngle: PI/3,
                from: Point(2, 1, -6),
                to: Point(0, 0, 0),
                up: Vector(0, 1, 0))
+        PointLight(position: Point(-10, 10, -10))
         ImplicitSurface(bottomFrontLeft: (-2.5, -2.5, -2.5),
                         topBackRight: (2.5, 2.5, 2.5), { x, y, z in
             decoCubeShape(x, y, z)

diff --git a/Examples/Die/Die.swift b/Examples/Die/Die.swift
@@ -15,13 +15,13 @@ struct Die: ScintillaApp {
             .reflective(0.2)
 
         return World {
-            PointLight(position: Point(-10, 10, -10))
             Camera(width: 800,
                    height: 600,
                    viewAngle: PI/3,
                    from: Point(0, 5, -10),
                    to: Point(0, 0, 0),
                    up: Vector(0, 1, 0))
+            PointLight(position: Point(-10, 10, -10))
             Cube()
                 .material(orange)
                 .intersection {

diff --git a/Examples/DimlyLitScene/DimlyLitScene.swift b/Examples/DimlyLitScene/DimlyLitScene.swift
@@ -0,0 +1,27 @@
+//
+//  DimlyLitScene.swift
+//
+//
+//  Created by Danielle Kefford on 11/28/23.
+//
+
+import ScintillaLib
+
+@available(macOS 12.0, *)
+@main
+struct DimlyLitScene: ScintillaApp {
+    var world = World {
+        Camera(width: 400,
+               height: 400,
+               viewAngle: PI/3,
+               from: Point(0, 0, -5),
+               to: Point(0, 0, 0),
+               up: Vector(0, 1, 0))
+        PointLight(position: Point(-10, 10, 0),
+                   fadeDistance: 10)
+        Sphere()
+            .material(.solidColor(1, 0.5, 0))
+        Plane()
+            .translate(0, -1, 0)
+    }
+}
diff --git a/Examples/HappyHalloween/HappyHalloween.swift b/Examples/HappyHalloween/HappyHalloween.swift
@@ -24,13 +24,13 @@ func stem(x: Double, y: Double, z: Double) -> Double {
 @main
 struct HappyHalloween: ScintillaApp {
     var world: World = World {
-        PointLight(position: Point(-2, 5, -5))
         Camera(width: 600,
                height: 600,
                viewAngle: PI/3,
                from: Point(0, 2, -5),
                to: Point(0, 0, 0),
                up: Vector(0, 1, 0))
+        PointLight(position: Point(-2, 5, -5))
         ImplicitSurface(center: (0.0, 0.0, 0.0), radius: 2.0) { x, y, z in
             pumpkin(x: x, y: y, z: z)
         }

diff --git a/Examples/HollowedSphere/HollowedSphere.swift b/Examples/HollowedSphere/HollowedSphere.swift
@@ -11,13 +11,13 @@ import ScintillaLib
 @main
 struct HollowedSphere: ScintillaApp {
     var world = World {
-        PointLight(position: Point(-10, 10, -10))
         Camera(width: 400,
                height: 400,
                viewAngle: PI/3,
                from: Point(0, 1.5, -2),
                to: Point(0, 0, 0),
                up: Vector(0, 1, 0))
+        PointLight(position: Point(-10, 10, -10))
         Sphere()
             .material(.solidColor(0, 0, 1))
             .intersection {

diff --git a/Examples/Hourglass/Hourglass.swift b/Examples/Hourglass/Hourglass.swift
@@ -12,13 +12,13 @@ import ScintillaLib
 @main
 struct Hourglass: ScintillaApp {
     var world = World {
-        PointLight(position: Point(-10, 10, -10))
         Camera(width: 400,
                height: 400,
                viewAngle: PI/3,
                from: Point(0, 1, -5),
                to: Point(0, 0, 0),
                up: Vector(0, 1, 0))
+        PointLight(position: Point(-10, 10, -10))
         ParametricSurface(bottomFrontLeft: (-1.0, -1.0, -1.0),
                           topBackRight: (1.0, 1.0, 1.0),
                           uRange: (0, 2*PI),

diff --git a/Examples/QuickStart/QuickStart.swift b/Examples/QuickStart/QuickStart.swift
@@ -11,13 +11,13 @@ import ScintillaLib
 @main
 struct QuickStart: ScintillaApp {
     var world = World {
-        PointLight(position: Point(-10, 10, -10))
         Camera(width: 400,
                height: 400,
                viewAngle: PI/3,
                from: Point(0, 2, -2),
                to: Point(0, 0, 0),
                up: Vector(0, 1, 0))
+        PointLight(position: Point(-10, 10, -10))
         Sphere()
             .material(.solidColor(1, 0, 0))
     }

diff --git a/Examples/RainbowBall/RainbowBall.swift b/Examples/RainbowBall/RainbowBall.swift
@@ -12,13 +12,13 @@ import ScintillaLib
 @main
 struct RainbowBall: ScintillaApp {
     var world = World {
-        PointLight(position: Point(-10, 10, -10))
         Camera(width: 400,
                height: 400,
                viewAngle: PI/3,
                from: Point(0, 2, -2),
                to: Point(0, 0, 0),
                up: Vector(0, 1, 0))
+        PointLight(position: Point(-10, 10, -10))
         Sphere()
             .material(.colorFunction(.hsl) { x, y, z in
                 ((atan2(z, x)+PI)/PI/2.0, 1.0, 0.5)

diff --git a/Examples/Rings/Rings.swift b/Examples/Rings/Rings.swift
@@ -12,13 +12,13 @@ import ScintillaLib
 @main
 struct Rings: ScintillaApp {
     var world = World {
-        PointLight(position: Point(-10, 10, -10))
         Camera(width: 400,
                height: 400,
                viewAngle: PI/3,
                from: Point(-10, 7, -10),
                to: Point(0, 0, 0),
                up: Vector(0, 1, 0))
+        PointLight(position: Point(-10, 10, -10))
         ParametricSurface(bottomFrontLeft: (-6, -3, -6),
                           topBackRight: (6, 3, 6),
                           uRange: (0, 2*PI),

diff --git a/Examples/StarPrism/StarPrism.swift b/Examples/StarPrism/StarPrism.swift
@@ -11,13 +11,13 @@ import ScintillaLib
 @main
 struct StarPrism: ScintillaApp {
     var world = World {
-        PointLight(position: Point(-5, 5, -5))
         Camera(width: 400,
                height: 400,
                viewAngle: PI/3,
                from: Point(0, 5, -5),
                to: Point(0, 1, 0),
                up: Vector(0, 1, 0))
+        PointLight(position: Point(-5, 5, -5))
         Prism(bottomY: 0.0,
               topY: 2.0,
               xzPoints: [

diff --git a/Examples/Superellipsoids/Superellipsoids.swift b/Examples/Superellipsoids/Superellipsoids.swift
@@ -11,13 +11,13 @@ import ScintillaLib
 @main
 struct Superellipsoids: ScintillaApp {
     var world: World = World {
-        PointLight(position: Point(0, 5, -5))
         Camera(width: 400,
                height: 400,
                viewAngle: PI/3,
                from: Point(0, 0, -12),
                to: Point(0, 0, 0),
                up: Vector(0, 1, 0))
+        PointLight(position: Point(0, 5, -5))
         for (i, e) in [0.25, 0.5, 1.0, 2.0, 2.5].enumerated() {
             for (j, n) in [0.25, 0.5, 1.0, 2.0, 2.5].enumerated() {
                 Superellipsoid(e: e, n: n)

diff --git a/Examples/TDOR/TDOR.swift b/Examples/TDOR/TDOR.swift
@@ -12,13 +12,13 @@ import ScintillaLib
 @main
 struct TDOR: ScintillaApp {
     var world = World {
-        PointLight(position: Point(-10, 10, -10))
         Camera(width: 600,
                height: 600,
                viewAngle: PI/3,
                from: Point(0, 0, -5),
                to: Point(0, 0, 0),
                up: Vector(0, 1, 0))
+        PointLight(position: Point(-10, 10, -10))
         ImplicitSurface(bottomFrontLeft: (-0.5, 0.0, -0.5),
                         topBackRight: (0.5, 1.0, 0.5), { x, y, z in
             pow(x, 2.0) + pow(z, 2.0) - pow(y, 3.0) + pow(y, 4.0)

diff --git a/Examples/Vase/Vase.swift b/Examples/Vase/Vase.swift
@@ -11,13 +11,13 @@ import ScintillaLib
 @main
 struct Vase: ScintillaApp {
     var world = World {
-        PointLight(position: Point(-5, 5, -5))
         Camera(width: 400,
                height: 400,
                viewAngle: PI/3,
                from: Point(0, 7, -10),
                to: Point(0, 2, 0),
                up: Vector(0, 1, 0))
+        PointLight(position: Point(-5, 5, -5))
         SurfaceOfRevolution(yzPoints: [(0.0, 2.0), (1.0, 2.0), (2.0, 1.0), (3.0, 0.5), (6.0, 0.5)])
             .material(.solidColor(0.5, 0.6, 0.8))
         Plane()

diff --git a/Package.swift b/Package.swift
@@ -95,5 +95,9 @@ let package = Package(
             name: "DecoCube",
             dependencies: ["ScintillaLib"],
             path: "Examples/DecoCube"),
+        .executableTarget(
+            name: "DimlyLitScene",
+            dependencies: ["ScintillaLib"],
+            path: "Examples/DimlyLitScene"),
     ]
 )