Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions SlackowWall.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -511,12 +511,13 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = SlackowWall/SlackowWall.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 260217;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_ASSET_PATHS = "\"SlackowWall/Resources/Preview Content\"";
DEVELOPMENT_TEAM = 94CLS492CD;
DEVELOPMENT_TEAM = C333G2JG3Y;
ENABLE_APP_SANDBOX = NO;
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_PREVIEWS = YES;
Expand Down Expand Up @@ -548,12 +549,13 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = SlackowWall/SlackowWall.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 260217;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_ASSET_PATHS = "\"SlackowWall/Resources/Preview Content\"";
DEVELOPMENT_TEAM = 94CLS492CD;
DEVELOPMENT_TEAM = C333G2JG3Y;
ENABLE_APP_SANDBOX = NO;
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_PREVIEWS = YES;
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>PacemanWrapper.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>1</integer>
</dict>
<key>SlackowWall.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
</dict>
</dict>
</dict>
</plist>
1 change: 0 additions & 1 deletion SlackowWall/Features/Capture/Views/CapturePreview.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ struct CapturePreview: NSViewRepresentable {
// A layer that renders the video contents.
private let contentLayer = CALayer()
private var reframe: ((CapturedFrame, CALayer) -> Void)? = nil

public mutating func onNewFrame(_ callback: @escaping (CapturedFrame, CALayer) -> Void) {
self.reframe = callback
}
Expand Down
116 changes: 116 additions & 0 deletions SlackowWall/Features/Projector/Views/DynamicEyeOverlay.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
//
// DynamicEyeOverlay.swift
// SlackowWall
//
// Dynamically rendered eye projector overlay with configurable colors,
// column count, and font. Replaces the static PNG overlays with a
// customizable version.
//

import SwiftUI

struct DynamicEyeOverlay: View {
let columnsPerSide: Int
let color1: Color
let color2: Color
let textColor: Color
let centerLineColor: Color
let bandOpacity: Double
let showDecadeMarkers: Bool

private var totalColumns: Int { columnsPerSide * 2 }

var body: some View {
GeometryReader { geo in
let colWidth = geo.size.width / CGFloat(totalColumns)
let bandHeight = max(colWidth * 1.2, 20)
let bandY = (geo.size.height - bandHeight) / 2

ZStack(alignment: .topLeading) {
// Colored columns with numbers
columnBand(colWidth: colWidth, bandHeight: bandHeight, bandY: bandY, geoWidth: geo.size.width)

// Center line
Rectangle()
.fill(centerLineColor)
.frame(width: 1, height: geo.size.height)
.position(x: geo.size.width / 2, y: geo.size.height / 2)
}
}
.allowsHitTesting(false)
}

private func columnBand(colWidth: CGFloat, bandHeight: CGFloat, bandY: CGFloat, geoWidth: CGFloat) -> some View {
HStack(spacing: 0) {
ForEach(0..<totalColumns, id: \.self) { i in
columnCell(index: i, colWidth: colWidth, bandHeight: bandHeight)
}
}
.frame(height: bandHeight)
.offset(y: bandY)
}

private func columnCell(index: Int, colWidth: CGFloat, bandHeight: CGFloat) -> some View {
let distFromCenter: Int
if index < columnsPerSide {
distFromCenter = columnsPerSide - index
} else {
distFromCenter = index - columnsPerSide + 1
}

let bgColor = (index % 2 == 0) ? color1 : color2
let isDecadeBoundary = showDecadeMarkers && distFromCenter > 1 && distFromCenter % 10 == 0
let label = showDecadeMarkers ? distFromCenter % 10 : distFromCenter

let fontSize = min(colWidth * 0.8, bandHeight * 0.6)

return ZStack {
Rectangle()
.fill(bgColor.opacity(bandOpacity))
if isDecadeBoundary {
HStack(spacing: 0) {
Rectangle()
.fill(centerLineColor)
.frame(width: 1)
Spacer()
}
let tens = distFromCenter / 10
let ones = distFromCenter % 10
let digitSize = fontSize * 0.7
VStack(spacing: 0) {
Text("\(tens)")
.font(.system(size: digitSize, weight: .bold, design: .monospaced))
.foregroundStyle(textColor)
Text("\(ones)")
.font(.system(size: digitSize, weight: .bold, design: .monospaced))
.foregroundStyle(textColor)
}
.minimumScaleFactor(0.2)
.lineLimit(1)
} else {
Text("\(label)")
.font(.system(size: fontSize, weight: .bold, design: .monospaced))
.foregroundStyle(textColor)
.minimumScaleFactor(0.3)
.lineLimit(1)
}
}
.frame(width: colWidth, height: bandHeight)
}
}

#Preview {
ZStack {
Color.white
DynamicEyeOverlay(
columnsPerSide: 30,
color1: Color(red: 1.0, green: 0.69, blue: 0.77),
color2: Color(red: 0.68, green: 0.85, blue: 0.9),
textColor: .black,
centerLineColor: Color(white: 0.8),
bandOpacity: 1.0,
showDecadeMarkers: true
)
}
.frame(width: 600, height: 400)
}
37 changes: 30 additions & 7 deletions SlackowWall/Features/Projector/Views/EyeProjectorView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,39 @@ struct EyeProjectorView: View {
y: utility.eyeProjectorHeightScale * f
* (Double(utility.eyeProjectorOverlayWidth) / 384)
)
overlayImage
.resizable()
if utility.eyeProjectorDynamicOverlay {
DynamicEyeOverlay(
columnsPerSide: utility.eyeProjectorColumnsPerSide,
color1: utility.eyeProjectorOverlayColor1.color,
color2: utility.eyeProjectorOverlayColor2.color,
textColor: utility.eyeProjectorOverlayTextColor.color,
centerLineColor: utility.eyeProjectorOverlayCenterColor.color,
bandOpacity: utility.eyeProjectorOverlayBandOpacity,
showDecadeMarkers: utility.eyeProjectorShowDecadeMarkers
)
.frame(width: geo.size.width)
.opacity(utility.eyeProjectorOverlayOpacity)
} else if screenRecorder.projectorMode == .pie_and_e {
} else {
overlayImage
.resizable()
.frame(width: geo.size.width)
.opacity(utility.eyeProjectorOverlayOpacity)
}
} else if screenRecorder.projectorMode == .pie
|| screenRecorder.projectorMode == .pie_and_e
{
previewRenderer.instance.eyeProjectorStream.capturePreview
previewRenderer.instance.eCountProjectorStream.capturePreview
.scaleEffect(4 * utility.pieProjectorECountScale / f)
.offset(utility.pieProjectorECountTranslation)
.opacity(utility.pieProjectorECountVisible ? 1 : 0)
.scaleEffect(
x: utility.pieProjectorFlatten ? utility.pieProjectorScaleX : 1,
y: utility.pieProjectorFlatten ? utility.pieProjectorScaleY : 1
)
.offset(y: utility.pieProjectorFlatten ? utility.pieProjectorOffsetY : 0)
if screenRecorder.projectorMode == .pie_and_e {
previewRenderer.instance.eCountProjectorStream.capturePreview
.scaleEffect(4 * utility.pieProjectorECountScale / f)
.offset(utility.pieProjectorECountTranslation)
.opacity(utility.pieProjectorECountVisible ? 1 : 0)
}
} else {
previewRenderer.instance.eyeProjectorStream.capturePreview
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,34 @@ extension Preferences {
var eyeProjectorStretchedOverlay: Bool = false
var eyeProjectorOverlayImage: URL? = nil
var eyeProjectorOverlayWidth: Int {
eyeProjectorStretchedOverlay ? 30 : 60
if eyeProjectorDynamicOverlay {
return eyeProjectorColumnsPerSide * 2
}
return eyeProjectorStretchedOverlay ? 30 : 60
}
var eyeProjectorAlwaysOnTop: Bool = false
var eyeProjectorTitleBarHidden: Bool = false
var eyeProjectorShouldOpenWithTallMode: Bool {
eyeProjectorEnabled && eyeProjectorOpenWithTallMode
}

// Dynamic overlay (replaces static image when enabled)
var eyeProjectorDynamicOverlay: Bool = false
var eyeProjectorColumnsPerSide: Int = 15
var eyeProjectorOverlayColor1: CodableColor = CodableColor(r: 1.0, g: 0.69, b: 0.77) // pink
var eyeProjectorOverlayColor2: CodableColor = CodableColor(r: 0.68, g: 0.85, b: 0.9) // blue
var eyeProjectorOverlayTextColor: CodableColor = CodableColor(r: 0, g: 0, b: 0) // black
var eyeProjectorOverlayCenterColor: CodableColor = CodableColor(r: 0.8, g: 0.8, b: 0.8) // gray
var eyeProjectorOverlayBandOpacity: Double = 1.0
var eyeProjectorShowDecadeMarkers: Bool = false

var pieProjectorEnabled: Bool = false
var pieProjectorOpenWithTallMode: Bool = true
var pieProjectorOpenWithThinMode: Bool = true
var pieProjectorFlatten: Bool = false
var pieProjectorScaleX: Double = 0.7
var pieProjectorScaleY: Double = 1.4
var pieProjectorOffsetY: Double = 40
var pieProjectorECountScale: Double = 1.0
var pieProjectorECountTranslation: CGSize = .zero
var pieProjectorECountVisible: Bool = true
Expand Down
Loading