Changeset 5509 in orxonox.OLD for trunk/src

Timestamp:

Nov 8, 2005, 4:46:24 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: proto_world_entity-stuff

Location:

trunk/src

Files:

• lib/graphics/graphics_engine.cc (modified) (1 diff)
• proto/proto_world_entity.cc (modified) (5 diffs)
• proto/proto_world_entity.h (modified) (1 diff)

trunk/src/lib/graphics/graphics_engine.cc

@@ -301 +301 @@
     glMatrixMode(GL_PROJECTION_MATRIX);
     glLoadIdentity();
-    glViewport(0,0,width,height);                                                   // Reset The Current Viewport
+    glViewport(0, 0, width, height);                     // Reset The Current Viewport
 }
 

trunk/src/proto/proto_world_entity.cc

@@ -15 +15 @@
 
 #include "proto_world_entity.h"
-#include "glincl.h"
-#include "stdincl.h"
-#include "vector.h"
-#include "model.h"
 
 using namespace std;
@@ -43 +39 @@
 }
 
+
 /**
  * initializes the ProtoWorldEntity
  * @todo change this to what you wish
  */
-void ProtoWorldEntity::init(void)
+void ProtoWorldEntity::init()
 {
-  this->setClassID(CL_PROTO_WORLD_ENTITY, )
-  ...
+  this->setClassID(CL_PROTO_WORLD_ENTITY, "ProtoWorldEntity");
+
+  /**
+   * @todo: Write CL_PROTO_WORLD_ENTITY INTO THE src/defs/class_id.h (your own definition)
+   */
+
 }
+
 
 /**
@@ -63 +65 @@
   static_cast<WorldEntity*>(this)->loadParam(root);
 
-  ...
+
+  /**
+   * @todo: make the class Loadable
+   */
 }
 
@@ -79 +84 @@
  * draws this worldEntity
  */
-void ProtoWorldEntity::draw ()
+void ProtoWorldEntity::draw () const
 {
   glMatrixMode(GL_MODELVIEW);
@@ -97 +102 @@
   glPopMatrix();
 }
+
+
+/**
+ *
+ *
+ */
+void ProtoWorldEntity::collidesWith (WorldEntity* entity, const Vector& location)
+{
+
+}

trunk/src/proto/proto_world_entity.h

@@ -20 +20 @@
   void init();
 
-  virtual void draw();
+  virtual void postSpawn ();
+  virtual void leftWorld ();
+
+
+  virtual void draw() const;
   virtual void tick(float time);
+  virtual void collidesWith (WorldEntity* entity, const Vector& location);
 
  private: