New Logo, production db, add library shader to project

Author: markusmoenig

ShaderMania.entitlements

@@ -0,0 +1,25 @@
+<?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>aps-environment</key>
+	<string>development</string>
+	<key>com.apple.developer.icloud-container-identifiers</key>
+	<array>
+		<string>iCloud.com.moenig.ShaderMania</string>
+	</array>
+	<key>com.apple.developer.icloud-services</key>
+	<array>
+		<string>CloudDocuments</string>
+		<string>CloudKit</string>
+	</array>
+	<key>com.apple.developer.ubiquity-container-identifiers</key>
+	<array>
+		<string>iCloud.com.moenig.ShaderMania</string>
+	</array>
+	<key>com.apple.developer.icloud-container-environment</key>
+	<string>Production</string>
+	<key>com.apple.developer.ubiquity-kvstore-identifier</key>
+	<string>$(TeamIdentifierPrefix)$(CFBundleIdentifier)</string>
+</dict>
+</plist>

ShaderMania.xcodeproj/project.pbxproj

@@ -54,6 +54,7 @@
 		2B36F67925D4DE84001611BE /* OpenSans.json in Resources */ = {isa = PBXBuildFile; fileRef = 2B36F67525D4DE84001611BE /* OpenSans.json */; };
 		2B3D4C7925A68ECA00D2F8EA /* Views.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B3D4C7825A68ECA00D2F8EA /* Views.swift */; };
 		2B3D4C7A25A68ECA00D2F8EA /* Views.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B3D4C7825A68ECA00D2F8EA /* Views.swift */; };
+		2B6B9C7625E0BC6000F266DF /* CloudKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B6B9C7525E0BC6000F266DF /* CloudKit.framework */; };
 		2B77B7BB25773978002D99C0 /* File.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B77B7BA25773978002D99C0 /* File.swift */; };
 		2B77B7BC25773978002D99C0 /* File.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B77B7BA25773978002D99C0 /* File.swift */; };
 		2B7C7EEC25DCB5D400727BC0 /* Library.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B7C7EEB25DCB5D400727BC0 /* Library.swift */; };
@@ -94,6 +95,8 @@
 		2B36F67425D4DE84001611BE /* OpenSans.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = OpenSans.tiff; sourceTree = "<group>"; };
 		2B36F67525D4DE84001611BE /* OpenSans.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = OpenSans.json; sourceTree = "<group>"; };
 		2B3D4C7825A68ECA00D2F8EA /* Views.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Views.swift; sourceTree = "<group>"; };
+		2B6B9C7225E0BC4E00F266DF /* ShaderMania.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = ShaderMania.entitlements; sourceTree = "<group>"; };
+		2B6B9C7525E0BC6000F266DF /* CloudKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CloudKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS14.4.sdk/System/Library/Frameworks/CloudKit.framework; sourceTree = DEVELOPER_DIR; };
 		2B77B7BA25773978002D99C0 /* File.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = File.swift; sourceTree = "<group>"; };
 		2B7C7EEB25DCB5D400727BC0 /* Library.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Library.swift; sourceTree = "<group>"; };
 		2B7C7EFB25DD0E0900727BC0 /* StoreManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoreManager.swift; sourceTree = "<group>"; };
@@ -105,6 +108,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				2B6B9C7625E0BC6000F266DF /* CloudKit.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -123,6 +127,7 @@
 		2B0EEA482565DF3900C84C6C = {
 			isa = PBXGroup;
 			children = (
+				2B6B9C7225E0BC4E00F266DF /* ShaderMania.entitlements */,
 				2B0EEA4D2565DF3900C84C6C /* Shared */,
 				2B0EEA582565DF3A00C84C6C /* iOS */,
 				2B0EEA5F2565DF3A00C84C6C /* macOS */,
@@ -201,6 +206,7 @@
 		2B0EEAC1256619D000C84C6C /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				2B6B9C7525E0BC6000F266DF /* CloudKit.framework */,
 				2B7C7F0225DD0E6D00727BC0 /* StoreKit.framework */,
 				2B0EEAC2256619D000C84C6C /* CloudKit.framework */,
 			);
@@ -492,6 +498,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				CODE_SIGN_ENTITLEMENTS = ShaderMania.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = G6R6L3VH62;
 				ENABLE_PREVIEWS = YES;
@@ -516,6 +523,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				CODE_SIGN_ENTITLEMENTS = ShaderMania.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = G6R6L3VH62;
 				ENABLE_PREVIEWS = YES;

