Changeset 3265 for code/branches/core4/src
- Timestamp:
- Jul 1, 2009, 1:24:30 PM (15 years ago)
- Location:
- code/branches/core4/src
- Files:
-
- 24 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/core4/src/core/ArgumentCompletionFunctions.cc
r3250 r3265 143 143 144 144 for (std::list<unsigned int>::const_iterator it = threadnumbers.begin(); it != threadnumbers.end(); ++it) 145 threads.push_back(ArgumentCompletionListElement( getConvertedValue<unsigned int,std::string>(*it)));145 threads.push_back(ArgumentCompletionListElement(multi_cast<std::string>(*it))); 146 146 147 147 return threads; -
code/branches/core4/src/core/ConfigFileManager.cc
r3250 r3265 124 124 { 125 125 if (this->additionalComment_ == "" || this->additionalComment_.size() == 0) 126 return (this->name_ + "[" + getConvertedValue<unsigned int,std::string>(this->index_, "0") + "]" + "=" + this->value_);127 else 128 return (this->name_ + "[" + getConvertedValue<unsigned int,std::string>(this->index_, "0") + "]=" + this->value_ + " " + this->additionalComment_);126 return (this->name_ + "[" + multi_cast<std::string>(this->index_, "0") + "]" + "=" + this->value_); 127 else 128 return (this->name_ + "[" + multi_cast<std::string>(this->index_, "0") + "]=" + this->value_ + " " + this->additionalComment_); 129 129 } 130 130 -
code/branches/core4/src/core/IRC.cc
r3196 r3265 68 68 { COUT(1) << "Error while initializing Tcl (IRC): " << e.what(); } 69 69 70 this->nickname_ = "orx" + getConvertedValue<int, std::string>((unsigned int)rand());70 this->nickname_ = "orx" + multi_cast<std::string>(static_cast<unsigned int>(rand())); 71 71 TclThreadManager::execute(threadID, "set nickname " + this->nickname_); 72 72 TclThreadManager::execute(threadID, "source irc.tcl"); -
code/branches/core4/src/core/TclThreadManager.cc
r3196 r3265 94 94 boost::mutex::scoped_lock bundles_lock(TclThreadManager::getInstance().bundlesMutex_); 95 95 TclThreadManager::getInstance().threadCounter_++; 96 std::string name = getConvertedValue<unsigned int,std::string>(TclThreadManager::getInstance().threadCounter_);96 std::string name = multi_cast<std::string>(TclThreadManager::getInstance().threadCounter_); 97 97 98 98 TclInterpreterBundle* bundle = new TclInterpreterBundle; … … 192 192 { 193 193 boost::mutex::scoped_lock queue_lock(TclThreadManager::getInstance().orxonoxInterpreterBundle_.queueMutex_); 194 output += getConvertedValue<unsigned int,std::string>(TclThreadManager::getInstance().orxonoxInterpreterBundle_.queue_.size());194 output += multi_cast<std::string>(TclThreadManager::getInstance().orxonoxInterpreterBundle_.queue_.size()); 195 195 } 196 196 output += "\t\t"; … … 201 201 for (std::map<unsigned int, TclInterpreterBundle*>::const_iterator it = TclThreadManager::getInstance().interpreterBundles_.begin(); it != TclThreadManager::getInstance().interpreterBundles_.end(); ++it) 202 202 { 203 std::string output = getConvertedValue<unsigned int,std::string>((*it).first);203 std::string output = multi_cast<std::string>((*it).first); 204 204 output += "\t\t"; 205 205 { 206 206 boost::mutex::scoped_lock queue_lock((*it).second->queueMutex_); 207 output += getConvertedValue<unsigned int,std::string>((*it).second->queue_.size());207 output += multi_cast<std::string>((*it).second->queue_.size()); 208 208 } 209 209 output += "\t\t"; … … 342 342 else 343 343 { 344 this->error("Error: No Tcl-interpreter with ID " + getConvertedValue<unsigned int,std::string>(threadID) + " existing.");344 this->error("Error: No Tcl-interpreter with ID " + multi_cast<std::string>(threadID) + " existing."); 345 345 return 0; 346 346 } … … 355 355 output += " "; 356 356 357 output += getConvertedValue<unsigned int,std::string>(*it);357 output += multi_cast<std::string>(*it); 358 358 } 359 359 return output; … … 444 444 if (bundle->queue_.size() >= TCLTHREADMANAGER_MAX_QUEUE_LENGTH) 445 445 { 446 this->error("Error: Queue of Tcl-interpreter " + getConvertedValue<unsigned int,std::string>(threadID) + " is full, couldn't add command.");446 this->error("Error: Queue of Tcl-interpreter " + multi_cast<std::string>(threadID) + " is full, couldn't add command."); 447 447 return; 448 448 } … … 492 492 if (std::find(target->queriers_.begin(), target->queriers_.end(), target->id_) != target->queriers_.end()) 493 493 { 494 this->error("Error: Circular query (" + this->dumpList(target->queriers_) + " -> " + getConvertedValue<unsigned int, std::string>(target->id_) + "), couldn't query Tcl-interpreter with ID " + getConvertedValue<unsigned int, std::string>(target->id_) + " from other interpreter with ID " + getConvertedValue<unsigned int,std::string>(querier->id_) + ".");494 this->error("Error: Circular query (" + this->dumpList(target->queriers_) + " -> " + multi_cast<std::string>(target->id_) + "), couldn't query Tcl-interpreter with ID " + multi_cast<std::string>(target->id_) + " from other interpreter with ID " + multi_cast<std::string>(querier->id_) + "."); 495 495 return false; 496 496 } … … 585 585 else 586 586 { 587 this->error("Error: Couldn't query Tcl-interpreter with ID " + getConvertedValue<unsigned int,std::string>(threadID) + ", interpreter is busy right now.");587 this->error("Error: Couldn't query Tcl-interpreter with ID " + multi_cast<std::string>(threadID) + ", interpreter is busy right now."); 588 588 } 589 589 } … … 665 665 catch (Tcl::tcl_error const &e) 666 666 { 667 TclThreadManager::getInstance().error("Tcl (ID " + getConvertedValue<unsigned int,std::string>(interpreterBundle->id_) + ") error: " + e.what());667 TclThreadManager::getInstance().error("Tcl (ID " + multi_cast<std::string>(interpreterBundle->id_) + ") error: " + e.what()); 668 668 } 669 669 catch (std::exception const &e) 670 670 { 671 TclThreadManager::getInstance().error("Error while executing Tcl (ID " + getConvertedValue<unsigned int,std::string>(interpreterBundle->id_) + "): " + e.what());671 TclThreadManager::getInstance().error("Error while executing Tcl (ID " + multi_cast<std::string>(interpreterBundle->id_) + "): " + e.what()); 672 672 } 673 673 -
code/branches/core4/src/core/input/KeyBinder.cc
r3196 r3265 187 187 for (unsigned int iDev = 0; iDev < numberOfJoySticks_; iDev++) 188 188 { 189 std::string deviceNumber = convertToString(iDev);189 std::string deviceNumber = multi_cast<std::string>(iDev); 190 190 // joy stick buttons 191 191 for (unsigned int i = 0; i < JoyStickButtonCode::numberOfButtons; i++) -
code/branches/core4/src/orxonox/objects/gametypes/UnderAttack.cc
r3196 r3265 173 173 if ( gameTime_ <= timesequence_ && gameTime_ > 0) 174 174 { 175 std::string message = convertToString(timesequence_) + " seconds left!";175 std::string message = multi_cast<std::string>(timesequence_) + " seconds left!"; 176 176 /* 177 177 COUT(0) << message << std::endl; -
code/branches/core4/src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.cc
r3196 r3265 56 56 this->materialBase_ = material; 57 57 58 BillboardProjectile::setMaterial(material + convertToString(this->textureIndex_));58 BillboardProjectile::setMaterial(material + multi_cast<std::string>(this->textureIndex_)); 59 59 } 60 60 -
code/branches/core4/src/orxonox/overlays/OrxonoxOverlay.cc
r3250 r3265 72 72 // create the Ogre::Overlay 73 73 overlay_ = Ogre::OverlayManager::getSingleton().create("OrxonoxOverlay_overlay_" 74 + convertToString(hudOverlayCounter_s++));74 + multi_cast<std::string>(hudOverlayCounter_s++)); 75 75 76 76 // create background panel (can be used to show any picture) 77 77 this->background_ = static_cast<Ogre::PanelOverlayElement*>( 78 78 Ogre::OverlayManager::getSingleton().createOverlayElement("Panel", 79 "OrxonoxOverlay_background_" + convertToString(hudOverlayCounter_s++)));79 "OrxonoxOverlay_background_" + multi_cast<std::string>(hudOverlayCounter_s++))); 80 80 this->overlay_->add2D(this->background_); 81 81 -
code/branches/core4/src/orxonox/overlays/console/InGameConsole.cc
r3262 r3265 220 220 for (int i = 0; i < LINES; i++) 221 221 { 222 this->consoleOverlayTextAreas_[i] = static_cast<Ogre::TextAreaOverlayElement*>(ovMan->createOverlayElement("TextArea", "InGameConsoleTextArea" + convertToString(i)));222 this->consoleOverlayTextAreas_[i] = static_cast<Ogre::TextAreaOverlayElement*>(ovMan->createOverlayElement("TextArea", "InGameConsoleTextArea" + multi_cast<std::string>(i))); 223 223 this->consoleOverlayTextAreas_[i]->setMetricsMode(Ogre::GMM_PIXELS); 224 224 this->consoleOverlayTextAreas_[i]->setFontName("MonofurConsole"); -
code/branches/core4/src/orxonox/overlays/hud/GametypeStatus.cc
r3239 r3265 70 70 { 71 71 if (gtinfo->isStartCountdownRunning()) 72 this->setCaption( convertToString((int)ceil(gtinfo->getStartCountdown())));72 this->setCaption(multi_cast<std::string>((int)ceil(gtinfo->getStartCountdown()))); 73 73 else if (ce->isA(Class(Spectator))) 74 74 this->setCaption("Press [Fire] to respawn"); -
code/branches/core4/src/orxonox/overlays/hud/HUDBar.cc
r3250 r3265 72 72 73 73 // create new material 74 std::string materialname = "barmaterial" + getConvertedValue<unsigned int,std::string>(materialcount_s++);74 std::string materialname = "barmaterial" + multi_cast<std::string>(materialcount_s++); 75 75 Ogre::MaterialPtr material = (Ogre::MaterialPtr)Ogre::MaterialManager::getSingleton().create(materialname, "General"); 76 76 material->getTechnique(0)->getPass(0)->setSceneBlending(Ogre::SBT_TRANSPARENT_ALPHA); -
code/branches/core4/src/orxonox/overlays/hud/HUDHealthBar.cc
r3239 r3265 83 83 { 84 84 this->setValue(this->owner_->getHealth() / this->owner_->getInitialHealth()); 85 this->textoverlay_->setCaption( convertToString((int)this->owner_->getHealth()));85 this->textoverlay_->setCaption(multi_cast<std::string>((int)this->owner_->getHealth())); 86 86 } 87 87 -
code/branches/core4/src/orxonox/overlays/hud/HUDNavigation.cc
r3250 r3265 142 142 // set text 143 143 int dist = (int) getDist2Focus(); 144 navText_->setCaption( convertToString(dist));145 float textLength = convertToString(dist).size() * navText_->getCharHeight() * 0.3;144 navText_->setCaption(multi_cast<std::string>(dist)); 145 float textLength = multi_cast<std::string>(dist).size() * navText_->getCharHeight() * 0.3; 146 146 147 147 /* -
code/branches/core4/src/orxonox/overlays/hud/HUDTimer.cc
r3239 r3265 59 59 if (gametype->getTimerIsActive()) 60 60 { 61 this->setCaption( convertToString((int)gametype->getTime() + 1));61 this->setCaption(multi_cast<std::string>((int)gametype->getTime() + 1)); 62 62 } 63 63 } -
code/branches/core4/src/orxonox/overlays/hud/PongScore.cc
r3239 r3265 83 83 { 84 84 name1 = player1->getName(); 85 score1 = convertToString(this->owner_->getScore(player1));85 score1 = multi_cast<std::string>(this->owner_->getScore(player1)); 86 86 } 87 87 … … 89 89 { 90 90 name2 = player2->getName(); 91 score2 = convertToString(this->owner_->getScore(player2));91 score2 = multi_cast<std::string>(this->owner_->getScore(player2)); 92 92 } 93 93 -
code/branches/core4/src/orxonox/overlays/hud/TeamBaseMatchScore.cc
r3239 r3265 71 71 if (this->owner_) 72 72 { 73 std::string bases1 = "(" + convertToString(this->owner_->getTeamBases(0)) + ")";74 std::string bases2 = "(" + convertToString(this->owner_->getTeamBases(1)) + ")";73 std::string bases1 = "(" + multi_cast<std::string>(this->owner_->getTeamBases(0)) + ")"; 74 std::string bases2 = "(" + multi_cast<std::string>(this->owner_->getTeamBases(1)) + ")"; 75 75 76 std::string score1 = convertToString(this->owner_->getTeamPoints(0));77 std::string score2 = convertToString(this->owner_->getTeamPoints(1));76 std::string score1 = multi_cast<std::string>(this->owner_->getTeamPoints(0)); 77 std::string score2 = multi_cast<std::string>(this->owner_->getTeamPoints(1)); 78 78 79 79 std::string output1; -
code/branches/core4/src/orxonox/overlays/stats/CreateLines.cc
r3196 r3265 99 99 // while (textColumns_.size() < numberOfColumns) 100 100 // { 101 // Ogre::TextAreaOverlayElement* tempTextArea = static_cast<Ogre::TextAreaOverlayElement*>(ovMan->createOverlayElement("TextArea", "StatsLineTextArea" + getName() + convertToString(lineIndex) + convertToString(colIndex)));101 // Ogre::TextAreaOverlayElement* tempTextArea = static_cast<Ogre::TextAreaOverlayElement*>(ovMan->createOverlayElement("TextArea", "StatsLineTextArea" + getName() + multi_cast<std::string>(lineIndex) + multi_cast<std::string>(colIndex))); 102 102 // textColumns_.push_back(tempTextArea); 103 103 // this->background_->addChild(tempTextArea); -
code/branches/core4/src/orxonox/tools/BillboardSet.cc
r3250 r3265 74 74 if (GameMode::showsGraphics()) 75 75 { 76 this->billboardSet_ = scenemanager->createBillboardSet("Billboard" + convertToString(BillboardSet::billboardSetCounter_s++), count);76 this->billboardSet_ = scenemanager->createBillboardSet("Billboard" + multi_cast<std::string>(BillboardSet::billboardSetCounter_s++), count); 77 77 this->billboardSet_->createBillboard(position); 78 78 this->billboardSet_->setMaterialName(file); … … 97 97 if (GameMode::showsGraphics()) 98 98 { 99 this->billboardSet_ = scenemanager->createBillboardSet("Billboard" + convertToString(BillboardSet::billboardSetCounter_s++), count);99 this->billboardSet_ = scenemanager->createBillboardSet("Billboard" + multi_cast<std::string>(BillboardSet::billboardSetCounter_s++), count); 100 100 this->billboardSet_->createBillboard(position, colour); 101 101 this->billboardSet_->setMaterialName(file); -
code/branches/core4/src/orxonox/tools/Mesh.cc
r3250 r3265 68 68 try 69 69 { 70 this->entity_ = this->scenemanager_->createEntity("Mesh" + convertToString(Mesh::meshCounter_s++), meshsource);70 this->entity_ = this->scenemanager_->createEntity("Mesh" + multi_cast<std::string>(Mesh::meshCounter_s++), meshsource); 71 71 this->entity_->setCastShadows(this->bCastShadows_); 72 72 -
code/branches/core4/src/orxonox/tools/ParticleInterface.cc
r3257 r3265 69 69 try 70 70 { 71 this->particleSystem_ = this->scenemanager_->createParticleSystem("particles" + getConvertedValue<unsigned int,std::string>(ParticleInterface::counter_s++), templateName);71 this->particleSystem_ = this->scenemanager_->createParticleSystem("particles" + multi_cast<std::string>(ParticleInterface::counter_s++), templateName); 72 72 this->setSpeedFactor(1.0f); 73 73 } -
code/branches/core4/src/orxonox/tools/TextureGenerator.cc
r3196 r3265 72 72 if (it == colourMap.end()) 73 73 { 74 std::string materialName = textureName + "_Material_" + convertToString(materialCount_s++);74 std::string materialName = textureName + "_Material_" + multi_cast<std::string>(materialCount_s++); 75 75 Ogre::MaterialPtr material = (Ogre::MaterialPtr)Ogre::MaterialManager::getSingleton().create(materialName, "General"); 76 76 material->getTechnique(0)->getPass(0)->setSceneBlending(Ogre::SBT_TRANSPARENT_ALPHA); -
code/branches/core4/src/util/Convert.h
r3250 r3265 361 361 } 362 362 363 // convert to string Shortcut364 template <class FromType>365 FORCEINLINE std::string convertToString(FromType value)366 {367 return getConvertedValue<FromType, std::string>(value);368 }369 370 // convert from string Shortcut371 template <class ToType>372 FORCEINLINE ToType convertFromString(std::string str)373 {374 return getConvertedValue<std::string, ToType>(str);375 }376 377 363 //////////////////////////////// 378 364 // Special string conversions // -
code/branches/core4/src/util/MultiTypeValue.h
r3257 r3265 139 139 inline operator bool() const { return getConvertedValue<T, bool> (this->value_, 0); } /** @brief Returns the current value, converted to the requested type. */ 140 140 inline operator void*() const { return getConvertedValue<T, void*> (this->value_, 0); } /** @brief Returns the current value, converted to the requested type. */ 141 inline operator std::string() const { return getConvertedValue<T, std::string> (this->value_, zeroise<std::string >()); } /** @brief Returns the current value, converted to the requested type. */142 inline operator orxonox::Vector2() const { return getConvertedValue<T, orxonox::Vector2> (this->value_, zeroise<orxonox::Vector2 >()); } /** @brief Returns the current value, converted to the requested type. */143 inline operator orxonox::Vector3() const { return getConvertedValue<T, orxonox::Vector3> (this->value_, zeroise<orxonox::Vector3 >()); } /** @brief Returns the current value, converted to the requested type. */144 inline operator orxonox::Vector4() const { return getConvertedValue<T, orxonox::Vector4> (this->value_, zeroise<orxonox::Vector4 >()); } /** @brief Returns the current value, converted to the requested type. */145 inline operator orxonox::ColourValue() const { return getConvertedValue<T, orxonox::ColourValue>(this->value_, zeroise<orxonox::ColourValue>()); } /** @brief Returns the current value, converted to the requested type. */146 inline operator orxonox::Quaternion() const { return getConvertedValue<T, orxonox::Quaternion> (this->value_, zeroise<orxonox::Quaternion >()); } /** @brief Returns the current value, converted to the requested type. */147 inline operator orxonox::Radian() const { return getConvertedValue<T, orxonox::Radian> (this->value_, zeroise<orxonox::Radian >()); } /** @brief Returns the current value, converted to the requested type. */148 inline operator orxonox::Degree() const { return getConvertedValue<T, orxonox::Degree> (this->value_, zeroise<orxonox::Degree >()); } /** @brief Returns the current value, converted to the requested type. */141 inline operator std::string() const { return getConvertedValue<T, std::string> (this->value_, NilValue<std::string >()); } /** @brief Returns the current value, converted to the requested type. */ 142 inline operator orxonox::Vector2() const { return getConvertedValue<T, orxonox::Vector2> (this->value_, NilValue<orxonox::Vector2 >()); } /** @brief Returns the current value, converted to the requested type. */ 143 inline operator orxonox::Vector3() const { return getConvertedValue<T, orxonox::Vector3> (this->value_, NilValue<orxonox::Vector3 >()); } /** @brief Returns the current value, converted to the requested type. */ 144 inline operator orxonox::Vector4() const { return getConvertedValue<T, orxonox::Vector4> (this->value_, NilValue<orxonox::Vector4 >()); } /** @brief Returns the current value, converted to the requested type. */ 145 inline operator orxonox::ColourValue() const { return getConvertedValue<T, orxonox::ColourValue>(this->value_, NilValue<orxonox::ColourValue>()); } /** @brief Returns the current value, converted to the requested type. */ 146 inline operator orxonox::Quaternion() const { return getConvertedValue<T, orxonox::Quaternion> (this->value_, NilValue<orxonox::Quaternion >()); } /** @brief Returns the current value, converted to the requested type. */ 147 inline operator orxonox::Radian() const { return getConvertedValue<T, orxonox::Radian> (this->value_, NilValue<orxonox::Radian >()); } /** @brief Returns the current value, converted to the requested type. */ 148 inline operator orxonox::Degree() const { return getConvertedValue<T, orxonox::Degree> (this->value_, NilValue<orxonox::Degree >()); } /** @brief Returns the current value, converted to the requested type. */ 149 149 150 150 /** @brief Puts the current value on the stream */ -
code/branches/core4/src/util/StringUtils.cc
r3250 r3265 44 44 std::string getUniqueNumberString() 45 45 { 46 return convertToString(getUniqueNumber());46 return multi_cast<std::string>(getUniqueNumber()); 47 47 } 48 48
Note: See TracChangeset
for help on using the changeset viewer.