LibCanvas wrapped in overall.js, all names used in short way

ilya-buligin · Jul 20, 2011 · e77f926 · e77f926
1 parent ff56a17
commit e77f926
Show file tree

Hide file tree

Showing 60 changed files with 705 additions and 870 deletions.
diff --git a/Packager b/Packager
diff --git a/Source/Animation/Sprite.js b/Source/Animation/Sprite.js
@@ -18,8 +18,8 @@ provides: Animation.Sprite
 ...
 */
 
-LibCanvas.Animation.Sprite = atom.Class({
-	Implements: [atom.Class.Events],
+LibCanvas.Animation.Sprite = Class({
+	Implements: [Class.Events],
 	sprites : null,
 
 	initialize: function () {

diff --git a/Source/Behaviors/Animatable.js b/Source/Behaviors/Animatable.js
@@ -21,15 +21,14 @@ provides: Behaviors.Animatable
 ...
 */
 
-(function (LibCanvas) {
+var Animatable = LibCanvas.Behaviors.Animatable = function () {
 
-var TF    = LibCanvas.Inner.TimingFunctions,
-	Color = LibCanvas.Utils.Color;
+var TF = TimingFunctions;
 
-LibCanvas.Behaviors.Animatable = atom.Class({
-	Implements: [LibCanvas.Invoker.AutoChoose],
+return Class({
+	Implements: [ Invoker.AutoChoose ],
 
-	initialize: atom.Class.hiddenMethod(function (element) {
+	initialize: Class.hiddenMethod(function (element) {
 		this['animate.element'] = element;
 		this['animate.func']    = atom.typeOf(element) == 'function';
 	}),
@@ -142,4 +141,4 @@ LibCanvas.Behaviors.Animatable = atom.Class({
 	}
 });
 
-})(LibCanvas);
+}();
diff --git a/Source/Behaviors/Clickable.js b/Source/Behaviors/Clickable.js
@@ -19,7 +19,7 @@ provides: Behaviors.Clickable
 ...
 */
 
-new function () {
+var Clickable = LibCanvas.Behaviors.Clickable = function () {
 
 var setValFn = function (object, name, val) {
 	return function () {
@@ -29,8 +29,8 @@ var setValFn = function (object, name, val) {
 };
 
 // Should extends drawable, implements mouseListener
-LibCanvas.Behaviors.Clickable = atom.Class({
-	Implements: [LibCanvas.Behaviors.MouseListener],
+return Class({
+	Implements: [ MouseListener ],
 
 	clickable : function () { 
 		this.listenMouse();
@@ -46,4 +46,4 @@ LibCanvas.Behaviors.Clickable = atom.Class({
 	}
 });
 
-};
+}();
diff --git a/Source/Behaviors/Draggable.js b/Source/Behaviors/Draggable.js
@@ -19,19 +19,7 @@ provides: Behaviors.Draggable
 ...
 */
 
-new function () {
-
-LibCanvas.Behaviors.Draggable = atom.Class({
-	Extends: LibCanvas.Behaviors.MouseListener,
-
-	draggable : function (stopDrag) {
-		if (! ('draggable.isDraggable' in this) ) {
-			this.addEvent('libcanvasSet', initDraggable);
-		}
-		this['draggable.isDraggable'] = !stopDrag;
-		return this;
-	}
-});
+var Draggable = LibCanvas.Behaviors.Draggable = function () {
 
 var isDraggable = function (elem, started) {
 	return elem['draggable.isDraggable'] && (!started || elem['draggable.mouse']);
@@ -75,4 +63,16 @@ var initDraggable = function () {
 		});
 };
 
-};
+return Class({
+	Extends: MouseListener,
+
+	draggable : function (stopDrag) {
+		if (! ('draggable.isDraggable' in this) ) {
+			this.addEvent('libcanvasSet', initDraggable);
+		}
+		this['draggable.isDraggable'] = !stopDrag;
+		return this;
+	}
+});
+
+}();
diff --git a/Source/Behaviors/Drawable.js b/Source/Behaviors/Drawable.js
@@ -18,7 +18,7 @@ provides: Behaviors.Drawable
 ...
 */
 
-new function () {
+var Drawable = LibCanvas.Behaviors.Drawable = function () {
 
 var start = function () {
 	this.libcanvas.addElement(this);
@@ -29,8 +29,8 @@ var stop = function () {
 	return 'removeEvent';
 };
 
-LibCanvas.Behaviors.Drawable = atom.Class({
-	Implements: [atom.Class.Events],
+return Class({
+	Implements: [Class.Events],
 	libcanvasIsReady: false,
 	setLibcanvas : function (libcanvas) {
 		if (this.libcanvas) {
@@ -81,8 +81,8 @@ LibCanvas.Behaviors.Drawable = atom.Class({
 		  .removeEvent('libcanvasSet', start)
 		     .addEvent('libcanvasSet', stop);
 	},
-	update : atom.Class.abstractMethod,
-	draw   : atom.Class.abstractMethod
+	update : Class.abstractMethod,
+	draw   : Class.abstractMethod
 });
 
-};
+}();
diff --git a/Source/Behaviors/DrawableSprite.js b/Source/Behaviors/DrawableSprite.js
@@ -19,8 +19,8 @@ provides: Behaviors.DrawableSprite
 ...
 */
 
-LibCanvas.Behaviors.DrawableSprite = atom.Class({
-	Extends: LibCanvas.Behaviors.Drawable,
+var DrawableSprite = LibCanvas.Behaviors.DrawableSprite = Class({
+	Extends: Drawable,
 
 	draw: function () {
 		this.libcanvas.ctx.drawImage( this.sprite, this.shape );

diff --git a/Source/Behaviors/Droppable.js b/Source/Behaviors/Droppable.js
@@ -20,7 +20,7 @@ provides: Behaviors.Droppable
 ...
 */
 
-LibCanvas.Behaviors.Droppable = atom.Class({
+var Droppable = LibCanvas.Behaviors.Droppable = Class({
 	drops : null,
 	drop : function (obj) {
 		if (this.drops === null) {

diff --git a/Source/Behaviors/Linkable.js b/Source/Behaviors/Linkable.js
@@ -18,7 +18,7 @@ provides: Behaviors.Linkable
 ...
 */
 
-LibCanvas.Behaviors.Linkable = atom.Class({
+var Linkable = LibCanvas.Behaviors.Linkable = Class({
 	links : null,
 	moveLinks : function (move) {
 		(this.links || []).forEach(function (elem) {

diff --git a/Source/Behaviors/MouseListener.js b/Source/Behaviors/MouseListener.js
@@ -33,7 +33,7 @@ events:
 */
 
 // Should extends LibCanvas.Behaviors.Drawable
-LibCanvas.Behaviors.MouseListener = atom.Class({
+var MouseListener = LibCanvas.Behaviors.MouseListener = Class({
 	listenMouse : function (stopListen) {
 		return this.addEvent('libcanvasSet', function () {
 			var command = stopListen ? "unsubscribe" : "subscribe";

diff --git a/Source/Behaviors/Moveable.js b/Source/Behaviors/Moveable.js
@@ -18,15 +18,15 @@ provides: Behaviors.Moveable
 
 ...
 */
-LibCanvas.Behaviors.Moveable = atom.Class({
+var Moveable = LibCanvas.Behaviors.Moveable = Class({
 	stopMoving : function () {
 		var anim = this['moveTo.animation'];
 		if (anim) anim.stop();
 		return this;
 	},
 	moveTo    : function (point, speed, fn) { // speed == pixels per sec
 		this.stopMoving();
-		point = LibCanvas.Point(point);
+		point = Point(point);
 		var diff = this.getCoords().diff(point), shape = this.getShape();
 		if (!speed) {
 			shape.move(diff);
@@ -35,7 +35,7 @@ LibCanvas.Behaviors.Moveable = atom.Class({
 		}
 		var distance = Math.hypotenuse(diff.x, diff.y), prev = 0;
 
-		this['moveTo.animation'] = new LibCanvas.Behaviors.Animatable(function (change) {
+		this['moveTo.animation'] = new Animatable(function (change) {
 			shape.move({
 				x : diff.x * (change - prev),
 				y : diff.y * (change - prev)

diff --git a/Source/Core/Canvas2D.js b/Source/Core/Canvas2D.js
@@ -22,14 +22,11 @@ provides: Canvas2D
 ...
 */
 
-LibCanvas.Canvas2D = atom.Class({
+var Canvas2D = LibCanvas.Canvas2D = Class({
 	Extends: LibCanvas,
 	Implements: [
-		LibCanvas.Inner.FrameRenderer,
-		LibCanvas.Inner.FpsMeter,
-		LibCanvas.Inner.DownloadingProgress,
-		atom.Class.Events,
-		atom.Class.Options
+		FrameRenderer,Inner.FpsMeter, DownloadingProgress,
+		Class.Events, Class.Options
 	],
 
 	Generators: {
@@ -63,7 +60,7 @@ LibCanvas.Canvas2D = atom.Class({
 				.appendTo(this.wrapper);
 		},
 		invoker: function () {
-			return new LibCanvas.Invoker({
+			return new Invoker({
 				context: this,
 				defaultPriority: 10,
 				fpsLimit: this.options.fps
@@ -182,7 +179,7 @@ LibCanvas.Canvas2D = atom.Class({
 		return this;
 	},
 
-	createProjectBuffer: atom.Class.protectedMethod(function () {
+	createProjectBuffer: Class.protectedMethod(function () {
 		if (this.options.backBuffer == 'off') {
 			this.elem = this.origElem;
 			this.ctx  = this.origCtx;
@@ -193,11 +190,11 @@ LibCanvas.Canvas2D = atom.Class({
 		return this;
 	}),
 
-	addClearer: atom.Class.protectedMethod(function () {
+	addClearer: Class.protectedMethod(function () {
 		var clear = this.options.clear;
 		if (clear) {
 			this.addProcessor('pre',
-				new LibCanvas.Processors.Clearer(
+				new Processors.Clearer(
 					typeof clear === 'string' ? clear : null
 				)
 			);
@@ -216,25 +213,25 @@ LibCanvas.Canvas2D = atom.Class({
 	},
 	listenMouse : function (elem) {
 		this._mouse = LibCanvas.isLibCanvas(elem) ? elem.mouse
-			: new LibCanvas.Mouse(this, /* preventDefault */elem);
+			: new Mouse(this, /* preventDefault */elem);
 		return this;
 	},
 	getKey : function (key) {
 		return this.keyboard.keyState(key);
 	},
 	listenKeyboard : function (elem) {
 		this._keyboard = LibCanvas.isLibCanvas(elem) ? elem.keyboard
-			: new LibCanvas.Keyboard(/* preventDefault */elem);
+			: new Keyboard(/* preventDefault */elem);
 		return this;
 	},
 	createBuffer : function (width, height) {
-		return LibCanvas.Buffer.apply(LibCanvas,
+		return Buffer.apply(LibCanvas,
 			arguments.length ? arguments :
 				Array.collect(this.origElem, ['width', 'height'])
 		);
 	},
 	createShaper : function (options) {
-		var shaper = new LibCanvas.Ui.Shaper(this, options);
+		var shaper = new Shaper(this, options);
 		this.addElement(shaper);
 		return shaper;
 	},
@@ -325,7 +322,7 @@ LibCanvas.Canvas2D = atom.Class({
 			z = null;
 		}
 		options = atom.extend({ name: name }, options || {});
-		var layer = this._layers[name] = new LibCanvas.Layer(this, this.options, options);
+		var layer = this._layers[name] = new Layer(this, this.options, options);
 		layer._layers = this._layers;
 		layer.zIndex  = z;
 		layer.origElem.atom.attr({ 'data-layer-name': name });

diff --git a/Source/Core/Context2D.js b/Source/Core/Context2D.js
@@ -22,13 +22,7 @@ provides: Context2D
 ...
 */
 
-(function (LibCanvas) {
-
-var Point  = LibCanvas.Point,
-    Shapes = LibCanvas.namespace('Shapes'),
-    Circle = Shapes.Circle,
-    Rectangle = Shapes.Rectangle;
-
+var Context2D = LibCanvas.Context2D = function () {
 
 var office = {
 	all : function (type, style) {
@@ -47,7 +41,7 @@ var office = {
 		return args.length ? Rectangle(args) : this.rectangle;
 	},
 	fillStroke : function (type, args) {
-		if (args.length >= 1 && args[0] instanceof LibCanvas.Shape) {
+		if (args.length >= 1 && args[0] instanceof Shape) {
 			if (args[1]) this.save().set(type + 'Style', args[1]);
 			args[0].draw(this, type);
 			if (args[1]) this.restore();
@@ -84,8 +78,8 @@ var accessors = {};
 	})
 });
 
-LibCanvas.Context2D = atom.Class({
-	Implements: [atom.Class(accessors)],
+var Context2D = Class({
+	Implements: [Class(accessors)],
 
 	initialize : function (canvas) {
 		if (canvas instanceof CanvasRenderingContext2D) {
@@ -145,7 +139,7 @@ LibCanvas.Context2D = atom.Class({
 		var args = [canvas, 0, 0];
 		if (resize) args.push(width, height);
 
-		var clone = LibCanvas.Buffer(width, height, true);
+		var clone = Buffer(width, height, true);
 		clone.ctx.original('drawImage', args);
 		return clone;
 	},
@@ -533,10 +527,10 @@ LibCanvas.Context2D = atom.Class({
 	},
 	projectiveImage : function (arg) {
 		// test
-		new LibCanvas.Inner.ProjectiveTexture(arg.image)
+		new ProjectiveTexture(arg.image)
 			.setContext(this.ctx2d)
 			.setQuality(arg.patchSize, arg.limit)
-			.render(new Shapes.Polygon(Array.collect(arg, [0, 1, 3, 2])));
+			.render(new Polygon(Array.collect(arg, [0, 1, 3, 2])));
 		return this;
 	},
 
@@ -690,8 +684,9 @@ var fixGradient = function (grad) {
 	return grad;
 };
 
-LibCanvas.Context2D.office = office;
+Context2D.office = office;
 
-HTMLCanvasElement.addContext('2d-libcanvas', LibCanvas.Context2D);
+HTMLCanvasElement.addContext('2d-libcanvas', Context2D);
 
-})(LibCanvas);
+return Context2D;
+}();