瀏覽代碼

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

David Catuhe 6 年之前
父節點
當前提交
7ee3a9fef7
共有 4 個文件被更改,包括 83 次插入1341 次删除
  1. 40 665
      dist/ammo.js
  2. 40 665
      dist/preview release/ammo.js
  3. 3 0
      dist/preview release/what's new.md
  4. 0 11
      serializers/src/glTF/2.0/glTFExporter.ts

文件差異過大導致無法顯示
+ 40 - 665
dist/ammo.js


文件差異過大導致無法顯示
+ 40 - 665
dist/preview release/ammo.js


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

@@ -33,6 +33,9 @@
 ### Meshes
 - Added new CreateTiledPlane and CreateTiledBox ([JohnK](https://github.com/BabylonJSGuide/))
 
+### Physics
+- Update Ammo.js library to support global collision contact callbacks ([MackeyK24](https://github.com/MackeyK24/))
+
 ## Bug fixes
 - Added support for `AnimationGroup` serialization ([Drigax](https://github.com/drigax/))
 - Removing assetContainer from scene will also remove gui layers ([TrevorDev](https://github.com/TrevorDev))

+ 0 - 11
serializers/src/glTF/2.0/glTFExporter.ts

@@ -1067,7 +1067,6 @@ export class _Exporter {
         let promises: Promise<IMeshPrimitive>[] = [];
         let bufferMesh: Nullable<Mesh> = null;
         let bufferView: IBufferView;
-        let uvCoordsPresent: boolean;
         let minMax: { min: Nullable<number[]>, max: Nullable<number[]> };
 
         if (babylonTransformNode instanceof Mesh) {
@@ -1123,7 +1122,6 @@ export class _Exporter {
             if (bufferMesh.subMeshes) {
                 // go through all mesh primitives (submeshes)
                 for (const submesh of bufferMesh.subMeshes) {
-                    uvCoordsPresent = false;
                     let babylonMaterial = submesh.getMaterial() || bufferMesh.getScene().defaultMaterial;
 
                     let materialIndex: Nullable<number> = null;
@@ -1179,9 +1177,6 @@ export class _Exporter {
                                     const accessor = _GLTFUtilities._CreateAccessor(bufferViewIndex, attributeKind + " - " + babylonTransformNode.name, attribute.accessorType, AccessorComponentType.FLOAT, vertexData.length / stride, 0, minMax.min, minMax.max);
                                     this._accessors.push(accessor);
                                     this.setAttributeKind(meshPrimitive, attributeKind);
-                                    if (meshPrimitive.attributes.TEXCOORD_0 != null || meshPrimitive.attributes.TEXCOORD_1 != null) {
-                                        uvCoordsPresent = true;
-                                    }
                                 }
                             }
                         }
@@ -1220,12 +1215,6 @@ export class _Exporter {
                             }
                         }
 
-                        if (!uvCoordsPresent && this._glTFMaterialExporter._hasTexturesPresent(this._materials[materialIndex])) {
-                            const newMat = this._glTFMaterialExporter._stripTexturesFromMaterial(this._materials[materialIndex]);
-                            this._materials.push(newMat);
-                            materialIndex = this._materials.length - 1;
-                        }
-
                         meshPrimitive.material = materialIndex;
 
                     }