Changeset 4283 in orxonox.OLD for orxonox/branches/physics/src/world_entities

Timestamp:

May 24, 2005, 10:32:34 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/physics: merged the trunk back to branches/physics
merged with command
svn merge -r 4223:HEAD ../../trunk/ .
conflicts additively included

Location:

orxonox/branches/physics/src/world_entities

Files:

• player.cc (modified) (1 diff)
• player.h (modified) (1 diff)
• skybox.cc (modified) (4 diffs)
• skybox.h (modified) (2 diffs)
• test_entity.cc (copied) (copied from orxonox/trunk/src/world_entities/test_entity.cc)
• test_entity.h (copied) (copied from orxonox/trunk/src/world_entities/test_entity.h)
• world_entity.cc (modified) (2 diffs)
• world_entity.h (modified) (3 diffs)

orxonox/branches/physics/src/world_entities/player.cc

@@ -80 +80 @@
    \todo add more parameters to load
 */
-Player::Player(TiXmlElement* root) : WorldEntity(root)
+Player::Player(const TiXmlElement* root) : WorldEntity(root)
 {
   this->weapons = new tList<Weapon>();

orxonox/branches/physics/src/world_entities/player.h

@@ -22 +22 @@
  public:
   Player();
-  Player(TiXmlElement* root);
+  Player(const TiXmlElement* root);
   virtual ~Player();
 

orxonox/branches/physics/src/world_entities/skybox.cc

@@ -11 +11 @@
 
    ### File Specific:
-   main-programmer: David Gruetter
-   co-programmer: Benjamin Grauer
-   
-   Created by Dave: this file is actually quite similar to player.cc and so is 
-   skybox.h similar to player.h
-   With that said, things should be clear:)
-   
-   Edited:
-   Bensch: more constructors, changeability, comments...
-   Patrick: giving it the common orxonox style, not much to do... good work Dave!
-
+   main-programmer: Benjamin Grauer
+   co-programmer: ...
 */
 
@@ -46 +37 @@
    \param fileName the file to take as input for the SkyBox
 */
-SkyBox::SkyBox(char* fileName)
+SkyBox::SkyBox(const char* fileName)
 {
   this->preInit();
+  if (fileName)
+    this->setTextureAndType(fileName, ".jpg");
   this->postInit();
 }
 
-SkyBox::SkyBox(TiXmlElement* root) : WorldEntity(root)
+SkyBox::SkyBox(const TiXmlElement* root) : WorldEntity(root)
 {
   this->preInit();
 
-  const char* string;
-
-  // Model Loading      
-  string = grabParameter( root, "materialset");
-  if( string != NULL)
-    this->setTexture(string, "jpg");
-  else
-    {
-      PRINTF(0)("SkyBox is missing a proper 'MaterialSet'\n");
-    }
-  if( this->skyModel == NULL)
-    {
-      PRINTF(0)("SkyBox model '%s' could not be loaded\n", string);
-    }
+  this->loadParams(root);
+
   this->postInit();
+}
+
+void SkyBox::loadParams(const TiXmlElement* root)
+{
+  LoadParam<SkyBox>(root, "Materialset", this, &SkyBox::setTexture)
+    .describe("Sets the material on the SkyBox. The string must be the path relative to the data-dir, and without a trailing .jpg");
 }
 
@@ -116 +103 @@
                "skybox_right.jpg", "skybox_front.jpg", "skybox_back.jpg");
 */
-void SkyBox::setTexture(const char* name, const char* extension)
+void SkyBox::setTextureAndType(const char* name, const char* extension)
 {
   char* top    = new char[strlen(name)+strlen(extension)+ 10];
@@ -219 +206 @@
 
   this->skyModel->setMaterial(material[0]);
-  this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 2,1,3, 3,2,3, 5,3,3, 4,0,3); // top
+  this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 2,0,3, 3,1,3, 5,2,3, 4,3,3); // top
   this->skyModel->setMaterial(material[1]);
-  this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 6,3,1, 7,0,1, 1,1,1, 0,2,1); // bottom
+  this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 6,0,1, 7,1,1, 1,2,1, 0,3,1); // bottom
   this->skyModel->setMaterial(material[2]);
-  this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 0,0,2, 1,1,2, 3,2,2, 2,3,2); // left
+  this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 4,2,2, 5,3,2, 7,0,2, 6,1,2); // left
   this->skyModel->setMaterial(material[3]);
-  this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 4,2,0, 5,3,0, 7,0,0, 6,1,0); // right
+  this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 0,0,0, 1,1,0, 3,2,0, 2,3,0); // right
   this->skyModel->setMaterial(material[4]);