Shared/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -71,25 +71,25 @@
       "size" : "40x40"
     },
     {
-      "filename" : "Image 2-1.png",
+      "filename" : "Space 2-2.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "76x76"
     },
     {
-      "filename" : "Image 2.png",
+      "filename" : "Space 2-1.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "76x76"
     },
     {
-      "filename" : "Image 2-2.png",
+      "filename" : "Space 2.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "83.5x83.5"
     },
     {
-      "filename" : "Image-1.png",
+      "filename" : "Space.png",
       "idiom" : "ios-marketing",
       "scale" : "1x",
       "size" : "1024x1024"
@@ -130,19 +130,19 @@
       "size" : "256x256"
     },
     {
-      "filename" : "RoundedIcon 2-1.png",
+      "filename" : "Space_Rounded 2-1.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "256x256"
     },
     {
-      "filename" : "RoundedIcon 2.png",
+      "filename" : "Space_Rounded 2.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "512x512"
     },
     {
-      "filename" : "RoundedIcon.png",
+      "filename" : "Space_Rounded.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "512x512"

Shared/Assets.xcassets/AppIcon.appiconset/Image 2-1.png

@@ -18,7 +18,7 @@ struct ContentView: View {
     }
 
     @State var editingState                 : EditingState = .Both
-    @State var editingStateText             : String = " Source & Nodes"
+    @State var editingStateText             : String = "Source & Nodes"
 
     @Binding var document                   : ShaderManiaDocument
     @StateObject var storeManager           : StoreManager
@@ -30,7 +30,7 @@ struct ContentView: View {
     @State private var userNickName         : String = ""
     @State private var userDescription      : String = ""
 
-    @State private var showLibrary          : Bool = false
+    @State private var showLibrary          : Bool = true
 
     @State private var showAssetNamePopover : Bool = false
     @State private var assetName            : String = ""
@@ -100,7 +100,7 @@ struct ContentView: View {
                                     .zIndex(0)
                                     .animation(.default)
                                     .allowsHitTesting(true)
-                                    .frame(maxHeight: editingState == .Both ? geometry.size.height / 2.3 : geometry.size.height)
+                                    .frame(maxHeight: editingState == .Both ? geometry.size.height / 2.5 : geometry.size.height)
                             }
                         }
 

Shared/Assets.xcassets/AppIcon.appiconset/Image 2-2.png

@@ -1,6 +1,30 @@
 
 void mainImage(thread Data &data)
 {
+    float2 uv = (data.fragCoord.xy-data.viewSize.xy*.5) / data.viewSize.y;
+    
+    uv *= float2x2(.707, -.707, .707, .707);
+    
+    float scale = ParamFloat<UI: "Slider", name: "Scale", min: 0.1, max: 30, default: 15>
+    uv *= scale;
+    
+    // ParamUrl<name: "Watch Tutorial", url: "www.youtube.com/watch?v=cQXAbndD5CQ">
 
-    data.outColor = float4(data.uv, 0, 1);
+    float2 gv = fract(uv)-.5;
+    float2 id = floor(uv);
+    
+    float m = 0.;
+    float t;
+    for(float y=-1.; y<=1.; y++) {
+        for(float x=-1.; x<=1.; x++) {
+            float2 offs = float2(x, y);
+            
+            t = -data.time + length(id-offs)*.2;
+            float r = mix(.4, 1.5, sin(t)*.5+.5);
+            float c = smoothstep(r, r*.9, length(gv+offs));
+            m = m*(1.-c) + c*(1.-m);
+        }
+    }
+
+    data.outColor = float4(float3(m), 1.0);
 }

Shared/Assets.xcassets/AppIcon.appiconset/Image 2.png

@@ -2,10 +2,10 @@
 /*
  * ShaderMania 1.5
  *
- * To learn more about shader development:
+ * Nodes are shaders or images. The currently selected node is rendered in the preview. You can easily change
+ * which shader is rendered by just selecting it. The selection state is saved with the project.
  *
- * The Book Of Shaders                  https://thebookofshaders.com
- * The Art of Code YouTube Channel      https://www.youtube.com/channel/UCcAlTqd9zID6aNX3TzwxJXg
+ * You can add nodes from existing shaders from the Shader Library by clicking on the shader and selecting "Add to Project".
  *
  */
 
@@ -29,19 +29,19 @@ typedef struct
 } Data;
 
 // Variables with UI parameters, parameter data is stored and reset when the parameter name changes
-// Up to 10 parameters per node are supported
+// Up to 10 parameters per node / shader are supported
 
 // Float slider parameter
-float size = ParamFloat<UI: "Slider", name: "Disk Size", min: 0, max: 1, default: 0.8>
+float size = ParamFloat<UI: "Slider", name: "Parameter Name", min: 0, max: 1, default: 0.8>
 
 // Float3 color picker parameter
-float3 diskColor = ParamFloat3<UI: "Color", name: "Disk Color", default: #ffffff>
+float3 diskColor = ParamFloat3<UI: "Color", name: "Parameter Name", default: #ffffff>
 
 // Url, ShaderMania will add https:// at the front automatically
 ParamUrl<name: "Watch Tutorial", url: "url without https://">
 
 // Input slots (up to 4 are supported per node)
-texture2d<float> input = ParamInput<name: "Input">
+texture2d<float> input = ParamInput<name: "Input Slot Name">
 
 // To read from input slots
 getLinearSample(texture2d<float>, float2 coord);

