Changeset 10635 in orxonox.OLD for branches/vs-enhencements
- Timestamp:
- Apr 19, 2007, 1:13:11 PM (18 years ago)
- Location:
- branches/vs-enhencements/src/world_entities
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/vs-enhencements/src/world_entities/effects/billboard.cc
r10633 r10635 11 11 ### File Specific: 12 12 main-programmer: David Hasenfratz 13 co-programmer: Nicolas Schlumberger 13 14 */ 14 15 … … 73 74 this->bPulse = false; 74 75 75 this->angularSpeed = M_ PI; //180;76 this->angularSpeed = M_2_PI; //360; 76 77 this->angle = 0; 77 78 … … 122 123 { 123 124 this->angle += dt * this->angularSpeed; 124 if (this->angle > 2 * M_PI)125 this->angle -= 2 * M_PI;125 if (this->angle > M_2_PI) 126 this->angle -= M_2_PI; 126 127 } 127 128 … … 158 159 float tmp = 1; 159 160 if (this->bPulse) 160 tmp = 1 +this->pulseMagnitude * updatePulse(this->angle);161 tmp += this->pulseMagnitude * updatePulse(this->angle); 161 162 162 163 v *= sizeX * tmp; -
branches/vs-enhencements/src/world_entities/effects/billboard.h
r10633 r10635 31 31 inline float getPulse () { return this->bPulse; }; 32 32 33 inline void setPulseMagnitude(float mag) {this->pulseMagnitude = mag; }; 34 33 35 virtual void tick(float dt); 34 36 virtual void draw() const; -
branches/vs-enhencements/src/world_entities/projectiles/lbolt.cc
r10618 r10635 65 65 this->halo->setVisibility(false); 66 66 67 this->halo->setPulse(); 67 68 68 69 } … … 148 149 149 150 angle += LBolt::rotationSpeed * dt; 151 if(angle > 360) 152 angle -= 360; 150 153 151 154 for( ObjectList<NPC>::const_iterator eIterator = NPC::objectList().begin(); eIterator !=NPC::objectList().end(); eIterator++) … … 183 186 float matrix[4][4]; 184 187 glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z); 185 Vector tmpRot = this->getAbsDir().getSpacialAxis(); 188 this->halo->draw(); 189 190 Vector tmpRot; 191 tmpRot = this->flightDirection.getNormalized(); 192 glRotatef(this->angle, tmpRot.x, tmpRot.y, tmpRot.z); 193 tmpRot = this->getAbsDir().getSpacialAxis(); 186 194 glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z ); 187 glRotatef(this->angle, 1.0, 0.0, 0.0); 195 188 196 this->getAbsDir().matrix (matrix); 189 197 glMultMatrixf((float*)matrix); 190 198 this->getModel()->draw(); 191 199 192 this->halo->draw();193 194 200 glPopMatrix(); 195 201 glPopAttrib(); -
branches/vs-enhencements/src/world_entities/projectiles/mbolt.cc
r10618 r10635 212 212 float matrix[4][4]; 213 213 glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z); 214 glRotatef(this->angle, 1.0f, 0.0f, 0.0f); //spinning missile 214 // glRotatef(this->angle, 1.0f, 0.0f, 0.0f); //spinning missile 215 glRotatef(this->angle, this->flightDirection.x, this->flightDirection.y, this->flightDirection.z); 215 216 this->getAbsDir().matrix (matrix); 216 217 glMultMatrixf((float*)matrix);
Note: See TracChangeset
for help on using the changeset viewer.