Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3484 in orxonox.OLD for orxonox/trunk/src/world_entities


Ignore:
Timestamp:
Mar 10, 2005, 11:29:32 PM (19 years ago)
Author:
patrick
Message:

orxonox/trunk: now moved importer in lib and other stuff. very very modular :)

Location:
orxonox/trunk/src/world_entities
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/src/world_entities/environment.cc

    r3472 r3484  
    2121#include "world_entity.h"
    2222#include "vector.h"
    23 #include "importer/objModel.h"
     23#include "objModel.h"
    2424
    2525using namespace std;

  • orxonox/trunk/src/world_entities/player.cc

    r3474 r3484  
    1919#include "stdincl.h"
    2020//#include "collision.h"
    21 #include "importer/objModel.h"
     21#include "objModel.h"
    2222
    2323using namespace std;

  • orxonox/trunk/src/world_entities/skysphere.cc

    r3475 r3484  
    1313   main-programmer: David Gruetter
    1414   co-programmer: Benjamin Grauer
    15 
    16     Created by Dave: this file is actually quite similar to player.cc and so is
    17     skybox.h similar to player.h
    18     With that said, things should be clear:)
    19 
    20     Edited by Bensch: more constructors, changeability, comments...
     15   
     16   Created by Dave: this file is actually quite similar to player.cc and so is
     17   skybox.h similar to player.h
     18   With that said, things should be clear:)
     19   
     20   Edited:
     21   Bensch: more constructors, changeability, comments...
     22   Patrick: giving it the common orxonox style, not much to do... good work Dave!
    2123
    2224*/
    2325
    24 #include "importer/material.h"
     26#include "material.h"
    2527#include "skysphere.h"
    2628#include "stdincl.h"
    … …  
    7577}
    7678
     79
    7780/**
    7881   \brief sets the Radius of the Sphere.
    … …  
    8487}
    8588
     89
    8690/**
    8791   \brief Defines which texture should be loaded onto the skysphere.
    … …  
    9296  this->skyMaterial->setDiffuseMap(fileName);
    9397}
     98
    9499
    95100/**
    … …  
    104109}
    105110
     111
    106112/**
    107113   \brief draws the Skysphere
    … …  
    109115   This part is normally precessed in the "Painting Phase".
    110116*/
    111 
    112117void Skysphere::draw()
    113118{
    … …  
    124129  glPopMatrix();
    125130  glDisable(GL_TEXTURE_2D);
    126 
    127131}

  • orxonox/trunk/src/world_entities/skysphere.h

    r3475 r3484  
    2121
    2222//! A Class to handle a SkySphere
    23 class Skysphere: public PNode
     23class Skysphere : public PNode
    2424{
    25  private:
    26   GLUquadricObj *sphereObj; //!< A Placeholder for the SkySphere.
    27   Material *skyMaterial;    //!< A Material for the SkySphere.
    28   Vector sphereCenter;      //!< Center of the SkySphere.
    29   float sphereRadius;       //!< Radius of the SkySphere. This should match the frustum maximum range.
    3025
    3126 public:
    … …  
    4035  void draw();
    4136
    42  private:
     37 private:
     38  GLUquadricObj *sphereObj; //!< A Placeholder for the SkySphere.
     39  Material *skyMaterial;    //!< A Material for the SkySphere.
     40  Vector sphereCenter;      //!< Center of the SkySphere.
     41  float sphereRadius;       //!< Radius of the SkySphere. This should match the frustum maximum range.
     42
     43
    4344  void initialize(char* fileName); 
    4445};
    4546
    46 #endif
     47#endif  /* _SKYSPHERE_H */
    4748
    4849
     50
Note: See TracChangeset for help on using the changeset viewer.