diff --git a/src/definition/BaseDefinition.cpp b/src/definition/BaseDefinition.cpp index 53eb2c2..bc0e890 100644 --- a/src/definition/BaseDefinition.cpp +++ b/src/definition/BaseDefinition.cpp @@ -74,7 +74,7 @@ void BaseDefinition::validate() void BaseDefinition::addChild(BaseDefinition* child) { - if (std::find(children.begin(), children.end(), child) != children.end()) + if (std::find(children.begin(), children.end(), child) == children.end()) { children.push_back(child); child->parent = this; @@ -91,6 +91,6 @@ void BaseDefinition::removeChild(BaseDefinition* child) } else { - qWarning("Trying to remove not found child from '%s'", name.c_str()); + qWarning("Trying to remove not found child '%s' from '%s'", child->name.c_str(), name.c_str()); } } diff --git a/src/definition/CloudsDefinition.cpp b/src/definition/CloudsDefinition.cpp index 0608479..633828e 100644 --- a/src/definition/CloudsDefinition.cpp +++ b/src/definition/CloudsDefinition.cpp @@ -10,6 +10,7 @@ static BaseDefinition* _layerConstructor(Layers* parent) CloudsDefinition::CloudsDefinition(BaseDefinition* parent): Layers(parent, _layerConstructor) { + setName("clouds"); } void CloudsDefinition::applyPreset(CloudsPreset preset) diff --git a/src/definition/Layers.cpp b/src/definition/Layers.cpp index 4413d3a..fa6285a 100644 --- a/src/definition/Layers.cpp +++ b/src/definition/Layers.cpp @@ -75,7 +75,7 @@ int Layers::findLayer(BaseDefinition* layer) const } i++; } - qWarning("Layer %p not found, on a total of %d, returning %d", layer, (int)layers.size(), -1); + qWarning("Layer %p (%s) not found, on a total of %d", layer, layer->getName().c_str(), (int)layers.size()); return -1; } @@ -108,6 +108,10 @@ void Layers::removeLayer(int position) layers.erase(layers.begin() + position); delete removed; } + else + { + qWarning("Removing unknown layer %d on %d from '%s'", position, (int)layers.size(), getName().c_str()); + } } void Layers::removeLayer(BaseDefinition* layer) diff --git a/src/render/preview/WaterAspectPreviewRenderer.cpp b/src/render/preview/WaterAspectPreviewRenderer.cpp index 057afbf..0c16f58 100644 --- a/src/render/preview/WaterAspectPreviewRenderer.cpp +++ b/src/render/preview/WaterAspectPreviewRenderer.cpp @@ -101,7 +101,7 @@ void WaterAspectPreviewRenderer::choiceChangeEvent(const std::string &key, int p } } -double WaterAspectPreviewRenderer::getPrecision(const Vector3 &location) +double WaterAspectPreviewRenderer::getPrecision(const Vector3 &) { return 0.000001; }