Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 164


Ignore:
Timestamp:
Nov 5, 2007, 1:16:39 PM (12 years ago)
Author:
nicolasc
Message:

Brute force megre of xml branch

Location:
code/trunk
Files:
12 added
2 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/CMakeLists.txt

    r137 r164  
    22
    33# create a few variables to simplify life
    4 SET(SRC_FILES orxonox.cc)
    5 #SET(INC_FILES ExampleApplication.h  ExampleFrameListener.h)
     4
     5SET(SRC_FILES orxonox.cc loader/LevelLoader.cc xml/xmlParser.cc)
     6SET(INC_FILES loader/LevelLoader.h xml/xmlParser.h)
    67
    78#Creates an executable
  • code/trunk/src/orxonox.cc

    r151 r164  
    3535#include <CEGUI/CEGUI.h>
    3636#include <OgreCEGUIRenderer.h>
     37
     38#include <string>
     39#include <iostream>
     40
     41#include "xml/xmlParser.h"
     42#include "loader/LevelLoader.h"
     43
    3744
    3845// some tests to see if enet works without includsion
     
    97104      createRenderWindow();
    98105      initializeResourceGroups();
     106      createScene();
    99107      setupScene();
    100108      setupInputSystem();
     
    180188    }
    181189
     190    void createScene(void)
     191    {
     192
     193      string levelFile = "sp_level_moonstation.oxw";
     194      loader::LevelLoader* loader = new loader::LevelLoader(levelFile);
     195    }
     196   
    182197    void setupScene()
    183198    {
Note: See TracChangeset for help on using the changeset viewer.