fix durations by making them milliseconds

This commit is contained in:
Ansis Brammanis
2015-02-04 13:51:52 -08:00
parent 4ec0028856
commit a49737e542
3 changed files with 5 additions and 5 deletions

View File

@@ -10,8 +10,8 @@ namespace mbgl {
template <typename T>
struct PiecewiseConstantFunction {
inline PiecewiseConstantFunction(const std::vector<std::pair<float, T>> &values_, std::chrono::duration<float> duration_) : values(values_), duration(duration_) {}
inline PiecewiseConstantFunction(T &value) : values({{ 0, value }}), duration(300) {}
inline PiecewiseConstantFunction() : values(), duration(300) {}
inline PiecewiseConstantFunction(T &value) : values({{ 0, value }}), duration(std::chrono::milliseconds(300)) {}
inline PiecewiseConstantFunction() : values(), duration(std::chrono::milliseconds(300)) {}
T evaluate(float z, const ZoomHistory &zoomHistory) const;
private:

View File

@@ -341,7 +341,7 @@ std::tuple<bool, Function<T>> StyleParser::parseFunction(JSVal value) {
return std::tuple<bool, Function<T>> { true, StopsFunction<T>(std::get<1>(stops), base) };
}
template <typename T> inline std::chrono::duration<float> defaultDurationValue() { return std::chrono::duration<float>(300.0f); }
template <typename T> inline std::chrono::duration<float> defaultDurationValue() { return std::chrono::milliseconds(300); }
template <typename T>
std::tuple<bool, PiecewiseConstantFunction<T>> StyleParser::parsePiecewiseConstantFunction(JSVal value) {
@@ -355,7 +355,7 @@ std::tuple<bool, PiecewiseConstantFunction<T>> StyleParser::parsePiecewiseConsta
if (value.HasMember("duration")) {
JSVal value_duration = value["duration"];
if (value_duration.IsNumber()) {
duration = static_cast<std::chrono::duration<float>>(value_duration.GetDouble());
duration = std::chrono::milliseconds(value_duration.GetUint());
} else {
Log::Warning(Event::ParseStyle, "duration must be numeric");
}

View File

@@ -17,7 +17,7 @@ struct ZoomHistory {
first = false;
lastIntegerZoom = std::floor(z);
lastIntegerZoomTime = std::chrono::steady_clock::time_point::min();
lastIntegerZoomTime = std::chrono::steady_clock::time_point(std::chrono::steady_clock::duration(0));
lastZoom = z;
}