浏览代码

Fix issue with matrice weights

David Catuhe 8 年之前
父节点
当前提交
f72a5925dd

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


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


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

@@ -6116,7 +6116,7 @@ var BABYLON;
             }
             }
             //At this point size can be a number, or an object (according to engine.prototype.createRenderTargetTexture method)
             //At this point size can be a number, or an object (according to engine.prototype.createRenderTargetTexture method)
             var texture = new BABYLON.RenderTargetTexture("screenShot", size, scene, false, false, BABYLON.Engine.TEXTURETYPE_UNSIGNED_INT, false, BABYLON.Texture.NEAREST_SAMPLINGMODE);
             var texture = new BABYLON.RenderTargetTexture("screenShot", size, scene, false, false, BABYLON.Engine.TEXTURETYPE_UNSIGNED_INT, false, BABYLON.Texture.NEAREST_SAMPLINGMODE);
-            texture.renderList = scene.meshes;
+            texture.renderList = null;
             texture.samples = samples;
             texture.samples = samples;
             texture.onAfterRenderObservable.add(function () {
             texture.onAfterRenderObservable.add(function () {
                 Tools.DumpFramebuffer(width, height, engine, successCallback, mimeType);
                 Tools.DumpFramebuffer(width, height, engine, successCallback, mimeType);
@@ -28605,7 +28605,7 @@ var BABYLON;
                 for (var j = 0; j < influencers - 1; j++) {
                 for (var j = 0; j < influencers - 1; j++) {
                     weight += matricesWeights[i + j];
                     weight += matricesWeights[i + j];
                 }
                 }
-                matricesWeights[i + (influencers - 1)] = Math.max(0, 1.0 - weight);
+                matricesWeights[i + (influencers - 1)] += Math.max(0, 1.0 - weight);
             }
             }
         };
         };
         Geometry.Parse = function (parsedVertexData, scene, rootUrl) {
         Geometry.Parse = function (parsedVertexData, scene, rootUrl) {
@@ -46494,7 +46494,7 @@ var BABYLON;
             }
             }
             var checkReady = function () {
             var checkReady = function () {
                 var subMesh = subMeshes[currentIndex];
                 var subMesh = subMeshes[currentIndex];
-                if (_this.isReady(subMesh, options ? options.useInstances : false)) {
+                if (_this._scene && _this._scene.getEngine() && _this.isReady(subMesh, options ? options.useInstances : false)) {
                     currentIndex++;
                     currentIndex++;
                     if (currentIndex >= subMeshes.length) {
                     if (currentIndex >= subMeshes.length) {
                         if (onCompiled) {
                         if (onCompiled) {
@@ -47883,7 +47883,7 @@ var BABYLON;
                     var type = fileToLoad.type;
                     var type = fileToLoad.type;
                     var entry = void 0;
                     var entry = void 0;
                     fileToLoad.correctName = name_1;
                     fileToLoad.correctName = name_1;
-                    if (event.dataTransfer.items) {
+                    if (event.dataTransfer && event.dataTransfer.items) {
                         var item = event.dataTransfer.items[i];
                         var item = event.dataTransfer.items[i];
                         if (item.getAsEntry) {
                         if (item.getAsEntry) {
                             entry = item.getAsEntry();
                             entry = item.getAsEntry();

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


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


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


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


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

@@ -6116,7 +6116,7 @@ var BABYLON;
             }
             }
             //At this point size can be a number, or an object (according to engine.prototype.createRenderTargetTexture method)
             //At this point size can be a number, or an object (according to engine.prototype.createRenderTargetTexture method)
             var texture = new BABYLON.RenderTargetTexture("screenShot", size, scene, false, false, BABYLON.Engine.TEXTURETYPE_UNSIGNED_INT, false, BABYLON.Texture.NEAREST_SAMPLINGMODE);
             var texture = new BABYLON.RenderTargetTexture("screenShot", size, scene, false, false, BABYLON.Engine.TEXTURETYPE_UNSIGNED_INT, false, BABYLON.Texture.NEAREST_SAMPLINGMODE);
-            texture.renderList = scene.meshes;
+            texture.renderList = null;
             texture.samples = samples;
             texture.samples = samples;
             texture.onAfterRenderObservable.add(function () {
             texture.onAfterRenderObservable.add(function () {
                 Tools.DumpFramebuffer(width, height, engine, successCallback, mimeType);
                 Tools.DumpFramebuffer(width, height, engine, successCallback, mimeType);
@@ -28605,7 +28605,7 @@ var BABYLON;
                 for (var j = 0; j < influencers - 1; j++) {
                 for (var j = 0; j < influencers - 1; j++) {
                     weight += matricesWeights[i + j];
                     weight += matricesWeights[i + j];
                 }
                 }
-                matricesWeights[i + (influencers - 1)] = Math.max(0, 1.0 - weight);
+                matricesWeights[i + (influencers - 1)] += Math.max(0, 1.0 - weight);
             }
             }
         };
         };
         Geometry.Parse = function (parsedVertexData, scene, rootUrl) {
         Geometry.Parse = function (parsedVertexData, scene, rootUrl) {

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


+ 1 - 0
dist/preview release/what's new.md

@@ -5,6 +5,7 @@
 - Engine can now be initialized with an existing webgl context ([deltakosh](https://github.com/deltakosh))
 - Engine can now be initialized with an existing webgl context ([deltakosh](https://github.com/deltakosh))
 
 
 ## Updates
 ## Updates
+- Added support for folders when drag'n'dropping into the sandbox ([deltakosh](https://github.com/deltakosh))
 - Better serialization support ([deltakosh](https://github.com/deltakosh))
 - Better serialization support ([deltakosh](https://github.com/deltakosh))
 - Introduced `performanceMonitor` class to get better FPS analysis ([deltakosh](https://github.com/deltakosh))
 - Introduced `performanceMonitor` class to get better FPS analysis ([deltakosh](https://github.com/deltakosh))
 - GUI: Added support for pointer move events on projected UI ([deltakosh](https://github.com/deltakosh))
 - GUI: Added support for pointer move events on projected UI ([deltakosh](https://github.com/deltakosh))

+ 1 - 1
src/Mesh/babylon.geometry.ts

@@ -987,7 +987,7 @@
                     weight += matricesWeights[i + j];
                     weight += matricesWeights[i + j];
                 }
                 }
 
 
-                matricesWeights[i + (influencers - 1)] = Math.max(0, 1.0 - weight);
+                matricesWeights[i + (influencers - 1)] += Math.max(0, 1.0 - weight);
             }
             }
         }
         }
 
 

+ 1 - 1
src/Tools/babylon.tools.ts

@@ -849,7 +849,7 @@
 
 
             //At this point size can be a number, or an object (according to engine.prototype.createRenderTargetTexture method)
             //At this point size can be a number, or an object (according to engine.prototype.createRenderTargetTexture method)
             var texture = new RenderTargetTexture("screenShot", size, scene, false, false, Engine.TEXTURETYPE_UNSIGNED_INT, false, Texture.NEAREST_SAMPLINGMODE);
             var texture = new RenderTargetTexture("screenShot", size, scene, false, false, Engine.TEXTURETYPE_UNSIGNED_INT, false, Texture.NEAREST_SAMPLINGMODE);
-            texture.renderList = scene.meshes;
+            texture.renderList = null;
             texture.samples = samples;
             texture.samples = samples;
 
 
             texture.onAfterRenderObservable.add(() => {
             texture.onAfterRenderObservable.add(() => {