Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
May 16, 2005, 1:33:19 PM (19 years ago)
Author:
bensch
Message:

orxonox/branches/openAL: merged trunk back to openAL
merged with command:

svn merge ../trunk/ openAL/ -r 3920:HEAD

no conflicts at all

Location:
orxonox/branches/openAL
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • orxonox/branches/openAL

    • Property svn:externals

      •  

        old new  
        1 data http://svn.orxonox.ethz.ch/data
         1

  • orxonox/branches/openAL/src/world_entities/environment.cc

    r3739 r4194  
    3030{
    3131  this->model = (Model*) ResourceManager::getInstance()->load("cube", RP_LEVEL);
    32   //  this->model = new OBJModel("../data/models/fighter.obj");
    3332}
    3433
    … …  
    5049void Environment::draw ()
    5150{
     51  //this->getRelCoor().debug();
     52
    5253  glMatrixMode(GL_MODELVIEW);
    5354  glPushMatrix();
Note: See TracChangeset for help on using the changeset viewer.