Update ghoul and adapt to ghoul change by moving std::to_string to ghoul::to_string

This commit is contained in:
Alexander Bock
2018-10-08 17:54:32 -06:00
parent 14645c2d3f
commit 428ab56d99
4 changed files with 23 additions and 18 deletions
@@ -389,13 +389,13 @@ template <typename T>
std::string NumericalProperty<T>::generateAdditionalJsonDescription() const {
std::string result = "{ ";
result +=
"\"" + MinimumValueKey + "\": " + luaToJson(std::to_string(_minimumValue)) + ",";
"\"" + MinimumValueKey + "\": " + luaToJson(ghoul::to_string(_minimumValue)) + ",";
result +=
"\"" + MaximumValueKey + "\": " + luaToJson(std::to_string(_maximumValue)) + ",";
"\"" + MaximumValueKey + "\": " + luaToJson(ghoul::to_string(_maximumValue)) + ",";
result +=
"\"" + SteppingValueKey + "\": " + luaToJson(std::to_string(_stepping)) + ",";
"\"" + SteppingValueKey + "\": " + luaToJson(ghoul::to_string(_stepping)) + ",";
result +=
"\"" + ExponentValueKey + "\": " + luaToJson(std::to_string(_exponent));
"\"" + ExponentValueKey + "\": " + luaToJson(ghoul::to_string(_exponent));
result += " }";
return result;
}
+12 -12
View File
@@ -393,7 +393,7 @@ void renderIVec2Property(Property* prop, const std::string& ownerName,
if (changed) {
executeScript(
p->fullyQualifiedIdentifier(),
std::to_string(value),
ghoul::to_string(value),
isRegular
);
}
@@ -427,7 +427,7 @@ void renderIVec3Property(Property* prop, const std::string& ownerName,
if (changed) {
executeScript(
p->fullyQualifiedIdentifier(),
std::to_string(value),
ghoul::to_string(value),
isRegular
);
}
@@ -460,7 +460,7 @@ void renderIVec4Property(Property* prop, const std::string& ownerName,
if (changed) {
executeScript(
p->fullyQualifiedIdentifier(),
std::to_string(value),
ghoul::to_string(value),
isRegular
);
}
@@ -526,7 +526,7 @@ void renderVec2Property(Property* prop, const std::string& ownerName,
if (changed) {
executeScript(
p->fullyQualifiedIdentifier(),
std::to_string(value),
ghoul::to_string(value),
isRegular
);
}
@@ -571,7 +571,7 @@ void renderVec3Property(Property* prop, const std::string& ownerName,
if (changed) {
executeScript(
p->fullyQualifiedIdentifier(),
std::to_string(value),
ghoul::to_string(value),
isRegular
);
}
@@ -616,7 +616,7 @@ void renderVec4Property(Property* prop, const std::string& ownerName,
if (changed) {
executeScript(
p->fullyQualifiedIdentifier(),
std::to_string(value),
ghoul::to_string(value),
isRegular
);
}
@@ -651,7 +651,7 @@ void renderDVec2Property(Property* prop, const std::string& ownerName,
if (changed) {
executeScript(
p->fullyQualifiedIdentifier(),
std::to_string(value),
ghoul::to_string(value),
isRegular
);
}
@@ -687,7 +687,7 @@ void renderDVec3Property(Property* prop, const std::string& ownerName,
if (changed) {
executeScript(
p->fullyQualifiedIdentifier(),
std::to_string(value),
ghoul::to_string(value),
isRegular
);
}
@@ -723,7 +723,7 @@ void renderDVec4Property(Property* prop, const std::string& ownerName,
if (changed) {
executeScript(
p->fullyQualifiedIdentifier(),
std::to_string(value),
ghoul::to_string(value),
isRegular
);
}
@@ -780,7 +780,7 @@ void renderDMat2Property(Property* prop, const std::string& ownerName,
if (changed) {
executeScript(
p->fullyQualifiedIdentifier(),
std::to_string(value),
ghoul::to_string(value),
isRegular
);
}
@@ -847,7 +847,7 @@ void renderDMat3Property(Property* prop, const std::string& ownerName,
if (changed) {
executeScript(
p->fullyQualifiedIdentifier(),
std::to_string(value),
ghoul::to_string(value),
isRegular
);
}
@@ -924,7 +924,7 @@ void renderDMat4Property(Property* prop, const std::string& ownerName,
if (changed) {
executeScript(
p->fullyQualifiedIdentifier(),
std::to_string(value),
ghoul::to_string(value),
isRegular
);
}
@@ -31,6 +31,7 @@
#include <openspace/documentation/documentation.h>
#include <openspace/documentation/verifier.h>
#include <openspace/scene/scenegraphnode.h>
#include <ghoul/glm.h>
#include <ghoul/filesystem/filesystem.h>
#include <ghoul/io/texture/texturereader.h>
#include <ghoul/misc/dictionary.h>
@@ -484,7 +485,11 @@ void ProjectionComponent::imageProjectBegin() {
glGetIntegerv(GL_FRAMEBUFFER_BINDING, &_defaultFBO);
if (_textureSizeDirty) {
LDEBUG(fmt::format("Changing texture size to {}", std::to_string(_textureSize)));
LDEBUG(
fmt::format(
"Changing texture size to {}", ghoul::to_string(_textureSize.value())
)
);
// If the texture size has changed, we have to allocate new memory and copy
// the image texture to the new target