zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-26 22:11:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

- do not render player sprites to canvases in the software renderer.

Browse source 
This applies to both savegame images and camera textures.
This commit is contained in:
Christoph Oelckers 2019-03-09 12:10:50 +01:00
parent d2475b68d0
commit 1a29d39355
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/rendering/swrenderer/scene/r_scene.cpp
View file

@ -129,7 +129,7 @@ namespace swrenderer
DrawerThreads::ResetDebugDrawPos(); DrawerThreads::ResetDebugDrawPos();
} }
RenderActorView(player->mo); RenderActorView(player->mo, true, false);
auto copyqueue = std::make_shared<DrawerCommandQueue>(MainThread()->FrameMemory.get()); auto copyqueue = std::make_shared<DrawerCommandQueue>(MainThread()->FrameMemory.get());
copyqueue->Push<MemcpyCommand>(videobuffer, target->GetPixels(), target->GetWidth(), target->GetHeight(), target->GetPitch(), target->IsBgra() ? 4 : 1); copyqueue->Push<MemcpyCommand>(videobuffer, target->GetPixels(), target->GetWidth(), target->GetHeight(), target->GetPitch(), target->IsBgra() ? 4 : 1);
@ -140,7 +140,7 @@ namespace swrenderer
DrawerWaitCycles.Unclock(); DrawerWaitCycles.Unclock();
} }
void RenderScene::RenderActorView(AActor *actor, bool dontmaplines) void RenderScene::RenderActorView(AActor *actor, bool renderPlayerSprites, bool dontmaplines)
{ {
WallCycles.Reset(); WallCycles.Reset();
PlaneCycles.Reset(); PlaneCycles.Reset();
@ -180,7 +180,8 @@ namespace swrenderer
if (r_modelscene) if (r_modelscene)
MainThread()->Viewport->SetupPolyViewport(MainThread()); MainThread()->Viewport->SetupPolyViewport(MainThread());
RenderPSprites(); if (renderPlayerSprites)
RenderPSprites();
MainThread()->Viewport->viewpoint.camera->renderflags = savedflags; MainThread()->Viewport->viewpoint.camera->renderflags = savedflags;
} }
@ -384,7 +385,7 @@ namespace swrenderer
PolyTriangleDrawer::ResizeBuffers(viewport->RenderTarget); PolyTriangleDrawer::ResizeBuffers(viewport->RenderTarget);
// Render: // Render:
RenderActorView(actor, dontmaplines); RenderActorView(actor, false, dontmaplines);
DrawerWaitCycles.Clock(); DrawerWaitCycles.Clock();
DrawerThreads::WaitForWorkers(); DrawerThreads::WaitForWorkers();
DrawerWaitCycles.Unclock(); DrawerWaitCycles.Unclock();

2
src/rendering/swrenderer/scene/r_scene.h
View file

@ -56,7 +56,7 @@ namespace swrenderer
RenderThread *MainThread() { return Threads.front().get(); } RenderThread *MainThread() { return Threads.front().get(); }
private: private:
void RenderActorView(AActor *actor, bool dontmaplines = false); void RenderActorView(AActor *actor,bool renderplayersprite, bool dontmaplines);
void RenderThreadSlices(); void RenderThreadSlices();
void RenderThreadSlice(RenderThread *thread); void RenderThreadSlice(RenderThread *thread);
void RenderPSprites(); void RenderPSprites();