From 351f179bbaaf3f3afc69e6071e03b4f4f1e1db30 Mon Sep 17 00:00:00 2001
From: cinnaboot <cinnaboot@protonmail.com>
Date: Tue, 25 Jan 2022 12:05:03 -0500
Subject: [PATCH] rename instances of GLmesh to GLMesh

---
 src/entity.cpp    |  4 ++--
 src/entity.h      |  2 +-
 src/shader.cpp    | 20 ++++++++++----------
 src/shader.h      |  7 +++----
 src/tangerine.cpp |  2 +-
 5 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/entity.cpp b/src/entity.cpp
index 2afba2c..f4fe8f6 100644
--- a/src/entity.cpp
+++ b/src/entity.cpp
@@ -15,7 +15,7 @@ initEntity(Entity* e,
 	const char* name)
 {
 	e->num_meshes = mdl->num_meshes;
-	e->meshes = ARENA_ALLOC(arena, GLmesh, e->num_meshes);
+	e->meshes = ARENA_ALLOC(arena, GLMesh, e->num_meshes);
 	e->model_xform = ARENA_ALLOC(arena, glm::mat4, 1);
 	*e->model_xform = glm::mat4(1.f);
 	e->name = arenaCopyCStr(arena, name);
@@ -25,7 +25,7 @@ initEntity(Entity* e,
 		return false;
 
 	for (u32 i = 0; i< e->num_meshes; i++) {
-		GLmesh* glm = &e->meshes[i];
+		GLMesh* glm = &e->meshes[i];
 		*glm = loadGLMesh(mdl->meshes[i],
 					GL_TRIANGLES,
 					e->diffuse_texture->id,
diff --git a/src/entity.h b/src/entity.h
index 721562b..b85a78f 100644
--- a/src/entity.h
+++ b/src/entity.h
@@ -10,7 +10,7 @@
 struct Entity
 {
 	u32 num_meshes;
-	GLmesh* meshes;
+	GLMesh* meshes;
 	GLTexture* diffuse_texture;	// NOTE: pointer into gl_ctx->textures array
 	glm::mat4* model_xform;
 	char* name;
diff --git a/src/shader.cpp b/src/shader.cpp
index 10c5207..e416dce 100644
--- a/src/shader.cpp
+++ b/src/shader.cpp
@@ -166,7 +166,7 @@ getGLTexture(GLContext* gl_ctx, Texture* diffuse_img)
 }
 
 void
-renderVAO(GLmesh* glmesh,
+renderVAO(GLMesh* glmesh,
 	glm::mat4* node_xform,
 	ShaderProgram* shader,
 	GLuint tex_id)
@@ -228,10 +228,10 @@ getVertexAttribByName(ShaderProgram* shader, const char* name)
 	return nullptr;
 }
 
-GLmesh
-initGLmesh(const Mesh& m, u32 num_mappings, GLenum draw_mode)
+GLMesh
+initGLMesh(const Mesh& m, u32 num_mappings, GLenum draw_mode)
 {
-	GLmesh glm = {0};
+	GLMesh glm = {0};
 	glm.num_indices = m.num_indices;
 	glm.draw_mode = draw_mode;
 	glm.usage = GL_STATIC_DRAW; // TODO: logic for updating dynamic meshes
@@ -254,9 +254,9 @@ initGLAttribBuffer(GLBuffer* buf, GLenum target, GLVertexAttrib* attrib)
 	buf->name = utilAllocateCStr(attrib->name);
 }
 
-// FIXME: might as well pass in pointer to GLmesh, since that's how we're
-// 	going to use this, can void copying GLmesh twice that way
-GLmesh
+// FIXME: might as well pass in pointer to GLMesh, since that's how we're
+// 	going to use this, can void copying GLMesh twice that way
+GLMesh
 loadGLMesh(const Mesh& m,
 	GLenum draw_mode,
 	GLuint diffuse_texture_id,
@@ -265,7 +265,7 @@ loadGLMesh(const Mesh& m,
 {
 	// NOTE: need to use freeGLMesh() when freeing because we're not storing
 	// 	the GLBuffers on a memory arean (yet)
-	GLmesh glm = initGLmesh(m, num_mappings, draw_mode);
+	GLMesh glm = initGLMesh(m, num_mappings, draw_mode);
 	glm.tex_id = diffuse_texture_id;
 	glGenVertexArrays(1, &glm.vao_id);
 	glBindVertexArray(glm.vao_id);
@@ -308,7 +308,7 @@ loadGLMesh(const Mesh& m,
 }
 
 void
-freeGLMesh(GLmesh* glm)
+freeGLMesh(GLMesh* glm)
 {
 	if (glm) {
 		for (u32 i = 0; i < glm->num_vertex_attrib_buffers; i++)
@@ -316,7 +316,7 @@ freeGLMesh(GLmesh* glm)
 
 		utilSafeFree(glm->vertex_attrib_buffers);
 		utilSafeFree(glm->element_buf);
-		// NOTE: don't free the GLmesh because it is part of a memory arena
+		// NOTE: don't free the GLMesh because it is part of a memory arena
 		//utilSafeFree(glm);
 	}
 }
diff --git a/src/shader.h b/src/shader.h
index c94568e..18c9dd1 100644
--- a/src/shader.h
+++ b/src/shader.h
@@ -125,8 +125,7 @@ struct GLContext
 	GLTexture* textures;
 };
 
-// TODO: rename to GLMesh
-struct GLmesh
+struct GLMesh
 {
 	u32 num_indices;
 	GLuint vao_id;
@@ -184,14 +183,14 @@ ShaderProgram* getFreeShader(GLContext* gl_ctx);
 
 GLTexture* getGLTexture(GLContext* gl_ctx, Texture* diffuse_img);
 
-void renderVAO(GLmesh* glmesh,
+void renderVAO(GLMesh* glmesh,
 	glm::mat4* node_xform,
 	ShaderProgram* shader,
 	GLuint tex_id = 0);
 
 GLVertexAttrib* getVertexAttribByName(ShaderProgram* shader, const char* name);
 
-GLmesh loadGLMesh(const Mesh& m,
+GLMesh loadGLMesh(const Mesh& m,
 	GLenum draw_mode,
 	GLuint diffuse_texture_id,
 	u32 num_mappings,
diff --git a/src/tangerine.cpp b/src/tangerine.cpp
index 4d3ebaf..9571ea0 100644
--- a/src/tangerine.cpp
+++ b/src/tangerine.cpp
@@ -177,7 +177,7 @@ renderFrame(RenderState* rs, const GLClearColor& clear_col)
 			Entity* e = &rg->entities[j];
 
 			for (u32 k = 0; k < e->num_meshes; k++) {
-				GLmesh& glm = e->meshes[k];
+				GLMesh& glm = e->meshes[k];
 				renderVAO(&glm, e->model_xform, rg->shader,
 							e->diffuse_texture->id);
 			}