From 0eccfdcde03561090fcde5657e291e9f765a7f71 Mon Sep 17 00:00:00 2001 From: Pavel Talanov Date: Thu, 9 Feb 2012 19:11:35 +0400 Subject: [PATCH] examples update --- examplesForWebDemo/src/html5/interactive/interactive.js | 2 +- examplesForWebDemo/src/html5/interactive/main.kt | 4 ++-- examplesForWebDemo/src/html5/interactive2/main.kt | 4 ++-- examplesForWebDemo/src/html5/interactive3/interactive3.js | 2 +- examplesForWebDemo/src/html5/interactive3/main.kt | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examplesForWebDemo/src/html5/interactive/interactive.js b/examplesForWebDemo/src/html5/interactive/interactive.js index 7903b8b8ecf..8de044cd34c 100644 --- a/examplesForWebDemo/src/html5/interactive/interactive.js +++ b/examplesForWebDemo/src/html5/interactive/interactive.js @@ -217,7 +217,7 @@ }, draw:function (state) { { var context = state.get_context(); - context.drawImage(getJBLogo(), 0, 0, this.get_imageSize().get_x(), this.get_imageSize().get_y(), this.get_pos().get_x(), this.get_pos().get_y(), this.get_canvasSize().get_x(), this.get_canvasSize().get_y()); + context.drawImage(getKotlinLogo(), 0, 0, this.get_imageSize().get_x(), this.get_imageSize().get_y(), this.get_pos().get_x(), this.get_pos().get_y(), this.get_canvasSize().get_x(), this.get_canvasSize().get_y()); } }, contains:function (mousePos) { { diff --git a/examplesForWebDemo/src/html5/interactive/main.kt b/examplesForWebDemo/src/html5/interactive/main.kt index ae53ad652d1..86eb1c1fdfc 100644 --- a/examplesForWebDemo/src/html5/interactive/main.kt +++ b/examplesForWebDemo/src/html5/interactive/main.kt @@ -7,7 +7,7 @@ import js.*; import js.Math; import js.setInterval import html5.getCanvas -import html5.getJBLogo +import html5.getKotlinLogo import jquery.jq import js.setTimeout @@ -68,7 +68,7 @@ class JB(override var pos : Vector, override fun draw(state : CanvasState) { val context = state.context; - context.drawImage(getJBLogo(), 0.0, 0.0, imageSize.x, imageSize.y, pos.x, pos.y, canvasSize.x, canvasSize.y) + context.drawImage(getKotlinLogo(), 0.0, 0.0, imageSize.x, imageSize.y, pos.x, pos.y, canvasSize.x, canvasSize.y) } override fun contains(mousePos: Vector): Boolean = mousePos.isInRect(pos, canvasSize) diff --git a/examplesForWebDemo/src/html5/interactive2/main.kt b/examplesForWebDemo/src/html5/interactive2/main.kt index 4f21e9eb66b..e4bacc02865 100644 --- a/examplesForWebDemo/src/html5/interactive2/main.kt +++ b/examplesForWebDemo/src/html5/interactive2/main.kt @@ -7,7 +7,7 @@ import js.*; import js.Math; import js.setInterval import html5.getCanvas -import html5.getJBLogo +import html5.getKotlinLogo import jquery.jq import js.setTimeout @@ -34,7 +34,7 @@ class Logo(override var pos : Vector, override fun draw(state : CanvasState) { val context = state.context; - context.drawImage(getJBLogo(), 0.0, 0.0, imageSize.x, imageSize.y, pos.x, pos.y, canvasSize.x, canvasSize.y) + context.drawImage(getKotlinLogo(), 0.0, 0.0, imageSize.x, imageSize.y, pos.x, pos.y, canvasSize.x, canvasSize.y) } override fun contains(mousePos: Vector): Boolean = mousePos.isInRect(pos, canvasSize) diff --git a/examplesForWebDemo/src/html5/interactive3/interactive3.js b/examplesForWebDemo/src/html5/interactive3/interactive3.js index 0fd6120c796..fc8f549c371 100644 --- a/examplesForWebDemo/src/html5/interactive3/interactive3.js +++ b/examplesForWebDemo/src/html5/interactive3/interactive3.js @@ -456,7 +456,7 @@ }, drawLogo:function (state) { { this.set_size(this.get_imageSize().times(state.get_size().get_x() / this.get_imageSize().get_x()).times(this.get_relSize())); - state.get_context().drawImage(getJBLogo(), 0, 0, this.get_imageSize().get_x(), this.get_imageSize().get_y(), this.get_position().get_x(), this.get_position().get_y(), this.get_size().get_x(), this.get_size().get_y()); + state.get_context().drawImage(getKotlinLogo(), 0, 0, this.get_imageSize().get_x(), this.get_imageSize().get_y(), this.get_position().get_x(), this.get_position().get_y(), this.get_size().get_x(), this.get_size().get_y()); } }, draw:function (state) { { diff --git a/examplesForWebDemo/src/html5/interactive3/main.kt b/examplesForWebDemo/src/html5/interactive3/main.kt index af53cfbe1d6..fb583ae4a31 100644 --- a/examplesForWebDemo/src/html5/interactive3/main.kt +++ b/examplesForWebDemo/src/html5/interactive3/main.kt @@ -7,7 +7,7 @@ import js.* import js.Math import js.setInterval import html5.getCanvas -import html5.getJBLogo +import html5.getKotlinLogo import jquery.jq import js.setTimeout import java.util.List @@ -53,7 +53,7 @@ var relSize : Double = 0.25) fun drawLogo(state : CanvasState) { size = imageSize * (state.size.x / imageSize.x) * relSize - state.context.drawImage(getJBLogo(), 0.0, 0.0, imageSize.x, imageSize.y, position.x, position.y, size.x, size.y) + state.context.drawImage(getKotlinLogo(), 0.0, 0.0, imageSize.x, imageSize.y, position.x, position.y, size.x, size.y) } override fun draw(state : CanvasState) {