Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated GLKitComplex sample project with missing textures. #1842

Merged
merged 2 commits into from
Jan 27, 2017
Merged

Updated GLKitComplex sample project with missing textures. #1842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c62e12
Add data files to xcodeproject
Jan 26, 2017
fb53e79
Updated glkit project with missing textures. Fixes #1840.
Jan 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions samples/GLKitComplex/GLKitComplex-WinStore10.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.22823.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GLKitComplex", "GLKitComplex", "{45F79AFE-6302-462D-A3E5-8C903EC35E31}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GLKitComplex", "GLKitComplex", "{5C45EC9B-07E4-41CD-9B1A-C556732E012E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GLKitComplex", "GLKitComplex.vsimporter\GLKitComplex-WinStore10\GLKitComplex.vcxproj", "{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GLKitComplex", "GLKitComplex.vsimporter\GLKitComplex-WinStore10\GLKitComplex.vcxproj", "{35213666-E979-4A72-AAE1-0BB309110B0D}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
Expand All @@ -16,23 +16,23 @@ Global
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Debug|ARM.ActiveCfg = Debug|ARM
{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Debug|ARM.Build.0 = Debug|ARM
{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Debug|ARM.Deploy.0 = Debug|ARM
{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Debug|Win32.ActiveCfg = Debug|Win32
{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Debug|Win32.Build.0 = Debug|Win32
{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Debug|Win32.Deploy.0 = Debug|Win32
{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Release|ARM.ActiveCfg = Release|ARM
{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Release|ARM.Build.0 = Release|ARM
{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Release|ARM.Deploy.0 = Release|ARM
{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Release|Win32.ActiveCfg = Release|Win32
{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Release|Win32.Build.0 = Release|Win32
{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Release|Win32.Deploy.0 = Release|Win32
{35213666-E979-4A72-AAE1-0BB309110B0D}.Debug|ARM.ActiveCfg = Debug|ARM
{35213666-E979-4A72-AAE1-0BB309110B0D}.Debug|ARM.Build.0 = Debug|ARM
{35213666-E979-4A72-AAE1-0BB309110B0D}.Debug|ARM.Deploy.0 = Debug|ARM
{35213666-E979-4A72-AAE1-0BB309110B0D}.Debug|Win32.ActiveCfg = Debug|Win32
{35213666-E979-4A72-AAE1-0BB309110B0D}.Debug|Win32.Build.0 = Debug|Win32
{35213666-E979-4A72-AAE1-0BB309110B0D}.Debug|Win32.Deploy.0 = Debug|Win32
{35213666-E979-4A72-AAE1-0BB309110B0D}.Release|ARM.ActiveCfg = Release|ARM
{35213666-E979-4A72-AAE1-0BB309110B0D}.Release|ARM.Build.0 = Release|ARM
{35213666-E979-4A72-AAE1-0BB309110B0D}.Release|ARM.Deploy.0 = Release|ARM
{35213666-E979-4A72-AAE1-0BB309110B0D}.Release|Win32.ActiveCfg = Release|Win32
{35213666-E979-4A72-AAE1-0BB309110B0D}.Release|Win32.Build.0 = Release|Win32
{35213666-E979-4A72-AAE1-0BB309110B0D}.Release|Win32.Deploy.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{E45BBE1B-1E64-4C3C-9D81-433F9AB81749} = {45F79AFE-6302-462D-A3E5-8C903EC35E31}
{35213666-E979-4A72-AAE1-0BB309110B0D} = {5C45EC9B-07E4-41CD-9B1A-C556732E012E}
EndGlobalSection
EndGlobal
14 changes: 7 additions & 7 deletions ...LKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/GLKitComplex-Debug-xcvars.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,15 +87,15 @@ PRODUCT_BUNDLE_IDENTIFIER = test.GLKitComplex
PRODUCT_NAME = GLKitComplex
PRODUCT_TYPE = com.apple.product-type.application
PROJECT = GLKitComplex
PROJECT_DIR = E:/island/github/henryfox/WinObjC/samples/GLKitComplex
PROJECT_FILE_PATH = E:\island\github\henryfox\WinObjC\samples\GLKitComplex\GLKitComplex.xcodeproj
PROJECT_DIR = D:/src/winobjc/samples/GLKitComplex
PROJECT_FILE_PATH = D:\src\winobjc\samples\GLKitComplex\GLKitComplex.xcodeproj
PROJECT_NAME = GLKitComplex
PROJECT_TEMP_DIR = sbuild/GLKitComplex.sbuild
PROJECT_TEMP_ROOT = sbuild
PUBLIC_HEADERS_FOLDER_PATH = GLKitComplex.app/Public
SDKROOT = E:/island/github/henryfox/WinObjC
SOURCE_ROOT = E:/island/github/henryfox/WinObjC/samples/GLKitComplex
SRCROOT = E:/island/github/henryfox/WinObjC/samples/GLKitComplex
SDKROOT = D:/src/Winobjc
SOURCE_ROOT = D:/src/winobjc/samples/GLKitComplex
SRCROOT = D:/src/winobjc/samples/GLKitComplex
SYMROOT = sbuild
TARGETED_DEVICE_FAMILY = 1,2
TARGETNAME = GLKitComplex
Expand All @@ -105,9 +105,9 @@ TARGET_SDKVERSION = 5.0
TARGET_TEMP_DIR = sbuild/GLKitComplex.sbuild/Debug-iphoneos/GLKitComplex.sbuild
TEMP_DIR = sbuild/GLKitComplex.sbuild/Debug-iphoneos/GLKitComplex.sbuild
UNLOCALIZED_RESOURCES_FOLDER_PATH = GLKitComplex.app
USER = henryfox
USER = rajsesh
USER_HEADER_SEARCH_PATHS =
USE_HEADERMAP = YES
WARNING_CFLAGS =
WARNING_LDFLAGS =
WINOBJC_SDK_ROOT = E:/island/github/henryfox/WinObjC
WINOBJC_SDK_ROOT = D:/src/Winobjc
14 changes: 7 additions & 7 deletions ...itComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/GLKitComplex-Release-xcvars.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,15 @@ PRODUCT_BUNDLE_IDENTIFIER = test.GLKitComplex
PRODUCT_NAME = GLKitComplex
PRODUCT_TYPE = com.apple.product-type.application
PROJECT = GLKitComplex
PROJECT_DIR = E:/island/github/henryfox/WinObjC/samples/GLKitComplex
PROJECT_FILE_PATH = E:\island\github\henryfox\WinObjC\samples\GLKitComplex\GLKitComplex.xcodeproj
PROJECT_DIR = D:/src/winobjc/samples/GLKitComplex
PROJECT_FILE_PATH = D:\src\winobjc\samples\GLKitComplex\GLKitComplex.xcodeproj
PROJECT_NAME = GLKitComplex
PROJECT_TEMP_DIR = sbuild/GLKitComplex.sbuild
PROJECT_TEMP_ROOT = sbuild
PUBLIC_HEADERS_FOLDER_PATH = GLKitComplex.app/Public
SDKROOT = E:/island/github/henryfox/WinObjC
SOURCE_ROOT = E:/island/github/henryfox/WinObjC/samples/GLKitComplex
SRCROOT = E:/island/github/henryfox/WinObjC/samples/GLKitComplex
SDKROOT = D:/src/Winobjc
SOURCE_ROOT = D:/src/winobjc/samples/GLKitComplex
SRCROOT = D:/src/winobjc/samples/GLKitComplex
SYMROOT = sbuild
TARGETED_DEVICE_FAMILY = 1,2
TARGETNAME = GLKitComplex
Expand All @@ -104,10 +104,10 @@ TARGET_SDKVERSION = 5.0
TARGET_TEMP_DIR = sbuild/GLKitComplex.sbuild/Release-iphoneos/GLKitComplex.sbuild
TEMP_DIR = sbuild/GLKitComplex.sbuild/Release-iphoneos/GLKitComplex.sbuild
UNLOCALIZED_RESOURCES_FOLDER_PATH = GLKitComplex.app
USER = henryfox
USER = rajsesh
USER_HEADER_SEARCH_PATHS =
USE_HEADERMAP = YES
VALIDATE_PRODUCT = YES
WARNING_CFLAGS =
WARNING_LDFLAGS =
WINOBJC_SDK_ROOT = E:/island/github/henryfox/WinObjC
WINOBJC_SDK_ROOT = D:/src/Winobjc
13 changes: 12 additions & 1 deletion samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/GLKitComplex.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10586.0</WindowsTargetPlatformMinVersion>
<Keyword>IslandwoodProj</Keyword>
<ProjectGuid>{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}</ProjectGuid>
<ProjectGuid>{35213666-E979-4A72-AAE1-0BB309110B0D}</ProjectGuid>
<RootNamespace>GLKitComplex</RootNamespace>
<WINOBJC_SDK_ROOT Condition="'$(WINOBJC_SDK_ROOT)' == ''">..\..\..\..</WINOBJC_SDK_ROOT>
</PropertyGroup>
Expand Down Expand Up @@ -202,6 +202,17 @@
<VariableFile Condition="'$(Configuration)'=='Release'">GLKitComplex-Release-xcvars.txt</VariableFile>
</SBInfoPlistCopy>
<SBResourceCopy Include="..\..\GLKitComplex\Data" />
<SBResourceCopy Include="..\..\GLKitComplex\Data\lobbyxneg.JPG" />
<SBResourceCopy Include="..\..\GLKitComplex\Data\lobbyxpos.JPG" />
<SBResourceCopy Include="..\..\GLKitComplex\Data\lobbyyneg.JPG" />
<SBResourceCopy Include="..\..\GLKitComplex\Data\lobbyypos.JPG" />
<SBResourceCopy Include="..\..\GLKitComplex\Data\lobbyzneg.JPG" />
<SBResourceCopy Include="..\..\GLKitComplex\Data\lobbyzpos.JPG" />
<SBResourceCopy Include="..\..\GLKitComplex\Data\seafloor.png" />
<SBResourceCopy Include="..\..\GLKitComplex\Data\teapot_decal.png" />
<SBResourceCopy Include="..\..\GLKitComplex\Data\teapot_emissive.png" />
<SBResourceCopy Include="..\..\GLKitComplex\Data\teapot_specular.pdn" />
<SBResourceCopy Include="..\..\GLKitComplex\Data\teapot_specular.png" />
<SBResourceCopy Include="..\..\GLKitComplex\Data\utah-teapot.obj" />
<StoryboardCompile Include="..\..\GLKitComplex\Base.lproj\LaunchScreen.storyboard">
<VariantDir>Base.lproj</VariantDir>
Expand Down
43 changes: 38 additions & 5 deletions ...GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/GLKitComplex.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Common">
<UniqueIdentifier>{6497114e-8c49-47cf-bd7e-2caaaef4b9b5}</UniqueIdentifier>
<UniqueIdentifier>{f323b7c0-d930-48d0-8dd2-39244962d27a}</UniqueIdentifier>
</Filter>
<Filter Include="Assets">
<UniqueIdentifier>{a8203dfd-e407-4106-a91f-45bb7976f98e}</UniqueIdentifier>
<UniqueIdentifier>{4c5448e0-435d-4567-9fa9-da65d7332ecc}</UniqueIdentifier>
</Filter>
<Filter Include="GLKitComplex">
<UniqueIdentifier>{5BB4745A-5EB8-4F23-B063-F9C7E9E2B269}</UniqueIdentifier>
<UniqueIdentifier>{31B1CDE7-B072-408F-81F2-AD3765659BD0}</UniqueIdentifier>
</Filter>
<Filter Include="GLKitComplex\Base">
<UniqueIdentifier>{CB2B31F2-8729-4BD9-A7EC-DAAEC2F082AD}</UniqueIdentifier>
<UniqueIdentifier>{541555BE-1E16-4C95-A8D7-978404476BCD}</UniqueIdentifier>
</Filter>
<Filter Include="Xcode Variable Files">
<UniqueIdentifier>{FE7114EF-5E09-4C55-8024-0F0F29E662B9}</UniqueIdentifier>
<UniqueIdentifier>{785494B2-9021-408C-807B-C8AB7BCBD1AA}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -67,6 +67,39 @@
<SBResourceCopy Include="..\..\GLKitComplex\Data">
<Filter>GLKitComplex</Filter>
</SBResourceCopy>
<SBResourceCopy Include="..\..\GLKitComplex\Data\lobbyxneg.JPG">
<Filter>GLKitComplex</Filter>
</SBResourceCopy>
<SBResourceCopy Include="..\..\GLKitComplex\Data\lobbyxpos.JPG">
<Filter>GLKitComplex</Filter>
</SBResourceCopy>
<SBResourceCopy Include="..\..\GLKitComplex\Data\lobbyyneg.JPG">
<Filter>GLKitComplex</Filter>
</SBResourceCopy>
<SBResourceCopy Include="..\..\GLKitComplex\Data\lobbyypos.JPG">
<Filter>GLKitComplex</Filter>
</SBResourceCopy>
<SBResourceCopy Include="..\..\GLKitComplex\Data\lobbyzneg.JPG">
<Filter>GLKitComplex</Filter>
</SBResourceCopy>
<SBResourceCopy Include="..\..\GLKitComplex\Data\lobbyzpos.JPG">
<Filter>GLKitComplex</Filter>
</SBResourceCopy>
<SBResourceCopy Include="..\..\GLKitComplex\Data\seafloor.png">
<Filter>GLKitComplex</Filter>
</SBResourceCopy>
<SBResourceCopy Include="..\..\GLKitComplex\Data\teapot_decal.png">
<Filter>GLKitComplex</Filter>
</SBResourceCopy>
<SBResourceCopy Include="..\..\GLKitComplex\Data\teapot_emissive.png">
<Filter>GLKitComplex</Filter>
</SBResourceCopy>
<SBResourceCopy Include="..\..\GLKitComplex\Data\teapot_specular.pdn">
<Filter>GLKitComplex</Filter>
</SBResourceCopy>
<SBResourceCopy Include="..\..\GLKitComplex\Data\teapot_specular.png">
<Filter>GLKitComplex</Filter>
</SBResourceCopy>
<SBResourceCopy Include="..\..\GLKitComplex\Data\utah-teapot.obj">
<Filter>GLKitComplex</Filter>
</SBResourceCopy>
Expand Down
6 changes: 3 additions & 3 deletions samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/Package.appxmanifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
IgnorableNamespaces="uap mp">

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

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

<Properties>
<DisplayName>GLKitComplex</DisplayName>
<PublisherDisplayName>henryfox</PublisherDisplayName>
<PublisherDisplayName>rajsesh</PublisherDisplayName>
<Logo>Assets\StoreLogo.png</Logo>
</Properties>

Expand Down
45 changes: 45 additions & 0 deletions samples/GLKitComplex/GLKitComplex.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,17 @@
8BB6C8131E20512B00F0FF90 /* Data in Resources */ = {isa = PBXBuildFile; fileRef = 8BB6C8121E20512B00F0FF90 /* Data */; };
8BB6C8161E20514100F0FF90 /* GLKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8BB6C8151E20514100F0FF90 /* GLKit.framework */; };
8BB6C8181E20517000F0FF90 /* utah-teapot.obj in Resources */ = {isa = PBXBuildFile; fileRef = 8BB6C8171E20517000F0FF90 /* utah-teapot.obj */; };
99CE5D751E3AB494003E972E /* lobbyxneg.JPG in Resources */ = {isa = PBXBuildFile; fileRef = 99CE5D6A1E3AB494003E972E /* lobbyxneg.JPG */; };
99CE5D761E3AB494003E972E /* lobbyxpos.JPG in Resources */ = {isa = PBXBuildFile; fileRef = 99CE5D6B1E3AB494003E972E /* lobbyxpos.JPG */; };
99CE5D771E3AB494003E972E /* lobbyyneg.JPG in Resources */ = {isa = PBXBuildFile; fileRef = 99CE5D6C1E3AB494003E972E /* lobbyyneg.JPG */; };
99CE5D781E3AB494003E972E /* lobbyypos.JPG in Resources */ = {isa = PBXBuildFile; fileRef = 99CE5D6D1E3AB494003E972E /* lobbyypos.JPG */; };
99CE5D791E3AB494003E972E /* lobbyzneg.JPG in Resources */ = {isa = PBXBuildFile; fileRef = 99CE5D6E1E3AB494003E972E /* lobbyzneg.JPG */; };
99CE5D7A1E3AB494003E972E /* lobbyzpos.JPG in Resources */ = {isa = PBXBuildFile; fileRef = 99CE5D6F1E3AB494003E972E /* lobbyzpos.JPG */; };
99CE5D7B1E3AB494003E972E /* seafloor.png in Resources */ = {isa = PBXBuildFile; fileRef = 99CE5D701E3AB494003E972E /* seafloor.png */; };
99CE5D7C1E3AB494003E972E /* teapot_decal.png in Resources */ = {isa = PBXBuildFile; fileRef = 99CE5D711E3AB494003E972E /* teapot_decal.png */; };
99CE5D7D1E3AB494003E972E /* teapot_emissive.png in Resources */ = {isa = PBXBuildFile; fileRef = 99CE5D721E3AB494003E972E /* teapot_emissive.png */; };
99CE5D7E1E3AB494003E972E /* teapot_specular.pdn in Resources */ = {isa = PBXBuildFile; fileRef = 99CE5D731E3AB494003E972E /* teapot_specular.pdn */; };
99CE5D7F1E3AB494003E972E /* teapot_specular.png in Resources */ = {isa = PBXBuildFile; fileRef = 99CE5D741E3AB494003E972E /* teapot_specular.png */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand All @@ -34,6 +45,17 @@
8BB6C8121E20512B00F0FF90 /* Data */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Data; sourceTree = "<group>"; };
8BB6C8151E20514100F0FF90 /* GLKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLKit.framework; path = System/Library/Frameworks/GLKit.framework; sourceTree = SDKROOT; };
8BB6C8171E20517000F0FF90 /* utah-teapot.obj */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "utah-teapot.obj"; path = "Data/utah-teapot.obj"; sourceTree = "<group>"; };
99CE5D6A1E3AB494003E972E /* lobbyxneg.JPG */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = lobbyxneg.JPG; path = Data/lobbyxneg.JPG; sourceTree = "<group>"; };
99CE5D6B1E3AB494003E972E /* lobbyxpos.JPG */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = lobbyxpos.JPG; path = Data/lobbyxpos.JPG; sourceTree = "<group>"; };
99CE5D6C1E3AB494003E972E /* lobbyyneg.JPG */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = lobbyyneg.JPG; path = Data/lobbyyneg.JPG; sourceTree = "<group>"; };
99CE5D6D1E3AB494003E972E /* lobbyypos.JPG */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = lobbyypos.JPG; path = Data/lobbyypos.JPG; sourceTree = "<group>"; };
99CE5D6E1E3AB494003E972E /* lobbyzneg.JPG */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = lobbyzneg.JPG; path = Data/lobbyzneg.JPG; sourceTree = "<group>"; };
99CE5D6F1E3AB494003E972E /* lobbyzpos.JPG */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = lobbyzpos.JPG; path = Data/lobbyzpos.JPG; sourceTree = "<group>"; };
99CE5D701E3AB494003E972E /* seafloor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = seafloor.png; path = Data/seafloor.png; sourceTree = "<group>"; };
99CE5D711E3AB494003E972E /* teapot_decal.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = teapot_decal.png; path = Data/teapot_decal.png; sourceTree = "<group>"; };
99CE5D721E3AB494003E972E /* teapot_emissive.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = teapot_emissive.png; path = Data/teapot_emissive.png; sourceTree = "<group>"; };
99CE5D731E3AB494003E972E /* teapot_specular.pdn */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = teapot_specular.pdn; path = Data/teapot_specular.pdn; sourceTree = "<group>"; };
99CE5D741E3AB494003E972E /* teapot_specular.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = teapot_specular.png; path = Data/teapot_specular.png; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -68,6 +90,17 @@
8BB6C7F01E204FF500F0FF90 /* GLKitComplex */ = {
isa = PBXGroup;
children = (
99CE5D6A1E3AB494003E972E /* lobbyxneg.JPG */,
99CE5D6B1E3AB494003E972E /* lobbyxpos.JPG */,
99CE5D6C1E3AB494003E972E /* lobbyyneg.JPG */,
99CE5D6D1E3AB494003E972E /* lobbyypos.JPG */,
99CE5D6E1E3AB494003E972E /* lobbyzneg.JPG */,
99CE5D6F1E3AB494003E972E /* lobbyzpos.JPG */,
99CE5D701E3AB494003E972E /* seafloor.png */,
99CE5D711E3AB494003E972E /* teapot_decal.png */,
99CE5D721E3AB494003E972E /* teapot_emissive.png */,
99CE5D731E3AB494003E972E /* teapot_specular.pdn */,
99CE5D741E3AB494003E972E /* teapot_specular.png */,
8BB6C8121E20512B00F0FF90 /* Data */,
8BB6C8081E20512600F0FF90 /* GLKitComplex.mm */,
8BB6C8171E20517000F0FF90 /* utah-teapot.obj */,
Expand Down Expand Up @@ -151,10 +184,21 @@
buildActionMask = 2147483647;
files = (
8BB6C8011E204FF500F0FF90 /* LaunchScreen.storyboard in Resources */,
99CE5D7F1E3AB494003E972E /* teapot_specular.png in Resources */,
8BB6C7FE1E204FF500F0FF90 /* Assets.xcassets in Resources */,
99CE5D7B1E3AB494003E972E /* seafloor.png in Resources */,
99CE5D791E3AB494003E972E /* lobbyzneg.JPG in Resources */,
8BB6C8131E20512B00F0FF90 /* Data in Resources */,
8BB6C8181E20517000F0FF90 /* utah-teapot.obj in Resources */,
99CE5D751E3AB494003E972E /* lobbyxneg.JPG in Resources */,
8BB6C7FC1E204FF500F0FF90 /* Main.storyboard in Resources */,
99CE5D781E3AB494003E972E /* lobbyypos.JPG in Resources */,
99CE5D7A1E3AB494003E972E /* lobbyzpos.JPG in Resources */,
99CE5D7C1E3AB494003E972E /* teapot_decal.png in Resources */,
99CE5D761E3AB494003E972E /* lobbyxpos.JPG in Resources */,
99CE5D771E3AB494003E972E /* lobbyyneg.JPG in Resources */,
99CE5D7E1E3AB494003E972E /* teapot_specular.pdn in Resources */,
99CE5D7D1E3AB494003E972E /* teapot_emissive.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -325,6 +369,7 @@
8BB6C8071E204FF500F0FF90 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
Expand Down
10 changes: 10 additions & 0 deletions samples/GLKitComplex/GLKitComplex/Assets.xcassets/AppIcon.appiconset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
{
"images" : [
{
"idiom" : "iphone",
"size" : "20x20",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "20x20",
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "29x29",
Expand Down