Changeset 10298 in orxonox.OLD for branches/playability

Timestamp:

Jan 21, 2007, 6:23:04 PM (18 years ago)

Author:

nicolasc

Message:

Fixed Wooblegrid, transparancy problem (acid splashes) still exists

Location:

branches/playability/src/world_entities

Files:

• effects/wobblegrid.cc (modified) (1 diff)
• projectiles/acid_splash.cc (modified) (2 diffs)
• space_ships/space_ship.cc (modified) (6 diffs)
• weapons/acid_launcher.cc (modified) (4 diffs)

branches/playability/src/world_entities/effects/wobblegrid.cc

@@ -202 +202 @@
   up = h.cross(view);
 
-  Quaternion dir = Quaternion::lookAt( this->getAbsCoor(), this->getAbsCoor() + up, view);
+  Quaternion dir = Quaternion::lookAt( Vector(), view, up);
   this->setAbsDir(dir);
 }

branches/playability/src/world_entities/projectiles/acid_splash.cc

@@ -43 +43 @@
   this->registerObject(this, AcidSplash::_objectList);
 
-  
+  srand(time(0));   //initialize Random Nomber Generator
+
   //this->loadModel("models/projectiles/laser.obj");
 
@@ -52 +53 @@
 
   this->grid = new Wobblegrid( 5);
-  this->grid->setTexture( "maps/acid3.png");
   this->grid->setParent( this);
+
+//  if (rand()/2 == 0) //!<Randomized Textrures
+    this->grid->setTexture( "maps/acid3.png");
+//   else
+//     this->grid->setTexture( "maps/blub.png");
 
   this->grid->toList(this->getOMListNumber());

branches/playability/src/world_entities/space_ships/space_ship.cc

@@ -29 +29 @@
 #include "weapons/spike_launcher.h"
 #include "weapons/spike_thrower.h"
+#include "weapons/acid_launcher.h"
 #include "weapons/boomerang_gun.h"
 #include "weapons/turret.h"
@@ -178 +179 @@
 //  spike2->setName( "SpikeLauncher" );
 
+  Weapon* acid0 = new AcidLauncher();
+  acid0->setName( "AcidSplasher" );
+
+  Weapon* acid1 = new AcidLauncher();
+  acid1->setName( "AcidSplasher" );
+
   this->weaponMan.addWeapon( wpLeft1, 0, 0);
   this->weaponMan.addWeapon( wpRight1, 0, 1);
@@ -196 +203 @@
   this->weaponMan.addWeapon( wpRight3, 3, 5);
 
-  this->secWeaponMan.addWeapon( cannon, 0, 0);
-  this->secWeaponMan.addWeapon( spike, 1, 1);
-//  this->secWeaponMan.addWeapon( spike2, 2, 2);
-
-
-  this->weaponMan.changeWeaponConfig(3);
+  this->weaponMan.addWeapon( acid0, 0, 6);
+  this->weaponMan.addWeapon( acid1, 0, 7);
+
+  this->secWeaponMan.addWeapon( cannon, 0, 2);
+  this->secWeaponMan.addWeapon( spike, 1, 3);
+//   this->secWeaponMan.addWeapon( acid0, 2, 2);
+//   this->secWeaponMan.addWeapon( acid1, 2, 3);
+
+
+  this->weaponMan.changeWeaponConfig(0);
   this->secWeaponMan.changeWeaponConfig(1);
 
@@ -236 +247 @@
 
   bForward = bBackward = bLeft = bRight = bAscend = bDescend = bRollL = bRollR = bFire = bSecFire = false;
-  
 
   this->setHealthMax(shieldMax);
@@ -288 +298 @@
   this->secWeaponMan.setParentEntity( this);
 
-  this->weaponMan.setSlotCount(6);
+  this->weaponMan.setSlotCount(8);
 
   this->weaponMan.setSlotPosition(0, Vector(0.0, 0, -3.0));
@@ -307 +317 @@
   this->weaponMan.setSlotPosition(5, Vector(1.5, 0, -.5));
   this->weaponMan.setSlotDirection(5, Quaternion(+M_PI_4*.5-M_PI, Vector(1,0,0)));
+
+  this->weaponMan.setSlotPosition(6, Vector(0.5, 0, 2.5));
+  this->weaponMan.setSlotDirection(6, Quaternion(-M_PI_4*.5+M_PI, Vector(1,0,0)));
+
+  this->weaponMan.setSlotPosition(7, Vector(0.5, 0, -2.5));
+  this->weaponMan.setSlotDirection(7, Quaternion(+M_PI_4*.5-M_PI, Vector(1,0,0)));
 
   this->secWeaponMan.setSlotCount(6);

branches/playability/src/world_entities/weapons/acid_launcher.cc

@@ -72 +72 @@
 {
   this->registerObject(this, AcidLauncher::_objectList);
-
+/*
   Animation3D* animation1 = this->getAnimation(WS_ACTIVATING, this);
   Animation3D* animation2 = this->getAnimation(WS_DEACTIVATING, this);
@@ -87 +87 @@
   this->setStateDuration(WS_RELOADING, 1.0f);
   this->setStateDuration(WS_ACTIVATING, .4);
-  this->setStateDuration(WS_DEACTIVATING, .4);
+  this->setStateDuration(WS_DEACTIVATING, .4);*/
 
-  this->setEnergyMax(10);
-  this->increaseEnergy(10);
+  this->setEnergyMax(100);
+  this->increaseEnergy(100);
   //this->minCharge = 2;
 
@@ -98 +98 @@
   this->loadModel("models/guns/turret1.obj", 1.0);
 
-  this->setEmissionPoint(1.684, 0.472, 0);
+  this->setEmissionPoint(1.0, 0, 0);
   this->getProjectileFactory()->prepare(50);
 
@@ -158 +158 @@
 
       pj->setParent(PNode::getNullParent());
-      pj->setAbsCoor(this->getEmissionPoint());
+      pj->setAbsCoor(this->getEmissionPoint() + VECTOR_RAND(.1));
       pj->setAbsDir(this->getAbsDir()+Quaternion(0,VECTOR_RAND(5)));
       pj->activate();