OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

remove AActor from common

Browse source
This commit is contained in:
Ricardo Luís Vaz Silva 2025-01-11 07:11:34 -03:00 • committed by Magnus Norddahl
commit 73e17842d3
18 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/rendering/hwrenderer/hw_models.cpp
View file

@ -134,8 +134,10 @@ void FHWModelRenderer::SetInterpolation(double inter)
state.SetInterpolationFactor((float)inter);
}
void FHWModelRenderer::SetMaterial(FGameTexture *skin, bool clampNoFilter, FTranslationID translation, AActor * act)
void FHWModelRenderer::SetMaterial(FGameTexture *skin, bool clampNoFilter, FTranslationID translation, void * act_v)
{
AActor * act = static_cast<AActor*>(act_v);
state.SetMaterial(skin, UF_Skin, 0, clampNoFilter ? CLAMP_NOFILTER : CLAMP_NONE, translation, -1, act ? act->GetClass() : nullptr);
int shader = state.getShaderIndex();

2
src/rendering/hwrenderer/hw_models.h
View file

@ -56,7 +56,7 @@ public:
void BeginDrawHUDModel(FRenderStyle style, const VSMatrix &objectToWorldMatrix, bool mirrored, int smf_flags) override;
void EndDrawHUDModel(FRenderStyle style, int smf_flags) override;
void SetInterpolation(double interpolation) override;
void SetMaterial(FGameTexture *skin, bool clampNoFilter, FTranslationID translation, AActor * act) override;
void SetMaterial(FGameTexture *skin, bool clampNoFilter, FTranslationID translation, void * act) override;
void DrawArrays(int start, int count) override;
void DrawElements(int numIndices, size_t offset) override;
int SetupFrame(FModel *model, unsigned int frame1, unsigned int frame2, unsigned int size, const TArray<VSMatrix>& bones, int boneStartIndex) override;