Changeset 6624 in orxonox.OLD for trunk/src

Timestamp:

Jan 20, 2006, 12:54:48 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Some missing stuff

Location:

trunk/src

Files:

• defs/class_id.h (modified) (1 diff)
• lib/coord/p_node.cc (modified) (1 diff)
• lib/event/event_handler.cc (modified) (1 diff)
• world_entities/projectiles/test_bullet.h (modified) (1 diff)

trunk/src/defs/class_id.h

@@ -224 +224 @@
   CL_FONT                       =    0x00000802,
 
-  CL_PARTICLE_EMITTER           =    0x00201812,
+  CL_PARTICLE_EMITTER           =    0x00201852,
   CL_PARTICLE_SYSTEM            =    0x00202000,
-  CL_SPRITE_PARTICLES           =    0x00000813,
-
+  CL_SPRITE_PARTICLES           =    0x00000853,
+  CL_SPARK_PARTICLES            =    0x00000854,
+  CL_PNODE_PARTICLES            =    0x00000855,
+  CL_DOT_PARTICLES              =    0x00000856,
+  CL_MODEL_PARTICLES            =    0x00000857,
+//  CL_TEMPLATE_PARTICLES         =    0x00000857,
 
   CL_MATERIAL                   =    0x00000804,

trunk/src/lib/coord/p_node.cc

@@ -748 +748 @@
         {
           this->toStep += fabs(dt) * bias;
-          printf("%s::%s %f\n", this->getClassName(), this->getName(), this->toStep );
+          //printf("%s::%s %f\n", this->getClassName(), this->getName(), this->toStep );
           Quaternion rotQuat = Quaternion::quatSlerp(this->relDirection,*this->toDirection, toStep);
           if (this->relDirection.distance(rotQuat) >PNODE_ITERATION_DELTA)

trunk/src/lib/event/event_handler.cc

@@ -262 +262 @@
     SDL_WM_GrabInput(SDL_GRAB_OFF);
   else
-    SDL_WM_GrabInput(SDL_GRAB_ON);
+    ;//SDL_WM_GrabInput(SDL_GRAB_ON);
 }
 

trunk/src/world_entities/projectiles/test_bullet.h

@@ -32 +32 @@
     virtual void draw () const;
 
-
   private:
     static FastFactory*               fastFactory;