salmon-engine-projects/asteroid-game
14
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update custom glk view

Browse Source
This commit is contained in:
Robert committed 2017-01-18 13:51:35 +05:00
1 parent 902887e1f9
commit b5df39d556
8 files changed
+144 -287
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

proj.ios/salmontemplate.xcodeproj/project.pbxproj
+10 -12
View File
@@ -21,15 +21,15 @@
4C77831815BABE26003D5142 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C77831415BABD8B003D5142 /* AudioToolbox.framework */; };
4C77831915BABE26003D5142 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C77831515BABD8B003D5142 /* OpenAL.framework */; };
4C7AD44C15B1D77700A599F6 /* ios_api.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7AD44B15B1D77700A599F6 /* ios_api.cpp */; };
4CCC0ECC15B30D6B005432FB /* CustomGLKView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4CCC0ECB15B30D6B005432FB /* CustomGLKView.mm */; };
4CE6A9D215B2F979006A3965 /* assets in Resources */ = {isa = PBXBuildFile; fileRef = 4CE6A9D115B2F979006A3965 /* assets */; };
74AC9EBD1E2CE407003C9749 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74AC9EBC1E2CE407003C9749 /* ViewController.swift */; };
74AC9EC11E2CF533003C9749 /* SENamespaceWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 74AC9EBF1E2CF533003C9749 /* SENamespaceWrapper.cpp */; };
74C3AE3B1E2E35F9003C07F2 /* main_code.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 74C3AE3A1E2E35F9003C07F2 /* main_code.cpp */; };
74CBC8701E2E5D050001871E /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 74CBC86F1E2E5D050001871E /* LaunchScreen.storyboard */; };
74EEBAEF1E2D13A6004C6C65 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74EEBAEE1E2D13A6004C6C65 /* AppDelegate.swift */; };
74EEBAF11E2D1C7C004C6C65 /* CustomGLKView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74EEBAF01E2D1C7C004C6C65 /* CustomGLKView.swift */; };
84D0FEBE1E274DDD00EC3FE5 /* libSalmon Engine.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C902A7815C5735700FBC901 /* libSalmon Engine.a */; };
84D0FEC91E274E4A00EC3FE5 /* libvorbis-tremor-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 84D0FEC61E274E3700EC3FE5 /* libvorbis-tremor-ios.a */; };
84D0FECC1E274EBC00EC3FE5 /* main_code.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84D0FECA1E274EBC00EC3FE5 /* main_code.cpp */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -82,19 +82,18 @@
4C77831515BABD8B003D5142 /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; };
4C7AD44B15B1D77700A599F6 /* ios_api.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ios_api.cpp; sourceTree = "<group>"; };
4C902A7015C5735500FBC901 /* Salmon Engine.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "Salmon Engine.xcodeproj"; path = "../../Engine/iOS/Salmon Engine/Salmon Engine.xcodeproj"; sourceTree = "<group>"; };
4CCC0ECA15B30D6A005432FB /* CustomGLKView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomGLKView.h; sourceTree = "<group>"; };
4CCC0ECB15B30D6B005432FB /* CustomGLKView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CustomGLKView.mm; sourceTree = "<group>"; };
4CCC0ECD15B310FB005432FB /* ios_api.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ios_api.h; sourceTree = "<group>"; };
4CE6A9D115B2F979006A3965 /* assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = assets; path = ../assets; sourceTree = "<group>"; };
74AC9EBB1E2CE407003C9749 /* salmontemplate-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "salmontemplate-Bridging-Header.h"; sourceTree = "<group>"; };
74AC9EBC1E2CE407003C9749 /* ViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
74AC9EBF1E2CF533003C9749 /* SENamespaceWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SENamespaceWrapper.cpp; sourceTree = "<group>"; };
74AC9EC01E2CF533003C9749 /* SENamespaceWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SENamespaceWrapper.h; sourceTree = "<group>"; };
74C3AE3A1E2E35F9003C07F2 /* main_code.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main_code.cpp; path = ../game/main_code.cpp; sourceTree = "<group>"; };
74C3AE3C1E2E35FD003C07F2 /* main_code.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = main_code.h; path = ../game/main_code.h; sourceTree = "<group>"; };
74CBC86F1E2E5D050001871E /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
74EEBAEE1E2D13A6004C6C65 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
74EEBAF01E2D1C7C004C6C65 /* CustomGLKView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomGLKView.swift; sourceTree = "<group>"; };
84D0FEC11E274E3700EC3FE5 /* vorbis-tremor-ios.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "vorbis-tremor-ios.xcodeproj"; path = "../../libs/vorbis-tremor-ios/vorbis-tremor-ios.xcodeproj"; sourceTree = "<group>"; };
84D0FECA1E274EBC00EC3FE5 /* main_code.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main_code.cpp; path = ../game/main_code.cpp; sourceTree = "<group>"; };
84D0FECB1E274EBC00EC3FE5 /* main_code.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = main_code.h; path = ../game/main_code.h; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -163,9 +162,8 @@
74EEBAF01E2D1C7C004C6C65 /* CustomGLKView.swift */,
4C49B2DA15B0991B003512CD /* ViewController_iPhone.xib */,
4C49B2DD15B0991B003512CD /* ViewController_iPad.xib */,
74CBC86F1E2E5D050001871E /* LaunchScreen.storyboard */,
4C49B2C815B0991B003512CD /* Supporting Files */,
4CCC0ECA15B30D6A005432FB /* CustomGLKView.h */,
4CCC0ECB15B30D6B005432FB /* CustomGLKView.mm */,
);
name = Sources;
sourceTree = "<group>";
@@ -212,8 +210,8 @@
4CE6A9E315B2F9A4006A3965 /* Game */ = {
isa = PBXGroup;
children = (
74C3AE3A1E2E35F9003C07F2 /* main_code.cpp */,
74C3AE3C1E2E35FD003C07F2 /* main_code.h */,
84D0FECA1E274EBC00EC3FE5 /* main_code.cpp */,
84D0FECB1E274EBC00EC3FE5 /* main_code.h */,
);
name = Game;
sourceTree = "<group>";
@@ -312,6 +310,7 @@
buildActionMask = 2147483647;
files = (
4C49B2CC15B0991B003512CD /* InfoPlist.strings in Resources */,
74CBC8701E2E5D050001871E /* LaunchScreen.storyboard in Resources */,
4C49B2DC15B0991B003512CD /* ViewController_iPhone.xib in Resources */,
4C49B2DF15B0991B003512CD /* ViewController_iPad.xib in Resources */,
4CE6A9D215B2F979006A3965 /* assets in Resources */,
@@ -329,12 +328,11 @@
buildActionMask = 2147483647;
files = (
74EEBAEF1E2D13A6004C6C65 /* AppDelegate.swift in Sources */,
74C3AE3B1E2E35F9003C07F2 /* main_code.cpp in Sources */,
74EEBAF11E2D1C7C004C6C65 /* CustomGLKView.swift in Sources */,
84D0FECC1E274EBC00EC3FE5 /* main_code.cpp in Sources */,
74AC9EBD1E2CE407003C9749 /* ViewController.swift in Sources */,
74AC9EC11E2CF533003C9749 /* SENamespaceWrapper.cpp in Sources */,
4C7AD44C15B1D77700A599F6 /* ios_api.cpp in Sources */,
4CCC0ECC15B30D6B005432FB /* CustomGLKView.mm in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};