Changeset 8586 for code/branches/presentation
- Timestamp:
- May 25, 2011, 11:07:46 PM (14 years ago)
- Location:
- code/branches/presentation/src/modules
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation/src/modules/docking/DockingController.h
r8568 r8586 39 39 namespace orxonox 40 40 { 41 class _ OrxonoxExport DockingController : public ArtificialController, public Tickable41 class _DockingExport DockingController : public ArtificialController, public Tickable 42 42 { 43 43 public: -
code/branches/presentation/src/modules/docking/DockingPrereqs.h
r8561 r8586 43 43 //----------------------------------------------------------------------- 44 44 45 #if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(D ocking_STATIC_BUILD)46 # ifdef D ocking_SHARED_BUILD45 #if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(DOCKING_STATIC_BUILD) 46 # ifdef DOCKING_SHARED_BUILD 47 47 # define _DockingExport __declspec(dllexport) 48 48 # else -
code/branches/presentation/src/modules/tetris/Tetris.cc
r8567 r8586 127 127 assert(stone); 128 128 129 if(position.y < this->center_->getStoneSize()/2.0 ) //!< If the stone has reached the bottom of the level130 { 131 stone->setPosition(Vector3(stone->getPosition().x, this->center_->getStoneSize()/2.0 , stone->getPosition().z));129 if(position.y < this->center_->getStoneSize()/2.0f) //!< If the stone has reached the bottom of the level 130 { 131 stone->setPosition(Vector3(stone->getPosition().x, this->center_->getStoneSize()/2.0f, stone->getPosition().z)); 132 132 return false; 133 133 } … … 257 257 // Attach the stone to the Centerpoint and set the position of the stone to be at the top middle. 258 258 this->center_->attach(stone); 259 float xPos = (this->center_->getWidth()/2 + ((this->center_->getWidth() % 2)*2-1)/2.0 )*this->center_->getStoneSize();260 float yPos = (this->center_->getHeight()-0.5 )*this->center_->getStoneSize();259 float xPos = (this->center_->getWidth()/2 + ((this->center_->getWidth() % 2)*2-1)/2.0f)*this->center_->getStoneSize(); 260 float yPos = (this->center_->getHeight()-0.5f)*this->center_->getStoneSize(); 261 261 stone->setPosition(xPos, yPos, 0.0f); 262 262 stone->setGame(this);
Note: See TracChangeset
for help on using the changeset viewer.