From 0d7bbfb2d7c12324a683f9f8bfd6966ebdf84f9e Mon Sep 17 00:00:00 2001 From: kelly <> Date: Fri, 14 Mar 2014 03:23:05 -0700 Subject: [PATCH] flare shaders added to the bundle --HG-- branch : nfb --- KREngine/Kraken.xcodeproj/project.pbxproj | 4 ++++ .../xcschemes/xcschememanagement.plist | 23 ++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/KREngine/Kraken.xcodeproj/project.pbxproj b/KREngine/Kraken.xcodeproj/project.pbxproj index 5708595..3c787f3 100644 --- a/KREngine/Kraken.xcodeproj/project.pbxproj +++ b/KREngine/Kraken.xcodeproj/project.pbxproj @@ -10,6 +10,8 @@ 104A335E1672D31C001C8BA6 /* KRCollider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 104A335C1672D31B001C8BA6 /* KRCollider.cpp */; }; 104A335F1672D31C001C8BA6 /* KRCollider.h in Headers */ = {isa = PBXBuildFile; fileRef = 104A335D1672D31C001C8BA6 /* KRCollider.h */; settings = {ATTRIBUTES = (); }; }; 10CC33A5168534F000BB9846 /* KRCamera.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E48B3CBF14393E2F000C50E2 /* KRCamera.cpp */; }; + 5035BF3E18D2BBDD00252924 /* flare.fsh in Resources */ = {isa = PBXBuildFile; fileRef = E42559AA184DD4490081BB20 /* flare.fsh */; }; + 5035BF3F18D2BBDD00252924 /* flare.vsh in Resources */ = {isa = PBXBuildFile; fileRef = E42559AC184DD45A0081BB20 /* flare.vsh */; }; E4030E4C160A3CF000592648 /* KRStockGeometry.h in Headers */ = {isa = PBXBuildFile; fileRef = E4030E4B160A3CF000592648 /* KRStockGeometry.h */; settings = {ATTRIBUTES = (); }; }; E4030E4D160A3CF000592648 /* KRStockGeometry.h in Headers */ = {isa = PBXBuildFile; fileRef = E4030E4B160A3CF000592648 /* KRStockGeometry.h */; settings = {ATTRIBUTES = (Public, ); }; }; E404702018695DD200F01F42 /* KRTextureKTX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E404701E18695DD200F01F42 /* KRTextureKTX.cpp */; }; @@ -1610,6 +1612,8 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 5035BF3E18D2BBDD00252924 /* flare.fsh in Resources */, + 5035BF3F18D2BBDD00252924 /* flare.vsh in Resources */, E4409D2916FA748700310F76 /* font.tga in Resources */, E437849816C4884F0037FD43 /* hrtf_kemar.krbundle in Resources */, E4E6F68516BA5DF700E410F8 /* sky_box.fsh in Resources */, diff --git a/KREngine/Kraken.xcodeproj/xcuserdata/admin8onf.xcuserdatad/xcschemes/xcschememanagement.plist b/KREngine/Kraken.xcodeproj/xcuserdata/admin8onf.xcuserdatad/xcschemes/xcschememanagement.plist index cc8ace3..300bfdd 100644 --- a/KREngine/Kraken.xcodeproj/xcuserdata/admin8onf.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/KREngine/Kraken.xcodeproj/xcuserdata/admin8onf.xcuserdatad/xcschemes/xcschememanagement.plist @@ -3,7 +3,28 @@ SchemeUserState - + + Kraken - ios.xcscheme + + isShown + + + Kraken - osx.xcscheme + + isShown + + + Kraken Standard Assets - OSX.xcscheme + + isShown + + + Kraken Standard Assets - iOS.xcscheme + + isShown + + + SuppressBuildableAutocreation E491016013C99B9E0098455B