فهرست منبع

BoundingInfo2D ConstructXXX renamed in CreateXXX
Engine.updateAndBindInstancesBuffer & unBindInstancesBuffer has a faster check for the offsetlocation parameter.
Removed leading spaces in config.json extra files list.

nockawa 9 سال پیش
والد
کامیت
ab55843fb9

+ 75 - 75
Tools/Gulp/config.json

@@ -154,81 +154,81 @@
   ],
   ],
   "extras": {
   "extras": {
     "files": [
     "files": [
-        "../../src/Math/babylon.math.SIMD.js",
-        "../../src/Tools/babylon.rectPackingMap.js",
-        "../../src/Tools/babylon.dynamicFloatArray.js",
-        "../../src/Materials/Textures/babylon.fontTexture.js",
-        "../../src/Materials/Textures/babylon.mapTexture.js",
-        "../../src/Canvas2d/babylon.bounding2d.js",
-        "../../src/Canvas2d/babylon.brushes2d.js",
-        "../../src/Canvas2d/babylon.smartPropertyPrim.js",
-        "../../src/Canvas2d/babylon.prim2dBase.js",
-        "../../src/Canvas2d/babylon.modelRenderCache.js",
-        "../../src/Canvas2d/babylon.renderablePrim2d.js",
-        "../../src/Canvas2d/babylon.shape2d.js",
-        "../../src/Canvas2d/babylon.group2d.js",
-        "../../src/Canvas2d/babylon.rectangle2d.js",
-        "../../src/Canvas2d/babylon.sprite2d.js",
-        "../../src/Canvas2d/babylon.text2d.js",
-        "../../src/Canvas2d/babylon.canvas2d.js",
-        "../../src/Canvas2d/babylon.worldspacecanvas2d.js",
-        "../../src/Materials/babylon.shaderMaterial.js",
-        "../../src/Tools/babylon.tools.dds.js",
-        "../../src/Physics/Plugins/babylon.cannonJSPlugin.js",
-        "../../src/Physics/Plugins/babylon.oimoJSPlugin.js",
-        "../../src/PostProcess/babylon.displayPassPostProcess.js",
-        "../../src/Mesh/babylon.meshSimplification.js",
-        "../../src/Tools/babylon.sceneSerializer.js",
-        "../../src/Mesh/babylon.csg.js",
-        "../../src/PostProcess/babylon.vrDistortionCorrectionPostProcess.js",
-        "../../src/Tools/babylon.virtualJoystick.js",
-        "../../src/Cameras/babylon.virtualJoysticksCamera.js",
-        "../../src/PostProcess/babylon.anaglyphPostProcess.js",
-        "../../src/Rendering/babylon.outlineRenderer.js",
-        "../../src/Tools/babylon.assetsManager.js",
-        "../../src/cameras/vr/babylon.vrCameraMetrics.js",
-        "../../src/Cameras/VR/babylon.vrDeviceOrientationCamera.js",
-        "../../src/Cameras/VR/babylon.webVRCamera.js",
-        "../../src/Tools/babylon.sceneOptimizer.js",
-        "../../src/Mesh/babylon.meshLODLevel.js",
-        "../../src/Materials/Textures/babylon.rawTexture.js",
-        "../../src/Mesh/babylon.polygonMesh.js",
-        "../../src/Culling/Octrees/babylon.octree.js",
-        "../../src/Culling/Octrees/babylon.octreeBlock.js",
-        "../../src/PostProcess/babylon.blurPostProcess.js",
-        "../../src/PostProcess/babylon.refractionPostProcess.js",
-        "../../src/PostProcess/babylon.blackAndWhitePostProcess.js",
-        "../../src/PostProcess/babylon.convolutionPostProcess.js",
-        "../../src/PostProcess/babylon.filterPostProcess.js",
-        "../../src/PostProcess/babylon.fxaaPostProcess.js",
-        "../../src/PostProcess/babylon.stereoscopicInterlacePostProcess.js",
-        "../../src/LensFlare/babylon.lensFlare.js",
-        "../../src/LensFlare/babylon.lensFlareSystem.js",
-        "../../src/Cameras/babylon.deviceOrientationCamera.js",
-        "../../src/Cameras/babylon.universalCamera.js",
-        "../../src/Tools/babylon.gamepads.js",
-        "../../src/Cameras/babylon.gamepadCamera.js",
-        "../../src/Audio/babylon.analyser.js",
-        "../../src/Rendering/babylon.depthRenderer.js",
-        "../../src/PostProcess/babylon.ssaoRenderingPipeline.js",
-        "../../src/PostProcess/babylon.volumetricLightScatteringPostProcess.js",
-        "../../src/PostProcess/babylon.lensRenderingPipeline.js",
-        "../../src/PostProcess/babylon.colorCorrectionPostProcess.js",
-        "../../src/Cameras/babylon.stereoscopicCameras.js",
-        "../../src/PostProcess/babylon.hdrRenderingPipeline.js",
-        "../../src/Rendering/babylon.edgesRenderer.js",
-        "../../src/PostProcess/babylon.tonemapPostProcess.js",
-        "../../src/Probes/babylon.reflectionProbe.js",
-        "../../src/Particles/babylon.solidParticle.js",
-        "../../src/Particles/babylon.solidParticleSystem.js",
-        "../../src/tools/hdr/babylon.tools.cubemaptosphericalpolynomial.js",
-        "../../src/tools/hdr/babylon.tools.panoramatocubemap.js",
-        "../../src/tools/hdr/babylon.tools.hdr.js",
-        "../../src/tools/hdr/babylon.tools.pmremGenerator.js",
-        "../../src/materials/textures/babylon.hdrcubetexture.js",
-        "../../src/Materials/Textures/babylon.colorGradingTexture.js",
-        "../../src/debug/babylon.skeletonViewer.js",
-        "../../src/materials/babylon.pbrmaterial.js"
+      "../../src/Math/babylon.math.SIMD.js",
+      "../../src/Tools/babylon.rectPackingMap.js",
+      "../../src/Tools/babylon.dynamicFloatArray.js",
+      "../../src/Materials/Textures/babylon.fontTexture.js",
+      "../../src/Materials/Textures/babylon.mapTexture.js",
+      "../../src/Canvas2d/babylon.bounding2d.js",
+      "../../src/Canvas2d/babylon.brushes2d.js",
+      "../../src/Canvas2d/babylon.smartPropertyPrim.js",
+      "../../src/Canvas2d/babylon.prim2dBase.js",
+      "../../src/Canvas2d/babylon.modelRenderCache.js",
+      "../../src/Canvas2d/babylon.renderablePrim2d.js",
+      "../../src/Canvas2d/babylon.shape2d.js",
+      "../../src/Canvas2d/babylon.group2d.js",
+      "../../src/Canvas2d/babylon.rectangle2d.js",
+      "../../src/Canvas2d/babylon.sprite2d.js",
+      "../../src/Canvas2d/babylon.text2d.js",
+      "../../src/Canvas2d/babylon.canvas2d.js",
+      "../../src/Canvas2d/babylon.worldspacecanvas2d.js",
+      "../../src/Materials/babylon.shaderMaterial.js",
+      "../../src/Tools/babylon.tools.dds.js",
+      "../../src/Physics/Plugins/babylon.cannonJSPlugin.js",
+      "../../src/Physics/Plugins/babylon.oimoJSPlugin.js",
+      "../../src/PostProcess/babylon.displayPassPostProcess.js",
+      "../../src/Mesh/babylon.meshSimplification.js",
+      "../../src/Tools/babylon.sceneSerializer.js",
+      "../../src/Mesh/babylon.csg.js",
+      "../../src/PostProcess/babylon.vrDistortionCorrectionPostProcess.js",
+      "../../src/Tools/babylon.virtualJoystick.js",
+      "../../src/Cameras/babylon.virtualJoysticksCamera.js",
+      "../../src/PostProcess/babylon.anaglyphPostProcess.js",
+      "../../src/Rendering/babylon.outlineRenderer.js",
+      "../../src/Tools/babylon.assetsManager.js",
+      "../../src/cameras/vr/babylon.vrCameraMetrics.js",
+      "../../src/Cameras/VR/babylon.vrDeviceOrientationCamera.js",
+      "../../src/Cameras/VR/babylon.webVRCamera.js",
+      "../../src/Tools/babylon.sceneOptimizer.js",
+      "../../src/Mesh/babylon.meshLODLevel.js",
+      "../../src/Materials/Textures/babylon.rawTexture.js",
+      "../../src/Mesh/babylon.polygonMesh.js",
+      "../../src/Culling/Octrees/babylon.octree.js",
+      "../../src/Culling/Octrees/babylon.octreeBlock.js",
+      "../../src/PostProcess/babylon.blurPostProcess.js",
+      "../../src/PostProcess/babylon.refractionPostProcess.js",
+      "../../src/PostProcess/babylon.blackAndWhitePostProcess.js",
+      "../../src/PostProcess/babylon.convolutionPostProcess.js",
+      "../../src/PostProcess/babylon.filterPostProcess.js",
+      "../../src/PostProcess/babylon.fxaaPostProcess.js",
+      "../../src/PostProcess/babylon.stereoscopicInterlacePostProcess.js",
+      "../../src/LensFlare/babylon.lensFlare.js",
+      "../../src/LensFlare/babylon.lensFlareSystem.js",
+      "../../src/Cameras/babylon.deviceOrientationCamera.js",
+      "../../src/Cameras/babylon.universalCamera.js",
+      "../../src/Tools/babylon.gamepads.js",
+      "../../src/Cameras/babylon.gamepadCamera.js",
+      "../../src/Audio/babylon.analyser.js",
+      "../../src/Rendering/babylon.depthRenderer.js",
+      "../../src/PostProcess/babylon.ssaoRenderingPipeline.js",
+      "../../src/PostProcess/babylon.volumetricLightScatteringPostProcess.js",
+      "../../src/PostProcess/babylon.lensRenderingPipeline.js",
+      "../../src/PostProcess/babylon.colorCorrectionPostProcess.js",
+      "../../src/Cameras/babylon.stereoscopicCameras.js",
+      "../../src/PostProcess/babylon.hdrRenderingPipeline.js",
+      "../../src/Rendering/babylon.edgesRenderer.js",
+      "../../src/PostProcess/babylon.tonemapPostProcess.js",
+      "../../src/Probes/babylon.reflectionProbe.js",
+      "../../src/Particles/babylon.solidParticle.js",
+      "../../src/Particles/babylon.solidParticleSystem.js",
+      "../../src/tools/hdr/babylon.tools.cubemaptosphericalpolynomial.js",
+      "../../src/tools/hdr/babylon.tools.panoramatocubemap.js",
+      "../../src/tools/hdr/babylon.tools.hdr.js",
+      "../../src/tools/hdr/babylon.tools.pmremGenerator.js",
+      "../../src/materials/textures/babylon.hdrcubetexture.js",
+      "../../src/Materials/Textures/babylon.colorGradingTexture.js",
+      "../../src/debug/babylon.skeletonViewer.js",
+      "../../src/materials/babylon.pbrmaterial.js"
     ]
     ]
   }
   }
 }
 }

