OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Remove model GL dependencies except for the matrix classes

Browse source
This commit is contained in:
Magnus Norddahl 2017-11-25 13:00:44 +01:00
commit 679f42db78
8 changed files with 38 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/gl/models/gl_models.cpp
View file

@ -137,23 +137,23 @@ void FGLModelRenderer::SetInterpolation(double inter)
gl_RenderState.SetInterpolationFactor((float)inter);
}
void FGLModelRenderer::SetMaterial(FTexture *skin, int clampmode, int translation)
void FGLModelRenderer::SetMaterial(FTexture *skin, bool clampNoFilter, int translation)
{
FMaterial * tex = FMaterial::ValidateTexture(skin, false);
gl_RenderState.SetMaterial(tex, clampmode, translation, -1, false);
gl_RenderState.SetMaterial(tex, clampNoFilter ? CLAMP_NOFILTER : CLAMP_NONE, translation, -1, false);
gl_RenderState.Apply();
if (modellightindex != -1) gl_RenderState.ApplyLightIndex(modellightindex);
}
void FGLModelRenderer::DrawArrays(int primitiveType, int start, int count)
void FGLModelRenderer::DrawArrays(int start, int count)
{
glDrawArrays(primitiveType, start, count);
glDrawArrays(GL_TRIANGLES, start, count);
}
void FGLModelRenderer::DrawElements(int primitiveType, int numIndices, int elementType, size_t offset)
void FGLModelRenderer::DrawElements(int numIndices, size_t offset)
{
glDrawElements(primitiveType, numIndices, elementType, (void*)(intptr_t)offset);
glDrawElements(GL_TRIANGLES, numIndices, GL_UNSIGNED_INT, (void*)(intptr_t)offset);
}
double FGLModelRenderer::GetTimeFloat()