Changeset 7115 in orxonox.OLD

Timestamp:

Feb 8, 2006, 2:42:08 AM (18 years ago)

Author:

bensch

Message:

movie-work

File:

• trunk/src/world_entities/movie_entity.cc (modified) (5 diffs)

trunk/src/world_entities/movie_entity.cc

@@ -63 +63 @@
   LoadParam(root, "name", this, MovieEntity, loadMovie);
   LoadParam(root, "axis", this, MovieEntity, setAxis);
-  //LoadParam(root, "rotation", this, MovieEntity, setRotation);
+  LoadParam(root, "rotation", this, MovieEntity, setRotation);
   LoadParam(root, "size", this, MovieEntity, setSize);
   LoadParam(root, "fps", this, MovieEntity, setFPS);
@@ -127 +127 @@
   }
 
-  if(rotation != 0)
-    axis = (int)(axis + (time * 360/rotation))%360;
+  axis += (time * rotation/360.0);
 }
 
@@ -142 +141 @@
     false;
 
+  glPushAttrib(GL_ENABLE_BIT);
+  glDisable(GL_LIGHTING);
+  glDisable(GL_BLEND);
+
+  glEnable(GL_TEXTURE_2D);
+  glBindTexture(GL_TEXTURE_2D, media_container->getFrameTexture(counter));
+
   glPushMatrix();
   glTranslatef (this->getAbsCoor ().x,
@@ -148 +154 @@
   glRotatef(axis, 0.0f, 1.0f, 0.0f);
 //PRINTF(0)("axis: %f\n", axis);
-
-  glPushAttrib(GL_ENABLE_BIT);
-  glDisable(GL_LIGHTING);
-  glDisable(GL_BLEND);
-
-  glEnable(GL_TEXTURE_2D);
-  glBindTexture(GL_TEXTURE_2D, media_container->getFrameTexture(counter));
 
   glColor3f(1.0, 1.0, 1.0);
@@ -165 +164 @@
   glEnd();
 
+  glPopMatrix();
   glPopAttrib();
-
-  glPopMatrix();
-
 }