2
0
georges 25 жил өмнө
parent
commit
0fa8e3bd71

+ 8 - 3
panda/src/particlesystem/spriteParticleRenderer.cxx

@@ -226,13 +226,18 @@ render(vector< PT(PhysicsObject) >& po_vector, int ttl_particles) {
     // put the current color into the array
     // put the current color into the array
     Colorf c = _color;
     Colorf c = _color;
 
 
-    if (!(get_alpha_mode() == PR_ALPHA_NONE)) {
+	int alphamode=get_alpha_mode();
+    if (alphamode != PR_ALPHA_NONE) {
       float t = cur_particle->get_parameterized_age();
       float t = cur_particle->get_parameterized_age();
 
 
-      if (get_alpha_mode() == PR_ALPHA_OUT)
+      if (alphamode == PR_ALPHA_OUT)
         c[3] = 1.0f - t;
         c[3] = 1.0f - t;
-      else if (get_alpha_mode() == PR_ALPHA_IN)
+      else if (alphamode == PR_ALPHA_IN)
         c[3] = t;
         c[3] = t;
+	  else {
+		  assert(alphamode == PR_ALPHA_USER);
+   		  c[3] = get_user_alpha();
+	  }
     }
     }
 
 
     *cur_color++ = c;
     *cur_color++ = c;