Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit f09dc5c

Browse files
ashvarmaashvarma
authored
Merge pull request #1856 from ashvarma/release_1_23
Release 1 23
2 parents 71ce028 + 78dab5f commit f09dc5c

File tree

10 files changed

+467
-335
lines changed

10 files changed

+467
-335
lines changed

‎Frameworks/Foundation/NSOperationQueue.mm‎

Lines changed: 330 additions & 295 deletions
Large diffs are not rendered by default.

‎include/Foundation/NSOperationQueue.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828

2929
enum { NSOperationQueueDefaultMaxConcurrentOperationCount = -1 };
3030

31-
// NOTE: This value appears to be a private detail that leaked into the public header. Unfortunately it is
32-
// difficult to know if it is used externally. At any rate it is wrong and should be 5.
3331
enum { NSOperationQueuePriority_Count = 3 };
3432

3533
FOUNDATION_EXPORT_CLASS

‎samples/GLKitComplex/GLKitComplex-WinStore10.sln‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio 14
33
VisualStudioVersion = 14.0.22823.1
44
MinimumVisualStudioVersion = 10.0.40219.1
5-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GLKitComplex", "GLKitComplex", "{45F79AFE-6302-462D-A3E5-8C903EC35E31}"
5+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GLKitComplex", "GLKitComplex", "{5C45EC9B-07E4-41CD-9B1A-C556732E012E}"
66
EndProject
7-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GLKitComplex", "GLKitComplex.vsimporter\GLKitComplex-WinStore10\GLKitComplex.vcxproj", "{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}"
7+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GLKitComplex", "GLKitComplex.vsimporter\GLKitComplex-WinStore10\GLKitComplex.vcxproj", "{35213666-E979-4A72-AAE1-0BB309110B0D}"
88
EndProject
99
Global
1010
GlobalSection(SharedMSBuildProjectFiles) = preSolution
@@ -16,23 +16,23 @@ Global
1616
Release|Win32 = Release|Win32
1717
EndGlobalSection
1818
GlobalSection(ProjectConfigurationPlatforms) = postSolution
19-
{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Debug|ARM.ActiveCfg = Debug|ARM
20-
{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Debug|ARM.Build.0 = Debug|ARM
21-
{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Debug|ARM.Deploy.0 = Debug|ARM
22-
{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Debug|Win32.ActiveCfg = Debug|Win32
23-
{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Debug|Win32.Build.0 = Debug|Win32
24-
{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Debug|Win32.Deploy.0 = Debug|Win32
25-
{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Release|ARM.ActiveCfg = Release|ARM
26-
{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Release|ARM.Build.0 = Release|ARM
27-
{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Release|ARM.Deploy.0 = Release|ARM
28-
{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Release|Win32.ActiveCfg = Release|Win32
29-
{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Release|Win32.Build.0 = Release|Win32
30-
{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Release|Win32.Deploy.0 = Release|Win32
19+
{35213666-E979-4A72-AAE1-0BB309110B0D}.Debug|ARM.ActiveCfg = Debug|ARM
20+
{35213666-E979-4A72-AAE1-0BB309110B0D}.Debug|ARM.Build.0 = Debug|ARM
21+
{35213666-E979-4A72-AAE1-0BB309110B0D}.Debug|ARM.Deploy.0 = Debug|ARM
22+
{35213666-E979-4A72-AAE1-0BB309110B0D}.Debug|Win32.ActiveCfg = Debug|Win32
23+
{35213666-E979-4A72-AAE1-0BB309110B0D}.Debug|Win32.Build.0 = Debug|Win32
24+
{35213666-E979-4A72-AAE1-0BB309110B0D}.Debug|Win32.Deploy.0 = Debug|Win32
25+
{35213666-E979-4A72-AAE1-0BB309110B0D}.Release|ARM.ActiveCfg = Release|ARM
26+
{35213666-E979-4A72-AAE1-0BB309110B0D}.Release|ARM.Build.0 = Release|ARM
27+
{35213666-E979-4A72-AAE1-0BB309110B0D}.Release|ARM.Deploy.0 = Release|ARM
28+
{35213666-E979-4A72-AAE1-0BB309110B0D}.Release|Win32.ActiveCfg = Release|Win32
29+
{35213666-E979-4A72-AAE1-0BB309110B0D}.Release|Win32.Build.0 = Release|Win32
30+
{35213666-E979-4A72-AAE1-0BB309110B0D}.Release|Win32.Deploy.0 = Release|Win32
3131
EndGlobalSection
3232
GlobalSection(SolutionProperties) = preSolution
3333
HideSolutionNode = FALSE
3434
EndGlobalSection
3535
GlobalSection(NestedProjects) = preSolution
36-
{E45BBE1B-1E64-4C3C-9D81-433F9AB81749} = {45F79AFE-6302-462D-A3E5-8C903EC35E31}
36+
{35213666-E979-4A72-AAE1-0BB309110B0D} = {5C45EC9B-07E4-41CD-9B1A-C556732E012E}
3737
EndGlobalSection
3838
EndGlobal

‎samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/GLKitComplex-Debug-xcvars.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,15 +87,15 @@ PRODUCT_BUNDLE_IDENTIFIER = test.GLKitComplex
8787
PRODUCT_NAME = GLKitComplex
8888
PRODUCT_TYPE = com.apple.product-type.application
8989
PROJECT = GLKitComplex
90-
PROJECT_DIR = E:/island/github/henryfox/WinObjC/samples/GLKitComplex
91-
PROJECT_FILE_PATH = E:\island\github\henryfox\WinObjC\samples\GLKitComplex\GLKitComplex.xcodeproj
90+
PROJECT_DIR = D:/src/winobjc/samples/GLKitComplex
91+
PROJECT_FILE_PATH = D:\src\winobjc\samples\GLKitComplex\GLKitComplex.xcodeproj
9292
PROJECT_NAME = GLKitComplex
9393
PROJECT_TEMP_DIR = sbuild/GLKitComplex.sbuild
9494
PROJECT_TEMP_ROOT = sbuild
9595
PUBLIC_HEADERS_FOLDER_PATH = GLKitComplex.app/Public
96-
SDKROOT = E:/island/github/henryfox/WinObjC
97-
SOURCE_ROOT = E:/island/github/henryfox/WinObjC/samples/GLKitComplex
98-
SRCROOT = E:/island/github/henryfox/WinObjC/samples/GLKitComplex
96+
SDKROOT = D:/src/Winobjc
97+
SOURCE_ROOT = D:/src/winobjc/samples/GLKitComplex
98+
SRCROOT = D:/src/winobjc/samples/GLKitComplex
9999
SYMROOT = sbuild
100100
TARGETED_DEVICE_FAMILY = 1,2
101101
TARGETNAME = GLKitComplex
@@ -105,9 +105,9 @@ TARGET_SDKVERSION = 5.0
105105
TARGET_TEMP_DIR = sbuild/GLKitComplex.sbuild/Debug-iphoneos/GLKitComplex.sbuild
106106
TEMP_DIR = sbuild/GLKitComplex.sbuild/Debug-iphoneos/GLKitComplex.sbuild
107107
UNLOCALIZED_RESOURCES_FOLDER_PATH = GLKitComplex.app
108-
USER = henryfox
108+
USER = rajsesh
109109
USER_HEADER_SEARCH_PATHS =
110110
USE_HEADERMAP = YES
111111
WARNING_CFLAGS =
112112
WARNING_LDFLAGS =
113-
WINOBJC_SDK_ROOT = E:/island/github/henryfox/WinObjC
113+
WINOBJC_SDK_ROOT = D:/src/Winobjc

‎samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/GLKitComplex-Release-xcvars.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,15 @@ PRODUCT_BUNDLE_IDENTIFIER = test.GLKitComplex
8686
PRODUCT_NAME = GLKitComplex
8787
PRODUCT_TYPE = com.apple.product-type.application
8888
PROJECT = GLKitComplex
89-
PROJECT_DIR = E:/island/github/henryfox/WinObjC/samples/GLKitComplex
90-
PROJECT_FILE_PATH = E:\island\github\henryfox\WinObjC\samples\GLKitComplex\GLKitComplex.xcodeproj
89+
PROJECT_DIR = D:/src/winobjc/samples/GLKitComplex
90+
PROJECT_FILE_PATH = D:\src\winobjc\samples\GLKitComplex\GLKitComplex.xcodeproj
9191
PROJECT_NAME = GLKitComplex
9292
PROJECT_TEMP_DIR = sbuild/GLKitComplex.sbuild
9393
PROJECT_TEMP_ROOT = sbuild
9494
PUBLIC_HEADERS_FOLDER_PATH = GLKitComplex.app/Public
95-
SDKROOT = E:/island/github/henryfox/WinObjC
96-
SOURCE_ROOT = E:/island/github/henryfox/WinObjC/samples/GLKitComplex
97-
SRCROOT = E:/island/github/henryfox/WinObjC/samples/GLKitComplex
95+
SDKROOT = D:/src/Winobjc
96+
SOURCE_ROOT = D:/src/winobjc/samples/GLKitComplex
97+
SRCROOT = D:/src/winobjc/samples/GLKitComplex
9898
SYMROOT = sbuild
9999
TARGETED_DEVICE_FAMILY = 1,2
100100
TARGETNAME = GLKitComplex
@@ -104,10 +104,10 @@ TARGET_SDKVERSION = 5.0
104104
TARGET_TEMP_DIR = sbuild/GLKitComplex.sbuild/Release-iphoneos/GLKitComplex.sbuild
105105
TEMP_DIR = sbuild/GLKitComplex.sbuild/Release-iphoneos/GLKitComplex.sbuild
106106
UNLOCALIZED_RESOURCES_FOLDER_PATH = GLKitComplex.app
107-
USER = henryfox
107+
USER = rajsesh
108108
USER_HEADER_SEARCH_PATHS =
109109
USE_HEADERMAP = YES
110110
VALIDATE_PRODUCT = YES
111111
WARNING_CFLAGS =
112112
WARNING_LDFLAGS =
113-
WINOBJC_SDK_ROOT = E:/island/github/henryfox/WinObjC
113+
WINOBJC_SDK_ROOT = D:/src/Winobjc

‎samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/GLKitComplex.vcxproj‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
3030
<WindowsTargetPlatformMinVersion>10.0.10586.0</WindowsTargetPlatformMinVersion>
3131
<Keyword>IslandwoodProj</Keyword>
32-
<ProjectGuid>{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}</ProjectGuid>
32+
<ProjectGuid>{35213666-E979-4A72-AAE1-0BB309110B0D}</ProjectGuid>
3333
<RootNamespace>GLKitComplex</RootNamespace>
3434
<WINOBJC_SDK_ROOT Condition="'$(WINOBJC_SDK_ROOT)' == ''">..\..\..\..</WINOBJC_SDK_ROOT>
3535
</PropertyGroup>
@@ -202,6 +202,17 @@
202202
<VariableFile Condition="'$(Configuration)'=='Release'">GLKitComplex-Release-xcvars.txt</VariableFile>
203203
</SBInfoPlistCopy>
204204
<SBResourceCopy Include="..\..\GLKitComplex\Data" />
205+
<SBResourceCopy Include="..\..\GLKitComplex\Data\lobbyxneg.JPG" />
206+
<SBResourceCopy Include="..\..\GLKitComplex\Data\lobbyxpos.JPG" />
207+
<SBResourceCopy Include="..\..\GLKitComplex\Data\lobbyyneg.JPG" />
208+
<SBResourceCopy Include="..\..\GLKitComplex\Data\lobbyypos.JPG" />
209+
<SBResourceCopy Include="..\..\GLKitComplex\Data\lobbyzneg.JPG" />
210+
<SBResourceCopy Include="..\..\GLKitComplex\Data\lobbyzpos.JPG" />
211+
<SBResourceCopy Include="..\..\GLKitComplex\Data\seafloor.png" />
212+
<SBResourceCopy Include="..\..\GLKitComplex\Data\teapot_decal.png" />
213+
<SBResourceCopy Include="..\..\GLKitComplex\Data\teapot_emissive.png" />
214+
<SBResourceCopy Include="..\..\GLKitComplex\Data\teapot_specular.pdn" />
215+
<SBResourceCopy Include="..\..\GLKitComplex\Data\teapot_specular.png" />
205216
<SBResourceCopy Include="..\..\GLKitComplex\Data\utah-teapot.obj" />
206217
<StoryboardCompile Include="..\..\GLKitComplex\Base.lproj\LaunchScreen.storyboard">
207218
<VariantDir>Base.lproj</VariantDir>

‎samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/GLKitComplex.vcxproj.filters‎

Lines changed: 38 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
44
<Filter Include="Common">
5-
<UniqueIdentifier>{6497114e-8c49-47cf-bd7e-2caaaef4b9b5}</UniqueIdentifier>
5+
<UniqueIdentifier>{f323b7c0-d930-48d0-8dd2-39244962d27a}</UniqueIdentifier>
66
</Filter>
77
<Filter Include="Assets">
8-
<UniqueIdentifier>{a8203dfd-e407-4106-a91f-45bb7976f98e}</UniqueIdentifier>
8+
<UniqueIdentifier>{4c5448e0-435d-4567-9fa9-da65d7332ecc}</UniqueIdentifier>
99
</Filter>
1010
<Filter Include="GLKitComplex">
11-
<UniqueIdentifier>{5BB4745A-5EB8-4F23-B063-F9C7E9E2B269}</UniqueIdentifier>
11+
<UniqueIdentifier>{31B1CDE7-B072-408F-81F2-AD3765659BD0}</UniqueIdentifier>
1212
</Filter>
1313
<Filter Include="GLKitComplex\Base">
14-
<UniqueIdentifier>{CB2B31F2-8729-4BD9-A7EC-DAAEC2F082AD}</UniqueIdentifier>
14+
<UniqueIdentifier>{541555BE-1E16-4C95-A8D7-978404476BCD}</UniqueIdentifier>
1515
</Filter>
1616
<Filter Include="Xcode Variable Files">
17-
<UniqueIdentifier>{FE7114EF-5E09-4C55-8024-0F0F29E662B9}</UniqueIdentifier>
17+
<UniqueIdentifier>{785494B2-9021-408C-807B-C8AB7BCBD1AA}</UniqueIdentifier>
1818
</Filter>
1919
</ItemGroup>
2020
<ItemGroup>
@@ -67,6 +67,39 @@
6767
<SBResourceCopy Include="..\..\GLKitComplex\Data">
6868
<Filter>GLKitComplex</Filter>
6969
</SBResourceCopy>
70+
<SBResourceCopy Include="..\..\GLKitComplex\Data\lobbyxneg.JPG">
71+
<Filter>GLKitComplex</Filter>
72+
</SBResourceCopy>
73+
<SBResourceCopy Include="..\..\GLKitComplex\Data\lobbyxpos.JPG">
74+
<Filter>GLKitComplex</Filter>
75+
</SBResourceCopy>
76+
<SBResourceCopy Include="..\..\GLKitComplex\Data\lobbyyneg.JPG">
77+
<Filter>GLKitComplex</Filter>
78+
</SBResourceCopy>
79+
<SBResourceCopy Include="..\..\GLKitComplex\Data\lobbyypos.JPG">
80+
<Filter>GLKitComplex</Filter>
81+
</SBResourceCopy>
82+
<SBResourceCopy Include="..\..\GLKitComplex\Data\lobbyzneg.JPG">
83+
<Filter>GLKitComplex</Filter>
84+
</SBResourceCopy>
85+
<SBResourceCopy Include="..\..\GLKitComplex\Data\lobbyzpos.JPG">
86+
<Filter>GLKitComplex</Filter>
87+
</SBResourceCopy>
88+
<SBResourceCopy Include="..\..\GLKitComplex\Data\seafloor.png">
89+
<Filter>GLKitComplex</Filter>
90+
</SBResourceCopy>
91+
<SBResourceCopy Include="..\..\GLKitComplex\Data\teapot_decal.png">
92+
<Filter>GLKitComplex</Filter>
93+
</SBResourceCopy>
94+
<SBResourceCopy Include="..\..\GLKitComplex\Data\teapot_emissive.png">
95+
<Filter>GLKitComplex</Filter>
96+
</SBResourceCopy>
97+
<SBResourceCopy Include="..\..\GLKitComplex\Data\teapot_specular.pdn">
98+
<Filter>GLKitComplex</Filter>
99+
</SBResourceCopy>
100+
<SBResourceCopy Include="..\..\GLKitComplex\Data\teapot_specular.png">
101+
<Filter>GLKitComplex</Filter>
102+
</SBResourceCopy>
70103
<SBResourceCopy Include="..\..\GLKitComplex\Data\utah-teapot.obj">
71104
<Filter>GLKitComplex</Filter>
72105
</SBResourceCopy>

‎samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/Package.appxmanifest‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
IgnorableNamespaces="uap mp">
88

99
<Identity
10-
Name="fae08089-524b-48c3-aed4-86beeceefce4"
10+
Name="b2fb5618-d35f-4405-8851-8db89aa7649a"
1111
Publisher="CN=islandwood"
1212
Version="1.0.0.0" />
1313

14-
<mp:PhoneIdentity PhoneProductId="fae08089-524b-48c3-aed4-86beeceefce4" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
14+
<mp:PhoneIdentity PhoneProductId="b2fb5618-d35f-4405-8851-8db89aa7649a" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
1515

1616
<Properties>
1717
<DisplayName>GLKitComplex</DisplayName>
18-
<PublisherDisplayName>henryfox</PublisherDisplayName>
18+
<PublisherDisplayName>rajsesh</PublisherDisplayName>
1919
<Logo>Assets\StoreLogo.png</Logo>
2020
</Properties>
2121

‎samples/GLKitComplex/GLKitComplex.xcodeproj/project.pbxproj‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,17 @@
1717
8BB6C8131E20512B00F0FF90 /* Data in Resources */ = {isa = PBXBuildFile; fileRef = 8BB6C8121E20512B00F0FF90 /* Data */; };
1818
8BB6C8161E20514100F0FF90 /* GLKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8BB6C8151E20514100F0FF90 /* GLKit.framework */; };
1919
8BB6C8181E20517000F0FF90 /* utah-teapot.obj in Resources */ = {isa = PBXBuildFile; fileRef = 8BB6C8171E20517000F0FF90 /* utah-teapot.obj */; };
20+
99CE5D751E3AB494003E972E /* lobbyxneg.JPG in Resources */ = {isa = PBXBuildFile; fileRef = 99CE5D6A1E3AB494003E972E /* lobbyxneg.JPG */; };
21+
99CE5D761E3AB494003E972E /* lobbyxpos.JPG in Resources */ = {isa = PBXBuildFile; fileRef = 99CE5D6B1E3AB494003E972E /* lobbyxpos.JPG */; };
22+
99CE5D771E3AB494003E972E /* lobbyyneg.JPG in Resources */ = {isa = PBXBuildFile; fileRef = 99CE5D6C1E3AB494003E972E /* lobbyyneg.JPG */; };
23+
99CE5D781E3AB494003E972E /* lobbyypos.JPG in Resources */ = {isa = PBXBuildFile; fileRef = 99CE5D6D1E3AB494003E972E /* lobbyypos.JPG */; };
24+
99CE5D791E3AB494003E972E /* lobbyzneg.JPG in Resources */ = {isa = PBXBuildFile; fileRef = 99CE5D6E1E3AB494003E972E /* lobbyzneg.JPG */; };
25+
99CE5D7A1E3AB494003E972E /* lobbyzpos.JPG in Resources */ = {isa = PBXBuildFile; fileRef = 99CE5D6F1E3AB494003E972E /* lobbyzpos.JPG */; };
26+
99CE5D7B1E3AB494003E972E /* seafloor.png in Resources */ = {isa = PBXBuildFile; fileRef = 99CE5D701E3AB494003E972E /* seafloor.png */; };
27+
99CE5D7C1E3AB494003E972E /* teapot_decal.png in Resources */ = {isa = PBXBuildFile; fileRef = 99CE5D711E3AB494003E972E /* teapot_decal.png */; };
28+
99CE5D7D1E3AB494003E972E /* teapot_emissive.png in Resources */ = {isa = PBXBuildFile; fileRef = 99CE5D721E3AB494003E972E /* teapot_emissive.png */; };
29+
99CE5D7E1E3AB494003E972E /* teapot_specular.pdn in Resources */ = {isa = PBXBuildFile; fileRef = 99CE5D731E3AB494003E972E /* teapot_specular.pdn */; };
30+
99CE5D7F1E3AB494003E972E /* teapot_specular.png in Resources */ = {isa = PBXBuildFile; fileRef = 99CE5D741E3AB494003E972E /* teapot_specular.png */; };
2031
/* End PBXBuildFile section */
2132

2233
/* Begin PBXFileReference section */
@@ -34,6 +45,17 @@
3445
8BB6C8121E20512B00F0FF90 /* Data */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Data; sourceTree = "<group>"; };
3546
8BB6C8151E20514100F0FF90 /* GLKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLKit.framework; path = System/Library/Frameworks/GLKit.framework; sourceTree = SDKROOT; };
3647
8BB6C8171E20517000F0FF90 /* utah-teapot.obj */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "utah-teapot.obj"; path = "Data/utah-teapot.obj"; sourceTree = "<group>"; };
48+
99CE5D6A1E3AB494003E972E /* lobbyxneg.JPG */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = lobbyxneg.JPG; path = Data/lobbyxneg.JPG; sourceTree = "<group>"; };
49+
99CE5D6B1E3AB494003E972E /* lobbyxpos.JPG */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = lobbyxpos.JPG; path = Data/lobbyxpos.JPG; sourceTree = "<group>"; };
50+
99CE5D6C1E3AB494003E972E /* lobbyyneg.JPG */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = lobbyyneg.JPG; path = Data/lobbyyneg.JPG; sourceTree = "<group>"; };
51+
99CE5D6D1E3AB494003E972E /* lobbyypos.JPG */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = lobbyypos.JPG; path = Data/lobbyypos.JPG; sourceTree = "<group>"; };
52+
99CE5D6E1E3AB494003E972E /* lobbyzneg.JPG */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = lobbyzneg.JPG; path = Data/lobbyzneg.JPG; sourceTree = "<group>"; };
53+
99CE5D6F1E3AB494003E972E /* lobbyzpos.JPG */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = lobbyzpos.JPG; path = Data/lobbyzpos.JPG; sourceTree = "<group>"; };
54+
99CE5D701E3AB494003E972E /* seafloor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = seafloor.png; path = Data/seafloor.png; sourceTree = "<group>"; };
55+
99CE5D711E3AB494003E972E /* teapot_decal.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = teapot_decal.png; path = Data/teapot_decal.png; sourceTree = "<group>"; };
56+
99CE5D721E3AB494003E972E /* teapot_emissive.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = teapot_emissive.png; path = Data/teapot_emissive.png; sourceTree = "<group>"; };
57+
99CE5D731E3AB494003E972E /* teapot_specular.pdn */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = teapot_specular.pdn; path = Data/teapot_specular.pdn; sourceTree = "<group>"; };
58+
99CE5D741E3AB494003E972E /* teapot_specular.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = teapot_specular.png; path = Data/teapot_specular.png; sourceTree = "<group>"; };
3759
/* End PBXFileReference section */
3860

3961
/* Begin PBXFrameworksBuildPhase section */
@@ -68,6 +90,17 @@
6890
8BB6C7F01E204FF500F0FF90 /* GLKitComplex */ = {
6991
isa = PBXGroup;
7092
children = (
93+
99CE5D6A1E3AB494003E972E /* lobbyxneg.JPG */,
94+
99CE5D6B1E3AB494003E972E /* lobbyxpos.JPG */,
95+
99CE5D6C1E3AB494003E972E /* lobbyyneg.JPG */,
96+
99CE5D6D1E3AB494003E972E /* lobbyypos.JPG */,
97+
99CE5D6E1E3AB494003E972E /* lobbyzneg.JPG */,
98+
99CE5D6F1E3AB494003E972E /* lobbyzpos.JPG */,
99+
99CE5D701E3AB494003E972E /* seafloor.png */,
100+
99CE5D711E3AB494003E972E /* teapot_decal.png */,
101+
99CE5D721E3AB494003E972E /* teapot_emissive.png */,
102+
99CE5D731E3AB494003E972E /* teapot_specular.pdn */,
103+
99CE5D741E3AB494003E972E /* teapot_specular.png */,
71104
8BB6C8121E20512B00F0FF90 /* Data */,
72105
8BB6C8081E20512600F0FF90 /* GLKitComplex.mm */,
73106
8BB6C8171E20517000F0FF90 /* utah-teapot.obj */,
@@ -151,10 +184,21 @@
151184
buildActionMask = 2147483647;
152185
files = (
153186
8BB6C8011E204FF500F0FF90 /* LaunchScreen.storyboard in Resources */,
187+
99CE5D7F1E3AB494003E972E /* teapot_specular.png in Resources */,
154188
8BB6C7FE1E204FF500F0FF90 /* Assets.xcassets in Resources */,
189+
99CE5D7B1E3AB494003E972E /* seafloor.png in Resources */,
190+
99CE5D791E3AB494003E972E /* lobbyzneg.JPG in Resources */,
155191
8BB6C8131E20512B00F0FF90 /* Data in Resources */,
156192
8BB6C8181E20517000F0FF90 /* utah-teapot.obj in Resources */,
193+
99CE5D751E3AB494003E972E /* lobbyxneg.JPG in Resources */,
157194
8BB6C7FC1E204FF500F0FF90 /* Main.storyboard in Resources */,
195+
99CE5D781E3AB494003E972E /* lobbyypos.JPG in Resources */,
196+
99CE5D7A1E3AB494003E972E /* lobbyzpos.JPG in Resources */,
197+
99CE5D7C1E3AB494003E972E /* teapot_decal.png in Resources */,
198+
99CE5D761E3AB494003E972E /* lobbyxpos.JPG in Resources */,
199+
99CE5D771E3AB494003E972E /* lobbyyneg.JPG in Resources */,
200+
99CE5D7E1E3AB494003E972E /* teapot_specular.pdn in Resources */,
201+
99CE5D7D1E3AB494003E972E /* teapot_emissive.png in Resources */,
158202
);
159203
runOnlyForDeploymentPostprocessing = 0;
160204
};
@@ -325,6 +369,7 @@
325369
8BB6C8071E204FF500F0FF90 /* Release */,
326370
);
327371
defaultConfigurationIsVisible = 0;
372+
defaultConfigurationName = Release;
328373
};
329374
/* End XCConfigurationList section */
330375
};

‎samples/GLKitComplex/GLKitComplex/Assets.xcassets/AppIcon.appiconset/Contents.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
{
22
"images" : [
3+
{
4+
"idiom" : "iphone",
5+
"size" : "20x20",
6+
"scale" : "2x"
7+
},
8+
{
9+
"idiom" : "iphone",
10+
"size" : "20x20",
11+
"scale" : "3x"
12+
},
313
{
414
"idiom" : "iphone",
515
"size" : "29x29",

0 commit comments

Comments
 (0)