Changeset 3337 in orxonox.OLD

Timestamp:

Jan 5, 2005, 2:32:58 AM (19 years ago)

Author:

patrick

Message:

orxonox/branches/parenting: resolved a svn-conflict, corrected come bugs in the world.cc code

File:

• orxonox/branches/parenting/src/world.cc (modified) (7 diffs)

orxonox/branches/parenting/src/world.cc

@@ -28 +28 @@
 #include "helper_parent.h"
 
+#include <SDL/SDL_image.h>
+
 using namespace std;
 
@@ -66 +68 @@
 
   this->nullParent->destroy ();
+
+  //delete this->testCurve;
 
   /*
@@ -138 +142 @@
 
 
+void World::displayLoadScreen ()
+{
+  printf ("World::displayLoadScreen - start\n"); 
+  SDL_Surface *screen;
+  SDL_RWops *rwop;
+  int i;
+  
+  //SDL_FreeSurface (Orxonox::getInstance()->getScreen ());
+  
+  /* load the image */
+  rwop = SDL_RWFromFile("load_screen.png", "rb");
+  this->loadImage = IMG_LoadPNG_RW (rwop);
+  if( !this->loadImage)
+    {
+      /* image failed to load */
+      printf ("IMG_Load: %s\n", IMG_GetError());
+    }
+  printf("loaded %s: %dx%d %dbpp\n", "load_screen.png",
+         this->loadImage->w, this->loadImage->h, this->loadImage->format->BitsPerPixel);
+  
+
+  //  screen = SDL_SetVideoMode(this->loadImage->w, this->loadImage->h, this->loadImage->format->BitsPerPixel, SDL_ANYFORMAT);
+  screen = Orxonox::getInstance()->getScreen ();
+  if( !screen)
+    {
+      printf ("SDL_SetVideoMode: %s\n", SDL_GetError());
+      SDL_FreeSurface (this->loadImage);
+      SDL_Quit ();
+      return;
+    }
+  
+  /* print some info about the obtained screen */
+  printf("screen is %dx%d %dbpp\n", screen->w, screen->h, screen->format->BitsPerPixel);
+
+  /* do the initial image display */
+  SDL_BlitSurface (this->loadImage, 0, screen, 0);
+  
+  if (SDL_Flip (screen) != 0)
+    printf("World::displayLoadScreen - couldn't filp buffers");
+  
+  //image = IMG_Load ("load_screen.png"); 
+  printf ("World::displayLoadScreen - end\n");
+}
+
+
+void World::releaseLoadScreen ()
+{
+  printf ("World::releaseLoadScreen - start\n"); 
+
+  //if( SDL_Flip (Orxonox::getInstance()->getScreen ()) != 0)
+  //  printf("World::displayLoadScreen - culdn't filp buffers");
+
+  SDL_Delay (1000); 
+
+  SDL_FreeSurface (this->loadImage); 
+  SDL_FreeSurface (Orxonox::getInstance()->getScreen ());
+
+  SDL_Flip (Orxonox::getInstance()->getScreen ());
+
+  SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 5);
+  SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 5);
+  SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 5);
+  SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 16);
+
+  int bpp = 16;
+  int width = 640;
+  int height = 480;
+  Uint32 flags = SDL_HWSURFACE | SDL_OPENGL | SDL_GL_DOUBLEBUFFER;
+  
+  SDL_Surface* screen = SDL_SetVideoMode (width, height, bpp, flags);
+
+  // OpenGL stuff
+  glClearColor(0.0, 0.0, 0.0, 0.0);
+  glEnable(GL_DEPTH_TEST);
+ 
+  // LIGHTING
+  GLfloat lmodelAmbient[] = {.1, .1, .1, 1.0};
+  GLfloat whiteLight[] = {1.0, 1.0, 1.0,1.0};
+  GLfloat lightPosition[] = {10.0, 10, 19.0, 0.0};
+
+  glLightfv(GL_LIGHT0, GL_DIFFUSE, whiteLight);
+  glLightfv(GL_LIGHT0, GL_SPECULAR, whiteLight);
+  glEnable(GL_LIGHTING);
+  glEnable(GL_LIGHT0);
+  glEnable(GL_DEPTH_TEST);
+  glLightfv(GL_LIGHT0, GL_POSITION, lightPosition);
+  glLightfv(GL_LIGHT0, GL_DIFFUSE, whiteLight);
+
+  //SDL_Surface* screen = Orxonox::getInstance()->getScreen ();
+
+  //SDL_Flip (screen);
+
+
+  printf ("World::releaseLoadScreen - end\n"); 
+}
 
 
@@ -197 +296 @@
             
 
-            Vector* es = new Vector (50, 0, 5);
+            Vector* es = new Vector (50, 2, 0);
             Quaternion* qs = new Quaternion ();
             WorldEntity* env = new Environment();
@@ -208 +307 @@
         case DEBUG_WORLD_1:
           {
+            /*
+            this->testCurve = new UPointCurve();
+            this->testCurve->addNode(Vector( 0, 0, 0));
+            this->testCurve->addNode(Vector(10, 0, 5));
+            this->testCurve->addNode(Vector(20, -5,-5));
+            this->testCurve->addNode(Vector(30, 5, 10));
+            this->testCurve->addNode(Vector(40, 0,-10));
+            this->testCurve->addNode(Vector(50, 0,-10));
+            */
+
             this->nullParent = NullParent::getInstance ();
             this->nullParent->setName ("NullParent");
@@ -438 +547 @@
     }
   glEnd();
+
   glEndList();
 }
@@ -802 +912 @@
   this->draw();
   // draw HUD
+  /* \todo draw HUD */
   // flip buffers
   SDL_GL_SwapBuffers();
+  //SDL_Surface* screen = Orxonox::getInstance()->getScreen ();
+  //SDL_Flip (screen);
 }