Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10618 in orxonox.OLD for trunk/src/story_entities


Ignore:
Timestamp:
Apr 4, 2007, 12:13:53 PM (18 years ago)
Author:
bknecht
Message:

merged cleanup into trunk (only improvements)

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        1616OrxonoxPlayability.kdevses
        1717OrxonoxPlayability.kdevelop.pcs
         18orxonox.backtrace
         19orxonox.kdevses
         20orxonox.kdevelop.pcs

  • trunk/src/story_entities/game_world.cc

    r10523 r10618  
    2727
    2828#include "player.h"
    29 #include "camera.h"
    30 #include "environment.h"
    31 #include "terrain.h"
    32 #include "test_entity.h"
    33 #include "terrain.h"
     29#include "tools/camera.h"
     30#include "tools/cameraman.h"
     31#include "environments/environment.h"
     32#include "environments/terrain.h"
    3433#include "playable.h"
    3534#include "environments/mapped_water.h"
    … …  
    193192  this->dataXML = (TiXmlElement*)root->Clone();
    194193
    195   //remove this after finished testing !!!!
    196   //Object* obj= new Object();
    197   //obj->setName("Obj");
    198   //Account* a = new Account();
    199   //a->setName("a");
    200   //Account *b = new Account(30);
    201   //b->setName("b");
    202 
    203 
    204194  LoadParamXML(root, "ScriptManager", &this->scriptManager, ScriptManager, loadParams);
    205195
    … …  
    454444
    455445    // tick camera first
    456     CameraMan* man = State::getCameraman();
    457     (man->getCurrentCam())->tick(this->dtS);
     446    (State::getCamera())->tick(this->dtS);
    458447    // TICK everything
    459448    for (i = 0; i < this->dataTank->tickLists.size(); ++i)
    … …  
    590579void GameWorld::applyCameraSettings()
    591580{
    592   CameraMan* man = State::getCameraman();
    593   Camera* c = man->getCurrentCam();
     581  Camera* c = State::getCamera();
     582
    594583  if( c != NULL)
    595584  {

  • trunk/src/story_entities/game_world.h

    r10428 r10618  
    5656  inline double getGameTime() { return this->gameTime; }
    5757  /** sets the game speed @param speed speed of the Game */
    58   inline void setSpeed(float speed) { this->speed = speed; };
     58  inline void setSpeed(float speed) { this->speed = speed; }
     59  inline float getSpeed(){ return this->speed; }
    5960  /**  returns the track path of this world @returns the track path */
    6061

  • trunk/src/story_entities/game_world_data.cc

    r10513 r10618  
    2929#include "world_entity.h"
    3030#include "player.h"
    31 #include "camera.h"
    32 #include "cameraman.h"
    33 #include "terrain.h"
    34 #include "skybox.h"
     31#include "tools/camera.h"
     32#include "tools/cameraman.h"
     33#include "environments/terrain.h"
     34#include "environments/skybox.h"
    3535#include "md2/md2Model.h"
    3636#include "world_entities/projectiles/projectile.h"
    … …  
    101101  PNode::getNullParent();
    102102  Camera* localCamera = new Camera();
    103     localCamera->setName ("GameWorld-Camera");
     103    localCamera->setName ("GameWorldCamera");
    104104  State::setCamera(localCamera, localCamera->getTarget());
    105105  //CameraMan* camMan = new CameraMan();
    … …  
    205205
    206206    glmis->setBackgroundImage("textures/load_screens/default.jpg");
     207    glmis->setPosScale(0.0,0.0,1.0,1.0);
     208    glmis->setBarImage("textures/load_screens/default_bar.png");
     209    glmis->setBarPosScale(0.65,0.87,0.3,0.05);
     210
    207211    this->glmis->setMaximum(8);
    208212    //     this->glmis->draw();

  • trunk/src/story_entities/menu/game_menu.cc

    r10403 r10618  
    2727
    2828#include "graphics_engine.h"
    29 #include "camera.h"
     29#include "tools/camera.h"
    3030#include "sound_engine.h"
    3131

  • trunk/src/story_entities/multi_player_world_data.cc

    r10114 r10618  
    2727#include "world_entity.h"
    2828#include "player.h"
    29 #include "camera.h"
    30 #include "environment.h"
    31 #include "terrain.h"
    32 #include "test_entity.h"
    33 #include "terrain.h"
    34 #include "md2/md2Model.h"
     29#include "tools/camera.h"
     30#include "environments/environment.h"
     31#include "environments/terrain.h"
    3532#include "world_entities/projectiles/projectile.h"
    3633#include "npcs/npc_test1.h"
Note: See TracChangeset for help on using the changeset viewer.