fix possible rendering edge cases

Author: mgood7123

NativeApp/include/Android/AndroidAppBase.hpp

@@ -26,8 +26,10 @@
 #pragma once
 
 #include <memory>
+#include <mutex>
 
 #include <android_native_app_glue.h>
+#include <FlagEnum.h>
 #include "AppBase.hpp"
 
 #include "NDKHelper.h"
@@ -38,62 +40,92 @@ namespace Diligent
 {
 
 /// Base class for Android applications.
-class AndroidAppBase : public AppBase
-{
-public:
-    int            InitDisplay();
-    void           SetState(android_app* state, const char* native_activity_class_name);
-    void           InitSensors();
-    void           ProcessSensors(int32_t id);
-    virtual void   DrawFrame();
-    bool           IsReady();
-    virtual void   TrimMemory()  = 0;
-    virtual void   TermDisplay() = 0;
-    static int32_t HandleInput(android_app* app, AInputEvent* event);
-    static void    HandleCmd(android_app* app, int32_t cmd);
-
-protected:
-    virtual void Initialize()
-    {
-    }
-
-    virtual int Resume(ANativeWindow* window) = 0;
-
-    virtual int32_t HandleInput(AInputEvent* event) { return 0; }
-
-    virtual void LoadResources()
-    {
-        //renderer_.Init();
-        //renderer_.Bind( &tap_camera_ );
-    }
-
-    virtual void UnloadResources()
-    {
-        //renderer_.Unload();
-    }
-
-    ndk_helper::DoubletapDetector doubletap_detector_;
-    ndk_helper::PinchDetector     pinch_detector_;
-    ndk_helper::DragDetector      drag_detector_;
-    ndk_helper::PerfMonitor       monitor_;
-
-    //ndk_helper::TapCamera tap_camera_;
-    android_app* app_ = nullptr;
-    std::string  native_activity_class_name_;
-
-private:
-    void UpdatePosition(AInputEvent* event, int32_t iIndex, float& fX, float& fY);
-    void SuspendSensors();
-    void ResumeSensors();
-    void ShowUI();
-    void UpdateFPS(float fFPS);
-
-    bool initialized_resources_ = false;
-    bool has_focus_             = false;
-
-    ASensorManager*    sensor_manager_       = nullptr;
-    const ASensor*     accelerometer_sensor_ = nullptr;
-    ASensorEventQueue* sensor_event_queue_   = nullptr;
-};
+    class AndroidAppBase : public AppBase {
+    public:
+        int InitDisplay();
+
+        void SetState(android_app *state, const char *native_activity_class_name);
+
+        void InitSensors();
+
+        void ProcessSensors(int32_t id);
+
+        virtual void DrawFrame();
+
+        bool IsReady();
+
+        virtual void TrimMemory() = 0;
+
+        virtual void TermDisplay() = 0;
+
+        static int32_t HandleInput(android_app *app, AInputEvent *event);
+
+        static void HandleCmd(android_app *app, int32_t cmd);
+
+        enum APP_STATUS_FLAGS {
+            APP_STATUS_FLAG_NONE = 0x00000000,
+            // Android lifecycle status flags.  Not app-specific
+            // Set between onCreate and onDestroy
+            APP_STATUS_FLAG_RUNNING = 0x00000001,
+            // Set between onResume and onPause
+            APP_STATUS_FLAG_ACTIVE = 0x00000002,
+            // Set between onWindowFocusChanged(true) and (false)
+            APP_STATUS_FLAG_FOCUSED = 0x00000004,
+            // Set when the app's SurfaceHolder points to a
+            // valid, nonzero-sized surface
+            APP_STATUS_FLAG_HAS_REAL_SURFACE = 0x00000008,
+        };
+
+        APP_STATUS_FLAGS app_status_ = APP_STATUS_FLAG_NONE;
+    protected:
+        virtual void Initialize() {
+        }
+
+        virtual int Resume(ANativeWindow *window) = 0;
+
+        virtual int32_t HandleInput(AInputEvent *event) { return 0; }
+
+        virtual void LoadResources() {
+            //renderer_.Init();
+            //renderer_.Bind( &tap_camera_ );
+        }
+
+        virtual void UnloadResources() {
+            //renderer_.Unload();
+        }
+
+        ndk_helper::DoubletapDetector doubletap_detector_;
+        ndk_helper::PinchDetector pinch_detector_;
+        ndk_helper::DragDetector drag_detector_;
+        ndk_helper::PerfMonitor monitor_;
+
+        //ndk_helper::TapCamera tap_camera_;
+        android_app *app_ = nullptr;
+        std::string native_activity_class_name_;
+
+        std::mutex mutex;
+
+    private:
+        void UpdatePosition(AInputEvent *event, int32_t iIndex, float &fX, float &fY);
+
+        void SuspendSensors();
+
+        void ResumeSensors();
+
+        void ShowUI();
+
+        void UpdateFPS(float fFPS);
+
+        bool initialized_resources_ = false;
+
+        int32_t      window_width_   = 0;
+        int32_t      window_height_  = 0;
+
+        ASensorManager*    sensor_manager_       = nullptr;
+        const ASensor*     accelerometer_sensor_ = nullptr;
+        ASensorEventQueue* sensor_event_queue_   = nullptr;
+    };
+
+    DEFINE_FLAG_ENUM_OPERATORS(AndroidAppBase::APP_STATUS_FLAGS)
 
 } // namespace Diligent