浏览代码

Merge branch 'master' of https://github.com/BabylonJS/Babylon.js

David Rousset 7 年之前
父节点
当前提交
df05188a06

文件差异内容过多而无法显示
+ 3112 - 3112
Playground/babylon.d.txt


+ 1 - 3
dist/gui/package.json

@@ -32,7 +32,5 @@
     },
     },
     "engines": {
     "engines": {
         "node": "*"
         "node": "*"
-    },
-    "_id": "babylonjs-gui@3.1.0-alpha1",
-    "_from": "babylonjs-gui@"
+    }
 }
 }

文件差异内容过多而无法显示
+ 3020 - 3020
dist/preview release/babylon.d.ts


文件差异内容过多而无法显示
+ 2 - 2
dist/preview release/babylon.js


+ 1 - 1
dist/preview release/babylon.max.js

@@ -26878,7 +26878,7 @@ var BABYLON;
                     this._program = engine.createShaderProgram(this._vertexSourceCode, this._fragmentSourceCode, defines, undefined, this._transformFeedbackVaryings);
                     this._program = engine.createShaderProgram(this._vertexSourceCode, this._fragmentSourceCode, defines, undefined, this._transformFeedbackVaryings);
                 }
                 }
                 this._program.__SPECTOR_rebuildProgram = this._rebuildProgram.bind(this);
                 this._program.__SPECTOR_rebuildProgram = this._rebuildProgram.bind(this);
-                if (engine.webGLVersion > 1) {
+                if (engine.supportsUniformBuffers) {
                     for (var name in this._uniformBuffersNames) {
                     for (var name in this._uniformBuffersNames) {
                         this.bindUniformBlock(name, this._uniformBuffersNames[name]);
                         this.bindUniformBlock(name, this._uniformBuffersNames[name]);
                     }
                     }

文件差异内容过多而无法显示
+ 2 - 2
dist/preview release/babylon.worker.js


文件差异内容过多而无法显示
+ 2 - 2
dist/preview release/customConfigurations/minimalGLTFViewer/babylon.js


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

@@ -26878,7 +26878,7 @@ var BABYLON;
                     this._program = engine.createShaderProgram(this._vertexSourceCode, this._fragmentSourceCode, defines, undefined, this._transformFeedbackVaryings);
                     this._program = engine.createShaderProgram(this._vertexSourceCode, this._fragmentSourceCode, defines, undefined, this._transformFeedbackVaryings);
                 }
                 }
                 this._program.__SPECTOR_rebuildProgram = this._rebuildProgram.bind(this);
                 this._program.__SPECTOR_rebuildProgram = this._rebuildProgram.bind(this);
-                if (engine.webGLVersion > 1) {
+                if (engine.supportsUniformBuffers) {
                     for (var name in this._uniformBuffersNames) {
                     for (var name in this._uniformBuffersNames) {
                         this.bindUniformBlock(name, this._uniformBuffersNames[name]);
                         this.bindUniformBlock(name, this._uniformBuffersNames[name]);
                     }
                     }

文件差异内容过多而无法显示
+ 2 - 2
dist/preview release/viewer/babylon.viewer.js


+ 1 - 3
package.json

@@ -64,7 +64,5 @@
         "node": "*"
         "node": "*"
     },
     },
     "readme": "Babylon.js is a 3D engine based on webgl and javascript",
     "readme": "Babylon.js is a 3D engine based on webgl and javascript",
-    "readmeFilename": "README.md",
-    "_id": "babylonjs@3.1.0-alpha2",
-    "_from": "babylonjs@"
+    "readmeFilename": "README.md"
 }
 }

+ 1 - 1
src/Materials/babylon.effect.ts

@@ -563,7 +563,7 @@
                 }
                 }
                 this._program.__SPECTOR_rebuildProgram = this._rebuildProgram.bind(this);
                 this._program.__SPECTOR_rebuildProgram = this._rebuildProgram.bind(this);
 
 
-                if (engine.webGLVersion > 1) {
+                if (engine.supportsUniformBuffers) {
                     for (var name in this._uniformBuffersNames) {
                     for (var name in this._uniformBuffersNames) {
                         this.bindUniformBlock(name, this._uniformBuffersNames[name]);
                         this.bindUniformBlock(name, this._uniformBuffersNames[name]);
                     }
                     }