- Timestamp:
- Dec 30, 2007, 6:56:58 PM (17 years ago)
- Location:
- code/branches/FICN
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/FICN/CMakeLists.txt
r727 r728 1 2 1 PROJECT(Orxonox) 3 2 #set some global variables, which are used throughout the project … … 58 57 59 58 60 61 59 #This sets where to look for "Find*.cmake" files 62 60 SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) -
code/branches/FICN/src/audio/CMakeLists.txt
r665 r728 18 18 ENDIF(WIN32) 19 19 20 TARGET_LINK_LIBRARIES(audio ${OPENAL_LIBRARY} ${ALUT_LIBRARY} ${VORBISFILE_LIBRARY} ${VORBISENC_LIBRARY} ${VORBIS_LIBRARY} ${OGG_LIBRARY}) 20 TARGET_LINK_LIBRARIES( 21 audio 22 ${OPENAL_LIBRARY} 23 ${ALUT_LIBRARY} 24 ${VORBISFILE_LIBRARY} 25 ${VORBISENC_LIBRARY} 26 ${VORBIS_LIBRARY} 27 ${OGG_LIBRARY} 28 ) 21 29 22 30 -
code/branches/FICN/src/misc/testing/TestConverter.cpp
r727 r728 4 4 int main(int argc, char** argv) 5 5 { 6 int input = 5;6 int input = rand(); 7 7 std::string sub; 8 8 int output = 0; -
code/branches/FICN/src/orxonox/core/CorePrereqs.h
r708 r728 27 27 28 28 /** 29 @file OrxonoxPrereq. cc29 @file OrxonoxPrereq.h 30 30 @brief Contains all the necessary forward declarations for all classes, structs and enums. 31 31 */ -
code/branches/FICN/src/orxonox/core/Language.cc
r725 r728 142 142 143 143 // Make sure we don't create a duplicate entry 144 if ( !it->second)144 if (it == this->languageEntries_.end()) 145 145 { 146 146 LanguageEntry* newEntry = new LanguageEntry(entry); … … 161 161 void Language::addEntry(const LanguageEntryName& name, const std::string& entry) 162 162 { 163 COUT(5) << "Called addEntry with\n name: " << name << "\n entry: " << entry << std::endl; 163 164 std::map<std::string, LanguageEntry*>::const_iterator it = this->languageEntries_.find(name); 164 if ( !it->second)165 if (it == this->languageEntries_.end()) 165 166 { 166 167 // The entry isn't available yet, meaning it's new, so create it … … 180 181 // Write the default language file because either a new entry was created or an existing entry has changed 181 182 this->writeDefaultLanguageFile(); 183 182 184 } 183 185 … … 190 192 { 191 193 std::map<std::string, LanguageEntry*>::const_iterator it = this->languageEntries_.find(name); 192 if (it ->second)194 if (it != this->languageEntries_.end()) 193 195 return it->second->getTranslation(); 194 196 else … … 294 296 295 297 // Check if the entry exists 296 if (it ->second)298 if (it != this->languageEntries_.end()) 297 299 it->second->setTranslation(lineString.substr(pos + 1)); 298 300 else -
code/branches/FICN/src/orxonox/core/Language.h
r725 r728 63 63 void setDefault(const std::string& fallbackEntry); 64 64 65 /** @brief Returns the translated entry in the configured language. @return The translated entry */ 65 /** 66 @brief Returns the translated entry in the configured language. 67 @return The translated entry 68 */ 66 69 inline const std::string& getTranslation() 67 70 { return this->translatedEntry_; } 68 71 69 /** @brief Returns the default entry. @return The default entry */ 72 /** 73 @brief Returns the default entry. 74 @return The default entry 75 */ 70 76 inline const std::string& getDefault() 71 77 { return this->fallbackEntry_; } -
code/branches/FICN/src/orxonox/objects/NPC.h
r708 r728 42 42 static int const ALIGNMENTDISTANCE = 300; //detectionradius of alignment 43 43 static int const COHESIONDISTANCE = 5000; //detectionradius of cohesion 44 static int const ANZELEMENTS = 9; //number of elements44 static int const NUMELEMENTS = 9; //number of elements 45 45 }; 46 46 -
code/branches/FICN/src/orxonox/particle/ParticleInterface.cc
r715 r728 67 67 { 68 68 //Abgleichen der anderen Emitter an die Variabeln 69 for (int i=1; i <numberOfEmitters_; i++) {69 for (int i=1; i < numberOfEmitters_; i++) { 70 70 particleSystem_->getEmitter(i)->setColour( colour_ ); 71 71 particleSystem_->getEmitter(i)->setTimeToLive( distance_ ); … … 130 130 void ParticleInterface::setDirection ( Vector3 direction ) 131 131 { 132 for(int i=0; i <numberOfEmitters_; i++) {132 for(int i=0; i < numberOfEmitters_; i++) { 133 133 particleSystem_->getEmitter(i)->setDirection(direction); 134 134 } … … 137 137 void ParticleInterface::switchEnable(){ 138 138 bool enable=(!(particleSystem_->getEmitter(0)->getEnabled())); 139 for(int i=0; i <numberOfEmitters_; i++) {139 for(int i=0; i < numberOfEmitters_; i++) { 140 140 particleSystem_->getEmitter(i)->setEnabled(enable); 141 141 } -
code/branches/FICN/src/orxonox/particle/ParticleInterface.h
r716 r728 28 28 ~ParticleInterface( void ); 29 29 30 void inline addToSceneNode( Ogre::SceneNode* sceneNode ) { sceneNode_ = sceneNode; sceneNode_->attachObject(particleSystem_);}; 31 void inline detachFromSceneNode( void ) { sceneNode_->detachObject(particleSystem_); sceneNode_ = NULL;}; 30 inline void addToSceneNode( Ogre::SceneNode* sceneNode ) 31 { sceneNode_ = sceneNode; sceneNode_->attachObject(particleSystem_);}; 32 inline void detachFromSceneNode( void ) 33 { sceneNode_->detachObject(particleSystem_); sceneNode_ = NULL;}; 32 34 33 35 Ogre::ParticleEmitter* getEmitter ( int emitterNr ); … … 35 37 36 38 Vector3 getPositionOfEmitter ( int emitterNr ); 37 inline void setPositionOfEmitter ( int emitterNr, Vector3 position ) { particleSystem_->getEmitter(emitterNr)->setPosition(position); }; 39 inline void setPositionOfEmitter ( int emitterNr, Vector3 position ) 40 { particleSystem_->getEmitter(emitterNr)->setPosition(position); }; 38 41 39 inline Vector3 getDirection ( void ) { return particleSystem_->getEmitter(0)->getDirection(); }; 42 inline Vector3 getDirection ( void ) 43 { return particleSystem_->getEmitter(0)->getDirection(); }; 40 44 void setDirection ( Vector3 direction ); 41 45 42 inline Real getVelocity() {return velocity_; }; 46 inline Real getVelocity() 47 {return velocity_; }; 43 48 void setVelocity( Real v ); 44 49 45 inline int getRate() { return rate_; }; 50 inline int getRate() 51 { return rate_; }; 46 52 void setRate( int r ); 47 53 48 inline Real getDistance() { return distance_; }; 54 inline Real getDistance() 55 { return distance_; }; 49 56 void setDistance( Real d ); 50 57 51 inline ColourValue getColour( void ) {return colour_;}; 58 inline ColourValue getColour( void ) 59 {return colour_;}; 52 60 void setColour( ColourValue colour ); 53 61 54 62 void switchEnable(); 55 63 56 inline Ogre::ParticleSystem* getParticleSystem() { return this->particleSystem_; }; 64 inline Ogre::ParticleSystem* getParticleSystem() 65 { return this->particleSystem_; }; 57 66 58 67 private:
Note: See TracChangeset
for help on using the changeset viewer.