Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8697 in orxonox.OLD for branches


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:
2 deleted
17 edited
15 copied

Legend:

Unmodified
Added
Removed

  • branches/terrain/src/defs/debug.h

    r8282 r8697  
    111111#define PRINTFORX_VDEBUG  PRINTF5
    112112
     113#ifndef ORX_DATADIR
     114#define ORX_DATADIR "/usr/share"
     115#endif
     116#ifndef DEBUG_LEVEL
     117#define DEBUG_LEVEL 2
     118#endif
    113119#if DEBUG_LEVEL <= 3
    114120#define PRINTF(x)        PRINT(x)

  • branches/terrain/src/defs/glincl.h

    r5279 r8697  
    1717#include <OpenGL/gl.h>
    1818#include <OpenGL/glu.h>
     19#include <OpenGL/glext.h>
    1920#endif
    2021

  • 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;

  • branches/terrain/src/orxonox.cc

    r8623 r8697  
    2727#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_ORXONOX
    2828#include "orxonox.h"
    29 
     29#ifndef PACKAGE_NAME
     30#define PACKAGE_NAME "orxonox"
     31#endif
     32#ifndef PACKAGE_VERSION
     33#define PACKAGE_VERSION "00"
     34#endif
    3035#include "globals.h"
    3136
    … …  
    511516  // checking for existence of the configuration-files, or if the lock file is still used
    512517  if (showGui || (!File("./orxonox.conf").isFile() &&
    513                   !File(DEFAULT_CONFIG_FILE).isFile())
    514 #if DEBUG_LEVEL <= 3 // developers do not need to see the GUI, when orxonox fails
    515       || ResourceManager::isFile(DEFAULT_LOCK_FILE)
    516 #endif
    517      )
     518                  !File(DEFAULT_CONFIG_FILE).isFile() ) )
    518519  {
    519520    File lockFile(DEFAULT_LOCK_FILE);

  • branches/terrain/src/story_entities/game_world.cc

    r8490 r8697  
    3030#include "camera.h"
    3131#include "environment.h"
    32 #include "terrain.h"
    3332#include "test_entity.h"
    34 #include "terrain.h"
     33#include "terrain_entity.h"
    3534#include "playable.h"
    3635#include "environments/mapped_water.h"

  • branches/terrain/src/story_entities/game_world_data.cc

    r8490 r8697  
    3131#include "player.h"
    3232#include "camera.h"
    33 #include "terrain.h"
     33#include "terrain_entity.h"
    3434#include "skybox.h"
    3535#include "md2/md2Model.h"
    … …  
    199199      BaseObject* created = Factory::fabricate(element);
    200200      if( created != NULL )
    201         PRINTF(4)("Created a %s: %s\n", created->getClassName(), created->getName());
     201        PRINTF(2)("Created a %s: %s\n", created->getClassName(), created->getName());
    202202
    203203      //todo do this more elegant
    … …  
    207207        State::setSkyBox(dynamic_cast<SkyBox*>(this->sky));
    208208      }
    209       if( element->Value() == "Terrain" && created->isA(CL_TERRAIN))
     209               
     210      if( element->Value() == "TerrainEntity" && created->isA(CL_TERRAIN))
    210211      {
    211         this->terrain = dynamic_cast<Terrain*>(created);
     212        this->terrain = dynamic_cast<TerrainEntity*>(created);
    212213        CDEngine::getInstance()->setTerrain(terrain);
    213214      }

  • branches/terrain/src/story_entities/game_world_data.h

    r7460 r8697  
    1414class Camera;
    1515class Player;
    16 class Terrain;
     16class TerrainEntity;
    1717class WorldEntity;
    1818
    … …  
    5757    Player*                       localPlayer;    //!< The player, you fly through the level.
    5858    WorldEntity*                  sky;            //!< The environmental sky of orxonox
    59     Terrain*                      terrain;        //!< The terrain - ground
     59    TerrainEntity*                terrain;        //!< The terrain - ground
    6060
    6161    OrxSound::OggPlayer*          music;          //!< Reference to the SoundEngine's music player (OggPlayer)

  • branches/terrain/src/story_entities/multi_player_world_data.cc

    r8490 r8697  
    3131#include "camera.h"
    3232#include "environment.h"
    33 #include "terrain.h"
     33#include "terrain_entity.h"
    3434#include "test_entity.h"
    35 #include "terrain.h"
    3635#include "md2/md2Model.h"
    3736#include "world_entities/projectiles/projectile.h"
    … …  
    157156        if( element->Value() != NULL && !strcmp( element->Value(), "Terrain"))
    158157        {
    159           this->terrain = dynamic_cast<Terrain*>(created);
     158          this->terrain = dynamic_cast<TerrainEntity*>(created);
    160159          CDEngine::getInstance()->setTerrain(terrain);
    161160        }
    … …  
    188187          if( element->Value() != NULL && !strcmp( element->Value(), "Terrain"))
    189188          {
    190             this->terrain = dynamic_cast<Terrain*>(created);
     189            this->terrain = dynamic_cast<TerrainEntity*>(created);
    191190            CDEngine::getInstance()->setTerrain(terrain);
    192191          }

  • branches/terrain/src/story_entities/simple_game_menu.cc

    r8619 r8697  
    3131#include "world_entity.h"
    3232#include "elements/image_entity.h"
    33 #include "terrain.h"
     33#include "terrain_entity.h"
    3434#include "camera.h"
    3535

  • branches/terrain/src/util/multiplayer_team_deathmatch.cc

    r8623 r8697  
    3232
    3333#include "shared_network_data.h"
    34 #include "terrain.h"
     34#include "terrain_entity.h"
    3535#include "class_list.h"
    3636#include "space_ships/space_ship.h"

  • branches/terrain/src/world_entities/WorldEntities.am

    r8490 r8697  
    88                world_entities/skysphere.cc \
    99                world_entities/skybox.cc \
    10                 world_entities/terrain.cc \
     10                world_entities/terrain_entity.cc \
    1111                world_entities/satellite.cc \
    1212                world_entities/movie_entity.cc \
    … …  
    6464                skysphere.h \
    6565                skybox.h \
    66                 terrain.h \
     66                terrain_entity.h \
    6767                satellite.h \
    6868                movie_entity.h \

  • branches/terrain/src/world_entities/camera.cc

    r7868 r8697  
    3434  this->subscribeEvent(ES_GAME, KeyMapper::PEV_VIEW5);
    3535
    36   this->setFovy(90);
     36  this->setFovy(60.0);
    3737  this->setAspectRatio(1.2f);
    38   this->setClipRegion(.1, 2000);
     38  this->setClipRegion( .1, 40.0f );
    3939
    4040  this->setViewMode(Camera::ViewNormal);
    … …  
    8383{
    8484  this->nearClip = nearClip;
    85   this->farClip = farClip;
     85  this->farClip = 400.0f;//farClip;
    8686}
    8787

  • branches/terrain/src/world_entities/skybox.cc

    r8037 r8697  
    230230//   glPushAttrib(GL_LIGHTING_BIT);
    231231  glDisable(GL_LIGHTING);
    232 
     232  glDisable( GL_DEPTH_TEST );   
    233233  glDisable(GL_FOG);
    234234
Note: See TracChangeset for help on using the changeset viewer.