From 95fd0d1a5d9045b4d4473112159141d4be1ea493 Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@nil.im>
Date: Fri, 13 Jan 2023 14:43:43 +0000
Subject: [PATCH] Change O3DVertex struct

FossilOrigin-Name: 2bf3eabe2875f0326928d79864923dab8a34d4d0a706d21bcf9370cb456fdd0d
---
 src/O3DGlideRenderer.m   | 14 ++++++++------
 src/O3DRenderer.h        |  8 ++++++--
 tests/TestsAppDelegate.m | 12 ++++++------
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/O3DGlideRenderer.m b/src/O3DGlideRenderer.m
index bdb8c95..f3a2e34 100644
--- a/src/O3DGlideRenderer.m
+++ b/src/O3DGlideRenderer.m
@@ -212,12 +212,14 @@ grGlideShutdownCdecl(void)
 	GrVertex *glideVertices = OFAllocZeroedMemory(count, sizeof(GrVertex));
 	@try {
 		for (size_t i = 0; i < count; i++) {
-			glideVertices[i].x = (vertices[i].x + 1) * halfWidth;
-			glideVertices[i].y = (vertices[i].y + 1) * halfHeight;
-			glideVertices[i].r = vertices[i].r * 255;
-			glideVertices[i].g = vertices[i].g * 255;
-			glideVertices[i].b = vertices[i].b * 255;
-			glideVertices[i].a = vertices[i].a * 255;
+			glideVertices[i].x =
+			    (vertices[i].position.x + 1) * halfWidth;
+			glideVertices[i].y =
+			    (vertices[i].position.y + 1) * halfHeight;
+			glideVertices[i].r = vertices[i].color.r * 255;
+			glideVertices[i].g = vertices[i].color.g * 255;
+			glideVertices[i].b = vertices[i].color.b * 255;
+			glideVertices[i].a = vertices[i].color.a * 255;
 		}
 
 		grDrawPolygonVertexList((int)count, glideVertices);
diff --git a/src/O3DRenderer.h b/src/O3DRenderer.h
index 20d3531..99ea0ac 100644
--- a/src/O3DRenderer.h
+++ b/src/O3DRenderer.h
@@ -18,8 +18,12 @@
 OF_ASSUME_NONNULL_BEGIN
 
 typedef struct OF_BOXABLE {
-	float x, y;
-	float r, g, b, a;
+	struct {
+		float x, y;
+	} position;
+	struct {
+		float r, g, b, a;
+	} color;
 } O3DVertex;
 
 @protocol O3DRenderer <OFObject>
diff --git a/tests/TestsAppDelegate.m b/tests/TestsAppDelegate.m
index 4406d78..b42c770 100644
--- a/tests/TestsAppDelegate.m
+++ b/tests/TestsAppDelegate.m
@@ -32,14 +32,14 @@ OF_APPLICATION_DELEGATE(TestsAppDelegate)
 		       options: nil] autorelease];
 
 	const O3DVertex outerTriangle[] = {
-		{ -1, -1, 1, 0, 0 },
-		{ 0, 1, 0, 1, 0 },
-		{ 1, -1, 0, 0, 1 }
+		{{ -1, -1 }, { 1, 0, 0 }},
+		{{ 0, 1 }, { 0, 1, 0 }},
+		{{ 1, -1 }, { 0, 0, 1 }}
 	};
 	const O3DVertex innerTriangle[] = {
-		{ -0.5, 0.5, 1, 1, 0 },
-		{ 0, -0.5, 0, 1, 1 },
-		{ 0.5, 0.5, 1, 0, 1 }
+		{{ -0.5, 0.5 }, { 1, 1, 0 }},
+		{{ 0, -0.5 }, { 0, 1, 1 }},
+		{{ 0.5, 0.5 }, { 1, 0, 1 }}
 	};
 
 	OFDate *startDate = [OFDate date];