- Timestamp:
- May 23, 2012, 5:56:57 PM (13 years ago)
- Location:
- code/branches/captureTheFlag
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/captureTheFlag
- Property svn:mergeinfo changed
/code/branches/waypoints (added) merged: 9032,9043,9054,9093,9105,9159,9177,9219
- Property svn:mergeinfo changed
-
code/branches/captureTheFlag/src/orxonox/overlays/OrxonoxOverlay.cc
r8858 r9232 42 42 #include <OgreTechnique.h> 43 43 #include <OgrePass.h> 44 #include <OgreEntity.h> 44 45 45 46 #include "util/Convert.h" … … 83 84 "OrxonoxOverlay_background_" + multi_cast<std::string>(hudOverlayCounter_s++))); 84 85 this->overlay_->add2D(this->background_); 86 87 overlay3d_ = new Ogre::SceneNode(NULL); 88 this->overlay_->add3D(overlay3d_); 85 89 86 90 // Get aspect ratio from the render window. Later on, we get informed automatically … … 448 452 tempTx->setColourOperationEx(Ogre::LBX_MODULATE, Ogre::LBS_MANUAL, Ogre::LBS_CURRENT, colour); 449 453 } 454 void OrxonoxOverlay::add3DMesh(Ogre::Entity* entity) 455 { 456 this->overlay3d_->attachObject(entity); 457 } 458 450 459 }
Note: See TracChangeset
for help on using the changeset viewer.