Changeset 9149 in orxonox.OLD

Timestamp:

Jul 4, 2006, 3:53:25 PM (18 years ago)

Author:

bensch

Message:

segfault prevention

Location:

branches/presentation/src

Files:

• story_entities/game_world_data.cc (modified) (1 diff)
• world_entities/camera.cc (modified) (1 diff)
• world_entities/skydome.cc (modified) (3 diffs)
• world_entities/space_ships/spacecraft_2d.cc (modified) (1 diff)

branches/presentation/src/story_entities/game_world_data.cc

@@ -343 +343 @@
   LoadParamXML(root, "GameRule", this, GameWorldData, loadGameRule);
 
+  LoadParam(root, "clip-region", this->localCamera, Camera, setClipRegion);
+
 
   //LoadParamXML(root, "ParticleEngine", ParticleEngine::getInstance(), ParticleEngine, loadParams);
   //LoadParamXML(root, "PhysicsEngine", PhysicsEngine::getInstance(), PhysicsEngine, loadParams);
 
-  this->localCamera->setClipRegion(1, 10000.0);
   if( this->sky != NULL)
     this->localCamera->addChild(this->sky);

branches/presentation/src/world_entities/camera.cc

@@ -36 +36 @@
   this->setFovy(90);
   this->setAspectRatio(1.2f);
-  this->setClipRegion(.1, 2000);
+  this->setClipRegion(.1, 10000);
 
   this->setViewMode(Camera::ViewNormal);

branches/presentation/src/world_entities/skydome.cc

@@ -1 +1 @@
 /*
    orxonox - the future of 3D-vertical-scrollers
- 
+
    Copyright (C) 2006 orx
- 
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
- 
+
 ### File Specific:
    main-programmer: hdavid, amaechler
@@ -47 +47 @@
   this->toList(OM_BACKGROUND);
   this->toReflectionList();
-  
+  this->indices = NULL;
+  this->vertices = NULL;
+  this->shader = NULL;
   activateDome = false;
 
@@ -91 +93 @@
   if(!activateDome)
     return;
-  
+
   glPushAttrib(GL_ENABLE_BIT);
 

branches/presentation/src/world_entities/space_ships/spacecraft_2d.cc

@@ -299 +299 @@
 
         State::getCameraNode()->setParentSoft(this->travelNode);
-        State::getCameraNode()->setRelCoorSoft(-3, 50,0);
+        State::getCameraNode()->setRelCoorSoft(-3, 100,0);
         State::getCameraTargetNode()->setParentSoft(this->travelNode);
         State::getCameraTargetNode()->setRelCoorSoft(5,0,1);