tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into linux-wrapper

Browse Source 
Conflicts:
	include/llmr/style/sprite.hpp
This commit is contained in:
Konstantin Käfer
2014-02-21 12:26:16 +01:00
parent baa4981c3b 0306e77ff0
commit 5f64ecc3cc
33 changed files with 700 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/style/sprite.cpp
View File

@@ -34,19 +34,21 @@ Sprite::operator bool() const {
return loaded;
}
void Sprite::load(const std::string& base_url) {
void Sprite::load(const std::string& base_url, float pixelRatio) {
std::shared_ptr<Sprite> sprite = shared_from_this();
auto complete = [sprite]() {
std::lock_guard<std::mutex> lock(sprite->mtx);
if (sprite->img && sprite->pos.size()) {
sprite->loaded = true;
platform::restart(NULL);
platform::restart();
fprintf(stderr, "sprite loaded\n");
}
};
platform::request_http(base_url + ".json", [sprite](const platform::Response & res) {
std::string suffix = (pixelRatio > 1 ? "@2x" : "");
platform::request_http(base_url + suffix + ".json", [sprite](const platform::Response & res) {
if (res.code == 200) {
sprite->parseJSON(res.body);
} else {
@@ -54,7 +56,7 @@ void Sprite::load(const std::string& base_url) {
}
}, complete);
platform::request_http(base_url + ".png", [sprite](const platform::Response & res) {
platform::request_http(base_url + suffix + ".png", [sprite](const platform::Response & res) {
if (res.code == 200) {
sprite->loadImage(res.body);
} else {
@@ -242,11 +244,13 @@ void Sprite::bind(bool linear) {
if (!texture) {
glGenTextures(1, &texture);
glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, texture);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, img);
} else {
glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, texture);
}