diff --git a/examples/example 13 - Graphics/index.html b/examples/example 13 - Graphics/index.html index 7f7fcd3..1164b62 100644 --- a/examples/example 13 - Graphics/index.html +++ b/examples/example 13 - Graphics/index.html @@ -20,8 +20,10 @@ var stage = new PIXI.Stage(0xFFFFFF, true); stage.interactive = true; - - var renderer = PIXI.autoDetectRenderer(620, 380); + + var rendererOptions = { antialias : true}; + // create a renderer instance + var renderer = PIXI.autoDetectRenderer(620, 380,rendererOptions); // add render view to DOM document.body.appendChild(renderer.view); diff --git a/examples/example 13 - Graphics/index.html b/examples/example 13 - Graphics/index.html index 7f7fcd3..1164b62 100644 --- a/examples/example 13 - Graphics/index.html +++ b/examples/example 13 - Graphics/index.html @@ -20,8 +20,10 @@ var stage = new PIXI.Stage(0xFFFFFF, true); stage.interactive = true; - - var renderer = PIXI.autoDetectRenderer(620, 380); + + var rendererOptions = { antialias : true}; + // create a renderer instance + var renderer = PIXI.autoDetectRenderer(620, 380,rendererOptions); // add render view to DOM document.body.appendChild(renderer.view); diff --git a/examples/example 14 - Masking/index.html b/examples/example 14 - Masking/index.html index d200bff..d786ce1 100644 --- a/examples/example 14 - Masking/index.html +++ b/examples/example 14 - Masking/index.html @@ -59,8 +59,10 @@ stage.addChild(container); + + var rendererOptions = { antialias : true}; // create a renderer instance - var renderer = PIXI.autoDetectRenderer(620, 380); + var renderer = PIXI.autoDetectRenderer(620, 380,rendererOptions); // center the renderer renderer.view.style.position = "absolute" diff --git a/examples/example 13 - Graphics/index.html b/examples/example 13 - Graphics/index.html index 7f7fcd3..1164b62 100644 --- a/examples/example 13 - Graphics/index.html +++ b/examples/example 13 - Graphics/index.html @@ -20,8 +20,10 @@ var stage = new PIXI.Stage(0xFFFFFF, true); stage.interactive = true; - - var renderer = PIXI.autoDetectRenderer(620, 380); + + var rendererOptions = { antialias : true}; + // create a renderer instance + var renderer = PIXI.autoDetectRenderer(620, 380,rendererOptions); // add render view to DOM document.body.appendChild(renderer.view); diff --git a/examples/example 14 - Masking/index.html b/examples/example 14 - Masking/index.html index d200bff..d786ce1 100644 --- a/examples/example 14 - Masking/index.html +++ b/examples/example 14 - Masking/index.html @@ -59,8 +59,10 @@ stage.addChild(container); + + var rendererOptions = { antialias : true}; // create a renderer instance - var renderer = PIXI.autoDetectRenderer(620, 380); + var renderer = PIXI.autoDetectRenderer(620, 380,rendererOptions); // center the renderer renderer.view.style.position = "absolute" diff --git a/examples/example 21 - Complex Graphics/index.html b/examples/example 21 - Complex Graphics/index.html index 5f4394e..2424e38 100644 --- a/examples/example 21 - Complex Graphics/index.html +++ b/examples/example 21 - Complex Graphics/index.html @@ -20,9 +20,9 @@ // create an new instance of a pixi stage var stage = new PIXI.Stage(0x3da8bb); - - // create a renderer instance. - var renderer = PIXI.autoDetectRenderer(window.innerWidth, window.innerHeight); + var rendererOptions = { antialias : true}; + // create a renderer instance + var renderer = PIXI.autoDetectRenderer(window.innerWidth, window.innerHeight,rendererOptions); // add the renderer view element to the DOM document.body.appendChild(renderer.view); diff --git a/examples/example 13 - Graphics/index.html b/examples/example 13 - Graphics/index.html index 7f7fcd3..1164b62 100644 --- a/examples/example 13 - Graphics/index.html +++ b/examples/example 13 - Graphics/index.html @@ -20,8 +20,10 @@ var stage = new PIXI.Stage(0xFFFFFF, true); stage.interactive = true; - - var renderer = PIXI.autoDetectRenderer(620, 380); + + var rendererOptions = { antialias : true}; + // create a renderer instance + var renderer = PIXI.autoDetectRenderer(620, 380,rendererOptions); // add render view to DOM document.body.appendChild(renderer.view); diff --git a/examples/example 14 - Masking/index.html b/examples/example 14 - Masking/index.html index d200bff..d786ce1 100644 --- a/examples/example 14 - Masking/index.html +++ b/examples/example 14 - Masking/index.html @@ -59,8 +59,10 @@ stage.addChild(container); + + var rendererOptions = { antialias : true}; // create a renderer instance - var renderer = PIXI.autoDetectRenderer(620, 380); + var renderer = PIXI.autoDetectRenderer(620, 380,rendererOptions); // center the renderer renderer.view.style.position = "absolute" diff --git a/examples/example 21 - Complex Graphics/index.html b/examples/example 21 - Complex Graphics/index.html index 5f4394e..2424e38 100644 --- a/examples/example 21 - Complex Graphics/index.html +++ b/examples/example 21 - Complex Graphics/index.html @@ -20,9 +20,9 @@ // create an new instance of a pixi stage var stage = new PIXI.Stage(0x3da8bb); - - // create a renderer instance. - var renderer = PIXI.autoDetectRenderer(window.innerWidth, window.innerHeight); + var rendererOptions = { antialias : true}; + // create a renderer instance + var renderer = PIXI.autoDetectRenderer(window.innerWidth, window.innerHeight,rendererOptions); // add the renderer view element to the DOM document.body.appendChild(renderer.view); diff --git a/examples/example 22 - Complex Masking/index.html b/examples/example 22 - Complex Masking/index.html index 18f5cbd..db7d0a5 100644 --- a/examples/example 22 - Complex Masking/index.html +++ b/examples/example 22 - Complex Masking/index.html @@ -19,8 +19,6 @@ // create an array of assets to load var alienFrames = ["eggHead.png", "flowerTop.png", "helmlok.png", "skully.png"]; - var count = 0; - // create an new instance of a pixi stage var stage = new PIXI.Stage(0x3da8bb); @@ -38,8 +36,6 @@ stage.addChild(alienContainer); - - count = 0; // start animating requestAnimFrame(animate); @@ -59,7 +55,7 @@ var colors = [0x5D0776, 0xEC8A49, 0xAF3666, 0xF6C84C, 0x4C779A]; var colorCount = 0; - var label = new PIXI.Text("Click and drag anywhere do draw complex geometry in pixi / do an art attack", {fill:"white", font:"16px Arial"}); + var label = new PIXI.Text("Click and drag anywhere do draw complex masks in pixi / do an art attack", {fill:"white", font:"16px Arial"}); label.x = 10; label.y = 10; @@ -71,12 +67,6 @@ var alien = PIXI.Sprite.fromImage(frameName); alien.tint = Math.random() * 0xFFFFFF; - /* - * fun fact for the day :) - * another way of doing the above would be - * var texture = PIXI.Texture.fromFrame(frameName); - * var alien = new PIXI.Sprite(texture); - */ alien.position.x = Math.random() * 800 - 400; alien.position.y = Math.random() * 600 - 300; alien.anchor.x = 0.5; @@ -128,9 +118,6 @@ function animate() { - - count += 0.1; - // render the stage renderer.render(stage); diff --git a/examples/example 13 - Graphics/index.html b/examples/example 13 - Graphics/index.html index 7f7fcd3..1164b62 100644 --- a/examples/example 13 - Graphics/index.html +++ b/examples/example 13 - Graphics/index.html @@ -20,8 +20,10 @@ var stage = new PIXI.Stage(0xFFFFFF, true); stage.interactive = true; - - var renderer = PIXI.autoDetectRenderer(620, 380); + + var rendererOptions = { antialias : true}; + // create a renderer instance + var renderer = PIXI.autoDetectRenderer(620, 380,rendererOptions); // add render view to DOM document.body.appendChild(renderer.view); diff --git a/examples/example 14 - Masking/index.html b/examples/example 14 - Masking/index.html index d200bff..d786ce1 100644 --- a/examples/example 14 - Masking/index.html +++ b/examples/example 14 - Masking/index.html @@ -59,8 +59,10 @@ stage.addChild(container); + + var rendererOptions = { antialias : true}; // create a renderer instance - var renderer = PIXI.autoDetectRenderer(620, 380); + var renderer = PIXI.autoDetectRenderer(620, 380,rendererOptions); // center the renderer renderer.view.style.position = "absolute" diff --git a/examples/example 21 - Complex Graphics/index.html b/examples/example 21 - Complex Graphics/index.html index 5f4394e..2424e38 100644 --- a/examples/example 21 - Complex Graphics/index.html +++ b/examples/example 21 - Complex Graphics/index.html @@ -20,9 +20,9 @@ // create an new instance of a pixi stage var stage = new PIXI.Stage(0x3da8bb); - - // create a renderer instance. - var renderer = PIXI.autoDetectRenderer(window.innerWidth, window.innerHeight); + var rendererOptions = { antialias : true}; + // create a renderer instance + var renderer = PIXI.autoDetectRenderer(window.innerWidth, window.innerHeight,rendererOptions); // add the renderer view element to the DOM document.body.appendChild(renderer.view); diff --git a/examples/example 22 - Complex Masking/index.html b/examples/example 22 - Complex Masking/index.html index 18f5cbd..db7d0a5 100644 --- a/examples/example 22 - Complex Masking/index.html +++ b/examples/example 22 - Complex Masking/index.html @@ -19,8 +19,6 @@ // create an array of assets to load var alienFrames = ["eggHead.png", "flowerTop.png", "helmlok.png", "skully.png"]; - var count = 0; - // create an new instance of a pixi stage var stage = new PIXI.Stage(0x3da8bb); @@ -38,8 +36,6 @@ stage.addChild(alienContainer); - - count = 0; // start animating requestAnimFrame(animate); @@ -59,7 +55,7 @@ var colors = [0x5D0776, 0xEC8A49, 0xAF3666, 0xF6C84C, 0x4C779A]; var colorCount = 0; - var label = new PIXI.Text("Click and drag anywhere do draw complex geometry in pixi / do an art attack", {fill:"white", font:"16px Arial"}); + var label = new PIXI.Text("Click and drag anywhere do draw complex masks in pixi / do an art attack", {fill:"white", font:"16px Arial"}); label.x = 10; label.y = 10; @@ -71,12 +67,6 @@ var alien = PIXI.Sprite.fromImage(frameName); alien.tint = Math.random() * 0xFFFFFF; - /* - * fun fact for the day :) - * another way of doing the above would be - * var texture = PIXI.Texture.fromFrame(frameName); - * var alien = new PIXI.Sprite(texture); - */ alien.position.x = Math.random() * 800 - 400; alien.position.y = Math.random() * 600 - 300; alien.anchor.x = 0.5; @@ -128,9 +118,6 @@ function animate() { - - count += 0.1; - // render the stage renderer.render(stage); diff --git a/examples/example 23 - Texture Swap/index.html b/examples/example 23 - Texture Swap/index.html index 0bbf65c..21feded 100644 --- a/examples/example 23 - Texture Swap/index.html +++ b/examples/example 23 - Texture Swap/index.html @@ -25,6 +25,8 @@ requestAnimFrame(animate); + var bol = false; + // create a texture from an image path var texture = PIXI.Texture.fromImage("flowerTop.png"); texture.baseTexture.on("loaded", function(){ diff --git a/examples/example 13 - Graphics/index.html b/examples/example 13 - Graphics/index.html index 7f7fcd3..1164b62 100644 --- a/examples/example 13 - Graphics/index.html +++ b/examples/example 13 - Graphics/index.html @@ -20,8 +20,10 @@ var stage = new PIXI.Stage(0xFFFFFF, true); stage.interactive = true; - - var renderer = PIXI.autoDetectRenderer(620, 380); + + var rendererOptions = { antialias : true}; + // create a renderer instance + var renderer = PIXI.autoDetectRenderer(620, 380,rendererOptions); // add render view to DOM document.body.appendChild(renderer.view); diff --git a/examples/example 14 - Masking/index.html b/examples/example 14 - Masking/index.html index d200bff..d786ce1 100644 --- a/examples/example 14 - Masking/index.html +++ b/examples/example 14 - Masking/index.html @@ -59,8 +59,10 @@ stage.addChild(container); + + var rendererOptions = { antialias : true}; // create a renderer instance - var renderer = PIXI.autoDetectRenderer(620, 380); + var renderer = PIXI.autoDetectRenderer(620, 380,rendererOptions); // center the renderer renderer.view.style.position = "absolute" diff --git a/examples/example 21 - Complex Graphics/index.html b/examples/example 21 - Complex Graphics/index.html index 5f4394e..2424e38 100644 --- a/examples/example 21 - Complex Graphics/index.html +++ b/examples/example 21 - Complex Graphics/index.html @@ -20,9 +20,9 @@ // create an new instance of a pixi stage var stage = new PIXI.Stage(0x3da8bb); - - // create a renderer instance. - var renderer = PIXI.autoDetectRenderer(window.innerWidth, window.innerHeight); + var rendererOptions = { antialias : true}; + // create a renderer instance + var renderer = PIXI.autoDetectRenderer(window.innerWidth, window.innerHeight,rendererOptions); // add the renderer view element to the DOM document.body.appendChild(renderer.view); diff --git a/examples/example 22 - Complex Masking/index.html b/examples/example 22 - Complex Masking/index.html index 18f5cbd..db7d0a5 100644 --- a/examples/example 22 - Complex Masking/index.html +++ b/examples/example 22 - Complex Masking/index.html @@ -19,8 +19,6 @@ // create an array of assets to load var alienFrames = ["eggHead.png", "flowerTop.png", "helmlok.png", "skully.png"]; - var count = 0; - // create an new instance of a pixi stage var stage = new PIXI.Stage(0x3da8bb); @@ -38,8 +36,6 @@ stage.addChild(alienContainer); - - count = 0; // start animating requestAnimFrame(animate); @@ -59,7 +55,7 @@ var colors = [0x5D0776, 0xEC8A49, 0xAF3666, 0xF6C84C, 0x4C779A]; var colorCount = 0; - var label = new PIXI.Text("Click and drag anywhere do draw complex geometry in pixi / do an art attack", {fill:"white", font:"16px Arial"}); + var label = new PIXI.Text("Click and drag anywhere do draw complex masks in pixi / do an art attack", {fill:"white", font:"16px Arial"}); label.x = 10; label.y = 10; @@ -71,12 +67,6 @@ var alien = PIXI.Sprite.fromImage(frameName); alien.tint = Math.random() * 0xFFFFFF; - /* - * fun fact for the day :) - * another way of doing the above would be - * var texture = PIXI.Texture.fromFrame(frameName); - * var alien = new PIXI.Sprite(texture); - */ alien.position.x = Math.random() * 800 - 400; alien.position.y = Math.random() * 600 - 300; alien.anchor.x = 0.5; @@ -128,9 +118,6 @@ function animate() { - - count += 0.1; - // render the stage renderer.render(stage); diff --git a/examples/example 23 - Texture Swap/index.html b/examples/example 23 - Texture Swap/index.html index 0bbf65c..21feded 100644 --- a/examples/example 23 - Texture Swap/index.html +++ b/examples/example 23 - Texture Swap/index.html @@ -25,6 +25,8 @@ requestAnimFrame(animate); + var bol = false; + // create a texture from an image path var texture = PIXI.Texture.fromImage("flowerTop.png"); texture.baseTexture.on("loaded", function(){ diff --git a/src/pixi/geom/Circle.js b/src/pixi/geom/Circle.js index 541e0fe..47288c6 100644 --- a/src/pixi/geom/Circle.js +++ b/src/pixi/geom/Circle.js @@ -33,6 +33,13 @@ * @default 0 */ this.radius = radius || 0; + + /** + * The type of the object, should be one of the Graphics type consts, PIXI.Graphics.CIRC in this case + * @property type + * @type Number + * @default 0 + */ }; /** diff --git a/examples/example 13 - Graphics/index.html b/examples/example 13 - Graphics/index.html index 7f7fcd3..1164b62 100644 --- a/examples/example 13 - Graphics/index.html +++ b/examples/example 13 - Graphics/index.html @@ -20,8 +20,10 @@ var stage = new PIXI.Stage(0xFFFFFF, true); stage.interactive = true; - - var renderer = PIXI.autoDetectRenderer(620, 380); + + var rendererOptions = { antialias : true}; + // create a renderer instance + var renderer = PIXI.autoDetectRenderer(620, 380,rendererOptions); // add render view to DOM document.body.appendChild(renderer.view); diff --git a/examples/example 14 - Masking/index.html b/examples/example 14 - Masking/index.html index d200bff..d786ce1 100644 --- a/examples/example 14 - Masking/index.html +++ b/examples/example 14 - Masking/index.html @@ -59,8 +59,10 @@ stage.addChild(container); + + var rendererOptions = { antialias : true}; // create a renderer instance - var renderer = PIXI.autoDetectRenderer(620, 380); + var renderer = PIXI.autoDetectRenderer(620, 380,rendererOptions); // center the renderer renderer.view.style.position = "absolute" diff --git a/examples/example 21 - Complex Graphics/index.html b/examples/example 21 - Complex Graphics/index.html index 5f4394e..2424e38 100644 --- a/examples/example 21 - Complex Graphics/index.html +++ b/examples/example 21 - Complex Graphics/index.html @@ -20,9 +20,9 @@ // create an new instance of a pixi stage var stage = new PIXI.Stage(0x3da8bb); - - // create a renderer instance. - var renderer = PIXI.autoDetectRenderer(window.innerWidth, window.innerHeight); + var rendererOptions = { antialias : true}; + // create a renderer instance + var renderer = PIXI.autoDetectRenderer(window.innerWidth, window.innerHeight,rendererOptions); // add the renderer view element to the DOM document.body.appendChild(renderer.view); diff --git a/examples/example 22 - Complex Masking/index.html b/examples/example 22 - Complex Masking/index.html index 18f5cbd..db7d0a5 100644 --- a/examples/example 22 - Complex Masking/index.html +++ b/examples/example 22 - Complex Masking/index.html @@ -19,8 +19,6 @@ // create an array of assets to load var alienFrames = ["eggHead.png", "flowerTop.png", "helmlok.png", "skully.png"]; - var count = 0; - // create an new instance of a pixi stage var stage = new PIXI.Stage(0x3da8bb); @@ -38,8 +36,6 @@ stage.addChild(alienContainer); - - count = 0; // start animating requestAnimFrame(animate); @@ -59,7 +55,7 @@ var colors = [0x5D0776, 0xEC8A49, 0xAF3666, 0xF6C84C, 0x4C779A]; var colorCount = 0; - var label = new PIXI.Text("Click and drag anywhere do draw complex geometry in pixi / do an art attack", {fill:"white", font:"16px Arial"}); + var label = new PIXI.Text("Click and drag anywhere do draw complex masks in pixi / do an art attack", {fill:"white", font:"16px Arial"}); label.x = 10; label.y = 10; @@ -71,12 +67,6 @@ var alien = PIXI.Sprite.fromImage(frameName); alien.tint = Math.random() * 0xFFFFFF; - /* - * fun fact for the day :) - * another way of doing the above would be - * var texture = PIXI.Texture.fromFrame(frameName); - * var alien = new PIXI.Sprite(texture); - */ alien.position.x = Math.random() * 800 - 400; alien.position.y = Math.random() * 600 - 300; alien.anchor.x = 0.5; @@ -128,9 +118,6 @@ function animate() { - - count += 0.1; - // render the stage renderer.render(stage); diff --git a/examples/example 23 - Texture Swap/index.html b/examples/example 23 - Texture Swap/index.html index 0bbf65c..21feded 100644 --- a/examples/example 23 - Texture Swap/index.html +++ b/examples/example 23 - Texture Swap/index.html @@ -25,6 +25,8 @@ requestAnimFrame(animate); + var bol = false; + // create a texture from an image path var texture = PIXI.Texture.fromImage("flowerTop.png"); texture.baseTexture.on("loaded", function(){ diff --git a/src/pixi/geom/Circle.js b/src/pixi/geom/Circle.js index 541e0fe..47288c6 100644 --- a/src/pixi/geom/Circle.js +++ b/src/pixi/geom/Circle.js @@ -33,6 +33,13 @@ * @default 0 */ this.radius = radius || 0; + + /** + * The type of the object, should be one of the Graphics type consts, PIXI.Graphics.CIRC in this case + * @property type + * @type Number + * @default 0 + */ }; /** diff --git a/src/pixi/geom/Ellipse.js b/src/pixi/geom/Ellipse.js index 0dd71f3..2700a71 100644 --- a/src/pixi/geom/Ellipse.js +++ b/src/pixi/geom/Ellipse.js @@ -41,6 +41,14 @@ * @default 0 */ this.height = height || 0; + + + /** + * The type of the object, should be one of the Graphics type consts, PIXI.Graphics.ELIP in this case + * @property type + * @type Number + * @default 0 + */ }; /** diff --git a/examples/example 13 - Graphics/index.html b/examples/example 13 - Graphics/index.html index 7f7fcd3..1164b62 100644 --- a/examples/example 13 - Graphics/index.html +++ b/examples/example 13 - Graphics/index.html @@ -20,8 +20,10 @@ var stage = new PIXI.Stage(0xFFFFFF, true); stage.interactive = true; - - var renderer = PIXI.autoDetectRenderer(620, 380); + + var rendererOptions = { antialias : true}; + // create a renderer instance + var renderer = PIXI.autoDetectRenderer(620, 380,rendererOptions); // add render view to DOM document.body.appendChild(renderer.view); diff --git a/examples/example 14 - Masking/index.html b/examples/example 14 - Masking/index.html index d200bff..d786ce1 100644 --- a/examples/example 14 - Masking/index.html +++ b/examples/example 14 - Masking/index.html @@ -59,8 +59,10 @@ stage.addChild(container); + + var rendererOptions = { antialias : true}; // create a renderer instance - var renderer = PIXI.autoDetectRenderer(620, 380); + var renderer = PIXI.autoDetectRenderer(620, 380,rendererOptions); // center the renderer renderer.view.style.position = "absolute" diff --git a/examples/example 21 - Complex Graphics/index.html b/examples/example 21 - Complex Graphics/index.html index 5f4394e..2424e38 100644 --- a/examples/example 21 - Complex Graphics/index.html +++ b/examples/example 21 - Complex Graphics/index.html @@ -20,9 +20,9 @@ // create an new instance of a pixi stage var stage = new PIXI.Stage(0x3da8bb); - - // create a renderer instance. - var renderer = PIXI.autoDetectRenderer(window.innerWidth, window.innerHeight); + var rendererOptions = { antialias : true}; + // create a renderer instance + var renderer = PIXI.autoDetectRenderer(window.innerWidth, window.innerHeight,rendererOptions); // add the renderer view element to the DOM document.body.appendChild(renderer.view); diff --git a/examples/example 22 - Complex Masking/index.html b/examples/example 22 - Complex Masking/index.html index 18f5cbd..db7d0a5 100644 --- a/examples/example 22 - Complex Masking/index.html +++ b/examples/example 22 - Complex Masking/index.html @@ -19,8 +19,6 @@ // create an array of assets to load var alienFrames = ["eggHead.png", "flowerTop.png", "helmlok.png", "skully.png"]; - var count = 0; - // create an new instance of a pixi stage var stage = new PIXI.Stage(0x3da8bb); @@ -38,8 +36,6 @@ stage.addChild(alienContainer); - - count = 0; // start animating requestAnimFrame(animate); @@ -59,7 +55,7 @@ var colors = [0x5D0776, 0xEC8A49, 0xAF3666, 0xF6C84C, 0x4C779A]; var colorCount = 0; - var label = new PIXI.Text("Click and drag anywhere do draw complex geometry in pixi / do an art attack", {fill:"white", font:"16px Arial"}); + var label = new PIXI.Text("Click and drag anywhere do draw complex masks in pixi / do an art attack", {fill:"white", font:"16px Arial"}); label.x = 10; label.y = 10; @@ -71,12 +67,6 @@ var alien = PIXI.Sprite.fromImage(frameName); alien.tint = Math.random() * 0xFFFFFF; - /* - * fun fact for the day :) - * another way of doing the above would be - * var texture = PIXI.Texture.fromFrame(frameName); - * var alien = new PIXI.Sprite(texture); - */ alien.position.x = Math.random() * 800 - 400; alien.position.y = Math.random() * 600 - 300; alien.anchor.x = 0.5; @@ -128,9 +118,6 @@ function animate() { - - count += 0.1; - // render the stage renderer.render(stage); diff --git a/examples/example 23 - Texture Swap/index.html b/examples/example 23 - Texture Swap/index.html index 0bbf65c..21feded 100644 --- a/examples/example 23 - Texture Swap/index.html +++ b/examples/example 23 - Texture Swap/index.html @@ -25,6 +25,8 @@ requestAnimFrame(animate); + var bol = false; + // create a texture from an image path var texture = PIXI.Texture.fromImage("flowerTop.png"); texture.baseTexture.on("loaded", function(){ diff --git a/src/pixi/geom/Circle.js b/src/pixi/geom/Circle.js index 541e0fe..47288c6 100644 --- a/src/pixi/geom/Circle.js +++ b/src/pixi/geom/Circle.js @@ -33,6 +33,13 @@ * @default 0 */ this.radius = radius || 0; + + /** + * The type of the object, should be one of the Graphics type consts, PIXI.Graphics.CIRC in this case + * @property type + * @type Number + * @default 0 + */ }; /** diff --git a/src/pixi/geom/Ellipse.js b/src/pixi/geom/Ellipse.js index 0dd71f3..2700a71 100644 --- a/src/pixi/geom/Ellipse.js +++ b/src/pixi/geom/Ellipse.js @@ -41,6 +41,14 @@ * @default 0 */ this.height = height || 0; + + + /** + * The type of the object, should be one of the Graphics type consts, PIXI.Graphics.ELIP in this case + * @property type + * @type Number + * @default 0 + */ }; /** diff --git a/src/pixi/geom/Polygon.js b/src/pixi/geom/Polygon.js index d615a89..77f8f56 100644 --- a/src/pixi/geom/Polygon.js +++ b/src/pixi/geom/Polygon.js @@ -29,7 +29,21 @@ } this.closed = true; + + /** + * An array of the points of this polygon + * @property points + * @type Array(Point)|Array(Number) + * + */ this.points = points; + + /** + * The type of the object, should be one of the Graphics type consts, PIXI.Graphics.POLY in this case + * @property type + * @type Number + * @default 0 + */ }; /** diff --git a/examples/example 13 - Graphics/index.html b/examples/example 13 - Graphics/index.html index 7f7fcd3..1164b62 100644 --- a/examples/example 13 - Graphics/index.html +++ b/examples/example 13 - Graphics/index.html @@ -20,8 +20,10 @@ var stage = new PIXI.Stage(0xFFFFFF, true); stage.interactive = true; - - var renderer = PIXI.autoDetectRenderer(620, 380); + + var rendererOptions = { antialias : true}; + // create a renderer instance + var renderer = PIXI.autoDetectRenderer(620, 380,rendererOptions); // add render view to DOM document.body.appendChild(renderer.view); diff --git a/examples/example 14 - Masking/index.html b/examples/example 14 - Masking/index.html index d200bff..d786ce1 100644 --- a/examples/example 14 - Masking/index.html +++ b/examples/example 14 - Masking/index.html @@ -59,8 +59,10 @@ stage.addChild(container); + + var rendererOptions = { antialias : true}; // create a renderer instance - var renderer = PIXI.autoDetectRenderer(620, 380); + var renderer = PIXI.autoDetectRenderer(620, 380,rendererOptions); // center the renderer renderer.view.style.position = "absolute" diff --git a/examples/example 21 - Complex Graphics/index.html b/examples/example 21 - Complex Graphics/index.html index 5f4394e..2424e38 100644 --- a/examples/example 21 - Complex Graphics/index.html +++ b/examples/example 21 - Complex Graphics/index.html @@ -20,9 +20,9 @@ // create an new instance of a pixi stage var stage = new PIXI.Stage(0x3da8bb); - - // create a renderer instance. - var renderer = PIXI.autoDetectRenderer(window.innerWidth, window.innerHeight); + var rendererOptions = { antialias : true}; + // create a renderer instance + var renderer = PIXI.autoDetectRenderer(window.innerWidth, window.innerHeight,rendererOptions); // add the renderer view element to the DOM document.body.appendChild(renderer.view); diff --git a/examples/example 22 - Complex Masking/index.html b/examples/example 22 - Complex Masking/index.html index 18f5cbd..db7d0a5 100644 --- a/examples/example 22 - Complex Masking/index.html +++ b/examples/example 22 - Complex Masking/index.html @@ -19,8 +19,6 @@ // create an array of assets to load var alienFrames = ["eggHead.png", "flowerTop.png", "helmlok.png", "skully.png"]; - var count = 0; - // create an new instance of a pixi stage var stage = new PIXI.Stage(0x3da8bb); @@ -38,8 +36,6 @@ stage.addChild(alienContainer); - - count = 0; // start animating requestAnimFrame(animate); @@ -59,7 +55,7 @@ var colors = [0x5D0776, 0xEC8A49, 0xAF3666, 0xF6C84C, 0x4C779A]; var colorCount = 0; - var label = new PIXI.Text("Click and drag anywhere do draw complex geometry in pixi / do an art attack", {fill:"white", font:"16px Arial"}); + var label = new PIXI.Text("Click and drag anywhere do draw complex masks in pixi / do an art attack", {fill:"white", font:"16px Arial"}); label.x = 10; label.y = 10; @@ -71,12 +67,6 @@ var alien = PIXI.Sprite.fromImage(frameName); alien.tint = Math.random() * 0xFFFFFF; - /* - * fun fact for the day :) - * another way of doing the above would be - * var texture = PIXI.Texture.fromFrame(frameName); - * var alien = new PIXI.Sprite(texture); - */ alien.position.x = Math.random() * 800 - 400; alien.position.y = Math.random() * 600 - 300; alien.anchor.x = 0.5; @@ -128,9 +118,6 @@ function animate() { - - count += 0.1; - // render the stage renderer.render(stage); diff --git a/examples/example 23 - Texture Swap/index.html b/examples/example 23 - Texture Swap/index.html index 0bbf65c..21feded 100644 --- a/examples/example 23 - Texture Swap/index.html +++ b/examples/example 23 - Texture Swap/index.html @@ -25,6 +25,8 @@ requestAnimFrame(animate); + var bol = false; + // create a texture from an image path var texture = PIXI.Texture.fromImage("flowerTop.png"); texture.baseTexture.on("loaded", function(){ diff --git a/src/pixi/geom/Circle.js b/src/pixi/geom/Circle.js index 541e0fe..47288c6 100644 --- a/src/pixi/geom/Circle.js +++ b/src/pixi/geom/Circle.js @@ -33,6 +33,13 @@ * @default 0 */ this.radius = radius || 0; + + /** + * The type of the object, should be one of the Graphics type consts, PIXI.Graphics.CIRC in this case + * @property type + * @type Number + * @default 0 + */ }; /** diff --git a/src/pixi/geom/Ellipse.js b/src/pixi/geom/Ellipse.js index 0dd71f3..2700a71 100644 --- a/src/pixi/geom/Ellipse.js +++ b/src/pixi/geom/Ellipse.js @@ -41,6 +41,14 @@ * @default 0 */ this.height = height || 0; + + + /** + * The type of the object, should be one of the Graphics type consts, PIXI.Graphics.ELIP in this case + * @property type + * @type Number + * @default 0 + */ }; /** diff --git a/src/pixi/geom/Polygon.js b/src/pixi/geom/Polygon.js index d615a89..77f8f56 100644 --- a/src/pixi/geom/Polygon.js +++ b/src/pixi/geom/Polygon.js @@ -29,7 +29,21 @@ } this.closed = true; + + /** + * An array of the points of this polygon + * @property points + * @type Array(Point)|Array(Number) + * + */ this.points = points; + + /** + * The type of the object, should be one of the Graphics type consts, PIXI.Graphics.POLY in this case + * @property type + * @type Number + * @default 0 + */ }; /** diff --git a/src/pixi/geom/Rectangle.js b/src/pixi/geom/Rectangle.js index 2ccd1d1..61985fa 100644 --- a/src/pixi/geom/Rectangle.js +++ b/src/pixi/geom/Rectangle.js @@ -41,6 +41,13 @@ * @default 0 */ this.height = height || 0; + + /** + * The type of the object, should be one of the Graphics type consts, PIXI.Graphics.RECT in this case + * @property type + * @type Number + * @default 0 + */ }; /** diff --git a/examples/example 13 - Graphics/index.html b/examples/example 13 - Graphics/index.html index 7f7fcd3..1164b62 100644 --- a/examples/example 13 - Graphics/index.html +++ b/examples/example 13 - Graphics/index.html @@ -20,8 +20,10 @@ var stage = new PIXI.Stage(0xFFFFFF, true); stage.interactive = true; - - var renderer = PIXI.autoDetectRenderer(620, 380); + + var rendererOptions = { antialias : true}; + // create a renderer instance + var renderer = PIXI.autoDetectRenderer(620, 380,rendererOptions); // add render view to DOM document.body.appendChild(renderer.view); diff --git a/examples/example 14 - Masking/index.html b/examples/example 14 - Masking/index.html index d200bff..d786ce1 100644 --- a/examples/example 14 - Masking/index.html +++ b/examples/example 14 - Masking/index.html @@ -59,8 +59,10 @@ stage.addChild(container); + + var rendererOptions = { antialias : true}; // create a renderer instance - var renderer = PIXI.autoDetectRenderer(620, 380); + var renderer = PIXI.autoDetectRenderer(620, 380,rendererOptions); // center the renderer renderer.view.style.position = "absolute" diff --git a/examples/example 21 - Complex Graphics/index.html b/examples/example 21 - Complex Graphics/index.html index 5f4394e..2424e38 100644 --- a/examples/example 21 - Complex Graphics/index.html +++ b/examples/example 21 - Complex Graphics/index.html @@ -20,9 +20,9 @@ // create an new instance of a pixi stage var stage = new PIXI.Stage(0x3da8bb); - - // create a renderer instance. - var renderer = PIXI.autoDetectRenderer(window.innerWidth, window.innerHeight); + var rendererOptions = { antialias : true}; + // create a renderer instance + var renderer = PIXI.autoDetectRenderer(window.innerWidth, window.innerHeight,rendererOptions); // add the renderer view element to the DOM document.body.appendChild(renderer.view); diff --git a/examples/example 22 - Complex Masking/index.html b/examples/example 22 - Complex Masking/index.html index 18f5cbd..db7d0a5 100644 --- a/examples/example 22 - Complex Masking/index.html +++ b/examples/example 22 - Complex Masking/index.html @@ -19,8 +19,6 @@ // create an array of assets to load var alienFrames = ["eggHead.png", "flowerTop.png", "helmlok.png", "skully.png"]; - var count = 0; - // create an new instance of a pixi stage var stage = new PIXI.Stage(0x3da8bb); @@ -38,8 +36,6 @@ stage.addChild(alienContainer); - - count = 0; // start animating requestAnimFrame(animate); @@ -59,7 +55,7 @@ var colors = [0x5D0776, 0xEC8A49, 0xAF3666, 0xF6C84C, 0x4C779A]; var colorCount = 0; - var label = new PIXI.Text("Click and drag anywhere do draw complex geometry in pixi / do an art attack", {fill:"white", font:"16px Arial"}); + var label = new PIXI.Text("Click and drag anywhere do draw complex masks in pixi / do an art attack", {fill:"white", font:"16px Arial"}); label.x = 10; label.y = 10; @@ -71,12 +67,6 @@ var alien = PIXI.Sprite.fromImage(frameName); alien.tint = Math.random() * 0xFFFFFF; - /* - * fun fact for the day :) - * another way of doing the above would be - * var texture = PIXI.Texture.fromFrame(frameName); - * var alien = new PIXI.Sprite(texture); - */ alien.position.x = Math.random() * 800 - 400; alien.position.y = Math.random() * 600 - 300; alien.anchor.x = 0.5; @@ -128,9 +118,6 @@ function animate() { - - count += 0.1; - // render the stage renderer.render(stage); diff --git a/examples/example 23 - Texture Swap/index.html b/examples/example 23 - Texture Swap/index.html index 0bbf65c..21feded 100644 --- a/examples/example 23 - Texture Swap/index.html +++ b/examples/example 23 - Texture Swap/index.html @@ -25,6 +25,8 @@ requestAnimFrame(animate); + var bol = false; + // create a texture from an image path var texture = PIXI.Texture.fromImage("flowerTop.png"); texture.baseTexture.on("loaded", function(){ diff --git a/src/pixi/geom/Circle.js b/src/pixi/geom/Circle.js index 541e0fe..47288c6 100644 --- a/src/pixi/geom/Circle.js +++ b/src/pixi/geom/Circle.js @@ -33,6 +33,13 @@ * @default 0 */ this.radius = radius || 0; + + /** + * The type of the object, should be one of the Graphics type consts, PIXI.Graphics.CIRC in this case + * @property type + * @type Number + * @default 0 + */ }; /** diff --git a/src/pixi/geom/Ellipse.js b/src/pixi/geom/Ellipse.js index 0dd71f3..2700a71 100644 --- a/src/pixi/geom/Ellipse.js +++ b/src/pixi/geom/Ellipse.js @@ -41,6 +41,14 @@ * @default 0 */ this.height = height || 0; + + + /** + * The type of the object, should be one of the Graphics type consts, PIXI.Graphics.ELIP in this case + * @property type + * @type Number + * @default 0 + */ }; /** diff --git a/src/pixi/geom/Polygon.js b/src/pixi/geom/Polygon.js index d615a89..77f8f56 100644 --- a/src/pixi/geom/Polygon.js +++ b/src/pixi/geom/Polygon.js @@ -29,7 +29,21 @@ } this.closed = true; + + /** + * An array of the points of this polygon + * @property points + * @type Array(Point)|Array(Number) + * + */ this.points = points; + + /** + * The type of the object, should be one of the Graphics type consts, PIXI.Graphics.POLY in this case + * @property type + * @type Number + * @default 0 + */ }; /** diff --git a/src/pixi/geom/Rectangle.js b/src/pixi/geom/Rectangle.js index 2ccd1d1..61985fa 100644 --- a/src/pixi/geom/Rectangle.js +++ b/src/pixi/geom/Rectangle.js @@ -41,6 +41,13 @@ * @default 0 */ this.height = height || 0; + + /** + * The type of the object, should be one of the Graphics type consts, PIXI.Graphics.RECT in this case + * @property type + * @type Number + * @default 0 + */ }; /** diff --git a/src/pixi/geom/RoundedRectangle.js b/src/pixi/geom/RoundedRectangle.js index dae668d..4f75723 100644 --- a/src/pixi/geom/RoundedRectangle.js +++ b/src/pixi/geom/RoundedRectangle.js @@ -11,7 +11,7 @@ * @param y {Number} The Y coordinate of the upper-left corner of the rounded rectangle * @param width {Number} The overall width of this rounded rectangle * @param height {Number} The overall height of this rounded rectangle - * @param radius {Number} The overall radius of this corners of this rounded rectangle + * @param radius {Number} Controls the radius of the rounded corners */ PIXI.RoundedRectangle = function(x, y, width, height, radius) { @@ -49,6 +49,13 @@ * @default 20 */ this.radius = radius || 20; + + /** + * The type of the object, should be one of the Graphics type consts, PIXI.Graphics.RRECT in this case + * @property type + * @type Number + * @default 0 + */ }; /** diff --git a/examples/example 13 - Graphics/index.html b/examples/example 13 - Graphics/index.html index 7f7fcd3..1164b62 100644 --- a/examples/example 13 - Graphics/index.html +++ b/examples/example 13 - Graphics/index.html @@ -20,8 +20,10 @@ var stage = new PIXI.Stage(0xFFFFFF, true); stage.interactive = true; - - var renderer = PIXI.autoDetectRenderer(620, 380); + + var rendererOptions = { antialias : true}; + // create a renderer instance + var renderer = PIXI.autoDetectRenderer(620, 380,rendererOptions); // add render view to DOM document.body.appendChild(renderer.view); diff --git a/examples/example 14 - Masking/index.html b/examples/example 14 - Masking/index.html index d200bff..d786ce1 100644 --- a/examples/example 14 - Masking/index.html +++ b/examples/example 14 - Masking/index.html @@ -59,8 +59,10 @@ stage.addChild(container); + + var rendererOptions = { antialias : true}; // create a renderer instance - var renderer = PIXI.autoDetectRenderer(620, 380); + var renderer = PIXI.autoDetectRenderer(620, 380,rendererOptions); // center the renderer renderer.view.style.position = "absolute" diff --git a/examples/example 21 - Complex Graphics/index.html b/examples/example 21 - Complex Graphics/index.html index 5f4394e..2424e38 100644 --- a/examples/example 21 - Complex Graphics/index.html +++ b/examples/example 21 - Complex Graphics/index.html @@ -20,9 +20,9 @@ // create an new instance of a pixi stage var stage = new PIXI.Stage(0x3da8bb); - - // create a renderer instance. - var renderer = PIXI.autoDetectRenderer(window.innerWidth, window.innerHeight); + var rendererOptions = { antialias : true}; + // create a renderer instance + var renderer = PIXI.autoDetectRenderer(window.innerWidth, window.innerHeight,rendererOptions); // add the renderer view element to the DOM document.body.appendChild(renderer.view); diff --git a/examples/example 22 - Complex Masking/index.html b/examples/example 22 - Complex Masking/index.html index 18f5cbd..db7d0a5 100644 --- a/examples/example 22 - Complex Masking/index.html +++ b/examples/example 22 - Complex Masking/index.html @@ -19,8 +19,6 @@ // create an array of assets to load var alienFrames = ["eggHead.png", "flowerTop.png", "helmlok.png", "skully.png"]; - var count = 0; - // create an new instance of a pixi stage var stage = new PIXI.Stage(0x3da8bb); @@ -38,8 +36,6 @@ stage.addChild(alienContainer); - - count = 0; // start animating requestAnimFrame(animate); @@ -59,7 +55,7 @@ var colors = [0x5D0776, 0xEC8A49, 0xAF3666, 0xF6C84C, 0x4C779A]; var colorCount = 0; - var label = new PIXI.Text("Click and drag anywhere do draw complex geometry in pixi / do an art attack", {fill:"white", font:"16px Arial"}); + var label = new PIXI.Text("Click and drag anywhere do draw complex masks in pixi / do an art attack", {fill:"white", font:"16px Arial"}); label.x = 10; label.y = 10; @@ -71,12 +67,6 @@ var alien = PIXI.Sprite.fromImage(frameName); alien.tint = Math.random() * 0xFFFFFF; - /* - * fun fact for the day :) - * another way of doing the above would be - * var texture = PIXI.Texture.fromFrame(frameName); - * var alien = new PIXI.Sprite(texture); - */ alien.position.x = Math.random() * 800 - 400; alien.position.y = Math.random() * 600 - 300; alien.anchor.x = 0.5; @@ -128,9 +118,6 @@ function animate() { - - count += 0.1; - // render the stage renderer.render(stage); diff --git a/examples/example 23 - Texture Swap/index.html b/examples/example 23 - Texture Swap/index.html index 0bbf65c..21feded 100644 --- a/examples/example 23 - Texture Swap/index.html +++ b/examples/example 23 - Texture Swap/index.html @@ -25,6 +25,8 @@ requestAnimFrame(animate); + var bol = false; + // create a texture from an image path var texture = PIXI.Texture.fromImage("flowerTop.png"); texture.baseTexture.on("loaded", function(){ diff --git a/src/pixi/geom/Circle.js b/src/pixi/geom/Circle.js index 541e0fe..47288c6 100644 --- a/src/pixi/geom/Circle.js +++ b/src/pixi/geom/Circle.js @@ -33,6 +33,13 @@ * @default 0 */ this.radius = radius || 0; + + /** + * The type of the object, should be one of the Graphics type consts, PIXI.Graphics.CIRC in this case + * @property type + * @type Number + * @default 0 + */ }; /** diff --git a/src/pixi/geom/Ellipse.js b/src/pixi/geom/Ellipse.js index 0dd71f3..2700a71 100644 --- a/src/pixi/geom/Ellipse.js +++ b/src/pixi/geom/Ellipse.js @@ -41,6 +41,14 @@ * @default 0 */ this.height = height || 0; + + + /** + * The type of the object, should be one of the Graphics type consts, PIXI.Graphics.ELIP in this case + * @property type + * @type Number + * @default 0 + */ }; /** diff --git a/src/pixi/geom/Polygon.js b/src/pixi/geom/Polygon.js index d615a89..77f8f56 100644 --- a/src/pixi/geom/Polygon.js +++ b/src/pixi/geom/Polygon.js @@ -29,7 +29,21 @@ } this.closed = true; + + /** + * An array of the points of this polygon + * @property points + * @type Array(Point)|Array(Number) + * + */ this.points = points; + + /** + * The type of the object, should be one of the Graphics type consts, PIXI.Graphics.POLY in this case + * @property type + * @type Number + * @default 0 + */ }; /** diff --git a/src/pixi/geom/Rectangle.js b/src/pixi/geom/Rectangle.js index 2ccd1d1..61985fa 100644 --- a/src/pixi/geom/Rectangle.js +++ b/src/pixi/geom/Rectangle.js @@ -41,6 +41,13 @@ * @default 0 */ this.height = height || 0; + + /** + * The type of the object, should be one of the Graphics type consts, PIXI.Graphics.RECT in this case + * @property type + * @type Number + * @default 0 + */ }; /** diff --git a/src/pixi/geom/RoundedRectangle.js b/src/pixi/geom/RoundedRectangle.js index dae668d..4f75723 100644 --- a/src/pixi/geom/RoundedRectangle.js +++ b/src/pixi/geom/RoundedRectangle.js @@ -11,7 +11,7 @@ * @param y {Number} The Y coordinate of the upper-left corner of the rounded rectangle * @param width {Number} The overall width of this rounded rectangle * @param height {Number} The overall height of this rounded rectangle - * @param radius {Number} The overall radius of this corners of this rounded rectangle + * @param radius {Number} Controls the radius of the rounded corners */ PIXI.RoundedRectangle = function(x, y, width, height, radius) { @@ -49,6 +49,13 @@ * @default 20 */ this.radius = radius || 20; + + /** + * The type of the object, should be one of the Graphics type consts, PIXI.Graphics.RRECT in this case + * @property type + * @type Number + * @default 0 + */ }; /** diff --git a/src/pixi/renderers/webgl/utils/WebGLFastSpriteBatch.js b/src/pixi/renderers/webgl/utils/WebGLFastSpriteBatch.js index 15ed7ae..d870f50 100644 --- a/src/pixi/renderers/webgl/utils/WebGLFastSpriteBatch.js +++ b/src/pixi/renderers/webgl/utils/WebGLFastSpriteBatch.js @@ -223,7 +223,7 @@ if(!sprite.texture._uvs)return; } - var uvs, verticies = this.vertices, width, height, w0, w1, h0, h1, index; + var uvs, vertices = this.vertices, width, height, w0, w1, h0, h1, index; uvs = sprite.texture._uvs; @@ -253,89 +253,89 @@ index = this.currentBatchSize * 4 * this.vertSize; // xy - verticies[index++] = w1; - verticies[index++] = h1; + vertices[index++] = w1; + vertices[index++] = h1; - verticies[index++] = sprite.position.x; - verticies[index++] = sprite.position.y; + vertices[index++] = sprite.position.x; + vertices[index++] = sprite.position.y; //scale - verticies[index++] = sprite.scale.x; - verticies[index++] = sprite.scale.y; + vertices[index++] = sprite.scale.x; + vertices[index++] = sprite.scale.y; //rotation - verticies[index++] = sprite.rotation; + vertices[index++] = sprite.rotation; // uv - verticies[index++] = uvs.x0; - verticies[index++] = uvs.y1; + vertices[index++] = uvs.x0; + vertices[index++] = uvs.y1; // color - verticies[index++] = sprite.alpha; + vertices[index++] = sprite.alpha; // xy - verticies[index++] = w0; - verticies[index++] = h1; + vertices[index++] = w0; + vertices[index++] = h1; - verticies[index++] = sprite.position.x; - verticies[index++] = sprite.position.y; + vertices[index++] = sprite.position.x; + vertices[index++] = sprite.position.y; //scale - verticies[index++] = sprite.scale.x; - verticies[index++] = sprite.scale.y; + vertices[index++] = sprite.scale.x; + vertices[index++] = sprite.scale.y; //rotation - verticies[index++] = sprite.rotation; + vertices[index++] = sprite.rotation; // uv - verticies[index++] = uvs.x1; - verticies[index++] = uvs.y1; + vertices[index++] = uvs.x1; + vertices[index++] = uvs.y1; // color - verticies[index++] = sprite.alpha; + vertices[index++] = sprite.alpha; // xy - verticies[index++] = w0; - verticies[index++] = h0; + vertices[index++] = w0; + vertices[index++] = h0; - verticies[index++] = sprite.position.x; - verticies[index++] = sprite.position.y; + vertices[index++] = sprite.position.x; + vertices[index++] = sprite.position.y; //scale - verticies[index++] = sprite.scale.x; - verticies[index++] = sprite.scale.y; + vertices[index++] = sprite.scale.x; + vertices[index++] = sprite.scale.y; //rotation - verticies[index++] = sprite.rotation; + vertices[index++] = sprite.rotation; // uv - verticies[index++] = uvs.x2; - verticies[index++] = uvs.y2; + vertices[index++] = uvs.x2; + vertices[index++] = uvs.y2; // color - verticies[index++] = sprite.alpha; + vertices[index++] = sprite.alpha; // xy - verticies[index++] = w1; - verticies[index++] = h0; + vertices[index++] = w1; + vertices[index++] = h0; - verticies[index++] = sprite.position.x; - verticies[index++] = sprite.position.y; + vertices[index++] = sprite.position.x; + vertices[index++] = sprite.position.y; //scale - verticies[index++] = sprite.scale.x; - verticies[index++] = sprite.scale.y; + vertices[index++] = sprite.scale.x; + vertices[index++] = sprite.scale.y; //rotation - verticies[index++] = sprite.rotation; + vertices[index++] = sprite.rotation; // uv - verticies[index++] = uvs.x3; - verticies[index++] = uvs.y3; + vertices[index++] = uvs.x3; + vertices[index++] = uvs.y3; // color - verticies[index++] = sprite.alpha; + vertices[index++] = sprite.alpha; // increment the batchs this.currentBatchSize++; diff --git a/examples/example 13 - Graphics/index.html b/examples/example 13 - Graphics/index.html index 7f7fcd3..1164b62 100644 --- a/examples/example 13 - Graphics/index.html +++ b/examples/example 13 - Graphics/index.html @@ -20,8 +20,10 @@ var stage = new PIXI.Stage(0xFFFFFF, true); stage.interactive = true; - - var renderer = PIXI.autoDetectRenderer(620, 380); + + var rendererOptions = { antialias : true}; + // create a renderer instance + var renderer = PIXI.autoDetectRenderer(620, 380,rendererOptions); // add render view to DOM document.body.appendChild(renderer.view); diff --git a/examples/example 14 - Masking/index.html b/examples/example 14 - Masking/index.html index d200bff..d786ce1 100644 --- a/examples/example 14 - Masking/index.html +++ b/examples/example 14 - Masking/index.html @@ -59,8 +59,10 @@ stage.addChild(container); + + var rendererOptions = { antialias : true}; // create a renderer instance - var renderer = PIXI.autoDetectRenderer(620, 380); + var renderer = PIXI.autoDetectRenderer(620, 380,rendererOptions); // center the renderer renderer.view.style.position = "absolute" diff --git a/examples/example 21 - Complex Graphics/index.html b/examples/example 21 - Complex Graphics/index.html index 5f4394e..2424e38 100644 --- a/examples/example 21 - Complex Graphics/index.html +++ b/examples/example 21 - Complex Graphics/index.html @@ -20,9 +20,9 @@ // create an new instance of a pixi stage var stage = new PIXI.Stage(0x3da8bb); - - // create a renderer instance. - var renderer = PIXI.autoDetectRenderer(window.innerWidth, window.innerHeight); + var rendererOptions = { antialias : true}; + // create a renderer instance + var renderer = PIXI.autoDetectRenderer(window.innerWidth, window.innerHeight,rendererOptions); // add the renderer view element to the DOM document.body.appendChild(renderer.view); diff --git a/examples/example 22 - Complex Masking/index.html b/examples/example 22 - Complex Masking/index.html index 18f5cbd..db7d0a5 100644 --- a/examples/example 22 - Complex Masking/index.html +++ b/examples/example 22 - Complex Masking/index.html @@ -19,8 +19,6 @@ // create an array of assets to load var alienFrames = ["eggHead.png", "flowerTop.png", "helmlok.png", "skully.png"]; - var count = 0; - // create an new instance of a pixi stage var stage = new PIXI.Stage(0x3da8bb); @@ -38,8 +36,6 @@ stage.addChild(alienContainer); - - count = 0; // start animating requestAnimFrame(animate); @@ -59,7 +55,7 @@ var colors = [0x5D0776, 0xEC8A49, 0xAF3666, 0xF6C84C, 0x4C779A]; var colorCount = 0; - var label = new PIXI.Text("Click and drag anywhere do draw complex geometry in pixi / do an art attack", {fill:"white", font:"16px Arial"}); + var label = new PIXI.Text("Click and drag anywhere do draw complex masks in pixi / do an art attack", {fill:"white", font:"16px Arial"}); label.x = 10; label.y = 10; @@ -71,12 +67,6 @@ var alien = PIXI.Sprite.fromImage(frameName); alien.tint = Math.random() * 0xFFFFFF; - /* - * fun fact for the day :) - * another way of doing the above would be - * var texture = PIXI.Texture.fromFrame(frameName); - * var alien = new PIXI.Sprite(texture); - */ alien.position.x = Math.random() * 800 - 400; alien.position.y = Math.random() * 600 - 300; alien.anchor.x = 0.5; @@ -128,9 +118,6 @@ function animate() { - - count += 0.1; - // render the stage renderer.render(stage); diff --git a/examples/example 23 - Texture Swap/index.html b/examples/example 23 - Texture Swap/index.html index 0bbf65c..21feded 100644 --- a/examples/example 23 - Texture Swap/index.html +++ b/examples/example 23 - Texture Swap/index.html @@ -25,6 +25,8 @@ requestAnimFrame(animate); + var bol = false; + // create a texture from an image path var texture = PIXI.Texture.fromImage("flowerTop.png"); texture.baseTexture.on("loaded", function(){ diff --git a/src/pixi/geom/Circle.js b/src/pixi/geom/Circle.js index 541e0fe..47288c6 100644 --- a/src/pixi/geom/Circle.js +++ b/src/pixi/geom/Circle.js @@ -33,6 +33,13 @@ * @default 0 */ this.radius = radius || 0; + + /** + * The type of the object, should be one of the Graphics type consts, PIXI.Graphics.CIRC in this case + * @property type + * @type Number + * @default 0 + */ }; /** diff --git a/src/pixi/geom/Ellipse.js b/src/pixi/geom/Ellipse.js index 0dd71f3..2700a71 100644 --- a/src/pixi/geom/Ellipse.js +++ b/src/pixi/geom/Ellipse.js @@ -41,6 +41,14 @@ * @default 0 */ this.height = height || 0; + + + /** + * The type of the object, should be one of the Graphics type consts, PIXI.Graphics.ELIP in this case + * @property type + * @type Number + * @default 0 + */ }; /** diff --git a/src/pixi/geom/Polygon.js b/src/pixi/geom/Polygon.js index d615a89..77f8f56 100644 --- a/src/pixi/geom/Polygon.js +++ b/src/pixi/geom/Polygon.js @@ -29,7 +29,21 @@ } this.closed = true; + + /** + * An array of the points of this polygon + * @property points + * @type Array(Point)|Array(Number) + * + */ this.points = points; + + /** + * The type of the object, should be one of the Graphics type consts, PIXI.Graphics.POLY in this case + * @property type + * @type Number + * @default 0 + */ }; /** diff --git a/src/pixi/geom/Rectangle.js b/src/pixi/geom/Rectangle.js index 2ccd1d1..61985fa 100644 --- a/src/pixi/geom/Rectangle.js +++ b/src/pixi/geom/Rectangle.js @@ -41,6 +41,13 @@ * @default 0 */ this.height = height || 0; + + /** + * The type of the object, should be one of the Graphics type consts, PIXI.Graphics.RECT in this case + * @property type + * @type Number + * @default 0 + */ }; /** diff --git a/src/pixi/geom/RoundedRectangle.js b/src/pixi/geom/RoundedRectangle.js index dae668d..4f75723 100644 --- a/src/pixi/geom/RoundedRectangle.js +++ b/src/pixi/geom/RoundedRectangle.js @@ -11,7 +11,7 @@ * @param y {Number} The Y coordinate of the upper-left corner of the rounded rectangle * @param width {Number} The overall width of this rounded rectangle * @param height {Number} The overall height of this rounded rectangle - * @param radius {Number} The overall radius of this corners of this rounded rectangle + * @param radius {Number} Controls the radius of the rounded corners */ PIXI.RoundedRectangle = function(x, y, width, height, radius) { @@ -49,6 +49,13 @@ * @default 20 */ this.radius = radius || 20; + + /** + * The type of the object, should be one of the Graphics type consts, PIXI.Graphics.RRECT in this case + * @property type + * @type Number + * @default 0 + */ }; /** diff --git a/src/pixi/renderers/webgl/utils/WebGLFastSpriteBatch.js b/src/pixi/renderers/webgl/utils/WebGLFastSpriteBatch.js index 15ed7ae..d870f50 100644 --- a/src/pixi/renderers/webgl/utils/WebGLFastSpriteBatch.js +++ b/src/pixi/renderers/webgl/utils/WebGLFastSpriteBatch.js @@ -223,7 +223,7 @@ if(!sprite.texture._uvs)return; } - var uvs, verticies = this.vertices, width, height, w0, w1, h0, h1, index; + var uvs, vertices = this.vertices, width, height, w0, w1, h0, h1, index; uvs = sprite.texture._uvs; @@ -253,89 +253,89 @@ index = this.currentBatchSize * 4 * this.vertSize; // xy - verticies[index++] = w1; - verticies[index++] = h1; + vertices[index++] = w1; + vertices[index++] = h1; - verticies[index++] = sprite.position.x; - verticies[index++] = sprite.position.y; + vertices[index++] = sprite.position.x; + vertices[index++] = sprite.position.y; //scale - verticies[index++] = sprite.scale.x; - verticies[index++] = sprite.scale.y; + vertices[index++] = sprite.scale.x; + vertices[index++] = sprite.scale.y; //rotation - verticies[index++] = sprite.rotation; + vertices[index++] = sprite.rotation; // uv - verticies[index++] = uvs.x0; - verticies[index++] = uvs.y1; + vertices[index++] = uvs.x0; + vertices[index++] = uvs.y1; // color - verticies[index++] = sprite.alpha; + vertices[index++] = sprite.alpha; // xy - verticies[index++] = w0; - verticies[index++] = h1; + vertices[index++] = w0; + vertices[index++] = h1; - verticies[index++] = sprite.position.x; - verticies[index++] = sprite.position.y; + vertices[index++] = sprite.position.x; + vertices[index++] = sprite.position.y; //scale - verticies[index++] = sprite.scale.x; - verticies[index++] = sprite.scale.y; + vertices[index++] = sprite.scale.x; + vertices[index++] = sprite.scale.y; //rotation - verticies[index++] = sprite.rotation; + vertices[index++] = sprite.rotation; // uv - verticies[index++] = uvs.x1; - verticies[index++] = uvs.y1; + vertices[index++] = uvs.x1; + vertices[index++] = uvs.y1; // color - verticies[index++] = sprite.alpha; + vertices[index++] = sprite.alpha; // xy - verticies[index++] = w0; - verticies[index++] = h0; + vertices[index++] = w0; + vertices[index++] = h0; - verticies[index++] = sprite.position.x; - verticies[index++] = sprite.position.y; + vertices[index++] = sprite.position.x; + vertices[index++] = sprite.position.y; //scale - verticies[index++] = sprite.scale.x; - verticies[index++] = sprite.scale.y; + vertices[index++] = sprite.scale.x; + vertices[index++] = sprite.scale.y; //rotation - verticies[index++] = sprite.rotation; + vertices[index++] = sprite.rotation; // uv - verticies[index++] = uvs.x2; - verticies[index++] = uvs.y2; + vertices[index++] = uvs.x2; + vertices[index++] = uvs.y2; // color - verticies[index++] = sprite.alpha; + vertices[index++] = sprite.alpha; // xy - verticies[index++] = w1; - verticies[index++] = h0; + vertices[index++] = w1; + vertices[index++] = h0; - verticies[index++] = sprite.position.x; - verticies[index++] = sprite.position.y; + vertices[index++] = sprite.position.x; + vertices[index++] = sprite.position.y; //scale - verticies[index++] = sprite.scale.x; - verticies[index++] = sprite.scale.y; + vertices[index++] = sprite.scale.x; + vertices[index++] = sprite.scale.y; //rotation - verticies[index++] = sprite.rotation; + vertices[index++] = sprite.rotation; // uv - verticies[index++] = uvs.x3; - verticies[index++] = uvs.y3; + vertices[index++] = uvs.x3; + vertices[index++] = uvs.y3; // color - verticies[index++] = sprite.alpha; + vertices[index++] = sprite.alpha; // increment the batchs this.currentBatchSize++; diff --git a/src/pixi/utils/Utils.js b/src/pixi/utils/Utils.js index 3cfcff8..1a0127d 100644 --- a/src/pixi/utils/Utils.js +++ b/src/pixi/utils/Utils.js @@ -206,6 +206,13 @@ } }; +/** + * checks if the given width and height make a power of two texture + * @method isPowerOfTwo + * @param width {Number} + * @param height {Number} + * @return {Boolean} + */ PIXI.isPowerOfTwo = function(width, height) { return (width > 0 && (width & (width - 1)) === 0 && height > 0 && (height & (height - 1)) === 0);