Changeset 537 for code/branches

Timestamp:

Dec 16, 2007, 1:07:59 AM (17 years ago)

Author:

nicolasc

Message:

got particle system wroking

Location:

code/branches/FICN

Files:

• Media/materials/scripts/assf2.material (modified) (1 diff)
• Media/particle/schuss.particle (modified) (1 diff)
• bin/levels/sample.oxw (modified) (2 diffs)
• src/orxonox/orxonox.cc (modified) (3 diffs)

code/branches/FICN/Media/materials/scripts/assf2.material

@@ -9 +9 @@
                         texture_unit
                         {
-                                texture human_assf.jpg
+                                texture human_assf.png
                         }
                 }

code/branches/FICN/Media/particle/schuss.particle

@@ -1 @@
-
-Orxonox/Schuss
+Orxonox/schuss
 {
         quota   5000

code/branches/FICN/bin/levels/sample.oxw

@@ -9 +9 @@
                 <bar top="200" left="50" width="300" height="20" image="textures/load_screens/ambush-loadbar.png" />
         </loading>
-        
+
         <audio>
-                        
+
         </audio>
-        
+
         <world>
-                
-                <SceneNode name="OgreHeadNode" pos="0,0,0" />                           
 
-                <Camera name="Camera" pos="0,0,100" lookat="0,0,0" node="OgreHeadNode" />
+                <SceneNode name="OgreHeadNode" pos="0,0,0" />
+
+                <Camera name="Camera" pos="0,0,-100" lookat="0,0,0" node="OgreHeadNode" />
 
                 <Ambient colourvalue="1,1,1" />
-        
+
                 <Skybox src="Orxonox/BlueStarSkyBox" />
 
                 <Entity name="ASSF" src="assf2.mesh" node="OgreHeadNode" />
 
-                <SceneNode name="Ogre1" pos="0,200,0" />                                
+                <SceneNode name="Ogre1" pos="0,200,0" />
                 <Entity name="head1" src="ogrehead.mesh" node="Ogre1" />
 
-                <SceneNode name="Ogre2" pos="200,0,0" />                                
+                <SceneNode name="Ogre2" pos="200,0,0" />
                 <Entity name="head2" src="ogrehead.mesh" node="Ogre2" />
 
-                <SceneNode name="Ogre3" pos="0,0,200" />                                
+                <SceneNode name="Ogre3" pos="0,0,200" />
                 <Entity name="head3" src="ogrehead.mesh" node="Ogre3" />
 
@@ -40 +40 @@
 <!-- Unused at the moment -->
                 <SpaceshipSteeringObject node="OgreHeadNode" forward="500" rotateupdown="200" rotaterightleft="200" looprightleft="200" />
-        
 
 
-        <scripts> 
+
+        <scripts>
                 <script file="intro.lua" />
         </scripts>

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

@@ -391 +391 @@
   }
 
+  /**
+   *
+   * @param
+   */
   void Orxonox::createScene(void)
   {
@@ -414 +418 @@
 
 
+  /**
+   *
+   */
   void Orxonox::setupScene()
   {
@@ -425 +432 @@
     steering_->addNode(node);
 
-/*
-    particle::ParticleInterface *e = new particle::ParticleInterface(mgr,"engine","strahl");
+
+    particle::ParticleInterface *e = new particle::ParticleInterface(mgr,"engine","Orxonox/strahl");
     e->particleSystem_->setParameter("local_space","true");
-    e->setPositionOfEmitter(0, Vector3(0,0,-10));
-    e->setDirection(Vector3(0,0,-1));*/
-//     e->addToSceneNode(node);
-
-
+    e->setPositionOfEmitter(0, Vector3(0,-10,200));
+    e->setDirection(Vector3(0,0,-1));
+    e->addToSceneNode(node);
+
+    particle::ParticleInterface *w = new particle::ParticleInterface(mgr,"schuss","Orxonox/schuss");
+    w->particleSystem_->setParameter("local_space","true");
+    w->newEmitter();
+    w->setDirection(Vector3(0,0,1));
+    w->setPositionOfEmitter(0, Vector3(10,10,0));
+    w->setPositionOfEmitter(1, Vector3(-10,10,0));
+    w->addToSceneNode(node);
   }