mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-08 04:31:08 -06:00
Code cleanup
This commit is contained in:
@@ -64,7 +64,6 @@ void MultiThreadedSceneInitializer::initializeNode(SceneGraphNode* node) {
|
||||
|
||||
node->initialize();
|
||||
std::lock_guard<std::mutex> g(_mutex);
|
||||
LDEBUG("Thread Initialized " << node->name());
|
||||
_initializedNodes.push_back(node);
|
||||
_initializingNodes.erase(node);
|
||||
|
||||
@@ -89,9 +88,6 @@ void MultiThreadedSceneInitializer::initializeNode(SceneGraphNode* node) {
|
||||
std::vector<SceneGraphNode*> MultiThreadedSceneInitializer::getInitializedNodes() {
|
||||
std::lock_guard<std::mutex> g(_mutex);
|
||||
std::vector<SceneGraphNode*> nodes = std::move(_initializedNodes);
|
||||
if (!nodes.empty()) {
|
||||
LDEBUG("Returning nodes...");
|
||||
}
|
||||
return nodes;
|
||||
}
|
||||
|
||||
|
||||
@@ -111,11 +111,7 @@ void Time::setTime(std::string time, bool requireJump) {
|
||||
}
|
||||
|
||||
std::string Time::UTC() const {
|
||||
try {
|
||||
return SpiceManager::ref().dateFromEphemerisTime(_time);
|
||||
} catch (const SpiceManager::SpiceException& c) {
|
||||
return "0000 JAN 00 T00:00:00.00";
|
||||
}
|
||||
return SpiceManager::ref().dateFromEphemerisTime(_time);
|
||||
}
|
||||
|
||||
std::string Time::ISO8601() const {
|
||||
|
||||
@@ -27,7 +27,6 @@
|
||||
#include <ghoul/glm.h>
|
||||
|
||||
#include <chrono>
|
||||
#include <cmath>
|
||||
|
||||
namespace {
|
||||
constexpr double SecondsPerYear = 31556952; // seconds in average Gregorian year
|
||||
@@ -46,7 +45,7 @@ namespace {
|
||||
namespace openspace {
|
||||
|
||||
std::pair<double, std::string> simplifyTime(double seconds) {
|
||||
double secondsVal = std::abs(seconds);
|
||||
double secondsVal = glm::abs(seconds);
|
||||
|
||||
if (secondsVal > 1e-3 && secondsVal < SecondsPerMinute) {
|
||||
return { seconds, seconds == 1.0 ? "second" : "seconds" };
|
||||
|
||||
@@ -115,7 +115,6 @@ int main(int argc, char** argv) {
|
||||
bool close;
|
||||
bool consoleLog = false;
|
||||
|
||||
|
||||
// Workaround for Visual Studio Google Test Adapter:
|
||||
// Do not try to initialize osengine if gtest is just listing tests
|
||||
bool skipOsEng = false;
|
||||
|
||||
Reference in New Issue
Block a user