From bf85cc25bd85e776a9ce2a1ba2f499b936185cdc Mon Sep 17 00:00:00 2001 From: Monster Iestyn Date: Wed, 1 Jun 2016 18:51:38 +0100 Subject: [PATCH] OpenGL: Fix lower unpegged texture offset, fix lower unpegged + effect 1 so the texture actually skews --- src/hardware/hw_main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index bec9cdb1..18eecb77 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -1719,12 +1719,12 @@ static void HWR_StoreWallRange(double startfrac, double endfrac) if (!(gr_linedef->flags & ML_DONTPEGBOTTOM)) texturevpegbottom = 0; else if (gr_linedef->flags & ML_EFFECT1) - texturevpegbottom = worldtop - worldlow; + texturevpegbottom = worldbottom - worldlow; else - texturevpegbottom = gr_frontsector->ceilingheight - gr_backsector->floorheight; + texturevpegbottom = gr_frontsector->floorheight - gr_backsector->floorheight; #else if (gr_linedef->flags & ML_DONTPEGBOTTOM) - texturevpegbottom = worldtop - worldlow; + texturevpegbottom = worldbottom - worldlow; else texturevpegbottom = 0; #endif @@ -1752,9 +1752,9 @@ static void HWR_StoreWallRange(double startfrac, double endfrac) else if (gr_linedef->flags & ML_DONTPEGBOTTOM) { // Skewed by bottom - wallVerts[0].t = (texturevpegbottom + worldlow - worldbottom) * grTex->scaleY; - wallVerts[2].t = wallVerts[3].t - (worldlowslope - worldlow) * grTex->scaleY; - wallVerts[1].t = wallVerts[2].t - (worldbottomslope - worldlowslope) * grTex->scaleY; + wallVerts[0].t = wallVerts[1].t = (texturevpegbottom + worldlow - worldbottom) * grTex->scaleY; + //wallVerts[3].t = wallVerts[0].t - (worldlow - worldbottom) * grTex->scaleY; // no need, [3] is already this + wallVerts[2].t = wallVerts[1].t - (worldlowslope - worldbottomslope) * grTex->scaleY; } else {