Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
May 20, 2010, 10:23:22 AM (14 years ago)
Author:
scheusso
Message:

merging lod branch into presentation3 merger branch

Location:
code/branches/presentation3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/presentation3

  • code/branches/presentation3/src/orxonox/Level.h

    r5929 r6926  
    3434#include <list>
    3535#include <string>
     36#include <map>
    3637#include "core/BaseObject.h"
    3738#include "network/synchronisable/Synchronisable.h"
     39#include "graphics/MeshLodInformation.h"
    3840
    3941namespace orxonox
     
    5557            void playerEntered(PlayerInfo* player);
    5658            void playerLeft(PlayerInfo* player);
     59                       
     60            MeshLodInformation* getLodInfo(std::string meshName) const;
     61
    5762
    5863        private:
    5964            void addObject(BaseObject* object);
    6065            BaseObject* getObject(unsigned int index) const;
     66
     67            void addLodInfo(MeshLodInformation* object);
     68//            const MeshLodInformation* getLodInfo(std::string meshName) const;
     69//            MeshLodInformation* getLodInfo(unsigned int index) const;
    6170
    6271            void setGametypeString(const std::string& gametype);
     
    6675            void networkcallback_applyXMLFile();
    6776
    68             std::string            description_;
    69             std::string            gametype_;
    70             std::string            xmlfilename_;
    71             XMLFile*               xmlfile_;
    72             std::list<BaseObject*> objects_;
     77            std::string                    description_;
     78            std::string                    gametype_;
     79            std::string                    xmlfilename_;
     80            XMLFile*                       xmlfile_;
     81            std::list<BaseObject*>         objects_;
     82            std::map<std::string,MeshLodInformation*>  lodInformation_;
    7383    };
    7484}
Note: See TracChangeset for help on using the changeset viewer.