Changeset 7871 in orxonox.OLD
- Timestamp:
- May 26, 2006, 1:39:33 PM (18 years ago)
-
orxonox/trunk: Element2D is better updated (after PNode
- Location:
- trunk/src
- Files:
-
- 3 edited
-
lib/graphics/graphics_engine.cc (modified) (24 diffs)
-
lib/graphics/render2D/element_2d.cc (modified) (1 diff)
-
story_entities/game_world.cc (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/lib/graphics/graphics_engine.cc
r7868 r7871 56 56 57 57 /** 58 * standard constructor58 * @brief standard constructor 59 59 */ 60 60 GraphicsEngine::GraphicsEngine () … … 84 84 85 85 /** 86 * The Pointer to this GraphicsEngine87 */86 * @brief The Pointer to this GraphicsEngine 87 */ 88 88 GraphicsEngine* GraphicsEngine::singletonRef = NULL; 89 89 90 90 /** 91 * destructs the graphicsEngine.91 * @brief destructs the graphicsEngine. 92 92 */ 93 93 GraphicsEngine::~GraphicsEngine () … … 110 110 111 111 /** 112 * loads the GraphicsEngine Specific Parameters.112 * @brief loads the GraphicsEngine Specific Parameters. 113 113 * @param root: the XML-Element to load the Data From 114 114 */ … … 138 138 139 139 /** 140 * initializes the GraphicsEngine with default settings.140 * @brief initializes the GraphicsEngine with default settings. 141 141 */ 142 142 int GraphicsEngine::init() … … 148 148 149 149 /** 150 * loads the GraphicsEngine's settings from a given ini-file and section150 * @brief loads the GraphicsEngine's settings from a given ini-file and section 151 151 * @returns nothing usefull 152 152 */ … … 191 191 192 192 /** 193 * initializes the Video for openGL.193 * @brief initializes the Video for openGL. 194 194 * 195 195 * This has to be done only once when starting orxonox. … … 241 241 242 242 /** 243 * sets the Window Captions and the Name of the icon.243 * @brief sets the Window Captions and the Name of the icon. 244 244 * @param windowName The name of the Window 245 245 * @param icon The name of the Icon on the Disc … … 261 261 262 262 /** 263 * Sets the GL-attributes263 * @brief Sets the GL-attributes 264 264 */ 265 265 int GraphicsEngine::setGLattribs() … … 289 289 290 290 /** 291 * grabs the Hardware Specifics 291 * @brief grabs the Hardware Specifics 292 * 292 293 * checks for all the different HW-types 293 294 */ … … 335 336 336 337 /** 337 * sets the Resolution of the Screen to display the Graphics to.338 * @brief sets the Resolution of the Screen to display the Graphics to. 338 339 * @param width The width of the window 339 340 * @param height The height of the window … … 378 379 379 380 /** 380 * sets Fullscreen mode381 * @brief sets Fullscreen mode 381 382 * @param fullscreen true if fullscreen, false if windowed 382 383 */ … … 391 392 392 393 /** 393 * sets the background color394 * @brief sets the background color 394 395 * @param red the red part of the background 395 396 * @param blue the blue part of the background … … 403 404 404 405 /** 405 * Signalhandler, for when the resolution has changed406 * @brief Signalhandler, for when the resolution has changed 406 407 * @param resizeInfo SDL information about the size of the new screen size 407 408 */ … … 414 415 415 416 /** 416 * entering 2D Mode 417 418 this is a GL-Projection-mode, that is orthogonal, for placing the font in fron of everything else 419 */ 417 * @brief entering 2D Mode 418 * this is a GL-Projection-mode, that is orthogonal, for placing the font in fron of everything else 419 */ 420 420 void GraphicsEngine::enter2DMode() 421 421 { … … 442 442 443 443 /** 444 * leaves the 2DMode again also @see Font::enter2DMode()444 * @brief leaves the 2DMode again also @see Font::enter2DMode() 445 445 */ 446 446 void GraphicsEngine::leave2DMode() … … 456 456 } 457 457 458 /** 459 * @brief changes to wireframe-mode. 460 */ 458 461 void GraphicsEngine::wireframe() 459 462 { … … 462 465 463 466 /** 464 * stores the GL_matrices467 * @brief stores the GL_matrices 465 468 */ 466 469 void GraphicsEngine::storeMatrices() … … 481 484 482 485 /** 483 * outputs all the Fullscreen modes.486 * @brief outputs all the Fullscreen modes. 484 487 */ 485 488 void GraphicsEngine::listModes() … … 510 513 511 514 /** 512 * checks wether a certain extension is availiable515 * @brief checks wether a certain extension is availiable 513 516 * @param extension the Extension to check for (ex. GL_ARB_texture_env_dot3) 514 517 * @return true if it is, false otherwise … … 523 526 524 527 /** 525 * updates everything that is to be updated in the GraphicsEngine528 * @brief updates everything that is to be updated in the GraphicsEngine 526 529 */ 527 530 void GraphicsEngine::update(float dt) … … 532 535 533 536 /** 534 * ticks the Text537 * @brief ticks the Text 535 538 * @param dt the time passed 536 539 */ … … 568 571 } 569 572 573 /** 574 * @brief draws all Elements that should be displayed on the Background. 575 */ 570 576 void GraphicsEngine::drawBackgroundElements() const 571 577 { … … 592 598 593 599 /** 594 * displays the Frames per second600 * @brief displays the Frames per second 595 601 * @param display if the text should be displayed 596 602 */ … … 639 645 640 646 /** 641 processes the events for the GraphicsEngine class642 * @param the event to handle647 * @brief processes the events for the GraphicsEngine class 648 * @param the event to handle 643 649 */ 644 650 void GraphicsEngine::process(const Event &event) -
trunk/src/lib/graphics/render2D/element_2d.cc
r7846 r7871 890 890 } 891 891 892 /// TODO this should be done on the new Projection Matrix. 892 893 GLdouble projectPos[3] = {0.0, 0.0, 0.0}; 893 894 gluProject(this->bindNode->getAbsCoor().x, -
trunk/src/story_entities/game_world.cc
r7840 r7871 402 402 void GameWorld::update() 403 403 { 404 GraphicsEngine::getInstance()->update(this->dtS);405 404 PNode::getNullParent()->updateNode (this->dtS); 406 405 OrxSound::SoundEngine::getInstance()->update(); 406 GraphicsEngine::getInstance()->update(this->dtS); 407 407 } 408 408
Note: See TracChangeset
for help on using the changeset viewer.
