From 9a93faef491f399e9be85054564020af722f42a0 Mon Sep 17 00:00:00 2001 From: badlogic Date: Thu, 25 Aug 2016 14:37:27 +0200 Subject: [PATCH] [ts] Fixed up demo canvas sizing --- spine-ts/webgl/example/demos/ikconstraint.js | 2 +- spine-ts/webgl/example/demos/skeletonvssprite.js | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/spine-ts/webgl/example/demos/ikconstraint.js b/spine-ts/webgl/example/demos/ikconstraint.js index 6a2085854..3cd52ace2 100644 --- a/spine-ts/webgl/example/demos/ikconstraint.js +++ b/spine-ts/webgl/example/demos/ikconstraint.js @@ -11,7 +11,7 @@ function init () { canvas = document.getElementById("ikdemo-canvas"); - canvas.width = window.innerWidth; canvas.height = window.innerHeight; + canvas.width = canvas.clientWidth; canvas.height = canvas.clientHeight; gl = canvas.getContext("webgl", { alpha: false }) || canvas.getContext("experimental-webgl", { alpha: false }); renderer = new spine.webgl.SceneRenderer(canvas, gl); diff --git a/spine-ts/webgl/example/demos/skeletonvssprite.js b/spine-ts/webgl/example/demos/skeletonvssprite.js index 87a532cac..3821e0b57 100644 --- a/spine-ts/webgl/example/demos/skeletonvssprite.js +++ b/spine-ts/webgl/example/demos/skeletonvssprite.js @@ -16,7 +16,7 @@ atlasCheckbox = document.getElementById("skeletonvsspritedemo-atlascheckbox"); canvas = document.getElementById("skeletonvsspritedemo-canvas"); - canvas.width = window.innerWidth; canvas.height = window.innerHeight; + canvas.width = canvas.clientWidth; canvas.height = canvas.clientHeight; gl = canvas.getContext("webgl", { alpha: false }) || canvas.getContext("experimental-webgl", { alpha: false }); renderer = new spine.webgl.SceneRenderer(canvas, gl); @@ -107,11 +107,11 @@ var pageSize = halfSpaceWidth / 2; // we only have one page for skeleton - var skeletonPageSize = pageSize * frameAtlasSize / skeletonAtlasSize; - renderer.drawTexture(skeletonAtlas.pages[0].texture, offset.x + halfSpaceWidth - skeletonPageSize / 2, - offset.y + halfSpaceWidth - skeletonPageSize / 2, skeletonPageSize, skeletonPageSize); - renderer.rect(skeletonAtlas.pages[0].texture, offset.x + halfSpaceWidth - skeletonPageSize / 2, - offset.y + halfSpaceWidth - skeletonPageSize / 2, skeletonPageSize, skeletonPageSize, SKELETON_ATLAS_COLOR); + var skeletonPageSize = pageSize * skeletonAtlasSize / frameAtlasSize; + renderer.drawTexture(skeletonAtlas.pages[0].texture, offset.x + halfSpaceWidth / 2 - skeletonPageSize / 2, + offset.y + halfSpaceHeight / 2 - skeletonPageSize / 2, skeletonPageSize, skeletonPageSize); + renderer.rect(false, offset.x + halfSpaceWidth / 2 - skeletonPageSize / 2, + offset.y + halfSpaceWidth / 2 - skeletonPageSize / 2, skeletonPageSize, skeletonPageSize, SKELETON_ATLAS_COLOR); var x = offset.x + halfSpaceWidth; var y = offset.y + halfSpaceHeight / 2;