Changeset 664 for code/branches

Timestamp:

Dec 21, 2007, 1:47:26 AM (17 years ago)

Author:

landauf

Message:

• bigger explosions
• changed camera orientation

Location:

code/branches/FICN/src

Files:

• audio/CMakeLists.txt (modified) (1 diff)
• orxonox/objects/Explosion.cc (modified) (2 diffs)
• orxonox/objects/SpaceShip.cc (modified) (1 diff)

code/branches/FICN/src/audio/CMakeLists.txt

@@ -12 +12 @@
 INCLUDE_DIRECTORIES(..)
 
-ADD_LIBRARY(audio SHARED ${SRC_FILES})
+IF(WIN32)
+  ADD_LIBRARY(audio ${SRC_FILES})
+ELSE(WIN32)
+  ADD_LIBRARY(audio SHARED ${SRC_FILES})
+ENDIF(WIN32)
 
 TARGET_LINK_LIBRARIES(audio ${OPENAL_LIBRARY} ${ALUT_LIBRARY} ${VORBISFILE_LIBRARY} ${VORBISENC_LIBRARY} ${VORBIS_LIBRARY} ${OGG_LIBRARY})

code/branches/FICN/src/orxonox/objects/Explosion.cc

@@ -17 +17 @@
             this->destroyTimer_.setTimer(this->lifetime_, false, this, &Explosion::destroyObject);
 
-            this->scale(1);
             Vector3 position = owner->getNode()->getWorldPosition();
 
@@ -23 +22 @@
             this->particle_->getParticleSystem()->setParameter("local_space", "true");
             this->particle_->newEmitter();
-            this->particle_->setPositionOfEmitter(0, position);
-            this->particle_->setPositionOfEmitter(1, position);
-//            this->particle_->setColour(ColourValue(1.0, 0.8, 0.2));
+            this->particle_->setPositionOfEmitter(0, Vector3::ZERO);
+            this->particle_->setPositionOfEmitter(1, Vector3::ZERO);
+            this->particle_->setColour(ColourValue(1.0, 0.8, 0.2));
+
+            this->setPosition(position);
+            this->scale(2);
 
             this->particle_->addToSceneNode(this->getNode());

code/branches/FICN/src/orxonox/objects/SpaceShip.cc

@@ -235 +235 @@
 */
 
-            cam->setPosition(Vector3(-150,0,50));
+            cam->setPosition(Vector3(-200,0,35));
 //            cam->setPosition(Vector3(0,-350,0));
-            cam->lookAt(Vector3(0,0,20));
+            cam->lookAt(Vector3(0,0,35));
             cam->roll(Degree(-90));