Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10730 in orxonox.OLD for branches


Ignore:
Timestamp:
Jun 20, 2007, 1:19:11 PM (17 years ago)
Author:
nicolasc
Message:

modular loading not working, WS hardcoded

Location:
branches/presentation/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/presentation/src/ai/ai_team.cc

    r10515 r10730  
    5555                                Vector targetPos=target->getAbsCoor();
    5656                                float distanceToPlayer=(targetPos-position).len();
    57 
    58                                 int zNorm=(position.z>targetPos.z)?1:-1;
     57//                              int zNorm=(position.z>targetPos.z)?1:-1;  // unused var
    5958
    6059                                if(distanceToPlayer<attackDistance+60){ //### change wakeup distance here
  • branches/presentation/src/lib/graphics/importer/static_model.cc

    r10729 r10730  
    101101void StaticModel::extractMountPoints()
    102102{
    103 //   printf("extracting MP...");
    104103  // go through all groups and check if they are mounts
    105104  std::vector<StaticModelData::Group>::iterator groupIt = this->data->getGroups().begin();
     
    114113    // check if the name has a "MP" prefix or else it won't work
    115114    if( groupName.find("MP.", 0) == std::string::npos){
    116 //       groupIt++;
    117 //       printf("Found MP:  ");
    118115      continue;
    119116    }
     
    128125      PRINTF(4)("the face count of %s is wrong, perhaps you missnamed this object or used the wrong mount point object (got %i faces)\n",
    129126                groupName.c_str(), (*groupIt)._faces.size());
    130 //       printf("wrong number of faces\n\n");
    131 //       groupIt++;
    132127      continue;
    133128    }
     
    143138    }
    144139
    145 //     printf("confirmed  ");
    146140
    147141    Vector center;
     
    150144    Vector zAxis;
    151145    // now process all points
    152 //     printf("entering loop: ");
    153146    for( int i = 0; i < 3; i++)
    154147    {
    155 //       printf("%i ", i);
    156148      // convert the float vertices to vectors
    157149      Vector a( this->data->getVertices()[triangle[i]._elements[0].vertexNumber * 3],
    158150                this->data->getVertices()[triangle[i]._elements[0].vertexNumber * 3 + 1],
    159151                this->data->getVertices()[triangle[i]._elements[0].vertexNumber * 3 + 2]);
    160 //       printf("a");
    161152      Vector b( this->data->getVertices()[triangle[i]._elements[1].vertexNumber * 3],
    162153                this->data->getVertices()[triangle[i]._elements[1].vertexNumber * 3 + 1],
    163154                this->data->getVertices()[triangle[i]._elements[1].vertexNumber * 3 + 2]);
    164 //       printf("b");
    165155      Vector c( this->data->getVertices()[triangle[i]._elements[2].vertexNumber * 3],
    166156                this->data->getVertices()[triangle[i]._elements[2].vertexNumber * 3 + 1],
    167157                this->data->getVertices()[triangle[i]._elements[2].vertexNumber * 3 + 2]);
    168 //       printf("c  ");
    169158
    170159      Vector ab = a - b;
     
    220209    }
    221210
    222 //     printf("adding MP\n");
    223     // now add the mount point
     211    printf("adding MP\n");
    224212     this->addMountPoint( zAxis, yAxis, center, groupName);
    225213
    226 //     printf("removing item...");
    227     // remove the group from the model list (mount points do not need to be drawn)
    228 //      std::vector<StaticModelData::Group>::iterator tmpIt =  groupIt;
    229 //      groupIt++;
    230 //     printf("   removing...");
    231 //      this->data->getGroups().erase(tmpIt);
    232 //     printf("   REMOVED\n");
    233214  }
    234 //   printf("done\n");
    235215}
    236216
  • branches/presentation/src/world_entities/space_ships/space_ship.cc

    r10728 r10730  
    463463      {
    464464        int slot = ws->getWeaponSlot();
    465 //         int side = ws->getWeaponSide(); //FIXME / REMOVE: is not used// HACK needed for some weapons (left/right)
     465//         int side = ws->getWeaponSide(); // HACK needed for some weapons (left/right)
    466466        this->getWeaponManager().setSlotPosition(slot, (*it).second->getCenter());
    467467        this->getWeaponManager().setSlotDirection(slot, ws->getRelDir());
Note: See TracChangeset for help on using the changeset viewer.