Skip to content

Change: Replace font subsystem #1162

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

Open
leezer3 wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Change: Replace font subsystem #1162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c6d64df
First working prototype of FontStash
leezer3 Jun 12, 2025
d9e3fdd
Implicit color conversion operator
leezer3 Jun 30, 2025
b6d0dd0
Use API Vector2f
leezer3 Jul 2, 2025
c237f35
Rename Matrix4 file
leezer3 Jul 2, 2025
f99291b
Double precision vectors
leezer3 Jul 2, 2025
78699f5
Fix some issues, remove some debugging stuff
leezer3 Jul 3, 2025
d4d6b08
Remove original font system
leezer3 Jul 4, 2025
89668e6
Remove GL1.2 renderer
leezer3 Jul 4, 2025
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
49 changes: 14 additions & 35 deletions assets/Shaders/text.vert
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,20 @@
#version 150 core

uniform mat4 uCurrentProjectionMatrix;
uniform mat4 uCurrentModelViewMatrix;
uniform vec2 uPoint;
uniform vec2 uSize;
uniform vec4 uAtlasLocation;
out vec2 textureCoord;
vec4 viewPos = vec4(0,0,0,0);
// Attributes
attribute vec3 a_position;
attribute vec4 a_color;
attribute vec2 a_texCoords0;

// Uniforms
uniform mat4 MatrixTransform;

// Varyings
varying vec4 v_color;
varying vec2 v_texCoords;

void main()
{
switch(gl_VertexID)
{
case 0:
viewPos = uCurrentModelViewMatrix * vec4(vec3(uPoint.x, uPoint.y, 0), 1.0);
textureCoord = vec2(uAtlasLocation.x, uAtlasLocation.y);
break;
case 1:
viewPos = uCurrentModelViewMatrix * vec4(vec3(uPoint.x + uSize.x, uPoint.y, 0), 1.0);
textureCoord = vec2(uAtlasLocation.x + uAtlasLocation.z, uAtlasLocation.y);
break;
case 2:
viewPos = uCurrentModelViewMatrix * vec4(vec3(uPoint.x + uSize.x, uPoint.y + uSize.y, 0), 1.0);
textureCoord = vec2(uAtlasLocation.x + uAtlasLocation.z, uAtlasLocation.y + uAtlasLocation.w);
break;
case 3:
viewPos = uCurrentModelViewMatrix * vec4(vec3(uPoint.x, uPoint.y, 0), 1.0);
textureCoord = vec2(uAtlasLocation.x, uAtlasLocation.y);
break;
case 4:
viewPos = uCurrentModelViewMatrix * vec4(vec3(uPoint.x, uPoint.y + uSize.y, 0), 1.0);
textureCoord = vec2(uAtlasLocation.x, uAtlasLocation.y + uAtlasLocation.w);
break;
case 5:
viewPos = uCurrentModelViewMatrix * vec4(vec3(uPoint.x + uSize.x, uPoint.y + uSize.y, 0), 1.0);
textureCoord = vec2(uAtlasLocation.x + uAtlasLocation.z, uAtlasLocation.y + uAtlasLocation.w);
break;
}
gl_Position = uCurrentProjectionMatrix * viewPos;
v_color = a_color;
v_texCoords = a_texCoords0;
gl_Position = MatrixTransform * vec4(a_position, 1.0);
}
163 changes: 7 additions & 156 deletions source/LibRender2/Backgrounds/Background.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using System;
using OpenBveApi.Math;
using OpenBveApi.Objects;
using OpenBveApi.Routes;
Expand Down Expand Up @@ -102,14 +101,7 @@ private void RenderStaticBackground(StaticBackground data, float scale)
/// <param name="scale">The scale</param>
private void RenderStaticBackground(StaticBackground data, float alpha, float scale)
{
if (renderer.AvailableNewRenderer)
{
RenderStaticBackgroundRetained(data, alpha, scale);
}
else
{
RenderStaticBackgroundImmediate(data, alpha, scale);
}
RenderStaticBackgroundRetained(data, alpha, scale);
}