+ 13 - 13
src/Canvas2d/babylon.bounding2d.ts

@@ -28,38 +28,38 @@
             this.extent = Vector2.Zero();
             this.extent = Vector2.Zero();
         }
         }
 
 
-        public static ConstructFromSize(size: Size): BoundingInfo2D {
+        public static CreateFromSize(size: Size): BoundingInfo2D {
             let r = new BoundingInfo2D();
             let r = new BoundingInfo2D();
-            BoundingInfo2D.ConstructFromSizeToRef(size, r);
+            BoundingInfo2D.CreateFromSizeToRef(size, r);
             return r;
             return r;
         }
         }
 
 
-        public static ConstructFromRadius(radius: number): BoundingInfo2D {
+        public static CreateFromRadius(radius: number): BoundingInfo2D {
             let r = new BoundingInfo2D();
             let r = new BoundingInfo2D();
-            BoundingInfo2D.ConstructFromRadiusToRef(radius, r);
+            BoundingInfo2D.CreateFromRadiusToRef(radius, r);
             return r;
             return r;
         }
         }
 
 
-        public static ConstructFromPoints(points: Vector2[]): BoundingInfo2D {
+        public static CreateFromPoints(points: Vector2[]): BoundingInfo2D {
             let r = new BoundingInfo2D();
             let r = new BoundingInfo2D();
-            BoundingInfo2D.ConstructFromPointsToRef(points, r);
+            BoundingInfo2D.CreateFromPointsToRef(points, r);
 
 
             return r;
             return r;
         }
         }
 
 
