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

Making OpenSpaceTest application compile with API change

Browse Source 
Set default start to July 2015
Move default window out of the corner
Compile fixes
This commit is contained in:
Alexander Bock
2016-01-14 16:05:29 +01:00
parent b43f622a9f
commit bae8d0aa76
6 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/sgct/single.xml
View File

@@ -14,7 +14,7 @@
<!-- <Size x="960" y="540" /> -->
<!-- <Size x="640" y="360" /> -->
<!--<Size x="640" y="310" />-->
<Pos x="0" y="0" />
<Pos x="50" y="50" />
<Viewport>
<Pos x="0.0" y="0.0" />
<Size x="1.0" y="1.0" />

20
modules/base/rendering/renderabletrail.cpp
View File

@@ -284,6 +284,7 @@ void RenderableTrail::fullYearSweep(double time) {
_vertexArray.resize(segments+2);
glm::dvec3 p;
bool failed = false;
for (int i = 0; i < segments+2; i++) {
if (start > time && intervalSet) {
time = start;
@@ -292,14 +293,17 @@ void RenderableTrail::fullYearSweep(double time) {
time = end;
}
try {
p =
SpiceManager::ref().targetPosition(_target, _observer, _frame, {}, time, lightTime);
}
catch (const SpiceManager::SpiceException& e) {
// This fires for PLUTO BARYCENTER and SUN and uses the only value sometimes?
// ---abock
LERROR(e.what());
if (!failed || intervalSet) {
try {
p =
SpiceManager::ref().targetPosition(_target, _observer, _frame, {}, time, lightTime);
}
catch (const SpiceManager::SpiceException& e) {
// This fires for PLUTO BARYCENTER and SUN and uses the only value sometimes?
// ---abock
LERROR(e.what());
failed = true;
}
}
psc pscPos = PowerScaledCoordinate::CreatePowerScaledCoordinate(p.x, p.y, p.z);

4
openspace.cfg
View File

@@ -7,7 +7,7 @@ return {
-- Sets the scene that is to be loaded by OpenSpace. A scene file is a description
-- of all entities that will be visible during an instance of OpenSpace
Scene = "${SCENE}/default.scene",
Scene = "${SCENE}/default_nh.scene",
Paths = {
SGCT = "${BASE_PATH}/config/sgct",
@@ -55,5 +55,5 @@ return {
File = "${BASE_PATH}/Properties.txt"
},
DownloadRequestURL = "http://openspace.itn.liu.se/request.cgi",
-- RenderingMethod = "ABufferFrameBuffer"
--RenderingMethod = "ABufferFrameBuffer"
}

4
scripts/default_startup.lua
View File

@@ -5,7 +5,7 @@
openspace.setInvertRoll(true);
--openspace.setInteractionSensitivity(10) -- This is the default value for the sensitivity (the higher, the more sensitive)
openspace.time.setTime("2007 FEB 27 16:30:00") -- This is the start time for a Jupiter run of New Horizons
-- openspace.time.setTime("2007 FEB 27 16:30:00") -- This is the start time for a Jupiter run of New Horizons
--openspace.time.setTime("2011 AUG 06 00:00:00") -- Dawn takes pictures of Vesta
--openspace.time.setTime("2011 JUL 28 12:00:00") -- Rosetta starts dancing around 67p
@@ -13,7 +13,7 @@ openspace.time.setTime("2007 FEB 27 16:30:00") -- This is the start tim
--TESTING ALICE
--openspace.time.setTime("2015-07-13T00:00:00.00")
--openspace.time.setTime("2015-07-14T10:00:00.00")
openspace.time.setTime("2015-07-14T10:00:00.00")
openspace.time.setDeltaTime(0) -- How many seconds pass per second of realtime, changeable in the GUI

2
src/util/screenlog.cpp
View File

@@ -24,6 +24,8 @@
#include <openspace/util/screenlog.h>
#include <algorithm>
using std::string;
namespace openspace {

4
tests/main.cpp
View File

@@ -36,7 +36,7 @@
//#include <test_luaconversions.inl>
//#include <test_powerscalecoordinates.inl>
#include <openspace/engine/openspaceengine.h>
#include <openspace/engine/wrapper/dummywindowwrapper.h>
#include <openspace/engine/wrapper/windowwrapper.h>
#include <openspace/engine/configurationmanager.h>
#include <openspace/util/factorymanager.h>
#include <openspace/util/time.h>
@@ -53,7 +53,7 @@ namespace {
int main(int argc, char** argv) {
std::vector<std::string> args;
openspace::OpenSpaceEngine::create(argc, argv, std::make_unique<openspace::DummyWindowWrapper>(), args);
openspace::OpenSpaceEngine::create(argc, argv, std::make_unique<openspace::WindowWrapper>(), args);
testing::InitGoogleTest(&argc, argv);
return RUN_ALL_TESTS();