change _hidden to visible

playcanvas · Jun 8, 2016 · 69fb2fe · 69fb2fe
1 parent 4b5c0f6
commit 69fb2fe
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/framework/components/particle-system/component.js b/src/framework/components/particle-system/component.js
@@ -486,7 +486,7 @@ pc.extend(pc, function() {
 
                 if (!this.data.autoPlay) {
                     this.pause();
-                    this.emitter.meshInstance._hidden = true;
+                    this.emitter.meshInstance.visible = false;
                 }
             }
 
@@ -562,7 +562,7 @@ pc.extend(pc, function() {
         play: function() {
             this.data.paused = false;
             if (this.emitter) {
-                this.emitter.meshInstance._hidden = false;
+                this.emitter.meshInstance.visible = true;
                 this.emitter.loop = this.data.loop;
                 this.emitter.resetTime();
             }

diff --git a/src/framework/components/particle-system/system.js b/src/framework/components/particle-system/system.js
@@ -165,7 +165,7 @@ pc.extend(pc, function() {
 
                     if (data.enabled && entity.enabled) {
                         var emitter = data.model.emitter;
-                        if (emitter.meshInstance._hidden) continue;
+                        if (!emitter.meshInstance.visible) continue;
 
                         if (!data.paused) {
 

diff --git a/src/scene/forward-renderer.js b/src/scene/forward-renderer.js
@@ -966,7 +966,7 @@ pc.extend(pc, function () {
                 visible = true;
                 meshPos = null;
                 if (!drawCall.command) {
-                    if (!drawCall.visible) continue; // use hidden property to quickly hide/show meshInstances
+                    if (!drawCall.visible) continue; // use visible property to quickly hide/show meshInstances
                     meshInstance = drawCall;
 
                     // Only alpha sort and cull mesh instances in the main world

diff --git a/src/scene/particle-emitter.js b/src/scene/particle-emitter.js
@@ -1518,7 +1518,7 @@ pc.extend(pc, function() {
             if (!this.loop) {
                 if (Date.now() > this.endTime) {
                     if (this.onFinished) this.onFinished();
-                    this.meshInstance._hidden = true;
+                    this.meshInstance.visible = false;
                 }
             }