From 103f0c2ab0c9c4c54d168b98a86bc10d0dac0449 Mon Sep 17 00:00:00 2001 From: assiduous Date: Thu, 30 Jan 2020 19:38:22 -0800 Subject: Renamed .h -> .hpp where appropriate --- NativeApp/include/Android/AndroidAppBase.h | 113 --------------------------- NativeApp/include/Android/AndroidAppBase.hpp | 113 +++++++++++++++++++++++++++ 2 files changed, 113 insertions(+), 113 deletions(-) delete mode 100644 NativeApp/include/Android/AndroidAppBase.h create mode 100644 NativeApp/include/Android/AndroidAppBase.hpp (limited to 'NativeApp/include/Android') diff --git a/NativeApp/include/Android/AndroidAppBase.h b/NativeApp/include/Android/AndroidAppBase.h deleted file mode 100644 index 0b291c6..0000000 --- a/NativeApp/include/Android/AndroidAppBase.h +++ /dev/null @@ -1,113 +0,0 @@ -/* Copyright 2015-2018 Egor Yusov - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS. - * - * In no event and under no legal theory, whether in tort (including negligence), - * contract, or otherwise, unless required by applicable law (such as deliberate - * and grossly negligent acts) or agreed to in writing, shall any Contributor be - * liable for any damages, including any direct, indirect, special, incidental, - * or consequential damages of any character arising as a result of this License or - * out of the use or inability to use the software (including but not limited to damages - * for loss of goodwill, work stoppage, computer failure or malfunction, or any and - * all other commercial damages or losses), even if such Contributor has been advised - * of the possibility of such damages. - */ - -#pragma once - -#include - -#include -#include "AppBase.h" - -#include "NDKHelper.h" - -struct android_app; - -namespace Diligent -{ - -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); - 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); - - bool CheckWindowSizeChanged() - { - auto new_window_width_ = ANativeWindow_getWidth(app_->window); - auto new_window_height_ = ANativeWindow_getHeight(app_->window); - if (new_window_width_ != window_width_ || new_window_height_ != window_height_) - { - window_width_ = new_window_width_; - window_height_ = new_window_height_; - return true; - } - else - return false; - } - -protected: - virtual void Initialize() - { - CheckWindowSizeChanged(); - } - - 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; - int32_t window_width_ = 0; - int32_t window_height_ = 0; - - ASensorManager* sensor_manager_ = nullptr; - const ASensor* accelerometer_sensor_ = nullptr; - ASensorEventQueue* sensor_event_queue_ = nullptr; -}; - -} // namespace Diligent diff --git a/NativeApp/include/Android/AndroidAppBase.hpp b/NativeApp/include/Android/AndroidAppBase.hpp new file mode 100644 index 0000000..fa42798 --- /dev/null +++ b/NativeApp/include/Android/AndroidAppBase.hpp @@ -0,0 +1,113 @@ +/* Copyright 2015-2018 Egor Yusov + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS. + * + * In no event and under no legal theory, whether in tort (including negligence), + * contract, or otherwise, unless required by applicable law (such as deliberate + * and grossly negligent acts) or agreed to in writing, shall any Contributor be + * liable for any damages, including any direct, indirect, special, incidental, + * or consequential damages of any character arising as a result of this License or + * out of the use or inability to use the software (including but not limited to damages + * for loss of goodwill, work stoppage, computer failure or malfunction, or any and + * all other commercial damages or losses), even if such Contributor has been advised + * of the possibility of such damages. + */ + +#pragma once + +#include + +#include +#include "AppBase.hpp" + +#include "NDKHelper.h" + +struct android_app; + +namespace Diligent +{ + +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); + 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); + + bool CheckWindowSizeChanged() + { + auto new_window_width_ = ANativeWindow_getWidth(app_->window); + auto new_window_height_ = ANativeWindow_getHeight(app_->window); + if (new_window_width_ != window_width_ || new_window_height_ != window_height_) + { + window_width_ = new_window_width_; + window_height_ = new_window_height_; + return true; + } + else + return false; + } + +protected: + virtual void Initialize() + { + CheckWindowSizeChanged(); + } + + 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; + int32_t window_width_ = 0; + int32_t window_height_ = 0; + + ASensorManager* sensor_manager_ = nullptr; + const ASensor* accelerometer_sensor_ = nullptr; + ASensorEventQueue* sensor_event_queue_ = nullptr; +}; + +} // namespace Diligent -- cgit v1.2.3