Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8927 in orxonox.OLD for branches/single_player_map


Ignore:
Timestamp:
Jun 29, 2006, 11:39:12 PM (19 years ago)
Author:
patrick
Message:

collision reactin output different

Location:
branches/single_player_map/src
Files:
2 added
3 edited
2 moved

Legend:

Unmodified
Added
Removed

  • branches/single_player_map/src/defs/class_id.h

    r8894 r8927  
    188188  CL_SKYDOME                    =    0x00000313,
    189189  CL_DOOR                       =    0x00000314,
     190  CL_REPAIR_STATION             =    0x00000315,
     191  CL_CRANE                      =    0x00000316,
     192  CL_BRAKING_WALL               =    0X00000317,
    190193
    191194  // Playables

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

    r8925 r8927  
    8787    Vector normal = ce->getGroundNormal();
    8888
    89     // collision position maths
     89    // calculate the collision position
    9090    Vector collPos =  collision->getEntityB()->getAbsCoor()  + box->center - ce->getCollisionPosition();
    9191
    … …  
    9898        front = collPos.x - box->halfLength[0];
    9999
    100         PRINTF(0)("front: %f\n", front);
    101         PRINTF(0)("in wall %i\n", ce->isInWall());
     100//         PRINTF(0)("front: %f\n", front);
     101//         PRINTF(0)("in wall %i\n", ce->isInWall());
    102102
    103103        // object is beneath the plane (ground)
    … …  
    119119        height = collPos.y - box->halfLength[1];
    120120
    121         PRINTF(0)("height: %f\n", height);
    122         PRINTF(0)("in wall %i\n", ce->isInWall());
     121//         PRINTF(0)("height: %f\n", height);
     122//         PRINTF(0)("in wall %i\n", ce->isInWall());
    123123
    124124        // object is beneath the plane (ground)
    … …  
    140140        side = collPos.z - box->halfLength[2];
    141141
    142         PRINTF(0)("side: %f\n", side);
    143         PRINTF(0)("in wall %i\n", ce->isInWall());
     142//         PRINTF(0)("side: %f\n", side);
     143//         PRINTF(0)("in wall %i\n", ce->isInWall());
    144144
    145145        // object is beneath the plane (ground)
    … …  
    155155        break;
    156156    }
     157    PRINTF(0)("collision distanzes: x: %f, y: %f, z: %f\n", front, height, side);
    157158  }
    158159

  • branches/single_player_map/src/world_entities/WorldEntities.am

    r8894 r8927  
    55                world_entities/npcs/ground_turret.cc \
    66                world_entities/npcs/generic_npc.cc \
     7                world_entities/npcs/door.cc \
    78                \
    89                world_entities/environment.cc \
    … …  
    1617                world_entities/character_attributes.cc \
    1718                world_entities/test_entity.cc \
    18                 world_entities/door.cc \
    1919                world_entities/planet.cc \
    2020                world_entities/bsp_entity.cc \
    … …  
    6666                npcs/npc_test1.h \
    6767                npcs/ground_turret.h \
     68                npcs/door.cc \
     69                \
    6870                environment.h \
    6971                skysphere.h \
    … …  
    7678                character_attributes.h \
    7779                test_entity.h \
    78                 door.h \
    7980                planet.h \
    8081                bsp_entity.h \
Note: See TracChangeset for help on using the changeset viewer.