skip: Merge branch '3.0.0-rc' of https://github.com/naver/egjs-view360 …

…into PanoViewer#123
naver · Jan 16, 2018 · 8c9e513 · 8c9e513
2 parents 7555e8c + 95deec2
commit 8c9e513
Show file tree

Hide file tree

Showing 23 changed files with 164 additions and 90 deletions.
diff --git a/dist/PanoViewer/view360.panoviewer.js b/dist/PanoViewer/view360.panoviewer.js
diff --git a/dist/PanoViewer/view360.panoviewer.js.map b/dist/PanoViewer/view360.panoviewer.js.map
diff --git a/dist/PanoViewer/view360.panoviewer.min.js b/dist/PanoViewer/view360.panoviewer.min.js
diff --git a/dist/PanoViewer/view360.panoviewer.min.js.map b/dist/PanoViewer/view360.panoviewer.min.js.map
diff --git a/dist/PanoViewer/view360.panoviewer.pkgd.js b/dist/PanoViewer/view360.panoviewer.pkgd.js
diff --git a/dist/PanoViewer/view360.panoviewer.pkgd.js.map b/dist/PanoViewer/view360.panoviewer.pkgd.js.map
diff --git a/dist/PanoViewer/view360.panoviewer.pkgd.min.js b/dist/PanoViewer/view360.panoviewer.pkgd.min.js
diff --git a/dist/PanoViewer/view360.panoviewer.pkgd.min.js.map b/dist/PanoViewer/view360.panoviewer.pkgd.min.js.map
diff --git a/dist/SpinViewer/view360.spinviewer.js.map b/dist/SpinViewer/view360.spinviewer.js.map
diff --git a/dist/SpinViewer/view360.spinviewer.pkgd.js.map b/dist/SpinViewer/view360.spinviewer.pkgd.js.map
diff --git a/dist/view360.js b/dist/view360.js
diff --git a/dist/view360.js.map b/dist/view360.js.map
diff --git a/dist/view360.min.js b/dist/view360.min.js
diff --git a/dist/view360.min.js.map b/dist/view360.min.js.map
diff --git a/dist/view360.pkgd.js b/dist/view360.pkgd.js
diff --git a/dist/view360.pkgd.js.map b/dist/view360.pkgd.js.map
diff --git a/dist/view360.pkgd.min.js b/dist/view360.pkgd.min.js
diff --git a/dist/view360.pkgd.min.js.map b/dist/view360.pkgd.min.js.map
diff --git a/src/PanoImageRenderer/PanoImageRenderer.js b/src/PanoImageRenderer/PanoImageRenderer.js
@@ -68,6 +68,7 @@ export default class PanoImageRenderer extends Component {
 
 		this._image = null;
 		this._imageIsReady = false;
+		this._shouldForceDraw = false;
 		this._keepUpdate = false; // Flag to specify 'continuous update' on video even when still.
 
 		this._onContentLoad = 	this._onContentLoad.bind(this);
@@ -107,8 +108,8 @@ export default class PanoImageRenderer extends Component {
 		this._image = this._contentLoader.getElement();
 
 		return this._contentLoader.get()
-			.then(this._onContentLoad)
-			.catch(this._onContentError);
+			.then(this._onContentLoad, this._onContentError)
+			.catch(e => setTimeout(() => { throw e; }));// Prevent exceptions from being isolated in promise chain.
 	}
 
 	_setImageType(imageType) {
@@ -371,6 +372,11 @@ export default class PanoImageRenderer extends Component {
 			gl.enableVertexAttribArray(shaderProgram.textureCoordAttribute);
 		}
 
+		// clear buffer
+		gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT | gl.STENCIL_BUFFER_BIT);
+		// Use TEXTURE0
+		gl.uniform1i(shaderProgram.samplerUniform, 0);
+
 		return shaderProgram;
 	}
 
@@ -445,9 +451,6 @@ export default class PanoImageRenderer extends Component {
 	_draw() {
 		const gl = this.context;
 
-		gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT | gl.STENCIL_BUFFER_BIT);
-
-		gl.uniform1i(this.shaderProgram.samplerUniform, 0);
 		gl.uniformMatrix4fv(this.shaderProgram.pMatrixUniform, false, this.pMatrix);
 		gl.uniformMatrix4fv(this.shaderProgram.mvMatrixUniform, false, this.mvMatrix);
 

diff --git a/src/PanoImageRenderer/WebGLUtils.js b/src/PanoImageRenderer/WebGLUtils.js
@@ -85,7 +85,10 @@ export default class WebGLUtils {
 		for (let i = 0; i < webglIdentifiers.length; i++) {
 			try {
 				// preserveDrawingBuffer: if true, the Galaxy s6 Naver app will experience tremor
-				context = canvas.getContext(webglIdentifiers[i], {preserveDrawingBuffer: false});
+				context = canvas.getContext(webglIdentifiers[i], {
+					preserveDrawingBuffer: false,
+					antialias: false /* TODO: Make it user option for antialiasing */
+				});
 			} catch (t) {}
 			if (context) {
 				break;