Changeset 976 for code/trunk

Timestamp:

Apr 3, 2008, 1:59:46 PM (17 years ago)

Author:

FelixSchulthess

Message:

changed level file so → trunk runnable

Location:

code/trunk

Files:

• bin/levels/sample.oxw (modified) (3 diffs)
• src/orxonox/objects/SpaceShip.cc (modified) (3 diffs)
• src/orxonox/objects/SpaceShip.h (modified) (1 diff)

code/trunk/bin/levels/sample.oxw

@@ -15 +15 @@
 
 <!--Fighter camera="true" position="0,0,0" scale="10" yawpitchroll="-90,-90,0" mesh="assf3.mesh"  forward="500" rotateupdown="200" rotaterightleft="200" looprightleft="200" /-->
-<SpaceShip camera="true" position="0,0,0" scale="10" yawpitchroll="-90,-90,0" mesh="assf5.mesh" maxSpeed="500" maxSideAndBackSpeed="50" maxRotation="1.0" transAcc="200" rotAcc="3.0" transDamp="75" rotDamp="1.0" />
+<SpaceShip camera="true" position="0,0,0" scale="10" yawpitchroll="-90,-90,0" mesh="assf3.mesh" maxSpeed="500" maxSideAndBackSpeed="50" maxRotation="1.0" transAcc="200" rotAcc="3.0" transDamp="75" rotDamp="1.0" />
 
 <NPC position="0,100,400" scale="1" mesh="razor.mesh"/>
@@ -23 +23 @@
 <NPC position="100,0,400" scale="1" mesh="razor.mesh"/>
 
+<!--
 <Model name="starship" position="200,0,500" scale="10" mesh="starship.mesh" yawpitchroll="-90,-90,0" />
 <Model name="drone" position="-200,0,500" scale="10" mesh="drone.mesh" yawpitchroll="-90,-90,0">
@@ -33 +34 @@
   </attached>
 </Model>
+-->
 
 <Model position="-200,1000,500" scale="10" mesh="hoover_body.mesh" yawpitchroll="-90,-90,0" />

code/trunk/src/orxonox/objects/SpaceShip.cc

@@ -141 +141 @@
         this->tt_->getParticleSystem()->setParameter("local_space","true");
         this->tt_->newEmitter();
+        this->tt_->newEmitter();
+
 /*
         this->tt_->setDirection(Vector3(0,0,1));
@@ -147 +149 @@
 */
         this->tt_->setDirection(Vector3(-1,0,0));
-        this->tt_->setPositionOfEmitter(0, Vector3(-15,20,-1));
-        this->tt_->setPositionOfEmitter(1, Vector3(-15,-20,-1));
+        this->tt_->setPositionOfEmitter(0, Vector3(-35,31,-3));
+        this->tt_->setPositionOfEmitter(1, Vector3(-35,-31,-3));
+        this->tt_->setPositionOfEmitter(2, Vector3(-48,0,20));
         this->tt_->setVelocity(50);
 
@@ -162 +165 @@
         this->greenBillboard_.setBillboardSet("Examples/Flare", ColourValue(0.0, 1.0, 0.0), 1);
 
-        this->redNode_ = this->getNode()->createChildSceneNode(this->getName() + "red", Vector3(0.3, 4.7, -0.3));
+        this->redNode_ = this->getNode()->createChildSceneNode(this->getName() + "red", Vector3(-0.9, 3.3, -0.4));
         this->redNode_->setInheritScale(false);
-        this->greenNode_ = this->getNode()->createChildSceneNode(this->getName() + "green", Vector3(0.3, -4.7, -0.3));
+        this->greenNode_ = this->getNode()->createChildSceneNode(this->getName() + "green", Vector3(-0.9, -3.3, -0.4));
         this->greenNode_->setInheritScale(false);
 

code/trunk/src/orxonox/objects/SpaceShip.h

@@ -84 +84 @@
             float mouseY_;
 
-            int emitterRate_;
+            float emitterRate_;
     };
 }