Changeset 6968 in orxonox.OLD for trunk

Timestamp:

Feb 1, 2006, 7:42:35 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: new entity

Location:

trunk/src/world_entities/environments

Files:

• movie_entity.cc (copied) (copied from trunk/src/world_entities/planet.cc) (4 diffs)
• movie_entity.h (copied) (copied from trunk/src/world_entities/planet.h) (2 diffs)

trunk/src/world_entities/environments/movie_entity.cc

@@ -16 +16 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
 
-#include "planet.h"
+#include "movie_entity.h"
 
 #include "load_param.h"
@@ -22 +22 @@
 #include "static_model.h"
 
-#include "material.h"
-#include "texture.h"
-
-#include "network_game_manager.h"
-#include "converter.h"
-#include "vertex_array_model.h"
-#include "primitive_model.h"
-
 using namespace std;
 
 
-CREATE_FACTORY(Planet, CL_PLANET);
+CREATE_FACTORY(ModelEntity, CL_MODEL_ENTITY);
 
 
@@ -40 +32 @@
  *  initializes a skybox from a XmlElement
 */
-Planet::Planet(const TiXmlElement* root)
+ModelEntity::ModelEntity(const TiXmlElement* root)
 {
-  this->setClassID(CL_PLANET, "Planet");
-  this->toList(OM_GROUP_01);
+  this->setClassID(CL_MODEL_ENTITY, "ModelEntity");
+  this->toList(OM_ENVIRON_NOTICK);
 
-  this->material = new Material();
-  //this->material->setIllum(20);
-  //this->material->setAmbient(0.1, 0.1, 0.1);
-
-
-
-      //st float radius, const unsigned int loops, const unsigned int segmentsPerLoop
-
-  this->loadParams(root);
-
-//   VertexArrayModel* model = new VertexArrayModel();
-//   model->spiralSphere(this->size, 10, 10);
-//   this->setModel(model);
-//   model->debug();
-//
-  PrimitiveModel* model = new PrimitiveModel(PRIM_SPHERE, this->size, 50);
-  this->setModel(model);
+  if (root != NULL)
+    this->loadParams(root);
 }
 
@@ -68 +45 @@
  *  default destructor
 */
-Planet::~Planet()
+ModelEntity::~ModelEntity()
 {
-  PRINTF(5)("Deleting Planet\n");
-  if( this->material)
-    delete this->material;
 }
 
 
-void Planet::loadParams(const TiXmlElement* root)
-{
-  WorldEntity::loadParams(root);
-
-  LoadParam(root, "texture", this, Planet, setTexture)
-      .describe("Sets the material on the Planet. The string must be the path relative to the data-dir, and without a trailing .jpg");
-
-  LoadParam(root, "size", this, Planet, setSize)
-      .describe("Sets the Size of the Planet (normally this should be 90% of the maximal viewing Distance).");
-}
-
-
-/**
- *  Defines which textures should be loaded onto the Planet.
- * @param textureName the top texture.
-*/
-void Planet::setTexture(const char* textureName)
-{
-  this->material->setDiffuseMap(textureName);
-}
-
-
-/**
- * @param size The new size of the Planet
-
- * do not forget to rebuild the Planet after this.
-*/
-void Planet::setSize(float size)
-{
-  this->size = size;
-}
-
-
-
-void Planet::draw() const
-{
-  glMatrixMode(GL_MODELVIEW);
-  glPushMatrix();
-
-  glShadeModel(GL_SMOOTH);
-
-  /* translate */
-  glTranslatef (this->getAbsCoor ().x,
-                this->getAbsCoor ().y,
-                this->getAbsCoor ().z);
-  Vector tmpRot = this->getAbsDir().getSpacialAxis();
-  glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
-
-  this->material->select();
-
-//   /WorldEntity::draw();
-  this->getModel(0)->draw();
- // static_cast<VertexArrayModel*>(this->getModel(0))->debug();
-
-  glPopMatrix();
-}
-
-
-

trunk/src/world_entities/environments/movie_entity.h

@@ -1 +1 @@
 /*!
- * @file planet.h
- *  Definition of the Planet, that handles the Display of an atmosphere for orxonox.
+ * @file movie_entity.h
+ *  Definition of the ModelEntity, that handles the Display of an atmosphere for orxonox.
  */
 
-#ifndef _PLANET_H
-#define _PLANET_H
+#ifndef _MODEL_ENTITY_H
+#define _MODEL_ENTITY_H
 
 /* INCLUDES */
@@ -11 +11 @@
 
 /* FORWARD DECLARATION */
-class Material;
-class Texture;
 
-//! A Class to handle a Planet
-class Planet : public WorldEntity
+//! A Class to handle a ModelEntity
+class ModelEntity : public WorldEntity
 {
  public:
-  Planet(const TiXmlElement* root);
+  ModelEntity(const TiXmlElement* root);
 
-  virtual ~Planet();
-
-  virtual void loadParams(const TiXmlElement* root);
-
-  void setSize(float size);
-  /** assumes jpg as input-format */
-  void setTexture(const char* textureName);
+  virtual ~ModelEntity();
 
 
-  virtual void draw() const;
+  private:
+
+};
+
+#endif  /* _MODEL_ENTITY_H */
 
 
 
- private:
-  Material*       material;        //!< Materials for the Planet. sorted by number (0-5) top, bottom, left, right, front, back
-  Texture*        texture;         //!< Textures for the CubeMap.
-
-  float           size;            //!< Size of the Planet. This should match the frustum maximum range.
-  float           textureSize;     //!< this is the length of a texture (assumes a square texture)
-  char*           textureName;     //!< Name of the Texture
-
-};
-
-#endif  /* _PLANET_H */
-
-
-