/// <summary>Renders a static frustrum based background</summary>
Expand Down Expand Up @@ -177,153 +169,19 @@ private void RenderStaticBackgroundRetained(StaticBackground data, float alpha,
}
}

/// <summary>Renders a static frustrum based background</summary>
/// <param name="data">The background to render</param>
/// <param name="alpha">The alpha level</param>
/// <param name="scale">The scale</param>
private void RenderStaticBackgroundImmediate(StaticBackground data, float alpha, float scale)
{
Texture t = data.Texture;
if (data.Texture != null && renderer.currentHost.LoadTexture(ref t, OpenGlTextureWrapMode.RepeatClamp))
{
GL.MatrixMode(MatrixMode.Projection);
GL.PushMatrix();
GL.LoadIdentity();
OpenTK.Matrix4d perspective = OpenTK.Matrix4d.Perspective(renderer.Camera.VerticalViewingAngle, -renderer.Screen.AspectRatio, 0.2, 1000.0);
GL.MultMatrix(ref perspective);
double dx = renderer.Camera.AbsoluteDirection.X;
double dy = renderer.Camera.AbsoluteDirection.Y;
double dz = renderer.Camera.AbsoluteDirection.Z;
double ux = renderer.Camera.AbsoluteUp.X;
double uy = renderer.Camera.AbsoluteUp.Y;
double uz = renderer.Camera.AbsoluteUp.Z;
OpenTK.Matrix4d lookat = OpenTK.Matrix4d.LookAt(0.0, 0.0, 0.0, dx, dy, dz, ux, uy, uz);
GL.MatrixMode(MatrixMode.Modelview);
GL.PushMatrix();
GL.LoadMatrix(ref lookat);
GL.Disable(EnableCap.Lighting);
GL.Enable(EnableCap.Texture2D);
if (alpha == 1.0f)
{
GL.Disable(EnableCap.Blend);
}
else
{
GL.Enable(EnableCap.Blend);
renderer.SetAlphaFunc(AlphaFunction.Greater, 0.0f);
}
GL.BindTexture(TextureTarget.Texture2D, t.OpenGlTextures[(int)OpenGlTextureWrapMode.RepeatClamp].Name);
renderer.LastBoundTexture = t.OpenGlTextures[(int)OpenGlTextureWrapMode.RepeatClamp];
GL.Color4(1.0f, 1.0f, 1.0f, alpha);
if (renderer.OptionFog)
{
GL.Enable(EnableCap.Fog);
}
if (data.DisplayList > 0)
{
GL.CallList(data.DisplayList);
GL.Disable(EnableCap.Texture2D);
GL.Enable(EnableCap.Blend);
GL.PopMatrix();
GL.MatrixMode(MatrixMode.Projection);
GL.PopMatrix();
return;
}

data.DisplayList = GL.GenLists(1);
GL.NewList(data.DisplayList, ListMode.Compile);
float y0, y1;
if (data.KeepAspectRatio)
{
double hh = Math.PI * data.BackgroundImageDistance * data.Texture.Height / (data.Texture.Width * data.Repetition);
y0 = (float)(-0.5 * hh);
y1 = (float)(1.5 * hh);
}
else
{
y0 = (float)(-0.125 * data.BackgroundImageDistance);
y1 = (float)(0.375 * data.BackgroundImageDistance);
}
const int n = 32;
Vector3[] bottom = new Vector3[n];
Vector3[] top = new Vector3[n];
double angleValue = 2.61799387799149 - 3.14159265358979 / n;
const double angleIncrement = 6.28318530717958 / n;
/*
* To ensure that the whole background cylinder is rendered inside the viewing frustum,
* the background is rendered before the scene with z-buffer writes disabled. Then,
* the actual distance from the camera is irrelevant as long as it is inside the frustum.
* */
for (int i = 0; i < n; i++)
{
float x = (float)(data.BackgroundImageDistance * Math.Cos(angleValue));
float z = (float)(data.BackgroundImageDistance * Math.Sin(angleValue));
bottom[i] = new Vector3(scale * x, scale * y0, scale * z);
top[i] = new Vector3(scale * x, scale * y1, scale * z);
angleValue += angleIncrement;
}
float textureStart = 0.5f * (float)data.Repetition / n;
float textureIncrement = -(float)data.Repetition / n;
double textureX = textureStart;
for (int i = 0; i < n; i++)
{
int j = (i + 1) % n;
// side wall
GL.Begin(PrimitiveType.Quads);
GL.TexCoord2(textureX, 0.005f);
GL.Vertex3(top[i].X, top[i].Y, top[i].Z);
GL.TexCoord2(textureX, 0.995f);
GL.Vertex3(bottom[i].X, bottom[i].Y, bottom[i].Z);
GL.TexCoord2(textureX + textureIncrement, 0.995f);
GL.Vertex3(bottom[j].X, bottom[j].Y, bottom[j].Z);
GL.TexCoord2(textureX + textureIncrement, 0.005f);
GL.Vertex3(top[j].X, top[j].Y, top[j].Z);
GL.End();
// top cap
GL.Begin(PrimitiveType.Triangles);
GL.TexCoord2(textureX, 0.005f);
GL.Vertex3(top[i].X, top[i].Y, top[i].Z);
GL.TexCoord2(textureX + textureIncrement, 0.005f);
GL.Vertex3(top[j].X, top[j].Y, top[j].Z);
GL.TexCoord2(textureX + 0.5 * textureIncrement, 0.1f);
GL.Vertex3(0.0f, top[i].Y, 0.0f);
// bottom cap
GL.TexCoord2(textureX + 0.5 * textureIncrement, 0.9f);
GL.Vertex3(0.0f, bottom[i].Y, 0.0f);
GL.TexCoord2(textureX + textureIncrement, 0.995f);
GL.Vertex3(bottom[j].X, bottom[j].Y, bottom[j].Z);
GL.TexCoord2(textureX, 0.995f);
GL.Vertex3(bottom[i].X, bottom[i].Y, bottom[i].Z);
GL.End();
// finish
textureX += textureIncrement;
}
GL.EndList();
GL.CallList(data.DisplayList);
GL.Disable(EnableCap.Texture2D);
GL.Enable(EnableCap.Blend);
GL.PopMatrix();
GL.MatrixMode(MatrixMode.Projection);
GL.PopMatrix();
}
}

