SimpleApp now uses FlyCamAppState to manage its

camera (by default).  If the app state doesn't
exist then the camera doesn't get created.  Due
to the volume of apps that will expect a working
camera in simpleInit(), it wasn't possible to
do this as a purely separate app state.


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

engine/src/core/com/jme3/app/FlyCamAppState.java

@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2009-2012 jMonkeyEngine
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'jMonkeyEngine' nor the names of its contributors
+ *   may be used to endorse or promote products derived from this software
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package com.jme3.app;
+
+import com.jme3.app.state.AbstractAppState;
+import com.jme3.app.state.AppStateManager;
+import com.jme3.input.FlyByCamera;
+
+
+/**
+ *  Manages a FlyByCamera.  
+ *
+ *  @author    Paul Speed
+ */
+public class FlyCamAppState extends AbstractAppState {
+
+    private Application app;
+    private FlyByCamera flyCam;
+
+    public FlyCamAppState() {
+    }    
+
+    /**
+     *  This is called by SimpleApplication during initialize().
+     */
+    void setCamera( FlyByCamera cam ) {
+        this.flyCam = cam;
+    }
+    
+    public FlyByCamera getCamera() {
+        return flyCam;
+    }
+
+    @Override
+    public void initialize(AppStateManager stateManager, Application app) {
+        super.initialize(stateManager, app);
+        
+        this.app = app;
+
+        if (app.getInputManager() != null) {
+        
+            if (flyCam == null) {
+                flyCam = new FlyByCamera(app.getCamera());
+            }
+            
+            flyCam.registerWithInput(app.getInputManager());            
+        }               
+    }
+            
+    @Override
+    public void setEnabled(boolean enabled) {
+        super.setEnabled(enabled);
+        
+        flyCam.setEnabled(enabled);
+    }
+    
+    @Override
+    public void cleanup() {
+        super.cleanup();
+
+        flyCam.unregisterInput();        
+    }
+
+
+}

engine/src/core/com/jme3/app/SimpleApplication.java

@@ -108,7 +108,7 @@ public abstract class SimpleApplication extends Application {
     }
 
     public SimpleApplication() {
-        this( new StatsAppState() );
+        this( new StatsAppState(), new FlyCamAppState() );
     }
 
     public SimpleApplication( AppState... initialStates ) {
@@ -189,9 +189,16 @@ public abstract class SimpleApplication extends Application {
         guiViewPort.attachScene(guiNode);
 
         if (inputManager != null) {
+        
+            // We have to special-case the FlyCamAppState because too
+            // many SimpleApplication subclasses expect it to exist in
+            // simpleInit().  But at least it only gets initialized if
+            // the app state is added.
+            if (stateManager.getState(FlyCamAppState.class) != null) {
                 flyCam = new FlyByCamera(cam);
-            flyCam.setMoveSpeed(1f);
-            flyCam.registerWithInput(inputManager);
+                flyCam.setMoveSpeed(1f); // odd to set this here but it did it before
+                stateManager.getState(FlyCamAppState.class).setCamera( flyCam ); 
+            }
 
             if (context.getType() == Type.Display) {
                 inputManager.addMapping(INPUT_MAPPING_EXIT, new KeyTrigger(KeyInput.KEY_ESCAPE));