Fix up some "shader" related functions; tweak 2D MDL drawing

edge-classic · Dec 15, 2024 · 790e859 · 790e859
1 parent 7aa8e89
commit 790e859
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/source_files/edge/r_mdl.cc b/source_files/edge/r_mdl.cc
@@ -1054,8 +1054,9 @@ void MDLRenderModel2D(MDLModel *md, const Image *skin_img, int frame, float x, f
 
             const MDLPoint  *point = &md->points_[strip->first + v_idx];
             const MDLVertex *vert  = &frame_ptr->vertices[point->vert_idx];
+            const HMM_Vec2   texc  = { point->skin_s, point->skin_t };
 
-            glTexCoord2f(point->skin_s, point->skin_t);
+            global_render_state->MultiTexCoord(GL_TEXTURE0, &texc);
 
             float dx = vert->x * xscale;
             float dy = vert->y * xscale;

diff --git a/source_files/edge/r_render.cc b/source_files/edge/r_render.cc
@@ -551,12 +551,12 @@ static void WallCoordFunc(void *d, int v_idx, HMM_Vec3 *pos, RGBAColor *rgb, HMM
     if (swirl_pass > 1)
     {
         *rgb = epi::MakeRGBA((uint8_t)(255.0f / data->R * render_view_red_multiplier), (uint8_t)(255.0f / data->G * render_view_green_multiplier), 
-            (uint8_t)(255.0f / data->B * render_view_blue_multiplier));
+            (uint8_t)(255.0f / data->B * render_view_blue_multiplier), epi::GetRGBAAlpha(*rgb));
     }
     else
     {
         *rgb = epi::MakeRGBA((uint8_t)(data->R * render_view_red_multiplier), (uint8_t)(data->G * render_view_green_multiplier), 
-            (uint8_t)(data->B * render_view_blue_multiplier));
+            (uint8_t)(data->B * render_view_blue_multiplier), epi::GetRGBAAlpha(*rgb));
     }
 
     float along;
@@ -619,12 +619,12 @@ static void PlaneCoordFunc(void *d, int v_idx, HMM_Vec3 *pos, RGBAColor *rgb, HM
     if (swirl_pass > 1)
     {
         *rgb = epi::MakeRGBA((uint8_t)(255.0f / data->R * render_view_red_multiplier), (uint8_t)(255.0f / data->G * render_view_green_multiplier), 
-            (uint8_t)(255.0f / data->B * render_view_blue_multiplier));
+            (uint8_t)(255.0f / data->B * render_view_blue_multiplier), epi::GetRGBAAlpha(*rgb));
     }
     else
     {
         *rgb = epi::MakeRGBA((uint8_t)(data->R * render_view_red_multiplier), (uint8_t)(data->G * render_view_green_multiplier), 
-            (uint8_t)(data->B * render_view_blue_multiplier));
+            (uint8_t)(data->B * render_view_blue_multiplier), epi::GetRGBAAlpha(*rgb));
     }
 
     HMM_Vec2 rxy = {{(data->tx0 + pos->X), (data->ty0 + pos->Y)}};
@@ -1778,7 +1778,7 @@ static void FloodCoordFunc(void *d, int v_idx, HMM_Vec3 *pos, RGBAColor *rgb, HM
     *pos    = data->vertices[v_idx];
     *normal = data->normal;
     *rgb = epi::MakeRGBA((uint8_t)(data->R * render_view_red_multiplier), (uint8_t)(data->G * render_view_green_multiplier), 
-        (uint8_t)(data->B * render_view_blue_multiplier));
+        (uint8_t)(data->B * render_view_blue_multiplier), epi::GetRGBAAlpha(*rgb));
 
     float along = (view_z - data->plane_h) / (view_z - pos->Z);