Work on onboarding

Author: dirkwhoffmann

GUI/Metal/Layers/Canvas.swift

@@ -359,6 +359,8 @@ class Canvas: Layer {
     }
 
     func render(_ encoder: MTLRenderCommandEncoder) {
+
+        if !shouldRender { return }
 
         // Configure the vertex shader
         encoder.setVertexBytes(&vertexUniforms2D,

GUI/Metal/Layers/Layer.swift

@@ -22,6 +22,9 @@ class Layer: NSObject {
     // Alpha channel of this layer
     var alpha: AnimatedFloat = AnimatedFloat(0.0)
 
+    // Indicates if this layer should be rendered
+    var shouldRender = true
+
     //
     // Initializing
     //

GUI/Metal/Layers/Onboarding.swift

@@ -53,41 +53,14 @@ class OnboardingLayerView: NSView {
 @MainActor
 class OnboardingPageContainerView: NSView {
 
-    /*
-    private var bgLayer: CALayer?
-
-    override func viewDidMoveToWindow() {
-
-        super.viewDidMoveToWindow()
-        wantsLayer = true
-
-        if let layer = self.layer, bgLayer == nil {
-
-            let background = CALayer()
-            background.contents = NSImage(named: "vAmigaBg")
-            background.contentsGravity = .resizeAspectFill
-            background.autoresizingMask = [.layerWidthSizable, .layerHeightSizable]
-            layer.insertSublayer(background, at: 0)
-            bgLayer = background
-        }
-    }
-
-    override func layout() {
-
-        super.layout()
-        bgLayer?.frame = CGRect(x: 0, y: 0,
-                                width: bounds.width,
-                                height: bounds.height - 32)
-    }
-    */
 }
 
 class OnboardingLayerViewController: NSViewController {
 
     @IBOutlet weak var pageContainerView: OnboardingPageContainerView!
     @IBOutlet weak var pageDotIndicator: PageDotsIndicator!
+    var layer: Onboarding!
 
-    // var pageController: NSPageController!
     private var pages: [NSViewController] = []
     private var currentPageIndex: Int = 0 {
         didSet { pageDotIndicator.currentPage = currentPageIndex }
@@ -100,12 +73,20 @@ class OnboardingLayerViewController: NSViewController {
 
     override func viewDidAppear() {
 
+        print("View did appear...")
+
         func instantiate(_ id: String) -> NSViewController {
 
             let storyboard = NSStoryboard(name: "Onboarding", bundle: nil)
             return storyboard.instantiateController(withIdentifier: id) as! NSViewController
         }
 
+        // Remove all child view controllers and their views
+        for child in children {
+            child.view.removeFromSuperview()
+            child.removeFromParent()
+        }
+
         super.viewDidAppear()
         pages = [instantiate("Step1"), instantiate("Step2")]
         pageDotIndicator.numberOfPages = pages.count
@@ -175,6 +156,12 @@ class OnboardingLayerViewController: NSViewController {
             showPage(at: prevIndex)
         }
     }
+
+    @IBAction func skipAction(_ sender: Any?) {
+
+        print("skip")
+        layer!.close(delay: 1.0)
+    }
 }
 
 @MainActor
@@ -193,6 +180,21 @@ class Onboarding: Layer {
         onboardingVC = storyboard.instantiateController(withIdentifier: "OnboardingLayerViewController") as? OnboardingLayerViewController
         onboardingVC.view.wantsLayer = true
         onboardingVC.view.layer?.backgroundColor = NSColor.windowBackgroundColor.cgColor
+        onboardingVC.layer = self
+    }
+
+    override func open(delay: Double) {
+
+        super.open(delay: delay)
+
+        print("open")
+    }
+
+    override func layerDidOpen() {
+
+        print("layerDidOpen")
+        renderer.canvas.shouldRender = true
+        renderer.splashScreen.shouldRender = true
     }
 
     override func alphaDidChange() {

GUI/Metal/Layers/SplashScreen.swift

@@ -58,7 +58,9 @@ class SplashScreen: Layer {
     }
 
     func render(_ encoder: MTLRenderCommandEncoder) {
-        
+
+        if !shouldRender { return }
+
         // Configure vertex shader
         encoder.setVertexBytes(&vertexUniforms,
                                length: MemoryLayout<VertexUniforms>.stride,

GUI/Metal/Renderer.swift

@@ -297,8 +297,9 @@ class Renderer: NSObject, MTKViewDelegate {
         // Render the scene
         if canvas.isTransparent { splashScreen.render(encoder) }
         if canvas.isVisible { canvas.render(encoder) }
+
         encoder.endEncoding()
-        
+
         // Commit the command buffer
         buffer.addCompletedHandler { @Sendable [weak self] buffer in
 

GUI/Metal/RendererSetup.swift

@@ -51,10 +51,16 @@ extension Renderer {
     }
 
     func buildDescriptors() {
-        
-        // Render pass descriptor
+
+        // Get the default background color
+        let bgColor = NSColor.windowBackgroundColor.usingColorSpace(.deviceRGB) ?? .black
+        let r = Double(bgColor.redComponent)
+        let g = Double(bgColor.greenComponent)
+        let b = Double(bgColor.blueComponent)
+
+        // Create the render pass descriptor
         descriptor = MTLRenderPassDescriptor()
-        descriptor.colorAttachments[0].clearColor = MTLClearColorMake(0, 0, 0, 1)
+        descriptor.colorAttachments[0].clearColor = MTLClearColorMake(r, g, b, 1.0)
         descriptor.colorAttachments[0].loadAction = MTLLoadAction.clear
         descriptor.colorAttachments[0].storeAction = MTLStoreAction.store
         descriptor.depthAttachment.clearDepth = 1

GUI/MyController.swift

@@ -209,7 +209,9 @@ extension MyController {
         do {
 
             // Experimental
-            renderer.onboarding.open(delay: 1)
+            renderer.splashScreen.shouldRender = false
+            renderer.canvas.shouldRender = false
+            renderer.onboarding.open(delay: 1.0)
 
             // Install Aros if no Kickstart is present
             if !emu.mem.info.hasRom { installAros() }

GUI/MyControllerMenu.swift

@@ -168,8 +168,13 @@ extension MyController: NSMenuItemValidation {
         pref.applyUserDefaults()
 
         // Power on
+        /*
         emu.powerOn()
         try? emu.run()
+        */
+
+        // Launch the onboarding agent
+        renderer.onboarding.open(delay: 1.0)
     }
 
     @IBAction func importScriptAction(_ sender: Any!) {

GUI/System/OnboardingButton.swift

@@ -36,6 +36,8 @@ class OnboardingButton: NSControl {
         setup()
     }
 
+    var myFont: NSFont?
+
     private func setup() {
 
         wantsLayer = true