Enabled test app on Android

1 files changed, 5 insertions, 82 deletions

diff --git a/Tests/TestApp/src/Android/TestAppAndroid.cpp b/Tests/TestApp/src/Android/TestAppAndroid.cpp
index 0cd8eb1..8c91f72 100644
--- a/Tests/TestApp/src/Android/TestAppAndroid.cpp
+++ b/Tests/TestApp/src/Android/TestAppAndroid.cpp
@@ -21,16 +21,15 @@
 *  of the possibility of such damages.
 */
 
-#include "SampleApp.h"
+#include "TestApp.h"
 #include "RenderDeviceGLES.h"
-#include "AntTweakBar.h"
 
 using namespace Diligent;
 
-class SampleAppAndroid final : public SampleApp
+class TestAppAndroid final : public TestApp
 {
 public:
-    SampleAppAndroid()
+    TestAppAndroid()
     {
         m_DeviceType = DeviceType::OpenGLES;
     }
@@ -39,8 +38,7 @@ public:
     {
         InitializeDiligentEngine(window);
         m_RenderDeviceGLES = RefCntAutoPtr<IRenderDeviceGLES>(m_pDevice, IID_RenderDeviceGLES);
-        m_TheSample->SetUIScale(3);
-        InitializeSample();
+        InitializeRenderers();
     }
 
     virtual int Resume(ANativeWindow* window)override final
@@ -59,81 +57,6 @@ public:
         LOGI( "Trimming memory" );
         m_RenderDeviceGLES->Invalidate();
     }
-        
-    virtual int32_t HandleInput( AInputEvent* event )override final
-    {
-        if( AInputEvent_getType( event ) == AINPUT_EVENT_TYPE_MOTION )
-        {
-            ndk_helper::GESTURE_STATE doubleTapState = doubletap_detector_.Detect( event );
-            ndk_helper::GESTURE_STATE dragState = drag_detector_.Detect( event );
-            ndk_helper::GESTURE_STATE pinchState = pinch_detector_.Detect( event );
-
-            //Double tap detector has a priority over other detectors
-            if( doubleTapState == ndk_helper::GESTURE_STATE_ACTION )
-            {
-                //Detect double tap
-                //tap_camera_.Reset( true );
-            }
-            else
-            {
-                //Handle drag state
-                if( dragState & ndk_helper::GESTURE_STATE_START )
-                {
-                    //Otherwise, start dragging
-                    ndk_helper::Vec2 v;
-                    drag_detector_.GetPointer( v );
-                    float fX = 0, fY = 0;
-                    v.Value(fX, fY);
-                    TwMouseMotion((short)fX, (short)fY);
-                    int Handled = TwMouseButton( TW_MOUSE_PRESSED, TW_MOUSE_LEFT );
-
-                    //TransformPosition( v );
-                    //tap_camera_.BeginDrag( v );
-                }
-                else if( dragState & ndk_helper::GESTURE_STATE_MOVE )
-                {
-                    ndk_helper::Vec2 v;
-                    drag_detector_.GetPointer( v );
-                    float fX = 0, fY = 0;
-                    v.Value(fX, fY);
-                    int Handled = TwMouseMotion((short)fX, (short)fY);
-                    //TransformPosition( v );
-                    //tap_camera_.Drag( v );
-                }
-                else if( dragState & ndk_helper::GESTURE_STATE_END )
-                {
-                    int Handled = TwMouseButton(TW_MOUSE_RELEASED, TW_MOUSE_LEFT);
-
-                    //tap_camera_.EndDrag();
-                }
-
-                //Handle pinch state
-                if( pinchState & ndk_helper::GESTURE_STATE_START )
-                {
-                    //Start new pinch
-                    ndk_helper::Vec2 v1;
-                    ndk_helper::Vec2 v2;
-                    pinch_detector_.GetPointers( v1, v2 );
-                    //TransformPosition( v1 );
-                    //TransformPosition( v2 );
-                    //tap_camera_.BeginPinch( v1, v2 );
-                }
-                else if( pinchState & ndk_helper::GESTURE_STATE_MOVE )
-                {
-                    //Multi touch
-                    //Start new pinch
-                    ndk_helper::Vec2 v1;
-                    ndk_helper::Vec2 v2;
-                    pinch_detector_.GetPointers( v1, v2 );
-                    //TransformPosition( v1 );
-                    //TransformPosition( v2 );
-                    //tap_camera_.Pinch( v1, v2 );
-                }
-            }
-            return 1;
-        }
-        return 0;
-    }
     
 private:
     RefCntAutoPtr<IRenderDeviceGLES> m_RenderDeviceGLES;
@@ -141,5 +64,5 @@ private:
 
 NativeAppBase* CreateApplication()
 {
-    return new SampleAppAndroid;
+    return new TestAppAndroid;
 }