TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

filter: Fix issue with cached CullResult persisting after cleanup

Browse Source 
This can cause issues if a DR gets assigned an inactive camera - the old cull result will persist and be used for draw.  Possibly we need to do this in set_camera.

Reproduced by #1166
This commit is contained in:
rdb 2021-08-03 10:59:10 +02:00
parent ea45ff691d
commit 1f84469cd9
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
direct/src/filter/FilterManager.py
View File

@ -366,6 +366,8 @@ class FilterManager(DirectObject):
self.camstate = self.caminit self.camstate = self.caminit
self.camera.node().setInitialState(self.caminit) self.camera.node().setInitialState(self.caminit)
self.region.setCamera(self.camera) self.region.setCamera(self.camera)
if hasattr(self.region, 'clearCullResult'):
self.region.clearCullResult()
self.nextsort = self.win.getSort() - 1000 self.nextsort = self.win.getSort() - 1000
self.basex = 0 self.basex = 0
self.basey = 0 self.basey = 0

9
panda/src/display/displayRegion.cxx
View File

@ -514,6 +514,15 @@ get_screenshot() {
return tex; return tex;
} }
/**
*
*/
void DisplayRegion::
clear_cull_result() {
CDCullWriter cdata_cull(_cycler_cull, true);
cdata_cull->_cull_result = nullptr;
}
/** /**
* Returns a special scene graph constructed to represent the results of the * Returns a special scene graph constructed to represent the results of the
* last frame's cull operation. * last frame's cull operation.

1
panda/src/display/displayRegion.h
View File

@ -160,6 +160,7 @@ PUBLISHED:
bool get_screenshot(PNMImage &image); bool get_screenshot(PNMImage &image);
PT(Texture) get_screenshot(); PT(Texture) get_screenshot();
void clear_cull_result();
virtual PT(PandaNode) make_cull_result_graph(); virtual PT(PandaNode) make_cull_result_graph();
public: public: