mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-07 12:58:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Jonathan Fransson
2019-03-25 14:37:10 -06:00
committed by ElonOlsson
parent 1e11067e49
commit b27b035cf8
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/space/CMakeLists.txt
View File

@@ -29,7 +29,6 @@ set(HEADER_FILES
${CMAKE_CURRENT_SOURCE_DIR}/rendering/planetgeometry.h
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableconstellationbounds.h
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplanet.h
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablesatellites.h
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablerings.h
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablestars.h
${CMAKE_CURRENT_SOURCE_DIR}/rendering/simplespheregeometry.h
@@ -45,9 +44,8 @@ source_group("Header Files" FILES ${HEADER_FILES})
set(SOURCE_FILES
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablesatellites.cpp
${CMAKE_CURRENT_SOURCE_DIR}/rendering/planetgeometry.cpp
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableconstellationbounds.cpp
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableconstellationbounds.cpp
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplanet.cpp
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablesatellites.cpp
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablerings.cpp
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablestars.cpp
${CMAKE_CURRENT_SOURCE_DIR}/rendering/simplespheregeometry.cpp

12
modules/space/rendering/renderablesatellites.cpp
View File

@@ -251,16 +251,16 @@ RenderableSatellites::RenderableSatellites(const ghoul::Dictionary& dictionary)
* test
*/
const std::string& file = dictionary.value<str::string(KeyFile);
int lineNumber = 1;
if (dictionary.hasKeyAndValue)<double>(KeyLineNumber) {
lineNumber = static_cast<int>(dictionary.value<double>(KeyLineNumber));
const std::string& file = dictionary.value<std::string(KeyFile);
int lineNum = 1;
if (dictionary.hasKeyAndValue)<double>(KeyLineNum) {
lineNum = static_cast<int>(dictionary.value<double>(KeyLineNum));
}
readTLEFile(file, lineNumber);
readTLEFile(file, lineNum);
}
void RenderableSatellites::readTLEFile(const std::string& filename, int lineNumber){
void RenderableSatellites::readTLEFile(const std::string& filename, int lineNum){
ghoul_assert(FileSys.fileExists(filename), "The filename must exist");
std::ifstream file;

6
modules/space/rendering/renderablesatellites.h
View File

@@ -27,7 +27,7 @@
#include <modules/base/rendering/renderabletrail.h>
#include <modules/space/translation/keplertranslation.h>
#include <openspace/util/circlegeometry.h>
//#include <openspace/util/circlegeometry.h>
#include <openspace/properties/stringproperty.h>
#include <openspace/properties/scalar/uintproperty.h>
@@ -116,8 +116,12 @@ private:
#endif // __OPENSPACE_MODULE_BASE___RenderableSatellites___H__
<<<<<<< HEAD
<<<<<<< HEAD
}
=======
}
>>>>>>> some code to test 1 sgn, more renderables
=======
}
>>>>>>> merge