diff --git a/ext/ghoul b/ext/ghoul index 1f1386215e..ba68d54517 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit 1f1386215e517179f7a4e80e64693fd3ebc2b339 +Subproject commit ba68d5451755ed20baccaf82dcb886186b5a1834 diff --git a/openspace-data b/openspace-data index 765e241626..26b896ed47 160000 --- a/openspace-data +++ b/openspace-data @@ -1 +1 @@ -Subproject commit 765e241626e3b67170fb08c6561f2fd1dfe97b92 +Subproject commit 26b896ed47ced54d24245d8947b8b2f47551740a diff --git a/scripts/default_startup.lua b/scripts/default_startup.lua index e574ef21f1..cb4071ff30 100644 --- a/scripts/default_startup.lua +++ b/scripts/default_startup.lua @@ -3,6 +3,6 @@ openspace.time.setTime("2007-02-26T17:00:00") --openspace.time.setTime("2006-08-22T20:00:00") --openspace.time.setDeltaTime(200000.0) -openspace.time.setDeltaTime(2000.0) +openspace.time.setDeltaTime(200000.0) --openspace.time.setDeltaTime(30000.0) -- print(openspace.time.currentTimeUTC()) diff --git a/shaders/pscstandard_fs.glsl b/shaders/pscstandard_fs.glsl index 3d1c243bba..ab973718df 100644 --- a/shaders/pscstandard_fs.glsl +++ b/shaders/pscstandard_fs.glsl @@ -70,8 +70,8 @@ void main() spec = specular * pow(intSpec, shine); } */ - diffuse = max(intensity * diffuse, ambient); - + //diffuse = max(intensity * diffuse, ambient); + //diffuse = vec4(1); ABufferStruct_t frag = createGeometryFragment(diffuse, position, depth); addToBuffer(frag); diff --git a/src/scenegraph/spiceephemeris.cpp b/src/scenegraph/spiceephemeris.cpp index 45aa2d18ed..4623406fc1 100644 --- a/src/scenegraph/spiceephemeris.cpp +++ b/src/scenegraph/spiceephemeris.cpp @@ -76,6 +76,7 @@ void SpiceEphemeris::update(const UpdateData& data) { glm::dvec3 position(0,0,0); double lightTime = 0.0; SpiceManager::ref().getTargetPosition(_targetName, _originName, "GALACTIC", "NONE", data.time, position, lightTime); + _position = psc::CreatePowerScaledCoordinate(position.x, position.y, position.z); _position[3] += 3; }