Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7614


Ignore:
Timestamp:
Nov 4, 2010, 5:01:40 PM (14 years ago)
Author:
dafrick
Message:

Trying out some stuff.

Location:
code/branches/releasetodo
Files:
2 added
5 edited

Legend:

Unmodified
Added
Removed
  • code/branches/releasetodo/data/levels/notifications.oxw

    r7474 r7614  
    55  include("templates/lodinformation.oxt")
    66?>
     7
     8<LevelInfo
     9 name = "Notifications showcase"
     10 description = "Level to test and showcase notifications."
     11 tags = "test, showcase, notifications"
     12/>
    713
    814<Level
  • code/branches/releasetodo/src/orxonox/CMakeLists.txt

    r7504 r7614  
    2525SET_SOURCE_FILES(ORXONOX_SRC_FILES
    2626  Level.cc
     27  LevelInfo.cc
    2728  LevelManager.cc
    2829  Main.cc
     
    5859  TOLUA_FILES
    5960    ChatInputHandler.h
     61    LevelInfo.h
    6062    LevelManager.h
    6163    MoodManager.h
  • code/branches/releasetodo/src/orxonox/Level.cc

    r7163 r7614  
    7676        XMLPortObject(Level, MeshLodInformation, "lodinformation", addLodInfo, getLodInfo, xmlelement, mode);
    7777        XMLPortObjectExtended(Level, BaseObject, "", addObject, getObject, xmlelement, mode, true, false);
    78 }
     78    }
    7979
    8080    void Level::registerVariables()
  • code/branches/releasetodo/src/orxonox/LevelManager.cc

    r7284 r7614  
    3232
    3333#include "util/ScopedSingletonManager.h"
     34#include "core/ClassTreeMask.h"
    3435#include "core/CommandLineParser.h"
    3536#include "core/ConfigValueIncludes.h"
     
    3738#include "core/Loader.h"
    3839#include "core/Resource.h"
     40#include "core/XMLFile.h"
    3941#include "PlayerManager.h"
    4042#include "Level.h"
     43#include "LevelInfo.h"
    4144
    4245namespace orxonox
     
    142145            {
    143146                size_t pos = it->find(".oxw");
     147                COUT(0) << *it << std::endl;
     148                XMLFile file = XMLFile(*it);
     149                ClassTreeMask mask = ClassTreeMask();
     150                mask.exclude(ClassIdentifier<BaseObject>::getIdentifier());
     151                mask.include(ClassIdentifier<LevelInfo>::getIdentifier());
     152                Loader::load(&file, mask);
     153               
    144154                this->availableLevels_.push_back(it->substr(0, pos));
    145155            }
    146156        }
     157
    147158    }
    148159}
  • code/branches/releasetodo/src/orxonox/OrxonoxPrereqs.h

    r7163 r7614  
    6767    class CameraManager;
    6868    class Level;
     69    class LevelInfo;
    6970    class LevelManager;
    7071    class PawnManager;
Note: See TracChangeset for help on using the changeset viewer.