More clang fixes

include/openspace/util/time.h

@@ -188,10 +188,7 @@ private:
     Time& operator=(const Time& rhs) = delete;
 
 	static Time* _instance; ///< The singleton instance
-	
-
-	double _deltaTimePerSecond; ///< The delta time that is used to advance the time
-	
+		
 	//sync variables
 	
 	//local copies 

src/scene/scene.cpp

@@ -467,7 +467,6 @@ bool Scene::loadSceneInternal(const std::string& sceneDescriptionFilePath) {
 
 	glm::vec2 cameraScaling(1);
 	psc cameraPosition(0,0,1,0);
-	glm::vec3 cameraDirection = glm::vec3(0, 0, -1);
 
     //if (_focus->)
     if (focusIterator != _graph.nodes().end()) {
@@ -525,7 +524,6 @@ bool Scene::loadSceneInternal(const std::string& sceneDescriptionFilePath) {
 	// the camera position
 	const SceneGraphNode* fn = OsEng.interactionHandler()->focusNode();
 	//psc relative = fn->worldPosition() - c->position();
-	psc relative = fn->worldPosition() - cameraPosition;
 
 	glm::mat4 la = glm::lookAt(cameraPosition.vec3(), fn->worldPosition().vec3(), c->lookUpVector());
 

src/util/hongkangparser.cpp

@@ -336,14 +336,13 @@ double HongKangParser::getETfromMet(std::string line){
 double HongKangParser::getETfromMet(double met){
 	double diff;
 	double referenceET;
-	double et;
 	openspace::SpiceManager::ref().getETfromDate("2015-07-14T11:50:00.00", referenceET);
-	double missionLaunch = referenceET - _metRef;
+    double et = referenceET;
 
-	diff = abs(met - _metRef);
+    diff = std::abs(met - _metRef);
 	if (met > _metRef){
 		et = referenceET + diff;
-	}else if (met < _metRef){
+	} else if (met < _metRef){
 		et = referenceET - diff;
 	}
 	return et;

src/util/imagesequencer.cpp

@@ -78,8 +78,8 @@ ImageSequencer::ImageSequencer()
     : _nextCapture(-1.0)
 	, _currentTime(-1.0)
 	, _sequenceIDs(0)
-	, _targetsAdded(false)
     , _defaultCaptureImage(absPath("${OPENSPACE_DATA}/scene/common/textures/placeholder_blank.png"))
+    , _targetsAdded(false)
 {}
 
 
@@ -380,7 +380,7 @@ double ImageSequencer::getMissionElapsedTime(std::string timestr){
 	//met ref time.
 	openspace::SpiceManager::ref().getETfromDate("2015-07-14T11:50:00.00", et);
 
-	diff = abs(met - _metRef);
+    diff = std::abs(met - _metRef);
 	if (met > _metRef){
 		et += diff;
 	}
@@ -466,7 +466,6 @@ bool ImageSequencer::parsePlaybookFile(const std::string& fileName, int& sequenc
 				if (!file.good()) LERROR("Failed to open txt file '" << fileName << "'");
 
 				std::string timestr = "";
-				double shutter = 0.01;
 				double et;
 				
 				//@TODO: change similar to renderableFOV

src/util/imagesequencer2.cpp

@@ -45,10 +45,10 @@ namespace openspace {
 
 ImageSequencer2* ImageSequencer2::_instance = nullptr;
 
-ImageSequencer2::ImageSequencer2() :
-_hasData(false),
-_latestImage(),
-_defaultCaptureImage(absPath("${OPENSPACE_DATA}/scene/common/textures/placeholder_blank.png"))
+ImageSequencer2::ImageSequencer2()
+    : _defaultCaptureImage(absPath("${OPENSPACE_DATA}/scene/common/textures/placeholder_blank.png"))
+    , _latestImage()
+    , _hasData(false)
 {}
 
 ImageSequencer2& ImageSequencer2::ref() {

src/util/powerscaledcoordinate.cpp

@@ -74,9 +74,9 @@ PowerScaledCoordinate
     char buff[600];
 
     // find the number with maximum number of digits
-    double ad1 = abs(d1);
-    double ad2 = abs(d2);
-    double ad3 = abs(d3);
+    double ad1 = std::abs(d1);
+    double ad2 = std::abs(d2);
+    double ad3 = std::abs(d3);
     double max = (ad2 > ad1) ? ad2 : (ad3 > ad1) ? ad3 : ad1;
 
     // find out how many digits

src/util/powerscaledscalar.cpp

@@ -53,7 +53,7 @@ PowerScaledScalar PowerScaledScalar::CreatePSS(double d1) {
 	char buff[30];
 
 	// find the number with maximum number of digits
-	double ad1 = abs(d1);
+    double ad1 = std::abs(d1);
 
 	// find out how many digits
 	sprintf ( buff, "%.0f", ad1);

src/util/spicemanager.cpp

@@ -819,6 +819,8 @@ bool SpiceManager::getPositionTransformMatrix(const std::string& fromFrame,
 		bool hasError = checkForError("Error retrieving position transform matrix from "
 			"frame '" + fromFrame + "' to frame '" + toFrame +
 			"' at time '" + std::to_string(ephemerisTime));
+        if (hasError)
+            return false;
 	}
 
     positionMatrix = glm::transpose(positionMatrix);

src/util/time.cpp

@@ -172,17 +172,16 @@ int time_currentTimeUTC(lua_State* L) {
 Time* Time::_instance = nullptr;
 
 Time::Time()
-	: _time(-1.0)
+    : _time(-1.0)
 	, _dt(1.0)
 	, _timeJumped(false)
     , _timePaused(false)
+    , _sharedTime(-1.0)
+    , _sharedDt(1.0)
+    , _sharedTimeJumped(false)
 	, _syncedTime(-1.0)
 	, _syncedDt(1.0)
 	, _syncedTimeJumped(false)
-	, _deltaTimePerSecond(1.0)
-	, _sharedTime(-1.0)
-	, _sharedDt(1.0)
-	, _sharedTimeJumped(false)
 {
 }