修复无graphics报错问题

kirikayakazuto · May 28, 2021 · 44e2ca0 · 44e2ca0
1 parent 79d684c
commit 44e2ca0
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 2 deletions.
diff --git a/source/bin/framework.js b/source/bin/framework.js
@@ -948,6 +948,8 @@ var es;
             this.components.update();
         };
         Entity.prototype.debugRender = function (batcher) {
+            if (!batcher)
+                return;
             this.components.debugRender(batcher);
         };
         /**
@@ -4196,6 +4198,8 @@ var es;
             }
         };
         ComponentList.prototype.debugRender = function (batcher) {
+            if (!batcher)
+                return;
             for (var i = 0; i < this._components.length; i++) {
                 if (this._components[i].enabled) {
                     this._components[i].debugRender(batcher);
@@ -5527,15 +5531,23 @@ var es;
         Renderer.prototype.onAddedToScene = function (scene) { };
         Renderer.prototype.unload = function () { };
         Renderer.prototype.beginRender = function (cam) {
+            if (!es.Graphics.instance)
+                return;
             es.Graphics.instance.batcher.begin(cam);
         };
         Renderer.prototype.endRender = function () {
+            if (!es.Graphics.instance)
+                return;
             es.Graphics.instance.batcher.end();
         };
         Renderer.prototype.renderAfterStateCheck = function (renderable, cam) {
+            if (!es.Graphics.instance)
+                return;
             renderable.render(es.Graphics.instance.batcher, cam);
         };
         Renderer.prototype.debugRender = function (scene) {
+            if (!es.Graphics.instance)
+                return;
             es.Physics.debugDraw(2);
             for (var i = 0; i < scene.entities.count; i++) {
                 var entity = scene.entities.buffer[i];

diff --git a/source/bin/framework.min.js b/source/bin/framework.min.js
diff --git a/source/src/ECS/Entity.ts b/source/src/ECS/Entity.ts
@@ -377,6 +377,7 @@ module es {
         }
 
         public debugRender(batcher: IBatcher) {
+            if (!batcher) return;
             this.components.debugRender(batcher);
         }
 

diff --git a/source/src/ECS/Utils/ComponentList.ts b/source/src/ECS/Utils/ComponentList.ts
@@ -327,6 +327,7 @@ module es {
         }
 
         public debugRender(batcher: IBatcher) {
+            if (!batcher) return;
             for (let i = 0; i < this._components.length; i ++) {
                 if (this._components[i].enabled) {
                     this._components[i].debugRender(batcher);

diff --git a/source/src/Graphics/Renderers/Renderer.ts b/source/src/Graphics/Renderers/Renderer.ts
@@ -14,22 +14,34 @@ module es {
         public unload() { }
 
         protected beginRender(cam: ICamera) {
+            if (!Graphics.instance)
+                return;
+
             Graphics.instance.batcher.begin(cam);
         }
 
         protected endRender() {
+            if (!Graphics.instance)
+                return;
+
             Graphics.instance.batcher.end();
         }
 
         public abstract render(scene: Scene): void;
 
         protected renderAfterStateCheck(renderable: IRenderable, cam: ICamera) {
+            if (!Graphics.instance)
+                return;
+
             renderable.render(Graphics.instance.batcher, cam);
         }
 
         protected debugRender(scene: Scene) {
-            es.Physics.debugDraw(2);
+            if (!Graphics.instance)
+                return;
 
+            es.Physics.debugDraw(2);
+
             for (let i = 0; i < scene.entities.count; i ++) {
                 let entity = scene.entities.buffer[i];
                 if (entity.enabled) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -377,6 +377,7 @@ module es { @@
             }
             public debugRender(batcher: IBatcher) {
+                if (!batcher) return;
                 this.components.debugRender(batcher);
             }
@@ Expand Down @@