Skip to content

Remove image mutate in OpenGL tutorials #675

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

Merged
merged 2 commits into from
Nov 6, 2021
Merged

Remove image mutate in OpenGL tutorials #675

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
20f9cb4
Stop mutating image in OpenGL tutorials and use inverted UV instead
TechPizzaDev Nov 6, 2021
3c34bbe
Removed unused files
TechPizzaDev Nov 6, 2021
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
9 changes: 5 additions & 4 deletions examples/CSharp/OpenGL Tutorials/Tutorial 1.4 - Textures/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,14 @@ class Program
private static Texture Texture;
private static Shader Shader;

// OpenGL has image origin in the bottom-left corner.
private static readonly float[] Vertices =
{
//X Y Z U V
0.5f, 0.5f, 0.0f, 1f, 1f,
0.5f, -0.5f, 0.0f, 1f, 0f,
-0.5f, -0.5f, 0.0f, 0f, 0f,
-0.5f, 0.5f, 0.5f, 0f, 1f
0.5f, 0.5f, 0.0f, 1f, 0f,
0.5f, -0.5f, 0.0f, 1f, 1f,
-0.5f, -0.5f, 0.0f, 0f, 1f,
-0.5f, 0.5f, 0.5f, 0f, 0f
};

private static readonly uint[] Indices =
Expand Down
4 changes: 1 addition & 3 deletions examples/CSharp/OpenGL Tutorials/Tutorial 1.4 - Textures/Texture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,8 @@ public unsafe Texture(GL gl, string path)
{
//Loading an image using imagesharp.
Image<Rgba32> img = (Image<Rgba32>) Image.Load(path);
//We need to flip our image as image sharps coordinates has origin (0, 0) in the top-left corner,
//whereas openGL has origin in the bottom-left corner.
img.Mutate(x => x.Flip(FlipMode.Vertical));

// OpenGL has image origin in the bottom-left corner.
fixed (void* data = &MemoryMarshal.GetReference(img.GetPixelRowSpan(0)))
{
//Loading the actual image.
Expand Down
8 changes: 4 additions & 4 deletions examples/CSharp/OpenGL Tutorials/Tutorial 1.5 - Transformations/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ class Program
private static readonly float[] Vertices =
{
//X Y Z U V
0.5f, 0.5f, 0.0f, 1f, 1f,
0.5f, -0.5f, 0.0f, 1f, 0f,
-0.5f, -0.5f, 0.0f, 0f, 0f,
-0.5f, 0.5f, 0.5f, 0f, 1f
0.5f, 0.5f, 0.0f, 1f, 0f,
0.5f, -0.5f, 0.0f, 1f, 1f,
-0.5f, -0.5f, 0.0f, 0f, 1f,
-0.5f, 0.5f, 0.5f, 0f, 0f
};

private static readonly uint[] Indices =
Expand Down
3 changes: 1 addition & 2 deletions examples/CSharp/OpenGL Tutorials/Tutorial 1.5 - Transformations/Texture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ public class Texture : IDisposable
public unsafe Texture(GL gl, string path)
{
Image<Rgba32> img = (Image<Rgba32>) Image.Load(path);
img.Mutate(x => x.Flip(FlipMode.Vertical));


fixed (void* data = &MemoryMarshal.GetReference(img.GetPixelRowSpan(0)))
{
Load(gl, data, (uint) img.Width, (uint) img.Height);
Expand Down
68 changes: 34 additions & 34 deletions examples/CSharp/OpenGL Tutorials/Tutorial 2.2 - Camera/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,47 +39,47 @@ class Program
private static readonly float[] Vertices =
{
//X Y Z U V
-0.5f, -0.5f, -0.5f, 0.0f, 0.0f,
0.5f, -0.5f, -0.5f, 1.0f, 0.0f,
0.5f, 0.5f, -0.5f, 1.0f, 1.0f,
0.5f, 0.5f, -0.5f, 1.0f, 1.0f,
-0.5f, 0.5f, -0.5f, 0.0f, 1.0f,
-0.5f, -0.5f, -0.5f, 0.0f, 0.0f,

-0.5f, -0.5f, 0.5f, 0.0f, 0.0f,
0.5f, -0.5f, 0.5f, 1.0f, 0.0f,
0.5f, 0.5f, 0.5f, 1.0f, 1.0f,
0.5f, 0.5f, 0.5f, 1.0f, 1.0f,
-0.5f, 0.5f, 0.5f, 0.0f, 1.0f,
-0.5f, -0.5f, 0.5f, 0.0f, 0.0f,

-0.5f, 0.5f, 0.5f, 1.0f, 0.0f,
-0.5f, 0.5f, -0.5f, 1.0f, 1.0f,
-0.5f, -0.5f, -0.5f, 0.0f, 1.0f,
-0.5f, -0.5f, -0.5f, 0.0f, 1.0f,
-0.5f, -0.5f, 0.5f, 0.0f, 0.0f,
-0.5f, 0.5f, 0.5f, 1.0f, 0.0f,

0.5f, 0.5f, 0.5f, 1.0f, 0.0f,
0.5f, 0.5f, -0.5f, 1.0f, 1.0f,
0.5f, -0.5f, -0.5f, 0.0f, 1.0f,
0.5f, -0.5f, -0.5f, 0.0f, 1.0f,
0.5f, -0.5f, 0.5f, 0.0f, 0.0f,
0.5f, 0.5f, 0.5f, 1.0f, 0.0f,

-0.5f, -0.5f, -0.5f, 0.0f, 1.0f,
0.5f, -0.5f, -0.5f, 1.0f, 1.0f,
0.5f, -0.5f, 0.5f, 1.0f, 0.0f,
0.5f, -0.5f, 0.5f, 1.0f, 0.0f,
-0.5f, -0.5f, 0.5f, 0.0f, 0.0f,
0.5f, 0.5f, -0.5f, 1.0f, 0.0f,
0.5f, 0.5f, -0.5f, 1.0f, 0.0f,
-0.5f, 0.5f, -0.5f, 0.0f, 0.0f,
-0.5f, -0.5f, -0.5f, 0.0f, 1.0f,

-0.5f, 0.5f, -0.5f, 0.0f, 1.0f,
0.5f, 0.5f, -0.5f, 1.0f, 1.0f,
-0.5f, -0.5f, 0.5f, 0.0f, 1.0f,
0.5f, -0.5f, 0.5f, 1.0f, 1.0f,
0.5f, 0.5f, 0.5f, 1.0f, 0.0f,
0.5f, 0.5f, 0.5f, 1.0f, 0.0f,
-0.5f, 0.5f, 0.5f, 0.0f, 0.0f,
-0.5f, 0.5f, -0.5f, 0.0f, 1.0f
-0.5f, -0.5f, 0.5f, 0.0f, 1.0f,

-0.5f, 0.5f, 0.5f, 1.0f, 1.0f,
-0.5f, 0.5f, -0.5f, 1.0f, 0.0f,
-0.5f, -0.5f, -0.5f, 0.0f, 0.0f,
-0.5f, -0.5f, -0.5f, 0.0f, 0.0f,
-0.5f, -0.5f, 0.5f, 0.0f, 1.0f,
-0.5f, 0.5f, 0.5f, 1.0f, 1.0f,

0.5f, 0.5f, 0.5f, 1.0f, 1.0f,
0.5f, 0.5f, -0.5f, 1.0f, 0.0f,
0.5f, -0.5f, -0.5f, 0.0f, 0.0f,
0.5f, -0.5f, -0.5f, 0.0f, 0.0f,
0.5f, -0.5f, 0.5f, 0.0f, 1.0f,
0.5f, 0.5f, 0.5f, 1.0f, 1.0f,

-0.5f, -0.5f, -0.5f, 0.0f, 0.0f,
0.5f, -0.5f, -0.5f, 1.0f, 0.0f,
0.5f, -0.5f, 0.5f, 1.0f, 1.0f,
0.5f, -0.5f, 0.5f, 1.0f, 1.0f,
-0.5f, -0.5f, 0.5f, 0.0f, 1.0f,
-0.5f, -0.5f, -0.5f, 0.0f, 0.0f,

-0.5f, 0.5f, -0.5f, 0.0f, 0.0f,
0.5f, 0.5f, -0.5f, 1.0f, 0.0f,
0.5f, 0.5f, 0.5f, 1.0f, 1.0f,
0.5f, 0.5f, 0.5f, 1.0f, 1.0f,
-0.5f, 0.5f, 0.5f, 0.0f, 1.0f,
-0.5f, 0.5f, -0.5f, 0.0f, 0.0f
};

private static readonly uint[] Indices =
Expand Down
3 changes: 1 addition & 2 deletions examples/CSharp/OpenGL Tutorials/Tutorial 2.2 - Camera/Texture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ public class Texture : IDisposable
public unsafe Texture(GL gl, string path)
{
Image<Rgba32> img = (Image<Rgba32>) Image.Load(path);
img.Mutate(x => x.Flip(FlipMode.Vertical));


fixed (void* data = &MemoryMarshal.GetReference(img.GetPixelRowSpan(0)))
{
Load(gl, data, (uint) img.Width, (uint) img.Height);
Expand Down
62 changes: 0 additions & 62 deletions examples/CSharp/OpenGL Tutorials/Tutorial 3.1 - Ambient Lighting/Texture.cs
View file
Open in desktop

This file was deleted.

62 changes: 0 additions & 62 deletions examples/CSharp/OpenGL Tutorials/Tutorial 3.2 - Diffuse Lighting/Texture.cs
View file
Open in desktop

This file was deleted.

62 changes: 0 additions & 62 deletions examples/CSharp/OpenGL Tutorials/Tutorial 3.3 - Specular Lighting/Texture.cs
View file
Open in desktop

This file was deleted.

62 changes: 0 additions & 62 deletions examples/CSharp/OpenGL Tutorials/Tutorial 3.4 - Materials/Texture.cs
View file
Open in desktop

This file was deleted.

Loading