mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-14 17:40:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Move curve implementations to their own folder

Browse Source
This commit is contained in:
Emma Broman
2020-11-03 17:17:03 +01:00
parent c916545ec5
commit 2447dc3b0f
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/autonavigation/CMakeLists.txt
View File

@@ -28,7 +28,6 @@ set(HEADER_FILES
${CMAKE_CURRENT_SOURCE_DIR}/atnodenavigator.h
${CMAKE_CURRENT_SOURCE_DIR}/autonavigationmodule.h
${CMAKE_CURRENT_SOURCE_DIR}/autonavigationhandler.h
${CMAKE_CURRENT_SOURCE_DIR}/avoidcollisioncurve.h
${CMAKE_CURRENT_SOURCE_DIR}/helperfunctions.h
${CMAKE_CURRENT_SOURCE_DIR}/instruction.h
${CMAKE_CURRENT_SOURCE_DIR}/pathspecification.h
@@ -37,7 +36,8 @@ set(HEADER_FILES
${CMAKE_CURRENT_SOURCE_DIR}/rotationinterpolator.h
${CMAKE_CURRENT_SOURCE_DIR}/speedfunction.h
${CMAKE_CURRENT_SOURCE_DIR}/waypoint.h
${CMAKE_CURRENT_SOURCE_DIR}/zoomoutoverviewcurve.h
${CMAKE_CURRENT_SOURCE_DIR}/curves/avoidcollisioncurve.h
${CMAKE_CURRENT_SOURCE_DIR}/curves/zoomoutoverviewcurve.h
)
source_group("Header Files" FILES ${HEADER_FILES})
@@ -46,7 +46,6 @@ set(SOURCE_FILES
${CMAKE_CURRENT_SOURCE_DIR}/autonavigationmodule.cpp
${CMAKE_CURRENT_SOURCE_DIR}/autonavigationmodule_lua.inl
${CMAKE_CURRENT_SOURCE_DIR}/autonavigationhandler.cpp
${CMAKE_CURRENT_SOURCE_DIR}/avoidcollisioncurve.cpp
${CMAKE_CURRENT_SOURCE_DIR}/helperfunctions.cpp
${CMAKE_CURRENT_SOURCE_DIR}/instruction.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pathspecification.cpp
@@ -55,7 +54,8 @@ set(SOURCE_FILES
${CMAKE_CURRENT_SOURCE_DIR}/rotationinterpolator.cpp
${CMAKE_CURRENT_SOURCE_DIR}/speedfunction.cpp
${CMAKE_CURRENT_SOURCE_DIR}/waypoint.cpp
${CMAKE_CURRENT_SOURCE_DIR}/zoomoutoverviewcurve.cpp
${CMAKE_CURRENT_SOURCE_DIR}/curves/avoidcollisioncurve.cpp
${CMAKE_CURRENT_SOURCE_DIR}/curves/zoomoutoverviewcurve.cpp
)
source_group("Source Files" FILES ${SOURCE_FILES})

2
modules/autonavigation/avoidcollisioncurve.cpp → modules/autonavigation/curves/avoidcollisioncurve.cpp
View File

@@ -22,7 +22,7 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include <modules/autonavigation/avoidcollisioncurve.h>
#include <modules/autonavigation/curves/avoidcollisioncurve.h>
#include <modules/autonavigation/autonavigationmodule.h>
#include <modules/autonavigation/helperfunctions.h>

0
modules/autonavigation/avoidcollisioncurve.h → modules/autonavigation/curves/avoidcollisioncurve.h
View File

2
modules/autonavigation/zoomoutoverviewcurve.cpp → modules/autonavigation/curves/zoomoutoverviewcurve.cpp
View File

@@ -22,7 +22,7 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include <modules/autonavigation/zoomoutoverviewcurve.h>
#include <modules/autonavigation/curves/zoomoutoverviewcurve.h>
#include <modules/autonavigation/autonavigationmodule.h>
#include <modules/autonavigation/helperfunctions.h>

0
modules/autonavigation/zoomoutoverviewcurve.h → modules/autonavigation/curves/zoomoutoverviewcurve.h
View File

4
modules/autonavigation/pathsegment.cpp
View File

@@ -25,12 +25,12 @@
#include <modules/autonavigation/pathsegment.h>
#include <modules/autonavigation/autonavigationmodule.h>
#include <modules/autonavigation/avoidcollisioncurve.h>
#include <modules/autonavigation/helperfunctions.h>
#include <modules/autonavigation/pathcurves.h>
#include <modules/autonavigation/rotationinterpolator.h>
#include <modules/autonavigation/speedfunction.h>
#include <modules/autonavigation/zoomoutoverviewcurve.h>
#include <modules/autonavigation/curves/avoidcollisioncurve.h>
#include <modules/autonavigation/curves/zoomoutoverviewcurve.h>
#include <openspace/engine/globals.h>
#include <openspace/engine/moduleengine.h>
#include <openspace/scene/scenegraphnode.h>