added changes to make things work on my end

openspace.cfg

@@ -1,5 +1,6 @@
 return {
 	Paths = {
+		BASE_PATH = "C:/Users/michal/Documents/openspace3",
 		SGCT = "${BASE_PATH}/config/sgct",
 		SCRIPTS = "${BASE_PATH}/scripts",
 		SHADERS = "${BASE_PATH}/shaders",

src/rendering/planets/renderableplanet.cpp

@@ -163,7 +163,7 @@ void RenderablePlanet::render(const RenderData& data)
 void RenderablePlanet::update(const UpdateData& data)
 {
 	// set spice-orientation in accordance to timestamp
-	openspace::SpiceManager::ref().getPositionTransformMatrix("GALACTIC", "IAU_EARTH", data.time, _stateMatrix);
+	openspace::SpiceManager::ref().getPositionTransformMatrix("IAU_EARTH", "GALACTIC", data.time, _stateMatrix);
 
 }
 

src/rendering/renderablesphericalgrid.cpp

@@ -41,7 +41,7 @@ namespace {
 namespace openspace {
 
 // needs to be set from dictionary - REMEMBER
-const PowerScaledScalar radius = PowerScaledScalar(1000.f, 6.f);
+const PowerScaledScalar radius = PowerScaledScalar(1.f, 20.f);
 
 RenderableSphericalGrid::RenderableSphericalGrid(const ghoul::Dictionary& dictionary)  
 : Renderable(dictionary)
@@ -101,19 +101,6 @@ RenderableSphericalGrid::RenderableSphericalGrid(const ghoul::Dictionary& dictio
 			if (round(y) == 0.0f) _varray[nr].tex[0] = -2;
 			_varray[nr].tex[1] = t2;
 
-			/* // we wont do this anymore, old code, now static grids. ignore or remove.
-			glm::mat4 rot = glm::rotate(glm::mat4(1), 90.f, glm::vec3(1, 0, 0));
-			glm::mat4 transform(1);
-			glm::dmat3 stateMatrix;
-			double initTime = 0;
-			openspace::SpiceManager::ref().getPositionTransformMatrixGLM("IAU_EARTH", "GALACTIC", 0, stateMatrix);
-			
-			for (int i = 0; i < 3; i++){
-				for (int j = 0; j < 3; j++){
-					transform[i][j] = stateMatrix[i][j];
-				}
-			}
-			*/
 			glm::vec4 tmp(x, y, z, 1);
 			glm::mat4 rot = glm::rotate(glm::mat4(1), 90.f, glm::vec3(1, 0, 0));
 			tmp = _gridMatrix*rot*tmp;

src/rendering/stars/renderablestars.cpp

@@ -57,7 +57,7 @@ int printOglError(char *file, int line){
 
 
 #define GLSPRITES
-#define GLPOINTS
+//#define GLPOINTS
 
 namespace {
 	const std::string _loggerCat = "RenderableStars";
@@ -341,11 +341,11 @@ void RenderableStars::render(const RenderData& data){
 	_haloProgram->deactivate();
 
 #ifdef GLPOINTS
-	/*
+
 // ---------------------- RENDER POINTS -----------------------------
 	_pointProgram->activate();
 
-	_pointProgram->setUniform("ViewProjection", camera->viewProjectionMatrix());
+	_pointProgram->setUniform("ViewProjection", data.camera.viewProjectionMatrix);
 	_pointProgram->setUniform("ModelTransform", transform);
 	_pointProgram->setUniform("campos", campos.vec4());
 	_pointProgram->setUniform("objpos", currentPosition.vec4());
@@ -362,12 +362,8 @@ void RenderableStars::render(const RenderData& data){
 	glDisable(GL_BLEND);
 	
 	_pointProgram->deactivate();
-<<<<<<< HEAD
 	glEnable(GL_DEPTH_TEST);
 
-=======
-	*/
-//>>>>>>> develop
 #endif
 }
 

src/scenegraph/scenegraph.cpp

@@ -175,6 +175,16 @@ bool SceneGraph::initialize()
 	_programs.push_back(tmpProgram);
     OsEng.ref().configurationManager().setValue("pscShader", tmpProgram);
 
+	// pscstandard
+	tmpProgram = ProgramObject::Build("EphemerisProgram",
+		"${SHADERS}/ephemeris_vs.glsl",
+		"${SHADERS}/ephemeris_fs.glsl",
+		cb);
+	if (!tmpProgram) return false;
+	_programs.push_back(tmpProgram);
+	OsEng.ref().configurationManager().setValue("EphemerisProgram", tmpProgram);
+
+
     // RaycastProgram
 	tmpProgram = ProgramObject::Build("RaycastProgram",
 		"${SHADERS}/exitpoints.vert",