-        public static ConstructFromSizeToRef(size: Size, b: BoundingInfo2D) {
+        public static CreateFromSizeToRef(size: Size, b: BoundingInfo2D) {
             b.center = new Vector2(size.width / 2, size.height / 2);
             b.center = new Vector2(size.width / 2, size.height / 2);
             b.extent = b.center.clone();
             b.extent = b.center.clone();
             b.radius = b.extent.length();
             b.radius = b.extent.length();
         }
         }
 
 
-        public static ConstructFromRadiusToRef(radius: number, b: BoundingInfo2D) {
+        public static CreateFromRadiusToRef(radius: number, b: BoundingInfo2D) {
             b.center = Vector2.Zero();
             b.center = Vector2.Zero();
             b.extent = new Vector2(radius, radius);
             b.extent = new Vector2(radius, radius);
             b.radius = radius;
             b.radius = radius;
         }
         }
 
 
-        public static ConstructFromPointsToRef(points: Vector2[], b: BoundingInfo2D) {
+        public static CreateFromPointsToRef(points: Vector2[], b: BoundingInfo2D) {
             let xmin = Number.MAX_VALUE, ymin = Number.MAX_VALUE, xmax = Number.MIN_VALUE, ymax = Number.MIN_VALUE;
             let xmin = Number.MAX_VALUE, ymin = Number.MAX_VALUE, xmax = Number.MIN_VALUE, ymax = Number.MIN_VALUE;
             for (let p of points) {
             for (let p of points) {
                 xmin = Math.min(p.x, xmin);
                 xmin = Math.min(p.x, xmin);
@@ -67,11 +67,11 @@
                 ymin = Math.min(p.y, ymin);
                 ymin = Math.min(p.y, ymin);
                 ymax = Math.max(p.y, ymax);
                 ymax = Math.max(p.y, ymax);
             }
             }
-            BoundingInfo2D.ConstructFromMinMaxToRef(xmin, xmax, ymin, ymax, b);
+            BoundingInfo2D.CreateFromMinMaxToRef(xmin, xmax, ymin, ymax, b);
         }
         }
 
 
 
 
