Changeset 8812 in orxonox.OLD

Timestamp:

Jun 26, 2006, 6:02:02 PM (18 years ago)

Author:

patrick

Message:

spl ground walking beter

Location:

branches/single_player_map/src

Files:

• lib/collision_reaction/cr_physics_ground_walk.cc (modified) (5 diffs)
• world_entities/npcs/generic_npc.cc (modified) (1 diff)

branches/single_player_map/src/lib/collision_reaction/cr_physics_ground_walk.cc

@@ -1 +1 @@
 /*
    orxonox - the future of 3D-vertical-scrollers
- 
+
    Copyright (C) 2004 orx
- 
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
- 
+
    ### File Specific:
    main-programmer: Patrick Boenzli
@@ -66 +66 @@
   Vector height;
   AABB* box = collision->getEntityB()->getModelAABB();
-  
-  
-  
+
+
+
   if(box!=NULL)
     height = ( ce->getCollisionPosition() - collision->getEntityB()->getAbsCoor() )*(-1.0f) ;
@@ -90 +90 @@
       return;
     }
-    
-    
+
+
     if(ce->getGroundNormal().len() >= 1.4f) {
       downspeed++;
@@ -101 +101 @@
     if(height.y > box->halfLength[1] + 0.0f ) // Above ground
     {
-      if(height.y < box->halfLength[1] + 1.3f) // Snap in
+      if(height.y < box->halfLength[1] + 2.3f) // Snap in
       {
         downspeed = 0;
@@ -131 +131 @@
 
   */
+
 }
 

branches/single_player_map/src/world_entities/npcs/generic_npc.cc

@@ -160 +160 @@
     this->currentAnim->addKeyFrame(this->getAbsCoor(), this->getAbsDir(), 0.0f);
     this->currentAnim->addKeyFrame(this->destCoor, this->destDir, time);
+
+    this->setAnimation(RUN, MD2_ANIM_LOOP);
   }