jME3

 * RenderManager will reload "shader" boolean on each invocation of render(), since Renderer might not have proper capabilities set before canvas has been attached

jMP
 * Fixed some illegal calls in SceneApplication

git-svn-id: http://jmonkeyengine.googlecode.com/svn/trunk@7095 75d07b2b-3a1a-0410-a2c5-0572b91ccdca

diff --git a/build.xml b/build.xml
index 84a5ff5..1ac78ee 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -10,7 +10,7 @@
         </condition>
     </fail>
 
-    <target name="build" description="Builds the complete SDK" depends="-check-platform">
+    <target name="build" description="Builds the complete SDK" depends="-check-platform, -update-sdk-platform-config">
         <ant dir="engine" target="update-sdk"/>
         <ant dir="sdk" target="build"/>
     </target>
@@ -73,5 +73,7 @@
               message="nbplatform.default.harness.dir=${nbplatform.dir}${file.separator}harness&#xD;&#xA;" append="true"/>
         <replace file="sdk/nbproject/private/platform-private.properties" token="\" value="\\"/>
     </target>
+    
+    <target name="update-sdk-platform-config" depends="-update-sdk-platform-config"/>
 
 </project>
\ No newline at end of file

diff --git a/engine/src/core/com/jme3/renderer/RenderManager.java b/engine/src/core/com/jme3/renderer/RenderManager.java
index d7f1fbf..afc6cd6 100644 (file)
--- a/engine/src/core/com/jme3/renderer/RenderManager.java
+++ b/engine/src/core/com/jme3/renderer/RenderManager.java
@@ -85,7 +85,7 @@ public class RenderManager {
     private Material forcedMaterial = null;
     private String forcedTechnique = null;
     private RenderState forcedRenderState = null;
-    private final boolean shader;
+    private boolean shader;
     private int viewX, viewY, viewWidth, viewHeight;
     private float near, far;
     private Matrix4f orthoMatrix = new Matrix4f();
@@ -734,6 +734,8 @@ public class RenderManager {
             return;
         }
 
+        this.shader = renderer.getCaps().contains(Caps.GLSL100);
+
         for (int i = 0; i < preViewPorts.size(); i++) {
             renderViewPort(preViewPorts.get(i), tpf);
         }

diff --git a/sdk/jme3-core/src/com/jme3/gde/core/scene/SceneApplication.java b/sdk/jme3-core/src/com/jme3/gde/core/scene/SceneApplication.java
index 6bdfcad..42cc586 100644 (file)
--- a/sdk/jme3-core/src/com/jme3/gde/core/scene/SceneApplication.java
+++ b/sdk/jme3-core/src/com/jme3/gde/core/scene/SceneApplication.java
@@ -127,8 +127,6 @@ public class SceneApplication extends Application implements LookupProvider, Loo
 
             createCanvas();
             startCanvas(true);
-            getContext().setAutoFlushFrames(true);
-            getContext().setSystemListener(this);
             progressHandle.progress("initialize Base Application", 1);
 //            if (!java.awt.EventQueue.isDispatchThread()) {
 //                java.awt.EventQueue.invokeAndWait(new Runnable() {
@@ -180,9 +178,6 @@ public class SceneApplication extends Application implements LookupProvider, Loo
             previewProcessor = new ScenePreviewProcessor();
             previewProcessor.setupPreviewView();
 
-            // enable depth test and back-face culling for performance
-            renderer.applyRenderState(RenderState.DEFAULT);
-
             getProgressHandle().progress("Prepare Camera", 4);
             camLight = new PointLight();
             camLight.setColor(ColorRGBA.White);
@@ -244,7 +239,9 @@ public class SceneApplication extends Application implements LookupProvider, Loo
             guiNode.updateGeometricState();
             toolsNode.updateGeometricState();
             getStateManager().render(renderManager);
-            renderManager.render(tpf);
+            if (context.isRenderable()){
+                renderManager.render(tpf);
+            }
             getStateManager().postRender();
         } catch (Exception e) {
             handleError(e.getMessage(), e);