Skip to content

Commit

Permalink
Merge branch 'main' into named
Browse files Browse the repository at this point in the history
# Conflicts:
#	Sources/SwiftSCAD/Values/Color.swift
  • Loading branch information
tomasf committed Jul 28, 2024
2 parents 25da833 + 9dba783 commit 78180d3
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions Sources/SwiftSCAD/Values/Color.swift
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import Foundation

public struct Color: Sendable {
private let source: Source
private let value: Value

init(red: Double, green: Double, blue: Double, alpha: Double = 1.0) {
source = .components(red: red, green: green, blue: blue, alpha: alpha)
value = .components(red: red, green: green, blue: blue, alpha: alpha)
}

func withAlphaComponent(_ alpha: Double) -> Color {
switch source {
switch value {
case .components (let red, let green, let blue, _):
Color(red: red, green: green, blue: blue, alpha: alpha)
case .named (let name, _):
Expand All @@ -18,7 +18,7 @@ public struct Color: Sendable {
}

internal extension Color {
enum Source {
enum Value {
case components (red: Double, green: Double, blue: Double, alpha: Double)
case named (String, alpha: Double)

Expand All @@ -33,11 +33,11 @@ internal extension Color {
}

init(name: String, alpha: Double = 1.0) {
source = .named(name, alpha: alpha)
value = .named(name, alpha: alpha)
}

var invocation: Invocation {
Invocation(name: "color", parameters: source.parameters)
Invocation(name: "color", parameters: value.parameters)
}
}

Expand Down

0 comments on commit 78180d3

Please sign in to comment.