提交 48f1ea25 编写于 作者: M Mr.doob

WebGLRenderer: Reverted WebGLTextures by now...

上级 57dbbab5
......@@ -13,6 +13,7 @@ THREE.EdgesHelper = function ( object, hex ) {
var geometry = new THREE.BufferGeometry();
var geometry2;
if ( object.geometry instanceof THREE.BufferGeometry ) {
geometry2 = new THREE.Geometry();
......
......@@ -254,8 +254,6 @@ THREE.WebGLRenderer = function ( parameters ) {
}
var textures = new THREE.WebGLTextures( _gl );
//
var glClearColor = function ( r, g, b, a ) {
......@@ -889,6 +887,17 @@ THREE.WebGLRenderer = function ( parameters ) {
delete texture.image.__webglTextureCube;
} else {
// 2D texture
if ( texture.__webglInit === undefined ) return;
_gl.deleteTexture( texture.__webglTexture );
delete texture.__webglTexture;
delete texture.__webglInit;
}
};
......@@ -5675,9 +5684,19 @@ THREE.WebGLRenderer = function ( parameters ) {
this.uploadTexture = function ( texture ) {
var webglTexture = textures.get( texture );
if ( texture.__webglInit === undefined ) {
texture.__webglInit = true;
texture.addEventListener( 'dispose', onTextureDispose );
texture.__webglTexture = _gl.createTexture();
_this.info.memory.textures ++;
}
_gl.bindTexture( _gl.TEXTURE_2D, webglTexture );
_gl.bindTexture( _gl.TEXTURE_2D, texture.__webglTexture );
_gl.pixelStorei( _gl.UNPACK_FLIP_Y_WEBGL, texture.flipY );
_gl.pixelStorei( _gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, texture.premultiplyAlpha );
......@@ -5786,7 +5805,7 @@ THREE.WebGLRenderer = function ( parameters ) {
} else {
_gl.bindTexture( _gl.TEXTURE_2D, textures.get( texture ) );
_gl.bindTexture( _gl.TEXTURE_2D, texture.__webglTexture );
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册