Fixed bug where setText not working correctly
Docs updated
This commit is contained in:
parent
8cd32d392c
commit
75c7880c93
119 changed files with 2398 additions and 906 deletions
|
@ -2,7 +2,7 @@
|
|||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>src/pixi/renderers/webgl/WebGLRenderer.js - Pixi.JS</title>
|
||||
<title>src/pixi/renderers/webgl/WebGLRenderer.js - pixi.js</title>
|
||||
<link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
|
||||
<link rel="stylesheet" href="../assets/vendor/prettify/prettify-min.css">
|
||||
<link rel="stylesheet" href="../assets/css/main.css" id="site_styles">
|
||||
|
@ -15,7 +15,7 @@
|
|||
<div id="hd" class="yui3-g header">
|
||||
<div class="yui3-u-3-4">
|
||||
|
||||
<h1><img src="http://www.goodboydigital.com/pixijs/logo_small.png" title="Pixi.JS"></h1>
|
||||
<h1><img src="http://www.goodboydigital.com/pixijs/logo_small.png" title="pixi.js"></h1>
|
||||
|
||||
</div>
|
||||
<div class="yui3-u-1-4 version">
|
||||
|
@ -43,6 +43,8 @@
|
|||
|
||||
<li><a href="../classes/AbstractFilter.html">AbstractFilter</a></li>
|
||||
|
||||
<li><a href="../classes/AlphaMaskFilter.html">AlphaMaskFilter</a></li>
|
||||
|
||||
<li><a href="../classes/AssetLoader.html">AssetLoader</a></li>
|
||||
|
||||
<li><a href="../classes/AtlasLoader.html">AtlasLoader</a></li>
|
||||
|
@ -255,9 +257,9 @@ PIXI.WebGLRenderer = function(width, height, view, transparent, antialias)
|
|||
PIXI.blendModesWebGL[PIXI.blendModes.SCREEN] = [gl.SRC_ALPHA, gl.ONE];
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
this.projection = new PIXI.Point();
|
||||
this.projection.x = this.width/2;
|
||||
this.projection.y = -this.height/2;
|
||||
|
@ -276,6 +278,7 @@ PIXI.WebGLRenderer = function(width, height, view, transparent, antialias)
|
|||
//
|
||||
this.renderSession = {};
|
||||
this.renderSession.gl = this.gl;
|
||||
this.renderSession.drawCount = 0;
|
||||
this.renderSession.shaderManager = this.shaderManager;
|
||||
this.renderSession.maskManager = this.maskManager;
|
||||
this.renderSession.filterManager = this.filterManager;
|
||||
|
@ -317,7 +320,7 @@ PIXI.WebGLRenderer.prototype.render = function(stage)
|
|||
|
||||
// update any textures this includes uvs and uploading them to the gpu
|
||||
PIXI.WebGLRenderer.updateTextures();
|
||||
|
||||
|
||||
// update the scene graph
|
||||
stage.updateTransform();
|
||||
|
||||
|
@ -330,7 +333,6 @@ PIXI.WebGLRenderer.prototype.render = function(stage)
|
|||
// make sure we are bound to the main frame buffer
|
||||
gl.bindFramebuffer(gl.FRAMEBUFFER, null);
|
||||
|
||||
|
||||
gl.clearColor(stage.backgroundColorSplit[0],stage.backgroundColorSplit[1],stage.backgroundColorSplit[2], !this.transparent);
|
||||
gl.clear(gl.COLOR_BUFFER_BIT);
|
||||
|
||||
|
@ -380,7 +382,7 @@ PIXI.WebGLRenderer.prototype.renderDisplayObject = function(displayObject, proje
|
|||
|
||||
this.renderSession.projection = projection;
|
||||
this.renderSession.offset = this.offset;
|
||||
|
||||
|
||||
// start the sprite batch
|
||||
this.spriteBatch.begin(this.renderSession);
|
||||
|
||||
|
@ -512,19 +514,19 @@ PIXI.WebGLRenderer.prototype.resize = function(width, height)
|
|||
this.view.height = height;
|
||||
|
||||
this.gl.viewport(0, 0, this.width, this.height);
|
||||
|
||||
|
||||
this.projection.x = this.width/2;
|
||||
this.projection.y = -this.height/2;
|
||||
};
|
||||
|
||||
PIXI.createWebGLTexture = function(texture, gl)
|
||||
{
|
||||
|
||||
|
||||
|
||||
if(texture.hasLoaded)
|
||||
{
|
||||
texture._glTextures[gl.id] = gl.createTexture();
|
||||
|
||||
|
||||
gl.bindTexture(gl.TEXTURE_2D, texture._glTextures[gl.id]);
|
||||
gl.pixelStorei(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, true);
|
||||
|
||||
|
@ -571,7 +573,7 @@ PIXI.WebGLRenderer.prototype.handleContextLost = function(event)
|
|||
*/
|
||||
PIXI.WebGLRenderer.prototype.handleContextRestored = function()
|
||||
{
|
||||
|
||||
|
||||
//try 'experimental-webgl'
|
||||
try {
|
||||
this.gl = this.view.getContext('experimental-webgl', this.options);
|
||||
|
@ -596,15 +598,15 @@ PIXI.WebGLRenderer.prototype.handleContextRestored = function()
|
|||
this.maskManager.setContext(gl);
|
||||
this.filterManager.setContext(gl);
|
||||
|
||||
|
||||
|
||||
this.renderSession.gl = this.gl;
|
||||
|
||||
|
||||
gl.disable(gl.DEPTH_TEST);
|
||||
gl.disable(gl.CULL_FACE);
|
||||
|
||||
gl.enable(gl.BLEND);
|
||||
gl.colorMask(true, true, true, this.transparent);
|
||||
|
||||
|
||||
this.gl.viewport(0, 0, this.width, this.height);
|
||||
|
||||
for(var key in PIXI.TextureCache)
|
||||
|
@ -614,7 +616,7 @@ PIXI.WebGLRenderer.prototype.handleContextRestored = function()
|
|||
}
|
||||
|
||||
this.contextLost = false;
|
||||
|
||||
|
||||
};
|
||||
|
||||
PIXI.WebGLRenderer.glContextId = 0;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue