Beginning work on header view

This commit is contained in:
Charles Magahern
2015-12-30 18:47:13 -08:00
parent 00fcca6893
commit 29dec42b20
21 changed files with 592 additions and 43 deletions

View File

@@ -9,9 +9,14 @@
/* Begin PBXBuildFile section */
0C20E2B91C33514100BA789B /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C20E2B51C33514100BA789B /* AppDelegate.swift */; };
0C20E2BB1C33529700BA789B /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C20E2BA1C33529700BA789B /* MainViewController.swift */; };
0C20E2BD1C33534F00BA789B /* BackgroundViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C20E2BC1C33534F00BA789B /* BackgroundViewController.swift */; };
0C20E2BD1C33534F00BA789B /* VisualizationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C20E2BC1C33534F00BA789B /* VisualizationViewController.swift */; };
0C3CAEAF1C3350C800B856AD /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0C3CAEAE1C3350C800B856AD /* Assets.xcassets */; };
0C3CAEB21C3350C800B856AD /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 0C3CAEB01C3350C800B856AD /* LaunchScreen.storyboard */; };
0C41EF4A1C34B51500AF847F /* ArcadeMachinesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C41EF491C34B51500AF847F /* ArcadeMachinesViewController.swift */; };
0C41EF4E1C34B81F00AF847F /* KSIRingView.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C41EF4D1C34B81F00AF847F /* KSIRingView.m */; };
0C41EF501C34B97700AF847F /* HeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C41EF4F1C34B97700AF847F /* HeaderView.swift */; };
0C41EF521C34BA4E00AF847F /* Orbitron-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 0C41EF511C34BA4E00AF847F /* Orbitron-Medium.ttf */; };
0C41EF541C34BC9800AF847F /* XIONLogoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C41EF531C34BC9800AF847F /* XIONLogoView.swift */; };
0C63A8731C337381007E4B52 /* CubletsTechnique.plist in Resources */ = {isa = PBXBuildFile; fileRef = 0C63A8721C337381007E4B52 /* CubletsTechnique.plist */; };
0C63A8761C3373D1007E4B52 /* HorizontalBlur.vsh in Resources */ = {isa = PBXBuildFile; fileRef = 0C63A8751C3373D1007E4B52 /* HorizontalBlur.vsh */; };
0C63A8781C3373D9007E4B52 /* HorizontalBlur.fsh in Resources */ = {isa = PBXBuildFile; fileRef = 0C63A8771C3373D9007E4B52 /* HorizontalBlur.fsh */; };
@@ -27,11 +32,17 @@
/* Begin PBXFileReference section */
0C20E2B51C33514100BA789B /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
0C20E2BA1C33529700BA789B /* MainViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = "<group>"; };
0C20E2BC1C33534F00BA789B /* BackgroundViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BackgroundViewController.swift; sourceTree = "<group>"; };
0C20E2BC1C33534F00BA789B /* VisualizationViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VisualizationViewController.swift; sourceTree = "<group>"; };
0C3CAEA41C3350C800B856AD /* XIONControlPanel.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = XIONControlPanel.app; sourceTree = BUILT_PRODUCTS_DIR; };
0C3CAEAE1C3350C800B856AD /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
0C3CAEB11C3350C800B856AD /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
0C3CAEB31C3350C800B856AD /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
0C41EF491C34B51500AF847F /* ArcadeMachinesViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ArcadeMachinesViewController.swift; sourceTree = "<group>"; };
0C41EF4C1C34B81F00AF847F /* KSIRingView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KSIRingView.h; sourceTree = "<group>"; };
0C41EF4D1C34B81F00AF847F /* KSIRingView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KSIRingView.m; sourceTree = "<group>"; };
0C41EF4F1C34B97700AF847F /* HeaderView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HeaderView.swift; sourceTree = "<group>"; };
0C41EF511C34BA4E00AF847F /* Orbitron-Medium.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Orbitron-Medium.ttf"; sourceTree = "<group>"; };
0C41EF531C34BC9800AF847F /* XIONLogoView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XIONLogoView.swift; sourceTree = "<group>"; };
0C63A8721C337381007E4B52 /* CubletsTechnique.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = CubletsTechnique.plist; sourceTree = "<group>"; };
0C63A8751C3373D1007E4B52 /* HorizontalBlur.vsh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = HorizontalBlur.vsh; sourceTree = "<group>"; };
0C63A8771C3373D9007E4B52 /* HorizontalBlur.fsh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = HorizontalBlur.fsh; sourceTree = "<group>"; };
@@ -61,8 +72,9 @@
isa = PBXGroup;
children = (
0C3CAEAE1C3350C800B856AD /* Assets.xcassets */,
0C3CAEB01C3350C800B856AD /* LaunchScreen.storyboard */,
0C3CAEB31C3350C800B856AD /* Info.plist */,
0C3CAEB01C3350C800B856AD /* LaunchScreen.storyboard */,
0C63A87A1C33C655007E4B52 /* XIONControlPanel-Bridging-Header.h */,
);
name = "Supporting Files";
path = SupportingFiles;
@@ -79,8 +91,9 @@
0C20E2B61C33514100BA789B /* Controllers */ = {
isa = PBXGroup;
children = (
0C20E2BC1C33534F00BA789B /* BackgroundViewController.swift */,
0C41EF491C34B51500AF847F /* ArcadeMachinesViewController.swift */,
0C20E2BA1C33529700BA789B /* MainViewController.swift */,
0C20E2BC1C33534F00BA789B /* VisualizationViewController.swift */,
);
path = Controllers;
sourceTree = "<group>";
@@ -95,6 +108,8 @@
0C20E2B81C33514100BA789B /* Views */ = {
isa = PBXGroup;
children = (
0C41EF4F1C34B97700AF847F /* HeaderView.swift */,
0C41EF531C34BC9800AF847F /* XIONLogoView.swift */,
);
path = Views;
sourceTree = "<group>";
@@ -103,6 +118,7 @@
isa = PBXGroup;
children = (
0C63A8721C337381007E4B52 /* CubletsTechnique.plist */,
0C41EF511C34BA4E00AF847F /* Orbitron-Medium.ttf */,
);
path = Resources;
sourceTree = "<group>";
@@ -128,6 +144,7 @@
children = (
0C20E2B41C33514100BA789B /* Application */,
0C20E2B61C33514100BA789B /* Controllers */,
0C41EF4B1C34B81F00AF847F /* External */,
0C20E2B71C33514100BA789B /* Models */,
0C63A8741C3373BC007E4B52 /* Shaders */,
0C20E2C81C336F2E00BA789B /* Resources */,
@@ -138,6 +155,15 @@
path = XIONControlPanel;
sourceTree = "<group>";
};
0C41EF4B1C34B81F00AF847F /* External */ = {
isa = PBXGroup;
children = (
0C41EF4C1C34B81F00AF847F /* KSIRingView.h */,
0C41EF4D1C34B81F00AF847F /* KSIRingView.m */,
);
path = External;
sourceTree = "<group>";
};
0C63A8741C3373BC007E4B52 /* Shaders */ = {
isa = PBXGroup;
children = (
@@ -158,7 +184,6 @@
children = (
0C63A87B1C33C655007E4B52 /* NSValue+XIONAdditions.h */,
0C63A87C1C33C655007E4B52 /* NSValue+XIONAdditions.m */,
0C63A87A1C33C655007E4B52 /* XIONControlPanel-Bridging-Header.h */,
);
path = Utilities;
sourceTree = "<group>";
@@ -230,6 +255,7 @@
0C3CAEB21C3350C800B856AD /* LaunchScreen.storyboard in Resources */,
0C3CAEAF1C3350C800B856AD /* Assets.xcassets in Resources */,
0C63A8841C33DC29007E4B52 /* VerticalBlur.fsh in Resources */,
0C41EF521C34BA4E00AF847F /* Orbitron-Medium.ttf in Resources */,
0C63A8851C33DC29007E4B52 /* VerticalBlur.vsh in Resources */,
0C63A8891C33EB3B007E4B52 /* FinalRender.vsh in Resources */,
0C63A8781C3373D9007E4B52 /* HorizontalBlur.fsh in Resources */,
@@ -243,10 +269,14 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
0C41EF4E1C34B81F00AF847F /* KSIRingView.m in Sources */,
0C63A87D1C33C655007E4B52 /* NSValue+XIONAdditions.m in Sources */,
0C20E2BD1C33534F00BA789B /* BackgroundViewController.swift in Sources */,
0C20E2BD1C33534F00BA789B /* VisualizationViewController.swift in Sources */,
0C41EF4A1C34B51500AF847F /* ArcadeMachinesViewController.swift in Sources */,
0C20E2B91C33514100BA789B /* AppDelegate.swift in Sources */,
0C20E2BB1C33529700BA789B /* MainViewController.swift in Sources */,
0C41EF501C34B97700AF847F /* HeaderView.swift in Sources */,
0C41EF541C34BC9800AF847F /* XIONLogoView.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -359,7 +389,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.xionsf.XIONControlPanel;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
SWIFT_OBJC_BRIDGING_HEADER = "XIONControlPanel/Utilities/XIONControlPanel-Bridging-Header.h";
SWIFT_OBJC_BRIDGING_HEADER = "XIONControlPanel/SupportingFiles/XIONControlPanel-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
};
name = Debug;
@@ -376,7 +406,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.xionsf.XIONControlPanel;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
SWIFT_OBJC_BRIDGING_HEADER = "XIONControlPanel/Utilities/XIONControlPanel-Bridging-Header.h";
SWIFT_OBJC_BRIDGING_HEADER = "XIONControlPanel/SupportingFiles/XIONControlPanel-Bridging-Header.h";
};
name = Release;
};