Skip to content

Commit

Permalink
Update ModernOpenGLDraw.cs
Browse files Browse the repository at this point in the history 
(cherry picked from commit 6fb44cc)
  • Loading branch information
@Sarofc @ikpil
Sarofc authored and ikpil committed Jul 26, 2024
1 parent 7ffda46 commit ab04256
Show file tree
Hide file tree
Showing 3 changed files with 79 additions and 83 deletions.
20 changes: 10 additions & 10 deletions src/DotRecast.Recast.Demo/Draw/ArrayBuffer.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using DotRecast.Core;

namespace DotRecast.Recast.Demo.Draw;
Expand All @@ -9,19 +9,19 @@ public class ArrayBuffer<T>
private T[] _items;
public int Count => _size;

public ArrayBuffer()
public ArrayBuffer() : this(512) { }

public ArrayBuffer(int capacity)
{
if (capacity <= 0)
throw new ArgumentOutOfRangeException();

_size = 0;
_items = Array.Empty<T>();
_items = new T[capacity];
}

public void Add(T item)
{
if (0 >= _items.Length)
{
_items = new T[256];
}

if (_items.Length <= _size)
{
var temp = new T[(int)(_size * 1.5)];
Expand All @@ -37,8 +37,8 @@ public void Clear()
_size = 0;
}

public T[] AsArray()
public Span<T> AsArray()
{
return _items;
return _items.AsSpan(0, _size);
}
}
1 change: 1 addition & 0 deletions src/DotRecast.Recast.Demo/Draw/IOpenGLDraw.cs
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System.Numerics;
using DotRecast.Core.Numerics;

namespace DotRecast.Recast.Demo.Draw;
Expand Down
141 changes: 68 additions & 73 deletions src/DotRecast.Recast.Demo/Draw/ModernOpenGLDraw.cs
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
using System;
using System.IO;
using Silk.NET.OpenGL;
using DotRecast.Core.Numerics;

namespace DotRecast.Recast.Demo.Draw;

// TODO use a lot of Memory, 2GB+

