Skip to content

Commit b0b3177

Browse files
PerkseyPerksey
committed
Commit before rewrite
1 parent 4445f62 commit b0b3177

File tree

7 files changed

+67
-64
lines changed

7 files changed

+67
-64
lines changed

‎examples/CSharp/OpenGL Demos/OpenGL VR Demo/Game.cs‎

Lines changed: 27 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,7 @@ public class Game : OpenGLXRGame
1818
private static BufferObject<float> Vbo;
1919
private static BufferObject<uint> Ebo;
2020
private static VertexArrayObject<float, uint> VaoCube;
21-
private static Shader LightingShader;
22-
private static Shader LampShader;
23-
private static Vector3 CubePosition = new(0.2f, 0.0f, 1.0f);
24-
private static Vector3 LampPosition = new(1.2f, 1.0f, 2.0f);
25-
21+
private static Shader CubesShader;
2622
private static Camera Camera;
2723
private static Vector2 LastOrientation;
2824

@@ -95,13 +91,10 @@ protected override void Load()
9591
VaoCube.VertexAttributePointer(0, 3, VertexAttribPointerType.Float, 6, 0);
9692
VaoCube.VertexAttributePointer(1, 3, VertexAttribPointerType.Float, 6, 3);
9793

98-
//The lighting shader will give our main cube it's colour multiplied by the light's intensity
99-
LightingShader = new(Gl, "shader.vert", "lighting.frag");
100-
//The Lamp shader uses a fragment shader that just colours it solid white so that we know it is the light source
101-
LampShader = new(Gl, "shader.vert", "shader.frag");
94+
CubesShader = new(Gl, "cubes.vert", "cubes.frag");
10295

10396
//Start a camera at position 3 on the Z axis, looking at position -1 on the Z axis
104-
Camera = new(Vector3.UnitZ * 6 * 6, Renderer);
97+
Camera = new(Vector3.One + Vector3.One, Renderer);
10598
}
10699

107100
protected override void Update(double delta)
@@ -116,47 +109,39 @@ protected override void Render(int eye, double delta)
116109
Gl.Clear((uint) (ClearBufferMask.ColorBufferBit | ClearBufferMask.DepthBufferBit));
117110

118111
VaoCube.Bind();
119-
LightingShader.Use();
112+
CubesShader.Use();
120113

121-
// Define the matrix for our cube
122-
var cubeMatrix = Matrix4x4.Identity;
123-
cubeMatrix *= Matrix4x4.CreateTranslation(CubePosition);
114+
CubesShader.SetUniform("uniformColor", Vector3.Zero);
115+
CubesShader.SetUniform("view", Matrix4x4.Transpose(Camera.GetViewMatrix(eye)));
116+
CubesShader.SetUniform("proj", Matrix4x4.Transpose(Camera.GetProjectionMatrix(eye)));
124117

125-
// Slightly rotate the cube to give it an angled face to look at
126-
cubeMatrix *= Matrix4x4.CreateRotationY(Scalar.DegreesToRadians(25f));
127-
128-
//LightingShader.SetUniform("uModel", Matrix4x4.CreateRotationY(MathHelper.DegreesToRadians(25f)));
129-
LightingShader.SetUniform("uModel", cubeMatrix);
130-
LightingShader.SetUniform("uView", Camera.GetViewMatrix(eye));
131-
LightingShader.SetUniform("uProjection", Camera.GetProjectionMatrix(eye));
132-
LightingShader.SetUniform("objectColor", new Vector3(1.0f, 0.5f, 0.31f));
133-
LightingShader.SetUniform("lightColor", Vector3.One);
134-
LightingShader.SetUniform("lightPos", LampPosition);
135-
LightingShader.SetUniform("viewPos", Camera.Position);
136-
137-
// We're drawing with just vertices and no indicies, and it takes 36 verticies to have a six-sided textured cube
138-
Gl.DrawArrays(PrimitiveType.Triangles, 0, 36);
139-
140-
LampShader.Use();
141-
142-
//The Lamp cube is going to be a scaled down version of the normal cubes verticies moved to a different screen location
143-
var lampMatrix = Matrix4x4.Identity;
144-
lampMatrix *= Matrix4x4.CreateScale(0.2f);
145-
lampMatrix *= Matrix4x4.CreateTranslation(LampPosition);
146-
147-
LampShader.SetUniform("uModel", lampMatrix);
148-
LampShader.SetUniform("uView", Camera.GetViewMatrix(eye));
149-
LampShader.SetUniform("uProjection", Camera.GetProjectionMatrix(eye));
150-
151-
Gl.DrawArrays(PrimitiveType.Triangles, 0, 36);
118+
const float rotations_per_sec = .25f;
119+
120+
float angle = ((long)(delta * 360f * rotations_per_sec)) % 360f;
121+
122+
float dist = 1.5f;
123+
float height = 0.5f;
124+
DrawRotatedCube(new(0, height, -dist), .33f, angle);
125+
DrawRotatedCube(new(0, height, dist), .33f, angle);
126+
DrawRotatedCube(new(dist, height, 0), .33f, angle);
127+
DrawRotatedCube(new(-dist, height, 0), .33f, angle);
128+
}
129+
130+
private void DrawRotatedCube(Vector3 position, float cube_size, float rotation)
131+
{
132+
var modelmatrix = Matrix4x4.CreateTranslation(position)
133+
* Matrix4x4.CreateScale(new Vector3(cube_size / 2f, cube_size / 2f, cube_size / 2f));
134+
modelmatrix *= Matrix4x4.CreateRotationY(Scalar.DegreesToRadians(rotation));
135+
CubesShader.SetUniform("model", Matrix4x4.Transpose(modelmatrix));
136+
Gl.DrawArrays(GLEnum.Triangles, 0, 36);
152137
}
153138

