From 83c0bc5ca6ec074331bc86c22c6281822f38d927 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Tue, 17 Aug 2021 22:23:42 +0200 Subject: [PATCH] Moved MoveCameraAnimation.h from es-app to es-core. --- es-app/CMakeLists.txt | 3 --- es-core/CMakeLists.txt | 1 + {es-app => es-core}/src/animations/MoveCameraAnimation.h | 6 +++--- 3 files changed, 4 insertions(+), 6 deletions(-) rename {es-app => es-core}/src/animations/MoveCameraAnimation.h (85%) diff --git a/es-app/CMakeLists.txt b/es-app/CMakeLists.txt index d2202eb0b..9af8aaee8 100644 --- a/es-app/CMakeLists.txt +++ b/es-app/CMakeLists.txt @@ -48,9 +48,6 @@ set(ES_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/src/views/SystemView.h ${CMAKE_CURRENT_SOURCE_DIR}/src/views/UIModeController.h ${CMAKE_CURRENT_SOURCE_DIR}/src/views/ViewController.h - - # Animations - ${CMAKE_CURRENT_SOURCE_DIR}/src/animations/MoveCameraAnimation.h ) set(ES_SOURCES diff --git a/es-core/CMakeLists.txt b/es-core/CMakeLists.txt index 5be39b28d..c28cadc36 100644 --- a/es-core/CMakeLists.txt +++ b/es-core/CMakeLists.txt @@ -22,6 +22,7 @@ set(CORE_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/src/animations/Animation.h ${CMAKE_CURRENT_SOURCE_DIR}/src/animations/AnimationController.h ${CMAKE_CURRENT_SOURCE_DIR}/src/animations/LambdaAnimation.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/animations/MoveCameraAnimation.h # GUI components ${CMAKE_CURRENT_SOURCE_DIR}/src/components/AnimatedImageComponent.h diff --git a/es-app/src/animations/MoveCameraAnimation.h b/es-core/src/animations/MoveCameraAnimation.h similarity index 85% rename from es-app/src/animations/MoveCameraAnimation.h rename to es-core/src/animations/MoveCameraAnimation.h index 9111a51b1..b84964ad4 100644 --- a/es-app/src/animations/MoveCameraAnimation.h +++ b/es-core/src/animations/MoveCameraAnimation.h @@ -6,8 +6,8 @@ // Animation to play when moving the camera, used by the slide transition style. // -#ifndef ES_APP_ANIMATIONS_MOVE_CAMERA_ANIMATION_H -#define ES_APP_ANIMATIONS_MOVE_CAMERA_ANIMATION_H +#ifndef ES_CORE_ANIMATIONS_MOVE_CAMERA_ANIMATION_H +#define ES_CORE_ANIMATIONS_MOVE_CAMERA_ANIMATION_H #include "animations/Animation.h" #include "utils/MathUtil.h" @@ -38,4 +38,4 @@ private: glm::vec3 mTarget; }; -#endif // ES_APP_ANIMATIONS_MOVE_CAMERA_ANIMATION_H +#endif // ES_CORE_ANIMATIONS_MOVE_CAMERA_ANIMATION_H