Changeset 5865 in orxonox.OLD

Timestamp:

Dec 1, 2005, 11:00:49 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: sequence test

Location:

trunk/src

Files:

• lib/graphics/importer/texture_sequence.cc (modified) (9 diffs)
• lib/graphics/importer/texture_sequence.h (modified) (1 diff)
• subprojects/importer/Makefile.am (modified) (2 diffs)
• subprojects/importer/multitex.cc (copied) (copied from trunk/src/subprojects/importer/importer.cc) (4 diffs)

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

@@ -29 +29 @@
 /**
  *  Constructor for a Texture
-*/
+ */
 TextureSequence::TextureSequence(unsigned int count, ...)
 {
@@ -41 +41 @@
 
 /**
- *  Destructor of a TextureSequence
-
-   Frees Data, and deletes the textures from GL
-*/
+ * Destructor of a TextureSequence
+ *
+ * Frees Data, and deletes the textures from GL
+ */
 TextureSequence::~TextureSequence()
 {
@@ -54 +54 @@
   }
 
+  this->setTexture(0);
   // delete all textures.
   while(!this->textures.empty())
@@ -65 +66 @@
 
 /**
- * rebuilds all the textures from the Images stored in this FrameSequence
+ * @brief rebuilds all the textures from the Images stored in this FrameSequence
  */
 bool TextureSequence::rebuild()
@@ -85 +86 @@
 
 /**
- * loads an image Series
+ * @brief loads an image Sequence
  * @param count how many images to load to the TextureSequence
  * @param ... the names of the Images to load
@@ -99 +100 @@
 
 /**
- * loads an image Series
+ * @brief loads an image Sequence
  * @param count how many images to load to the TextureSequence
  * @param textures the names of the Images to load
@@ -115 +116 @@
 }
 
-
+/**
+ * @brief adds a new Frame to this Sequence (at the end)
+ * @param imageName the Name of the Image to add
+ * @returns true on success
+ */
 bool TextureSequence::addFrame(const char* imageName)
 {
@@ -129 +134 @@
 
 /**
- * adds a new Frame at the end of the Sequence.
+ * @brief adds a new Frame at the end of the Sequence.
  * @param surface the Surface to add at the end of the Sequence.
  */
@@ -144 +149 @@
   }
   this->setAlpha(hasAlpha);
+  return true;
 }
+
+
+
+/**
+ * moves to the n'th texture which can then be retrieved via the Texture function: this->getTexture()
+ * @param frameNumber the n-th frame
+ */
+void TextureSequence::gotoFrame(unsigned int frameNumber)
+{
+  if (this->textures.size() > frameNumber)
+    this->setTexture(this->textures[frameNumber]);
+}

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

@@ -32 +32 @@
     virtual bool rebuild();
 
+    /** @returns the count of frames in this sequence */
+    inline unsigned int getFrameCount() const { return this->textures.size(); };
+
+    void gotoFrame(unsigned int frameNumber);
     /** @returns The textureID of the Frame @param frameNumber the n-th frame this texture-series.  */
-    inline GLuint getFrameTexture(unsigned int frameNumber) const { return this->textures[frameNumber]; };
+    inline GLuint getFrameTexture(unsigned int frameNumber) const { return (this->textures.size()>frameNumber)?this->textures[frameNumber]:0; };
     /** @returns The SDL_Surface of the image at Frame @param frameNumber the n-th frame of this image-seriers */
-    const SDL_Surface* const getFrameImage(unsigned int frameNumber) const { return this->images[frameNumber]; };
+    const SDL_Surface* const getFrameImage(unsigned int frameNumber) const { return (this->images.size()>frameNumber)?this->images[frameNumber]:NULL; };
 
   private:

trunk/src/subprojects/importer/Makefile.am

@@ -6 +6 @@
 importer_LDFLAGS = $(MWINDOWS)
 
-bin_PROGRAMS = importer
+bin_PROGRAMS = importer \
+               multitex
 
 importer_LDADD = $(MAINSRCDIR)/lib/event/libORXevent.a \
@@ -32 +33 @@
                   $(MAINSRCDIR)/lib/util/color.cc \
                   $(MAINSRCDIR)/lib/util/multi_type.cc \
+                  $(MAINSRCDIR)/lib/util/executor/executor.cc \
                   $(MAINSRCDIR)/util/loading/factory.cc
