From d915bae8cdb6adbf5b2ad6d09b4d641cf51f5869 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Sun, 30 Jul 2017 15:22:01 -0700 Subject: [PATCH] [Metaballs] Add empty shader file to app --- Metaballs.xcodeproj/project.pbxproj | 18 ++++++++++++++++++ Metaballs/Shaders.metal | 12 ++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 Metaballs/Shaders.metal diff --git a/Metaballs.xcodeproj/project.pbxproj b/Metaballs.xcodeproj/project.pbxproj index 594ae06..ed0fd41 100644 --- a/Metaballs.xcodeproj/project.pbxproj +++ b/Metaballs.xcodeproj/project.pbxproj @@ -16,6 +16,9 @@ C0BBE39A1F2E81B600E68524 /* MetaballsKitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0BBE3991F2E81B600E68524 /* MetaballsKitTests.swift */; }; C0BBE39C1F2E81B600E68524 /* MetaballsKit.h in Headers */ = {isa = PBXBuildFile; fileRef = C0BBE38E1F2E81B600E68524 /* MetaballsKit.h */; settings = {ATTRIBUTES = (Public, ); }; }; C0BBE3A41F2E81C700E68524 /* Metaballs.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0BBE3A31F2E81C700E68524 /* Metaballs.swift */; }; + C0BBE3A51F2E87D500E68524 /* MetaballsKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C0BBE38C1F2E81B600E68524 /* MetaballsKit.framework */; }; + C0BBE3A81F2E893A00E68524 /* MetalKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C0BBE3A71F2E893A00E68524 /* MetalKit.framework */; }; + C0BBE3AA1F2E91D900E68524 /* Shaders.metal in Sources */ = {isa = PBXBuildFile; fileRef = C0BBE3A91F2E91D900E68524 /* Shaders.metal */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -52,6 +55,8 @@ C0BBE3991F2E81B600E68524 /* MetaballsKitTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MetaballsKitTests.swift; sourceTree = ""; }; C0BBE39B1F2E81B600E68524 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; C0BBE3A31F2E81C700E68524 /* Metaballs.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Metaballs.swift; sourceTree = ""; }; + C0BBE3A71F2E893A00E68524 /* MetalKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MetalKit.framework; path = System/Library/Frameworks/MetalKit.framework; sourceTree = SDKROOT; }; + C0BBE3A91F2E91D900E68524 /* Shaders.metal */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.metal; path = Shaders.metal; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -59,6 +64,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + C0BBE3A81F2E893A00E68524 /* MetalKit.framework in Frameworks */, + C0BBE3A51F2E87D500E68524 /* MetaballsKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -95,6 +102,7 @@ C0BBE38D1F2E81B600E68524 /* MetaballsKit */, C0BBE3981F2E81B600E68524 /* MetaballsKitTests */, C0BBE3681F2E816500E68524 /* Products */, + C0BBE3A61F2E893A00E68524 /* Frameworks */, ); sourceTree = ""; }; @@ -114,6 +122,7 @@ children = ( C0BBE36A1F2E816500E68524 /* AppDelegate.swift */, C0BBE36C1F2E816500E68524 /* ViewController.swift */, + C0BBE3A91F2E91D900E68524 /* Shaders.metal */, C0BBE36E1F2E816500E68524 /* Assets.xcassets */, C0BBE3701F2E816500E68524 /* Main.storyboard */, C0BBE3731F2E816500E68524 /* Info.plist */, @@ -149,6 +158,14 @@ path = MetaballsKitTests; sourceTree = ""; }; + C0BBE3A61F2E893A00E68524 /* Frameworks */ = { + isa = PBXGroup; + children = ( + C0BBE3A71F2E893A00E68524 /* MetalKit.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -327,6 +344,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + C0BBE3AA1F2E91D900E68524 /* Shaders.metal in Sources */, C0BBE36D1F2E816500E68524 /* ViewController.swift in Sources */, C0BBE36B1F2E816500E68524 /* AppDelegate.swift in Sources */, ); diff --git a/Metaballs/Shaders.metal b/Metaballs/Shaders.metal new file mode 100644 index 0000000..97f46bb --- /dev/null +++ b/Metaballs/Shaders.metal @@ -0,0 +1,12 @@ +// +// Shaders.metal +// Metaballs +// +// Created by Eryn Wells on 7/30/17. +// Copyright © 2017 Eryn Wells. All rights reserved. +// + +#include +using namespace metal; + +