add interpolation

This commit is contained in:
Konstantin Käfer
2014-06-30 17:41:25 +02:00
parent 18d898fae7
commit a6f7696feb
9 changed files with 70 additions and 7 deletions

View File

@@ -3,6 +3,7 @@
#include <llmr/style/style_parser.hpp>
#include <llmr/style/style_bucket.hpp>
#include <llmr/util/constants.hpp>
#include <llmr/util/time.hpp>
#include <csscolorparser/csscolorparser.hpp>
#include <rapidjson/document.h>
@@ -55,7 +56,7 @@ void Style::updateProperties(float z, timestamp t) {
}
void Style::setDefaultTransitionDuration(uint16_t duration_milliseconds) {
defaultTransition.duration = duration_milliseconds;
defaultTransition.duration = duration_milliseconds * 1_millisecond;
}
const std::vector<std::string> &Style::getAppliedClasses() const {
@@ -81,6 +82,16 @@ void Style::updateClasses() {
}
}
bool Style::hasTransitions() const {
if (layers) {
if (layers->hasTransitions()) {
return true;
}
}
return false;
}
void Style::loadJSON(const uint8_t *const data) {
uv::writelock lock(mtx);