Changeset 3614 in orxonox.OLD

Timestamp:

Mar 21, 2005, 2:25:10 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: enhanced primitives, now more properties to set

Location:

orxonox/trunk/src

Files:

• story_entities/world.cc (modified) (1 diff)
• world_entities/primitive.cc (modified) (3 diffs)
• world_entities/primitive.h (modified) (1 diff)

orxonox/trunk/src/story_entities/world.cc

@@ -238 +238 @@
             Vector* es = new Vector (10, 5, 0);
             Quaternion* qs = new Quaternion ();
-            WorldEntity* pr = new Primitive(P_CUBE);
+            WorldEntity* pr = new Primitive(P_CYLINDER);
             pr->setName("primitive");
             this->spawn(pr, this->localPlayer, es, qs, PNODE_MOVEMENT);

orxonox/trunk/src/world_entities/primitive.cc

@@ -40 +40 @@
   
   this->material = new Material("Sphere");
-  //this->material->setDiffuseMap("../data/pictures/load_screen.jpg");
   this->material->setIllum(3);
   this->material->setAmbient(1, .5, 1);
@@ -54 +53 @@
   free(this->object);
 }
+
+
+/**
+   \brief sets the form of the primitive body
+   \param form (enumeration) from pForm
+*/
+void Primitive::setForm(pForm form)
+{
+  this->form = form;
+}
+
+
+/**
+   \brief sets the size of the body
+   \param size from [0..1]
+*/
+void Primitive::setSize(float size)
+{
+  if( size < 0 || size > 1)
+    {
+      PRINTF(1)("size must be value between 0 and 1 [0..1]. resetting it to 1\n");
+      size = 1.0;
+    }
+  this->size = size;
+}
+
+
+/**
+   \brief stets the material
+   \param material to be set
+*/
+void Primitive::setMaterial(Material* material)
+{
+  if( material == NULL)
+    {
+      PRINTF(1)("material reference is NULL, returning without modifications\n");
+      return;
+    }
+  this->material = material;
+}
+
+
+/**
+   \brief sets the texture name
+   \param path to the texture
+
+   eg: name could have following value: "../data/pictures/load_screen.jpg"
+*/
+void Primitive::setTexture(char* name)
+{
+  if( name == NULL )
+    {
+      PRINTF(1)("texture char reference is NULL, returning without modifications\n");
+      return;
+    }
+  this->textureName = name;
+  this->material->setDiffuseMap( name);
+}
+
 
 /**
@@ -98 +156 @@
     {
     case P_SPHERE:
-      gluSphere(this->object, 1, 6, 6);
+      gluSphere(this->object, 0.2, 6, 6);
       break;
     case P_CUBE:

orxonox/trunk/src/world_entities/primitive.h

@@ -17 +17 @@
   virtual ~Primitive ();
 
+  void setForm(pForm form);
+  void setSize(float size);
+  void setMaterial(Material* material);
+  void setTexture(char* name);
+  
+
   virtual void tick (float time);
   virtual void hit (WorldEntity* weapon, Vector* loc);
   virtual void collide (WorldEntity* other,  Uint32 ownhitflags, Uint32 otherhitflags);
+  virtual void draw ();
 
-  virtual void draw ();
-  void glDrawCube();
 
 
  private:
-  GLUquadricObj *object; //!< the object to be rendered
-  Material *material;    //!< A Material for the SkySphere.
+  GLUquadricObj* object; //!< the object to be rendered
+  Material* material;    //!< A Material for the SkySphere.
   pForm form;
+  char* textureName;
+  float size;
 
+  void glDrawCube();
 };