mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-05 19:19:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

SGCT compile fix

Browse Source 
First pass for pull request
This commit is contained in:
Alexander Bock
2020-06-11 00:24:58 +02:00
parent 748fc64d60
commit 433d96bbb4
19 changed files with 306 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/profile/test_common.h
View File

@@ -422,7 +422,7 @@ end)";
const std::string detectChangedPropsResult_1 = "\
#Version\n\
" + profileFormatVersion + "\n\
" + std::string(Profile::FormatVersion) + "\n\
\n\
#Module\n\
\n\
@@ -456,7 +456,7 @@ Sun\n\
const std::string detectChangedAssetsResult_1 = "\
#Version\n\
" + profileFormatVersion + "\n\
" + std::string(Profile::FormatVersion) + "\n\
\n\
#Module\n\
\n\
@@ -489,7 +489,7 @@ Sun\n\
const std::string detectChangedAssetsResult_2 = "\
#Version\n\
" + profileFormatVersion + "\n\
" + std::string(Profile::FormatVersion) + "\n\
\n\
#Module\n\
\n\
@@ -521,7 +521,7 @@ Sun\n\
const std::string detectChangedAssetsResult_3 = "\
#Version\n\
" + profileFormatVersion + "\n\
" + std::string(Profile::FormatVersion) + "\n\
\n\
#Module\n\
\n\
@@ -553,7 +553,7 @@ Sun\n\
const std::string detectChangedAssetsResult_4 = "\
#Version\n\
" + profileFormatVersion + "\n\
" + std::string(Profile::FormatVersion) + "\n\
\n\
#Module\n\
\n\
@@ -585,7 +585,7 @@ Sun\n\
const std::string detectChangedAssetsResult_5 = "\
#Version\n\
" + profileFormatVersion + "\n\
" + std::string(Profile::FormatVersion) + "\n\
\n\
#Module\n\
\n\
@@ -618,7 +618,7 @@ Sun\n\
const std::string detectChangedAssetsResult_6 = "\
#Version\n\
" + profileFormatVersion + "\n\
" + std::string(Profile::FormatVersion) + "\n\
\n\
#Module\n\
\n\

16
tests/profile/test_profile.cpp
View File

@@ -56,10 +56,10 @@ namespace {
class Profile2 : public Profile {
public:
Profile2(AssetLoader& refAssetLoader) : _assLoader(refAssetLoader) {}
std::string getCurrentTimeUTC() override {
std::string currentTimeUTC() const override {
return "2020-02-29T01:23:45.00";
}
interaction::NavigationHandler::NavigationState getCurrentCameraState() override {
interaction::NavigationHandler::NavigationState currentCameraState() const override {
interaction::NavigationHandler::NavigationState n;
n.anchor = "Earth";
n.aim = "Sun";
@@ -73,24 +73,24 @@ public:
void addPropertiesMarkedAsChanged(std::string formattedLine) {
_scenegraphProps.push_back(formattedLine);
}
std::vector<std::string> getChangedPropertiesFormatted() override {
std::vector<std::string> changedPropertiesFormatted() override {
std::vector<std::string> formattedLines;
for (std::string s : _scenegraphProps) {
formattedLines.push_back(s);
}
return formattedLines;
}
bool usingProfile() override {
bool usingProfile() const override {
return true;
}
std::string initialProfile() override {
std::string initialProfile() const override {
return _initProfile;
}
void setInitialProfile(std::string file) {
_initProfile = file;
}
std::vector<Profile::AssetEvent> listOfAllAssetEvents() override {
return _assLoader.listOfAllAssetEvents();
std::vector<Profile::AssetEvent> assetEvents() const override {
return _assLoader.assetEvents();
}
void setProfileBaseDirectory(std::string dir) {
_profileBaseDirectory = dir;
@@ -235,7 +235,7 @@ TEST_CASE("profile: Detect new added assets after reset", "[profile]") {
asset->initialize();
std::shared_ptr<openspace::Asset> asset2 = assetLoader.add("test2");
asset2->initialize();
assetLoader.listOfAllAssetEvents_reset();
assetLoader.resetAssetEvents();
std::shared_ptr<openspace::Asset> asset3 = assetLoader.add("test3");
asset3->initialize();
std::shared_ptr<openspace::Asset> asset4 = assetLoader.add("test4");