diff --git a/src/core/index.js b/src/core/index.js index 76eaa44..0cebeb7 100644 --- a/src/core/index.js +++ b/src/core/index.js @@ -31,11 +31,10 @@ export { default as GraphicsRenderer } from './graphics/webgl/GraphicsRenderer'; export { default as CanvasGraphicsRenderer } from './graphics/canvas/CanvasGraphicsRenderer'; export { default as Spritesheet } from './textures/Spritesheet'; -export { default as Texture } from './textures/Texture'; -export { default as NewTexture } from './textures/BaseTexture'; -export { default as NewFrameBuffer } from './textures/FrameBuffer'; -export { default as NewCubeTexture } from './textures/CubeTexture'; +export { default as FrameBuffer } from './textures/FrameBuffer'; +export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; +export { default as Texture } from './textures/Texture'; export { default as RenderTexture } from './textures/RenderTexture'; export { default as BaseRenderTexture } from './textures/BaseRenderTexture'; export { default as VideoBaseTexture } from './textures/VideoBaseTexture'; diff --git a/src/core/index.js b/src/core/index.js index 76eaa44..0cebeb7 100644 --- a/src/core/index.js +++ b/src/core/index.js @@ -31,11 +31,10 @@ export { default as GraphicsRenderer } from './graphics/webgl/GraphicsRenderer'; export { default as CanvasGraphicsRenderer } from './graphics/canvas/CanvasGraphicsRenderer'; export { default as Spritesheet } from './textures/Spritesheet'; -export { default as Texture } from './textures/Texture'; -export { default as NewTexture } from './textures/BaseTexture'; -export { default as NewFrameBuffer } from './textures/FrameBuffer'; -export { default as NewCubeTexture } from './textures/CubeTexture'; +export { default as FrameBuffer } from './textures/FrameBuffer'; +export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; +export { default as Texture } from './textures/Texture'; export { default as RenderTexture } from './textures/RenderTexture'; export { default as BaseRenderTexture } from './textures/BaseRenderTexture'; export { default as VideoBaseTexture } from './textures/VideoBaseTexture'; diff --git a/src/core/renderers/webgl/systems/FramebufferSystem.js b/src/core/renderers/webgl/systems/FramebufferSystem.js index 70408af..38eaa56 100644 --- a/src/core/renderers/webgl/systems/FramebufferSystem.js +++ b/src/core/renderers/webgl/systems/FramebufferSystem.js @@ -76,14 +76,14 @@ this.renderer.texture.unbind(framebuffer.depthTexture); } -// gl.viewport(0,0,framebuffer.width, framebuffer.height); + gl.viewport(0,0,framebuffer.width, framebuffer.height); } else { gl.bindFramebuffer(gl.FRAMEBUFFER, null); - // gl.viewport(0,0,this.renderer.width, this.renderer.height); + gl.viewport(0,0,this.renderer.width, this.renderer.height); } } diff --git a/src/core/index.js b/src/core/index.js index 76eaa44..0cebeb7 100644 --- a/src/core/index.js +++ b/src/core/index.js @@ -31,11 +31,10 @@ export { default as GraphicsRenderer } from './graphics/webgl/GraphicsRenderer'; export { default as CanvasGraphicsRenderer } from './graphics/canvas/CanvasGraphicsRenderer'; export { default as Spritesheet } from './textures/Spritesheet'; -export { default as Texture } from './textures/Texture'; -export { default as NewTexture } from './textures/BaseTexture'; -export { default as NewFrameBuffer } from './textures/FrameBuffer'; -export { default as NewCubeTexture } from './textures/CubeTexture'; +export { default as FrameBuffer } from './textures/FrameBuffer'; +export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; +export { default as Texture } from './textures/Texture'; export { default as RenderTexture } from './textures/RenderTexture'; export { default as BaseRenderTexture } from './textures/BaseRenderTexture'; export { default as VideoBaseTexture } from './textures/VideoBaseTexture'; diff --git a/src/core/renderers/webgl/systems/FramebufferSystem.js b/src/core/renderers/webgl/systems/FramebufferSystem.js index 70408af..38eaa56 100644 --- a/src/core/renderers/webgl/systems/FramebufferSystem.js +++ b/src/core/renderers/webgl/systems/FramebufferSystem.js @@ -76,14 +76,14 @@ this.renderer.texture.unbind(framebuffer.depthTexture); } -// gl.viewport(0,0,framebuffer.width, framebuffer.height); + gl.viewport(0,0,framebuffer.width, framebuffer.height); } else { gl.bindFramebuffer(gl.FRAMEBUFFER, null); - // gl.viewport(0,0,this.renderer.width, this.renderer.height); + gl.viewport(0,0,this.renderer.width, this.renderer.height); } } diff --git a/src/core/renderers/webgl/systems/RenderTextureSystem.js b/src/core/renderers/webgl/systems/RenderTextureSystem.js index d27802b..7376934 100644 --- a/src/core/renderers/webgl/systems/RenderTextureSystem.js +++ b/src/core/renderers/webgl/systems/RenderTextureSystem.js @@ -28,27 +28,29 @@ { // TODO - do we want this?? if(this.renderTexture === renderTexture)return; - this.renderTexture = renderTexture; + const renderer = this.renderer; + if(renderTexture) { this.renderer.framebuffer.bind(renderTexture.baseTexture.frameBuffer); this.renderer.projection.update(renderTexture.frame, renderTexture.frame, false); this.renderer.stencil.setMaskStack(renderTexture.baseTexture.stencilMaskStack); + } else { - this.renderer.framebuffer.bind(null); + renderer.framebuffer.bind(null); - tempRect.width = this.renderer.width; - tempRect.height = this.renderer.height; + tempRect.width = renderer.width; + tempRect.height = renderer.height; // TODO store this.. this.renderer.projection.update(tempRect, tempRect, true); this.renderer.stencil.setMaskStack(this.defaultMaskStack); } - const glShader = this.renderer.shader.getGLShader() + const glShader = renderer.shader.getGLShader() if (glShader) { diff --git a/src/core/index.js b/src/core/index.js index 76eaa44..0cebeb7 100644 --- a/src/core/index.js +++ b/src/core/index.js @@ -31,11 +31,10 @@ export { default as GraphicsRenderer } from './graphics/webgl/GraphicsRenderer'; export { default as CanvasGraphicsRenderer } from './graphics/canvas/CanvasGraphicsRenderer'; export { default as Spritesheet } from './textures/Spritesheet'; -export { default as Texture } from './textures/Texture'; -export { default as NewTexture } from './textures/BaseTexture'; -export { default as NewFrameBuffer } from './textures/FrameBuffer'; -export { default as NewCubeTexture } from './textures/CubeTexture'; +export { default as FrameBuffer } from './textures/FrameBuffer'; +export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; +export { default as Texture } from './textures/Texture'; export { default as RenderTexture } from './textures/RenderTexture'; export { default as BaseRenderTexture } from './textures/BaseRenderTexture'; export { default as VideoBaseTexture } from './textures/VideoBaseTexture'; diff --git a/src/core/renderers/webgl/systems/FramebufferSystem.js b/src/core/renderers/webgl/systems/FramebufferSystem.js index 70408af..38eaa56 100644 --- a/src/core/renderers/webgl/systems/FramebufferSystem.js +++ b/src/core/renderers/webgl/systems/FramebufferSystem.js @@ -76,14 +76,14 @@ this.renderer.texture.unbind(framebuffer.depthTexture); } -// gl.viewport(0,0,framebuffer.width, framebuffer.height); + gl.viewport(0,0,framebuffer.width, framebuffer.height); } else { gl.bindFramebuffer(gl.FRAMEBUFFER, null); - // gl.viewport(0,0,this.renderer.width, this.renderer.height); + gl.viewport(0,0,this.renderer.width, this.renderer.height); } } diff --git a/src/core/renderers/webgl/systems/RenderTextureSystem.js b/src/core/renderers/webgl/systems/RenderTextureSystem.js index d27802b..7376934 100644 --- a/src/core/renderers/webgl/systems/RenderTextureSystem.js +++ b/src/core/renderers/webgl/systems/RenderTextureSystem.js @@ -28,27 +28,29 @@ { // TODO - do we want this?? if(this.renderTexture === renderTexture)return; - this.renderTexture = renderTexture; + const renderer = this.renderer; + if(renderTexture) { this.renderer.framebuffer.bind(renderTexture.baseTexture.frameBuffer); this.renderer.projection.update(renderTexture.frame, renderTexture.frame, false); this.renderer.stencil.setMaskStack(renderTexture.baseTexture.stencilMaskStack); + } else { - this.renderer.framebuffer.bind(null); + renderer.framebuffer.bind(null); - tempRect.width = this.renderer.width; - tempRect.height = this.renderer.height; + tempRect.width = renderer.width; + tempRect.height = renderer.height; // TODO store this.. this.renderer.projection.update(tempRect, tempRect, true); this.renderer.stencil.setMaskStack(this.defaultMaskStack); } - const glShader = this.renderer.shader.getGLShader() + const glShader = renderer.shader.getGLShader() if (glShader) { diff --git a/src/core/shader/generateUniformsSync.js b/src/core/shader/generateUniformsSync.js index 8dc3adb..b7241ef 100644 --- a/src/core/shader/generateUniformsSync.js +++ b/src/core/shader/generateUniformsSync.js @@ -147,7 +147,7 @@ } //console.log(' --------------- ') - console.log(func); + // console.log(func); return new Function('uniformData', 'uniformValues', 'renderer', func); // eslint-disable-line no-new-func } diff --git a/src/core/index.js b/src/core/index.js index 76eaa44..0cebeb7 100644 --- a/src/core/index.js +++ b/src/core/index.js @@ -31,11 +31,10 @@ export { default as GraphicsRenderer } from './graphics/webgl/GraphicsRenderer'; export { default as CanvasGraphicsRenderer } from './graphics/canvas/CanvasGraphicsRenderer'; export { default as Spritesheet } from './textures/Spritesheet'; -export { default as Texture } from './textures/Texture'; -export { default as NewTexture } from './textures/BaseTexture'; -export { default as NewFrameBuffer } from './textures/FrameBuffer'; -export { default as NewCubeTexture } from './textures/CubeTexture'; +export { default as FrameBuffer } from './textures/FrameBuffer'; +export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; +export { default as Texture } from './textures/Texture'; export { default as RenderTexture } from './textures/RenderTexture'; export { default as BaseRenderTexture } from './textures/BaseRenderTexture'; export { default as VideoBaseTexture } from './textures/VideoBaseTexture'; diff --git a/src/core/renderers/webgl/systems/FramebufferSystem.js b/src/core/renderers/webgl/systems/FramebufferSystem.js index 70408af..38eaa56 100644 --- a/src/core/renderers/webgl/systems/FramebufferSystem.js +++ b/src/core/renderers/webgl/systems/FramebufferSystem.js @@ -76,14 +76,14 @@ this.renderer.texture.unbind(framebuffer.depthTexture); } -// gl.viewport(0,0,framebuffer.width, framebuffer.height); + gl.viewport(0,0,framebuffer.width, framebuffer.height); } else { gl.bindFramebuffer(gl.FRAMEBUFFER, null); - // gl.viewport(0,0,this.renderer.width, this.renderer.height); + gl.viewport(0,0,this.renderer.width, this.renderer.height); } } diff --git a/src/core/renderers/webgl/systems/RenderTextureSystem.js b/src/core/renderers/webgl/systems/RenderTextureSystem.js index d27802b..7376934 100644 --- a/src/core/renderers/webgl/systems/RenderTextureSystem.js +++ b/src/core/renderers/webgl/systems/RenderTextureSystem.js @@ -28,27 +28,29 @@ { // TODO - do we want this?? if(this.renderTexture === renderTexture)return; - this.renderTexture = renderTexture; + const renderer = this.renderer; + if(renderTexture) { this.renderer.framebuffer.bind(renderTexture.baseTexture.frameBuffer); this.renderer.projection.update(renderTexture.frame, renderTexture.frame, false); this.renderer.stencil.setMaskStack(renderTexture.baseTexture.stencilMaskStack); + } else { - this.renderer.framebuffer.bind(null); + renderer.framebuffer.bind(null); - tempRect.width = this.renderer.width; - tempRect.height = this.renderer.height; + tempRect.width = renderer.width; + tempRect.height = renderer.height; // TODO store this.. this.renderer.projection.update(tempRect, tempRect, true); this.renderer.stencil.setMaskStack(this.defaultMaskStack); } - const glShader = this.renderer.shader.getGLShader() + const glShader = renderer.shader.getGLShader() if (glShader) { diff --git a/src/core/shader/generateUniformsSync.js b/src/core/shader/generateUniformsSync.js index 8dc3adb..b7241ef 100644 --- a/src/core/shader/generateUniformsSync.js +++ b/src/core/shader/generateUniformsSync.js @@ -147,7 +147,7 @@ } //console.log(' --------------- ') - console.log(func); + // console.log(func); return new Function('uniformData', 'uniformValues', 'renderer', func); // eslint-disable-line no-new-func } diff --git a/src/core/shader/generateUniformsSync2.js b/src/core/shader/generateUniformsSync2.js index c0322b1..4fd60fe 100644 --- a/src/core/shader/generateUniformsSync2.js +++ b/src/core/shader/generateUniformsSync2.js @@ -74,7 +74,7 @@ { const data = uniformData[i]; //group.uniforms[i]; - console.log(i, data); + // console.log(i, data); if(!data) { if(group.uniforms[i].group) @@ -129,7 +129,7 @@ } else { - console.log("binding..") + // console.log("binding..") uniformData.${i}.value = ${textureCount}; renderer.boundTextures[${textureCount}] = renderer.emptyTextures[${textureCount}]; gl.activeTexture(gl.TEXTURE0 + ${textureCount}); diff --git a/src/core/index.js b/src/core/index.js index 76eaa44..0cebeb7 100644 --- a/src/core/index.js +++ b/src/core/index.js @@ -31,11 +31,10 @@ export { default as GraphicsRenderer } from './graphics/webgl/GraphicsRenderer'; export { default as CanvasGraphicsRenderer } from './graphics/canvas/CanvasGraphicsRenderer'; export { default as Spritesheet } from './textures/Spritesheet'; -export { default as Texture } from './textures/Texture'; -export { default as NewTexture } from './textures/BaseTexture'; -export { default as NewFrameBuffer } from './textures/FrameBuffer'; -export { default as NewCubeTexture } from './textures/CubeTexture'; +export { default as FrameBuffer } from './textures/FrameBuffer'; +export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; +export { default as Texture } from './textures/Texture'; export { default as RenderTexture } from './textures/RenderTexture'; export { default as BaseRenderTexture } from './textures/BaseRenderTexture'; export { default as VideoBaseTexture } from './textures/VideoBaseTexture'; diff --git a/src/core/renderers/webgl/systems/FramebufferSystem.js b/src/core/renderers/webgl/systems/FramebufferSystem.js index 70408af..38eaa56 100644 --- a/src/core/renderers/webgl/systems/FramebufferSystem.js +++ b/src/core/renderers/webgl/systems/FramebufferSystem.js @@ -76,14 +76,14 @@ this.renderer.texture.unbind(framebuffer.depthTexture); } -// gl.viewport(0,0,framebuffer.width, framebuffer.height); + gl.viewport(0,0,framebuffer.width, framebuffer.height); } else { gl.bindFramebuffer(gl.FRAMEBUFFER, null); - // gl.viewport(0,0,this.renderer.width, this.renderer.height); + gl.viewport(0,0,this.renderer.width, this.renderer.height); } } diff --git a/src/core/renderers/webgl/systems/RenderTextureSystem.js b/src/core/renderers/webgl/systems/RenderTextureSystem.js index d27802b..7376934 100644 --- a/src/core/renderers/webgl/systems/RenderTextureSystem.js +++ b/src/core/renderers/webgl/systems/RenderTextureSystem.js @@ -28,27 +28,29 @@ { // TODO - do we want this?? if(this.renderTexture === renderTexture)return; - this.renderTexture = renderTexture; + const renderer = this.renderer; + if(renderTexture) { this.renderer.framebuffer.bind(renderTexture.baseTexture.frameBuffer); this.renderer.projection.update(renderTexture.frame, renderTexture.frame, false); this.renderer.stencil.setMaskStack(renderTexture.baseTexture.stencilMaskStack); + } else { - this.renderer.framebuffer.bind(null); + renderer.framebuffer.bind(null); - tempRect.width = this.renderer.width; - tempRect.height = this.renderer.height; + tempRect.width = renderer.width; + tempRect.height = renderer.height; // TODO store this.. this.renderer.projection.update(tempRect, tempRect, true); this.renderer.stencil.setMaskStack(this.defaultMaskStack); } - const glShader = this.renderer.shader.getGLShader() + const glShader = renderer.shader.getGLShader() if (glShader) { diff --git a/src/core/shader/generateUniformsSync.js b/src/core/shader/generateUniformsSync.js index 8dc3adb..b7241ef 100644 --- a/src/core/shader/generateUniformsSync.js +++ b/src/core/shader/generateUniformsSync.js @@ -147,7 +147,7 @@ } //console.log(' --------------- ') - console.log(func); + // console.log(func); return new Function('uniformData', 'uniformValues', 'renderer', func); // eslint-disable-line no-new-func } diff --git a/src/core/shader/generateUniformsSync2.js b/src/core/shader/generateUniformsSync2.js index c0322b1..4fd60fe 100644 --- a/src/core/shader/generateUniformsSync2.js +++ b/src/core/shader/generateUniformsSync2.js @@ -74,7 +74,7 @@ { const data = uniformData[i]; //group.uniforms[i]; - console.log(i, data); + // console.log(i, data); if(!data) { if(group.uniforms[i].group) @@ -129,7 +129,7 @@ } else { - console.log("binding..") + // console.log("binding..") uniformData.${i}.value = ${textureCount}; renderer.boundTextures[${textureCount}] = renderer.emptyTextures[${textureCount}]; gl.activeTexture(gl.TEXTURE0 + ${textureCount}); diff --git a/src/core/sprites/webgl/SpriteRenderer.js b/src/core/sprites/webgl/SpriteRenderer.js index 309da9c..22df803 100644 --- a/src/core/sprites/webgl/SpriteRenderer.js +++ b/src/core/sprites/webgl/SpriteRenderer.js @@ -137,7 +137,7 @@ for (let i = 0; i < this.vaoMax; i++) { - this.vertexBuffers[i] = glCore.GLBuffer.createVertexBuffer(gl, null, gl.STREAM_DRAW); + this.vertexBuffers[i] = glCore.GLBuffer.createVertexBuffer(gl, null, gl.DYNAMIC_DRAW); /* eslint-disable max-len */ var attributeData = shader.program.attributeData; @@ -389,7 +389,7 @@ if (this.vaoMax <= this.vertexCount) { this.vaoMax++; - this.vertexBuffers[this.vertexCount] = glCore.GLBuffer.createVertexBuffer(gl, null, gl.STREAM_DRAW); + this.vertexBuffers[this.vertexCount] = glCore.GLBuffer.createVertexBuffer(gl, null, gl.DYNAMIC_DRAW); /* eslint-disable max-len */ diff --git a/src/core/index.js b/src/core/index.js index 76eaa44..0cebeb7 100644 --- a/src/core/index.js +++ b/src/core/index.js @@ -31,11 +31,10 @@ export { default as GraphicsRenderer } from './graphics/webgl/GraphicsRenderer'; export { default as CanvasGraphicsRenderer } from './graphics/canvas/CanvasGraphicsRenderer'; export { default as Spritesheet } from './textures/Spritesheet'; -export { default as Texture } from './textures/Texture'; -export { default as NewTexture } from './textures/BaseTexture'; -export { default as NewFrameBuffer } from './textures/FrameBuffer'; -export { default as NewCubeTexture } from './textures/CubeTexture'; +export { default as FrameBuffer } from './textures/FrameBuffer'; +export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; +export { default as Texture } from './textures/Texture'; export { default as RenderTexture } from './textures/RenderTexture'; export { default as BaseRenderTexture } from './textures/BaseRenderTexture'; export { default as VideoBaseTexture } from './textures/VideoBaseTexture'; diff --git a/src/core/renderers/webgl/systems/FramebufferSystem.js b/src/core/renderers/webgl/systems/FramebufferSystem.js index 70408af..38eaa56 100644 --- a/src/core/renderers/webgl/systems/FramebufferSystem.js +++ b/src/core/renderers/webgl/systems/FramebufferSystem.js @@ -76,14 +76,14 @@ this.renderer.texture.unbind(framebuffer.depthTexture); } -// gl.viewport(0,0,framebuffer.width, framebuffer.height); + gl.viewport(0,0,framebuffer.width, framebuffer.height); } else { gl.bindFramebuffer(gl.FRAMEBUFFER, null); - // gl.viewport(0,0,this.renderer.width, this.renderer.height); + gl.viewport(0,0,this.renderer.width, this.renderer.height); } } diff --git a/src/core/renderers/webgl/systems/RenderTextureSystem.js b/src/core/renderers/webgl/systems/RenderTextureSystem.js index d27802b..7376934 100644 --- a/src/core/renderers/webgl/systems/RenderTextureSystem.js +++ b/src/core/renderers/webgl/systems/RenderTextureSystem.js @@ -28,27 +28,29 @@ { // TODO - do we want this?? if(this.renderTexture === renderTexture)return; - this.renderTexture = renderTexture; + const renderer = this.renderer; + if(renderTexture) { this.renderer.framebuffer.bind(renderTexture.baseTexture.frameBuffer); this.renderer.projection.update(renderTexture.frame, renderTexture.frame, false); this.renderer.stencil.setMaskStack(renderTexture.baseTexture.stencilMaskStack); + } else { - this.renderer.framebuffer.bind(null); + renderer.framebuffer.bind(null); - tempRect.width = this.renderer.width; - tempRect.height = this.renderer.height; + tempRect.width = renderer.width; + tempRect.height = renderer.height; // TODO store this.. this.renderer.projection.update(tempRect, tempRect, true); this.renderer.stencil.setMaskStack(this.defaultMaskStack); } - const glShader = this.renderer.shader.getGLShader() + const glShader = renderer.shader.getGLShader() if (glShader) { diff --git a/src/core/shader/generateUniformsSync.js b/src/core/shader/generateUniformsSync.js index 8dc3adb..b7241ef 100644 --- a/src/core/shader/generateUniformsSync.js +++ b/src/core/shader/generateUniformsSync.js @@ -147,7 +147,7 @@ } //console.log(' --------------- ') - console.log(func); + // console.log(func); return new Function('uniformData', 'uniformValues', 'renderer', func); // eslint-disable-line no-new-func } diff --git a/src/core/shader/generateUniformsSync2.js b/src/core/shader/generateUniformsSync2.js index c0322b1..4fd60fe 100644 --- a/src/core/shader/generateUniformsSync2.js +++ b/src/core/shader/generateUniformsSync2.js @@ -74,7 +74,7 @@ { const data = uniformData[i]; //group.uniforms[i]; - console.log(i, data); + // console.log(i, data); if(!data) { if(group.uniforms[i].group) @@ -129,7 +129,7 @@ } else { - console.log("binding..") + // console.log("binding..") uniformData.${i}.value = ${textureCount}; renderer.boundTextures[${textureCount}] = renderer.emptyTextures[${textureCount}]; gl.activeTexture(gl.TEXTURE0 + ${textureCount}); diff --git a/src/core/sprites/webgl/SpriteRenderer.js b/src/core/sprites/webgl/SpriteRenderer.js index 309da9c..22df803 100644 --- a/src/core/sprites/webgl/SpriteRenderer.js +++ b/src/core/sprites/webgl/SpriteRenderer.js @@ -137,7 +137,7 @@ for (let i = 0; i < this.vaoMax; i++) { - this.vertexBuffers[i] = glCore.GLBuffer.createVertexBuffer(gl, null, gl.STREAM_DRAW); + this.vertexBuffers[i] = glCore.GLBuffer.createVertexBuffer(gl, null, gl.DYNAMIC_DRAW); /* eslint-disable max-len */ var attributeData = shader.program.attributeData; @@ -389,7 +389,7 @@ if (this.vaoMax <= this.vertexCount) { this.vaoMax++; - this.vertexBuffers[this.vertexCount] = glCore.GLBuffer.createVertexBuffer(gl, null, gl.STREAM_DRAW); + this.vertexBuffers[this.vertexCount] = glCore.GLBuffer.createVertexBuffer(gl, null, gl.DYNAMIC_DRAW); /* eslint-disable max-len */ diff --git a/src/core/textures/BaseTexture.js b/src/core/textures/BaseTexture.js index 2d62c23..853da3d 100644 --- a/src/core/textures/BaseTexture.js +++ b/src/core/textures/BaseTexture.js @@ -148,8 +148,8 @@ resourceLoaded(resource) { - console.log(this) - console.log("****** LOADED...") + // console.log(this) + // console.log("****** LOADED...") if(resource === resource) { if(resource.width !== -1 && resource.hight !== -1) @@ -158,7 +158,7 @@ this.height = resource.height / this.resolution; } - console.log(this.width, this.height) + // console.log(this.width, this.height) this.validate(); if(this.valid) diff --git a/src/core/index.js b/src/core/index.js index 76eaa44..0cebeb7 100644 --- a/src/core/index.js +++ b/src/core/index.js @@ -31,11 +31,10 @@ export { default as GraphicsRenderer } from './graphics/webgl/GraphicsRenderer'; export { default as CanvasGraphicsRenderer } from './graphics/canvas/CanvasGraphicsRenderer'; export { default as Spritesheet } from './textures/Spritesheet'; -export { default as Texture } from './textures/Texture'; -export { default as NewTexture } from './textures/BaseTexture'; -export { default as NewFrameBuffer } from './textures/FrameBuffer'; -export { default as NewCubeTexture } from './textures/CubeTexture'; +export { default as FrameBuffer } from './textures/FrameBuffer'; +export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; +export { default as Texture } from './textures/Texture'; export { default as RenderTexture } from './textures/RenderTexture'; export { default as BaseRenderTexture } from './textures/BaseRenderTexture'; export { default as VideoBaseTexture } from './textures/VideoBaseTexture'; diff --git a/src/core/renderers/webgl/systems/FramebufferSystem.js b/src/core/renderers/webgl/systems/FramebufferSystem.js index 70408af..38eaa56 100644 --- a/src/core/renderers/webgl/systems/FramebufferSystem.js +++ b/src/core/renderers/webgl/systems/FramebufferSystem.js @@ -76,14 +76,14 @@ this.renderer.texture.unbind(framebuffer.depthTexture); } -// gl.viewport(0,0,framebuffer.width, framebuffer.height); + gl.viewport(0,0,framebuffer.width, framebuffer.height); } else { gl.bindFramebuffer(gl.FRAMEBUFFER, null); - // gl.viewport(0,0,this.renderer.width, this.renderer.height); + gl.viewport(0,0,this.renderer.width, this.renderer.height); } } diff --git a/src/core/renderers/webgl/systems/RenderTextureSystem.js b/src/core/renderers/webgl/systems/RenderTextureSystem.js index d27802b..7376934 100644 --- a/src/core/renderers/webgl/systems/RenderTextureSystem.js +++ b/src/core/renderers/webgl/systems/RenderTextureSystem.js @@ -28,27 +28,29 @@ { // TODO - do we want this?? if(this.renderTexture === renderTexture)return; - this.renderTexture = renderTexture; + const renderer = this.renderer; + if(renderTexture) { this.renderer.framebuffer.bind(renderTexture.baseTexture.frameBuffer); this.renderer.projection.update(renderTexture.frame, renderTexture.frame, false); this.renderer.stencil.setMaskStack(renderTexture.baseTexture.stencilMaskStack); + } else { - this.renderer.framebuffer.bind(null); + renderer.framebuffer.bind(null); - tempRect.width = this.renderer.width; - tempRect.height = this.renderer.height; + tempRect.width = renderer.width; + tempRect.height = renderer.height; // TODO store this.. this.renderer.projection.update(tempRect, tempRect, true); this.renderer.stencil.setMaskStack(this.defaultMaskStack); } - const glShader = this.renderer.shader.getGLShader() + const glShader = renderer.shader.getGLShader() if (glShader) { diff --git a/src/core/shader/generateUniformsSync.js b/src/core/shader/generateUniformsSync.js index 8dc3adb..b7241ef 100644 --- a/src/core/shader/generateUniformsSync.js +++ b/src/core/shader/generateUniformsSync.js @@ -147,7 +147,7 @@ } //console.log(' --------------- ') - console.log(func); + // console.log(func); return new Function('uniformData', 'uniformValues', 'renderer', func); // eslint-disable-line no-new-func } diff --git a/src/core/shader/generateUniformsSync2.js b/src/core/shader/generateUniformsSync2.js index c0322b1..4fd60fe 100644 --- a/src/core/shader/generateUniformsSync2.js +++ b/src/core/shader/generateUniformsSync2.js @@ -74,7 +74,7 @@ { const data = uniformData[i]; //group.uniforms[i]; - console.log(i, data); + // console.log(i, data); if(!data) { if(group.uniforms[i].group) @@ -129,7 +129,7 @@ } else { - console.log("binding..") + // console.log("binding..") uniformData.${i}.value = ${textureCount}; renderer.boundTextures[${textureCount}] = renderer.emptyTextures[${textureCount}]; gl.activeTexture(gl.TEXTURE0 + ${textureCount}); diff --git a/src/core/sprites/webgl/SpriteRenderer.js b/src/core/sprites/webgl/SpriteRenderer.js index 309da9c..22df803 100644 --- a/src/core/sprites/webgl/SpriteRenderer.js +++ b/src/core/sprites/webgl/SpriteRenderer.js @@ -137,7 +137,7 @@ for (let i = 0; i < this.vaoMax; i++) { - this.vertexBuffers[i] = glCore.GLBuffer.createVertexBuffer(gl, null, gl.STREAM_DRAW); + this.vertexBuffers[i] = glCore.GLBuffer.createVertexBuffer(gl, null, gl.DYNAMIC_DRAW); /* eslint-disable max-len */ var attributeData = shader.program.attributeData; @@ -389,7 +389,7 @@ if (this.vaoMax <= this.vertexCount) { this.vaoMax++; - this.vertexBuffers[this.vertexCount] = glCore.GLBuffer.createVertexBuffer(gl, null, gl.STREAM_DRAW); + this.vertexBuffers[this.vertexCount] = glCore.GLBuffer.createVertexBuffer(gl, null, gl.DYNAMIC_DRAW); /* eslint-disable max-len */ diff --git a/src/core/textures/BaseTexture.js b/src/core/textures/BaseTexture.js index 2d62c23..853da3d 100644 --- a/src/core/textures/BaseTexture.js +++ b/src/core/textures/BaseTexture.js @@ -148,8 +148,8 @@ resourceLoaded(resource) { - console.log(this) - console.log("****** LOADED...") + // console.log(this) + // console.log("****** LOADED...") if(resource === resource) { if(resource.width !== -1 && resource.hight !== -1) @@ -158,7 +158,7 @@ this.height = resource.height / this.resolution; } - console.log(this.width, this.height) + // console.log(this.width, this.height) this.validate(); if(this.valid) diff --git a/src/core/textures/Texture.js b/src/core/textures/Texture.js index fcea0d0..0a2c379 100644 --- a/src/core/textures/Texture.js +++ b/src/core/textures/Texture.js @@ -141,7 +141,7 @@ } else { - baseTexture.once('loaded', this.onBaseTextureLoaded, this); + baseTexture.once('loaded', this.onBaseTextureUpdated, this); } /** @@ -297,7 +297,7 @@ } else { - console.log(texture.baseTexture.width) + // console.log(texture.baseTexture.width) } // lets assume its a base texture! return texture; @@ -315,15 +315,15 @@ */ static fromLoader(source, imageUrl, name) { - console.log('added from loader...') + // console.log('added from loader...') const resource = new ImageResource(source);//.from(imageUrl, crossorigin);// document.createElement('img'); - console.log('base resource ' + resource.width); + // console.log('base resource ' + resource.width); const baseTexture = new BaseTexture(resource, settings.SCALE_MODE, getResolutionOfUrl(imageUrl)); - console.log('base width ' + baseTexture.width); + /// console.log('base width ' + baseTexture.width); const texture = new Texture(baseTexture); // No name, use imageUrl instead diff --git a/src/core/index.js b/src/core/index.js index 76eaa44..0cebeb7 100644 --- a/src/core/index.js +++ b/src/core/index.js @@ -31,11 +31,10 @@ export { default as GraphicsRenderer } from './graphics/webgl/GraphicsRenderer'; export { default as CanvasGraphicsRenderer } from './graphics/canvas/CanvasGraphicsRenderer'; export { default as Spritesheet } from './textures/Spritesheet'; -export { default as Texture } from './textures/Texture'; -export { default as NewTexture } from './textures/BaseTexture'; -export { default as NewFrameBuffer } from './textures/FrameBuffer'; -export { default as NewCubeTexture } from './textures/CubeTexture'; +export { default as FrameBuffer } from './textures/FrameBuffer'; +export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; +export { default as Texture } from './textures/Texture'; export { default as RenderTexture } from './textures/RenderTexture'; export { default as BaseRenderTexture } from './textures/BaseRenderTexture'; export { default as VideoBaseTexture } from './textures/VideoBaseTexture'; diff --git a/src/core/renderers/webgl/systems/FramebufferSystem.js b/src/core/renderers/webgl/systems/FramebufferSystem.js index 70408af..38eaa56 100644 --- a/src/core/renderers/webgl/systems/FramebufferSystem.js +++ b/src/core/renderers/webgl/systems/FramebufferSystem.js @@ -76,14 +76,14 @@ this.renderer.texture.unbind(framebuffer.depthTexture); } -// gl.viewport(0,0,framebuffer.width, framebuffer.height); + gl.viewport(0,0,framebuffer.width, framebuffer.height); } else { gl.bindFramebuffer(gl.FRAMEBUFFER, null); - // gl.viewport(0,0,this.renderer.width, this.renderer.height); + gl.viewport(0,0,this.renderer.width, this.renderer.height); } } diff --git a/src/core/renderers/webgl/systems/RenderTextureSystem.js b/src/core/renderers/webgl/systems/RenderTextureSystem.js index d27802b..7376934 100644 --- a/src/core/renderers/webgl/systems/RenderTextureSystem.js +++ b/src/core/renderers/webgl/systems/RenderTextureSystem.js @@ -28,27 +28,29 @@ { // TODO - do we want this?? if(this.renderTexture === renderTexture)return; - this.renderTexture = renderTexture; + const renderer = this.renderer; + if(renderTexture) { this.renderer.framebuffer.bind(renderTexture.baseTexture.frameBuffer); this.renderer.projection.update(renderTexture.frame, renderTexture.frame, false); this.renderer.stencil.setMaskStack(renderTexture.baseTexture.stencilMaskStack); + } else { - this.renderer.framebuffer.bind(null); + renderer.framebuffer.bind(null); - tempRect.width = this.renderer.width; - tempRect.height = this.renderer.height; + tempRect.width = renderer.width; + tempRect.height = renderer.height; // TODO store this.. this.renderer.projection.update(tempRect, tempRect, true); this.renderer.stencil.setMaskStack(this.defaultMaskStack); } - const glShader = this.renderer.shader.getGLShader() + const glShader = renderer.shader.getGLShader() if (glShader) { diff --git a/src/core/shader/generateUniformsSync.js b/src/core/shader/generateUniformsSync.js index 8dc3adb..b7241ef 100644 --- a/src/core/shader/generateUniformsSync.js +++ b/src/core/shader/generateUniformsSync.js @@ -147,7 +147,7 @@ } //console.log(' --------------- ') - console.log(func); + // console.log(func); return new Function('uniformData', 'uniformValues', 'renderer', func); // eslint-disable-line no-new-func } diff --git a/src/core/shader/generateUniformsSync2.js b/src/core/shader/generateUniformsSync2.js index c0322b1..4fd60fe 100644 --- a/src/core/shader/generateUniformsSync2.js +++ b/src/core/shader/generateUniformsSync2.js @@ -74,7 +74,7 @@ { const data = uniformData[i]; //group.uniforms[i]; - console.log(i, data); + // console.log(i, data); if(!data) { if(group.uniforms[i].group) @@ -129,7 +129,7 @@ } else { - console.log("binding..") + // console.log("binding..") uniformData.${i}.value = ${textureCount}; renderer.boundTextures[${textureCount}] = renderer.emptyTextures[${textureCount}]; gl.activeTexture(gl.TEXTURE0 + ${textureCount}); diff --git a/src/core/sprites/webgl/SpriteRenderer.js b/src/core/sprites/webgl/SpriteRenderer.js index 309da9c..22df803 100644 --- a/src/core/sprites/webgl/SpriteRenderer.js +++ b/src/core/sprites/webgl/SpriteRenderer.js @@ -137,7 +137,7 @@ for (let i = 0; i < this.vaoMax; i++) { - this.vertexBuffers[i] = glCore.GLBuffer.createVertexBuffer(gl, null, gl.STREAM_DRAW); + this.vertexBuffers[i] = glCore.GLBuffer.createVertexBuffer(gl, null, gl.DYNAMIC_DRAW); /* eslint-disable max-len */ var attributeData = shader.program.attributeData; @@ -389,7 +389,7 @@ if (this.vaoMax <= this.vertexCount) { this.vaoMax++; - this.vertexBuffers[this.vertexCount] = glCore.GLBuffer.createVertexBuffer(gl, null, gl.STREAM_DRAW); + this.vertexBuffers[this.vertexCount] = glCore.GLBuffer.createVertexBuffer(gl, null, gl.DYNAMIC_DRAW); /* eslint-disable max-len */ diff --git a/src/core/textures/BaseTexture.js b/src/core/textures/BaseTexture.js index 2d62c23..853da3d 100644 --- a/src/core/textures/BaseTexture.js +++ b/src/core/textures/BaseTexture.js @@ -148,8 +148,8 @@ resourceLoaded(resource) { - console.log(this) - console.log("****** LOADED...") + // console.log(this) + // console.log("****** LOADED...") if(resource === resource) { if(resource.width !== -1 && resource.hight !== -1) @@ -158,7 +158,7 @@ this.height = resource.height / this.resolution; } - console.log(this.width, this.height) + // console.log(this.width, this.height) this.validate(); if(this.valid) diff --git a/src/core/textures/Texture.js b/src/core/textures/Texture.js index fcea0d0..0a2c379 100644 --- a/src/core/textures/Texture.js +++ b/src/core/textures/Texture.js @@ -141,7 +141,7 @@ } else { - baseTexture.once('loaded', this.onBaseTextureLoaded, this); + baseTexture.once('loaded', this.onBaseTextureUpdated, this); } /** @@ -297,7 +297,7 @@ } else { - console.log(texture.baseTexture.width) + // console.log(texture.baseTexture.width) } // lets assume its a base texture! return texture; @@ -315,15 +315,15 @@ */ static fromLoader(source, imageUrl, name) { - console.log('added from loader...') + // console.log('added from loader...') const resource = new ImageResource(source);//.from(imageUrl, crossorigin);// document.createElement('img'); - console.log('base resource ' + resource.width); + // console.log('base resource ' + resource.width); const baseTexture = new BaseTexture(resource, settings.SCALE_MODE, getResolutionOfUrl(imageUrl)); - console.log('base width ' + baseTexture.width); + /// console.log('base width ' + baseTexture.width); const texture = new Texture(baseTexture); // No name, use imageUrl instead diff --git a/src/core/textures/resources/ImageResource.js b/src/core/textures/resources/ImageResource.js index 58856c1..cf267ed 100644 --- a/src/core/textures/resources/ImageResource.js +++ b/src/core/textures/resources/ImageResource.js @@ -29,7 +29,7 @@ source.onerror = null; this.width = source.width; this.height = source.height; - console.log("image") + // console.log("image") resolve(this); }