-        public static ConstructFromMinMaxToRef(xmin: number, xmax: number, ymin: number, ymax: number, b: BoundingInfo2D) {
+        public static CreateFromMinMaxToRef(xmin: number, xmax: number, ymin: number, ymax: number, b: BoundingInfo2D) {
             b.center = new Vector2(xmin + (xmax - xmin) / 2, ymin + (ymax - ymin) / 2);
             b.center = new Vector2(xmin + (xmax - xmin) / 2, ymin + (ymax - ymin) / 2);
             b.extent = new Vector2(xmax - b.center.x, ymax - b.center.y);
             b.extent = new Vector2(xmax - b.center.x, ymax - b.center.y);
             b.radius = b.extent.length();
             b.radius = b.extent.length();
@@ -148,7 +148,7 @@
             for (let i = 0; i < 4; i++) {
             for (let i = 0; i < 4; i++) {
                 Vector2.TransformToRef(p[i], matrix, p[i]);
                 Vector2.TransformToRef(p[i], matrix, p[i]);
             }
             }
-            BoundingInfo2D.ConstructFromPointsToRef(p, result);
+            BoundingInfo2D.CreateFromPointsToRef(p, result);
         }
         }
 
 
         /**
         /**
@@ -162,7 +162,7 @@
             let ymax = Math.max(this.center.y + this.extent.y, other.center.y + other.extent.y);
             let ymax = Math.max(this.center.y + this.extent.y, other.center.y + other.extent.y);
             let xmin = Math.min(this.center.x - this.extent.x, other.center.x - other.extent.x);
             let xmin = Math.min(this.center.x - this.extent.x, other.center.x - other.extent.x);
             let ymin = Math.min(this.center.y - this.extent.y, other.center.y - other.extent.y);
             let ymin = Math.min(this.center.y - this.extent.y, other.center.y - other.extent.y);
-            BoundingInfo2D.ConstructFromMinMaxToRef(xmin, xmax, ymin, ymax, result);
+            BoundingInfo2D.CreateFromMinMaxToRef(xmin, xmax, ymin, ymax, result);
         }
         }
 
 
     }
     }

+ 1 - 1
src/Canvas2d/babylon.group2d.ts

@@ -128,7 +128,7 @@
                 size = new Size(0, 0);
                 size = new Size(0, 0);
             }
             }
 
 
-            BoundingInfo2D.ConstructFromSizeToRef(size, this._levelBoundingInfo);
+            BoundingInfo2D.CreateFromSizeToRef(size, this._levelBoundingInfo);
         }
         }
 
 
         // Method called only on renderable groups to prepare the rendering
         // Method called only on renderable groups to prepare the rendering

+ 1 - 1
src/Canvas2d/babylon.rectangle2d.ts

@@ -139,7 +139,7 @@
         }
         }
 
 
         protected updateLevelBoundingInfo() {
         protected updateLevelBoundingInfo() {
-            BoundingInfo2D.ConstructFromSizeToRef(this.size, this._levelBoundingInfo);
+            BoundingInfo2D.CreateFromSizeToRef(this.size, this._levelBoundingInfo);
         }
         }
 
 
         protected setupRectangle2D(owner: Canvas2D, parent: Prim2DBase, id: string, position: Vector2, size: Size, roundRadius = 0, fill?: IBrush2D, border?: IBrush2D, borderThickness: number = 1) {
         protected setupRectangle2D(owner: Canvas2D, parent: Prim2DBase, id: string, position: Vector2, size: Size, roundRadius = 0, fill?: IBrush2D, border?: IBrush2D, borderThickness: number = 1) {

+ 1 - 1
src/Canvas2d/babylon.sprite2d.ts

@@ -133,7 +133,7 @@
         }
         }
 
 
         protected updateLevelBoundingInfo() {
         protected updateLevelBoundingInfo() {
-            BoundingInfo2D.ConstructFromSizeToRef(this.spriteSize, this._levelBoundingInfo);
+            BoundingInfo2D.CreateFromSizeToRef(this.spriteSize, this._levelBoundingInfo);
         }
         }
 
 
         protected setupSprite2D(owner: Canvas2D, parent: Prim2DBase, id: string, position: Vector2, texture: Texture, spriteSize: Size, spriteLocation: Vector2, invertY: boolean) {
         protected setupSprite2D(owner: Canvas2D, parent: Prim2DBase, id: string, position: Vector2, texture: Texture, spriteSize: Size, spriteLocation: Vector2, invertY: boolean) {

+ 1 - 1
src/Canvas2d/babylon.text2d.ts

@@ -187,7 +187,7 @@
         }
         }
 
 
         protected updateLevelBoundingInfo() {
         protected updateLevelBoundingInfo() {
-            BoundingInfo2D.ConstructFromSizeToRef(this.actualAreaSize, this._levelBoundingInfo);
+            BoundingInfo2D.CreateFromSizeToRef(this.actualAreaSize, this._levelBoundingInfo);
         }
         }
 
 
         protected setupText2D(owner: Canvas2D, parent: Prim2DBase, id: string, position: Vector2, fontName: string, text: string, areaSize: Size, defaultFontColor: Color4, vAlign, hAlign, tabulationSize: number) {
         protected setupText2D(owner: Canvas2D, parent: Prim2DBase, id: string, position: Vector2, fontName: string, text: string, areaSize: Size, defaultFontColor: Color4, vAlign, hAlign, tabulationSize: number) {

+ 2 - 2
src/babylon.engine.ts

@@ -1015,7 +1015,7 @@
                 this._gl.bufferSubData(this._gl.ARRAY_BUFFER, 0, data);
                 this._gl.bufferSubData(this._gl.ARRAY_BUFFER, 0, data);
             }
             }
 
 
-            if (offsetLocations[0] instanceof InstancingAttributeInfo) {
+            if ((<any>offsetLocations[0]).index !== undefined) {
                 let stride = 0;
                 let stride = 0;
                 for (let i = 0; i < offsetLocations.length; i++) {
                 for (let i = 0; i < offsetLocations.length; i++) {
                     let ai = <InstancingAttributeInfo>offsetLocations[i];
                     let ai = <InstancingAttributeInfo>offsetLocations[i];
@@ -1039,7 +1039,7 @@
 
 
         public unBindInstancesBuffer(instancesBuffer: WebGLBuffer, offsetLocations: number[] | InstancingAttributeInfo[]): void {
         public unBindInstancesBuffer(instancesBuffer: WebGLBuffer, offsetLocations: number[] | InstancingAttributeInfo[]): void {
             this._gl.bindBuffer(this._gl.ARRAY_BUFFER, instancesBuffer);
             this._gl.bindBuffer(this._gl.ARRAY_BUFFER, instancesBuffer);
-            if (offsetLocations[0] instanceof InstancingAttributeInfo) {
+            if ((<any>offsetLocations[0]).index !== undefined) {
                 for (let i = 0; i < offsetLocations.length; i++) {
                 for (let i = 0; i < offsetLocations.length; i++) {
                     let ai = <InstancingAttributeInfo>offsetLocations[i];
                     let ai = <InstancingAttributeInfo>offsetLocations[i];
                     this._gl.disableVertexAttribArray(ai.index);
                     this._gl.disableVertexAttribArray(ai.index);