Updated glkit project with missing textures. Fixes microsoft#1840.

rajsesh · Jan 26, 2017 · fb53e79 · fb53e79
1 parent 7c62e12
commit fb53e79
Show file tree

Hide file tree

Showing 6 changed files with 82 additions and 38 deletions.
diff --git a/samples/GLKitComplex/GLKitComplex-WinStore10.sln b/samples/GLKitComplex/GLKitComplex-WinStore10.sln
@@ -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
@@ -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
diff --git a/...LKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/GLKitComplex-Debug-xcvars.txt b/...LKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/GLKitComplex-Debug-xcvars.txt
@@ -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
@@ -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
diff --git a/...itComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/GLKitComplex-Release-xcvars.txt b/...itComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/GLKitComplex-Release-xcvars.txt
@@ -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
@@ -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
diff --git a/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/GLKitComplex.vcxproj b/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/GLKitComplex.vcxproj
@@ -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>
@@ -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>

diff --git a/...GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/GLKitComplex.vcxproj.filters b/...GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/GLKitComplex.vcxproj.filters
@@ -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>
@@ -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>

diff --git a/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/Package.appxmanifest b/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/Package.appxmanifest
@@ -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>