From 85b2ed594f6aef3435c63913dff2206184edce40 Mon Sep 17 00:00:00 2001 From: Hannu Hanhi Date: Thu, 16 Jul 2020 22:39:44 +0300 Subject: [PATCH] More work on sprite-texture model uv adjustment 2 --- src/hardware/hw_model.c | 3 ++- src/hardware/r_opengl/r_opengl.c | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/hardware/hw_model.c b/src/hardware/hw_model.c index cb22a2ec4..4ed03744b 100644 --- a/src/hardware/hw_model.c +++ b/src/hardware/hw_model.c @@ -225,9 +225,10 @@ model_t *LoadModel(const char *filename, int ztag) for (i = 0; i < model->numMeshes; i++) model->meshes[i].originaluvs = model->meshes[i].uvs; - // Set initial values to max_s and max_t model->max_s = 1.0; model->max_t = 1.0; + model->vbo_max_s = 1.0; + model->vbo_max_t = 1.0; return model; } diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c index a837b5e03..195f3d6f7 100644 --- a/src/hardware/r_opengl/r_opengl.c +++ b/src/hardware/r_opengl/r_opengl.c @@ -2803,7 +2803,6 @@ static void DrawModelEx(model_t *model, INT32 frameIndex, INT32 duration, INT32 } else { - //CONS_Printf("non-vbo tinyframe\n"); pglVertexPointer(3, GL_SHORT, 0, frame->vertices); pglNormalPointer(GL_BYTE, 0, frame->normals); pglTexCoordPointer(2, GL_FLOAT, 0, mesh->uvs); @@ -2858,7 +2857,6 @@ static void DrawModelEx(model_t *model, INT32 frameIndex, INT32 duration, INT32 } else { - //CONS_Printf("non-vbo frame\n"); pglVertexPointer(3, GL_FLOAT, 0, frame->vertices); pglNormalPointer(GL_FLOAT, 0, frame->normals); pglTexCoordPointer(2, GL_FLOAT, 0, mesh->uvs);