Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8533 in orxonox.OLD for branches/bsp_model/src/lib


Ignore:
Timestamp:
Jun 16, 2006, 3:21:30 PM (18 years ago)
Author:
patrick
Message:

bsp: config parsing tests

Location:
branches/bsp_model/src/lib/graphics/importer
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/bsp_model/src/lib/graphics/importer/bsp_manager.cc

    r8524 r8533  
    5050BspManager::BspManager(WorldEntity* parent)
    5151{
    52  
     52
    5353  this->parent = parent;
    5454  /*// open a BSP file
     
    937937void BspManager::checkCollision(WorldEntity* worldEntity)
    938938{
    939  
     939
    940940  this->outputStartsOut = true;
    941941  this->outputAllSolid = false;
    942942  this->outputFraction = 1.0f;
    943  
     943
    944944
    945945
     
    976976
    977977  float height = 40;
    978  
     978
    979979  this->inputStart =  position;
    980980  this->inputEnd =   dest;
    981981  this->checkCollisionRayN(this->root,0.0f,1.0f, &position, &dest );
    982982
    983   PRINTF(0)(" checking collision: %s, solid = %i, fraction = %f\n", worldEntity->getClassName(), this->outputAllSolid, this->outputFraction);
    984   PRINTF(0)("checking collision!! Pos.Coords: %f , %f , %f\n", position.x , position.y, position.z);
    985   PRINTF(0)("checking collision!! Dest.Coords: %f , %f , %f\n", dest.x , dest.y, dest.z); 
     983//   PRINTF(0)(" checking collision: %s, solid = %i, fraction = %f\n", worldEntity->getClassName(), this->outputAllSolid, this->outputFraction);
     984//   PRINTF(0)("checking collision!! Pos.Coords: %f , %f , %f\n", position.x , position.y, position.z);
     985//   PRINTF(0)("checking collision!! Dest.Coords: %f , %f , %f\n", dest.x , dest.y, dest.z);
    986986//   position1.debug();
    987987
  • branches/bsp_model/src/lib/graphics/importer/md3/md3_animation_cfg.cc

    r8532 r8533  
    4444    if( !this->dataStream) {
    4545      PRINTF(1)("Error: file could not be opened: %s\n", filename.c_str());
     46      return;
    4647    }
     48
     49    this->loadConfig(filename);
    4750  }
    4851
     
    5861   * loads the configuration file
    5962   */
    60   void MD3AnimationCfg::loadConfig()
     63  void MD3AnimationCfg::loadConfig(std::string filename)
    6164  {
    6265//     BufferedReader bin=new BufferedReader(new InputStreamReader(in));
     
    9093            tokens.pop_back();
    9194          }
    92           return;
     95
     96          this->dataStream.getline(buffer, 1024, '\n');
     97          std::string line(buffer);
     98        }
     99      }
     100    }
    93101/*
    94102          st.nextToken(); //throw away first token
     
    160168      throw new IOException(e.getMessage());
    161169    }*/
    162         }
    163       }
    164     }
     170
    165171  }
    166172
  • branches/bsp_model/src/lib/graphics/importer/md3/md3_animation_cfg.h

    r8532 r8533  
    3535      virtual ~MD3AnimationCfg();
    3636
    37       void loadConfig();
     37      void loadConfig(std::string filename);
    3838
    3939      std::string toString() { return std::string("Name: " + this->filename); }
  • branches/bsp_model/src/lib/graphics/importer/md3/md3_model.cc

    r8490 r8533  
    1919#include "md3_data.h"
    2020
     21#include "md3_animation_cfg.h"
    2122
    2223namespace md3
     
    2930  {
    3031    this->md3Data = new MD3Data(filename, filename, scaling);
     32
     33    MD3AnimationCfg cfg("/home/boenzlip/tmp/q3/Downloads/MOH/q3mdl-alien3/models/players/alien3/animation.cfg");
    3134  }
    3235
Note: See TracChangeset for help on using the changeset viewer.