Skip to content
Snippets Groups Projects
Commit 3ffc4e8f authored by Christopher Pietsch's avatar Christopher Pietsch
Browse files

texture update fix

parent d5b49774
No related branches found
No related tags found
Loading
...@@ -268,8 +268,6 @@ function myListView() { ...@@ -268,8 +268,6 @@ function myListView() {
if (Math.abs(zoomedToImageScale - scale) < 0.1) { if (Math.abs(zoomedToImageScale - scale) < 0.1) {
chart.resetZoom(); chart.resetZoom();
} else if (scale < 3) {
zoomToYear(selectedImage)
} else { } else {
zoomToImage(selectedImage, 1400 / Math.sqrt(Math.sqrt(scale))); zoomToImage(selectedImage, 1400 / Math.sqrt(Math.sqrt(scale)));
} }
...@@ -419,13 +417,10 @@ function myListView() { ...@@ -419,13 +417,10 @@ function myListView() {
chart.wakeup = function() { sleep = false } chart.wakeup = function() { sleep = false }
function animate(time) { function animate(time) {
requestAnimationFrame(animate); requestAnimationFrame(animate);
loadImages(); loadImages();
if(sleep) return if(sleep) return
sleep = imageAnimation(); sleep = imageAnimation();
// console.log(sleep)
renderer.render(stage); renderer.render(stage);
} }
...@@ -512,7 +507,6 @@ function myListView() { ...@@ -512,7 +507,6 @@ function myListView() {
detailVue._data.id = d.id detailVue._data.id = d.id
detailVue._data.page = d.page detailVue._data.page = d.page
console.log(selectedImage, detailData)
} }
chart.changePage = function (id, page){ chart.changePage = function (id, page){
...@@ -752,6 +746,13 @@ function myListView() { ...@@ -752,6 +746,13 @@ function myListView() {
var texture = new PIXI.Texture.fromImage(config.loader.textures.detail.url + d.id + '.jpg', true) var texture = new PIXI.Texture.fromImage(config.loader.textures.detail.url + d.id + '.jpg', true)
var sprite = new PIXI.Sprite(texture); 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.x = d.scaleFactor;
sprite.scale.y = d.scaleFactor; sprite.scale.y = d.scaleFactor;
...@@ -788,6 +789,7 @@ function myListView() { ...@@ -788,6 +789,7 @@ function myListView() {
var updateSize = function() { var updateSize = function() {
var size = Math.max(texture.width, texture.height) var size = Math.max(texture.width, texture.height)
sprite.scale.x = sprite.scale.y = (imageSize3 / size) * d.scaleFactor; sprite.scale.x = sprite.scale.y = (imageSize3 / size) * d.scaleFactor;
sleep = false
} }
sprite.on('added', updateSize) sprite.on('added', updateSize)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment