From f0a72c18a9897eb5f1f646dbe368bb596462ceac Mon Sep 17 00:00:00 2001 From: derek <84210066+bruhderek@users.noreply.github.com> Date: Thu, 15 Aug 2024 21:13:40 -0700 Subject: [PATCH 1/4] make it compile --- src/mtlfontstash.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mtlfontstash.h b/src/mtlfontstash.h index 8e8b279..8d2c692 100644 --- a/src/mtlfontstash.h +++ b/src/mtlfontstash.h @@ -218,7 +218,7 @@ static void mtlfons__renderDraw(void* userPtr, const float* verts, const float* mtl->currentVertexBufferOffset = 0; } - MTLFONSvertex *vertexData = mtl->vertexBuffer.contents + mtl->currentVertexBufferOffset; + MTLFONSvertex *vertexData = (MTLFONSvertex *) mtl->vertexBuffer.contents + mtl->currentVertexBufferOffset; for (int i = 0; i < nverts; ++i) { memcpy(&vertexData[i].x, &verts[i * 2], sizeof(float) * 2); memcpy(&vertexData[i].tx, &tcoords[i * 2], sizeof(float) * 2); From 5257796215a2ae4d2668f3ac5ff12aa4158e1e19 Mon Sep 17 00:00:00 2001 From: derek <84210066+bruhderek@users.noreply.github.com> Date: Fri, 16 Aug 2024 10:03:33 -0700 Subject: [PATCH 2/4] Update mtlfontstash.h --- src/mtlfontstash.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mtlfontstash.h b/src/mtlfontstash.h index 8d2c692..3ef26c6 100644 --- a/src/mtlfontstash.h +++ b/src/mtlfontstash.h @@ -218,7 +218,7 @@ static void mtlfons__renderDraw(void* userPtr, const float* verts, const float* mtl->currentVertexBufferOffset = 0; } - MTLFONSvertex *vertexData = (MTLFONSvertex *) mtl->vertexBuffer.contents + mtl->currentVertexBufferOffset; + MTLFONSvertex *vertexData = (unsigned char *) mtl->vertexBuffer.contents + mtl->currentVertexBufferOffset; for (int i = 0; i < nverts; ++i) { memcpy(&vertexData[i].x, &verts[i * 2], sizeof(float) * 2); memcpy(&vertexData[i].tx, &tcoords[i * 2], sizeof(float) * 2); From c6086176c166724c3ec6682b62018927046f7e9e Mon Sep 17 00:00:00 2001 From: derek <84210066+bruhderek@users.noreply.github.com> Date: Fri, 16 Aug 2024 10:08:50 -0700 Subject: [PATCH 3/4] Update mtlfontstash.h --- src/mtlfontstash.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mtlfontstash.h b/src/mtlfontstash.h index 3ef26c6..40772a6 100644 --- a/src/mtlfontstash.h +++ b/src/mtlfontstash.h @@ -218,7 +218,7 @@ static void mtlfons__renderDraw(void* userPtr, const float* verts, const float* mtl->currentVertexBufferOffset = 0; } - MTLFONSvertex *vertexData = (unsigned char *) mtl->vertexBuffer.contents + mtl->currentVertexBufferOffset; + MTLFONSvertex *vertexData = (MTLFonsvertex *) ((unsigned char *) mtl->vertexBuffer.contents + mtl->currentVertexBufferOffset); for (int i = 0; i < nverts; ++i) { memcpy(&vertexData[i].x, &verts[i * 2], sizeof(float) * 2); memcpy(&vertexData[i].tx, &tcoords[i * 2], sizeof(float) * 2); From 7318c99c12a1d306d5408411b49af61e6e1ea400 Mon Sep 17 00:00:00 2001 From: derek <84210066+bruhderek@users.noreply.github.com> Date: Fri, 16 Aug 2024 10:09:36 -0700 Subject: [PATCH 4/4] Update mtlfontstash.h --- src/mtlfontstash.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mtlfontstash.h b/src/mtlfontstash.h index 40772a6..1ec27fc 100644 --- a/src/mtlfontstash.h +++ b/src/mtlfontstash.h @@ -218,7 +218,7 @@ static void mtlfons__renderDraw(void* userPtr, const float* verts, const float* mtl->currentVertexBufferOffset = 0; } - MTLFONSvertex *vertexData = (MTLFonsvertex *) ((unsigned char *) mtl->vertexBuffer.contents + mtl->currentVertexBufferOffset); + MTLFONSvertex *vertexData = (MTLFONSvertex *) ((unsigned char *) mtl->vertexBuffer.contents + mtl->currentVertexBufferOffset); for (int i = 0; i < nverts; ++i) { memcpy(&vertexData[i].x, &verts[i * 2], sizeof(float) * 2); memcpy(&vertexData[i].tx, &tcoords[i * 2], sizeof(float) * 2);