From a4863508267171087096419354535a5e79d81823 Mon Sep 17 00:00:00 2001 From: Charles Magahern Date: Wed, 30 Dec 2015 03:16:12 -0800 Subject: [PATCH] Symlink duplicate shader file --- XIONControlPanel.xcodeproj/project.pbxproj | 7 +++++ XIONControlPanel/Shaders/HorizontalBlur.fsh | 2 +- XIONControlPanel/Shaders/VerticalBlur.fsh | 32 +-------------------- 3 files changed, 9 insertions(+), 32 deletions(-) mode change 100644 => 120000 XIONControlPanel/Shaders/VerticalBlur.fsh diff --git a/XIONControlPanel.xcodeproj/project.pbxproj b/XIONControlPanel.xcodeproj/project.pbxproj index e0627ed..83de131 100644 --- a/XIONControlPanel.xcodeproj/project.pbxproj +++ b/XIONControlPanel.xcodeproj/project.pbxproj @@ -195,6 +195,7 @@ TargetAttributes = { 0C3CAEA31C3350C800B856AD = { CreatedOnToolsVersion = 7.2; + DevelopmentTeam = TNUURJU7SZ; }; }; }; @@ -351,10 +352,13 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; INFOPLIST_FILE = "$(SRCROOT)/XIONControlPanel/SupportingFiles/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.xionsf.XIONControlPanel; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE = ""; SWIFT_OBJC_BRIDGING_HEADER = "XIONControlPanel/Utilities/XIONControlPanel-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; }; @@ -365,10 +369,13 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; INFOPLIST_FILE = "$(SRCROOT)/XIONControlPanel/SupportingFiles/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.xionsf.XIONControlPanel; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE = ""; SWIFT_OBJC_BRIDGING_HEADER = "XIONControlPanel/Utilities/XIONControlPanel-Bridging-Header.h"; }; name = Release; diff --git a/XIONControlPanel/Shaders/HorizontalBlur.fsh b/XIONControlPanel/Shaders/HorizontalBlur.fsh index b12e955..a14d422 100644 --- a/XIONControlPanel/Shaders/HorizontalBlur.fsh +++ b/XIONControlPanel/Shaders/HorizontalBlur.fsh @@ -1,5 +1,5 @@ // -// HorizontalBlur.fsh +// {Horizontal,Vertical}Blur.fsh // XIONControlPanel // // Created by Charles Magahern on 12/29/15. diff --git a/XIONControlPanel/Shaders/VerticalBlur.fsh b/XIONControlPanel/Shaders/VerticalBlur.fsh deleted file mode 100644 index 1132e55..0000000 --- a/XIONControlPanel/Shaders/VerticalBlur.fsh +++ /dev/null @@ -1,31 +0,0 @@ -// -// VerticalBlur.fsh -// XIONControlPanel -// -// Created by Charles Magahern on 12/29/15. -// Copyright © 2015 XION. All rights reserved. -// - -uniform sampler2D u_colorSampler; -varying vec2 v_uv; -varying vec2 v_blurTexCoords[14]; - -void main() -{ - gl_FragColor = vec4(0.0); -    gl_FragColor += texture2D(u_colorSampler, v_blurTexCoords[ 0])*0.0044299121055113265; -    gl_FragColor += texture2D(u_colorSampler, v_blurTexCoords[ 1])*0.00895781211794; -    gl_FragColor += texture2D(u_colorSampler, v_blurTexCoords[ 2])*0.0215963866053; -    gl_FragColor += texture2D(u_colorSampler, v_blurTexCoords[ 3])*0.0443683338718; -    gl_FragColor += texture2D(u_colorSampler, v_blurTexCoords[ 4])*0.0776744219933; -    gl_FragColor += texture2D(u_colorSampler, v_blurTexCoords[ 5])*0.115876621105; -    gl_FragColor += texture2D(u_colorSampler, v_blurTexCoords[ 6])*0.147308056121; -    gl_FragColor += texture2D(u_colorSampler, v_uv          )*0.159576912161; -    gl_FragColor += texture2D(u_colorSampler, v_blurTexCoords[ 7])*0.147308056121; -    gl_FragColor += texture2D(u_colorSampler, v_blurTexCoords[ 8])*0.115876621105; -    gl_FragColor += texture2D(u_colorSampler, v_blurTexCoords[ 9])*0.0776744219933; -    gl_FragColor += texture2D(u_colorSampler, v_blurTexCoords[10])*0.0443683338718; -    gl_FragColor += texture2D(u_colorSampler, v_blurTexCoords[11])*0.0215963866053; -    gl_FragColor += texture2D(u_colorSampler, v_blurTexCoords[12])*0.00895781211794; -    gl_FragColor += texture2D(u_colorSampler, v_blurTexCoords[13])*0.0044299121055113265; -} diff --git a/XIONControlPanel/Shaders/VerticalBlur.fsh b/XIONControlPanel/Shaders/VerticalBlur.fsh new file mode 120000 index 0000000..8a4aafd --- /dev/null +++ b/XIONControlPanel/Shaders/VerticalBlur.fsh @@ -0,0 +1 @@ +HorizontalBlur.fsh \ No newline at end of file