/// <summary>Renders an object based background</summary>
/// <param name="data">The background object</param>
private void RenderBackgroundObject(BackgroundObject data)
{
GL.Enable(EnableCap.Blend);
// alpha test
renderer.SetAlphaFunc(AlphaFunction.Greater, 0.0f);
if (renderer.AvailableNewRenderer)
{
renderer.DefaultShader.Activate();
renderer.DefaultShader.SetCurrentProjectionMatrix(renderer.CurrentProjectionMatrix);
renderer.DefaultShader.Activate();
renderer.DefaultShader.SetCurrentProjectionMatrix(renderer.CurrentProjectionMatrix);

if (data.Object.Mesh.VAO == null)
{
VAOExtensions.CreateVAO(data.Object.Mesh, false, renderer.DefaultShader.VertexLayout, renderer);
}
if (data.Object.Mesh.VAO == null)
{
VAOExtensions.CreateVAO(data.Object.Mesh, false, renderer.DefaultShader.VertexLayout, renderer);
}

foreach (MeshFace face in data.Object.Mesh.Faces)
Expand Down Expand Up @@ -351,14 +209,7 @@ private void RenderBackgroundObject(BackgroundObject data)
}
}
GL.Enable(EnableCap.DepthClamp);
if (renderer.AvailableNewRenderer)
{
renderer.RenderFace(renderer.DefaultShader, data.ObjectState, face, Matrix4D.NoTransformation, Matrix4D.Scale(1.0) * renderer.CurrentViewMatrix);
}
else
{
renderer.RenderFaceImmediateMode(data.ObjectState, face, Matrix4D.NoTransformation, Matrix4D.Scale(1.0) * renderer.CurrentViewMatrix);
}
renderer.RenderFace(renderer.DefaultShader, data.ObjectState, face, Matrix4D.NoTransformation, Matrix4D.Scale(1.0) * renderer.CurrentViewMatrix);
GL.Disable(EnableCap.DepthClamp);
}
}
Expand Down
Loading