Changeset 6222 in orxonox.OLD for trunk/src/lib

Timestamp:

Dec 21, 2005, 1:49:06 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the christmas branche to the trunk
merged with command:
svn merge -r6165:HEAD christmas_branche/ ../trunk/
no conflicts

Location:

trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/lib (modified) (1 prop)
• src/lib/collision_detection (modified) (1 prop)
• src/lib/collision_detection/cd_engine.cc (modified) (1 diff)
• src/lib/collision_detection/obb.cc (modified) (1 diff)
• src/lib/event (modified) (1 prop)
• src/lib/graphics (modified) (1 prop)
• src/lib/graphics/graphics_engine.cc (modified) (2 diffs)
• src/lib/graphics/importer (modified) (1 prop)
• src/lib/graphics/importer/md2Model.cc (modified) (18 diffs)
• src/lib/graphics/importer/md2Model.h (modified) (4 diffs)
• src/lib/graphics/importer/model.h (modified) (3 diffs)
• src/lib/graphics/render2D/render_2d.cc (modified) (1 diff)
• src/lib/graphics/spatial_separation (modified) (1 prop)
• src/lib/graphics/text_engine/text_engine.cc (modified) (1 diff)
• src/lib/gui (modified) (1 prop)
• src/lib/gui/gl_gui (modified) (1 prop)
• src/lib/gui/gtk_gui (modified) (1 prop)
• src/lib/network (modified) (1 prop)
• src/lib/parser (modified) (1 prop)
• src/lib/parser/ini_parser (modified) (1 prop)
• src/lib/parser/tinyxml (modified) (1 prop)
• src/lib/particles (modified) (1 prop)
• src/lib/particles/particle_system.cc (modified) (1 diff)
• src/lib/physics (modified) (1 prop)
• src/lib/shell (modified) (1 prop)
• src/lib/shell/shell.cc (modified) (1 diff)
• src/lib/shell/shell_buffer.cc (modified) (1 diff)
• src/lib/shell/shell_command.cc (modified) (1 diff)
• src/lib/shell/shell_input.cc (modified) (1 diff)
• src/lib/sound (modified) (1 prop)
• src/lib/sound/sound_engine.cc (modified) (1 diff)
• src/lib/util/executor/executor.cc (modified) (1 diff)

trunk/src/lib/collision_detection/cd_engine.cc

@@ -19 +19 @@
 #include "obb_tree.h"
 #include "debug.h"
-#include "list.h"
 
 #include "model.h"

trunk/src/lib/collision_detection/obb.cc

@@ -17 +17 @@
 
 #include "obb.h"
-#include "list.h"
 #include "vector.h"
 

trunk/src/lib/graphics/graphics_engine.cc

@@ -37 +37 @@
 #ifdef __WIN32__
  #include "class_list.h"
- #include "list.h"
  #include "static_model.h"
 #endif
@@ -579 +578 @@
   std::list<WorldEntity*>::const_iterator entity;
   for (entity = drawList.begin(); entity != drawList.end(); entity++)
-    if ((*entity)->isVisible()) 
-      (*entity)->draw(); 
+    if ((*entity)->isVisible())
+      (*entity)->draw();
 }
 

trunk/src/lib/graphics/importer/md2Model.cc

@@ -21 +21 @@
 #include "resource_manager.h"
 
-//#include <fstream>
-
 
 using namespace std;
@@ -36 +34 @@
 };
 
-//! again one of these strange id software parts
-static float *shadeDots = MD2Model::anormsDots[0];
 
 //! the angle under which the model is viewd, used internaly
