diff --git a/ios/CCIOS.xcodeproj/project.pbxproj b/ios/CCIOS.xcodeproj/project.pbxproj index 97aa167e7..c273c0ded 100644 --- a/ios/CCIOS.xcodeproj/project.pbxproj +++ b/ios/CCIOS.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 9A62ADF5286D906F00E5E3DE /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9A62ADF4286D906F00E5E3DE /* Assets.xcassets */; }; 9A89D4F227F802F600FF3F80 /* LWidgets.c in Sources */ = {isa = PBXBuildFile; fileRef = 9A89D37827F802F500FF3F80 /* LWidgets.c */; }; 9A89D4F327F802F600FF3F80 /* Graphics_GL2.c in Sources */ = {isa = PBXBuildFile; fileRef = 9A89D37A27F802F500FF3F80 /* Graphics_GL2.c */; }; 9A89D4F427F802F600FF3F80 /* Vorbis.c in Sources */ = {isa = PBXBuildFile; fileRef = 9A89D37C27F802F500FF3F80 /* Vorbis.c */; }; @@ -98,7 +99,8 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 9A89D35727F802B100FF3F80 /* CCIOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CCIOS.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 9A62ADF4286D906F00E5E3DE /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = ClassiCube/Assets.xcassets; sourceTree = ""; }; + 9A89D35727F802B100FF3F80 /* ClassiCube.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ClassiCube.app; sourceTree = BUILT_PRODUCTS_DIR; }; 9A89D36827F802B400FF3F80 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 9A89D37827F802F500FF3F80 /* LWidgets.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = LWidgets.c; sourceTree = ""; }; 9A89D37927F802F500FF3F80 /* AxisLinesRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AxisLinesRenderer.h; sourceTree = ""; }; @@ -273,6 +275,7 @@ 9A89D34E27F802B100FF3F80 = { isa = PBXGroup; children = ( + 9A62ADF4286D906F00E5E3DE /* Assets.xcassets */, 9A89D36827F802B400FF3F80 /* Info.plist */, 9A89D37727F802F500FF3F80 /* src */, 9A89D35827F802B100FF3F80 /* Products */, @@ -282,7 +285,7 @@ 9A89D35827F802B100FF3F80 /* Products */ = { isa = PBXGroup; children = ( - 9A89D35727F802B100FF3F80 /* CCIOS.app */, + 9A89D35727F802B100FF3F80 /* ClassiCube.app */, ); name = Products; sourceTree = ""; @@ -454,9 +457,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 9A89D35627F802B100FF3F80 /* CCIOS */ = { + 9A89D35627F802B100FF3F80 /* ClassiCube */ = { isa = PBXNativeTarget; - buildConfigurationList = 9A89D36D27F802B400FF3F80 /* Build configuration list for PBXNativeTarget "CCIOS" */; + buildConfigurationList = 9A89D36D27F802B400FF3F80 /* Build configuration list for PBXNativeTarget "ClassiCube" */; buildPhases = ( 9A89D35327F802B100FF3F80 /* Sources */, 9A89D35427F802B100FF3F80 /* Frameworks */, @@ -466,9 +469,9 @@ ); dependencies = ( ); - name = CCIOS; - productName = CCIOS; - productReference = 9A89D35727F802B100FF3F80 /* CCIOS.app */; + name = ClassiCube; + productName = CCIOS2; + productReference = 9A89D35727F802B100FF3F80 /* ClassiCube.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -498,7 +501,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 9A89D35627F802B100FF3F80 /* CCIOS */, + 9A89D35627F802B100FF3F80 /* ClassiCube */, ); }; /* End PBXProject section */ @@ -508,6 +511,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 9A62ADF5286D906F00E5E3DE /* Assets.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -730,6 +734,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -746,6 +751,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -768,7 +774,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 9A89D36D27F802B400FF3F80 /* Build configuration list for PBXNativeTarget "CCIOS" */ = { + 9A89D36D27F802B400FF3F80 /* Build configuration list for PBXNativeTarget "ClassiCube" */ = { isa = XCConfigurationList; buildConfigurations = ( 9A89D36E27F802B400FF3F80 /* Debug */, diff --git a/ios/ClassiCube/Assets.xcassets/AppIcon.appiconset/CC10242.png b/ios/ClassiCube/Assets.xcassets/AppIcon.appiconset/CC10242.png new file mode 100644 index 000000000..84ccce9c0 Binary files /dev/null and b/ios/ClassiCube/Assets.xcassets/AppIcon.appiconset/CC10242.png differ diff --git a/ios/ClassiCube/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/ClassiCube/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 000000000..9f58edf29 --- /dev/null +++ b/ios/ClassiCube/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,99 @@ +{ + "images" : [ + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "3x" + }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "76x76", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "76x76", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "83.5x83.5", + "scale" : "2x" + }, + { + "size" : "1024x1024", + "idiom" : "ios-marketing", + "filename" : "CC10242.png", + "scale" : "1x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/ios/ClassiCube/Assets.xcassets/Contents.json b/ios/ClassiCube/Assets.xcassets/Contents.json new file mode 100644 index 000000000..da4a164c9 --- /dev/null +++ b/ios/ClassiCube/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/ios/Info.plist b/ios/Info.plist index 6226e3e10..9b59d3510 100644 --- a/ios/Info.plist +++ b/ios/Info.plist @@ -2,20 +2,28 @@ - NSPhotoLibraryAddUsageDescription - Saving screenshot - CFBundleExecutable + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName ClassiCube + CFBundleExecutable + $(EXECUTABLE_NAME) CFBundleIdentifier - com.classicube.client.ios + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName - ClassiCube + $(PRODUCT_NAME) CFBundlePackageType APPL + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 LSRequiresIPhoneOS + NSPhotoLibraryAddUsageDescription + Saving screenshot UILaunchStoryboardName LaunchScreen UISupportedInterfaceOrientations diff --git a/misc/CC1024.png b/misc/CC1024.png new file mode 100644 index 000000000..0bc82c30e Binary files /dev/null and b/misc/CC1024.png differ diff --git a/misc/CC10242.png b/misc/CC10242.png new file mode 100644 index 000000000..84ccce9c0 Binary files /dev/null and b/misc/CC10242.png differ diff --git a/src/Event.c b/src/Event.c index 549f2a511..9b3cc197f 100644 --- a/src/Event.c +++ b/src/Event.c @@ -94,6 +94,7 @@ void Event_UnregisterAll(void) { WindowEvents.StateChanged.Count = 0; WindowEvents.Created.Count = 0; WindowEvents.InactiveChanged.Count = 0; + WindowEvents.Redrawing.Count = 0; InputEvents.Press.Count = 0; InputEvents.Down.Count = 0;