Changeset 10206 in orxonox.OLD for branches/camera/src/world_entities
- Timestamp:
- Jan 10, 2007, 1:51:44 PM (18 years ago)
- Location:
- branches/camera/src/world_entities
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/camera/src/world_entities/Makefile.am
r10195 r10206 11 11 camera.cc \ 12 12 cameraman.cc \ 13 blackscreen.cc \ 13 14 playable.cc \ 14 15 player.cc \ … … 42 43 camera.h \ 43 44 cameraman.h \ 45 blackscreen.h \ 44 46 extendable.h \ 45 47 playable.h \ -
branches/camera/src/world_entities/camera.cc
r10204 r10206 376 376 } 377 377 378 void CameraTarget::jump( Vector newPos)379 { 380 target->setAbsCoor( newPos);378 void CameraTarget::jump(float x, float y, float z) 379 { 380 target->setAbsCoor(x,y,z); 381 381 } 382 382 -
branches/camera/src/world_entities/camera.h
r10204 r10206 105 105 void changeSpeed(float speed); 106 106 Vector* rotate(Vector* newPos, float speed); 107 void jump( Vector newPos);107 void jump(float x, float y, float z); 108 108 void test(); 109 109 void translateNow(Vector* vec); -
branches/camera/src/world_entities/cameraman.cc
r10205 r10206 1 /* 2 orxonox - the future of 3D-vertical-scrollers 3 4 Copyright (C) 2004 orx 5 6 This program is free software; you can redistribute it and/or modify 7 it under the terms of the GNU General Public License as published by 8 the Free Software Foundation; either version 2, or (at your option) 9 any later version. 10 11 ### File Specific: 12 main-programmer: Filip Gospodinov 13 co-programmer: 14 */ 15 1 16 #include "shell_command.h" 2 17 #include "cameraman.h" … … 10 25 { 11 26 currentCam=State::getCamera(); 12 cameras[0]=currentCam; 13 camAmount=1; 27 this->cameras.push_back(currentCam); 14 28 15 29 } … … 18 32 void cameraman::createCam() 19 33 { 20 if (camAmount<6)21 {22 34 Camera* newCamera=new Camera(); 23 cameras[camAmount]=newCamera; 24 } 35 this->cameras.push_back(newCamera); 36 //cameraList.size(); 37 //cameraList[4] 25 38 } 26 39 27 40 void cameraman::setCam(int cameraNo) 28 41 { 29 if (cameraNo<cam Amount)42 if (cameraNo<cameras.size()) 30 43 { 31 44 currentCam=cameras[cameraNo]; … … 62 75 void cameraman::jumpCam(int x, int y, int z, int camNo) 63 76 { 64 // cameras[camNo]77 cameras[camNo]->target->jump(x, y, z); 65 78 } 66 79 67 80 68 void jumpCurrCam(int x, int y, int z)81 void cameraman::jumpCurrCam(int x, int y, int z) 69 82 { 83 currentCam->target->jump(x, y, z); 70 84 } 71 85 -
branches/camera/src/world_entities/cameraman.h
r10205 r10206 4 4 #include "p_node.h" 5 5 #include "camera.h" 6 #include <vector> 6 7 7 8 class cameraman { … … 9 10 private: 10 11 Camera* currentCam; 11 int camNo; 12 int camAmount; 13 Camera* cameras[6]; 12 // int camNo; 13 std::vector<Camera*> cameras; 14 14 15 15
Note: See TracChangeset
for help on using the changeset viewer.