154139
protected override void Unload()
155140
{
156141
Vbo.Dispose();
157142
Ebo.Dispose();
158143
VaoCube.Dispose();
159-
LightingShader.Dispose();
144+
CubesShader.Dispose();
160145
}
161146
}
162147
}

‎examples/CSharp/OpenGL Demos/OpenGL VR Demo/MathHelper.cs‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎examples/CSharp/OpenGL Demos/OpenGL VR Demo/OpenGL VR Demo.csproj‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,16 @@
2020
<None Update="shader.frag">
2121
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2222
</None>
23-
<None Update="lighting.frag">
23+
<None Update="shader.vert">
2424
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2525
</None>
26-
<None Update="shader.vert">
26+
<None Update="cubes.frag">
27+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
28+
</None>
29+
<None Update="cubes.vert">
30+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
31+
</None>
32+
<None Update="lighting.frag">
2733
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2834
</None>
2935
</ItemGroup>

‎examples/CSharp/OpenGL Demos/OpenGL VR Demo/OpenXR/Renderer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public class Renderer : IDisposable
4040
public View[] ViewStates { get; private set; } = new View[2];
4141
public Matrix4x4 GetViewMatrix(int eye, Vector3 offset = default)
4242
{
43-
if (!Matrix4x4.Invert(RawViews[eye].ToView(), out var inverse))
43+
if (!Matrix4x4.Invert(RawViews[eye].ToView(offset), out var inverse))
4444
{
4545
throw new("Couldn't create inverse pose view matrix.");
4646
}

‎examples/CSharp/OpenGL Demos/OpenGL VR Demo/OpenXR/Utilities.cs‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ public static class Utilities
1515
public const float DefaultOffset = 0f;
1616

1717
public static Matrix4x4 ToView(this Posef pose, Vector3 offset = default)
18-
=> Matrix4x4.Transpose(Matrix4x4.Identity
18+
=> Matrix4x4.Identity
1919
* Matrix4x4.CreateTranslation(Unsafe.As<Vector3f, Vector3>(ref pose.Position) + offset)
20-
* Matrix4x4.CreateFromQuaternion(Unsafe.As<Quaternionf, Quaternion>(ref pose.Orientation)));
20+
* Matrix4x4.CreateFromQuaternion(Unsafe.As<Quaternionf, Quaternion>(ref pose.Orientation));
2121

2222
public static Matrix4x4
2323
ToProjection
@@ -37,6 +37,8 @@ public static Matrix4x4
3737
var tanAngleUp = MathF.Tan(fov.AngleUp);
3838

3939
var tanAngleWidth = tanAngleRight - tanAngleLeft;
40+
var angleWidth = fov.AngleRight - fov.AngleLeft;
41+
var angleHeight = !isGlSpace ? fov.AngleDown - fov.AngleUp : fov.AngleUp - fov.AngleDown;
4042

4143
// Set to tanAngleDown - tanAngleUp for a clip space with positive Y
4244
// down (Vulkan). Set to tanAngleUp - tanAngleDown for a clip space with
@@ -55,10 +57,10 @@ public static Matrix4x4
5557
result.M31 = (tanAngleRight + tanAngleLeft) / tanAngleWidth;
5658
result.M41 = 0;
5759

58-
result.M11 = 0;
59-
result.M21 = 2 / tanAngleHeight;
60-
result.M31 = (tanAngleUp + tanAngleDown) / tanAngleHeight;
61-
result.M41 = 0;
60+
result.M12 = 0;
61+
result.M22 = 2 / tanAngleHeight;
62+
result.M32 = (tanAngleUp + tanAngleDown) / tanAngleHeight;
63+
result.M42 = 0;
6264

6365
result.M13 = 0;
6466
result.M23 = 0;
@@ -94,7 +96,7 @@ public static Matrix4x4
9496
result.M44 = 0;
9597
}
9698

97-
return result;
99+
return Matrix4x4.Transpose(result);
98100
}
99101
}
100102
}

‎examples/CSharp/OpenGL Demos/OpenGL VR Demo/cubes.frag‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#version 330 core
2+
#extension GL_ARB_explicit_uniform_location : require
3+
layout(location = 0) out vec4 FragColor;
4+
layout(location = 1) uniform vec3 uniformColor;
5+
in vec2 vertexColor;
6+
void main() {
7+
FragColor = (uniformColor.x < 0.01 && uniformColor.y < 0.01 && uniformColor.z < 0.01)
8+
? vec4(vertexColor, 1.0, 1.0)
9+
: vec4(uniformColor, 1.0);
10+
}

‎examples/CSharp/OpenGL Demos/OpenGL VR Demo/cubes.vert‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#version 330 core
2+
#extension GL_ARB_explicit_uniform_location : require
3+
layout(location = 0) in vec3 aPos;
4+
layout(location = 2) uniform mat4 model;
5+
layout(location = 3) uniform mat4 view;
6+
layout(location = 4) uniform mat4 proj;
7+
layout(location = 5) in vec2 aColor;
8+
out vec2 vertexColor;
9+
void main() {
10+
gl_Position = proj * view * model * vec4(aPos.x, aPos.y, aPos.z, 1.0);
11+
vertexColor = aColor;
12+
}

0 commit comments

Comments
 (0)