sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed an issue where the fpp and all its filters were reinitialized when all filters had been disabled and the first one was re enabled. Thanks to James Mundy to have found this issue.

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10885 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
rem..om 2013-11-10 13:20:00 +00:00
parent d502d22d0e
commit ab89b55a53
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
engine/src/core/com/jme3/post/FilterPostProcessor.java
View File

@ -311,11 +311,7 @@ public class FilterPostProcessor implements SceneProcessor, Savable {
}
} else {
if (renderFrameBufferMS != null) {
viewPort.setOutputFrameBuffer(renderFrameBufferMS);
} else {
viewPort.setOutputFrameBuffer(renderFrameBuffer);
}
setupViewPortFrameBuffer();
//if we are ina multiview situation we need to resize the camera
//to the viewportsize so that the backbuffer is rendered correctly
if (multiView) {
@ -355,11 +351,20 @@ public class FilterPostProcessor implements SceneProcessor, Savable {
for (int i = filters.size() - 1; i >= 0 && lastFilterIndex == -1; i--) {
if (filters.get(i).isEnabled()) {
lastFilterIndex = i;
//the Fpp is initialized, but the viwport framebuffer is the
//original out framebuffer so we must recover from a situation
//where no filter was enabled. So we set th correc framebuffer
//on the viewport
if(isInitialized() && viewPort.getOutputFrameBuffer()==outputBuffer){
setupViewPortFrameBuffer();
}
return;
}
}
if (lastFilterIndex == -1) {
cleanup();
//There is no enabled filter, we restore the original framebuffer
//to the viewport to bypass the fpp.
viewPort.setOutputFrameBuffer(outputBuffer);
}
}
@ -439,12 +444,7 @@ public class FilterPostProcessor implements SceneProcessor, Savable {
Filter filter = it.next();
initFilter(filter, vp);
}
if (renderFrameBufferMS != null) {
viewPort.setOutputFrameBuffer(renderFrameBufferMS);
} else {
viewPort.setOutputFrameBuffer(renderFrameBuffer);
}
setupViewPortFrameBuffer();
}
/**
@ -541,4 +541,12 @@ public class FilterPostProcessor implements SceneProcessor, Savable {
public List<Filter> getFilterList(){
return Collections.unmodifiableList(filters);
}
private void setupViewPortFrameBuffer() {
if (renderFrameBufferMS != null) {
viewPort.setOutputFrameBuffer(renderFrameBufferMS);
} else {
viewPort.setOutputFrameBuffer(renderFrameBuffer);
}
}
}