Changeset 10644 in orxonox.OLD for branches/vs-enhencements/src/world_entities
- Timestamp:
- Apr 29, 2007, 9:58:18 PM (18 years ago)
- Location:
- branches/vs-enhencements/src/world_entities
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/vs-enhencements/src/world_entities/space_ships/space_ship.cc
r10642 r10644 157 157 //weapons: 158 158 159 Weapon* wpRight 1 = new LightBlaster();160 wpRight 1->setName( "LightBlaster");161 Weapon* wpLeft 1 = new LightBlaster();162 wpLeft 1->setName( "LightBlaster");163 164 //Weapon* wpRight1 = new RFCannon ();159 Weapon* wpRight0 = new RFCannon (); 160 wpRight0->setName( "RFCannon"); 161 Weapon* wpLeft0 = new RFCannon (); 162 wpLeft0->setName( "RFCannon"); 163 164 Weapon* wpRight1 = new RFCannon (); 165 165 wpRight1->setName( "RFCannon"); 166 //Weapon* wpLeft1 = new RFCannon ();166 Weapon* wpLeft1 = new RFCannon (); 167 167 wpLeft1->setName( "RFCannon"); 168 168 … … 181 181 182 182 183 this->weaponMan.addWeapon( wpLeft1, 0, 0); 184 this->weaponMan.addWeapon( wpRight1, 0, 1); 185 186 this->weaponMan.addWeapon( wpLeft2, 1, 2); 187 this->weaponMan.addWeapon( wpRight2, 1, 3); 188 189 this->weaponMan.addWeapon( wpLeft3, 2, 4); 190 this->weaponMan.addWeapon( wpRight3, 2, 5); 191 192 this->weaponMan.addWeapon( wpLeft1, 3, 0); 193 this->weaponMan.addWeapon( wpRight1, 3, 1); 194 195 this->weaponMan.addWeapon( wpLeft2, 3, 2); 196 this->weaponMan.addWeapon( wpRight2, 3, 3); 197 198 this->weaponMan.addWeapon( wpLeft3, 3, 4); 199 this->weaponMan.addWeapon( wpRight3, 3, 5); 183 this->weaponMan.addWeapon( wpLeft0, 0, 0); 184 this->weaponMan.addWeapon( wpRight0, 0, 1); 185 186 this->weaponMan.addWeapon( wpLeft1, 0, 2); 187 this->weaponMan.addWeapon( wpRight1, 0, 3); 188 189 this->weaponMan.addWeapon( wpLeft2, 1, 4); 190 this->weaponMan.addWeapon( wpRight2, 1, 5); 191 192 this->weaponMan.addWeapon( wpLeft3, 2, 6); 193 this->weaponMan.addWeapon( wpRight3, 2, 7); 194 195 this->weaponMan.addWeapon( wpLeft0, 3, 0); 196 this->weaponMan.addWeapon( wpRight0, 3, 1); 197 198 this->weaponMan.addWeapon( wpLeft1, 3, 2); 199 this->weaponMan.addWeapon( wpRight1, 3, 3); 200 201 this->weaponMan.addWeapon( wpLeft2, 3, 4); 202 this->weaponMan.addWeapon( wpRight2, 3, 5); 203 204 this->weaponMan.addWeapon( wpLeft3, 3, 6); 205 this->weaponMan.addWeapon( wpRight3, 3, 7); 200 206 201 207 … … 299 305 this->weaponMan.setSlotCount(8); 300 306 301 this->weaponMan.setSlotPosition(0, Vector( 0.0, 0, -3.0));307 this->weaponMan.setSlotPosition(0, Vector(3.006, 1.028, .155)); 302 308 this->weaponMan.setSlotCapability(0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL); 303 309 304 this->weaponMan.setSlotPosition(1, Vector( 0.0, 0, 3.0));310 this->weaponMan.setSlotPosition(1, Vector(3.006, 1.028, -.155)); 305 311 this->weaponMan.setSlotCapability(1, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL); 306 312 307 this->weaponMan.setSlotPosition(2, Vector( 1.0, 0, -1.5));313 this->weaponMan.setSlotPosition(2, Vector(4.03, .063, .876)); 308 314 this->weaponMan.setSlotDirection(2, Quaternion(-M_PI_4*.5, Vector(1,0,0))); 309 315 310 this->weaponMan.setSlotPosition(3, Vector( 1.0, 0, 1.5));316 this->weaponMan.setSlotPosition(3, Vector(4.03, -.063, -.876)); 311 317 this->weaponMan.setSlotDirection(3, Quaternion(M_PI_4*.5, Vector(1,0,0))); 312 318 313 this->weaponMan.setSlotPosition(4, Vector(1. 5, 0, .5));319 this->weaponMan.setSlotPosition(4, Vector(1.431, -.612, 2.691)); 314 320 this->weaponMan.setSlotDirection(4, Quaternion(-M_PI_4*.5+M_PI, Vector(1,0,0))); 315 321 316 this->weaponMan.setSlotPosition(5, Vector(1. 5, 0, -.5));322 this->weaponMan.setSlotPosition(5, Vector(1.431, -.612, -2.691)); 317 323 this->weaponMan.setSlotDirection(5, Quaternion(+M_PI_4*.5-M_PI, Vector(1,0,0))); 318 324 319 this->weaponMan.setSlotPosition(6, Vector( 0.5, 0, 2.5));325 this->weaponMan.setSlotPosition(6, Vector(1.431, -.612, 3.254)); 320 326 this->weaponMan.setSlotDirection(6, Quaternion(-M_PI_4*.5+M_PI, Vector(1,0,0))); 321 327 322 this->weaponMan.setSlotPosition(7, Vector( 0.5, 0, -2.5));328 this->weaponMan.setSlotPosition(7, Vector(1.431, -.612, -3.254)); 323 329 this->weaponMan.setSlotDirection(7, Quaternion(+M_PI_4*.5-M_PI, Vector(1,0,0))); 324 330 325 this->secWeaponMan.setSlotPosition(0, Vector(1.5, 0, 0));331 this->secWeaponMan.setSlotPosition(0, Vector(1.5, 3, 0)); 326 332 this->secWeaponMan.setSlotCapability(0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL); 327 333 -
branches/vs-enhencements/src/world_entities/weapons/heavy_blaster.cc
r10618 r10644 156 156 157 157 158 // Animation3D* animB0Shoot = this->getAnimation(WS_SHOOTING0, this->objComp[0][0]);159 // Animation3D* animB1Shoot = this->getAnimation(WS_SHOOTING1, this->objComp2);160 // Animation3D* animB2Shoot = this->getAnimation(WS_SHOOTING2, this->objComp3);161 // Animation3D* animT0Shoot = this->getAnimation(WS_SHOOTING3, this->objComp[0][1]);162 // Animation3D* animT1Shoot = this->getAnimation(WS_SHOOTING4, this->objComp5);163 // Animation3D* animT2Shoot = this->getAnimation(WS_SHOOTING5, this->objComp6);164 165 166 // this->shootAnim[0][0]->setInfinity(ANIM_INF_CONSTANT);167 // animB1Shoot->setInfinity(ANIM_INF_CONSTANT);168 // animB2Shoot->setInfinity(ANIM_INF_CONSTANT);169 // animT0Shoot->setInfinity(ANIM_INF_CONSTANT);170 // animT1Shoot->setInfinity(ANIM_INF_CONSTANT);171 // animT2Shoot->setInfinity(ANIM_INF_CONSTANT);172 173 158 for (int i = 0; i < this->getBarrels(); i++){ 174 159 this->shootAnim[i][0]->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.05, ANIM_LINEAR, ANIM_NULL); … … 187 172 animation3->setInfinity(ANIM_INF_CONSTANT); 188 173 189 // this->setEmissionPoint(3.8, 1.2, 0, 0);190 191 174 animation2->addKeyFrame(Vector(0.0, -1.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL); 192 175 animation2->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.5, ANIM_LINEAR, ANIM_NULL); … … 207 190 pj->setParent(PNode::getNullParent()); 208 191 209 // pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*250 + VECTOR_RAND(5));210 // pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*130 + VECTOR_RAND(1));211 192 pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*130 + VECTOR_RAND(1)); 212 193 213 194 pj->setAbsCoor(this->emissionPoint[this->activeBarrel]->getAbsCoor()); 214 // pj->setAbsCoor(this->getEmissionPoint(0));215 195 pj->setAbsDir(this->getAbsDir()); 216 // pj->toList(OM_GROUP_01_PROJ);217 196 pj->activate(); 218 197 -
branches/vs-enhencements/src/world_entities/weapons/light_blaster.cc
r10618 r10644 53 53 { 54 54 55 for (int i = 0; i < this->getBarrels(); i++)56 {57 //delete [] this->shootAnim[i];58 delete [] this->objComp[i];59 }60 delete [] this->emissionPoint;61 //delete [] this->shootAnim;62 delete [] this->objComp;55 // for (int i = 0; i < this->getBarrels(); i++) 56 // { 57 // //delete [] this->shootAnim[i]; 58 // delete [] this->objComp[i]; 59 // } 60 // delete [] this->emissionPoint; 61 // //delete [] this->shootAnim; 62 // delete [] this->objComp; 63 63 64 64 } -
branches/vs-enhencements/src/world_entities/weapons/rf_cannon.cc
r10641 r10644 52 52 RFCannon::~RFCannon() 53 53 { 54 for (int i = 0; i < this->getBarrels(); i++)55 delete [] this->objComp[i];54 // for (int i = 0; i < this->getBarrels(); i++) 55 // delete [] this->objComp[i]; 56 56 57 delete [] this->emissionPoint;58 delete [] this->objComp;57 // delete [] this->emissionPoint; 58 // delete [] this->objComp; 59 59 } 60 60 … … 132 132 pj->setParent(PNode::getNullParent()); 133 133 134 pj->setVelocity(this->getAbsDir().apply(Vector( 0,1,0))*190);134 pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*190); 135 135 136 136 pj->setAbsCoor(this->emissionPoint[this->activeBarrel]->getAbsCoor());
Note: See TracChangeset
for help on using the changeset viewer.