Quellcode durchsuchen

Added engine.getError to surface webGL error numbers

David Catuhe vor 8 Jahren
Ursprung
Commit
125f4225a6

Datei-Diff unterdrückt, da er zu groß ist
+ 2669 - 2669
dist/preview release/babylon.d.ts


Datei-Diff unterdrückt, da er zu groß ist
+ 35 - 35
dist/preview release/babylon.js


+ 7 - 15
dist/preview release/babylon.max.js

@@ -10336,6 +10336,9 @@ var BABYLON;
             var shaders = this._gl.getAttachedShaders(program);
             var shaders = this._gl.getAttachedShaders(program);
             return this._gl.getShaderSource(shaders[1]);
             return this._gl.getShaderSource(shaders[1]);
         };
         };
+        Engine.prototype.getError = function () {
+            return this._gl.getError();
+        };
         // FPS
         // FPS
         Engine.prototype.getFps = function () {
         Engine.prototype.getFps = function () {
             return this.fps;
             return this.fps;
@@ -15591,7 +15594,6 @@ var BABYLON;
             this._transformMatrix = BABYLON.Matrix.Zero();
             this._transformMatrix = BABYLON.Matrix.Zero();
             this.requireLightSorting = false;
             this.requireLightSorting = false;
             this._uniqueIdCounter = 0;
             this._uniqueIdCounter = 0;
-            this.offscreenRenderTarget = null;
             this._engine = engine || BABYLON.Engine.LastCreatedEngine;
             this._engine = engine || BABYLON.Engine.LastCreatedEngine;
             this._engine.scenes.push(this);
             this._engine.scenes.push(this);
             this._uid = null;
             this._uid = null;
@@ -17522,12 +17524,7 @@ var BABYLON;
                 this._renderId++;
                 this._renderId++;
             }
             }
             if (needsRestoreFrameBuffer) {
             if (needsRestoreFrameBuffer) {
-                if (this.offscreenRenderTarget) {
-                    engine.bindFramebuffer(this.offscreenRenderTarget._texture);
-                }
-                else {
-                    engine.restoreDefaultFramebuffer(); // Restore back buffer
-                }
+                engine.restoreDefaultFramebuffer(); // Restore back buffer
             }
             }
             this._renderTargetsDuration.endMonitoring(false);
             this._renderTargetsDuration.endMonitoring(false);
             // Prepare Frame
             // Prepare Frame
@@ -17714,14 +17711,9 @@ var BABYLON;
                 BABYLON.Tools.EndPerformanceCounter("Custom render targets", this.customRenderTargets.length > 0);
                 BABYLON.Tools.EndPerformanceCounter("Custom render targets", this.customRenderTargets.length > 0);
                 this._renderId++;
                 this._renderId++;
             }
             }
-            if (this.offscreenRenderTarget) {
-                engine.bindFramebuffer(this.offscreenRenderTarget._texture);
-            }
-            else {
-                // Restore back buffer
-                if (this.customRenderTargets.length > 0) {
-                    engine.restoreDefaultFramebuffer();
-                }
+            // Restore back buffer
+            if (this.customRenderTargets.length > 0) {
+                engine.restoreDefaultFramebuffer();
             }
             }
             this._renderTargetsDuration.endMonitoring();
             this._renderTargetsDuration.endMonitoring();
             this.activeCamera = currentActiveCamera;
             this.activeCamera = currentActiveCamera;

Datei-Diff unterdrückt, da er zu groß ist
+ 2669 - 2669
dist/preview release/babylon.module.d.ts


Datei-Diff unterdrückt, da er zu groß ist
+ 35 - 35
dist/preview release/babylon.worker.js


+ 4 - 0
src/babylon.engine.ts

@@ -3903,6 +3903,10 @@
             return this._gl.getShaderSource(shaders[1]);
             return this._gl.getShaderSource(shaders[1]);
         }
         }
 
 
+        public getError(): number {
+            return this._gl.getError();
+        }        
+
         // FPS
         // FPS
         public getFps(): number {
         public getFps(): number {
             return this.fps;
             return this.fps;

+ 4 - 16
src/babylon.scene.ts

@@ -758,8 +758,6 @@
         private _externalData: StringDictionary<Object>;
         private _externalData: StringDictionary<Object>;
         private _uid: string;
         private _uid: string;
 
 
-        public offscreenRenderTarget: RenderTargetTexture = null;
-
         /**
         /**
          * @constructor
          * @constructor
          * @param {BABYLON.Engine} engine - the engine to be used to render this scene.
          * @param {BABYLON.Engine} engine - the engine to be used to render this scene.
@@ -2698,12 +2696,7 @@
             }
             }
 
 
             if (needsRestoreFrameBuffer) {
             if (needsRestoreFrameBuffer) {
-                if (this.offscreenRenderTarget) {
-                    engine.bindFramebuffer(this.offscreenRenderTarget._texture);
-                }
-                else {
-                    engine.restoreDefaultFramebuffer(); // Restore back buffer
-                }
+                engine.restoreDefaultFramebuffer(); // Restore back buffer
             }
             }
 
 
             this._renderTargetsDuration.endMonitoring(false);
             this._renderTargetsDuration.endMonitoring(false);
@@ -2935,14 +2928,9 @@
                 this._renderId++;
                 this._renderId++;
             }
             }
 
 
-            if (this.offscreenRenderTarget) {
-                engine.bindFramebuffer(this.offscreenRenderTarget._texture);
-            }
-            else {
-                // Restore back buffer
-                if (this.customRenderTargets.length > 0) {
-                    engine.restoreDefaultFramebuffer();
-                }
+            // Restore back buffer
+            if (this.customRenderTargets.length > 0) {
+                engine.restoreDefaultFramebuffer();
             }
             }
 
 
             this._renderTargetsDuration.endMonitoring();
             this._renderTargetsDuration.endMonitoring();