Changeset 2666 in orxonox.OLD for orxonox/branches/chris

Timestamp:

Oct 27, 2004, 7:49:25 PM (20 years ago)

Author:

chris

Message:

orxonox/branches/chris: implemented missing DataTank code, precaching implemented, possibility to specify a function to document the precaching process visually added - doxygen tags still missing

Location:

orxonox/branches/chris/src

Files:

• data_tank.cc (modified) (2 diffs)
• data_tank.h (modified) (1 diff)

orxonox/branches/chris/src/data_tank.cc

@@ -283 +283 @@
                 {
                         // return placeholder
+                        return loader->get_placeholder( type);
                 }
                 else
@@ -305 +306 @@
 }
 
-void DataTank::precache( char* resfile, void(*pfunc)(int, float, char*, char*))
-{
+void DataTank::precache( char* resfile, void(*pfunc)(int, float, char*))
+{
+        FILE* source;
+        int total, done;
+        char file[256];
+        char* s;
+        
+        source = fopen( resfile, "r");
+        if( source == NULL) return;
+        
+        total = done = 0;
+        
+        while( !feof( source))
+        {
+                fgets( file, 256, source);
+                if( (s = strchr( file, '\n')) != NULL) *s = 0;
+                if( strlen( file) > 1) total++;
+        }
+        
+        rewind( source);
+        
+        while( !feof( source))
+        {
+                fgets( file, 256, source);
+                if( (s = strchr( file, '\n')) != NULL) *s = 0;
+                if( strlen( file) > 1)
+                {
+                        if( pfunc) pfunc( total, ((float)done)/((float)total), file);
+                        get( file);
+                        done++;
+                }
+        }
+        
+        fclose( source);
 }
 

orxonox/branches/chris/src/data_tank.h

@@ -86 +86 @@
         void unload( char* file);
         int add_filetype( char* postfix, void*(*lfunc)(char*), void(*ffunc)(void*), char* placeholderfile);
-        void precache( char* resfile, void(*pfunc)(int, float, char*, char*));
+        void precache( char* resfile, void(*pfunc)(int, float, char*));
         void save_precache( char* file);
         void save_node( DataTree* act, FILE* out);