Skip to content

Commit 474138f

Browse files
author
Erik van Bilsen
committed
Added 2.1 Colors tutorial
1 parent ca69cb9 commit 474138f

27 files changed

+2090
-174
lines changed

‎Tutorials/1.GettingStarted/1.HelloWindow/T101HelloWindow.dproj

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<MainSource>T101HelloWindow.dpr</MainSource>
77
<Base>True</Base>
88
<Config Condition="'$(Config)'==''">Debug</Config>
9-
<Platform Condition="'$(Platform)'==''">Android</Platform>
9+
<Platform Condition="'$(Platform)'==''">Win32</Platform>
1010
<TargetedPlatforms>1119</TargetedPlatforms>
1111
<AppType>Application</AppType>
1212
</PropertyGroup>
@@ -101,7 +101,7 @@
101101
<Base>true</Base>
102102
</PropertyGroup>
103103
<PropertyGroup Condition="'$(Base)'!=''">
104-
<DCC_UnitSearchPath>..\..\Common;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
104+
<DCC_UnitSearchPath>..\..\Common;..\..\..\..\DelphiStb\Stb;..\..\..\..\FastMath\FastMath;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
105105
<Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
106106
<AUP_READ_PHONE_STATE>true</AUP_READ_PHONE_STATE>
107107
<AUP_ACCESS_FINE_LOCATION>true</AUP_ACCESS_FINE_LOCATION>
@@ -317,6 +317,7 @@
317317
<VerInfo_UIDeviceFamily>iPhoneAndiPad</VerInfo_UIDeviceFamily>
318318
</PropertyGroup>
319319
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
320+
<VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
320321
<BT_BuildType>Debug</BT_BuildType>
321322
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
322323
<VerInfo_Locale>1033</VerInfo_Locale>
@@ -404,25 +405,25 @@
404405
<Overwrite>true</Overwrite>
405406
</Platform>
406407
</DeployFile>
407-
<DeployFile LocalName="$(BDS)\bin\Artwork\iOS\iPad\FM_ApplicationIcon_144x144.png" Configuration="Debug" Class="iPad_AppIcon144">
408+
<DeployFile LocalName="$(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_57x57.png" Configuration="Debug" Class="iPhone_AppIcon57">
408409
<Platform Name="iOSDevice64">
409410
<Overwrite>true</Overwrite>
410411
</Platform>
411412
</DeployFile>
412-
<DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_SplashImage_426x320.png" Configuration="Debug" Class="Android_SplashImage426">
413-
<Platform Name="Android">
414-
<RemoteName>splash_image.png</RemoteName>
413+
<DeployFile LocalName="$(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_2208x1242.png" Configuration="Debug" Class="iPhone_Launch2208">
414+
<Platform Name="iOSDevice32">
415+
<RemoteName>Default-Landscape-736h@3x.png</RemoteName>
415416
<Overwrite>true</Overwrite>
416417
</Platform>
417418
</DeployFile>
418-
<DeployFile LocalName="$(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_57x57.png" Configuration="Debug" Class="iPhone_AppIcon57">
419+
<DeployFile LocalName="$(BDS)\bin\Artwork\iOS\iPad\FM_ApplicationIcon_144x144.png" Configuration="Debug" Class="iPad_AppIcon144">
419420
<Platform Name="iOSDevice64">
420421
<Overwrite>true</Overwrite>
421422
</Platform>
422423
</DeployFile>
423-
<DeployFile LocalName="$(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_2208x1242.png" Configuration="Debug" Class="iPhone_Launch2208">
424-
<Platform Name="iOSDevice32">
425-
<RemoteName>Default-Landscape-736h@3x.png</RemoteName>
424+
<DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_SplashImage_426x320.png" Configuration="Debug" Class="Android_SplashImage426">
425+
<Platform Name="Android">
426+
<RemoteName>splash_image.png</RemoteName>
426427
<Overwrite>true</Overwrite>
427428
</Platform>
428429
</DeployFile>
@@ -454,8 +455,9 @@
454455
<Overwrite>true</Overwrite>
455456
</Platform>
456457
</DeployFile>
457-
<DeployFile LocalName="iOSDevice64\Debug\T101HelloWindow.entitlements" Configuration="Debug" Class="ProjectiOSEntitlements">
458-
<Platform Name="iOSDevice64">
458+
<DeployFile LocalName="iOSDevice32\Debug\T101HelloWindow" Configuration="Debug" Class="ProjectOutput">
459+
<Platform Name="iOSDevice32">
460+
<RemoteName>T101HelloWindow</RemoteName>
459461
<Overwrite>true</Overwrite>
460462
</Platform>
461463
</DeployFile>
@@ -465,9 +467,8 @@
465467
<Overwrite>true</Overwrite>
466468
</Platform>
467469
</DeployFile>
468-
<DeployFile LocalName="iOSDevice32\Debug\T101HelloWindow" Configuration="Debug" Class="ProjectOutput">
469-
<Platform Name="iOSDevice32">
470-
<RemoteName>T101HelloWindow</RemoteName>
470+
<DeployFile LocalName="iOSDevice64\Debug\T101HelloWindow.entitlements" Configuration="Debug" Class="ProjectiOSEntitlements">
471+
<Platform Name="iOSDevice64">
471472
<Overwrite>true</Overwrite>
472473
</Platform>
473474
</DeployFile>
@@ -933,12 +934,27 @@
933934
<Overwrite>true</Overwrite>
934935
</Platform>
935936
</DeployFile>
936-
<DeployClass Name="ProjectiOSDeviceResourceRules">
937+
<DeployClass Name="DependencyModule">
938+
<Platform Name="Win32">
939+
<Operation>0</Operation>
940+
<Extensions>.dll;.bpl</Extensions>
941+
</Platform>
937942
<Platform Name="iOSDevice64">
938943
<Operation>1</Operation>
944+
<Extensions>.dylib</Extensions>
945+
</Platform>
946+
<Platform Name="OSX32">
947+
<RemoteDir>Contents\MacOS</RemoteDir>
948+
<Operation>1</Operation>
949+
<Extensions>.dylib</Extensions>
939950
</Platform>
940951
<Platform Name="iOSDevice32">
941952
<Operation>1</Operation>
953+
<Extensions>.dylib</Extensions>
954+
</Platform>
955+
<Platform Name="iOSSimulator">
956+
<Operation>1</Operation>
957+
<Extensions>.dylib</Extensions>
942958
</Platform>
943959
</DeployClass>
944960
<DeployClass Name="ProjectOSXResource">
@@ -1317,27 +1333,12 @@
13171333
<Operation>1</Operation>
13181334
</Platform>
13191335
</DeployClass>
1320-
<DeployClass Name="DependencyModule">
1321-
<Platform Name="Win32">
1322-
<Operation>0</Operation>
1323-
<Extensions>.dll;.bpl</Extensions>
1324-
</Platform>
1336+
<DeployClass Name="ProjectiOSDeviceResourceRules">
13251337
<Platform Name="iOSDevice64">
13261338
<Operation>1</Operation>
1327-
<Extensions>.dylib</Extensions>
1328-
</Platform>
1329-
<Platform Name="OSX32">
1330-
<RemoteDir>Contents\MacOS</RemoteDir>
1331-
<Operation>1</Operation>
1332-
<Extensions>.dylib</Extensions>
13331339
</Platform>
13341340
<Platform Name="iOSDevice32">
13351341
<Operation>1</Operation>
1336-
<Extensions>.dylib</Extensions>
1337-
</Platform>
1338-
<Platform Name="iOSSimulator">
1339-
<Operation>1</Operation>
1340-
<Extensions>.dylib</Extensions>
13411342
</Platform>
13421343
</DeployClass>
13431344
<ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>

