Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10197 in orxonox.OLD


Ignore:
Timestamp:
Jan 8, 2007, 11:54:17 PM (13 years ago)
Author:
gfilip
Message:

override

Location:
branches/camera/src/world_entities
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/camera/src/world_entities/cameraman.cc

    r10195 r10197  
    11#include "shell_command.h"
    22#include "cameraman.h"
    3 #include "camera.h"
     3
    44#include "state.h"
    55
     
    99cameraman::cameraman()
    1010{
    11   currentCam=State::getCameraNode();
     11  currentCam=State::getCamera();
    1212  cameras[0]=currentCam;
    1313  camAmount=1;
     
    2020if (camAmount<6)
    2121{
    22   PNode* newCamera=new Camera();
     22  Camera* newCamera=new Camera();
    2323  cameras[camAmount]=newCamera;
    2424}
     
    2828{
    2929  if (cameraNo<camAmount)
     30  {
    3031  currentCam=cameras[cameraNo];
     32  State::setCamera(currentCam, currentCam->getTargetNode());
     33  }
    3134
    3235}
  • branches/camera/src/world_entities/cameraman.h

    r10195 r10197  
    33
    44#include "p_node.h"
     5#include "camera.h"
    56
    67class cameraman {
    78
    89  private:
    9     PNode* currentCam;
     10    Camera* currentCam;
    1011    int camNo;
    1112    int camAmount;
     
    1718    void setCam(int CameraNo);
    1819    void createCam();
    19     PNode* cameras[6];
     20    Camera* cameras[6];
     21    void moveCam(int x, int y, int z, int speed, int camNo);
     22    void moveCurrCam(int x, int y, int z, int speed);
     23
    2024
    2125
Note: See TracChangeset for help on using the changeset viewer.