From 3ffc4e8f22214cd80c9b598289cad92a82988616 Mon Sep 17 00:00:00 2001
From: Christopher Pietsch <cpietsch@gmail.com>
Date: Thu, 14 Jun 2018 19:29:31 +0200
Subject: [PATCH] texture update fix
---
js/list.js | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/js/list.js b/js/list.js
index 49087a2..716e8ed 100644
--- a/js/list.js
+++ b/js/list.js
@@ -268,8 +268,6 @@ function myListView() {
if (Math.abs(zoomedToImageScale - scale) < 0.1) {
chart.resetZoom();
- } else if (scale < 3) {
- zoomToYear(selectedImage)
} else {
zoomToImage(selectedImage, 1400 / Math.sqrt(Math.sqrt(scale)));
}
@@ -419,13 +417,10 @@ function myListView() {
chart.wakeup = function() { sleep = false }
function animate(time) {
-
requestAnimationFrame(animate);
-
loadImages();
if(sleep) return
sleep = imageAnimation();
- // console.log(sleep)
renderer.render(stage);
}
@@ -512,7 +507,6 @@ function myListView() {
detailVue._data.id = d.id
detailVue._data.page = d.page
- console.log(selectedImage, detailData)
}
chart.changePage = function (id, page){
@@ -752,6 +746,13 @@ function myListView() {
var texture = new PIXI.Texture.fromImage(config.loader.textures.detail.url + d.id + '.jpg', true)
var sprite = new PIXI.Sprite(texture);
+ var update = function() {
+ sleep = false
+ }
+
+ sprite.on('added', update)
+ texture.once('update', update)
+
sprite.scale.x = d.scaleFactor;
sprite.scale.y = d.scaleFactor;
@@ -788,6 +789,7 @@ function myListView() {
var updateSize = function() {
var size = Math.max(texture.width, texture.height)
sprite.scale.x = sprite.scale.y = (imageSize3 / size) * d.scaleFactor;
+ sleep = false
}
sprite.on('added', updateSize)
--
GitLab