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

* Let implementation choose appropriate pixel format for pbuffer.

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7469 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
sha..rd 2011-05-08 17:54:41 +00:00
parent b0aae84707
commit 549d167635
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engine/src/lwjgl-ogl/com/jme3/system/lwjgl/LwjglCanvas.java
View File

@ -268,7 +268,9 @@ public class LwjglCanvas extends LwjglAbstractDisplay implements JmeCanvasContex
logger.log(Level.WARNING, "PBuffer was lost!"); logger.log(Level.WARNING, "PBuffer was lost!");
pbuffer.destroy(); pbuffer.destroy();
} }
pbuffer = new Pbuffer(1, 1, acquirePixelFormat(), null); // Let the implementation choose an appropriate pixel format.
pbuffer = new Pbuffer(1, 1, new PixelFormat(0, 0, 0, 0, 0), null);
//pbuffer = new Pbuffer(1, 1, acquirePixelFormat(), null);
logger.log(Level.INFO, "OGL: Pbuffer has been created"); logger.log(Level.INFO, "OGL: Pbuffer has been created");
} }
} }

7
engine/src/ogre/com/jme3/scene/plugins/ogre/SceneLoader.java
View File

@ -282,9 +282,12 @@ public class SceneLoader extends DefaultHandler implements AssetLoader {
node.setLocalScale(SAXUtil.parseVector3(attribs)); node.setLocalScale(SAXUtil.parseVector3(attribs));
} else if (qName.equals("light")) { } else if (qName.equals("light")) {
parseLight(attribs); parseLight(attribs);
} else if (qName.equals("colourDiffuse")) { } else if (qName.equals("colourDiffuse") || qName.equals("colorDiffuse")) {
assert elementStack.peek().equals("light"); if (elementStack.peek().equals("light")){
light.setColor(parseColor(attribs)); light.setColor(parseColor(attribs));
}else{
assert elementStack.peek().equals("environment");
}
} else if (qName.equals("normal")) { } else if (qName.equals("normal")) {
parseLightNormal(attribs); parseLightNormal(attribs);
} else if (qName.equals("lightAttenuation")) { } else if (qName.equals("lightAttenuation")) {