David Catuhe пре 7 година
родитељ
комит
8dd6a69e79

Разлика између датотеке није приказан због своје велике величине
+ 11113 - 11112
Playground/babylon.d.txt


Разлика између датотеке није приказан због своје велике величине
+ 5723 - 5722
dist/preview release/babylon.d.ts


Разлика између датотеке није приказан због своје велике величине
+ 16 - 16
dist/preview release/babylon.js


+ 12 - 2
dist/preview release/babylon.max.js

@@ -11148,7 +11148,7 @@ var BABYLON;
                     throw new Error("Unable to create multi sampled framebuffer");
                     throw new Error("Unable to create multi sampled framebuffer");
                 }
                 }
                 gl.bindRenderbuffer(gl.RENDERBUFFER, colorRenderbuffer);
                 gl.bindRenderbuffer(gl.RENDERBUFFER, colorRenderbuffer);
-                gl.renderbufferStorageMultisample(gl.RENDERBUFFER, samples, gl.RGBA8, texture.width, texture.height);
+                gl.renderbufferStorageMultisample(gl.RENDERBUFFER, samples, this._getRGBAMultiSampleBufferFormat(texture.type), texture.width, texture.height);
                 gl.framebufferRenderbuffer(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.RENDERBUFFER, colorRenderbuffer);
                 gl.framebufferRenderbuffer(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.RENDERBUFFER, colorRenderbuffer);
                 texture._MSAARenderBuffer = colorRenderbuffer;
                 texture._MSAARenderBuffer = colorRenderbuffer;
             }
             }
@@ -11201,7 +11201,7 @@ var BABYLON;
                         throw new Error("Unable to create multi sampled framebuffer");
                         throw new Error("Unable to create multi sampled framebuffer");
                     }
                     }
                     gl.bindRenderbuffer(gl.RENDERBUFFER, colorRenderbuffer);
                     gl.bindRenderbuffer(gl.RENDERBUFFER, colorRenderbuffer);
-                    gl.renderbufferStorageMultisample(gl.RENDERBUFFER, samples, gl.RGBA8, texture.width, texture.height);
+                    gl.renderbufferStorageMultisample(gl.RENDERBUFFER, samples, this._getRGBAMultiSampleBufferFormat(texture.type), texture.width, texture.height);
                     gl.framebufferRenderbuffer(gl.FRAMEBUFFER, attachment, gl.RENDERBUFFER, colorRenderbuffer);
                     gl.framebufferRenderbuffer(gl.FRAMEBUFFER, attachment, gl.RENDERBUFFER, colorRenderbuffer);
                     texture._MSAAFramebuffer = framebuffer;
                     texture._MSAAFramebuffer = framebuffer;
                     texture._MSAARenderBuffer = colorRenderbuffer;
                     texture._MSAARenderBuffer = colorRenderbuffer;
@@ -12485,6 +12485,16 @@ var BABYLON;
             return this._gl.RGBA;
             return this._gl.RGBA;
         };
         };
         ;
         ;
+        Engine.prototype._getRGBAMultiSampleBufferFormat = function (type) {
+            if (type === Engine.TEXTURETYPE_FLOAT) {
+                return this._gl.RGBA32F;
+            }
+            else if (type === Engine.TEXTURETYPE_HALF_FLOAT) {
+                return this._gl.RGBA16F;
+            }
+            return this._gl.RGBA8;
+        };
+        ;
         Engine.prototype.createQuery = function () {
         Engine.prototype.createQuery = function () {
             return this._gl.createQuery();
             return this._gl.createQuery();
         };
         };

Разлика између датотеке није приказан због своје велике величине
+ 16 - 16
dist/preview release/babylon.worker.js


Разлика између датотеке није приказан због своје велике величине
+ 3664 - 3663
dist/preview release/customConfigurations/minimalGLTFViewer/babylon.d.ts


Разлика између датотеке није приказан због своје велике величине
+ 17 - 17
dist/preview release/customConfigurations/minimalGLTFViewer/babylon.js


+ 13 - 3
dist/preview release/customConfigurations/minimalGLTFViewer/babylon.max.js

@@ -8724,7 +8724,7 @@ var BABYLON;
         });
         });
         Object.defineProperty(Engine, "Version", {
         Object.defineProperty(Engine, "Version", {
             get: function () {
             get: function () {
-                return "3.2.0-alpha1";
+                return "3.2.0-alpha2";
             },
             },
             enumerable: true,
             enumerable: true,
             configurable: true
             configurable: true
@@ -11148,7 +11148,7 @@ var BABYLON;
                     throw new Error("Unable to create multi sampled framebuffer");
                     throw new Error("Unable to create multi sampled framebuffer");
                 }
                 }
                 gl.bindRenderbuffer(gl.RENDERBUFFER, colorRenderbuffer);
                 gl.bindRenderbuffer(gl.RENDERBUFFER, colorRenderbuffer);
-                gl.renderbufferStorageMultisample(gl.RENDERBUFFER, samples, gl.RGBA8, texture.width, texture.height);
+                gl.renderbufferStorageMultisample(gl.RENDERBUFFER, samples, this._getRGBAMultiSampleBufferFormat(texture.type), texture.width, texture.height);
                 gl.framebufferRenderbuffer(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.RENDERBUFFER, colorRenderbuffer);
                 gl.framebufferRenderbuffer(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.RENDERBUFFER, colorRenderbuffer);
                 texture._MSAARenderBuffer = colorRenderbuffer;
                 texture._MSAARenderBuffer = colorRenderbuffer;
             }
             }
@@ -11201,7 +11201,7 @@ var BABYLON;
                         throw new Error("Unable to create multi sampled framebuffer");
                         throw new Error("Unable to create multi sampled framebuffer");
                     }
                     }
                     gl.bindRenderbuffer(gl.RENDERBUFFER, colorRenderbuffer);
                     gl.bindRenderbuffer(gl.RENDERBUFFER, colorRenderbuffer);
-                    gl.renderbufferStorageMultisample(gl.RENDERBUFFER, samples, gl.RGBA8, texture.width, texture.height);
+                    gl.renderbufferStorageMultisample(gl.RENDERBUFFER, samples, this._getRGBAMultiSampleBufferFormat(texture.type), texture.width, texture.height);
                     gl.framebufferRenderbuffer(gl.FRAMEBUFFER, attachment, gl.RENDERBUFFER, colorRenderbuffer);
                     gl.framebufferRenderbuffer(gl.FRAMEBUFFER, attachment, gl.RENDERBUFFER, colorRenderbuffer);
                     texture._MSAAFramebuffer = framebuffer;
                     texture._MSAAFramebuffer = framebuffer;
                     texture._MSAARenderBuffer = colorRenderbuffer;
                     texture._MSAARenderBuffer = colorRenderbuffer;
@@ -12485,6 +12485,16 @@ var BABYLON;
             return this._gl.RGBA;
             return this._gl.RGBA;
         };
         };
         ;
         ;
+        Engine.prototype._getRGBAMultiSampleBufferFormat = function (type) {
+            if (type === Engine.TEXTURETYPE_FLOAT) {
+                return this._gl.RGBA32F;
+            }
+            else if (type === Engine.TEXTURETYPE_HALF_FLOAT) {
+                return this._gl.RGBA16F;
+            }
+            return this._gl.RGBA8;
+        };
+        ;
         Engine.prototype.createQuery = function () {
         Engine.prototype.createQuery = function () {
             return this._gl.createQuery();
             return this._gl.createQuery();
         };
         };

Разлика између датотеке није приказан због своје велике величине
+ 41 - 41
dist/preview release/viewer/babylon.viewer.js


+ 14 - 3
src/Engine/babylon.engine.ts

@@ -538,7 +538,7 @@
         }
         }
 
 
         public static get Version(): string {
         public static get Version(): string {
-            return "3.2.0-alpha1";
+            return "3.2.0-alpha2";
         }
         }
 
 
         // Updatable statics so stick with vars here
         // Updatable statics so stick with vars here
@@ -3867,7 +3867,7 @@
                 }
                 }
 
 
                 gl.bindRenderbuffer(gl.RENDERBUFFER, colorRenderbuffer);
                 gl.bindRenderbuffer(gl.RENDERBUFFER, colorRenderbuffer);
-                gl.renderbufferStorageMultisample(gl.RENDERBUFFER, samples, gl.RGBA8, texture.width, texture.height);
+                gl.renderbufferStorageMultisample(gl.RENDERBUFFER, samples, this._getRGBAMultiSampleBufferFormat(texture.type), texture.width, texture.height);
 
 
                 gl.framebufferRenderbuffer(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.RENDERBUFFER, colorRenderbuffer);
                 gl.framebufferRenderbuffer(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.RENDERBUFFER, colorRenderbuffer);
 
 
@@ -3940,7 +3940,7 @@
                     }
                     }
 
 
                     gl.bindRenderbuffer(gl.RENDERBUFFER, colorRenderbuffer);
                     gl.bindRenderbuffer(gl.RENDERBUFFER, colorRenderbuffer);
-                    gl.renderbufferStorageMultisample(gl.RENDERBUFFER, samples, gl.RGBA8, texture.width, texture.height);
+                    gl.renderbufferStorageMultisample(gl.RENDERBUFFER, samples, this._getRGBAMultiSampleBufferFormat(texture.type), texture.width, texture.height);
 
 
                     gl.framebufferRenderbuffer(gl.FRAMEBUFFER, attachment, gl.RENDERBUFFER, colorRenderbuffer);
                     gl.framebufferRenderbuffer(gl.FRAMEBUFFER, attachment, gl.RENDERBUFFER, colorRenderbuffer);
 
 
@@ -5494,6 +5494,17 @@
             return this._gl.RGBA;
             return this._gl.RGBA;
         };
         };
 
 
+        public _getRGBAMultiSampleBufferFormat(type: number): number {
+            if (type === Engine.TEXTURETYPE_FLOAT) {
+                return this._gl.RGBA32F;
+            }
+            else if (type === Engine.TEXTURETYPE_HALF_FLOAT) {
+                return this._gl.RGBA16F;
+            }
+
+            return this._gl.RGBA8;
+        };
+
         public createQuery(): WebGLQuery {
         public createQuery(): WebGLQuery {
             return this._gl.createQuery();
             return this._gl.createQuery();
         }
         }

+ 1 - 2
tests/validation/config.json

@@ -338,8 +338,7 @@
       "scriptToRun": "/Demos/Procedural/proceduralTexture.js",
       "scriptToRun": "/Demos/Procedural/proceduralTexture.js",
       "functionToCall": "CreateProceduralTextureTestScene",
       "functionToCall": "CreateProceduralTextureTestScene",
       "referenceImage": "procedural.png",
       "referenceImage": "procedural.png",
-      "replace": "./land, https://cdn.rawgit.com/BabylonJS/Website/06ecbea7/Demos/Procedural/land",
-      "onlyVisual": true
+      "replace": "./land, https://cdn.rawgit.com/BabylonJS/Website/06ecbea7/Demos/Procedural/land"
     },
     },
     {
     {
       "title": "Water material (only visual check)",
       "title": "Water material (only visual check)",