diff --git a/js/js.examples/js.examples.iml b/js/js.examples/js.examples.iml
index d5c07432750..861647b3dcc 100644
--- a/js/js.examples/js.examples.iml
+++ b/js/js.examples/js.examples.iml
@@ -2,11 +2,12 @@
-
-
+
+
+
diff --git a/js/js.examples/src/html5/creatures/creatures.js b/js/js.examples/src/html5/creatures/creatures.js
index a83e29d65ad..9148767d4fa 100644
--- a/js/js.examples/src/html5/creatures/creatures.js
+++ b/js/js.examples/src/html5/creatures/creatures.js
@@ -1,545 +1,586 @@
-/*
- * Copyright 2000-2012 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-{
- var classes = function () {
- var Vector = Kotlin.Class.create({initialize:function (x, y) {
- this.$x = x;
- this.$y = y;
- }, get_x:function () {
- return this.$x;
- }, get_y:function () {
- return this.$y;
- }, plus:function (v) {
- {
- return creatures.v_0(this.get_x() + v.get_x(), this.get_y() + v.get_y());
- }
- }, minus:function () {
- {
- return creatures.v_0(-this.get_x(), -this.get_y());
- }
- }, minus$0:function (v) {
- {
- return creatures.v_0(this.get_x() - v.get_x(), this.get_y() - v.get_y());
- }
- }, times:function (koef) {
- {
- return creatures.v_0(this.get_x() * koef, this.get_y() * koef);
- }
- }, distanceTo:function (v) {
- {
- return Math.sqrt(this.minus$0(v).get_sqr());
- }
- }, rotatedBy:function (theta) {
- {
- var sin = Math.sin(theta);
- var cos = Math.cos(theta);
- return creatures.v_0(this.get_x() * cos - this.get_y() * sin, this.get_x() * sin + this.get_y() * cos);
- }
- }, isInRect:function (topLeft, size) {
- {
- return this.get_x() >= topLeft.get_x() && this.get_x() <= topLeft.get_x() + size.get_x() && this.get_y() >= topLeft.get_y() && this.get_y() <= topLeft.get_y() + size.get_y();
- }
- }, get_sqr:function () {
- {
- return this.get_x() * this.get_x() + this.get_y() * this.get_y();
- }
- }, get_normalized:function () {
- {
- return this.times(1 / Math.sqrt(this.get_sqr()));
- }
- }
- });
- var RadialGradientGenerator = Kotlin.Class.create({initialize:function (context) {
- this.$context = context;
- this.$gradients = new Kotlin.ArrayList;
- this.$current = 0;
- {
- this.newColorStops([
- [0, '#F59898'],
- [0.5, '#F57373'],
- [1, '#DB6B6B']
- ]);
- this.newColorStops([
- [0.39, 'rgb(140,167,209)'],
- [0.7, 'rgb(104,139,209)'],
- [0.85, 'rgb(67,122,217)']
- ]);
- this.newColorStops([
- [0, 'rgb(255,222,255)'],
- [0.5, 'rgb(255,185,222)'],
- [1, 'rgb(230,154,185)']
- ]);
- this.newColorStops([
- [0, 'rgb(255,209,114)'],
- [0.5, 'rgb(255,174,81)'],
- [1, 'rgb(241,145,54)']
- ]);
- this.newColorStops([
- [0, 'rgb(132,240,135)'],
- [0.5, 'rgb(91,240,96)'],
- [1, 'rgb(27,245,41)']
- ]);
- this.newColorStops([
- [0, 'rgb(250,147,250)'],
- [0.5, 'rgb(255,80,255)'],
- [1, 'rgb(250,0,217)']
- ]);
- }
- }, get_context:function () {
- return this.$context;
- }, get_gradients:function () {
- return this.$gradients;
- }, get_current:function () {
- return this.$current;
- }, set_current:function (tmp$0) {
- this.$current = tmp$0;
- }, newColorStops:function (colorStops) {
- {
- this.get_gradients().add(colorStops);
- }
- }, getNext:function () {
- {
- var result = this.get_gradients().get(this.get_current());
- this.set_current((this.get_current() + 1) % this.get_gradients().size());
- return result;
- }
- }
- });
- var CanvasState = Kotlin.Class.create({initialize:function (canvas) {
- this.$canvas = canvas;
- this.$width = this.get_canvas().width;
- this.$height = this.get_canvas().height;
- this.$context = getContext();
- this.$valid = false;
- this.$shapes = new Kotlin.ArrayList;
- this.$selection = null;
- this.$dragOff = new creatures.Vector_0(0, 0);
- this.$interval = 1000 / 30;
- {
- var tmp$4;
- var tmp$3;
- var tmp$2;
- var tmp$1;
- var tmp$0_0;
- $(this.get_canvas()).mousedown((tmp$0_0 = this , function (it) {
- {
- var tmp$0;
- tmp$0_0.set_valid(false);
- tmp$0_0.set_selection(null);
- var mousePos = tmp$0_0.mousePos_0(it);
- {
- tmp$0 = tmp$0_0.get_shapes().iterator();
- while (tmp$0.hasNext()) {
- var shape = tmp$0.next();
- {
- if (shape.contains(mousePos)) {
- tmp$0_0.set_dragOff(mousePos.minus$0(shape.get_pos()));
- shape.set_selected(true);
- tmp$0_0.set_selection(shape);
- break;
- }
- }
- }
- }
- }
- }
- ));
- $(this.get_canvas()).mousemove((tmp$1 = this , function (it) {
- {
- if (tmp$1.get_selection() != null) {
- Kotlin.sure(tmp$1.get_selection()).set_pos(tmp$1.mousePos_0(it).minus$0(tmp$1.get_dragOff()));
- tmp$1.set_valid(false);
- }
- }
- }
- ));
- $(this.get_canvas()).mouseup((tmp$2 = this , function (it) {
- {
- if (tmp$2.get_selection() != null) {
- Kotlin.sure(tmp$2.get_selection()).set_selected(false);
- }
- tmp$2.set_selection(null);
- tmp$2.set_valid(false);
- }
- }
- ));
- $(this.get_canvas()).dblclick((tmp$3 = this , function (it) {
- {
- var newCreature = new creatures.Creature_0(tmp$3.mousePos_0(it), tmp$3);
- tmp$3.addShape(newCreature);
- tmp$3.set_valid(false);
- }
- }
- ));
- setInterval((tmp$4 = this , function () {
- {
- tmp$4.draw();
- }
- }
- ), this.get_interval());
- }
- }, get_canvas:function () {
- return this.$canvas;
- }, get_width:function () {
- return this.$width;
- }, set_width:function (tmp$0) {
- this.$width = tmp$0;
- }, get_height:function () {
- return this.$height;
- }, set_height:function (tmp$0) {
- this.$height = tmp$0;
- }, get_size:function () {
- {
- return creatures.v_0(this.get_width(), this.get_height());
- }
- }, get_context:function () {
- return this.$context;
- }, get_valid:function () {
- return this.$valid;
- }, set_valid:function (tmp$0) {
- this.$valid = tmp$0;
- }, get_shapes:function () {
- return this.$shapes;
- }, set_shapes:function (tmp$0) {
- this.$shapes = tmp$0;
- }, get_selection:function () {
- return this.$selection;
- }, set_selection:function (tmp$0) {
- this.$selection = tmp$0;
- }, get_dragOff:function () {
- return this.$dragOff;
- }, set_dragOff:function (tmp$0) {
- this.$dragOff = tmp$0;
- }, get_interval:function () {
- return this.$interval;
- }, mousePos_0:function (e) {
- {
- var offset = new creatures.Vector_0(0, 0);
- var element = this.get_canvas();
- while (element != null) {
- var el = Kotlin.sure(element);
- offset = offset.plus(new creatures.Vector_0(el.offsetLeft, el.offsetTop));
- element = el.offsetParent;
- }
- return (new creatures.Vector_0(e.pageX, e.pageY)).minus$0(offset);
- }
- }, addShape:function (shape) {
- {
- this.get_shapes().add(shape);
- this.set_valid(false);
- }
- }, clear:function () {
- {
- this.get_context().fillStyle = '#FFFFFF';
- this.get_context().fillRect(0, 0, this.get_width(), this.get_height());
- this.get_context().strokeStyle = '#000000';
- this.get_context().lineWidth = 4;
- this.get_context().strokeRect(0, 0, this.get_width(), this.get_height());
- }
- }, draw:function () {
- {
- var tmp$0;
- if (this.get_valid())
- return;
- this.clear();
- {
- tmp$0 = creatures.reversed(this.get_shapes()).iterator();
- while (tmp$0.hasNext()) {
- var shape = tmp$0.next();
- {
- shape.draw(this);
- }
- }
- }
- creatures.get_Kotlin().draw(this);
- this.set_valid(true);
- }
- }
- });
- var Shape = Kotlin.Class.create({initialize:function () {
- this.$selected = false;
- }, draw:function (state) {
- }, contains:function (mousePos) {
- }, get_pos:function () {
- return this.$pos;
- }, set_pos:function (tmp$0) {
- this.$pos = tmp$0;
- }, get_selected:function () {
- return this.$selected;
- }, set_selected:function (tmp$0) {
- this.$selected = tmp$0;
- }, shadowed:function (receiver, shadowOffset, alpha, render) {
- {
- receiver.save();
- receiver.shadowColor = 'rgba(100, 100, 100, ' + alpha + ')';
- receiver.shadowBlur = 5;
- receiver.shadowOffsetX = shadowOffset.get_x();
- receiver.shadowOffsetY = shadowOffset.get_y();
- render.call(receiver);
- receiver.restore();
- }
- }, fillPath:function (receiver, constructPath) {
- {
- receiver.beginPath();
- constructPath.call(receiver);
- receiver.closePath();
- receiver.fill();
- }
- }
- });
- var Creature = Kotlin.Class.create(Shape, {initialize:function (pos, state) {
- this.$pos = pos;
- this.$state = state;
- this.super_init();
- this.$shadowOffset = creatures.v_0(-5, 5);
- this.$colorStops = creatures.get_gradientGenerator().getNext();
- this.$relSize = 0.05;
- }, get_pos:function () {
- return this.$pos;
- }, set_pos:function (tmp$0) {
- this.$pos = tmp$0;
- }, get_state:function () {
- return this.$state;
- }, get_shadowOffset:function () {
- return this.$shadowOffset;
- }, get_colorStops:function () {
- return this.$colorStops;
- }, get_relSize:function () {
- return this.$relSize;
- }, get_radius:function () {
- {
- return this.get_state().get_width() * this.get_relSize();
- }
- }, get_position:function () {
- var tmp$0;
- if (this.get_selected())
- tmp$0 = this.get_pos().minus$0(this.get_shadowOffset());
- else
- tmp$0 = this.get_pos();
- {
- return tmp$0;
- }
- }, get_directionToLogo:function () {
- {
- return creatures.get_Kotlin().get_centre().minus$0(this.get_position()).get_normalized();
- }
- }, contains:function (mousePos) {
- {
- return this.get_pos().distanceTo(mousePos) < this.get_radius();
- }
- }, circlePath:function (receiver, position, rad) {
- {
- receiver.arc(position.get_x(), position.get_y(), rad, 0, 2 * Math.PI, false);
- }
- }, fillCircle:function (receiver, position, rad) {
- {
- var tmp$0;
- this.fillPath(receiver, (tmp$0 = this , function () {
- {
- tmp$0.circlePath(receiver, position, rad);
- }
- }
- ));
- }
- }, draw:function (state) {
- {
- var context = state.get_context();
- if (!this.get_selected()) {
- this.drawCreature(context);
- }
- else {
- this.drawCreatureWithShadow(context);
- }
- }
- }, drawCreature:function (context) {
- {
- var tmp$0;
- context.fillStyle = this.getGradient(context);
- this.fillPath(context, (tmp$0 = this , function () {
- {
- tmp$0.tailPath(context);
- tmp$0.circlePath(this, tmp$0.get_position(), tmp$0.get_radius());
- }
- }
- ));
- this.drawEye(context);
- }
- }, getGradient:function (context) {
- {
- var tmp$0;
- var gradientCentre = this.get_position().plus(this.get_directionToLogo().times(this.get_radius() / 4));
- var gradient = context.createRadialGradient(gradientCentre.get_x(), gradientCentre.get_y(), 1, gradientCentre.get_x(), gradientCentre.get_y(), 2 * this.get_radius());
- {
- tmp$0 = Kotlin.arrayIterator(this.get_colorStops());
- while (tmp$0.hasNext()) {
- var colorStop = tmp$0.next();
- {
- gradient.addColorStop(colorStop[0], colorStop[1]);
- }
- }
- }
- return gradient;
- }
- }, tailPath:function (context) {
- {
- var tailDirection = this.get_directionToLogo().minus();
- var tailPos = this.get_position().plus(tailDirection.times(this.get_radius()).times(1));
- var tailSize = this.get_radius() * 1.6;
- var angle = Math.PI / 6;
- var p1 = tailPos.plus(tailDirection.rotatedBy(angle).times(tailSize));
- var p2 = tailPos.plus(tailDirection.rotatedBy(-angle).times(tailSize));
- var middlePoint = this.get_position().plus(tailDirection.times(this.get_radius()).times(1));
- context.moveTo(tailPos.get_x(), tailPos.get_y());
- context.lineTo(p1.get_x(), p1.get_y());
- context.quadraticCurveTo(middlePoint.get_x(), middlePoint.get_y(), p2.get_x(), p2.get_y());
- context.lineTo(tailPos.get_x(), tailPos.get_y());
- }
- }, drawEye:function (context) {
- {
- var eyePos = this.get_directionToLogo().times(this.get_radius()).times(0.6).plus(this.get_position());
- var eyeRadius = this.get_radius() / 3;
- var eyeLidRadius = eyeRadius / 2;
- context.fillStyle = '#FFFFFF';
- this.fillCircle(context, eyePos, eyeRadius);
- context.fillStyle = '#000000';
- this.fillCircle(context, eyePos, eyeLidRadius);
- }
- }, drawCreatureWithShadow:function (context) {
- {
- var tmp$0_0;
- this.shadowed(context, this.get_shadowOffset(), 0.7, (tmp$0_0 = this , function () {
- {
- var tmp$0;
- context.fillStyle = tmp$0_0.getGradient(context);
- tmp$0_0.fillPath(this, (tmp$0 = tmp$0_0 , function () {
- {
- tmp$0.tailPath(context);
- tmp$0.circlePath(context, tmp$0.get_position(), tmp$0.get_radius());
- }
- }
- ));
- }
- }
- ));
- this.drawEye(context);
- }
- }
- });
- var Logo = Kotlin.Class.create(Shape, {initialize:function (pos) {
- this.$pos = pos;
- this.super_init();
- this.$relSize = 0.25;
- this.$shadowOffset = creatures.v_0(-3, 3);
- this.$imageSize = creatures.v_0(377, 393);
- this.$size = this.get_imageSize().times(this.get_relSize());
- }, get_pos:function () {
- return this.$pos;
- }, set_pos:function (tmp$0) {
- this.$pos = tmp$0;
- }, get_relSize:function () {
- return this.$relSize;
- }, get_shadowOffset:function () {
- return this.$shadowOffset;
- }, get_imageSize:function () {
- return this.$imageSize;
- }, get_size:function () {
- return this.$size;
- }, set_size:function (tmp$0) {
- this.$size = tmp$0;
- }, get_position:function () {
- var tmp$0;
- if (this.get_selected())
- tmp$0 = this.get_pos().minus$0(this.get_shadowOffset());
- else
- tmp$0 = this.get_pos();
- {
- return tmp$0;
- }
- }, 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(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) {
- {
- var context = state.get_context();
- if (this.get_selected()) {
- var tmp$0;
- this.shadowed(context, this.get_shadowOffset(), 0.2, (tmp$0 = this , function () {
- {
- tmp$0.drawLogo(state);
- }
- }
- ));
- }
- else {
- this.drawLogo(state);
- }
- }
- }, contains:function (mousePos) {
- {
- return mousePos.isInRect(this.get_pos(), this.get_size());
- }
- }, get_centre:function () {
- {
- return this.get_pos().plus(this.get_size().times(0.5));
- }
- }
- });
- return {Shape_0:Shape, Logo_0:Logo, Creature_0:Creature, RadialGradientGenerator_0:RadialGradientGenerator, CanvasState_0:CanvasState, Vector_0:Vector};
+var classes = function(){
+ var tmp$0 = Kotlin.Class.create({initialize:function(x, y){
+ this.$x = x;
+ this.$y = y;
+ }
+ , get_x:function(){
+ return this.$x;
+ }
+ , get_y:function(){
+ return this.$y;
+ }
+ , plus:function(v){
+ {
+ return creatures.v(this.get_x() + v.get_x(), this.get_y() + v.get_y());
}
- ();
- var creatures = Kotlin.Namespace.create({initialize:function () {
- creatures.$Kotlin = new creatures.Logo_0(creatures.v_0(300, 100));
- creatures.$gradientGenerator = new creatures.RadialGradientGenerator_0(getContext());
- }, get_Kotlin:function () {
- return creatures.$Kotlin;
- }, get_gradientGenerator:function () {
- return creatures.$gradientGenerator;
- }, v_0:function (x, y) {
- {
- return new creatures.Vector_0(x, y);
- }
- }, main:function () {
- {
- var state = new creatures.CanvasState_0(getCanvas());
- state.addShape(creatures.get_Kotlin());
- state.addShape(new creatures.Creature_0(state.get_size().times(0.25), state));
- state.addShape(new creatures.Creature_0(state.get_size().times(0.75), state));
- setTimeout(function () {
- {
- state.set_valid(false);
- }
- }
- );
- }
- }, reversed:function (receiver) {
- {
- var result = new Kotlin.ArrayList;
- var i = receiver.size();
- while (i > 0) {
- result.add(receiver.get(--i));
- }
- return result;
- }
+ }
+ , minus:function(){
+ {
+ return creatures.v(-this.get_x(), -this.get_y());
}
- }, classes);
- creatures.initialize();
+ }
+ , minus$0:function(v){
+ {
+ return creatures.v(this.get_x() - v.get_x(), this.get_y() - v.get_y());
+ }
+ }
+ , times:function(koef){
+ {
+ return creatures.v(this.get_x() * koef, this.get_y() * koef);
+ }
+ }
+ , distanceTo:function(v){
+ {
+ return Math.sqrt(this.minus$0(v).get_sqr());
+ }
+ }
+ , rotatedBy:function(theta){
+ {
+ var sin = Math.sin(theta);
+ var cos = Math.cos(theta);
+ return creatures.v(this.get_x() * cos - this.get_y() * sin, this.get_x() * sin + this.get_y() * cos);
+ }
+ }
+ , isInRect:function(topLeft, size){
+ {
+ return this.get_x() >= topLeft.get_x() && this.get_x() <= topLeft.get_x() + size.get_x() && this.get_y() >= topLeft.get_y() && this.get_y() <= topLeft.get_y() + size.get_y();
+ }
+ }
+ , get_sqr:function(){
+ {
+ return this.get_x() * this.get_x() + this.get_y() * this.get_y();
+ }
+ }
+ , get_normalized:function(){
+ {
+ return this.times(1 / Math.sqrt(this.get_sqr()));
+ }
+ }
+ });
+ var tmp$1 = Kotlin.Class.create({initialize:function(context){
+ this.$context = context;
+ this.$gradients = new Kotlin.ArrayList;
+ this.$current = 0;
+ {
+ this.newColorStops([[0, '#F59898'], [0.5, '#F57373'], [1, '#DB6B6B']]);
+ this.newColorStops([[0.39, 'rgb(140,167,209)'], [0.7, 'rgb(104,139,209)'], [0.85, 'rgb(67,122,217)']]);
+ this.newColorStops([[0, 'rgb(255,222,255)'], [0.5, 'rgb(255,185,222)'], [1, 'rgb(230,154,185)']]);
+ this.newColorStops([[0, 'rgb(255,209,114)'], [0.5, 'rgb(255,174,81)'], [1, 'rgb(241,145,54)']]);
+ this.newColorStops([[0, 'rgb(132,240,135)'], [0.5, 'rgb(91,240,96)'], [1, 'rgb(27,245,41)']]);
+ this.newColorStops([[0, 'rgb(250,147,250)'], [0.5, 'rgb(255,80,255)'], [1, 'rgb(250,0,217)']]);
+ }
+ }
+ , get_context:function(){
+ return this.$context;
+ }
+ , get_gradients:function(){
+ return this.$gradients;
+ }
+ , get_current:function(){
+ return this.$current;
+ }
+ , set_current:function(tmp$0){
+ this.$current = tmp$0;
+ }
+ , newColorStops:function(colorStops){
+ {
+ this.get_gradients().add(colorStops);
+ }
+ }
+ , getNext:function(){
+ {
+ var result = this.get_gradients().get(this.get_current());
+ this.set_current((this.get_current() + 1) % this.get_gradients().size());
+ return result;
+ }
+ }
+ });
+ var tmp$2 = Kotlin.Class.create({initialize:function(canvas){
+ this.$canvas = canvas;
+ this.$width = this.get_canvas().width;
+ this.$height = this.get_canvas().height;
+ this.$context = getContext();
+ this.$valid = false;
+ this.$shapes = new Kotlin.ArrayList;
+ this.$selection = null;
+ this.$dragOff = new creatures.Vector(0, 0);
+ this.$interval = 1000 / 30;
+ {
+ var tmp$0_0;
+ $(this.get_canvas()).mousedown((tmp$0_0 = this , function(it){
+ {
+ tmp$0_0.set_valid(false);
+ tmp$0_0.set_selection(null);
+ var mousePos = tmp$0_0.mousePos_0(it);
+ var tmp$0;
+ {
+ tmp$0 = tmp$0_0.get_shapes().iterator();
+ while (tmp$0.hasNext()) {
+ var shape = tmp$0.next();
+ {
+ if (shape.contains(mousePos)) {
+ tmp$0_0.set_dragOff(mousePos.minus$0(shape.get_pos()));
+ shape.set_selected(true);
+ tmp$0_0.set_selection(shape);
+ break;
+ }
+ }
+ }
+ }
+ }
+ }
+ ));
+ var tmp$1;
+ $(this.get_canvas()).mousemove((tmp$1 = this , function(it){
+ {
+ if (tmp$1.get_selection() != null) {
+ Kotlin.sure(tmp$1.get_selection()).set_pos(tmp$1.mousePos_0(it).minus$0(tmp$1.get_dragOff()));
+ tmp$1.set_valid(false);
+ }
+ }
+ }
+ ));
+ var tmp$2;
+ $(this.get_canvas()).mouseup((tmp$2 = this , function(it){
+ {
+ if (tmp$2.get_selection() != null) {
+ Kotlin.sure(tmp$2.get_selection()).set_selected(false);
+ }
+ tmp$2.set_selection(null);
+ tmp$2.set_valid(false);
+ }
+ }
+ ));
+ var tmp$3;
+ $(this.get_canvas()).dblclick((tmp$3 = this , function(it){
+ {
+ var newCreature = new creatures.Creature(tmp$3.mousePos_0(it), tmp$3);
+ tmp$3.addShape(newCreature);
+ tmp$3.set_valid(false);
+ }
+ }
+ ));
+ var tmp$4;
+ setInterval((tmp$4 = this , function(){
+ {
+ tmp$4.draw();
+ }
+ }
+ ), this.get_interval());
+ }
+ }
+ , get_canvas:function(){
+ return this.$canvas;
+ }
+ , get_width:function(){
+ return this.$width;
+ }
+ , set_width:function(tmp$0){
+ this.$width = tmp$0;
+ }
+ , get_height:function(){
+ return this.$height;
+ }
+ , set_height:function(tmp$0){
+ this.$height = tmp$0;
+ }
+ , get_size:function(){
+ {
+ return creatures.v(this.get_width(), this.get_height());
+ }
+ }
+ , get_context:function(){
+ return this.$context;
+ }
+ , get_valid:function(){
+ return this.$valid;
+ }
+ , set_valid:function(tmp$0){
+ this.$valid = tmp$0;
+ }
+ , get_shapes:function(){
+ return this.$shapes;
+ }
+ , set_shapes:function(tmp$0){
+ this.$shapes = tmp$0;
+ }
+ , get_selection:function(){
+ return this.$selection;
+ }
+ , set_selection:function(tmp$0){
+ this.$selection = tmp$0;
+ }
+ , get_dragOff:function(){
+ return this.$dragOff;
+ }
+ , set_dragOff:function(tmp$0){
+ this.$dragOff = tmp$0;
+ }
+ , get_interval:function(){
+ return this.$interval;
+ }
+ , mousePos_0:function(e){
+ {
+ var offset = new creatures.Vector(0, 0);
+ var element = this.get_canvas();
+ while (element != null) {
+ var el = Kotlin.sure(element);
+ offset = offset.plus(new creatures.Vector(el.offsetLeft, el.offsetTop));
+ element = el.offsetParent;
+ }
+ return (new creatures.Vector(e.pageX, e.pageY)).minus$0(offset);
+ }
+ }
+ , addShape:function(shape){
+ {
+ this.get_shapes().add(shape);
+ this.set_valid(false);
+ }
+ }
+ , clear:function(){
+ {
+ this.get_context().fillStyle = '#FFFFFF';
+ this.get_context().fillRect(0, 0, this.get_width(), this.get_height());
+ this.get_context().strokeStyle = '#000000';
+ this.get_context().lineWidth = 4;
+ this.get_context().strokeRect(0, 0, this.get_width(), this.get_height());
+ }
+ }
+ , draw:function(){
+ {
+ if (this.get_valid())
+ return;
+ this.clear();
+ var tmp$0;
+ {
+ tmp$0 = creatures.reversed(this.get_shapes()).iterator();
+ while (tmp$0.hasNext()) {
+ var shape = tmp$0.next();
+ {
+ shape.draw(this);
+ }
+ }
+ }
+ creatures.get_Kotlin().draw(this);
+ this.set_valid(true);
+ }
+ }
+ });
+ var tmp$3 = Kotlin.Class.create({initialize:function(){
+ this.$selected = false;
+ }
+ , draw:function(state){
+ }
+ , contains:function(mousePos){
+ }
+ , get_pos:function(){
+ return this.$pos_0;
+ }
+ , set_pos:function(tmp$0){
+ this.$pos_0 = tmp$0;
+ }
+ , get_selected:function(){
+ return this.$selected;
+ }
+ , set_selected:function(tmp$0){
+ this.$selected = tmp$0;
+ }
+ , shadowed:function(receiver, shadowOffset, alpha, render){
+ {
+ receiver.save();
+ receiver.shadowColor = 'rgba(100, 100, 100, ' + alpha + ')';
+ receiver.shadowBlur = 5;
+ receiver.shadowOffsetX = shadowOffset.get_x();
+ receiver.shadowOffsetY = shadowOffset.get_y();
+ render.call(receiver);
+ receiver.restore();
+ }
+ }
+ , fillPath:function(receiver, constructPath){
+ {
+ receiver.beginPath();
+ constructPath.call(receiver);
+ receiver.closePath();
+ receiver.fill();
+ }
+ }
+ });
+ var tmp$4 = Kotlin.Class.create(tmp$3, {initialize:function(pos, state){
+ this.$pos = pos;
+ this.$state = state;
+ this.super_init();
+ this.$shadowOffset = creatures.v(-5, 5);
+ this.$colorStops = creatures.get_gradientGenerator().getNext();
+ this.$relSize = 0.05;
+ }
+ , get_pos:function(){
+ return this.$pos;
+ }
+ , set_pos:function(tmp$0){
+ this.$pos = tmp$0;
+ }
+ , get_state:function(){
+ return this.$state;
+ }
+ , get_shadowOffset:function(){
+ return this.$shadowOffset;
+ }
+ , get_colorStops:function(){
+ return this.$colorStops;
+ }
+ , get_relSize:function(){
+ return this.$relSize;
+ }
+ , get_radius:function(){
+ {
+ return this.get_state().get_width() * this.get_relSize();
+ }
+ }
+ , get_position:function(){
+ var tmp$0;
+ if (this.get_selected())
+ tmp$0 = this.get_pos().minus$0(this.get_shadowOffset());
+ else
+ tmp$0 = this.get_pos();
+ {
+ return tmp$0;
+ }
+ }
+ , get_directionToLogo:function(){
+ {
+ return creatures.get_Kotlin().get_centre().minus$0(this.get_position()).get_normalized();
+ }
+ }
+ , contains:function(mousePos){
+ {
+ return this.get_pos().distanceTo(mousePos) < this.get_radius();
+ }
+ }
+ , circlePath:function(receiver, position, rad){
+ {
+ receiver.arc(position.get_x(), position.get_y(), rad, 0, 2 * Math.PI, false);
+ }
+ }
+ , fillCircle:function(receiver, position, rad){
+ {
+ var tmp$0;
+ this.fillPath(receiver, (tmp$0 = this , function(){
+ {
+ tmp$0.circlePath(receiver, position, rad);
+ }
+ }
+ ));
+ }
+ }
+ , draw:function(state){
+ {
+ var context = state.get_context();
+ if (!this.get_selected()) {
+ this.drawCreature(context);
+ }
+ else {
+ this.drawCreatureWithShadow(context);
+ }
+ }
+ }
+ , drawCreature:function(context){
+ {
+ context.fillStyle = this.getGradient(context);
+ var tmp$0;
+ this.fillPath(context, (tmp$0 = this , function(){
+ {
+ tmp$0.tailPath(context);
+ tmp$0.circlePath(this, tmp$0.get_position(), tmp$0.get_radius());
+ }
+ }
+ ));
+ this.drawEye(context);
+ }
+ }
+ , getGradient:function(context){
+ {
+ var gradientCentre = this.get_position().plus(this.get_directionToLogo().times(this.get_radius() / 4));
+ var gradient = context.createRadialGradient(gradientCentre.get_x(), gradientCentre.get_y(), 1, gradientCentre.get_x(), gradientCentre.get_y(), 2 * this.get_radius());
+ var tmp$0;
+ var tmp$1;
+ var tmp$2;
+ {
+ tmp$0 = this.get_colorStops();
+ tmp$1 = tmp$0.length;
+ for (var tmp$2 = 0; tmp$2 != tmp$1; ++tmp$2) {
+ var colorStop = tmp$0[tmp$2];
+ {
+ gradient.addColorStop(colorStop[0], colorStop[1]);
+ }
+ }
+ }
+ return gradient;
+ }
+ }
+ , tailPath:function(context){
+ {
+ var tailDirection = this.get_directionToLogo().minus();
+ var tailPos = this.get_position().plus(tailDirection.times(this.get_radius()).times(1));
+ var tailSize = this.get_radius() * 1.6;
+ var angle = Math.PI / 6;
+ var p1 = tailPos.plus(tailDirection.rotatedBy(angle).times(tailSize));
+ var p2 = tailPos.plus(tailDirection.rotatedBy(-angle).times(tailSize));
+ var middlePoint = this.get_position().plus(tailDirection.times(this.get_radius()).times(1));
+ context.moveTo(tailPos.get_x(), tailPos.get_y());
+ context.lineTo(p1.get_x(), p1.get_y());
+ context.quadraticCurveTo(middlePoint.get_x(), middlePoint.get_y(), p2.get_x(), p2.get_y());
+ context.lineTo(tailPos.get_x(), tailPos.get_y());
+ }
+ }
+ , drawEye:function(context){
+ {
+ var eyePos = this.get_directionToLogo().times(this.get_radius()).times(0.6).plus(this.get_position());
+ var eyeRadius = this.get_radius() / 3;
+ var eyeLidRadius = eyeRadius / 2;
+ context.fillStyle = '#FFFFFF';
+ this.fillCircle(context, eyePos, eyeRadius);
+ context.fillStyle = '#000000';
+ this.fillCircle(context, eyePos, eyeLidRadius);
+ }
+ }
+ , drawCreatureWithShadow:function(context){
+ {
+ var tmp$0_0;
+ this.shadowed(context, this.get_shadowOffset(), 0.7, (tmp$0_0 = this , function(){
+ {
+ context.fillStyle = tmp$0_0.getGradient(context);
+ var tmp$0;
+ tmp$0_0.fillPath(this, (tmp$0 = tmp$0_0 , function(){
+ {
+ tmp$0.tailPath(context);
+ tmp$0.circlePath(context, tmp$0.get_position(), tmp$0.get_radius());
+ }
+ }
+ ));
+ }
+ }
+ ));
+ this.drawEye(context);
+ }
+ }
+ });
+ var tmp$5 = Kotlin.Class.create(tmp$3, {initialize:function(pos){
+ this.$pos = pos;
+ this.super_init();
+ this.$relSize = 0.25;
+ this.$shadowOffset = creatures.v(-3, 3);
+ this.$imageSize = creatures.v(377, 393);
+ this.$size = this.get_imageSize().times(this.get_relSize());
+ }
+ , get_pos:function(){
+ return this.$pos;
+ }
+ , set_pos:function(tmp$0){
+ this.$pos = tmp$0;
+ }
+ , get_relSize:function(){
+ return this.$relSize;
+ }
+ , get_shadowOffset:function(){
+ return this.$shadowOffset;
+ }
+ , get_imageSize:function(){
+ return this.$imageSize;
+ }
+ , get_size:function(){
+ return this.$size;
+ }
+ , set_size:function(tmp$0){
+ this.$size = tmp$0;
+ }
+ , get_position:function(){
+ var tmp$0;
+ if (this.get_selected())
+ tmp$0 = this.get_pos().minus$0(this.get_shadowOffset());
+ else
+ tmp$0 = this.get_pos();
+ {
+ return tmp$0;
+ }
+ }
+ , 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(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){
+ {
+ var context = state.get_context();
+ if (this.get_selected()) {
+ var tmp$0;
+ this.shadowed(context, this.get_shadowOffset(), 0.2, (tmp$0 = this , function(){
+ {
+ tmp$0.drawLogo(state);
+ }
+ }
+ ));
+ }
+ else {
+ this.drawLogo(state);
+ }
+ }
+ }
+ , contains:function(mousePos){
+ {
+ return mousePos.isInRect(this.get_pos(), this.get_size());
+ }
+ }
+ , get_centre:function(){
+ {
+ return this.get_pos().plus(this.get_size().times(0.5));
+ }
+ }
+ });
+ return {Logo:tmp$5, RadialGradientGenerator:tmp$1, CanvasState:tmp$2, Shape:tmp$3, Creature:tmp$4, Vector:tmp$0};
}
+();
+var creatures = Kotlin.Namespace.create({initialize:function(){
+ $Kotlin = new creatures.Logo(creatures.v(300, 100));
+ $gradientGenerator = new creatures.RadialGradientGenerator(getContext());
+}
+, get_Kotlin:function(){
+ return $Kotlin;
+}
+, get_gradientGenerator:function(){
+ return $gradientGenerator;
+}
+, v:function(x, y){
+ {
+ return new creatures.Vector(x, y);
+ }
+}
+, main:function(args){
+ {
+ var state = new creatures.CanvasState(getCanvas());
+ state.addShape(creatures.get_Kotlin());
+ state.addShape(new creatures.Creature(state.get_size().times(0.25), state));
+ state.addShape(new creatures.Creature(state.get_size().times(0.75), state));
+ setTimeout(function(){
+ {
+ state.set_valid(false);
+ }
+ }
+ );
+ }
+}
+, reversed:function(receiver){
+ {
+ var result = new Kotlin.ArrayList;
+ var i = receiver.size();
+ while (i > 0) {
+ result.add(receiver.get(--i));
+ }
+ return result;
+ }
+}
+}, {Shape:classes.Shape, Logo:classes.Logo, Creature:classes.Creature, CanvasState:classes.CanvasState, RadialGradientGenerator:classes.RadialGradientGenerator, Vector:classes.Vector});
+creatures.initialize();
var args = [];
creatures.main(args);
diff --git a/js/js.examples/src/html5/creatures/main.kt b/js/js.examples/src/html5/creatures/main.kt
index 46e0d92b8c2..793ec6bbe57 100644
--- a/js/js.examples/src/html5/creatures/main.kt
+++ b/js/js.examples/src/html5/creatures/main.kt
@@ -176,8 +176,8 @@ class Creature(override var pos : Vector, val state : CanvasState) : Shape() {
}
class CanvasState(val canvas : Canvas) {
- var width = canvas.width
- var height = canvas.height
+ var width = canvas.width.toDouble()
+ var height = canvas.height.toDouble()
val size : Vector
get() = v(width, height)
val context = getContext()
@@ -311,7 +311,7 @@ class Vector(val x : Double = 0.0, val y : Double = 0.0) {
get() = this * (1.0 / Math.sqrt(sqr))
}
-fun main() {
+fun main(args : Array) {
val state = CanvasState(getCanvas())
state.addShape(Kotlin)
state.addShape(Creature(state.size * 0.25, state))
diff --git a/js/js.examples/src/html5/creatures/template.html b/js/js.examples/src/html5/creatures/template.html
index 466bfa8168f..5f98b0ca175 100644
--- a/js/js.examples/src/html5/creatures/template.html
+++ b/js/js.examples/src/html5/creatures/template.html
@@ -24,8 +24,8 @@
-
-
+
+
diff --git a/js/js.examples/src/html5/fancyLines/fancylines.js b/js/js.examples/src/html5/fancyLines/fancylines.js
index 27e7e39a3a3..eb3eaf2f316 100644
--- a/js/js.examples/src/html5/fancyLines/fancylines.js
+++ b/js/js.examples/src/html5/fancyLines/fancylines.js
@@ -1,103 +1,98 @@
-/*
- * Copyright 2000-2012 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-{
- var classes = function () {
- var FancyLines = Kotlin.Class.create({initialize:function () {
- this.$context = getContext();
- this.$height = getCanvas().height;
- this.$width = getCanvas().width;
- this.$x = this.get_width() * Math.random();
- this.$y = this.get_height() * Math.random();
- this.$hue = 0;
- }, get_context:function () {
- return this.$context;
- }, get_height:function () {
- return this.$height;
- }, get_width:function () {
- return this.$width;
- }, get_x:function () {
- return this.$x;
- }, set_x:function (tmp$0) {
- this.$x = tmp$0;
- }, get_y:function () {
- return this.$y;
- }, set_y:function (tmp$0) {
- this.$y = tmp$0;
- }, get_hue:function () {
- return this.$hue;
- }, set_hue:function (tmp$0) {
- this.$hue = tmp$0;
- }, line:function () {
- {
- this.get_context().save();
- this.get_context().beginPath();
- this.get_context().lineWidth = 20 * Math.random();
- this.get_context().moveTo(this.get_x(), this.get_y());
- this.set_x(this.get_width() * Math.random());
- this.set_y(this.get_height() * Math.random());
- this.get_context().bezierCurveTo(this.get_width() * Math.random(), this.get_height() * Math.random(), this.get_width() * Math.random(), this.get_height() * Math.random(), this.get_x(), this.get_y());
- this.set_hue(this.get_hue() + Math.random() * 10);
- this.get_context().strokeStyle = 'hsl(' + this.get_hue() + ', 50%, 50%)';
- this.get_context().shadowColor = 'white';
- this.get_context().shadowBlur = 10;
- this.get_context().stroke();
- this.get_context().restore();
- }
- }, blank:function () {
- {
- this.get_context().fillStyle = 'rgba(255,255,1,0.1)';
- this.get_context().fillRect(0, 0, this.get_width(), this.get_height());
- }
- }, run:function () {
- {
- var tmp$1;
- var tmp$0;
- setInterval((tmp$0 = this , function () {
- {
- tmp$0.line();
- }
- }
- ), 40);
- setInterval((tmp$1 = this , function () {
- {
- tmp$1.blank();
- }
- }
- ), 100);
- }
- }
- });
- return {FancyLines_0:FancyLines};
+var classes = function(){
+ var tmp$0 = Kotlin.Class.create({initialize:function(){
+ this.$context = getContext();
+ this.$height = getCanvas().height;
+ this.$width = getCanvas().width;
+ this.$x = this.get_width() * Math.random();
+ this.$y = this.get_height() * Math.random();
+ this.$hue = 0;
+ }
+ , get_context:function(){
+ return this.$context;
+ }
+ , get_height:function(){
+ return this.$height;
+ }
+ , get_width:function(){
+ return this.$width;
+ }
+ , get_x:function(){
+ return this.$x;
+ }
+ , set_x:function(tmp$0){
+ this.$x = tmp$0;
+ }
+ , get_y:function(){
+ return this.$y;
+ }
+ , set_y:function(tmp$0){
+ this.$y = tmp$0;
+ }
+ , get_hue:function(){
+ return this.$hue;
+ }
+ , set_hue:function(tmp$0){
+ this.$hue = tmp$0;
+ }
+ , line:function(){
+ {
+ this.get_context().save();
+ this.get_context().beginPath();
+ this.get_context().lineWidth = 20 * Math.random();
+ this.get_context().moveTo(this.get_x(), this.get_y());
+ this.set_x(this.get_width() * Math.random());
+ this.set_y(this.get_height() * Math.random());
+ this.get_context().bezierCurveTo(this.get_width() * Math.random(), this.get_height() * Math.random(), this.get_width() * Math.random(), this.get_height() * Math.random(), this.get_x(), this.get_y());
+ this.set_hue(this.get_hue() + Math.random() * 10);
+ this.get_context().strokeStyle = 'hsl(' + this.get_hue() + ', 50%, 50%)';
+ this.get_context().shadowColor = 'white';
+ this.get_context().shadowBlur = 10;
+ this.get_context().stroke();
+ this.get_context().restore();
}
- ();
- var fancylines = Kotlin.Namespace.create({initialize:function () {
- }, main:function () {
+ }
+ , blank:function(){
+ {
+ this.get_context().fillStyle = 'rgba(255,255,1,0.1)';
+ this.get_context().fillRect(0, 0, this.get_width(), this.get_height());
+ }
+ }
+ , run:function(){
+ {
+ var tmp$0;
+ setInterval((tmp$0 = this , function(){
{
- $(function () {
- {
- (new fancylines.FancyLines_0).run();
- }
- }
- );
+ tmp$0.line();
}
+ }
+ ), 40);
+ var tmp$1;
+ setInterval((tmp$1 = this , function(){
+ {
+ tmp$1.blank();
+ }
+ }
+ ), 100);
}
- }, classes);
- fancylines.initialize();
+ }
+ });
+ return {FancyLines:tmp$0};
}
+();
+var fancylines = Kotlin.Namespace.create({initialize:function(){
+}
+, main:function(args){
+ {
+ $(function(){
+ {
+ (new fancylines.FancyLines).run();
+ }
+ }
+ );
+ }
+}
+}, {FancyLines:classes.FancyLines});
+fancylines.initialize();
var args = [];
fancylines.main(args);
diff --git a/js/js.examples/src/html5/fancyLines/template.html b/js/js.examples/src/html5/fancyLines/template.html
index 64a717ea926..6e6b4171cde 100644
--- a/js/js.examples/src/html5/fancyLines/template.html
+++ b/js/js.examples/src/html5/fancyLines/template.html
@@ -23,8 +23,8 @@