‎Tutorials/1.GettingStarted/1.HelloWindow/T101HelloWindow.res

58 KB
Binary file not shown.

‎Tutorials/1.GettingStarted/2.HelloTriangle/T102HelloTriangle.dproj

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<PropertyGroup>
3-
<ProjectGuid>{0406DF75-C48F-4AE3-B64B-A16FB75DED9A}</ProjectGuid>
3+
<ProjectGuid>{12FBB9F7-1FF8-4365-8A2D-F01C1FFF3221}</ProjectGuid>
44
<ProjectVersion>18.2</ProjectVersion>
55
<FrameworkType>FMX</FrameworkType>
66
<MainSource>T102HelloTriangle.dpr</MainSource>
@@ -461,14 +461,14 @@
461461
<Overwrite>true</Overwrite>
462462
</Platform>
463463
</DeployFile>
464-
<DeployFile LocalName="$(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_2208x1242.png" Configuration="Debug" Class="iPhone_Launch2208">
465-
<Platform Name="iOSDevice32">
466-
<RemoteName>[email protected]</RemoteName>
464+
<DeployFile LocalName="$(BDS)\bin\Artwork\iOS\iPad\FM_ApplicationIcon_144x144.png" Configuration="Debug" Class="iPad_AppIcon144">
465+
<Platform Name="iOSDevice64">
467466
<Overwrite>true</Overwrite>
468467
</Platform>
469468
</DeployFile>
470-
<DeployFile LocalName="$(BDS)\bin\Artwork\iOS\iPad\FM_ApplicationIcon_144x144.png" Configuration="Debug" Class="iPad_AppIcon144">
471-
<Platform Name="iOSDevice64">
469+
<DeployFile LocalName="$(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_2208x1242.png" Configuration="Debug" Class="iPhone_Launch2208">
470+
<Platform Name="iOSDevice32">
471+
<RemoteName>[email protected]</RemoteName>
472472
<Overwrite>true</Overwrite>
473473
</Platform>
474474
</DeployFile>
@@ -1171,27 +1171,12 @@
11711171
<Overwrite>true</Overwrite>
11721172
</Platform>
11731173
</DeployFile>
1174-
<DeployClass Name="DependencyModule">
1175-
<Platform Name="Win32">
1176-
<Operation>0</Operation>
1177-
<Extensions>.dll;.bpl</Extensions>
1178-
</Platform>
1174+
<DeployClass Name="ProjectiOSDeviceResourceRules">
11791175
<Platform Name="iOSDevice64">
11801176
<Operation>1</Operation>
1181-
<Extensions>.dylib</Extensions>
1182-
</Platform>
1183-
<Platform Name="OSX32">
1184-
<RemoteDir>Contents\MacOS</RemoteDir>
1185-
<Operation>1</Operation>
1186-
<Extensions>.dylib</Extensions>
11871177
</Platform>
11881178
<Platform Name="iOSDevice32">
11891179
<Operation>1</Operation>
1190-
<Extensions>.dylib</Extensions>
1191-
</Platform>
1192-
<Platform Name="iOSSimulator">
1193-
<Operation>1</Operation>
1194-
<Extensions>.dylib</Extensions>
11951180
</Platform>
11961181
</DeployClass>
11971182
<DeployClass Name="ProjectOSXResource">
@@ -1570,12 +1555,27 @@
15701555
<Operation>1</Operation>
15711556
</Platform>
15721557
</DeployClass>
1573-
<DeployClass Name="ProjectiOSDeviceResourceRules">
1558+
<DeployClass Name="DependencyModule">
1559+
<Platform Name="Win32">
1560+
<Operation>0</Operation>
1561+
<Extensions>.dll;.bpl</Extensions>
1562+
</Platform>
15741563
<Platform Name="iOSDevice64">
15751564
<Operation>1</Operation>
1565+
<Extensions>.dylib</Extensions>
1566+
</Platform>
1567+
<Platform Name="OSX32">
1568+
<RemoteDir>Contents\MacOS</RemoteDir>
1569+
<Operation>1</Operation>
1570+
<Extensions>.dylib</Extensions>
15761571
</Platform>
15771572
<Platform Name="iOSDevice32">
15781573
<Operation>1</Operation>
1574+
<Extensions>.dylib</Extensions>
1575+
</Platform>
1576+
<Platform Name="iOSSimulator">
1577+
<Operation>1</Operation>
1578+
<Extensions>.dylib</Extensions>
15791579
</Platform>
15801580
</DeployClass>
15811581
<ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>

‎Tutorials/1.GettingStarted/3.Shaders/T103Shaders.dproj

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<PropertyGroup>
3-
<ProjectGuid>{0406DF75-C48F-4AE3-B64B-A16FB75DED9A}</ProjectGuid>
3+
<ProjectGuid>{0F79D684-D820-4269-BF04-D7C68B0794DF}</ProjectGuid>
44
<ProjectVersion>18.2</ProjectVersion>
55
<FrameworkType>FMX</FrameworkType>
66
<MainSource>T103Shaders.dpr</MainSource>
@@ -414,18 +414,18 @@
414414
<Overwrite>true</Overwrite>
415415
</Platform>
416416
</DeployFile>
417-
<DeployFile LocalName="$(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_2208x1242.png" Configuration="Debug" Class="iPhone_Launch2208">
418-
<Platform Name="iOSDevice32">
419-
<RemoteName>[email protected]</RemoteName>
420-
<Overwrite>true</Overwrite>
421-
</Platform>
422-
</DeployFile>
423417
<DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_SplashImage_426x320.png" Configuration="Debug" Class="Android_SplashImage426">
424418
<Platform Name="Android">
425419
<RemoteName>splash_image.png</RemoteName>
426420
<Overwrite>true</Overwrite>
427421
</Platform>
428422
</DeployFile>
423+
<DeployFile LocalName="$(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_2208x1242.png" Configuration="Debug" Class="iPhone_Launch2208">
424+
<Platform Name="iOSDevice32">
425+
<RemoteName>[email protected]</RemoteName>
426+
<Overwrite>true</Overwrite>
427+
</Platform>
428+
</DeployFile>
429429
<DeployFile LocalName="$(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImagePortrait_1536x2048.png" Configuration="Debug" Class="iPad_Launch1536x2048">
430430
<Platform Name="iOSDevice32">
431431
<RemoteName>Default-Portrait@2x~ipad.png</RemoteName>
@@ -969,27 +969,12 @@
969969
<Overwrite>true</Overwrite>
970970
</Platform>
971971
</DeployFile>
972-
<DeployClass Name="DependencyModule">
973-
<Platform Name="Win32">
974-
<Operation>0</Operation>
975-
<Extensions>.dll;.bpl</Extensions>
976-
</Platform>
972+
<DeployClass Name="ProjectiOSDeviceResourceRules">
977973
<Platform Name="iOSDevice64">
978974
<Operation>1</Operation>
979-
<Extensions>.dylib</Extensions>
980-
</Platform>
981-
<Platform Name="OSX32">
982-
<RemoteDir>Contents\MacOS</RemoteDir>
983-
<Operation>1</Operation>
984-
<Extensions>.dylib</Extensions>
985975
</Platform>
986976
<Platform Name="iOSDevice32">
987977
<Operation>1</Operation>
988-
<Extensions>.dylib</Extensions>
989-
</Platform>
990-
<Platform Name="iOSSimulator">
991-
<Operation>1</Operation>
992-
<Extensions>.dylib</Extensions>
993978
</Platform>
994979
</DeployClass>
995980
<DeployClass Name="ProjectOSXResource">
@@ -1368,12 +1353,27 @@
13681353
<Operation>1</Operation>
13691354
</Platform>
13701355
</DeployClass>
1371-
<DeployClass Name="ProjectiOSDeviceResourceRules">
1356+
<DeployClass Name="DependencyModule">
1357+
<Platform Name="Win32">
1358+
<Operation>0</Operation>
1359+
<Extensions>.dll;.bpl</Extensions>
1360+
</Platform>
13721361
<Platform Name="iOSDevice64">
13731362
<Operation>1</Operation>
1363+
<Extensions>.dylib</Extensions>
1364+
</Platform>
1365+
<Platform Name="OSX32">
1366+
<RemoteDir>Contents\MacOS</RemoteDir>
1367+
<Operation>1</Operation>
1368+
<Extensions>.dylib</Extensions>
13741369
</Platform>
13751370
<Platform Name="iOSDevice32">
13761371
<Operation>1</Operation>
1372+
<Extensions>.dylib</Extensions>
1373+
</Platform>
1374+
<Platform Name="iOSSimulator">
1375+
<Operation>1</Operation>
1376+
<Extensions>.dylib</Extensions>
13771377
</Platform>
13781378
</DeployClass>
13791379
<ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>

0 commit comments

Comments
 (0)