Просмотр исходного кода

* Let implementation choose appropriate pixel format for pbuffer.

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7469 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
sha..rd 14 лет назад
Родитель
Сommit
549d167635

+ 3 - 1
engine/src/lwjgl-ogl/com/jme3/system/lwjgl/LwjglCanvas.java

@@ -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");
         }
         }
     }
     }

+ 6 - 3
engine/src/ogre/com/jme3/scene/plugins/ogre/SceneLoader.java

@@ -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")) {
-            assert elementStack.peek().equals("light");
-            light.setColor(parseColor(attribs));
+        } else if (qName.equals("colourDiffuse") || qName.equals("colorDiffuse")) {
+            if (elementStack.peek().equals("light")){
+                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")) {