Changeset 8081 in orxonox.OLD for branches/bsp_model/src/world_entities

Timestamp:

Jun 1, 2006, 4:42:01 PM (18 years ago)

Author:

bottac

Message:

Loadable from .oxw

Location:

branches/bsp_model/src/world_entities

Files:

• WorldEntities.am (modified) (2 diffs)
• bsp_entity.cc (copied) (copied from branches/bsp_model/src/proto/proto_world_entity.cc) (5 diffs)
• bsp_entity.h (copied) (copied from branches/bsp_model/src/proto/proto_world_entity.h) (2 diffs)
• terrain.cc (modified) (3 diffs)

branches/bsp_model/src/world_entities/WorldEntities.am

@@ -15 +15 @@
                 world_entities/test_entity.cc \
                 world_entities/planet.cc \
+                world_entities/bsp_entity.cc \
                 \
                 world_entities/weapons/test_gun.cc \
@@ -65 +66 @@
                 test_entity.h \
                 planet.h \
+                bsp_entity.h \
                 \
                 weapons/test_gun.h \

branches/bsp_model/src/world_entities/bsp_entity.cc

@@ -14 +14 @@
 */
 
-#include "proto_world_entity.h"
-
+#include "bsp_entity.h"
+#include "util/loading/resource_manager.h"
 using namespace std;
 
-
+CREATE_FACTORY(BSPEntity, CL_BSP_ENTITY);
 /**
- * constructs and loads a ProtoWorldEntity from a XML-element
+ * constructs and loads a BSPEntity from a XML-element
  * @param root the XML-element to load from
  */
-ProtoWorldEntity::ProtoWorldEntity(const TiXmlElement* root)
+BSPEntity::BSPEntity(const TiXmlElement* root)
 {
   this->init();
@@ -34 +34 @@
  * standard deconstructor
  */
-ProtoWorldEntity::~ProtoWorldEntity ()
+BSPEntity::~BSPEntity ()
 {
 
 }
 
+void BSPEntity::setName(const std::string& name)
+{
+  printf("+++++++++++ LOADING NAME %s\n", name.c_str());
+  
+  this->bspManager->load(name.c_str(), 0.1f);
+}
+
+
 
 /**
- * initializes the ProtoWorldEntity
+ * initializes the BSPEntity
  * @todo change this to what you wish
  */
-void ProtoWorldEntity::init()
+void BSPEntity::init()
 {
-  this->setClassID(CL_PROTO_WORLD_ENTITY, "ProtoWorldEntity");
+  this->bspManager = new BspManager();
+  this->setClassID(CL_BSP_ENTITY, "BSPEntity");
 
+  this->toList(OM_ENVIRON);
+  
   /**
-   * @todo: Write CL_PROTO_WORLD_ENTITY INTO THE src/defs/class_id.h (your own definition)
+   * @todo: Write CL_BSP_ENTITY INTO THE src/defs/class_id.h (your own definition)
    */
 
@@ -56 +67 @@
 
 /**
- * loads a ProtoWorldEntity from a XML-element
+ * loads a BSPEntity from a XML-element
  * @param root the XML-element to load from
  * @todo make the class Loadable
  */
-void ProtoWorldEntity::loadParams(const TiXmlElement* root)
+void BSPEntity::loadParams(const TiXmlElement* root)
 {
   // all the clases this Entity is directly derived from must be called in this way, to load all settings.
-  WorldEntity::loadParam(root);
+ // WorldEntity::loadParam(root);
+  
+  LoadParam(root, "Name", this, BSPEntity, setName)
+      .describe("Sets the of the BSP file.");
 
+/*  LoadParam(root, "Scale", this, BSpEntity, setScale)
+      .describe("Sets the scale factore of the bsp level.");
+*/
 
   /**
@@ -73 +90 @@
 
 /**
- * advances the ProtoWorldEntity about time seconds
+ * advances the BSPEntity about time seconds
  * @param time the Time to step
  */
-ProtoWorldEntity::tick(float time)
+void BSPEntity::tick(float time)
 {
 
 }
 
+
 /**
  * draws this worldEntity
  */
-void ProtoWorldEntity::draw () const
+void BSPEntity::draw () const
 {
-  glMatrixMode(GL_MODELVIEW);
-  glPushMatrix();
-  float matrix[4][4];
-
-  /* translate */
-  glTranslatef (this->getAbsCoor ().x,
-                this->getAbsCoor ().y,
-                this->getAbsCoor ().z);
-  /* rotate */
-  this->getAbsDir().matrix(matrix);
-  glMultMatrixf((float*)matrix);
-
-  if (model)
-    model->draw();
-  glPopMatrix();
+  this->bspManager->draw();
 }
 
@@ -108 +112 @@
  *
  */
-void ProtoWorldEntity::collidesWith (WorldEntity* entity, const Vector& location)
+void BSPEntity::collidesWith (WorldEntity* entity, const Vector& location)
 {
 

branches/bsp_model/src/world_entities/bsp_entity.h

@@ -1 +1 @@
 /*!
- * @file proto_world_entity.h
+ * @file bsp_entity.h
  * @brief description
 */
 
-#ifndef _PROTO_WORLD_ENTITY_H
-#define _PROTO_WORLD_ENTITY_H
+#ifndef _BSP_ENTITY_H
+#define _BSP_ENTITY_H
 
 #include "world_entity.h"
+#include "bsp_manager.h"
+
+#include "util/loading/factory.h"
+#include "util/loading/load_param.h"
+
+
 
 //! A Class to ...
-class ProtoWorldEntity : public WorldEntity
+class BSPEntity : public WorldEntity
 {
-
+ 
  public:
-  ProtoWorldEntity(const TiXmlElement* root = NULL);
-  virtual ~ProtoWorldEntity();
+  BSPEntity(const TiXmlElement* root = NULL);
+  virtual ~BSPEntity();
 
   virtual void loadParams(const TiXmlElement* root);
+  
+  void setName(const std::string& name);
+
   void init();
-
-  virtual void postSpawn ();
-  virtual void leftWorld ();
-
 
   virtual void draw() const;
@@ -29 +34 @@
 
  private:
+   BspManager* bspManager;
 
 };
 
-#endif /* _PROTO_WORLD_ENTITY_H */
+#endif /* _BSP_ENTITY_H */

branches/bsp_model/src/world_entities/terrain.cc

@@ -117 +117 @@
         
   this->bspManager = new BspManager();
+  this->bspManager->load("test.bsp", 0.4);
   //this->loadTexture("maps/wall1.jpeg");
 }
@@ -208 +209 @@
   // Vector tmpRot = this->getAbsDir().getSpacialAxis();
   //glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
-/*
+
   if (this->objectList)
     glCallList(this->objectList);
@@ -226 +227 @@
   }
 
-*/
-
-  this->bspManager->draw();
+
+
+ // this->bspManager->draw();
   glPopMatrix();