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

Test rundown part 1 :

Browse Source 
- fixed NPE in FilterPostProcessor
- fixed compilation error in terrain lighting

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8028 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
rem..om 2011-08-17 16:01:31 +00:00
parent 0448725e2b
commit 36dd462c4f
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -126,8 +126,8 @@ public class FilterPostProcessor implements SceneProcessor, Savable {
filter.cleanup(renderer); filter.cleanup(renderer);
updateLastFilterIndex(); updateLastFilterIndex();
} }
public Iterator<Filter> getFilterIterator(){ public Iterator<Filter> getFilterIterator() {
return filters.iterator(); return filters.iterator();
} }
@ -289,10 +289,13 @@ public class FilterPostProcessor implements SceneProcessor, Savable {
} else if (renderFrameBufferMS != null) { } else if (renderFrameBufferMS != null) {
sceneBuffer = renderFrameBufferMS; sceneBuffer = renderFrameBufferMS;
} }
renderFilterChain(renderer, sceneBuffer); renderFilterChain(renderer, sceneBuffer);
renderManager.setCamera(viewPort.getCamera(), false);
renderer.setFrameBuffer(outputBuffer); renderer.setFrameBuffer(outputBuffer);
//viewport can be null if no filters are enabled
if (viewPort != null) {
renderManager.setCamera(viewPort.getCamera(), false);
}
} }
@ -361,7 +364,7 @@ public class FilterPostProcessor implements SceneProcessor, Savable {
//reseting the viewport camera viewport to its initial value //reseting the viewport camera viewport to its initial value
viewPort.getCamera().resize(originalWidth, originalHeight, true); viewPort.getCamera().resize(originalWidth, originalHeight, true);
viewPort.getCamera().setViewPort(left, right, bottom, top); viewPort.getCamera().setViewPort(left, right, bottom, top);
viewPort.setOutputFrameBuffer(outputBuffer); viewPort.setOutputFrameBuffer(outputBuffer);
viewPort = null; viewPort = null;
} }
@ -478,7 +481,7 @@ public class FilterPostProcessor implements SceneProcessor, Savable {
InputCapsule ic = im.getCapsule(this); InputCapsule ic = im.getCapsule(this);
numSamples = ic.readInt("numSamples", 0); numSamples = ic.readInt("numSamples", 0);
filters = ic.readSavableArrayList("filters", null); filters = ic.readSavableArrayList("filters", null);
for (Filter filter : filters) { for (Filter filter : filters) {
filter.setProcessor(this); filter.setProcessor(this);
setFilterState(filter, filter.isEnabled()); setFilterState(filter, filter.isEnabled());
} }

2
engine/src/terrain/Common/MatDefs/Terrain/TerrainLighting.frag
View File

@ -658,7 +658,7 @@ void main(){
spotFallOff = (curAngleCos - outerAngleCos) / innerMinusOuter; spotFallOff = (curAngleCos - outerAngleCos) / innerMinusOuter;
if(spotFallOff <= 0.0){ if(spotFallOff <= 0.0){
gl_FragColor.rgb = AmbientSum * diffuseColor; gl_FragColor = AmbientSum * diffuseColor;
return; return;
}else{ }else{
spotFallOff = clamp(spotFallOff, 0.0, 1.0); spotFallOff = clamp(spotFallOff, 0.0, 1.0);