+
+
+multitex_LDADD = $(MAINSRCDIR)/lib/event/libORXevent.a \
+                 $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a \
+                 $(MAINSRCDIR)/lib/graphics/libORXgraphics.a \
+                 $(MAINSRCDIR)/lib/shell/libORXshell.a \
+                 $(MAINSRCDIR)/lib/sound/libORXsound.a \
+                 $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a
+
+multitex_SOURCES= ../framework.cc \
+                  multitex.cc \
+                  $(MAINSRCDIR)/util/state.cc \
+                  $(MAINSRCDIR)/world_entities/camera.cc \
+                  $(MAINSRCDIR)/lib/lang/base_object.cc \
+                  $(MAINSRCDIR)/lib/lang/class_list.cc \
+                  $(MAINSRCDIR)/lib/math/vector.cc \
+                  $(MAINSRCDIR)/util/loading/resource_manager.cc \
+                  $(MAINSRCDIR)/lib/util/ini_parser.cc \
+                  $(MAINSRCDIR)/lib/coord/p_node.cc \
+                  $(MAINSRCDIR)/lib/coord/null_parent.cc \
+                  $(MAINSRCDIR)/util/loading/load_param.cc \
+                  $(MAINSRCDIR)/util/loading/load_param_description.cc \
+                  $(MAINSRCDIR)/lib/util/helper_functions.cc \
+                  $(MAINSRCDIR)/lib/util/substring.cc \
+                  $(MAINSRCDIR)/lib/util/color.cc \
+                  $(MAINSRCDIR)/lib/util/multi_type.cc \
+                  $(MAINSRCDIR)/lib/util/executor/executor.cc \
+                  $(MAINSRCDIR)/util/loading/factory.cc

trunk/src/subprojects/importer/multitex.cc

@@ -20 +20 @@
 #include "light.h"
 
+#include "texture_sequence.h"
+#include "material.h"
+
 #include "objModel.h"
+
 #include "primitive_model.h"
 #include <stdlib.h>
@@ -27 +31 @@
 
 Model* obj;
+TextureSequence* seq;
+Texture* test;
+float counter = 0;
 
 void Framework::moduleInit(int argc, char** argv)
@@ -32 +39 @@
   ResourceManager::getInstance()->addImageDir("./");
 
-  for (int i = 0; i < argc; i++)
+  seq = new TextureSequence();
+  for (int i = 1; i < argc; i++)
   {
+    seq->addFrame(argv[i]);
     printf("%s\n", argv[i]);
   }
+  test = new Texture(argv[1]);
+
   ResourceManager::getInstance()->addImageDir("");
 
 
-  if (argc>=3)
-    obj = new OBJModel (argv[1], atof(argv[2]));
-  else if (argc>=2)
-    obj = new OBJModel(argv[1]);
-  else
-    obj = new PrimitiveModel(PRIM_CYLINDER);
+  obj = new PrimitiveModel(PRIM_CYLINDER);
 
   ResourceManager::getInstance()->debug();
@@ -69 +75 @@
 void Framework::moduleTick(float dt)
 {
+  counter+=dt;
 
+  seq->gotoFrame((unsigned int)counter);
+  if ((unsigned int)counter > seq->getFrameCount())
+    counter = 0;
 }
 
 void Framework::moduleDraw(void) const
 {
+  float diffuse[] = {1,1,1,1};
+  float ambient[] = {1,0,0,1};
+  float specular[] = {1,0,1,1};
+  // setting diffuse color
+  //  glColor3f (diffuse[0], diffuse[1], diffuse[2]);
+  glMaterialfv(GL_FRONT, GL_DIFFUSE, diffuse);
+
+  // setting ambient color
+  glMaterialfv(GL_FRONT, GL_AMBIENT, ambient);
+
+  // setting up Sprecular
+  glMaterialfv(GL_FRONT, GL_SPECULAR, specular);
+
+  // setting up Shininess
+  glMaterialf(GL_FRONT, GL_SHININESS, .4);
+  glShadeModel(GL_SMOOTH);
+
+  glEnable(GL_TEXTURE_2D);
+  glBindTexture(GL_TEXTURE_2D, seq->getTexture());
+//  printf("Number = %d\n", seq->getTexture());
+    /* This allows alpha blending of 2D textures with the scene */
+//     if (seq->hasAlpha())
+//     {
+//       glEnable(GL_BLEND);
+//       glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+//     }
+
   obj->draw();