Changeset 3429 in orxonox.OLD for orxonox/trunk/src

Timestamp:

Mar 1, 2005, 9:32:46 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: skysphere now produces no more segfault while level changes

Location:

orxonox/trunk/src

Files:

• Makefile.in (modified) (1 diff)
• importer/Makefile.in (modified) (1 diff)
• skysphere.cc (modified) (2 diffs)
• world.cc (modified) (2 diffs)

orxonox/trunk/src/Makefile.in

@@ -318 +318 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --gnu  src/Makefile
+          $(AUTOMAKE) --foreign  src/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

orxonox/trunk/src/importer/Makefile.in

@@ -215 +215 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/importer/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/importer/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --gnu  src/importer/Makefile
+          $(AUTOMAKE) --foreign  src/importer/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

orxonox/trunk/src/skysphere.cc

@@ -53 +53 @@
 Skysphere::~Skysphere()
 {
+  PRINTF(3)("Deleting the SkySphere\n");
   delete skyMaterial;
   free(sphereObj);
@@ -63 +64 @@
 void Skysphere::initialize(char* fileName)
 {
+  PRINTF(1)("initializing the Skysphere with Material %s.\n", fileName);
   this->sphereObj = gluNewQuadric();
   gluQuadricTexture(this->sphereObj, GL_TRUE);

orxonox/trunk/src/world.cc

@@ -67 +67 @@
   this->localCamera->destroy();
 
-  this->nullParent->destroy ();
+  this->nullParent->destroy();
+  
+  delete this->skySphere;
 
   //delete this->trackManager;
@@ -360 +362 @@
             this->getCamera()->bind (myPlayer); 
             this->localPlayer->addChild (this->localCamera);
+
+            // Create SkySphere
+            skySphere = new Skysphere("../data/pictures/sky-replace.jpg");
+
             break;
+
+
           }
         default: