Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 228 for code/branches


Ignore:
Timestamp:
Nov 20, 2007, 9:03:57 PM (17 years ago)
Author:
nicolasc
Message:

merged xml

Location:
code/branches/merger
Files:
2 edited
9 copied

Legend:

Unmodified
Added
Removed
  • code/branches/merger/bin/run-script

    r89 r228  
    11#!/bin/bash
    2 
     2cd bin
    33if [[ !  -f main ]] ; then
    44        echo "main does not exist"
     
    2323fi
    2424exec ./main
     25cd ..
  • code/branches/merger/src/orxonox.cc

    r164 r228  
    190190    void createScene(void)
    191191    {
    192 
    193       string levelFile = "sp_level_moonstation.oxw";
    194       loader::LevelLoader* loader = new loader::LevelLoader(levelFile);
     192     
    195193    }
    196194   
     
    200198      Camera *cam = mgr->createCamera("Camera");
    201199      Viewport *vp = mRoot->getAutoCreatedWindow()->addViewport(cam);
     200
     201      string levelFile = "sp_level_moonstation.oxw";
     202      loader::LevelLoader* loader = new loader::LevelLoader(levelFile);
     203     
     204      mgr->setAmbientLight(Ogre::ColourValue(0.3,0.3,0.9));
     205      mgr->setSkyBox(true,"Examples/SpaceSkyBox");
     206
    202207    }
    203208
Note: See TracChangeset for help on using the changeset viewer.