Shared/Assets.xcassets/AppIcon.appiconset/Image-1.png

@@ -7,6 +7,7 @@
 
 import Foundation
 import CloudKit
+import CoreGraphics
 
 class LibraryShader
 {
@@ -150,6 +151,14 @@ class Library
             predicate = NSPredicate(value: true)
         } else {
             predicate = NSPredicate(format: "self contains %@", searchFor)
+            /*
+            query(predicate, { (list) -> () in
+                self.currentList = list
+                
+                DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+                    self.core.libraryChanged.send(self.currentList)
+                }
+            })*/
         }
 
         getShaders(predicate, { (list) -> () in
@@ -176,6 +185,29 @@ class Library
         })
     }
 
+    func query(_ predicate: NSPredicate,_ cb: @escaping (LibraryShaderList)->())
+    {
+        let query = CKQuery(recordType: "Shaders", predicate: predicate)
+
+        let queryOperation = CKQueryOperation(query: query)
+        queryOperation.desiredKeys = ["recordName", "description", ""]
+        //queryOperation.queuePriority = .veryHigh
+        
+        queryOperation.recordFetchedBlock = { (record: CKRecord!) -> Void in
+            print("got something")
+            if let shaderRecord = record {
+            //this is where you are appending to your array
+                //self.moviesArray.append(moviesRecord)
+                print(shaderRecord.recordID.recordName)
+            }
+        }
+        
+        queryOperation.queryCompletionBlock = { cursor, error in
+        }
+        
+        publicDatabase.add(queryOperation)
+    }
+
     func getShaders(_ predicate: NSPredicate,_ cb: @escaping (LibraryShaderList)->())
     {
         let list = LibraryShaderList()
@@ -239,4 +271,18 @@ class Library
             cb(list)
         }
     }
+    
+    /// Adds the library to the curent project
+    func addShaderToProject(_ shader: LibraryShader)
+    {
+        if let folder = shader.folder {
+            for asset in folder.assets {
+                if asset.type == .Shader || asset.type == .Image {
+                    core.assetFolder.assets.append(asset)
+                }
+            }
+        }
+        core.nodesWidget.update()
+        core.contentChanged.send()
+    }
 }

Shared/Assets.xcassets/AppIcon.appiconset/RoundedIcon 2-1.png

@@ -285,7 +285,6 @@ public class NodesWidget    : ObservableObject
                     for (index, nodeUUID) in asset.slots {
                         if nodeUUID == node.id {
                             asset.slots[index] = nil
-                            print("connection deleted")
                         }
                     }
                 }
@@ -343,6 +342,7 @@ public class NodesWidget    : ObservableObject
                         //canConnect = false
                         asset.slots[t] = nil
                         // Disconnect instead of not allowing to connect when slot is already taken
+                        core.contentChanged.send()
                     }
 
                     if canConnect {
@@ -409,6 +409,8 @@ public class NodesWidget    : ObservableObject
             } else {
                 connectingNode!.slots[connectingTerminalId!] = currentNode!.id
             }
+            
+            core.contentChanged.send()
         }
 
         action = .None

Shared/Assets.xcassets/AppIcon.appiconset/RoundedIcon 2.png

@@ -126,12 +126,19 @@ class Project
         checkTextures(collected: collected, preview: preview, device: device)
 
         for asset in collected {
-
             if asset.type == .Shader {
                 drawShader(asset, preview, device)
             }
         }
 
+        if preview {
+            for asset in assetFolder.assets {
+                if asset.previewTexture != nil && collected.contains(asset) == false {
+                    clear(asset.previewTexture!, float4(0,0,0,0))
+                }
+            }
+        }
+        
         if preview == false {
             lastSize = size
         }

Shared/Assets.xcassets/AppIcon.appiconset/RoundedIcon.png

@@ -210,6 +210,7 @@ struct ShaderList: View {
 
                 if let userRecord = authorOfShader.userRecord {
                     Text((userRecord["nickName"] as! String))
+                        .padding(.top, 5)
                     Text((userRecord["description"] as! String))
                         .padding(.top, 4)
                 }
@@ -278,12 +279,20 @@ struct ShaderList: View {
                         .foregroundColor(Color.secondary)
                     Spacer()
                 }
+                .padding(.top, 5)
                 HStack {
                     Text(detailedShader.description)
                     Spacer()
                 }
                 .padding(.top, 2)
-
+                
+                Button(action: {
+                    document.core.library.addShaderToProject(detailedShader)
+                })
+                {
+                    Text("Add to Project")
+                }
+                .padding(.top, 5)
             }
 
         } else {

Shared/Assets.xcassets/AppIcon.appiconset/Space 2-1.png

@@ -25,6 +25,8 @@
 	<true/>
 	<key>com.apple.security.files.user-selected.read-write</key>
 	<true/>
+	<key>com.apple.developer.icloud-container-environment</key>
+	<string>Production</string>
 	<key>com.apple.security.network.client</key>
 	<true/>
 </dict>