Fix the display of milky way texture

DJBen · Jul 3, 2023 · aebcbe3 · aebcbe3
1 parent 4ba50f8
commit aebcbe3
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 52 deletions.
diff --git a/Graviton/Base.lproj/Main.storyboard b/Graviton/Base.lproj/Main.storyboard
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="MsG-vN-XK9">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="MsG-vN-XK9">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>

diff --git a/Graviton/Common/Nodes/SphereInteriorNode.swift b/Graviton/Common/Nodes/SphereInteriorNode.swift
@@ -22,7 +22,7 @@ class SphereInteriorNode: SCNNode {
     init(radius: Double, textureLongitudeOffset: Double = 0) {
         super.init()
         let sphere = SCNSphere(radius: CGFloat(radius))
-        sphere.firstMaterial!.cullMode = .back
+        sphere.firstMaterial!.cullMode = .front
         sphere.firstMaterial!.locksAmbientWithDiffuse = true
         geometry = sphere
         var mtx = SCNMatrix4MakeRotation(Float(-Double.pi / 2), 1, 0, 0)

diff --git a/Graviton/Observer/Resources/Textures.xcassets/Contents.json b/Graviton/Observer/Resources/Textures.xcassets/Contents.json
@@ -1,6 +1,6 @@
 {
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}
diff --git a/...r/Resources/Textures.xcassets/debug_sphere_directions_transparency.imageset/Contents.json b/...r/Resources/Textures.xcassets/debug_sphere_directions_transparency.imageset/Contents.json
@@ -1,21 +1,12 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
       "filename" : "debug_sphere_directions_transparency.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}
diff --git a/Graviton/Observer/Resources/Textures.xcassets/milkyway.imageset/Contents.json b/Graviton/Observer/Resources/Textures.xcassets/milkyway.imageset/Contents.json
@@ -1,21 +1,12 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
       "filename" : "milkyway.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}
diff --git a/...r/Resources/Textures.xcassets/mounain_panorama.imageset/[email protected] b/...r/Resources/Textures.xcassets/mounain_panorama.imageset/[email protected]
diff --git a/...s/mounain_panorama.imageset/Contents.json → .../mountain_panorama.imageset/Contents.json b/...s/mounain_panorama.imageset/Contents.json → .../mountain_panorama.imageset/Contents.json
@@ -1,23 +1,22 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
       "filename" : "mounain_panorama.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "[email protected]",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "[email protected]",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}
diff --git a/...in_panorama.imageset/mounain_panorama.png → ...in_panorama.imageset/mounain_panorama.png b/...in_panorama.imageset/mounain_panorama.png → ...in_panorama.imageset/mounain_panorama.png
diff --git a/...panorama.imageset/[email protected] → ...panorama.imageset/[email protected] b/...panorama.imageset/[email protected] → ...panorama.imageset/[email protected]
diff --git a/...ton/Observer/Resources/Textures.xcassets/panorama_city_silhoulette.imageset/Contents.json b/...ton/Observer/Resources/Textures.xcassets/panorama_city_silhoulette.imageset/Contents.json
@@ -1,23 +1,22 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
       "filename" : "[email protected]",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "[email protected]",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "[email protected]",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}
diff --git a/...es.xcassets/panorama_city_silhoulette.imageset/[email protected] b/...es.xcassets/panorama_city_silhoulette.imageset/[email protected]
diff --git a/Graviton/Observer/Scenes/ObserverScene.swift b/Graviton/Observer/Scenes/ObserverScene.swift
@@ -114,7 +114,7 @@ class ObserverScene: SCNScene, CameraResponsive, FocusingSupport {
 
     private lazy var milkyWayNode: SCNNode = {
         let node = SphereInteriorNode(radius: milkywayLayerRadius, textureLongitudeOffset: -Double.pi / 2)
-        node.sphere.firstMaterial!.diffuse.contents = #imageLiteral(resourceName: "milkyway.png")
+        node.sphere.firstMaterial!.diffuse.contents = UIImage(named: "milkyway")
         node.sphere.firstMaterial!.locksAmbientWithDiffuse = true
         node.opacity = 0.3
         node.categoryBitMask = VisibilityCategory.nonMoon.rawValue
@@ -124,7 +124,7 @@ class ObserverScene: SCNScene, CameraResponsive, FocusingSupport {
     lazy var panoramaNode: SCNNode = {
         let node = SphereInteriorNode(radius: landscapeLayerRadius)
         node.sphere.firstMaterial!.diffuse.contents = UIColor.white
-        node.sphere.firstMaterial!.transparent.contents = #imageLiteral(resourceName: "debug_sphere_directions_transparency")
+        node.sphere.firstMaterial!.transparent.contents = UIImage(named: "debug_sphere_directions_transparency")
         node.sphere.firstMaterial!.transparent.contentsTransform = flipTextureContentsTransform
         node.sphere.firstMaterial!.isDoubleSided = true
         node.sphere.firstMaterial!.locksAmbientWithDiffuse = true
@@ -719,15 +719,15 @@ private extension ObserverScene {
         switch key {
         case "citySilhoulette":
             material?.transparencyMode = .aOne
-            material?.transparent.contents = #imageLiteral(resourceName: "panorama_city_silhoulette")
+            material?.transparent.contents = UIImage(named: "panorama_city_silhoulette")
             material?.diffuse.contents = UIColor.lightGray.withAlphaComponent(0.3)
         case "debugNode":
             material?.transparencyMode = .aOne
-            material?.transparent.contents = #imageLiteral(resourceName: "debug_sphere_directions_transparency")
+            material?.transparent.contents = UIImage(named: "debug_sphere_directions_transparency")
             material?.diffuse.contents = UIColor.white
         case "silverMountain":
             material?.transparencyMode = .aOne
-            material?.transparent.contents = #imageLiteral(resourceName: "mounain_panorama")
+            material?.transparent.contents = UIImage(named: "mountain_panorama")
             material?.diffuse.contents = UIColor.white
         case "none":
             break