added texcoordTransform for SkyboxMaterial & added PBR update to remo…

…ve env intensity & gamma correction in UI
Hi-Rez · May 20, 2023 · 6d1f7d1 · 6d1f7d1
1 parent 105fc3d
commit 6d1f7d1
Show file tree

Hide file tree

Showing 13 changed files with 63 additions and 17 deletions.
diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj
@@ -262,6 +262,7 @@
 		E1E7681028A73661005D75AB /* AudioInputRendererView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioInputRendererView.swift; sourceTree = "<group>"; };
 		E1E7685028ADAF6F005D75AB /* FlockingRenderer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlockingRenderer.swift; sourceTree = "<group>"; };
 		E1E7685228ADB23B005D75AB /* FlockingRendererView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlockingRendererView.swift; sourceTree = "<group>"; };
+		E1E7ADCA2A14349700180894 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 		E1EB6DE729690C5B0029E4FC /* PBREnhancedRenderer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PBREnhancedRenderer.swift; sourceTree = "<group>"; };
 		E1EB6DE929690DD90029E4FC /* PBREnhancedRendererView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PBREnhancedRendererView.swift; sourceTree = "<group>"; };
 		E1EC55D8268785630097C140 /* RayMarchingRenderer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RayMarchingRenderer.swift; sourceTree = "<group>"; };
@@ -641,6 +642,7 @@
 		E1D714D228A6BADA00B517B6 /* Example */ = {
 			isa = PBXGroup;
 			children = (
+				E1E7ADCA2A14349700180894 /* Info.plist */,
 				E192F05F24875D6E00C7EE74 /* Utilities */,
 				66E678CD243EE2190070B294 /* Renderers */,
 				E1E767C028A6D313005D75AB /* Views */,
@@ -1053,6 +1055,7 @@
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_FILE = Example/Info.plist;
 				INFOPLIST_KEY_NSCameraUsageDescription = "Augments your reality";
 				INFOPLIST_KEY_NSMicrophoneUsageDescription = "Audio Input Example";
 				"INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES;
@@ -1098,6 +1101,7 @@
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_FILE = Example/Info.plist;
 				INFOPLIST_KEY_NSCameraUsageDescription = "Augments your reality";
 				INFOPLIST_KEY_NSMicrophoneUsageDescription = "Audio Input Example";
 				"INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES;

diff --git a/Example/Example/Assets.xcassets/Contents.json b/Example/Example/Assets.xcassets/Contents.json
@@ -2,5 +2,8 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "compression-type" : "automatic"
   }
 }
diff --git a/Example/Example/Example.entitlements b/Example/Example/Example.entitlements
@@ -4,11 +4,11 @@
 <dict>
 	<key>com.apple.security.app-sandbox</key>
 	<true/>
-	<key>com.apple.security.files.user-selected.read-only</key>
-	<true/>
 	<key>com.apple.security.device.audio-input</key>
 	<true/>
 	<key>com.apple.security.device.camera</key>
 	<true/>
+	<key>com.apple.security.files.user-selected.read-write</key>
+	<true/>
 </dict>
 </plist>
diff --git a/Example/Example/Info.plist b/Example/Example/Info.plist
@@ -0,0 +1,8 @@
+<?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>CADisableMinimumFrameDuration</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Example/Example/Renderers/AR/ARPlanesRenderer.swift b/Example/Example/Renderers/AR/ARPlanesRenderer.swift
@@ -13,6 +13,7 @@ import MetalKit
 
 import Forge
 import Satin
