Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9377 in orxonox.OLD for branches


Ignore:
Timestamp:
Jul 21, 2006, 11:43:38 AM (18 years ago)
Author:
patrick
Message:

more string switching for outcommented stuff

Location:
branches/proxy/src
Files:
20 edited

Legend:

Unmodified
Added
Removed
  • branches/proxy/src/lib/collision_detection/cd_engine.cc

    r9371 r9377  
    114114      for(entityIterator = list1.begin(); entityIterator != list1.end(); entityIterator++)
    115115      {
    116 //         PRINTF(0)("Checking: %s a %s\n", (*entityIterator)->getName(), (*entityIterator)->getClassName());
     116//         PRINTF(0)("Checking: %s a %s\n", (*entityIterator)->getName(), (*entityIterator)->getClassCName());
    117117        (dynamic_cast<BspEntity*>(*bspIterator)->getBspManager())->checkCollision(*entityIterator);
    118118      }
  • branches/proxy/src/lib/collision_detection/obb_tree_node.cc

    r9371 r9377  
    482482
    483483//   if( distance < distanceMax)
    484 //     PRINTF(0)(" %s (%s: group %i) vs %s (%s: group %i): distanceMax: %f, distance: %f\n", nodeA->getClassName(), nodeA->getName(), nodeA->getOMListNumber(), nodeB->getClassName(),  nodeB->getName(), nodeB->getOMListNumber(), distanceMax, distance);
     484//     PRINTF(0)(" %s (%s: group %i) vs %s (%s: group %i): distanceMax: %f, distance: %f\n", nodeA->getClassCName(), nodeA->getName(), nodeA->getOMListNumber(), nodeB->getClassCName(),  nodeB->getName(), nodeB->getOMListNumber(), distanceMax, distance);
    485485
    486486
  • branches/proxy/src/lib/collision_reaction/collision_handle.cc

    r9371 r9377  
    232232//     if(collisionEvent->getEntityB()->isA(CL_AIMING_SYSTEM) || collisionEvent->getEntityA()->isA(CL_AIMING_SYSTEM))
    233233//     {
    234 //        PRINTF(0)("I am: %s colliding with: %s\n", owner->getClassName(), collisionEvent->getEntityB()->getClassName(), *it);
     234//        PRINTF(0)("I am: %s colliding with: %s\n", owner->getClassCName(), collisionEvent->getEntityB()->getClassCName(), *it);
    235235//        if( collisionEvent->getEntityA() == this->owner) {
    236 //          PRINTF(0)("I am owner -> I am: %s colliding with: %s is a %i filter?\n", owner->getClassName(),
    237 //          collisionEvent->getEntityB()->getClassName(), *it);
     236//          PRINTF(0)("I am owner -> I am: %s colliding with: %s is a %i filter?\n", owner->getClassCName(),
     237//          collisionEvent->getEntityB()->getClassCName(), *it);
    238238//          if( collisionEvent->getEntityB()->isA((ClassID)(*it))) {
    239 //            PRINTF(0)("I am owner -> I am: %s colliding with: %s is a %i filter ok\n", owner->getClassName(),
    240 //            collisionEvent->getEntityB()->getClassName(), *it);
     239//            PRINTF(0)("I am owner -> I am: %s colliding with: %s is a %i filter ok\n", owner->getClassCName(),
     240//            collisionEvent->getEntityB()->getClassCName(), *it);
    241241//             }
    242242//        }
    243243//        else {
    244 //          PRINTF(0)("I am not owner -> I am: %s colliding with: %s is a %i filter?\n", owner->getClassName(),
    245 //          collisionEvent->getEntityB()->getClassName(), *it);
     244//          PRINTF(0)("I am not owner -> I am: %s colliding with: %s is a %i filter?\n", owner->getClassCName(),
     245//          collisionEvent->getEntityB()->getClassCName(), *it);
    246246//          if( collisionEvent->getEntityA()->isA((ClassID)(*it))) {
    247 //            PRINTF(0)("I'm not owner -> I am: %s colliding with: %s is a %i filter ok\n", owner->getClassName(),
    248 //            collisionEvent->getEntityA()->getClassName(), *it);
     247//            PRINTF(0)("I'm not owner -> I am: %s colliding with: %s is a %i filter ok\n", owner->getClassCName(),
     248//            collisionEvent->getEntityA()->getClassCName(), *it);
    249249//             }
    250250//        }
     
    282282//     if(collision->getEntityB()->isA(CL_AIMING_SYSTEM) || collision->getEntityA()->isA(CL_AIMING_SYSTEM))
    283283//     {
    284 //       PRINTF(0)("Shared!!! I am: %s colliding with: %s\n", owner->getClassName(), collision->getEntityB()->getClassName(), *it);
     284//       PRINTF(0)("Shared!!! I am: %s colliding with: %s\n", owner->getClassCName(), collision->getEntityB()->getClassCName(), *it);
    285285//       if( collision->getEntityA() == this->owner) {
    286 //         PRINTF(0)("I am owner -> I am: %s colliding with: %s is a %i filter?\n", owner->getClassName(),
    287 //         collision->getEntityB()->getClassName(), *it);
     286//         PRINTF(0)("I am owner -> I am: %s colliding with: %s is a %i filter?\n", owner->getClassCName(),
     287//         collision->getEntityB()->getClassCName(), *it);
    288288//         if( collision->getEntityB()->isA((ClassID)(*it))) {
    289 //           PRINTF(0)("I am owner -> I am: %s colliding with: %s is a %i filter ok\n", owner->getClassName(),
    290 //           collision->getEntityB()->getClassName(), *it);
     289//           PRINTF(0)("I am owner -> I am: %s colliding with: %s is a %i filter ok\n", owner->getClassCName(),
     290//           collision->getEntityB()->getClassCName(), *it);
    291291//         }
    292292//       }
    293293//       else {
    294 //         PRINTF(0)("I'm not owner -> I am: %s colliding with: %s is a %i filter?\n", owner->getClassName(),
    295 //         collision->getEntityB()->getClassName(), *it);
     294//         PRINTF(0)("I'm not owner -> I am: %s colliding with: %s is a %i filter?\n", owner->getClassCName(),
     295//         collision->getEntityB()->getClassCName(), *it);
    296296//         if( collision->getEntityA()->isA((ClassID)(*it))) {
    297 //           PRINTF(0)("I'm not owner -> I am: %s colliding with: %s is a %i filter ok\n", owner->getClassName(),
    298 //           collision->getEntityA()->getClassName(), *it);
     297//           PRINTF(0)("I'm not owner -> I am: %s colliding with: %s is a %i filter ok\n", owner->getClassCName(),
     298//           collision->getEntityA()->getClassCName(), *it);
    299299//         }
    300300//       }
  • branches/proxy/src/lib/coord/p_node.cc

    r9371 r9377  
    793793        if (unlikely (shiftLen >= 1.0))
    794794          shiftLen = 1.0;
    795         //printf("%s::%s %f\n", this->getClassName(), this->getName(), this->toStep );
     795        //printf("%s::%s %f\n", this->getClassCName(), this->getName(), this->toStep );
    796796        Quaternion rotQuat = Quaternion::quatSlerp(this->relDirection,*this->toDirection, shiftLen);
    797797        if (this->relDirection.distance(rotQuat) > PNODE_ITERATION_DELTA)
  • branches/proxy/src/lib/graphics/effects/atmospheric_engine.cc

    r9357 r9377  
    116116        std::list<BaseObject*>::const_iterator it;
    117117        for (it = weatherEffects->begin(); it != weatherEffects->end(); it++) {
    118             /*      printf("%s::%s \n", (*it)->getClassName(), (*it)->getName());*/
     118            /*      printf("%s::%s \n", (*it)->getClassCName(), (*it)->getName());*/
    119119            dynamic_cast<WeatherEffect*>(*it)->tick(dt);
    120120        }
  • branches/proxy/src/lib/graphics/render2D/element_2d.cc

    r9371 r9377  
    104104      deleteNode = tmp;
    105105      tmp++;
    106       //      printf("TEST::%s(%s) %s\n", (*deleteNode)->getName(), (*deleteNode)->getClassName(), this->getName());
     106      //      printf("TEST::%s(%s) %s\n", (*deleteNode)->getName(), (*deleteNode)->getClassCName(), this->getName());
    107107      if ((this->parentMode & E2D_PROHIBIT_CHILD_DELETE) ||
    108108          ((*deleteNode)->parentMode & E2D_PROHIBIT_DELETE_WITH_PARENT))
     
    937937                 projectPos+1,
    938938                 projectPos+2);
    939       //       printf("%s::%s  == %f %f %f :: %f %f\n", this->getClassName(), this->getName(),
     939      //       printf("%s::%s  == %f %f %f :: %f %f\n", this->getClassCName(), this->getName(),
    940940      //              this->bindNode->getAbsCoor().x,
    941941      //              this->bindNode->getAbsCoor().y,
  • branches/proxy/src/lib/network/synchronizeable.cc

    r9375 r9377  
    326326      n = (*it)->readFromBuf( stateTo->data + i, stateTo->dataLength - i );
    327327      i += n;
    328       //NETPRINTF(0)("%s::setvar %s %d\n", getClassName(), (*it)->getName().c_str(), n);
    329       PRINTF(0)("%s::setvar %s %d\n", getClassName().c_str(), (*it)->getName().c_str(), n);
     328      //NETPRINTF(0)("%s::setvar %s %d\n", getClassCName(), (*it)->getName().c_str(), n);
     329      PRINTF(0)("%s::setvar %s %d\n", getClassCName(), (*it)->getName().c_str(), n);
    330330      //(*it)->debug();
    331331      if ( (*it)->getHasChanged() )
     
    338338//      PRINTF(0)("DONT SET VAR BECAUSE OF PERMISSION: %s %d %d %d %d %d %d\n", (*it)->getName().c_str(), (*it)->checkPermission( PERMISSION_MASTER_SERVER ), (*it)->checkPermission( PERMISSION_OWNER ), (*it)->checkPermission( PERMISSION_ALL ), networkStream->isUserServer( userId ), this->owner, userId );
    339339      n = (*it)->getSizeFromBuf( stateTo->data + i, stateTo->dataLength - i );
    340       //NETPRINTF(0)("%s::setvar %s %d\n", getClassName(), (*it)->getName().c_str(), n);
     340      //NETPRINTF(0)("%s::setvar %s %d\n", getClassCName(), (*it)->getName().c_str(), n);
    341341      //(*it)->debug();
    342342      i += n;
  • branches/proxy/src/lib/network/synchronizeable_var/synchronizeable_ip.cc

    r9365 r9377  
    8989  *this->vPtrOut = IP(host, port);
    9090
    91   printf(" %s old: %i, %i -- new: %i, %i\n", name.c_str(), oldVal.host(), oldVal.port(), this->vPtrOut->host(), this->vPtrOut->port());
    9291  this->setHasChanged( *this->vPtrOut != oldVal);
    9392
  • branches/proxy/src/lib/network/tcp_socket.h

    r9347 r9377  
    1616#define _INCOMING_BUFFER_SIZE 2024000
    1717#define _OUTGOING_BUFFER_SIZE 2024000
    18 #define _LOCAL_BUFFER_SIZE 1024
     18#define _LOCAL_BUFFER_SIZE 2048
    1919//sleep if incoming buffer is full
    2020#define _MSECONDS_SLEEP_FULL_BUFFER 10
  • branches/proxy/src/lib/physics/physics_interface.cc

    r9357 r9377  
    6868    {
    6969    // todo: find out if children are PhysicsInterface in an efficient way
    70     if (strcmp( pn->getClassName(), "PhysicsInterface")) {
     70    if (strcmp( pn->getClassCName(), "PhysicsInterface")) {
    7171    massSum += ((PhysicsInterface*)pn)->getTotalMass();
    7272    }
     
    7777    if (massSum != this->massChildren ) {
    7878    this->massChildren = massSum;
    79     if (strcmp( massCalcPNode->parent->getClassName(), "PhysicsInterface"))
     79    if (strcmp( massCalcPNode->parent->getClassCName(), "PhysicsInterface"))
    8080    ((PhysicsInterface*)massCalcPNode->parent)->recalcMass();
    8181    } else {
  • branches/proxy/src/lib/util/loading/load_param.cc

    r9371 r9377  
    164164{
    165165    // locating the class
    166     this->classDesc = LoadClassDescription::addClass(object->getClassName());
     166    this->classDesc = LoadClassDescription::addClass(object->getClassCName());
    167167
    168168    if ((this->paramDesc = this->classDesc->addParam(paramName)) != NULL)
  • branches/proxy/src/story_entities/game_world_data.cc

    r9371 r9377  
    289289      //    ClassList::debug( 3, CL_PARENT_NODE);
    290290      //    PNode::getNullParent()->debugNode(0);
    291       //    printf("%s::%s\n", nodeList->front()->getClassName(), nodeList->front()->getName());
     291      //    printf("%s::%s\n", nodeList->front()->getClassCName(), nodeList->front()->getName());
    292292      delete nodeList->front();
    293293    }
  • branches/proxy/src/util/fast_factory.cc

    r9371 r9377  
    188188/*  if (this->storedDeadObjects + this->storedLivingObjects >= count)
    189189  {
    190   PRINTF(3)("not creating new Objects for class %s, because the requested count already exists\n", this->getClassName());
     190  PRINTF(3)("not creating new Objects for class %s, because the requested count already exists\n", this->getClassCName());
    191191}*/
    192192  for (unsigned int i = this->storedDeadObjects; i < count; i++)
  • branches/proxy/src/util/hud.cc

    r9235 r9377  
    155155      if (weapon != NULL)
    156156      {
    157         //PRINTF(0)("WEAPON %s::%s in Slots\n", weapon->getClassName(), weapon->getName());
     157        //PRINTF(0)("WEAPON %s::%s in Slots\n", weapon->getClassCName(), weapon->getName());
    158158        weapon->getEnergyWidget()->show();
    159159        weapon->getEnergyWidget()->setBackgroundColor(Color(.8,.2,.11, 0.1));
     
    215215    (*weaponWidget)->setWidgetSize(.02*this->resX, .1 *this->resY);
    216216    (*weaponWidget)->show();
    217     //printf("update thing %s::%s\n", (*weaponWidget)->getClassName(), (*weaponWidget)->getName());
     217    //printf("update thing %s::%s\n", (*weaponWidget)->getClassCName(), (*weaponWidget)->getName());
    218218  }
    219219}
  • branches/proxy/src/world_entities/creatures/fps_player.cc

    r9371 r9377  
    276276//     if( target != NULL)
    277277//     {
    278 //       PRINTF(0)("hit hit hit, got: %s\n", target->getClassName());
     278//       PRINTF(0)("hit hit hit, got: %s\n", target->getClassCName());
    279279//     }
    280280//     else
  • branches/proxy/src/world_entities/power_ups/laser_power_up.cc

    r9357 r9377  
    7878void LaserPowerUp::collidesWith(WorldEntity* entity, const Vector& location)
    7979{
    80  // PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassName(), entity->getClassName(), location.x, location.y, location.z);
     80 // PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassCName(), entity->getClassCName(), location.x, location.y, location.z);
    8181 if (entity->isA(CL_PLAYABLE))
    8282  this->toList(OM_DEAD);
  • branches/proxy/src/world_entities/power_ups/turret_power_up.cc

    r9357 r9377  
    7474void TurretPowerUp::collidesWith(WorldEntity* entity, const Vector& location)
    7575{
    76  // PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassName(), entity->getClassName(), location.x, location.y, location.z);
     76 // PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassCName(), entity->getClassCName(), location.x, location.y, location.z);
    7777 if (entity->isA(CL_PLAYABLE))
    7878   this->toList(OM_DEAD);
  • branches/proxy/src/world_entities/weapons/aiming_system.cc

    r9371 r9377  
    115115  if( this->owner != killer)
    116116  {
    117     //PRINTF(0)("real hit: %s\n", killer->getClassName());
     117    //PRINTF(0)("real hit: %s\n", killer->getClassCName());
    118118    this->selectionList.push_back(killer);
    119119  }
  • branches/proxy/src/world_entities/weapons/weapon.cc

    r9371 r9377  
    313313  {
    314314    this->energyWidget = new OrxGui::GLGuiEnergyWidget();
    315     this->energyWidget->setDisplayedName(this->getClassName());
     315    this->energyWidget->setDisplayedName(this->getClassCName());
    316316    this->energyWidget->setSize2D( 20, 100);
    317317    this->energyWidget->setMaximum(this->getEnergyMax());
  • branches/proxy/src/world_entities/world_entity.cc

    r9371 r9377  
    506506   * You can always define a default Action.... don't be affraid just test it :)
    507507   */
    508   //  PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassName(), entity->getClassName(), location.x, location.y, location.z);
     508  //  PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassCName(), entity->getClassCName(), location.x, location.y, location.z);
    509509}
    510510
     
    524524{
    525525
    526   // PRINTF(0)("BSP_GROUND: Player collides \n", this->getClassName() );
     526  // PRINTF(0)("BSP_GROUND: Player collides \n", this->getClassCName() );
    527527
    528528  Vector v = this->getAbsDirX();
     
    594594void WorldEntity::draw() const
    595595{
    596   //PRINTF(0)("(%s::%s)\n", this->getClassName(), this->getName());
     596  //PRINTF(0)("(%s::%s)\n", this->getClassCName(), this->getName());
    597597  //  assert(!unlikely(this->models.empty()));
    598598  {
Note: See TracChangeset for help on using the changeset viewer.