- Timestamp:
- Sep 4, 2005, 10:20:59 PM (19 years ago)
- Location:
- trunk/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/orxonox.cc
r5098 r5158 21 21 ### File Specific: 22 22 main-programmer: Patrick Boenzli 23 23 co-programmer: Christian Meyer 24 24 co-programmer: Benjamin Grauer: injected ResourceManager/GraphicsEngine/GUI 25 25 */ … … 31 31 #include "world.h" 32 32 #include "ini_parser.h" 33 #include "game_loader.h" 33 #include "game_loader.h" 34 34 35 35 //ENGINES -
trunk/src/util/shell.cc
r5157 r5158 56 56 //this->bufferSize = 0; 57 57 this->bufferText = NULL; 58 this->setBufferSize(10 0);58 this->setBufferSize(10); 59 59 this->bufferDisplaySize = 10; 60 60 this->setAbsCoor2D(3, -400); … … 184 184 this->bufferText[i]->setText(this->bufferIterator->prevElement(), false); 185 185 } 186 186 187 187 188 /** … … 632 633 glBlendFunc(GL_SRC_ALPHA, GL_ONE); 633 634 634 // glBindTexture(GL_TEXTURE_2D, this->texture);635 glBegin(GL_ QUADS);636 637 // glTexCoord2f(this->texCoord.minU, this->texCoord.minV);635 glBindTexture(GL_TEXTURE_2D, 0); 636 glBegin(GL_TRIANGLE_STRIP); 637 638 glTexCoord2f(0, 0); 638 639 glVertex2f(this->getAbsCoor2D().x, this->getAbsCoor2D().y ); 639 640 640 // glTexCoord2f(this->texCoord.maxU, this->texCoord.minV);641 glTexCoord2f(1, 0); 641 642 glVertex2f(GraphicsEngine::getInstance()->getResolutionX() - this->getAbsCoor2D().x, this->getAbsCoor2D().y ); 642 643 643 // glTexCoord2f(this->texCoord.maxU, this->texCoord.maxV); 644 glTexCoord2f(0, 1); 645 glVertex2f(this->getAbsCoor2D().x, this->getAbsCoor2D().y + this->shellHeight); 646 647 glTexCoord2f(1, 1); 644 648 glVertex2f(GraphicsEngine::getInstance()->getResolutionX() - this->getAbsCoor2D().x, this->getAbsCoor2D().y + this->shellHeight); 645 646 // glTexCoord2f(this->texCoord.minU, this->texCoord.maxV);647 glVertex2f(this->getAbsCoor2D().x, this->getAbsCoor2D().y + this->shellHeight);648 649 649 650 glEnd();
Note: See TracChangeset
for help on using the changeset viewer.