+import SatinCore
 import SwiftUI
 
 class ARPlaneContainer: Object {

diff --git a/Example/Example/Renderers/PBR/PBRStandardMaterialRenderer.swift b/Example/Example/Renderers/PBR/PBRStandardMaterialRenderer.swift
@@ -12,8 +12,12 @@ import Metal
 import MetalKit
 
 import Forge
-import SatinCore
 import Satin
+import SatinCore
+
+import CoreImage
+import ModelIO
+import UniformTypeIdentifiers
 
 class PBRStandardMaterialRenderer: BaseRenderer, MaterialDelegate {
     override var texturesURL: URL { sharedAssetsURL.appendingPathComponent("Textures") }
@@ -182,7 +186,6 @@ class PBRStandardMaterialRenderer: BaseRenderer, MaterialDelegate {
         material.setTexture(tmpTexture, type: .normal)
         material.setTexture(tmpTexture, type: .roughness)
 
-
         let baseURL = modelsURL.appendingPathComponent("Suzanne")
         let maps: [PBRTextureIndex: URL] = [
             .baseColor: baseURL.appendingPathComponent("albedo.png"),

diff --git a/Sources/Satin/Core/Renderer.swift b/Sources/Satin/Core/Renderer.swift
@@ -384,8 +384,11 @@ open class Renderer {
                         }
                     }
 
-                    if let cubemapTexture = cubemapTexture, let skyboxMaterial = material as? SkyboxMaterial {
+                    if let cubemapTexture = cubemapTexture,
+                        let skyboxMaterial = material as? SkyboxMaterial {
                         skyboxMaterial.texture = cubemapTexture
+                        skyboxMaterial.texcoordTransform = reflectionTexcoordTransform
+                        skyboxMaterial.environmentIntensity = environmentIntensity
                     }
                 }
             } else {

diff --git a/Sources/Satin/Materials/SkyboxMaterial.swift b/Sources/Satin/Materials/SkyboxMaterial.swift
@@ -6,6 +6,7 @@
 //
 
 import Metal
+import simd
 
 open class SkyboxMaterial: BasicTextureMaterial {
     override public var texture: MTLTexture? {
@@ -16,6 +17,18 @@ open class SkyboxMaterial: BasicTextureMaterial {
         }
     }
 
+    public var texcoordTransform: simd_float3x3 = matrix_identity_float3x3 {
+        didSet {
+            set("Texcoord Transform", texcoordTransform)
+        }
+    }
+
+    public var environmentIntensity: Float = 1.0 {
+        didSet {
+            set("Environment Intensity", environmentIntensity)
+        }
+    }
+
     public var tonemapping: Tonemapping = .aces {
         didSet {
             if oldValue != tonemapping, let shader = shader as? SkyboxShader {
@@ -47,9 +60,16 @@ open class SkyboxMaterial: BasicTextureMaterial {
         initalizeParameters(tonemapping: tonemapping, gammaCorrection: gammaCorrection)
     }
 
-    private func initalizeParameters(tonemapping: Tonemapping = .aces, gammaCorrection: Float = 1.0) {
+    private func initalizeParameters(
+        tonemapping: Tonemapping = .aces,
+        gammaCorrection: Float = 1.0,
+        environmentIntensity: Float = 1.0,
+        texcoordTransform: simd_float3x3 = matrix_identity_float3x3
+    ) {
         self.tonemapping = tonemapping
         self.gammaCorrection = gammaCorrection
+        self.environmentIntensity = environmentIntensity
+        self.texcoordTransform = texcoordTransform
     }
 
     public required init() {

diff --git a/Sources/Satin/Objects/Scene.swift b/Sources/Satin/Objects/Scene.swift
@@ -89,16 +89,17 @@ open class Scene: Object, Environment {
     }
 
     public func setEnvironmentCubemap(texture: MTLTexture,  qos: DispatchQoS.QoSClass = .background, reflectionSize: Int = 512, irrandianceSize: Int = 64, brdfSize: Int = 512, progress: Progress? = nil) {
+
         cubemapTexture = texture
         self.cubemapSize = texture.width
         self.reflectionSize = reflectionSize
         irradianceSize = irrandianceSize
         self.brdfSize = brdfSize
-        DispatchQueue.global(qos: qos).async {
-            guard let environment = self.environment,
-                  let commandQueue = environment.device.makeCommandQueue() else { return }
 
-            let device = environment.device
+        let device = texture.device
+
+        DispatchQueue.global(qos: qos).async {
+            guard let commandQueue = texture.device.makeCommandQueue() else { return }
 
             var _brdfTexture: MTLTexture? = nil
             var _reflectionTexture: MTLTexture? = nil

diff --git a/Sources/Satin/Pipelines/Chunks/PbrStandardUniforms.metal b/Sources/Satin/Pipelines/Chunks/PbrStandardUniforms.metal
@@ -3,8 +3,8 @@
     float roughness;            // slider,0.0,1.0,0.0
     float metallic;             // slider,0.0,1.0,0.0
     float specular;             // slider,0.0,1.0,0.5
-    float environmentIntensity; // slider,0,1,1
-    float gammaCorrection;      // slider,0,1,1
+    float environmentIntensity;
+    float gammaCorrection;
     float3x3 baseColorTexcoordTransform;
     float3x3 emissiveTexcoordTransform;
     float3x3 roughnessTexcoordTransform;

diff --git a/Sources/Satin/Pipelines/Chunks/PbrUniforms.metal b/Sources/Satin/Pipelines/Chunks/PbrUniforms.metal
@@ -14,8 +14,8 @@
     float transmission;         // slider,0.0,1.0,0.0
     float thickness;            // slider,0.0,5.0,0.0
     float ior;                  // slider,1.0,3.0,1.5
-    float environmentIntensity; // slider,0,1,1
-    float gammaCorrection;      // slider,0,1,1
+    float environmentIntensity;
+    float gammaCorrection;
     float3x3 baseColorTexcoordTransform;
     float3x3 emissiveTexcoordTransform;
     float3x3 roughnessTexcoordTransform;

diff --git a/Sources/Satin/Pipelines/Library/Pbr/PbrImageBasedLighting.metal b/Sources/Satin/Pipelines/Library/Pbr/PbrImageBasedLighting.metal
@@ -58,7 +58,7 @@ void pbrIndirectLighting(
     // Transmission
     float ior = pixel.material.ior;
     // float3 thickness = pixel.material.thickness;
-    float3 transmissionRay = getVolumeTransmissionRay(N, V, 1.0, ior);
+    float3 transmissionRay = pixel.material.reflectionTexcoordTransform * getVolumeTransmissionRay(N, V, 1.0, ior);
     // float3 refractedRayExit = pixel.position + transmissionRay;
 
     // Since Satin's render isn't ready for multiple passes we are going to default to refract into the cubemap

diff --git a/Sources/Satin/Pipelines/Materials/Skybox/Shaders.metal b/Sources/Satin/Pipelines/Materials/Skybox/Shaders.metal
@@ -4,6 +4,8 @@
 typedef struct {
     float4 color; // color
     float gammaCorrection; //slider,0.0,1.0,1.0
+    float environmentIntensity; //slider,0,1,1
+    float3x3 texcoordTransform;
 } SkyboxUniforms;
 
 typedef struct {
@@ -33,8 +35,9 @@ fragment float4 skyboxFragment(SkyVertexData in [[stage_in]],
     texturecube<float> cubeTex [[texture(FragmentTextureCustom0)]],
     sampler cubeTexSampler [[sampler(FragmentSamplerCustom0)]])
 {
-    float4 color = cubeTex.sample(cubeTexSampler, in.uv);
-
+    float4 color = cubeTex.sample(cubeTexSampler, uniforms.texcoordTransform * in.uv);
+    color.rgb *= uniforms.environmentIntensity;
+
     color.rgb = tonemap(color.rgb);
 
 #ifndef TONEMAPPING_UNREAL