Changeset 8544 in orxonox.OLD for branches/bsp_model

Timestamp:

Jun 16, 2006, 5:28:03 PM (18 years ago)

Author:

patrick

Message:

bsp: md3 animation parsing and reading construct finished

Location:

branches/bsp_model/src/lib/graphics/importer/md3

Files:

• md3_animation_cfg.cc (modified) (4 diffs)
• md3_animation_cfg.h (modified) (1 diff)

branches/bsp_model/src/lib/graphics/importer/md3/md3_animation_cfg.cc

@@ -176 +176 @@
               firstTorsoFrame = animation->first;
 
-
-          //newAnimCfg.putAnimation(animation);
+          this->putAnimation(animation);
         }
       }
-
-
     }
-
   }
 
@@ -196 +192 @@
   MD3Animation* MD3AnimationCfg::getAnimation(std::string name)
   {
-//     return (MD3Animation)animations.get(name);
+    return this->animations[name];
   }
 
@@ -205 +201 @@
    void MD3AnimationCfg::putAnimation(MD3Animation* anim)
    {
-//        animations.put(anim.name, anim);
+      this->animations[anim->name] = anim;
    }
 
@@ -211 +207 @@
 }
 
-#if 0
-      /**
-         * <p>Create an empty animation data resource. Use this when creating and
-         * managing your own animations.
-      */
-        protected AnimationCfg() {
-                animations=new TreeMap();
-}
-
-        /**
-         * <p>Constructor that loads an <i>animation.cfg</i> file into the internal
-         * data stuctures. The read information can later be consulted using the
-         * animationNames() and getAnimation() methods.
-         *
-         * @param file The file to open.
-        */
-        protected AnimationCfg(String file) throws IOException {
-                this();
-                InputStream fin=new FileInputStream(file);
-                CFGIO.loadAnimationCfg(this, fin);
-                fin.close();
-}
-
-        /**
-         * <p>Constructor that loads <i>animation.cfg</i> data coming from the specified
-         * input stream into the internal data stuctures. The read information can later
-         * be consulted using the animationNames() and getAnimation() methods.
-         *
-         * @param in The stream to read data from.
-        */
-        protected AnimationCfg(InputStream in) throws IOException {
-                this();
-                CFGIO.loadAnimationCfg(this, in);
-}
-
-        /**
-         * <p>Return an Iterator listing the names of all known animations.
-        */
-        public Iterator animationNames() {
-                return animations.keySet().iterator();
-}
-
-        /**
-         * <p>Look up the animation data for the animation with the specified name.
-         *
-         * @param name Name of the animation.
-         * @return The animation data associated with the name or null if no data was found.
-        */
-        public MD3Animation getAnimation(String name) {
-                return (MD3Animation)animations.get(name);
-}
-
-        /**
-         * <p>Add the specified animation to the list of known animations.
-        */
-        public void putAnimation(MD3Animation anim) {
-                animations.put(anim.name, anim);
-}
-#endif
-
+
+

branches/bsp_model/src/lib/graphics/importer/md3/md3_animation_cfg.h

@@ -40 +40 @@
       void putAnimation(MD3Animation* animation);
 
-      std::string toString() { return std::string("Name: " + this->filename); }
-
 
     public: