mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-25 05:28:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Rename Ephemeris files to Translation

Browse Source
This commit is contained in:
Alexander Bock
2016-09-26 13:48:39 +02:00
parent a688a1eee9
commit 7ddccd8172
13 changed files with 26 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/scene/scenegraphnode.h
+1 -1
View File
@@ -29,7 +29,7 @@
#include <openspace/documentation/documentation.h>
#include <openspace/rendering/renderable.h>
#include <openspace/scene/ephemeris.h>
#include <openspace/scene/translation.h>
#include <openspace/scene/rotation.h>
#include <openspace/scene/scale.h>
#include <openspace/properties/propertyowner.h>
include/openspace/scene/ephemeris.h → include/openspace/scene/translation.h
+3 -3
View File
@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __EPHEMERIS_H__
#define __EPHEMERIS_H__
#ifndef __TRANSLATION_H__
#define __TRANSLATION_H__
#include <openspace/properties/propertyowner.h>
@@ -48,4 +48,4 @@ public:
} // namespace openspace
#endif // __EPHEMERIS_H__
#endif // __TRANSLATION_H__
modules/base/CMakeLists.txt
+4 -4
View File
@@ -42,8 +42,8 @@ set(HEADER_FILES
${CMAKE_CURRENT_SOURCE_DIR}/rendering/simplespheregeometry.h
${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspaceframebuffer.h
${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspaceimage.h
${CMAKE_CURRENT_SOURCE_DIR}/ephemeris/spiceephemeris.h
${CMAKE_CURRENT_SOURCE_DIR}/ephemeris/staticephemeris.h
${CMAKE_CURRENT_SOURCE_DIR}/translation/spicetranslation.h
${CMAKE_CURRENT_SOURCE_DIR}/translation/statictranslation.h
${CMAKE_CURRENT_SOURCE_DIR}/rotation/spicerotation.h
${CMAKE_CURRENT_SOURCE_DIR}/rotation/staticrotation.h
${CMAKE_CURRENT_SOURCE_DIR}/scale/staticscale.h
@@ -68,8 +68,8 @@ set(SOURCE_FILES
${CMAKE_CURRENT_SOURCE_DIR}/rendering/simplespheregeometry.cpp
${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspaceframebuffer.cpp
${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspaceimage.cpp
${CMAKE_CURRENT_SOURCE_DIR}/ephemeris/spiceephemeris.cpp
${CMAKE_CURRENT_SOURCE_DIR}/ephemeris/staticephemeris.cpp
${CMAKE_CURRENT_SOURCE_DIR}/translation/spicetranslation.cpp
${CMAKE_CURRENT_SOURCE_DIR}/translation/statictranslation.cpp
${CMAKE_CURRENT_SOURCE_DIR}/rotation/spicerotation.cpp
${CMAKE_CURRENT_SOURCE_DIR}/rotation/staticrotation.cpp
${CMAKE_CURRENT_SOURCE_DIR}/scale/staticscale.cpp
modules/base/basemodule.cpp
+2 -2
View File
@@ -48,8 +48,8 @@
#include <modules/base/rendering/screenspaceimage.h>
#include <modules/base/rendering/screenspaceframebuffer.h>
#include <modules/base/ephemeris/staticephemeris.h>
#include <modules/base/ephemeris/spiceephemeris.h>
#include <modules/base/translation/statictranslation.h>
#include <modules/base/translation/spicetranslation.h>
#include <modules/base/rotation/staticrotation.h>
#include <modules/base/rotation/spicerotation.h>
modules/base/ephemeris/spiceephemeris.cpp → modules/base/translation/spicetranslation.cpp
+1 -1
View File
@@ -22,7 +22,7 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include <modules/base/ephemeris/spiceephemeris.h>
#include <modules/base/translation/spicetranslation.h>
#include <openspace/util/spicemanager.h>
#include <openspace/util/time.h>
modules/base/ephemeris/spiceephemeris.h → modules/base/translation/spicetranslation.h
+4 -4
View File
@@ -22,10 +22,10 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __SPICEEPHEMERIS_H__
#define __SPICEEPHEMERIS_H__
#ifndef __SPICETRANSLATION_H__
#define __SPICETRANSLATION_H__
#include <openspace/scene/ephemeris.h>
#include <openspace/scene/translation.h>
#include <openspace/documentation/documentation.h>
#include <openspace/properties/stringproperty.h>
@@ -50,4 +50,4 @@ private:
} // namespace openspace
#endif // __SPICEEPHEMERIS_H__
#endif // __SPICETRANSLATION_H__
modules/base/ephemeris/staticephemeris.cpp → modules/base/translation/statictranslation.cpp
+1 -1
View File
@@ -22,7 +22,7 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include <modules/base/ephemeris/staticephemeris.h>
#include <modules/base/translation/statictranslation.h>
#include <openspace/documentation/verifier.h>
modules/base/ephemeris/staticephemeris.h → modules/base/translation/statictranslation.h
+4 -4
View File
@@ -22,10 +22,10 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __STATICEPHEMERIS_H__
#define __STATICEPHEMERIS_H__
#ifndef __STATICTRANSLATION_H__
#define __STATICTRANSLATION_H__
#include <openspace/scene/ephemeris.h>
#include <openspace/scene/translation.h>
#include <openspace/documentation/documentation.h>
#include <openspace/properties/vectorproperty.h>
@@ -48,4 +48,4 @@ private:
} // namespace openspace
#endif // __STATICEPHEMERIS_H__
#endif // __STATICTRANSLATION_H__
src/CMakeLists.txt
+2 -2
View File
@@ -83,7 +83,7 @@ set(OPENSPACE_SOURCE
${OPENSPACE_BASE_DIR}/src/rendering/renderengine_lua.inl
${OPENSPACE_BASE_DIR}/src/rendering/screenspacerenderable.cpp
${OPENSPACE_BASE_DIR}/src/rendering/transferfunction.cpp
${OPENSPACE_BASE_DIR}/src/scene/ephemeris.cpp
${OPENSPACE_BASE_DIR}/src/scene/translation.cpp
${OPENSPACE_BASE_DIR}/src/scene/rotation.cpp
${OPENSPACE_BASE_DIR}/src/scene/scale.cpp
${OPENSPACE_BASE_DIR}/src/scene/scene.cpp
@@ -183,7 +183,7 @@ set(OPENSPACE_HEADER
${OPENSPACE_BASE_DIR}/include/openspace/rendering/screenspacerenderable.h
${OPENSPACE_BASE_DIR}/include/openspace/rendering/volumeraycaster.h
${OPENSPACE_BASE_DIR}/include/openspace/rendering/transferfunction.h
${OPENSPACE_BASE_DIR}/include/openspace/scene/ephemeris.h
${OPENSPACE_BASE_DIR}/include/openspace/scene/translation.h
${OPENSPACE_BASE_DIR}/include/openspace/scene/rotation.h
${OPENSPACE_BASE_DIR}/include/openspace/scene/scale.h
${OPENSPACE_BASE_DIR}/include/openspace/scene/scene.h
src/engine/openspaceengine.cpp
+1 -1
View File
@@ -45,7 +45,7 @@
#include <openspace/rendering/renderengine.h>
#include <openspace/scripting/scriptengine.h>
#include <openspace/scripting/scriptscheduler.h>
#include <openspace/scene/ephemeris.h>
#include <openspace/scene/translation.h>
#include <openspace/scene/scene.h>
#include <openspace/util/factorymanager.h>
#include <openspace/util/time.h>
src/rendering/renderengine.cpp
-4
View File
@@ -84,10 +84,6 @@
#include <sgct.h>
#include <stack>
// These are temporary ---abock
#include <modules/base/ephemeris/spiceephemeris.h>
#include <modules/base/ephemeris/staticephemeris.h>
// ABuffer defines
#define RENDERER_FRAMEBUFFER 0
#define RENDERER_ABUFFER 1
src/scene/scenegraphnode.cpp
+1 -1
View File
@@ -39,7 +39,7 @@
#include <ghoul/opengl/programobject.h>
#include <ghoul/opengl/shaderobject.h>
#include <modules/base/ephemeris/staticephemeris.h>
#include <modules/base/translation/statictranslation.h>
#include <modules/base/rotation/staticrotation.h>
#include <modules/base/scale/staticscale.h>
src/scene/ephemeris.cpp → src/scene/translation.cpp
+2 -1
View File
@@ -22,7 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include <openspace/scene/ephemeris.h>
#include <openspace/scene/translation.h>
#include <openspace/util/factorymanager.h>
#include <ghoul/logging/logmanager.h>