Changeset 12144 for code/branches/OrxoKart_HS18
- Timestamp:
- Dec 5, 2018, 10:48:32 AM (6 years ago)
- Location:
- code/branches/OrxoKart_HS18
- Files:
-
- 4 added
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/OrxoKart_HS18/data/levels/OrxoKart1.oxw
r12128 r12144 71 71 team=0 72 72 73 position="<?lua print(S*0)?>,40,<?lua print(8 *S)?>"73 position="<?lua print(S*0)?>,40,<?lua print(8.5*S)?>" 74 74 lookat="0,40,0" 75 75 spawnclass=OrxoKartKart -
code/branches/OrxoKart_HS18/data/overlays/OrxoKartHUD.oxo
r12079 r12144 17 17 /> 18 18 19 <HUDHealthBar 20 name = "HealthBar1" 21 background = "Orxonox/HealthBarBackground" 22 size = "0.35, 0.0875" 23 position = "0.0 , 0.97" 24 pickpoint = "0, 1" 25 bartexture = "healthbar_bar.png" 26 textfont = "VeraMono" 27 textusebarcolour = true 28 textscale = 0.4 29 textoffset = "0.325, -0.825" 30 textpickpoint = "0, 0" 31 textalign = "right" 32 correctaspect = true 33 iconmaterial = "Orxonox/BarIconHealth" 34 > 35 <BarColour position = 0.0 colour = "0.7,0.2,0.2" /> 36 <BarColour position = 0.5 colour = "0.7,0.7,0.2" /> 37 <BarColour position = 1.0 colour = "0.2,0.7,0.2" /> 38 </HUDHealthBar> 19 <ShroomHUD 20 name = "ShroomHUD" 21 position = "0.05, 0.02" 22 size = "0.18, 0.05" 23 /> 24 39 25 </OverlayGroup> 40 26 </Template> -
code/branches/OrxoKart_HS18/src/modules/orxokart/CMakeLists.txt
r12108 r12144 5 5 OrxoKartOrigin.cc 6 6 OrxoKartFlag.cc 7 ShroomHUD.cc 7 8 TimeHUD.cc 8 9 ) -
code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc
r12128 r12144 50 50 this->raceFinished = false; 51 51 this->firstTick_ = true; 52 this->numberOfShrooms = 3; 52 53 53 54 this->setHUDTemplate("OrxoKartHUD"); … … 181 182 OrxoKartKart* player = flag_->getObjectofCollision(); 182 183 if (level == 1) 183 player->setPosition(Vector3(s*0, 20, s*8 ));184 player->setPosition(Vector3(s*0, 20, s*8.5)); 184 185 if (level == 2) 185 player->setPosition(Vector3(s*0, 20, s*18 ));186 player->setPosition(Vector3(s*0, 20, s*18.5)); 186 187 player->setOrientation(Quaternion(1, 0, 0, 0)); // 0, 0, 0 187 188 player->setVelocity(Vector3(0,0,0)); -
code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.h
r12128 r12144 57 57 inline int getRaceFinished() const 58 58 { return this->raceFinished; } 59 inline int getNumberOfShrooms() const 60 { return this->numberOfShrooms; } 59 61 60 62 private: … … 68 70 bool firstTick_; 69 71 72 int numberOfShrooms; 73 70 74 int s; 71 75 int n; -
code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartPrereqs.h
r12108 r12144 74 74 class OrxoKartTile; 75 75 class TimeHUD; 76 class ShroomHUD; 76 77 } 77 78 -
code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartTile.cc
r12128 r12144 48 48 this->model_ = nullptr; 49 49 this->cs_ = nullptr; 50 this->arc = nullptr; 50 51 51 52 this->enableCollisionCallback(); … … 66 67 if (this->cs_) 67 68 this->cs_->destroy(); 69 if (this->arc) 70 this->arc->destroy(); 68 71 } 69 72 } … … 90 93 else if (type == 2 ) { 91 94 model_->setMeshSource("OrxoKartStreckenabschnittZiel.mesh"); 95 96 arc = new Model(this->getContext()); 97 arc->setMeshSource("OrxoKartStartTor.mesh"); 98 arc->setPosition(Vector3(x*1.0f, -1.0f, z*1.0f)); 99 arc->setScale3D(Vector3(s*1.0f/10, s*1.0f/10, s*1.0f/10)); 100 arc->yaw(Degree(-90)); 101 this->attach(arc); 92 102 } 93 103 model_->setScale3D(Vector3(s*1.0f, 8.0f, s*1.0f)); -
code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartTile.h
r12128 r12144 65 65 private: 66 66 Model* model_; 67 Model* arc; 67 68 BoxCollisionShape* cs_; 68 69 bool collided_;
Note: See TracChangeset
for help on using the changeset viewer.