David Catuhe 10 år sedan
förälder
incheckning
932165e152

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
Babylon/Debug/babylon.debugLayer.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
Babylon/Debug/babylon.debugLayer.js.map


+ 1 - 1
Babylon/Debug/babylon.debugLayer.ts

@@ -714,7 +714,7 @@
                 + "Total materials: " + scene.materials.length + "<br>"
                 + "Total textures: " + scene.textures.length + "<br>"
                 + "Active meshes: " + scene.getActiveMeshes().length + "<br>"
-                + "Active vertices: " + scene.getActiveVertices() + "<br>"
+                + "Active indices: " + scene.getActiveIndices() + "<br>"
                 + "Active bones: " + scene.getActiveBones() + "<br>"
                 + "Active particles: " + scene.getActiveParticles() + "<br>"
                 + "<b>Draw calls: " + engine.drawCalls + "</b><br><br>"

+ 1 - 1
Babylon/Materials/Textures/babylon.renderTargetTexture.js

@@ -110,7 +110,7 @@ var BABYLON;
                         mesh._activate(scene.getRenderId());
                         for (var subIndex = 0; subIndex < mesh.subMeshes.length; subIndex++) {
                             var subMesh = mesh.subMeshes[subIndex];
-                            scene._activeVertices += subMesh.indexCount;
+                            scene._activeIndices += subMesh.indexCount;
                             this._renderingManager.dispatch(subMesh);
                         }
                     }

+ 1 - 1
Babylon/Materials/Textures/babylon.renderTargetTexture.ts

@@ -131,7 +131,7 @@
 
                         for (var subIndex = 0; subIndex < mesh.subMeshes.length; subIndex++) {
                             var subMesh = mesh.subMeshes[subIndex];
-                            scene._activeVertices += subMesh.indexCount;
+                            scene._activeIndices += subMesh.indexCount;
                             this._renderingManager.dispatch(subMesh);
                         }
                     }

+ 5 - 5
Babylon/babylon.scene.js

@@ -104,7 +104,7 @@ var BABYLON;
             this._audioEnabled = true;
             this._headphone = false;
             this._totalVertices = 0;
-            this._activeVertices = 0;
+            this._activeIndices = 0;
             this._activeParticles = 0;
             this._lastFrameDuration = 0;
             this._evaluateActiveMeshesDuration = 0;
@@ -228,8 +228,8 @@ var BABYLON;
         Scene.prototype.getTotalVertices = function () {
             return this._totalVertices;
         };
-        Scene.prototype.getActiveVertices = function () {
-            return this._activeVertices;
+        Scene.prototype.getActiveIndices = function () {
+            return this._activeIndices;
         };
         Scene.prototype.getActiveParticles = function () {
             return this._activeParticles;
@@ -905,7 +905,7 @@ var BABYLON;
                         }
                     }
                     // Dispatch
-                    this._activeVertices += subMesh.indexCount;
+                    this._activeIndices += subMesh.indexCount;
                     this._renderingManager.dispatch(subMesh);
                 }
             }
@@ -1158,7 +1158,7 @@ var BABYLON;
             this._renderTargetsDuration = 0;
             this._evaluateActiveMeshesDuration = 0;
             this._totalVertices = 0;
-            this._activeVertices = 0;
+            this._activeIndices = 0;
             this._activeBones = 0;
             this.getEngine().resetDrawCalls();
             this._meshesForIntersections.reset();

+ 5 - 5
Babylon/babylon.scene.ts

@@ -207,7 +207,7 @@
         // Private
         private _engine: Engine;
         private _totalVertices = 0;
-        public _activeVertices = 0;
+        public _activeIndices = 0;
         public _activeParticles = 0;
         private _lastFrameDuration = 0;
         private _evaluateActiveMeshesDuration = 0;
@@ -341,8 +341,8 @@
             return this._totalVertices;
         }
 
-        public getActiveVertices(): number {
-            return this._activeVertices;
+        public getActiveIndices(): number {
+            return this._activeIndices;
         }
 
         public getActiveParticles(): number {
@@ -1165,7 +1165,7 @@
                     }
 
                     // Dispatch
-                    this._activeVertices += subMesh.indexCount;
+                    this._activeIndices += subMesh.indexCount;
                     this._renderingManager.dispatch(subMesh);
                 }
             }
@@ -1479,7 +1479,7 @@
             this._renderTargetsDuration = 0;
             this._evaluateActiveMeshesDuration = 0;
             this._totalVertices = 0;
-            this._activeVertices = 0;
+            this._activeIndices = 0;
             this._activeBones = 0;
             this.getEngine().resetDrawCalls();
             this._meshesForIntersections.reset();

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 7 - 9
babylon.2.1-alpha.debug.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 4 - 4
babylon.2.1-alpha.js