OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Move TexMan.GetCanvas and GetTextureCanvas to common

Browse source
This commit is contained in:
Magnus Norddahl 2022-07-25 13:47:43 +02:00 • committed by Christoph Oelckers
commit e2778ba442
9 changed files with 56 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/r_data/r_canvastexture.cpp
View file

@ -110,31 +110,6 @@ void SetCameraToTexture(AActor *viewpoint, const FString &texturename, double fo
}
}
TArray<FCanvas*> AllCanvases;
FCanvas* GetTextureCanvas(const FString& texturename)
{
FTextureID textureid = TexMan.CheckForTexture(texturename, ETextureType::Wall, FTextureManager::TEXMAN_Overridable);
if (textureid.isValid())
{
// Only proceed if the texture is a canvas texture.
auto tex = TexMan.GetGameTexture(textureid);
if (tex && tex->GetTexture()->isCanvas())
{
FCanvasTexture* canvasTex = static_cast<FCanvasTexture*>(tex->GetTexture());
if (!canvasTex->Canvas)
{
canvasTex->Canvas = Create<FCanvas>();
canvasTex->Canvas->Tex = canvasTex;
canvasTex->Canvas->Drawer.SetSize(tex->GetTexelWidth(), tex->GetTexelHeight());
AllCanvases.Push(canvasTex->Canvas);
}
return canvasTex->Canvas;
}
}
return nullptr;
}
//==========================================================================
//
// FCanvasTextureInfo :: UpdateAll