Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9140 in orxonox.OLD for branches/terrain/src/world_entities


Ignore:
Timestamp:
Jul 4, 2006, 3:06:00 PM (19 years ago)
Author:
bensch
Message:

merged back

Location:
branches/terrain/src/world_entities
Files:
2 deleted
5 edited
2 copied

Legend:

Unmodified
Added
Removed

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

    r9061 r9140  
    1212                world_entities/skybox.cc \
    1313                world_entities/skydome.cc \
    14                 world_entities/terrain.cc \
     14                world_entities/terrain_entity.cc \
    1515                world_entities/satellite.cc \
    1616                world_entities/movie_entity.cc \
    … …  
    7777                skybox.h \
    7878                skydome.h \
    79                 terrain.h \
     79                terrain_entity.h \
    8080                satellite.h \
    8181                movie_entity.h \

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

    r7868 r9140  
    3434  this->subscribeEvent(ES_GAME, KeyMapper::PEV_VIEW5);
    3535
    36   this->setFovy(90);
     36  this->setFovy(90.0);
    3737  this->setAspectRatio(1.2f);
    38   this->setClipRegion(.1, 2000);
     38  this->setClipRegion( .1, 40.0f );
    3939
    4040  this->setViewMode(Camera::ViewNormal);

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

    r9110 r9140  
    6969  //subscribe to collision reaction
    7070  this->subscribeReaction(CREngine::CR_PHYSICS_GROUND_WALK, CL_BSP_ENTITY);
    71 
     71        this->subscribeReaction(CREngine::CR_PHYSICS_GROUND_WALK, CL_TERRAIN );
    7272  registerVar( new SynchronizeableInt( &score, &score, "score" ) );
    7373  registerVar( new SynchronizeableBool( &bFire, &bFire, "bFire", PERMISSION_OWNER));

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

    r8037 r9140  
    230230//   glPushAttrib(GL_LIGHTING_BIT);
    231231  glDisable(GL_LIGHTING);
    232 
     232  glDisable( GL_DEPTH_TEST );   
    233233  glDisable(GL_FOG);
    234234

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

    r9110 r9140  
    442442    return false;
    443443
     444
    444445  // get a collision event
    445446  CollisionEvent* c = CREngine::getInstance()->popCollisionEventObject();
Note: See TracChangeset for help on using the changeset viewer.