public class ModernOpenGLDraw : IOpenGLDraw
{
private GL _gl;
Expand All @@ -19,8 +20,8 @@ public class ModernOpenGLDraw : IOpenGLDraw
private float fogEnd;
private bool fogEnabled;
private int uniformViewMatrix;
private readonly ArrayBuffer<OpenGLVertex> vertices = new();
private readonly ArrayBuffer<int> elements = new();
private readonly ArrayBuffer<OpenGLVertex> vertices = new(512);
private readonly ArrayBuffer<int> elements = new(512);
private GLCheckerTexture _texture;
private readonly float[] _viewMatrix = new float[16];
private readonly float[] _projectionMatrix = new float[16];
Expand All @@ -36,36 +37,42 @@ public ModernOpenGLDraw(GL gl)

public unsafe void Init()
{
string SHADER_VERSION = "#version 400\n";
string vertex_shader = SHADER_VERSION + "uniform mat4 ProjMtx;\n" //
+ "uniform mat4 ViewMtx;\n" //
+ "in vec3 Position;\n" //
+ "in vec2 TexCoord;\n" //
+ "in vec4 Color;\n" //
+ "out vec2 Frag_UV;\n" //
+ "out vec4 Frag_Color;\n" //
+ "out float Frag_Depth;\n" //
+ "void main() {\n" //
+ " Frag_UV = TexCoord;\n" //
+ " Frag_Color = Color;\n" //
+ " vec4 VSPosition = ViewMtx * vec4(Position, 1);\n" //
+ " Frag_Depth = -VSPosition.z;\n" //
+ " gl_Position = ProjMtx * VSPosition;\n" //
+ "}\n";
string fragment_shader = SHADER_VERSION + "precision mediump float;\n" //
+ "uniform sampler2D Texture;\n" //
+ "uniform float UseTexture;\n" //
+ "uniform float EnableFog;\n" //
+ "uniform float FogStart;\n" //
+ "uniform float FogEnd;\n" //
+ "const vec4 FogColor = vec4(0.3f, 0.3f, 0.32f, 1.0f);\n" //
+ "in vec2 Frag_UV;\n" //
+ "in vec4 Frag_Color;\n" //
+ "in float Frag_Depth;\n" //
+ "out vec4 Out_Color;\n" //
+ "void main(){\n" //
+ " Out_Color = mix(FogColor, Frag_Color * mix(vec4(1), texture(Texture, Frag_UV.st), UseTexture), 1.0 - EnableFog * clamp( (Frag_Depth - FogStart) / (FogEnd - FogStart), 0.0, 1.0) );\n" //
+ "}\n";
const string SHADER_VERSION = "#version 400\n";
const string vertex_shader = $@"
{SHADER_VERSION}
uniform mat4 ProjMtx;
uniform mat4 ViewMtx;
in vec3 Position;
in vec2 TexCoord;
in vec4 Color;
out vec2 Frag_UV;
out vec4 Frag_Color;
out float Frag_Depth;
void main() {{
Frag_UV = TexCoord;
Frag_Color = Color;
vec4 VSPosition = ViewMtx * vec4(Position, 1);
Frag_Depth = -VSPosition.z;
gl_Position = ProjMtx * VSPosition;
}}
";
const string fragment_shader = $@"
{SHADER_VERSION}
precision mediump float;
uniform sampler2D Texture;
uniform float UseTexture;
uniform float EnableFog;
uniform float FogStart;
uniform float FogEnd;
const vec4 FogColor = vec4(0.3f, 0.3f, 0.32f, 1.0f);
in vec2 Frag_UV;
in vec4 Frag_Color;
in float Frag_Depth;
out vec4 Out_Color;
void main(){{
Out_Color = mix(FogColor, Frag_Color * mix(vec4(1), texture(Texture, Frag_UV.st), UseTexture), 1.0 - EnableFog * clamp( (Frag_Depth - FogStart) / (FogEnd - FogStart), 0.0, 1.0) );
}}
";

program = _gl.CreateProgram();
uint vert_shdr = _gl.CreateShader(GLEnum.VertexShader);
Expand Down Expand Up @@ -150,6 +157,10 @@ public unsafe void Init()
_gl.BindVertexArray(0);
_gl.BindBuffer(GLEnum.ArrayBuffer, 0);
_gl.BindBuffer(GLEnum.ElementArrayBuffer, 0);

//int* range = stackalloc int[2];
//_gl.GetInteger(GetPName.LineWidthRange, range);
//Console.WriteLine($"\nLineWidthRange: {range[0]} {range[1]}");
}

public void Clear()
Expand Down Expand Up @@ -191,53 +202,30 @@ public unsafe void End()
// GlBufferData(GL_ARRAY_BUFFER, MAX_VERTEX_BUFFER, GL_STREAM_DRAW);
// GlBufferData(GL_ELEMENT_ARRAY_BUFFER, MAX_ELEMENT_BUFFER, GL_STREAM_DRAW);

uint vboSize = (uint)vertices.Count * 24;
uint eboSize = currentPrim == DebugDrawPrimitives.QUADS ? (uint)vertices.Count * 6 : (uint)vertices.Count * 4;

_gl.BufferData(GLEnum.ArrayBuffer, vboSize, null, GLEnum.StreamDraw);
_gl.BufferData(GLEnum.ElementArrayBuffer, eboSize, null, GLEnum.StreamDraw);
// load draw vertices & elements directly into vertex + element buffer
_gl.BufferData<OpenGLVertex>(GLEnum.ArrayBuffer, vertices.AsArray(), GLEnum.DynamicDraw);

if (currentPrim == DebugDrawPrimitives.QUADS)
{
byte* pVerts = (byte*)_gl.MapBuffer(GLEnum.ArrayBuffer, GLEnum.WriteOnly);
byte* pElems = (byte*)_gl.MapBuffer(GLEnum.ElementArrayBuffer, GLEnum.WriteOnly);

//vertices.ForEach(v => v.Store(verts));
fixed (void* v = vertices.AsArray())
for (int i = 0; i < vertices.Count; i += 4)
{
System.Buffer.MemoryCopy(v, pVerts, vboSize, vboSize);
elements.Add(i);
elements.Add(i + 1);
elements.Add(i + 2);
elements.Add(i);
elements.Add(i + 2);
elements.Add(i + 3);
}

if (currentPrim == DebugDrawPrimitives.QUADS)
{
using var unmanagedElems = new UnmanagedMemoryStream(pElems, eboSize, eboSize, FileAccess.Write);
using var bw = new BinaryWriter(unmanagedElems);
for (int i = 0; i < vertices.Count; i += 4)
{
bw.Write(i);
bw.Write(i + 1);
bw.Write(i + 2);
bw.Write(i);
bw.Write(i + 2);
bw.Write(i + 3);
}
}
else
}
else
{
for (int i = elements.Count; i < vertices.Count; i++)
{
for (int i = elements.Count; i < vertices.Count; i++)
{
elements.Add(i);
}

fixed (void* e = elements.AsArray())
{
System.Buffer.MemoryCopy(e, pElems, eboSize, eboSize);
}
elements.Add(i);
}

_gl.UnmapBuffer(GLEnum.ElementArrayBuffer);
_gl.UnmapBuffer(GLEnum.ArrayBuffer);
}

_gl.BufferData<int>(GLEnum.ElementArrayBuffer, elements.AsArray(), GLEnum.DynamicDraw);

if (_texture != null)
{
_texture.Bind();
Expand Down Expand Up @@ -271,15 +259,22 @@ public unsafe void End()
_gl.BindBuffer(GLEnum.ArrayBuffer, 0);
_gl.BindBuffer(GLEnum.ElementArrayBuffer, 0);
vertices.Clear();
elements.Clear();
_gl.LineWidth(1.0f);
_gl.PointSize(1.0f);
}


public void Vertex(float x, float y, float z, int color)
{
vertices.Add(new OpenGLVertex(x, y, z, color));
}

public unsafe void Vertex(float* pos, int color)
{
vertices.Add(new OpenGLVertex(pos[0], pos[1], pos[2], color));
}

public void Vertex(float[] pos, int color)
{
vertices.Add(new OpenGLVertex(pos, color));
Expand Down

0 comments on commit ab04256

Please sign in to comment.