georges 25 gadi atpakaļ
vecāks
revīzija
0083b3ba5b
1 mainītis faili ar 8 papildinājumiem un 7 dzēšanām
  1. 8 7
      panda/src/testbed/test_particles.cxx

+ 8 - 7
panda/src/testbed/test_particles.cxx

@@ -107,9 +107,10 @@
 #endif
 
 // particle renderer params
-//#define PARTICLE_RENDERER_ALPHA_MODE  PR_ALPHA_NONE
-//#define PARTICLE_RENDERER_ALPHA_MODE  PR_ALPHA_IN
-//#define PARTICLE_RENDERER_ALPHA_MODE  PR_ALPHA_OUT
+#define SPRITE_PARTICLE_RENDERER_ALPHA_DISABLE      false
+#define PARTICLE_RENDERER_ALPHA_MODE  BaseParticleRenderer::PR_ALPHA_NONE
+//#define PARTICLE_RENDERER_ALPHA_MODE  BaseParticleRenderer::PR_ALPHA_IN
+//#define PARTICLE_RENDERER_ALPHA_MODE  BaseParticleRenderer::PR_ALPHA_OUT
 //#define PARTICLE_RENDERER_ALPHA_MODE  BaseParticleRenderer::PR_ALPHA_USER
 //#define PARTICLE_RENDERER_USER_ALPHA  1.0
 
@@ -118,9 +119,10 @@
   #define POINT_PARTICLE_RENDERER_POINT_SIZE    1.0f
 //  #define POINT_PARTICLE_RENDERER_STARTCOLOR    Colorf(1.0f, 0.0f, 0.0f, 1.0f)
 //  #define POINT_PARTICLE_RENDERER_ENDCOLOR      Colorf(1.0f, 1.0f, 0.0f, 1.0f)
-//  #define POINT_PARTICLE_RENDERER_BLEND_TYPE    PP_BLEND_LIFE
-//  #define POINT_PARTICLE_RENDERER_BLEND_METHOD  PP_BLEND_LINEAR
-//  #define POINT_PARTICLE_RENDERER_BLEND_METHOD  PP_BLEND_CUBIC
+//  #define POINT_PARTICLE_RENDERER_BLEND_TYPE    BaseParticleRenderer::PP_BLEND_LIFE
+//  #define POINT_PARTICLE_RENDERER_BLEND_METHOD  BaseParticleRenderer::PP_BLEND_LINEAR
+//  #define POINT_PARTICLE_RENDERER_BLEND_METHOD  BaseParticleRenderer::PP_BLEND_CUBIC
+
 #elif defined LINE_PARTICLE_RENDERER
   #define LINE_PARTICLE_RENDERER_HEAD_COLOR   Colorf(1.0f, 1.0f, 1.0f, 1.0f)
   #define LINE_PARTICLE_RENDERER_TAIL_COLOR   Colorf(1.0f, 1.0f, 1.0f, 1.0f)
@@ -367,7 +369,6 @@ event_add_particles(CPT_Event) {
     #ifdef SPRITE_PARTICLE_RENDERER_BLEND_METHOD
       pr->set_alpha_blend_method(SPRITE_PARTICLE_RENDERER_BLEND_METHOD);
     #endif
-    #define SPRITE_PARTICLE_RENDERER_ALPHA_DISABLE      false
     #ifdef SPRITE_PARTICLE_RENDERER_ALPHA_DISABLE
       pr->set_alpha_disable(SPRITE_PARTICLE_RENDERER_ALPHA_DISABLE);
     #endif