*** empty log message ***

panda/src/particlesystem/zSpinParticle.cxx

@@ -91,11 +91,11 @@ die(void) {
 }
 
 ////////////////////////////////////////////////////////////////////
-//    Function : get_angle
+//    Function : get_theta
 //      Access : public, virtual
 // Description :
 ////////////////////////////////////////////////////////////////////
 float ZSpinParticle::
-get_angle(void) const {
+get_theta(void) const {
   return _cur_angle;
 }

panda/src/testbed/test_particles.cxx

@@ -54,8 +54,8 @@
 
 // particle system params
 #define PARTICLE_SYSTEM_POOL_SIZE 1024
-#define PARTICLE_SYSTEM_BIRTH_RATE  0.02f
-//#define PARTICLE_SYSTEM_BIRTH_RATE  0.5f
+//#define PARTICLE_SYSTEM_BIRTH_RATE  0.02f
+#define PARTICLE_SYSTEM_BIRTH_RATE  0.5f
 #define PARTICLE_SYSTEM_LITTER_SIZE 10
 #define PARTICLE_SYSTEM_LITTER_SPREAD 0
 
@@ -66,8 +66,8 @@
 /////////////////////////////////////////////////
 
 // particle factory selection
-#define POINT_PARTICLES
-//#define ZSPIN_PARTICLES
+//#define POINT_PARTICLES
+#define ZSPIN_PARTICLES
 //#define ORIENTED_PARTICLES
 
 // particle renderer selection
@@ -78,8 +78,8 @@
 //#define GEOM_PARTICLE_RENDERER
 
 // particle emitter selection
-//#define BOX_EMITTER
-#define DISC_EMITTER
+#define BOX_EMITTER
+//#define DISC_EMITTER
 //#define LINE_EMITTER
 //#define POINT_EMITTER
 //#define RECTANGLE_EMITTER
@@ -107,8 +107,10 @@
 #endif
 
 // particle renderer params
-//#define PARTICLE_RENDERER_ALPHA_MODE  PR_NO_ALPHA
-#define PARTICLE_RENDERER_ALPHA_MODE  PR_ALPHA_IN
+//#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 PARTICLE_RENDERER_ALPHA_MODE  PR_ALPHA_USER
 #define PARTICLE_RENDERER_USER_ALPHA  1.0
 
 #ifdef GEOM_PARTICLE_RENDERER
@@ -134,12 +136,12 @@
   #define SPRITE_PARTICLE_RENDERER_COLOR              Colorf(1.0f, 1.0f, 1.0f, 1.0f)
 //  #define SPRITE_PARTICLE_RENDERER_X_SCALE_FLAG       true
 //  #define SPRITE_PARTICLE_RENDERER_Y_SCALE_FLAG       true
-//  #define SPRITE_PARTICLE_RENDERER_ANIM_ANGLE_FLAG    true
+  #define SPRITE_PARTICLE_RENDERER_ANIM_ANGLE_FLAG    true
 //  #define SPRITE_PARTICLE_RENDERER_INITIAL_X_SCALE    0.1
 //  #define SPRITE_PARTICLE_RENDERER_FINAL_X_SCALE      0.0
 //  #define SPRITE_PARTICLE_RENDERER_INITIAL_Y_SCALE    0.0
 //  #define SPRITE_PARTICLE_RENDERER_FINAL_Y_SCALE      0.5
-//  #define SPRITE_PARTICLE_RENDERER_NONANIMATED_THETA  45.0f
+  #define SPRITE_PARTICLE_RENDERER_NONANIMATED_THETA  45.0f
   #define SPRITE_PARTICLE_RENDERER_BLEND_METHOD       PP_BLEND_LINEAR
 //  #define SPRITE_PARTICLE_RENDERER_BLEND_METHOD       PP_BLEND_CUBIC
 //  #define SPRITE_PARTICLE_RENDERER_ALPHA_DISABLE      false
@@ -147,9 +149,9 @@
 
 // particle emitter params
 
-#define EMISSION_TYPE_EXPLICIT
+//#define EMISSION_TYPE_EXPLICIT
 //#define EMISSION_TYPE_RADIATE
-//#define EMISSION_TYPE_CUSTOM
+#define EMISSION_TYPE_CUSTOM
 
 //#define EMITTER_AMPLITUDE 10.0
 #define EMITTER_AMPLITUDE 1.0