Changeset 3796 in orxonox.OLD for orxonox/trunk/src/world_entities

Timestamp:

Apr 13, 2005, 4:52:55 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: some simple implementation of a SkyBox

Location:

orxonox/trunk/src/world_entities

Files:

• skybox.cc (copied) (copied from orxonox/trunk/src/world_entities/skysphere.cc) (5 diffs)
• skybox.h (copied) (copied from orxonox/trunk/src/world_entities/skysphere.h) (3 diffs)

orxonox/trunk/src/world_entities/skybox.cc

@@ -27 +27 @@
 
 
-#include "skysphere.h"
+#include "skybox.h"
 #include "stdincl.h"
 
 #include "material.h"
 #include "vector.h"
+#include "resource_manager.h"
+#include "model.h"
 //#include "world_entity.h"
 
@@ -38 +40 @@
 
 /**
-   \brief Constructs a SkySphere and takes fileName as a map.
-   \param fileName the file to take as input for the skysphere
+   \brief Constructs a SkyBox and takes fileName as a map.
+   \param fileName the file to take as input for the SkyBox
 */
-Skysphere::Skysphere(char* fileName)
+SkyBox::SkyBox(char* fileName)
 {
-  if (fileName == NULL)
-    this->initialize("../data/pictures/sky-replace.jpg");
-  else
-    this->initialize(fileName);
+  this->setClassName("SkyBox");
+
+
+  this->model = (Model*)ResourceManager::getInstance()->load("cube", PRIM, RP_LEVEL);
+  this->setMode(PNODE_MOVEMENT);
+
+  this->setSize(1900.0);
+
+  this->material = new Material("Sky");
+  if (fileName)
+    this->setTexture(fileName);
+  this->material->setIllum(3);
+  this->material->setAmbient(1.0, 1.0, 1.0);
+
 }
 
@@ -53 +65 @@
    \brief default destructor
 */
-Skysphere::~Skysphere()
+SkyBox::~SkyBox()
 {
-  PRINTF(3)("Deleting the SkySphere\n");
-  delete this->skyMaterial;
-  free(this->sphereObj);
-}
-
-/**
-   \brief initializes the Skysphere.
-   \param fileName the file to take as input for the skysphere
-*/
-void Skysphere::initialize(char* fileName)
-{
-  PRINTF(1)("initializing the Skysphere with Material %s.\n", fileName);
-  this->sphereObj = gluNewQuadric();
-  this->setMode(PNODE_MOVEMENT);
-
-  gluQuadricTexture(this->sphereObj, GL_TRUE);
-  this->setRadius(1900.0);
-
-  this->skyMaterial = new Material("Sky");
-  this->setTexture(fileName);
-  this->skyMaterial->setIllum(3);
-  this->skyMaterial->setAmbient(1.0, 1.0, 1.0);
+  PRINTF(3)("Deleting the SkyBox\n");
+  delete this->material;
 }
 
 
 /**
-   \brief Defines which texture should be loaded onto the skysphere.
+   \brief Defines which texture should be loaded onto the SkyBox.
    \param fileName The filename of the Texture
 */
-void Skysphere::setTexture(char* fileName)
+void SkyBox::setTexture(char* fileName)
 {
-  this->skyMaterial->setDiffuseMap(fileName);
+  this->material->setDiffuseMap(fileName);
 }
 
 
 /**
-   \brief draws the Skysphere
+   \brief draws the SkyBox
    
    This part is normally precessed in the "Painting Phase".
 */
-void Skysphere::draw()
+void SkyBox::draw()
 {
   glPushMatrix();
@@ -102 +94 @@
   glTranslatef(r.x, r.y, r.z);
 
-  //glRotatef(-30, 1, 0, 0);
-  //glRotatef(95.0f, 0.0f, 0.0f, 1.0f);
-  //glRotatef(-250.0f, 0.0, 1.0f, 0.0f);
-  
-  skyMaterial->select();
-  gluSphere(this->sphereObj, this->sphereRadius, 20, 20);
+  this->material->select();
+
+  this->model->draw();
+
   glPopMatrix();
 }
@@ -116 +106 @@
    \param radius The Radius of The Sphere
 */
-void Skysphere::setRadius(float radius)
+void SkyBox::setSize(float size)
 {
-  this->sphereRadius = radius;
+  this->size = size;
 }

orxonox/trunk/src/world_entities/skybox.h

@@ -1 +1 @@
 /*! 
-    \file skysphere.h
-    \brief Definition of the Skysphere, that handles the Display of an atmosphere of orxonox.
+    \file skybox.h
+    \brief Definition of the SkyBox, that handles the Display of an atmosphere for orxonox.
 
-    A SkySphere is always centered at the current working Camera, and will only obey the cameras
+    A SkyBox is always centered at the current working Camera, and will only obey the cameras
     movment but not its rotation.
-
-    \todo self-rotation
-    \todo handle reference to parent-object
 */
 
-#ifndef _SKYSPHERE_H
-#define _SKYSPHERE_H
+#ifndef _SKYBOX_H
+#define _SKYBOX_H
 
 /* INCLUDES */
@@ -20 +17 @@
 class Vector;
 
-//! A Class to handle a SkySphere
-class Skysphere : public WorldEntity
+//! A Class to handle a Skybox
+class SkyBox : public WorldEntity
 {
 
  public:
-  Skysphere(char* fileName = NULL);
-  virtual ~Skysphere();
-  void destroy();
+  SkyBox(char* fileName = NULL);
+  virtual ~SkyBox();
 
-  void setRadius(float radius);
+  void setSize(float size);
   void setTexture(char* fileName);
 
@@ -35 +31 @@
 
  private: 
-  GLUquadricObj *sphereObj; //!< A Placeholder for the SkySphere.
-  Material *skyMaterial;    //!< A Material for the SkySphere.
-  float sphereRadius;       //!< Radius of the SkySphere. This should match the frustum maximum range.
+  Material *material;    //!< A Material for the Skybox.
+  float size;       //!< Radius of the Skybox. This should match the frustum maximum range.
     
-  void initialize(char* fileName);  
 };
 
-#endif  /* _SKYSPHERE_H */
+#endif  /* _SKYBOX_H */