diff --git a/src/gl/scene/gl_sky.cpp b/src/gl/scene/gl_sky.cpp index 80ecc7632..384af7f15 100644 --- a/src/gl/scene/gl_sky.cpp +++ b/src/gl/scene/gl_sky.cpp @@ -86,8 +86,8 @@ void GLSkyInfo::init(int sky1, PalEntry FadeColor) texture[0] = FMaterial::ValidateTexture(texno, false, true); if (!texture[0] || texture[0]->tex->UseType == FTexture::TEX_Null) goto normalsky; skytexno1 = texno; - x_offset[0] = s->GetTextureXOffsetF(pos) * (360.f/65536.f); - y_offset = s->GetTextureYOffsetF(pos); + x_offset[0] = s->GetTextureXOffset(pos) * (360.f/65536.f); + y_offset = s->GetTextureYOffset(pos); mirrored = !l->args[2]; } else @@ -272,11 +272,11 @@ void GLWall::SkyTop(seg_t * seg,sector_t * fs,sector_t * bs,vertex_t * v1,vertex // or it will cause glitches elsewhere. tex = TexMan(seg->sidedef->GetTexture(side_t::mid)); if (tex != NULL && !(seg->linedef->flags & ML_DONTPEGTOP) && - seg->sidedef->GetTextureYOffsetF(side_t::mid) > 0) + seg->sidedef->GetTextureYOffset(side_t::mid) > 0) { ztop[0]=ztop[1]=32768.0f; zbottom[0]=zbottom[1]= - bs->ceilingplane.ZatPoint(v2) + seg->sidedef->GetTextureYOffsetF(side_t::mid); + bs->ceilingplane.ZatPoint(v2) + seg->sidedef->GetTextureYOffset(side_t::mid); SkyPlane(fs, sector_t::ceiling, false); return; } diff --git a/src/gl/scene/gl_walls.cpp b/src/gl/scene/gl_walls.cpp index aec87c8af..7b9d99cab 100644 --- a/src/gl/scene/gl_walls.cpp +++ b/src/gl/scene/gl_walls.cpp @@ -641,11 +641,11 @@ void GLWall::DoTexture(int _type,seg_t * seg, int peg, type = _type; - float floatceilingref = ceilingrefheight + tci.RowOffset(seg->sidedef->GetTextureYOffsetF(texpos)); + float floatceilingref = ceilingrefheight + tci.RowOffset(seg->sidedef->GetTextureYOffset(texpos)); if (peg) floatceilingref += tci.mRenderHeight - flh - v_offset; if (!SetWallCoordinates(seg, &tci, floatceilingref, topleft, topright, bottomleft, bottomright, - seg->sidedef->GetTextureXOffsetF(texpos))) return; + seg->sidedef->GetTextureXOffset(texpos))) return; if (seg->linedef->special == Line_Mirror && _type == RENDERWALL_M1S && gl_mirrors) { @@ -704,7 +704,7 @@ void GLWall::DoMidTexture(seg_t * seg, bool drawfogboundary, tci.mRenderHeight = -tci.mRenderHeight; tci.mScale.Y = -tci.mScale.Y; } - float rowoffset = tci.RowOffset(seg->sidedef->GetTextureYOffsetF(side_t::mid)); + float rowoffset = tci.RowOffset(seg->sidedef->GetTextureYOffset(side_t::mid)); if ((seg->linedef->flags & ML_DONTPEGBOTTOM) >0) { texturebottom = MAX(realfront->GetPlaneTexZF(sector_t::floor), realback->GetPlaneTexZF(sector_t::floor)) + rowoffset; @@ -822,7 +822,7 @@ void GLWall::DoMidTexture(seg_t * seg, bool drawfogboundary, // set up texture coordinate stuff // // - float t_ofs = seg->sidedef->GetTextureXOffsetF(side_t::mid); + float t_ofs = seg->sidedef->GetTextureXOffset(side_t::mid); if (gltexture) { @@ -1052,18 +1052,18 @@ void GLWall::BuildFFBlock(seg_t * seg, F3DFloor * rover, gltexture->GetTexCoordInfo(&tci, mastersd, side_t::mid); } - to = (rover->flags&(FF_UPPERTEXTURE | FF_LOWERTEXTURE)) ? 0 : tci.TextureOffset(mastersd->GetTextureXOffsetF(side_t::mid)); + to = (rover->flags&(FF_UPPERTEXTURE | FF_LOWERTEXTURE)) ? 0 : tci.TextureOffset(mastersd->GetTextureXOffset(side_t::mid)); - ul = tci.FloatToTexU(to + tci.TextureOffset(seg->sidedef->GetTextureXOffsetF(side_t::mid))); + ul = tci.FloatToTexU(to + tci.TextureOffset(seg->sidedef->GetTextureXOffset(side_t::mid))); texlength = tci.FloatToTexU(seg->sidedef->TexelLength); uplft.u = lolft.u = ul + texlength * glseg.fracleft; uprgt.u = lorgt.u = ul + texlength * glseg.fracright; - float rowoffset = tci.RowOffset(seg->sidedef->GetTextureYOffsetF(side_t::mid)); + float rowoffset = tci.RowOffset(seg->sidedef->GetTextureYOffset(side_t::mid)); to = (rover->flags&(FF_UPPERTEXTURE | FF_LOWERTEXTURE)) ? - 0.f : tci.RowOffset(mastersd->GetTextureYOffsetF(side_t::mid)); + 0.f : tci.RowOffset(mastersd->GetTextureYOffset(side_t::mid)); to += rowoffset + rover->top.model->GetPlaneTexZF(rover->top.isceiling); diff --git a/src/gl/textures/gl_material.h b/src/gl/textures/gl_material.h index 83069049c..9cd2d3387 100644 --- a/src/gl/textures/gl_material.h +++ b/src/gl/textures/gl_material.h @@ -161,7 +161,7 @@ public: void GetTexCoordInfo(FTexCoordInfo *tci, side_t *side, int texpos) const { - GetTexCoordInfo(tci, (float)side->GetTextureXScaleF(texpos), (float)side->GetTextureYScaleF(texpos)); + GetTexCoordInfo(tci, (float)side->GetTextureXScale(texpos), (float)side->GetTextureYScale(texpos)); } // This is scaled size in integer units as needed by walls and flats