-  this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 1,0,5, 7,1,5, 5,2,5, 3,3,6); // front
+  this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 1,0,5, 7,1,5, 5,2,5, 3,3,5); // front
   this->skyModel->setMaterial(material[5]);
   this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 6,0,4, 0,1,4, 2,2,4, 4,3,4); // back

orxonox/branches/physics/src/world_entities/skybox.h

@@ -21 +21 @@
 {
  public:
-  SkyBox(char* fileName = NULL);
-  SkyBox(TiXmlElement* root);
+  SkyBox(const char* fileName = NULL);
+  SkyBox(const TiXmlElement* root);
 
   virtual ~SkyBox();
+
+  void loadParams(const TiXmlElement* root);
 
   void preInit(void);
@@ -31 +33 @@
 
   void setSize(float size);
-  void setTexture(const char* name, const char* extension);
+  /** \brief assumes jpg as input-format */
+  void setTexture(const char* name) { setTextureAndType (name, "jpg");};
+  void setTextureAndType(const char* name, const char* extension);
   void setTextures(const char* top, const char* bottom, const char* left, const char* right, const char* front, const char* back);
 

orxonox/branches/physics/src/world_entities/world_entity.cc

@@ -23 +23 @@
 #include "vector.h"
 
-//#include "stdincl.h"
-//#include "collision.h"
-
 using namespace std;
 
 /**
-   \brief standard constructor
-*/
-WorldEntity::WorldEntity ()
+   \brief Loads the WordEntity-specific Part of any derived Class
+*/
+WorldEntity::WorldEntity(const TiXmlElement* root)
 {
   this->setClassName ("WorldEntity");
+  this->model = NULL;
+
+  if (root)
+    this->loadParams(root);
+
   this->bDraw = true;
-  this->model = NULL;
-  //  collisioncluster = NULL;
-}
-
-/**
-   \brief Loads the WordEntity-specific Part of any derived Class
-*/
-WorldEntity::WorldEntity(TiXmlElement* root)
-{
-  // Name Setup
-  char* temp;
-  const char* string;
-  string = grabParameter( root, "name");
-  if( string == NULL)
-    {
-      PRINTF(2)("WorldEntity is missing a proper 'name'\n");
-      string = "Unknown";
-      temp = new char[strlen(string + 2)];
-      strcpy( temp, string);
-      this->setName( temp);
-    }
-  else
-    {
-      temp = new char[strlen(string + 2)];
-      strcpy( temp, string);
-      this->setName( temp);
-    }
+}
+
+void WorldEntity::loadParams(const TiXmlElement* root)
+{
+  // name setup
+  LoadParam<WorldEntity>(root, "name", this, &WorldEntity::setName)
+    .describe("the name of the Object at hand");
+
   // Model Loading      
-  this->model = NULL;
-  string = grabParameter( root, "model");
-  if( string != NULL)
-    this->model = (Model*)ResourceManager::getInstance()->load(string, OBJ, RP_CAMPAIGN);
-  else
-    {
-      PRINTF(2)("WorldEntity is missing a proper 'model'\n");
-      this->model = NULL;
-    }
-  if( this->model == NULL)
-    {
-      PRINTF(2)("WorldEntity model '%s' could not be loaded\n", string);
-    }
-  this->bDraw = true;
+  LoadParam<WorldEntity>(root, "model", this, &WorldEntity::loadModel)
+    .describe("the fileName of the model, that should be loaded onto this world-entity. (must be relative to the data-dir)") ;
 }
 
@@ -87 +58 @@
   if (this->model)
     ResourceManager::getInstance()->unload(this->model);
+}
+
+/**
+   \brief loads a Model onto a WorldEntity
+   \param fileName the name of the model to load
+*/
+void WorldEntity::loadModel(const char* fileName)
+{
+  if (this->model)
+    ResourceManager::getInstance()->unload(this->model, RP_LEVEL);
+  this->model = (Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN);
 }
 

orxonox/branches/physics/src/world_entities/world_entity.h

@@ -10 +10 @@
 #include "comincl.h"
 #include "resource_manager.h"
+#include "factory.h"
+#include "load_param.h"
 
 
@@ -15 +17 @@
 class CharacterAttributes;
 class Model;
-
-
 //! Basic class from which all interactive stuff in the world is derived from
 class WorldEntity : public PNode
@@ -23 +23 @@
 
  public:
-  WorldEntity (void);
-  WorldEntity(TiXmlElement* root);
+  WorldEntity(const TiXmlElement* root = NULL);
   virtual ~WorldEntity ();
 
+  void loadParams(const TiXmlElement* root);
+  void loadModel(const char* fileName);
 
   //void setCollision (CollisionCluster* newhull);