瀏覽代碼

Fix issue with mergeMeshes

David Catuhe 7 年之前
父節點
當前提交
b2a398f82c

File diff suppressed because it is too large
+ 14479 - 14479
dist/preview release/babylon.d.ts


File diff suppressed because it is too large
+ 9 - 9
dist/preview release/babylon.js


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

@@ -34287,7 +34287,7 @@ var BABYLON;
             for (index = 0; index < meshes.length; index++) {
             for (index = 0; index < meshes.length; index++) {
                 if (meshes[index]) {
                 if (meshes[index]) {
                     meshes[index].computeWorldMatrix(true);
                     meshes[index].computeWorldMatrix(true);
-                    otherVertexData = BABYLON.VertexData.ExtractFromMesh(meshes[index], true);
+                    otherVertexData = BABYLON.VertexData.ExtractFromMesh(meshes[index], true, true);
                     otherVertexData.transform(meshes[index].getWorldMatrix());
                     otherVertexData.transform(meshes[index].getWorldMatrix());
                     if (vertexData) {
                     if (vertexData) {
                         vertexData.merge(otherVertexData);
                         vertexData.merge(otherVertexData);

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

@@ -34254,7 +34254,7 @@ var BABYLON;
             for (index = 0; index < meshes.length; index++) {
             for (index = 0; index < meshes.length; index++) {
                 if (meshes[index]) {
                 if (meshes[index]) {
                     meshes[index].computeWorldMatrix(true);
                     meshes[index].computeWorldMatrix(true);
-                    otherVertexData = BABYLON.VertexData.ExtractFromMesh(meshes[index], true);
+                    otherVertexData = BABYLON.VertexData.ExtractFromMesh(meshes[index], true, true);
                     otherVertexData.transform(meshes[index].getWorldMatrix());
                     otherVertexData.transform(meshes[index].getWorldMatrix());
                     if (vertexData) {
                     if (vertexData) {
                         vertexData.merge(otherVertexData);
                         vertexData.merge(otherVertexData);

File diff suppressed because it is too large
+ 9 - 9
dist/preview release/babylon.worker.js


+ 1 - 1
dist/preview release/es6.js

@@ -34254,7 +34254,7 @@ var BABYLON;
             for (index = 0; index < meshes.length; index++) {
             for (index = 0; index < meshes.length; index++) {
                 if (meshes[index]) {
                 if (meshes[index]) {
                     meshes[index].computeWorldMatrix(true);
                     meshes[index].computeWorldMatrix(true);
-                    otherVertexData = BABYLON.VertexData.ExtractFromMesh(meshes[index], true);
+                    otherVertexData = BABYLON.VertexData.ExtractFromMesh(meshes[index], true, true);
                     otherVertexData.transform(meshes[index].getWorldMatrix());
                     otherVertexData.transform(meshes[index].getWorldMatrix());
                     if (vertexData) {
                     if (vertexData) {
                         vertexData.merge(otherVertexData);
                         vertexData.merge(otherVertexData);

File diff suppressed because it is too large
+ 1 - 1
dist/preview release/viewer/babylon.viewer.js


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

@@ -34375,7 +34375,7 @@ var BABYLON;
             for (index = 0; index < meshes.length; index++) {
             for (index = 0; index < meshes.length; index++) {
                 if (meshes[index]) {
                 if (meshes[index]) {
                     meshes[index].computeWorldMatrix(true);
                     meshes[index].computeWorldMatrix(true);
-                    otherVertexData = BABYLON.VertexData.ExtractFromMesh(meshes[index], true);
+                    otherVertexData = BABYLON.VertexData.ExtractFromMesh(meshes[index], true, true);
                     otherVertexData.transform(meshes[index].getWorldMatrix());
                     otherVertexData.transform(meshes[index].getWorldMatrix());
                     if (vertexData) {
                     if (vertexData) {
                         vertexData.merge(otherVertexData);
                         vertexData.merge(otherVertexData);

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

@@ -3392,7 +3392,7 @@
             for (index = 0; index < meshes.length; index++) {
             for (index = 0; index < meshes.length; index++) {
                 if (meshes[index]) {
                 if (meshes[index]) {
                     meshes[index].computeWorldMatrix(true);
                     meshes[index].computeWorldMatrix(true);
-                    otherVertexData = VertexData.ExtractFromMesh(meshes[index], true);
+                    otherVertexData = VertexData.ExtractFromMesh(meshes[index], true, true);
                     otherVertexData.transform(meshes[index].getWorldMatrix());
                     otherVertexData.transform(meshes[index].getWorldMatrix());
 
 
                     if (vertexData) {
                     if (vertexData) {