Changeset 6169 in orxonox.OLD for branches/christmas_branche/src/lib

Timestamp:

Dec 20, 2005, 12:22:17 AM (19 years ago)

Author:

patrick

Message:

christmas: model loading progress

Location:

branches/christmas_branche/src/lib

Files:

• event/event_handler.cc (modified) (1 diff)
• graphics/importer/md2Model.cc (modified) (5 diffs)
• graphics/importer/md2Model.h (modified) (2 diffs)

branches/christmas_branche/src/lib/event/event_handler.cc

@@ -259 +259 @@
 {
   this->eventsGrabbed = grabEvents;
-//   if(!grabEvents)
-//     SDL_WM_GrabInput(SDL_GRAB_OFF);
-//   else
-//     SDL_WM_GrabInput(SDL_GRAB_ON);
+  if(!grabEvents)
+    SDL_WM_GrabInput(SDL_GRAB_OFF);
+  else
+    SDL_WM_GrabInput(SDL_GRAB_ON);
 }
 

branches/christmas_branche/src/lib/graphics/importer/md2Model.cc

@@ -156 +156 @@
 {
   this->animationState.localTime += time;
+
+  if( likely(this->animationState.localTime > 0.0))
+    this->animate();
+
+  static sVec3D verticesList[MD2_MAX_VERTICES]; /* performance: created only once in a lifetime */
+  this->processLighting();
+  this->interpolate(verticesList);
 }
 
@@ -164 +171 @@
  * FIXME
  */
-void MD2Model::draw()
-{
-  if( likely(this->animationState.localTime > 0.0))
-    this->animate();
-
-  glPushMatrix();
+void MD2Model::draw() const
+{
+//   glPushMatrix();
 
   this->renderFrame();
 
-  glPopMatrix();
+//   glPopMatrix();
 }
 
@@ -180 +184 @@
   \brief this is an internal function to render this special frame selected by animate()
 */
-void MD2Model::renderFrame()
+void MD2Model::renderFrame() const
 {
   static sVec3D verticesList[MD2_MAX_VERTICES]; /* performance: created only once in a lifetime */
@@ -191 +195 @@
   glCullFace(GL_BACK);
 
-  this->processLighting();
-  this->interpolate(verticesList);
+
   this->data->material->select();
 
@@ -406 +409 @@
         }
     }
+    PRINTF(4)("Finished loading the md2 file\n");
 
   delete [] buffer;

branches/christmas_branche/src/lib/graphics/importer/md2Model.h

@@ -143 +143 @@
   virtual ~MD2Model();
 
-  void draw();
+  virtual void draw() const;
 
   void setAnim(int type);
@@ -160 +160 @@
   void processLighting();
   void interpolate(sVec3D* verticesList);
-  void renderFrame();
+  void renderFrame() const;