@@ -46 +42 @@
 sAnim MD2Model::animationList[21] =
   {
- // begin, end, fps
-    {   0,  39,  9 },   //!< STAND
-    {  40,  45, 10 },   //!< RUN
-    {  46,  53, 10 },   //!< ATTACK
-    {  54,  57,  7 },   //!< PAIN_A
-    {  58,  61,  7 },   //!< PAIN_B
-    {  62,  65,  7 },   //!< PAIN_C
-    {  66,  71,  7 },   //!< JUMP
-    {  72,  83,  7 },   //!< FLIP
-    {  84,  94,  7 },   //!< SALUTE
-    {  95, 111, 10 },   //!< FALLBACK
-    { 112, 122,  7 },   //!< WAVE
-    { 123, 134,  6 },   //!< POINTT
-    { 135, 153, 10 },   //!< CROUCH_STAND
-    { 154, 159,  7 },   //!< CROUCH_WALK
-    { 160, 168, 10 },   //!< CROUCH_ATTACK
-    { 196, 172,  7 },   //!< CROUCH_PAIN
-    { 173, 177,  5 },   //!< CROUCH_DEATH
-    { 178, 183,  7 },   //!< DEATH_FALLBACK
-    { 184, 189,  7 },   //!< DEATH_FALLFORWARD
-    { 190, 197,  7 },   //!< DEATH_FALLBACKSLOW
-    { 198, 198,  5 },   //!< BOOM
+ // begin, end, fps, interruptable
+    {   0,  39,  9, 1 },   //!< STAND
+    {  40,  45, 10, 1 },   //!< RUN
+    {  46,  53, 10, 0 },   //!< ATTACK
+    {  54,  57,  7, 1 },   //!< PAIN_A
+    {  58,  61,  7, 1 },   //!< PAIN_B
+    {  62,  65,  7, 1 },   //!< PAIN_C
+    {  66,  71,  7, 0 },   //!< JUMP
+    {  72,  83,  7, 1 },   //!< FLIP
+    {  84,  94,  7, 1 },   //!< SALUTE
+    {  95, 111, 10, 1 },   //!< FALLBACK
+    { 112, 122,  7, 1 },   //!< WAVE
+    { 123, 134,  6, 1 },   //!< POINTT
+    { 135, 153, 10, 1 },   //!< CROUCH_STAND
+    { 154, 159,  7, 1 },   //!< CROUCH_WALK
+    { 160, 168, 10, 1 },   //!< CROUCH_ATTACK
+    { 196, 172,  7, 1 },   //!< CROUCH_PAIN
+    { 173, 177,  5, 0 },   //!< CROUCH_DEATH
+    { 178, 183,  7, 0 },   //!< DEATH_FALLBACK
+    { 184, 189,  7, 0 },   //!< DEATH_FALLFORWARD
+    { 190, 197,  7, 0 },   //!< DEATH_FALLBACKSLOW
+    { 198, 198,  5, 1 },   //!< BOOM
   };
 
@@ -87 +83 @@
 
   this->scaleFactor = this->data->scaleFactor;
+
+  shadeDots = MD2Model::anormsDots[0];
+  /* set the animation stat mannualy */
+  this->animationState.type = STAND;
+  this->animationState.numPlays = 1;
   this->setAnim(STAND);
+
+  this->debug();
 }
 
@@ -103 +106 @@
 /**
  *  initializes an array of vert with the current frame scaled vertices
- * @param verticesList: the list of vertices to interpolate between
+ * @param this->verticesList: the list of vertices to interpolate between
 
    we won't use the pVertices array directly, since its much easier and we need
    saving of data anyway
 */
-void MD2Model::interpolate(sVec3D* verticesList)
+void MD2Model::interpolate(/*sVec3D* this->verticesList*/)
 {
   sVec3D* currVec;
@@ -118 +121 @@
   for( int i = 0; i < this->data->numVertices; ++i)
     {
-      verticesList[i][0] = currVec[i][0] + this->animationState.interpolationState * (nextVec[i][0] - currVec[i][0]);
-      verticesList[i][1] = currVec[i][1] + this->animationState.interpolationState * (nextVec[i][1] - currVec[i][1]);
-      verticesList[i][2] = currVec[i][2] + this->animationState.interpolationState * (nextVec[i][2] - currVec[i][2]);
+      this->verticesList[i][0] = currVec[i][0] + this->animationState.interpolationState * (nextVec[i][0] - currVec[i][0]);
+      this->verticesList[i][1] = currVec[i][1] + this->animationState.interpolationState * (nextVec[i][1] - currVec[i][1]);
+      this->verticesList[i][2] = currVec[i][2] + this->animationState.interpolationState * (nextVec[i][2] - currVec[i][2]);
     }
 }
@@ -135 +138 @@
   if( (type < 0) || (type > MAX_ANIMATIONS) )
     type = STAND;
+
+  if( MD2Model::animationList[this->animationState.type].bStoppable == 0)
+  {
+    if( this->animationState.numPlays == 0 )
+      return;
+  }
 
   this->animationState.startFrame = animationList[type].firstFrame;
@@ -141 +150 @@
   this->animationState.fps = animationList[type].fps;
   this->animationState.type = type;
+  this->animationState.numPlays = 0;
 
   this->animationState.interpolationState = 0.0f;
@@ -155 +165 @@
 void MD2Model::tick(float time)
 {
-  this->animationState.localTime += time;
+  this->animate(time);
+  this->processLighting();
+  this->interpolate(/*this->verticesList*/);
 }
 
@@ -164 +176 @@
  * FIXME
  */
-void MD2Model::draw()
-{
-  if( likely(this->animationState.localTime > 0.0))
-    this->animate();
-
+void MD2Model::draw() const
+{
   glPushMatrix();
-
   this->renderFrame();
-
+  // renderFrameTriangles();
   glPopMatrix();
 }
@@ -180 +188 @@
   \brief this is an internal function to render this special frame selected by animate()
 */
-void MD2Model::renderFrame()
-{
-  static sVec3D verticesList[MD2_MAX_VERTICES]; /* performance: created only once in a lifetime */
+void MD2Model::renderFrame() const
+{
   int* pCommands = this->data->pGLCommands;
 
@@ -191 +198 @@
   glCullFace(GL_BACK);
 
-  this->processLighting();
-  this->interpolate(verticesList);
   this->data->material->select();
 
@@ -208 +213 @@
         }
 
-
       for(; i > 0; i--, pCommands += 3) /* down counting for loop, next 3 gl commands */
         {
           glTexCoord2f( ((float *)pCommands)[0], ((float *)pCommands)[1] );
           glNormal3fv(anorms[this->data->pLightNormals[pCommands[2]]]);
-          glVertex3fv(verticesList[pCommands[2]]);
+          glVertex3fv(this->verticesList[pCommands[2]]);
         }
       glEnd();
@@ -223 +227 @@
 
 
+void MD2Model::renderFrameTriangles() const
+{
+  //static sVec3D this->verticesList[MD2_MAX_VERTICES]; /* performance: created only once in a lifetime */
+  int* pCommands = this->data->pGLCommands;
+  /* some face culling stuff */
+//   glPushAttrib(GL_POLYGON_BIT);
+//   glFrontFace(GL_CW);
+//   glEnable(GL_CULL_FACE);
+//   glCullFace(GL_BACK);
+//
+//   this->processLighting();
+//   this->interpolate(/*this->verticesList*/);
+  this->data->material->select();
+
+  /* draw the triangles */
+  glBegin(GL_TRIANGLES);
+
+  for( int i = 0, k = 0; i < this->data->numTriangles; ++i, k += 3)
+  {
+    float* v = this->data->pVertices[this->data->pTriangles[i].indexToVertices[0]];
+
+    printf("triangle: %i\n", i);
+    printf("     v0: (%f, %f, %f)\n", v[0], v[1], v[2]);
+    v = this->data->pVertices[this->data->pTriangles[i].indexToVertices[1]];
+    printf("     v1: (%f, %f, %f)\n", v[0], v[1], v[2]);
+    v = this->data->pVertices[this->data->pTriangles[i].indexToVertices[2]];
+    printf("     v2: (%f, %f, %f)\n", v[0], v[1], v[2]);
+
+
+    glNormal3f(anorms[i][0], anorms[i][1], anorms[i][2]);
+    glVertex3fv(this->data->pVertices[this->data->pTriangles[i].indexToVertices[0]]);
+
+    glNormal3f(anorms[i][0], anorms[i][1], anorms[i][2]);
+    glVertex3fv(this->data->pVertices[this->data->pTriangles[i].indexToVertices[1]]);
+
+    glNormal3f(anorms[i][0], anorms[i][1], anorms[i][2]);
+    glVertex3fv(this->data->pVertices[this->data->pTriangles[i].indexToVertices[2]]);
+  }
+
+  glEnd();
+}
+
+
 /**
   \brief animates the current model
@@ -228 +275 @@
   depending on the time passed (tick function), the player will select another model
 */
-void MD2Model::animate()
-{
+void MD2Model::animate(float time)
+{
+  this->animationState.localTime += time;
+
   if( this->animationState.localTime - this->animationState.lastTime > (1.0f / this->animationState.fps))
     {
@@ -236 +285 @@
 
       if( this->animationState.nextFrame > this->animationState.endFrame)
+      {
         this->animationState.nextFrame = this->animationState.startFrame;
+        this->animationState.numPlays++;
+      }
       this->animationState.lastTime = this->animationState.localTime;
     }
@@ -297 +349 @@
   this->numTexCoor = 0;
 
-  this->scaleFactor = 0.2f;
+//   this->scaleFactor = 1.0f;
+  this->scaleFactor = 0.1f;
 
   this->fileName = NULL;
@@ -399 +452 @@
         {
           /* SPEEDUP: *(pVerts + i + 0) = (*(frame->pVertices + i + 0)...  */
-          pVertex[j][0] = ((frame->pVertices[j].v[0] * frame->scale[0] ) + frame->translate[0] )* this->scaleFactor;
-          pVertex[j][1] = ((frame->pVertices[j].v[2] * frame->scale[2]) + frame->translate[2]) * this->scaleFactor;
-          pVertex[j][2] = (-1.0 * (frame->pVertices[j].v[1] * frame->scale[1] + frame->translate[1])) * this->scaleFactor;
+           pVertex[j][0] = ((frame->pVertices[j].v[0] * frame->scale[0] ) + frame->translate[0] )* this->scaleFactor;
+           pVertex[j][1] = ((frame->pVertices[j].v[2] * frame->scale[2]) + frame->translate[2]) * this->scaleFactor;
+           pVertex[j][2] = (-1.0 * (frame->pVertices[j].v[1] * frame->scale[1] + frame->translate[1])) * this->scaleFactor;
+
+          //printf("vertex %i/%i: (%f, %f, %f)\n", j, this->numVertices, pVertex[j][0], pVertex[j][1], pVertex[j][2]);
 
           pNormals[j] = frame->pVertices[j].lightNormalIndex;
         }
     }
+    PRINTF(4)("Finished loading the md2 file\n");
 
   delete [] buffer;

trunk/src/lib/graphics/importer/md2Model.h

@@ -65 +65 @@
 };
 
+
+//! compressed vertex data: char insetead of float, the value will be expanded by the scale value. only for loading
+typedef struct
+{
+  unsigned char    v[3];                 //!< the vector of the vertex
+  unsigned char    lightNormalIndex;     //!< the index of the light normal
+} sVertex;
+
+
+//! compressed texture offset data: coords scaled by the texture size. Only for loading
+typedef struct
+{
+  short            s;                    //!< the s,t coordinates of a texture
+  short            t;                    //!< the s,t coordinates of a texture
+} sTexCoor;
+
+
+//! holds tha informations about a md2 frame
+typedef struct
+{
+  sVec3D           scale;                //!< scales values of the model
+  sVec3D           translate;            //!< translates the model
+  char             name[16];             //!< frame name: something like "run32"
+  sVertex          pVertices[1];         //!< first vertex of thes frame
+} sFrame;
+
+
+//! holds the information about a triangle
+typedef struct
+{
+  unsigned short   indexToVertices[3];   //!< index to the verteces of the triangle
+  unsigned short   indexToTexCoor[3];    //!< index to the texture coordinates
+} sTriangle;
+
+
+
+//! the command list of the md2 model, very md2 specific
+typedef struct
+{
+  float            s;                    //!< texture coordinate 1
+  float            t;                    //!< texture coordinate 2
+  int              vertexIndex;          //!< index of the vertex in the vertex list
+} glCommandVertex;
+
+
+//! a md2 animation definition
+typedef struct
+{
+  int              firstFrame;           //!< first frame of the animation
+  int              lastFrame;            //!< last frame of the animation
+  int              fps;                  //!< speed: number of frames per second
+  int              bStoppable;           //!< 1 if the animation is stoppable 0 else
+} sAnim;
+
+
+//! animation state definition
+typedef struct
+{
+  int              startFrame;           //!< the start frame of an animation
+  int              endFrame;             //!< last frame of the animation
+  int              fps;                  //!< fps of the animaion (speed)
+
+  float            localTime;            //!< the local time
+  float            lastTime;             //!< last time stamp
+  float            interpolationState;   //!< the state of the animation [0..1]
+
+  int              type;                 //!< animation type
+
+  int              currentFrame;         //!< the current frame
+  int              nextFrame;            //!< the next frame in the list
+  int              numPlays;             //!< the number of times, this has been played in series
+} sAnimState;
 
 
@@ -143 +215 @@
   virtual ~MD2Model();
 
-  void draw();
+  virtual void draw() const;
+  void renderFrameTriangles() const;
+
 
   void setAnim(int type);
-  /**
-   *  scales the current model
-   * @param scaleFactor: the factor [0..1] to use for scaling
-  */
+  /**  returns the current animation @returns animation type */
+  inline int MD2Model::getAnim() { return this->animationState.type; }
+  /**  scales the current model @param scaleFactor: the factor [0..1] to use for scaling */
   void scaleModel(float scaleFactor) { this->scaleFactor = scaleFactor;}
 
-  void tick(float dtS);
+  virtual void tick(float dtS);
   void debug();
 
 
 private:
-  void animate();
+  void animate(float time);
   void processLighting();
-  void interpolate(sVec3D* verticesList);
-  void renderFrame();
+  void interpolate(/*sVec3D* verticesList*/);
+  void renderFrame() const ;
 
 
@@ -168 +241 @@
   static float        anormsDots[SHADEDOT_QUANT][256];  //!< the anormals dot products
   static sAnim        animationList[21];                //!< the anomation list
+   //! again one of these strange id software parts
+  float*              shadeDots;
 
   MD2Data*            data;                             //!< the md2 data pointer
@@ -174 +249 @@
   float               scaleFactor;                      //!< the scale factor (individual)
   sAnimState          animationState;                   //!< animation state of the model
+  sVec3D              verticesList[MD2_MAX_VERTICES];   //!< place to temp sav the vert
 };
 

trunk/src/lib/graphics/importer/model.h

@@ -29 +29 @@
 
 
-
-//! compressed vertex data: char insetead of float, the value will be expanded by the scale value. only for loading
-typedef struct
-{
-  char             v[3];                 //!< the vector of the vertex
-  unsigned char    lightNormalIndex;     //!< the index of the light normal
-} sVertex;
-
-
-//! compressed texture offset data: coords scaled by the texture size. Only for loading
-typedef struct
-{
-  short            s;                    //!< the s,t coordinates of a texture
-  short            t;                    //!< the s,t coordinates of a texture
-} sTexCoor;
-
-
-//! holds tha informations about a md2 frame
-typedef struct
-{
-  sVec3D           scale;                //!< scales values of the model
-  sVec3D           translate;            //!< translates the model
-  char             name[16];             //!< frame name: something like "run32"
-  sVertex          pVertices[1];         //!< first vertex of thes frame
-} sFrame;
-
-
-//! holds the information about a triangle
-typedef struct
-{
-  unsigned short   indexToVertices[3];   //!< index to the verteces of the triangle
-  unsigned short   indexToTexCoor[3];    //!< index to the texture coordinates
-} sTriangle;
-
-
 //! holds the information about a triangle
 typedef struct
@@ -72 +37 @@
 } sTriangleExt;
 
