Changeset 658

Timestamp:

Dec 19, 2007, 11:08:56 PM (17 years ago)

Author:

nicolasc

Message:

• fixed (possible) typo in network
• some inlining in PI - probably more possible

Location:

code/branches/FICN

Files:

• bin/levels/sample.oxw (modified) (2 diffs)
• src/network/ClientConnection.h (modified) (1 diff)
• src/orxonox/particle/ParticleInterface.cc (modified) (7 diffs)
• src/orxonox/particle/ParticleInterface.h (modified) (1 diff)

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

@@ -20 +20 @@
                         <ogg src="tha_silent_partner_-_void" />
                 </ambient>
-  </audio> 
+  </audio>
 
   <!-- Keep a minimum distance of >100 to the object, otherwise the camara thinks it's in the object -->
@@ -41 +41 @@
     <NPC position="100,0,400" scale="1" mesh="razor.mesh"/>
 
-<!--    <Model position="200,0,500" scale="10" mesh="starship.mesh" yaw="-90" pitch="-90" />
-    <Model position="-200,0,500" scale="10" mesh="drone.mesh" yaw="-90" pitch="-90" />-->
+    <Model position="200,0,500" scale="10" mesh="starship.mesh" yaw="-90" pitch="-90" />
+    <Model position="-200,0,500" scale="10" mesh="drone.mesh" yaw="-90" pitch="-90" />
 
     <Model position="-200,1000,500" scale="10" mesh="hoover_body.mesh" yaw="-90" pitch="-90" />

code/branches/FICN/src/network/ClientConnection.h

@@ -28 +28 @@
 #define NETWORK_PORT 55556
 #define NETWORK_CLIENT_MAX_CONNECTIONS 5
-#define NETWORK_CLIENT_TIMEOUT 10x
+#define NETWORK_CLIENT_TIMEOUT 10
 #define NETWORK_SEND_WAIT 5
 #define NETWORK_CLIENT_CHANNELS 2

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

@@ -24 +24 @@
  *      ...
  *
+ */
+
+/**
+ * @file ParticleInterface.cc
+ * @brief class to control praticle effects
  */
 
@@ -70 +75 @@
   }
 
-  void ParticleInterface::addToSceneNode( SceneNode* sceneNode )
-  {
-    sceneNode_ = sceneNode;
-    sceneNode_->attachObject(particleSystem_);
-  }
-
-  void ParticleInterface::detachFromSceneNode ( void )
-  {
-    sceneNode_->detachObject(particleSystem_);
-    sceneNode_ = NULL;
-  }
-
-  Real ParticleInterface::getVelocity()
-  {
-    return velocity_;
-  }
-
   void ParticleInterface::setVelocity(Real v)
   {
@@ -94 +82 @@
   }
 
-  int ParticleInterface::getRate()
-  {
-    return rate_;
-  }
   void ParticleInterface::setRate(int r)
   {
@@ -107 +91 @@
   }
 
-  Real ParticleInterface::getDistance()
-  {
-    return distance_;
-  }
-
   void ParticleInterface::setDistance(Real d)
   {
@@ -119 +98 @@
       particleSystem_->getEmitter(i)->setTimeToLive(distance_);
     }
-  }
-  ColourValue ParticleInterface::getColour()
-  {
-    return colour_;
   }
 
@@ -147 +122 @@
   }
 
-  void ParticleInterface::setPositionOfEmitter ( int emitterNr, Vector3 position )
-  {
-    particleSystem_->getEmitter(emitterNr)->setPosition(position);
-  }
-
+ // TODO check if this really works
   Vector3 ParticleInterface::getPositionOfEmitter ( int emitterNr )
   {
@@ -164 +135 @@
   }
 
-
-  Vector3 ParticleInterface::getDirection ( void )
-  {
-    return particleSystem_->getEmitter(0)->getDirection();
-  }
-
   void ParticleInterface::switchEnable(){
     bool enable=(!(particleSystem_->getEmitter(0)->getEnabled()));

code/branches/FICN/src/orxonox/particle/ParticleInterface.h

@@ -21 +21 @@
         ParticleInterface( Ogre::SceneManager *sceneManager, Ogre::String name, Ogre::String templateName );
         ~ParticleInterface( void );
-        void addToSceneNode( Ogre::SceneNode* sceneNode );
-        void detachFromSceneNode( void );
+
+  void inline addToSceneNode( Ogre::SceneNode* sceneNode ) { sceneNode_ = sceneNode; sceneNode_->attachObject(particleSystem_);};
+  void inline detachFromSceneNode( void ) { sceneNode_->detachObject(particleSystem_); sceneNode_ = NULL;};
+
         Ogre::ParticleEmitter* getEmitter ( int emitterNr );
         void newEmitter ( void );
-        void setPositionOfEmitter ( int emitterNr, Ogre::Vector3 position );
-        Ogre::Vector3 getPositionOfEmitter ( int emitterNr );
+
+  Ogre::Vector3 getPositionOfEmitter ( int emitterNr );
+  inline void setPositionOfEmitter ( int emitterNr, Ogre::Vector3 position ) { particleSystem_->getEmitter(emitterNr)->setPosition(position); };
+
+  inline Ogre::Vector3 getDirection ( void ) { return particleSystem_->getEmitter(0)->getDirection(); };
         void setDirection ( Ogre::Vector3 direction );
-        Ogre::Vector3 getDirection ( void );
-        Ogre::Real getVelocity();
+
+        inline Ogre::Real getVelocity() {return velocity_; };
         void setVelocity( Ogre::Real v );
-        int getRate();
+
+        inline int getRate() { return rate_; };
         void setRate( int r );
-        Ogre::Real getDistance();
+
+        inline Ogre::Real getDistance() { return distance_; };
         void setDistance( Ogre::Real d );
-        Ogre::ColourValue getColour( void );
+
+        inline Ogre::ColourValue getColour( void ) {return colour_;};
         void setColour( Ogre::ColourValue colour );
+
         void switchEnable( void );
 
-  Ogre::ParticleSystem* getParticleSystem() {return this->particleSystem_; };
+  inline Ogre::ParticleSystem* getParticleSystem() {return this->particleSystem_; };
 
  private: