Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8697 in orxonox.OLD for branches/terrain/src/lib


Ignore:
Timestamp:
Jun 21, 2006, 11:45:20 PM (18 years ago)
Author:
patrick
Message:

merged the terrain with the new trunk (MARK TERRAIN)

Location:
branches/terrain
Files:
5 edited
13 copied

Legend:

Unmodified
Added
Removed

  • branches/terrain/src/lib/collision_detection/cd_engine.h

    r8186 r8697  
    1616class WorldEntity;
    1717class OBBTree;
    18 class Terrain;
     18class TerrainEntity;
    1919class BspManager;
    2020//class Player;
    … …  
    5050  inline void disable(const int options) { int temp = this->state & options; this->state ^= temp; }
    5151
    52   inline void setTerrain(Terrain* terrain) { this->terrain = terrain; }
     52  inline void setTerrain( TerrainEntity* terrain) { this->terrain = terrain; }
    5353  inline void setBSPModel(BspManager* bspManager) { this->bspManager = bspManager; }
    5454
    … …  
    8383  OBBTree*                rootTree;                         //!< for testing purposes a root tree
    8484
    85   Terrain*                terrain;                          //!< this it a ref to the terrain, serving as a ground for all WE
     85  TerrainEntity*                terrain;                          //!< this it a ref to the terrain, serving as a ground for all WE
    8686  BspManager*             bspManager;
    8787};

  • branches/terrain/src/lib/graphics/graphics_engine.cc

    r8518 r8697  
    236236  // Enable default GL stuff
    237237  glEnable(GL_DEPTH_TEST);
    238 
     238  glEnable(GL_CULL_FACE);
     239  glCullFace(GL_FRONT);
    239240  Render2D::getInstance();
    240241

  • branches/terrain/src/lib/graphics/importer/Makefile.am

    r8490 r8697  
    3737                           md3/md3_mesh.cc \
    3838                           md3/md3_data.cc \
    39                            md3/md3_tag.cc
    40 
    41 
     39                           md3/md3_tag.cc \
     40                           \
     41                           terrain/terrain.cc \
     42                           terrain/terrain_quad.cc \
     43                           terrain/terrain_page.cc \
     44                           terrain/frustum.cc \
     45                           terrain/buffer_broker.cc
    4246
    4347
    … …  
    7983                md3/md3_mesh.h \
    8084                md3/md3_data.h \
    81                 md3/md3_tag.h
     85                md3/md3_tag.h \
     86                \
     87                terrain/terrain.h \
     88                terrain/terrain_page.h \
     89                terrain/terrain_quad.h \
     90                terrain/frustum.h \
     91                terrain/types.h \
     92                terrain/buffer_broker.h
    8293

  • branches/terrain/src/lib/graphics/importer/material.h

    r8619 r8697  
    6060  void setSpecularMap(const std::string& sMap, GLenum target = GL_TEXTURE_2D);
    6161  void setBump(const std::string& bump);
    62 
    6362  GLuint diffuseTextureID(unsigned int i = 0) const { return (this->textures.size() > i)? this->textures[i].getTexture() : 0; };
    6463

  • branches/terrain/src/lib/util/threading.h

    r7847 r8697  
    1414 #include <SDL/SDL_thread.h>
    1515#endif
    16 
     16#include <string>
    1717namespace OrxThread
    1818{
    … …  
    3131    void start();
    3232    void terminate();
    33 
    34 
    3533  private:
    3634    SDL_Thread* thread;
Note: See TracChangeset for help on using the changeset viewer.