-
-//! the command list of the md2 model, very md2 specific
-typedef struct
-{
-  float            s;                    //!< texture coordinate 1
-  float            t;                    //!< texture coordinate 2
-  int              vertexIndex;          //!< index of the vertex in the vertex list
-} glCommandVertex;
-
-
-//! a md2 animation definition
-typedef struct
-{
-  int              firstFrame;           //!< first frame of the animation
-  int              lastFrame;            //!< last frame of the animation
-  int              fps;                  //!< speed: number of frames per second
-} sAnim;
-
-
-//! animation state definition
-typedef struct
-{
-  int              startFrame;           //!< the start frame of an animation
-  int              endFrame;             //!< last frame of the animation
-  int              fps;                  //!< fps of the animaion (speed)
-
-  float            localTime;            //!< the local time
-  float            lastTime;             //!< last time stamp
-  float            interpolationState;   //!< the state of the animation [0..1]
-
-  int              type;                 //!< animation type
-
-  int              currentFrame;         //!< the current frame
-  int              nextFrame;            //!< the next frame in the list
-} sAnimState;
 
 //! Model Information definitions
@@ -122 +52 @@
 
 } modelInfo;
-
 
 

trunk/src/lib/graphics/render2D/render_2d.cc

@@ -20 +20 @@
 #include "graphics_engine.h"
 #include "class_list.h"
-#include "list.h"
 #include "element_2d.h"
 

trunk/src/lib/graphics/text_engine/text_engine.cc

@@ -37 +37 @@
 
 #include "debug.h"
-#include "list.h"
 
 ///////////////////

trunk/src/lib/particles/particle_system.cc

@@ -130 +130 @@
   LoadParam(root, "type", this, ParticleSystem, setType)
       .describe("sets the type of the Particles, (dot, spark, sprite or model)");
+
+  LoadParam(root, "texture", this, ParticleSystem, setMaterialTexture);
 
   LOAD_PARAM_START_CYCLE(root, element);

trunk/src/lib/shell/shell.cc

@@ -23 +23 @@
 
 #include "text.h"
-#include "list.h"
 #include "graphics_engine.h"
 #include "material.h"

trunk/src/lib/shell/shell_buffer.cc

@@ -18 +18 @@
 #include "shell_buffer.h"
 #include "debug.h"
-#include "list.h"
 #include "shell.h"
 

trunk/src/lib/shell/shell_command.cc

@@ -19 +19 @@
 #include "shell_command_class.h"
 
-#include "list.h"
+#include "compiler.h"
 #include "debug.h"
 #include "class_list.h"

trunk/src/lib/shell/shell_input.cc

@@ -26 +26 @@
 
 #include "debug.h"
-#include "list.h"
 #include "compiler.h"
 #include "stdlibincl.h"

trunk/src/lib/sound/sound_engine.cc

@@ -24 +24 @@
 
 #include "p_node.h"
-#include "list.h"
 #include "resource_manager.h"
 #include "debug.h"

trunk/src/lib/util/executor/executor.cc

@@ -18 +18 @@
 #include "executor.h"
 
-#include "list.h"
 #include "debug.h"
 #include "class_list.h"