Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10618 in orxonox.OLD for trunk/src/world_entities/effects


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

merged cleanup into trunk (only improvements)

Location:
trunk
Files:
5 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/world_entities/effects/billboard.cc

    r10501 r10618  
    2222#include "glincl.h"
    2323#include "state.h"
    24 #include "cameraman.h"
    25 #include "camera.h"
     24#include "tools/cameraman.h"
     25#include "tools/camera.h"
    2626
    2727#include "debug.h"
    … …  
    134134  this->material->select();
    135135
    136   const CameraMan* man = State::getCameraman();
    137   const Camera* camera = man->getCurrentCam(); //!< @todo MUST be different
     136  const Camera* camera = State::getCamera();
    138137  Vector cameraPos = camera->getAbsCoor();
    139138  Vector cameraTargetPos = camera->getTarget()->getAbsCoor();

  • trunk/src/world_entities/effects/blink.cc

    r10530 r10618  
    11/*
     2   orxonox - the future of 3D-vertical-scrollers
    23
    34   Copyright (C) 2006 orx

  • trunk/src/world_entities/effects/trail.cc

    r10511 r10618  
    2121#include "util/loading/load_param.h"
    2222#include "util/loading/factory.h"
    23 
    24 #include "quaternion.h"
    25 #include "vector.h"
    2623
    2724#include "graphics_engine.h"

  • trunk/src/world_entities/effects/wobblegrid.cc

    r10557 r10618  
    2424#include "grid.h"
    2525
    26 #include "cameraman.h"
    27 #include "camera.h"
    28 
    29 #include <assert.h>
     26#include "tools/cameraman.h"
     27#include "tools/camera.h"
     28
     29#include <cassert>
    3030#include "debug.h"
    3131
    … …  
    9393  this->angularSpeed = M_PI; //180;
    9494  this->setModel(this->grid);
     95 
     96  this->angle = 0;
    9597
    9698  this->setUpdateFunction((*sinf));
    … …  
    201203void Wobblegrid::orient()
    202204{
    203      
    204      CameraMan* cman = State::getCameraman();
    205      Camera* c = cman->getCurrentCam();
     205
     206  Camera* c = State::getCamera();
    206207
    207208  Vector view = this->getAbsCoor() - c->getAbsCoor();
Note: See TracChangeset for help on using the changeset viewer.