mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-04-23 12:39:24 -05:00
Remove warnings on MacOS
This commit is contained in:
@@ -849,7 +849,7 @@ void OpenSpaceEngine::runGlobalCustomizationScripts(const std::string& sceneDesc
|
||||
std::string k = ConfigurationManager::KeyGlobalCustomizationScripts;
|
||||
if (_configurationManager->hasKey(k)) {
|
||||
ghoul::Dictionary dict = _configurationManager->value<ghoul::Dictionary>(k);
|
||||
for (int i = 1; i <= dict.size(); ++i) {
|
||||
for (int i = 1; i <= static_cast<int>(dict.size()); ++i) {
|
||||
std::string script = absPath(dict.value<std::string>(std::to_string(i)));
|
||||
|
||||
if (FileSys.fileExists(script)) {
|
||||
|
||||
@@ -68,7 +68,7 @@ void SettingsEngine::initialize() {
|
||||
const std::size_t found = scenes[i].find_last_of("/\\");
|
||||
_scenes.addOption(static_cast<int>(i), scenes[i].substr(found + 1));
|
||||
}
|
||||
_scenes.addOption(scenes.size(), "None");
|
||||
_scenes.addOption(static_cast<int>(scenes.size()), "None");
|
||||
|
||||
// Set interaction to change ConfigurationManager and schedule the load
|
||||
_scenes.onChange([this, nScenes, sceneDir]() {
|
||||
|
||||
@@ -62,17 +62,17 @@ void Dashboard::addDashboardItem(std::unique_ptr<DashboardItem> item) {
|
||||
}
|
||||
|
||||
void Dashboard::removeDashboardItem(int index) {
|
||||
ghoul_assert(index < _items.size(), "Invalid index");
|
||||
ghoul_assert(index < static_cast<int>(_items.size()), "Invalid index");
|
||||
removePropertySubOwner(_items[index].get());
|
||||
_items.erase(_items.begin() + index);
|
||||
}
|
||||
|
||||
bool Dashboard::hasItem(int index) const {
|
||||
return (index >= 0) && (index < _items.size());
|
||||
return (index >= 0) && (index < static_cast<int>(_items.size()));
|
||||
}
|
||||
|
||||
const DashboardItem& Dashboard::item(int index) const {
|
||||
ghoul_assert(index < _items.size(), "Invalid index");
|
||||
ghoul_assert(index < static_cast<int>(_items.size()), "Invalid index");
|
||||
return *_items[index];
|
||||
}
|
||||
|
||||
|
||||
+2
-1
@@ -58,6 +58,7 @@
|
||||
#include <string>
|
||||
#include <stack>
|
||||
#include <unordered_map>
|
||||
#include <vector>
|
||||
|
||||
#include "scene_lua.inl"
|
||||
|
||||
@@ -89,8 +90,8 @@ Scene::Scene(std::unique_ptr<SceneInitializer> initializer)
|
||||
},
|
||||
"${WEB}/properties/script.js"
|
||||
)
|
||||
, _initializer(std::move(initializer))
|
||||
, _dirtyNodeRegistry(false)
|
||||
, _initializer(std::move(initializer))
|
||||
{
|
||||
_rootDummy.setName(SceneGraphNode::RootNodeName);
|
||||
_rootDummy.setScene(this);
|
||||
|
||||
@@ -335,7 +335,6 @@ void SceneGraphNode::update(const UpdateData& data) {
|
||||
}
|
||||
|
||||
void SceneGraphNode::render(const RenderData& data, RendererTasks& tasks) {
|
||||
State s = _state;
|
||||
if (_state != State::GLInitialized) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -29,10 +29,6 @@
|
||||
|
||||
#include <ghoul/logging/logmanager.h>
|
||||
|
||||
namespace {
|
||||
const char* _loggerCat = "SceneInitializer";
|
||||
}
|
||||
|
||||
namespace openspace {
|
||||
|
||||
void SingleThreadedSceneInitializer::initializeNode(SceneGraphNode* node) {
|
||||
|
||||
@@ -36,9 +36,9 @@
|
||||
#include <memory>
|
||||
|
||||
namespace {
|
||||
constexpr char* KeyType = "Type";
|
||||
constexpr char* KeyName = "Name";
|
||||
constexpr char* _loggerCat = "ResourceSynchronization";
|
||||
constexpr const char* KeyType = "Type";
|
||||
constexpr const char* KeyName = "Name";
|
||||
constexpr const char* _loggerCat = "ResourceSynchronization";
|
||||
}
|
||||
|
||||
namespace openspace {
|
||||
|
||||
Reference in New Issue
Block a user