Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 658


Ignore:
Timestamp:
Dec 19, 2007, 11:08:56 PM (16 years ago)
Author:
nicolasc
Message:
  • fixed (possible) typo in network
  • some inlining in PI - probably more possible
Location:
code/branches/FICN
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • code/branches/FICN/bin/levels/sample.oxw

    r655 r658  
    2020                        <ogg src="tha_silent_partner_-_void" />
    2121                </ambient>
    22   </audio> 
     22  </audio>
    2323
    2424  <!-- Keep a minimum distance of >100 to the object, otherwise the camara thinks it's in the object -->
     
    4141    <NPC position="100,0,400" scale="1" mesh="razor.mesh"/>
    4242
    43 <!--    <Model position="200,0,500" scale="10" mesh="starship.mesh" yaw="-90" pitch="-90" />
    44     <Model position="-200,0,500" scale="10" mesh="drone.mesh" yaw="-90" pitch="-90" />-->
     43    <Model position="200,0,500" scale="10" mesh="starship.mesh" yaw="-90" pitch="-90" />
     44    <Model position="-200,0,500" scale="10" mesh="drone.mesh" yaw="-90" pitch="-90" />
    4545
    4646    <Model position="-200,1000,500" scale="10" mesh="hoover_body.mesh" yaw="-90" pitch="-90" />
  • code/branches/FICN/src/network/ClientConnection.h

    r657 r658  
    2828#define NETWORK_PORT 55556
    2929#define NETWORK_CLIENT_MAX_CONNECTIONS 5
    30 #define NETWORK_CLIENT_TIMEOUT 10x
     30#define NETWORK_CLIENT_TIMEOUT 10
    3131#define NETWORK_SEND_WAIT 5
    3232#define NETWORK_CLIENT_CHANNELS 2
  • code/branches/FICN/src/orxonox/particle/ParticleInterface.cc

    r647 r658  
    2424 *      ...
    2525 *
     26 */
     27
     28/**
     29 * @file ParticleInterface.cc
     30 * @brief class to control praticle effects
    2631 */
    2732
     
    7075  }
    7176
    72   void ParticleInterface::addToSceneNode( SceneNode* sceneNode )
    73   {
    74     sceneNode_ = sceneNode;
    75     sceneNode_->attachObject(particleSystem_);
    76   }
    77 
    78   void ParticleInterface::detachFromSceneNode ( void )
    79   {
    80     sceneNode_->detachObject(particleSystem_);
    81     sceneNode_ = NULL;
    82   }
    83 
    84   Real ParticleInterface::getVelocity()
    85   {
    86     return velocity_;
    87   }
    88 
    8977  void ParticleInterface::setVelocity(Real v)
    9078  {
     
    9482  }
    9583
    96   int ParticleInterface::getRate()
    97   {
    98     return rate_;
    99   }
    10084  void ParticleInterface::setRate(int r)
    10185  {
     
    10791  }
    10892
    109   Real ParticleInterface::getDistance()
    110   {
    111     return distance_;
    112   }
    113 
    11493  void ParticleInterface::setDistance(Real d)
    11594  {
     
    11998      particleSystem_->getEmitter(i)->setTimeToLive(distance_);
    12099    }
    121   }
    122   ColourValue ParticleInterface::getColour()
    123   {
    124     return colour_;
    125100  }
    126101
     
    147122  }
    148123
    149   void ParticleInterface::setPositionOfEmitter ( int emitterNr, Vector3 position )
    150   {
    151     particleSystem_->getEmitter(emitterNr)->setPosition(position);
    152   }
    153 
     124 // TODO check if this really works
    154125  Vector3 ParticleInterface::getPositionOfEmitter ( int emitterNr )
    155126  {
     
    164135  }
    165136
    166 
    167   Vector3 ParticleInterface::getDirection ( void )
    168   {
    169     return particleSystem_->getEmitter(0)->getDirection();
    170   }
    171 
    172137  void ParticleInterface::switchEnable(){
    173138    bool enable=(!(particleSystem_->getEmitter(0)->getEnabled()));
  • code/branches/FICN/src/orxonox/particle/ParticleInterface.h

    r646 r658  
    2121        ParticleInterface( Ogre::SceneManager *sceneManager, Ogre::String name, Ogre::String templateName );
    2222        ~ParticleInterface( void );
    23         void addToSceneNode( Ogre::SceneNode* sceneNode );
    24         void detachFromSceneNode( void );
     23
     24  void inline addToSceneNode( Ogre::SceneNode* sceneNode ) { sceneNode_ = sceneNode; sceneNode_->attachObject(particleSystem_);};
     25  void inline detachFromSceneNode( void ) { sceneNode_->detachObject(particleSystem_); sceneNode_ = NULL;};
     26
    2527        Ogre::ParticleEmitter* getEmitter ( int emitterNr );
    2628        void newEmitter ( void );
    27         void setPositionOfEmitter ( int emitterNr, Ogre::Vector3 position );
    28         Ogre::Vector3 getPositionOfEmitter ( int emitterNr );
     29
     30  Ogre::Vector3 getPositionOfEmitter ( int emitterNr );
     31  inline void setPositionOfEmitter ( int emitterNr, Ogre::Vector3 position ) { particleSystem_->getEmitter(emitterNr)->setPosition(position); };
     32
     33  inline Ogre::Vector3 getDirection ( void ) { return particleSystem_->getEmitter(0)->getDirection(); };
    2934        void setDirection ( Ogre::Vector3 direction );
    30         Ogre::Vector3 getDirection ( void );
    31         Ogre::Real getVelocity();
     35
     36        inline Ogre::Real getVelocity() {return velocity_; };
    3237        void setVelocity( Ogre::Real v );
    33         int getRate();
     38
     39        inline int getRate() { return rate_; };
    3440        void setRate( int r );
    35         Ogre::Real getDistance();
     41
     42        inline Ogre::Real getDistance() { return distance_; };
    3643        void setDistance( Ogre::Real d );
    37         Ogre::ColourValue getColour( void );
     44
     45        inline Ogre::ColourValue getColour( void ) {return colour_;};
    3846        void setColour( Ogre::ColourValue colour );
     47
    3948        void switchEnable( void );
    4049
    41   Ogre::ParticleSystem* getParticleSystem() {return this->particleSystem_; };
     50  inline Ogre::ParticleSystem* getParticleSystem() {return this->particleSystem_; };
    4251
    4352 private:
Note: See TracChangeset for help on using the changeset viewer.