Skip to content

Commit 9091c7b

Browse files
aquagooseThomasMiz
aquagoose
and
ThomasMiz
authored
Add a texture tutorial before the abstractions tutorial (#1373)
* Started texture sample * created textures project * add textures project to sln * removed existing texture tutorial * renamed abstractions project from 1.3 to 1.4 * implemented quad tutorial code as a base for textures * added texture tutorial * updated title i forgot to update * added textures to abstractions tutorial * removed temporary garbage from the project file * found the solution to the broken solution * Apply suggestions from code review Co-authored-by: ThomasMiz <32400648+ThomasMiz@users.noreply.github.com> * texture.cs fixes * added a comment about mip level range * added comment about uniform initialization --------- Co-authored-by: ThomasMiz <32400648+ThomasMiz@users.noreply.github.com>
1 parent b11d766 commit 9091c7b

File tree

21 files changed

+389
-358
lines changed

21 files changed

+389
-358
lines changed

‎.nuke/build.schema.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,4 +231,4 @@
231231
}
232232
}
233233
}
234-
}
234+
}

‎Silk.NET.sln‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -354,9 +354,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tutorial 1.1 - Hello Window
354354
EndProject
355355
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tutorial 1.2 - Hello quad", "examples\CSharp\OpenGL Tutorials\Tutorial 1.2 - Hello quad\Tutorial 1.2 - Hello quad.csproj", "{FDC37D4C-0CA1-4D98-92B4-4DB5CADB1BD2}"
356356
EndProject
357-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tutorial 1.3 - Abstraction", "examples\CSharp\OpenGL Tutorials\Tutorial 1.3 - Abstractions\Tutorial 1.3 - Abstraction.csproj", "{69321DDA-65DF-412F-BDDA-9306B8EE98D0}"
358-
EndProject
359-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tutorial 1.4 - Textures", "examples\CSharp\OpenGL Tutorials\Tutorial 1.4 - Textures\Tutorial 1.4 - Textures.csproj", "{4DDAC13A-7521-4E9A-A1F8-276FD3FD51AC}"
357+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tutorial 1.4 - Abstraction", "examples\CSharp\OpenGL Tutorials\Tutorial 1.4 - Abstractions\Tutorial 1.4 - Abstraction.csproj", "{69321DDA-65DF-412F-BDDA-9306B8EE98D0}"
360358
EndProject
361359
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tutorial 1.5 - Transformations", "examples\CSharp\OpenGL Tutorials\Tutorial 1.5 - Transformations\Tutorial 1.5 - Transformations.csproj", "{4270B2E3-5CA2-4DB8-B3D9-D99F161A0016}"
362360
EndProject
@@ -590,6 +588,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.SPIRV.Cross", "src
590588
EndProject
591589
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.SPIRV.Cross.Native", "src\Native\Silk.NET.SPIRV.Cross.Native\Silk.NET.SPIRV.Cross.Native.csproj", "{EEFD27E0-F0F3-45EF-A2CB-D9C8135BC893}"
592590
EndProject
591+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tutorial 1.3 - Textures", "examples\CSharp\OpenGL Tutorials\Tutorial 1.3 - Textures\Tutorial 1.3 - Textures.csproj", "{1E7C6166-58B2-46B3-A9BA-18099BD83AF0}"
592+
EndProject
593593
Global
594594
GlobalSection(SolutionConfigurationPlatforms) = preSolution
595595
Debug|Any CPU = Debug|Any CPU
@@ -2303,18 +2303,6 @@ Global
23032303
{69321DDA-65DF-412F-BDDA-9306B8EE98D0}.Release|x64.Build.0 = Release|Any CPU
23042304
{69321DDA-65DF-412F-BDDA-9306B8EE98D0}.Release|x86.ActiveCfg = Release|Any CPU
23052305
{69321DDA-65DF-412F-BDDA-9306B8EE98D0}.Release|x86.Build.0 = Release|Any CPU
2306-
{4DDAC13A-7521-4E9A-A1F8-276FD3FD51AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2307-
{4DDAC13A-7521-4E9A-A1F8-276FD3FD51AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
2308-
{4DDAC13A-7521-4E9A-A1F8-276FD3FD51AC}.Debug|x64.ActiveCfg = Debug|Any CPU
2309-
{4DDAC13A-7521-4E9A-A1F8-276FD3FD51AC}.Debug|x64.Build.0 = Debug|Any CPU
2310-
{4DDAC13A-7521-4E9A-A1F8-276FD3FD51AC}.Debug|x86.ActiveCfg = Debug|Any CPU
2311-
{4DDAC13A-7521-4E9A-A1F8-276FD3FD51AC}.Debug|x86.Build.0 = Debug|Any CPU
2312-
{4DDAC13A-7521-4E9A-A1F8-276FD3FD51AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
2313-
{4DDAC13A-7521-4E9A-A1F8-276FD3FD51AC}.Release|Any CPU.Build.0 = Release|Any CPU
2314-
{4DDAC13A-7521-4E9A-A1F8-276FD3FD51AC}.Release|x64.ActiveCfg = Release|Any CPU
2315-
{4DDAC13A-7521-4E9A-A1F8-276FD3FD51AC}.Release|x64.Build.0 = Release|Any CPU
2316-
{4DDAC13A-7521-4E9A-A1F8-276FD3FD51AC}.Release|x86.ActiveCfg = Release|Any CPU
2317-
{4DDAC13A-7521-4E9A-A1F8-276FD3FD51AC}.Release|x86.Build.0 = Release|Any CPU
23182306
{4270B2E3-5CA2-4DB8-B3D9-D99F161A0016}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
23192307
{4270B2E3-5CA2-4DB8-B3D9-D99F161A0016}.Debug|Any CPU.Build.0 = Debug|Any CPU
23202308
{4270B2E3-5CA2-4DB8-B3D9-D99F161A0016}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -3587,6 +3575,18 @@ Global
35873575
{EEFD27E0-F0F3-45EF-A2CB-D9C8135BC893}.Release|x64.Build.0 = Release|Any CPU
35883576
{EEFD27E0-F0F3-45EF-A2CB-D9C8135BC893}.Release|x86.ActiveCfg = Release|Any CPU
35893577
{EEFD27E0-F0F3-45EF-A2CB-D9C8135BC893}.Release|x86.Build.0 = Release|Any CPU
3578+
{1E7C6166-58B2-46B3-A9BA-18099BD83AF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3579+
{1E7C6166-58B2-46B3-A9BA-18099BD83AF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
3580+
{1E7C6166-58B2-46B3-A9BA-18099BD83AF0}.Debug|x64.ActiveCfg = Debug|Any CPU
3581+
{1E7C6166-58B2-46B3-A9BA-18099BD83AF0}.Debug|x64.Build.0 = Debug|Any CPU
3582+
{1E7C6166-58B2-46B3-A9BA-18099BD83AF0}.Debug|x86.ActiveCfg = Debug|Any CPU
3583+
{1E7C6166-58B2-46B3-A9BA-18099BD83AF0}.Debug|x86.Build.0 = Debug|Any CPU
3584+
{1E7C6166-58B2-46B3-A9BA-18099BD83AF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
3585+
{1E7C6166-58B2-46B3-A9BA-18099BD83AF0}.Release|Any CPU.Build.0 = Release|Any CPU
3586+
{1E7C6166-58B2-46B3-A9BA-18099BD83AF0}.Release|x64.ActiveCfg = Release|Any CPU
3587+
{1E7C6166-58B2-46B3-A9BA-18099BD83AF0}.Release|x64.Build.0 = Release|Any CPU
3588+
{1E7C6166-58B2-46B3-A9BA-18099BD83AF0}.Release|x86.ActiveCfg = Release|Any CPU
3589+
{1E7C6166-58B2-46B3-A9BA-18099BD83AF0}.Release|x86.Build.0 = Release|Any CPU
35903590
EndGlobalSection
35913591
GlobalSection(SolutionProperties) = preSolution
35923592
HideSolutionNode = FALSE
@@ -3758,7 +3758,6 @@ Global
37583758
{7803ADF5-D9C5-4262-9031-58AF9E050542} = {20A4A2D1-D699-4D71-AA97-950154638576}
37593759
{FDC37D4C-0CA1-4D98-92B4-4DB5CADB1BD2} = {20A4A2D1-D699-4D71-AA97-950154638576}
37603760
{69321DDA-65DF-412F-BDDA-9306B8EE98D0} = {20A4A2D1-D699-4D71-AA97-950154638576}
3761-
{4DDAC13A-7521-4E9A-A1F8-276FD3FD51AC} = {20A4A2D1-D699-4D71-AA97-950154638576}
37623761
{4270B2E3-5CA2-4DB8-B3D9-D99F161A0016} = {20A4A2D1-D699-4D71-AA97-950154638576}
37633762
{674A6DFE-22C7-482B-88B0-D065678D4A82} = {20A4A2D1-D699-4D71-AA97-950154638576}
37643763
{88709BA6-3345-4ED5-A3C8-06CE98E163B9} = {20A4A2D1-D699-4D71-AA97-950154638576}
@@ -3874,6 +3873,7 @@ Global
38743873
{22DA5C34-2859-4599-97DA-9F9E3B7CEEA4} = {49BC383A-D7E6-4013-93C7-371479B984CC}
38753874
{AFF43F5B-46EC-4560-8E92-6D241C0D9F43} = {15FC3D1A-25D7-446B-87A7-B45BA3C2225F}
38763875
{EEFD27E0-F0F3-45EF-A2CB-D9C8135BC893} = {72E7FA64-5B1E-477D-BD30-63B7F206B3C4}
3876+
{1E7C6166-58B2-46B3-A9BA-18099BD83AF0} = {20A4A2D1-D699-4D71-AA97-950154638576}
38773877
EndGlobalSection
38783878
GlobalSection(ExtensibilityGlobals) = postSolution
38793879
SolutionGuid = {F5273D7F-3334-48DF-94E3-41AE6816CD4D}

‎examples/CSharp/OpenGL Tutorials/Tutorial 1.1 - Hello Window/Program.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ private static void Main(string[] args)
2525
//Run the window.
2626
window.Run();
2727

28+
// window.Run() is a BLOCKING method - this means that it will halt execution of any code in the current
29+
// method until the window has finished running. Therefore, this dispose method will not be called until you
30+
// close the window.
2831
window.Dispose();
2932
}
3033

0 commit comments

Comments
 (0)