Changeset 10076 for OpenSceneGraph/trunk/src/osgPlugins/3ds/file.cpp

Timestamp:

04/22/09 17:46:24 (4 years ago)

Author:

robert

Message:

From Neil Hughes, converted across to use istream for reading data from file to enable reading .3ds files over http (use OSG's libcurl plugin).

From Robert Osfield, ammendments of the above to better support reading of files from local directories.

Files:

• OpenSceneGraph/trunk/src/osgPlugins/3ds/file.cpp (modified) (57 diffs)

OpenSceneGraph/trunk/src/osgPlugins/3ds/file.cpp

@@ -38 +38 @@
 #endif
 
-#include <osgDB/FileUtils>
-
+#include <istream>
+#include <stdio.h>
+//#include <strstream>
+#include <sstream>
+#include <fstream>
 
 /*!
@@ -66 +69 @@
  */
 Lib3dsFile*
-lib3ds_file_load(const char *filename)
-{
-  FILE *f;
-  Lib3dsFile *file;
-
-  f=osgDB::fopen(filename, "rb");
-  if (!f) {
-    return(0);
-  }
-  file=lib3ds_file_new();
-  if (!file) {
-    fclose(f);
-    return(0);
-  }
-  
-  if (!lib3ds_file_read(file, f)) {
-    free(file);
-    fclose(f);
-    return(0);
-  }
-  fclose(f);
+lib3ds_file_load(const char *filename, const osgDB::ReaderWriter::Options* options)
+{
+  Lib3dsFile *file = NULL;
+  std::stringstream bufferedStream;
+  ifstream inputStream(filename,ios::in|ios::binary);
+  if (!inputStream.fail())
+  {
+        bufferedStream.operator<<(inputStream.rdbuf());                
+        bufferedStream.seekp(ios_base::beg);                    
+        file = lib3ds_stream_load(&bufferedStream);
+        inputStream.close();
+  }
   return(file);
 }
+
+Lib3dsFile*
+lib3ds_stream_load(iostream * strm)
+{
+  Lib3dsFile *file = NULL;
+  if (strm)
+  {    
+    file=lib3ds_file_new();
+    if (file) 
+    {
+        if (!lib3ds_file_read(file,strm)) 
+        {
+            free(file);
+            file = NULL;
+        }
+    }
+    else 
+        file = NULL;
+  }
+  return(file);
+}
+
 
 
@@ -107 +123 @@
 lib3ds_file_save(Lib3dsFile *file, const char *filename)
 {
-  FILE *f;
-
-  f=osgDB::fopen(filename, "wb");
-  if (!f) {
+  fstream strm;
+
+  strm.open(filename,ios_base::out | ios_base::binary);
+  if (strm.fail()) return (LIB3DS_FALSE);
+  
+  if (!lib3ds_file_write(file, &strm)) {
+      strm.close();
     return(LIB3DS_FALSE);
   }
-  
-  if (!lib3ds_file_write(file, f)) {
-    fclose(f);
-    return(LIB3DS_FALSE);
-  }
-  fclose(f);
+  strm.close();
   return(LIB3DS_TRUE);
 }
@@ -214 +228 @@
 
 static Lib3dsBool
-named_object_read(Lib3dsFile *file, FILE *f)
+named_object_read(Lib3dsFile *file, iostream *strm)
 {
   Lib3dsChunk c;
@@ -220 +234 @@
   Lib3dsWord chunk;
 
-  if (!lib3ds_chunk_read_start(&c, LIB3DS_NAMED_OBJECT, f)) {
+  if (!lib3ds_chunk_read_start(&c, LIB3DS_NAMED_OBJECT, strm)) {
     return(LIB3DS_FALSE);
   }
-  if (!lib3ds_string_read(name, 64, f)) {
+  if (!lib3ds_string_read(name, 64, strm)) {
     return(LIB3DS_FALSE);
   }
   lib3ds_chunk_dump_info("  NAME=%s", name);
-  lib3ds_chunk_read_tell(&c, f);
-
-  while ((chunk=lib3ds_chunk_read_next(&c, f))!=0) {
+  lib3ds_chunk_read_tell(&c, strm);
+
+  while ((chunk=lib3ds_chunk_read_next(&c, strm))!=0) {
     switch (chunk) {
       case LIB3DS_N_TRI_OBJECT:
@@ -239 +253 @@
             return(LIB3DS_FALSE);
           }
-          lib3ds_chunk_read_reset(&c, f);
-          if (!lib3ds_mesh_read(mesh, f)) {
+          lib3ds_chunk_read_reset(&c, strm);
+          if (!lib3ds_mesh_read(mesh, strm)) {
             return(LIB3DS_FALSE);
           }
@@ -254 +268 @@
             return(LIB3DS_FALSE);
           }
-          lib3ds_chunk_read_reset(&c, f);
-          if (!lib3ds_camera_read(camera, f)) {
+          lib3ds_chunk_read_reset(&c, strm);
+          if (!lib3ds_camera_read(camera, strm)) {
             return(LIB3DS_FALSE);
           }
@@ -269 +283 @@
             return(LIB3DS_FALSE);
           }
-          lib3ds_chunk_read_reset(&c, f);
-          if (!lib3ds_light_read(light, f)) {
+          lib3ds_chunk_read_reset(&c, strm);
+          if (!lib3ds_light_read(light, strm)) {
             return(LIB3DS_FALSE);
           }
@@ -281 +295 @@
   }
   
-  lib3ds_chunk_read_end(&c, f);
+  lib3ds_chunk_read_end(&c, strm);
   return(LIB3DS_TRUE);
 }
@@ -287 +301 @@
 
 static Lib3dsBool
-ambient_read(Lib3dsFile *file, FILE *f)
+ambient_read(Lib3dsFile *file, iostream *strm)
 {
   Lib3dsChunk c;
@@ -293 +307 @@
   Lib3dsBool have_lin=LIB3DS_FALSE;
 
-  if (!lib3ds_chunk_read_start(&c, LIB3DS_AMBIENT_LIGHT, f)) {
+  if (!lib3ds_chunk_read_start(&c, LIB3DS_AMBIENT_LIGHT, strm)) {
     return(LIB3DS_FALSE);
   }
 
-  while ((chunk=lib3ds_chunk_read_next(&c, f))!=0) {
+  while ((chunk=lib3ds_chunk_read_next(&c, strm))!=0) {
     switch (chunk) {
       case LIB3DS_LIN_COLOR_F:
@@ -303 +317 @@
           int i;
           for (i=0; i<3; ++i) {
-            file->ambient[i]=lib3ds_float_read(f);
+            file->ambient[i]=lib3ds_float_read(strm);
           }
         }
@@ -315 +329 @@
             int i;
             for (i=0; i<3; ++i) {
-              file->ambient[i]=lib3ds_float_read(f);
+              file->ambient[i]=lib3ds_float_read(strm);
             }
           }
@@ -325 +339 @@
   }
   
-  lib3ds_chunk_read_end(&c, f);
+  lib3ds_chunk_read_end(&c, strm);
   return(LIB3DS_TRUE);
 }
@@ -331 +345 @@
 
 static Lib3dsBool
-mdata_read(Lib3dsFile *file, FILE *f)
+mdata_read(Lib3dsFile *file, iostream *strm)
 {
   Lib3dsChunk c;
   Lib3dsWord chunk;
 
-  if (!lib3ds_chunk_read_start(&c, LIB3DS_MDATA, f)) {
+  if (!lib3ds_chunk_read_start(&c, LIB3DS_MDATA, strm)) {
     return(LIB3DS_FALSE);
   }
   
-  while ((chunk=lib3ds_chunk_read_next(&c, f))!=0) {
+  while ((chunk=lib3ds_chunk_read_next(&c, strm))!=0) {
     switch (chunk) {
       case LIB3DS_MESH_VERSION:
         {
-          file->mesh_version=lib3ds_intd_read(f);
+          file->mesh_version=lib3ds_intd_read(strm);
         }
         break;
       case LIB3DS_MASTER_SCALE:
         {
-          file->master_scale=lib3ds_float_read(f);
+          file->master_scale=lib3ds_float_read(strm);
         }
         break;
@@ -360 +374 @@
       case LIB3DS_RAY_BIAS:
         {
-          lib3ds_chunk_read_reset(&c, f);
-          if (!lib3ds_shadow_read(&file->shadow, f)) {
+          lib3ds_chunk_read_reset(&c, strm);
+          if (!lib3ds_shadow_read(&file->shadow, strm)) {
             return(LIB3DS_FALSE);
           }
@@ -369 +383 @@
       case LIB3DS_DEFAULT_VIEW:
         {
-          lib3ds_chunk_read_reset(&c, f);
-          if (!lib3ds_viewport_read(&file->viewport, f)) {
+          lib3ds_chunk_read_reset(&c, strm);
+          if (!lib3ds_viewport_read(&file->viewport, strm)) {
             return(LIB3DS_FALSE);
           }
@@ -379 +393 @@
           int i;
           for (i=0; i<3; ++i) {
-            file->construction_plane[i]=lib3ds_float_read(f);
+            file->construction_plane[i]=lib3ds_float_read(strm);
           }
         }
@@ -385 +399 @@
       case LIB3DS_AMBIENT_LIGHT:
         {
-          lib3ds_chunk_read_reset(&c, f);
-          if (!ambient_read(file, f)) {
+          lib3ds_chunk_read_reset(&c, strm);
+          if (!ambient_read(file, strm)) {
             return(LIB3DS_FALSE);
           }
@@ -398 +412 @@
       case LIB3DS_USE_V_GRADIENT:
         {
-          lib3ds_chunk_read_reset(&c, f);
-          if (!lib3ds_background_read(&file->background, f)) {
+          lib3ds_chunk_read_reset(&c, strm);
+          if (!lib3ds_background_read(&file->background, strm)) {
             return(LIB3DS_FALSE);
           }
@@ -411 +425 @@
       case LIB3DS_USE_DISTANCE_CUE:
         {
-          lib3ds_chunk_read_reset(&c, f);
-          if (!lib3ds_atmosphere_read(&file->atmosphere, f)) {
+          lib3ds_chunk_read_reset(&c, strm);
+          if (!lib3ds_atmosphere_read(&file->atmosphere, strm)) {
             return(LIB3DS_FALSE);
           }
@@ -425 +439 @@
             return(LIB3DS_FALSE);
           }
-          lib3ds_chunk_read_reset(&c, f);
-          if (!lib3ds_material_read(material, f)) {
+          lib3ds_chunk_read_reset(&c, strm);
+          if (!lib3ds_material_read(material, strm)) {
             return(LIB3DS_FALSE);
           }
@@ -434 +448 @@
       case LIB3DS_NAMED_OBJECT:
         {
-          lib3ds_chunk_read_reset(&c, f);
-          if (!named_object_read(file, f)) {
+          lib3ds_chunk_read_reset(&c, strm);
+          if (!named_object_read(file, strm)) {
             return(LIB3DS_FALSE);
           }
@@ -445 +459 @@
   }
 
-  lib3ds_chunk_read_end(&c, f);
+  lib3ds_chunk_read_end(&c, strm);
   return(LIB3DS_TRUE);
 }
@@ -451 +465 @@
 
 static Lib3dsBool
-kfdata_read(Lib3dsFile *file, FILE *f)
+kfdata_read(Lib3dsFile *file, iostream *strm)
 {
   Lib3dsChunk c;
   Lib3dsWord chunk;
 
-  if (!lib3ds_chunk_read_start(&c, LIB3DS_KFDATA, f)) {
+  if (!lib3ds_chunk_read_start(&c, LIB3DS_KFDATA, strm)) {
     return(LIB3DS_FALSE);
   }
   
-  while ((chunk=lib3ds_chunk_read_next(&c, f))!=0) {
+  while ((chunk=lib3ds_chunk_read_next(&c, strm))!=0) {
     switch (chunk) {
       case LIB3DS_KFHDR:
         {
-          file->keyf_revision=lib3ds_word_read(f);
-          if (!lib3ds_string_read(file->name, 12+1, f)) {
-            return(LIB3DS_FALSE);
-          }
-          file->frames=lib3ds_intd_read(f);
+          file->keyf_revision=lib3ds_word_read(strm);
+          if (!lib3ds_string_read(file->name, 12+1, strm)) {
+            return(LIB3DS_FALSE);
+          }
+          file->frames=lib3ds_intd_read(strm);
         }
         break;
       case LIB3DS_KFSEG:
         {
-          file->segment_from=lib3ds_intd_read(f);
-          file->segment_to=lib3ds_intd_read(f);
+          file->segment_from=lib3ds_intd_read(strm);
+          file->segment_to=lib3ds_intd_read(strm);
         }
         break;
       case LIB3DS_KFCURTIME:
         {
-          file->current_frame=lib3ds_intd_read(f);
+          file->current_frame=lib3ds_intd_read(strm);
         }
         break;
@@ -485 +499 @@
       case LIB3DS_DEFAULT_VIEW:
         {
-          lib3ds_chunk_read_reset(&c, f);
-          if (!lib3ds_viewport_read(&file->viewport_keyf, f)) {
+          lib3ds_chunk_read_reset(&c, strm);
+          if (!lib3ds_viewport_read(&file->viewport_keyf, strm)) {
             return(LIB3DS_FALSE);
           }
@@ -499 +513 @@
             return(LIB3DS_FALSE);
           }
-          lib3ds_chunk_read_reset(&c, f);
-          if (!lib3ds_node_read(node, file, f)) {
+          lib3ds_chunk_read_reset(&c, strm);
+          if (!lib3ds_node_read(node, file, strm)) {
             return(LIB3DS_FALSE);
           }
@@ -514 +528 @@
             return(LIB3DS_FALSE);
           }
-          lib3ds_chunk_read_reset(&c, f);
-          if (!lib3ds_node_read(node, file, f)) {
+          lib3ds_chunk_read_reset(&c, strm);
+          if (!lib3ds_node_read(node, file, strm)) {
             return(LIB3DS_FALSE);
           }
@@ -529 +543 @@
             return(LIB3DS_FALSE);
           }
-          lib3ds_chunk_read_reset(&c, f);
-          if (!lib3ds_node_read(node, file, f)) {
+          lib3ds_chunk_read_reset(&c, strm);
+          if (!lib3ds_node_read(node, file, strm)) {
             return(LIB3DS_FALSE);
           }
@@ -544 +558 @@
             return(LIB3DS_FALSE);
           }
-          lib3ds_chunk_read_reset(&c, f);
-          if (!lib3ds_node_read(node, file, f)) {
+          lib3ds_chunk_read_reset(&c, strm);
+          if (!lib3ds_node_read(node, file, strm)) {
             return(LIB3DS_FALSE);
           }
@@ -560 +574 @@
             return(LIB3DS_FALSE);
           }
-          lib3ds_chunk_read_reset(&c, f);
-          if (!lib3ds_node_read(node, file, f)) {
+          lib3ds_chunk_read_reset(&c, strm);
+          if (!lib3ds_node_read(node, file, strm)) {
             return(LIB3DS_FALSE);
           }
@@ -575 +589 @@
             return(LIB3DS_FALSE);
           }
-          lib3ds_chunk_read_reset(&c, f);
-          if (!lib3ds_node_read(node, file, f)) {
+          lib3ds_chunk_read_reset(&c, strm);
+          if (!lib3ds_node_read(node, file, strm)) {
             return(LIB3DS_FALSE);
           }
@@ -587 +601 @@
   }
 
-  lib3ds_chunk_read_end(&c, f);
+  lib3ds_chunk_read_end(&c, strm);
   return(LIB3DS_TRUE);
 }
@@ -596 +610 @@
  */
 Lib3dsBool
-lib3ds_file_read(Lib3dsFile *file, FILE *f)
+lib3ds_file_read(Lib3dsFile *file, iostream *strm)
 {
   Lib3dsChunk c;
   Lib3dsWord chunk;
 
-  if (!lib3ds_chunk_read_start(&c, 0, f)) {
+  if (!lib3ds_chunk_read_start(&c, 0, strm)) {
     return(LIB3DS_FALSE);
   }
@@ -607 +621 @@
     case LIB3DS_MDATA:
       {
-        lib3ds_chunk_read_reset(&c, f);
-        if (!mdata_read(file, f)) {
+        lib3ds_chunk_read_reset(&c, strm);
+        if (!mdata_read(file, strm)) {
           return(LIB3DS_FALSE);
         }
@@ -617 +631 @@
     case LIB3DS_CMAGIC:
       {
-        while ((chunk=lib3ds_chunk_read_next(&c, f))!=0) {
+        while ((chunk=lib3ds_chunk_read_next(&c, strm))!=0) {
           switch (chunk) {
             case LIB3DS_M3D_VERSION:
               {
-                file->mesh_version=lib3ds_dword_read(f);
+                file->mesh_version=lib3ds_dword_read(strm);
               }
               break;
             case LIB3DS_MDATA:
               {
-                lib3ds_chunk_read_reset(&c, f);
-                if (!mdata_read(file, f)) {
+                lib3ds_chunk_read_reset(&c, strm);
+                if (!mdata_read(file, strm)) {
                   return(LIB3DS_FALSE);
                 }
@@ -634 +648 @@
             case LIB3DS_KFDATA:
               {
-                lib3ds_chunk_read_reset(&c, f);
-                if (!kfdata_read(file, f)) {
+                lib3ds_chunk_read_reset(&c, strm);
+                if (!kfdata_read(file, strm)) {
                   return(LIB3DS_FALSE);
                 }
@@ -651 +665 @@
   }
 
-  lib3ds_chunk_read_end(&c, f);
+  lib3ds_chunk_read_end(&c, strm);
   return(LIB3DS_TRUE);
 }
@@ -657 +671 @@
 
 static Lib3dsBool
-colorf_write(Lib3dsRgba rgb, FILE *f)
+colorf_write(Lib3dsRgba rgb, iostream *strm)
 {
   Lib3dsChunk c;
@@ -663 +677 @@
   c.chunk=LIB3DS_COLOR_F;
   c.size=18;
-  lib3ds_chunk_write(&c,f);
-  lib3ds_rgb_write(rgb,f);
+  lib3ds_chunk_write(&c,strm);
+  lib3ds_rgb_write(rgb,strm);
 
   c.chunk=LIB3DS_LIN_COLOR_F;
   c.size=18;
-  lib3ds_chunk_write(&c,f);
-  lib3ds_rgb_write(rgb,f);
+  lib3ds_chunk_write(&c,strm);
+  lib3ds_rgb_write(rgb,strm);
   return(LIB3DS_TRUE);
 }
@@ -675 +689 @@
 
 static Lib3dsBool
-mdata_write(Lib3dsFile *file, FILE *f)
+mdata_write(Lib3dsFile *file, iostream *strm)
 {
   Lib3dsChunk c;
 
   c.chunk=LIB3DS_MDATA;
-  if (!lib3ds_chunk_write_start(&c,f)) {
+  if (!lib3ds_chunk_write_start(&c,strm)) {
     return(LIB3DS_FALSE);
   }
@@ -688 +702 @@
     c.chunk=LIB3DS_MESH_VERSION;
     c.size=10;
-    lib3ds_chunk_write(&c,f);
-    lib3ds_intd_write(file->mesh_version,f);
+    lib3ds_chunk_write(&c,strm);
+    lib3ds_intd_write(file->mesh_version,strm);
   }
   { /*---- LIB3DS_MASTER_SCALE ----*/
@@ -695 +709 @@
     c.chunk=LIB3DS_MASTER_SCALE;
     c.size=10;
-    lib3ds_chunk_write(&c,f);
-    lib3ds_float_write(file->master_scale,f);
+    lib3ds_chunk_write(&c,strm);
+    lib3ds_float_write(file->master_scale,strm);
   }
   { /*---- LIB3DS_O_CONSTS ----*/
@@ -709 +723 @@
       c.chunk=LIB3DS_O_CONSTS;
       c.size=18;
-      lib3ds_chunk_write(&c,f);
-      lib3ds_vector_write(file->construction_plane,f);
+      lib3ds_chunk_write(&c,strm);
+      lib3ds_vector_write(file->construction_plane,strm);
     }
   }
@@ -725 +739 @@
       c.chunk=LIB3DS_AMBIENT_LIGHT;
       c.size=42;
-      lib3ds_chunk_write(&c,f);
-      colorf_write(file->ambient,f);
-    }
-  }
-  lib3ds_background_write(&file->background, f);
-  lib3ds_atmosphere_write(&file->atmosphere, f);
-  lib3ds_shadow_write(&file->shadow, f);
-  lib3ds_viewport_write(&file->viewport, f);
+      lib3ds_chunk_write(&c,strm);
+      colorf_write(file->ambient,strm);
+    }
+  }
+  lib3ds_background_write(&file->background, strm);
+  lib3ds_atmosphere_write(&file->atmosphere, strm);
+  lib3ds_shadow_write(&file->shadow, strm);
+  lib3ds_viewport_write(&file->viewport, strm);
   {
     Lib3dsMaterial *p;
     for (p=file->materials; p!=0; p=p->next) {
-      if (!lib3ds_material_write(p,f)) {
+      if (!lib3ds_material_write(p,strm)) {
         return(LIB3DS_FALSE);
       }
@@ -747 +761 @@
     for (p=file->cameras; p!=0; p=p->next) {
       c.chunk=LIB3DS_NAMED_OBJECT;
-      if (!lib3ds_chunk_write_start(&c,f)) {
+      if (!lib3ds_chunk_write_start(&c,strm)) {
         return(LIB3DS_FALSE);
       }
-      lib3ds_string_write(p->name,f);
-      lib3ds_camera_write(p,f);
-      if (!lib3ds_chunk_write_end(&c,f)) {
+      lib3ds_string_write(p->name,strm);
+      lib3ds_camera_write(p,strm);
+      if (!lib3ds_chunk_write_end(&c,strm)) {
         return(LIB3DS_FALSE);
       }
@@ -763 +777 @@
     for (p=file->lights; p!=0; p=p->next) {
       c.chunk=LIB3DS_NAMED_OBJECT;
-      if (!lib3ds_chunk_write_start(&c,f)) {
+      if (!lib3ds_chunk_write_start(&c,strm)) {
         return(LIB3DS_FALSE);
       }
-      lib3ds_string_write(p->name,f);
-      lib3ds_light_write(p,f);
-      if (!lib3ds_chunk_write_end(&c,f)) {
+      lib3ds_string_write(p->name,strm);
+      lib3ds_light_write(p,strm);
+      if (!lib3ds_chunk_write_end(&c,strm)) {
         return(LIB3DS_FALSE);
       }
@@ -779 +793 @@
     for (p=file->meshes; p!=0; p=p->next) {
       c.chunk=LIB3DS_NAMED_OBJECT;
-      if (!lib3ds_chunk_write_start(&c,f)) {
+      if (!lib3ds_chunk_write_start(&c,strm)) {
         return(LIB3DS_FALSE);
       }
-      lib3ds_string_write(p->name,f);
-      lib3ds_mesh_write(p,f);
-      if (!lib3ds_chunk_write_end(&c,f)) {
+      lib3ds_string_write(p->name,strm);
+      lib3ds_mesh_write(p,strm);
+      if (!lib3ds_chunk_write_end(&c,strm)) {
         return(LIB3DS_FALSE);
       }
@@ -790 +804 @@
   }
 
-  if (!lib3ds_chunk_write_end(&c,f)) {
+  if (!lib3ds_chunk_write_end(&c,strm)) {
     return(LIB3DS_FALSE);
   }
@@ -799 +813 @@
 
 static Lib3dsBool
-nodes_write(Lib3dsNode *node, Lib3dsFile *file, FILE *f)
+nodes_write(Lib3dsNode *node, Lib3dsFile *file, iostream *strm)
 {
   {
     Lib3dsNode *p;
     for (p=node->childs; p!=0; p=p->next) {
-      if (!lib3ds_node_write(p, file, f)) {
+      if (!lib3ds_node_write(p, file, strm)) {
         return(LIB3DS_FALSE);
       }
-      nodes_write(p, file, f);
+      nodes_write(p, file, strm);
     }
   }
@@ -815 +829 @@
 
 static Lib3dsBool
-kfdata_write(Lib3dsFile *file, FILE *f)
+kfdata_write(Lib3dsFile *file, iostream *strm)
 {
   Lib3dsChunk c;
   
   c.chunk=LIB3DS_KFDATA;
-  if (!lib3ds_chunk_write_start(&c,f)) {
+  if (!lib3ds_chunk_write_start(&c,strm)) {
     return(LIB3DS_FALSE);
   }
@@ -828 +842 @@
     c.chunk=LIB3DS_KFHDR;
     c.size=6 + 2 + strlen(file->name)+1 +4;
-    lib3ds_chunk_write(&c,f);
-    lib3ds_intw_write(file->keyf_revision,f);
-    lib3ds_string_write(file->name, f);
-    lib3ds_intd_write(file->frames, f);
+    lib3ds_chunk_write(&c,strm);
+    lib3ds_intw_write(file->keyf_revision,strm);
+    lib3ds_string_write(file->name, strm);
+    lib3ds_intd_write(file->frames, strm);
   }
   { /*---- LIB3DS_KFSEG ----*/
@@ -837 +851 @@
     c.chunk=LIB3DS_KFSEG;
     c.size=14;
-    lib3ds_chunk_write(&c,f);
-    lib3ds_intd_write(file->segment_from,f);
-    lib3ds_intd_write(file->segment_to,f);
+    lib3ds_chunk_write(&c,strm);
+    lib3ds_intd_write(file->segment_from,strm);
+    lib3ds_intd_write(file->segment_to,strm);
   }
   { /*---- LIB3DS_KFCURTIME ----*/
@@ -845 +859 @@
     c.chunk=LIB3DS_KFCURTIME;
     c.size=10;
-    lib3ds_chunk_write(&c,f);
-    lib3ds_intd_write(file->current_frame,f);
-  }
-  lib3ds_viewport_write(&file->viewport_keyf, f);
+    lib3ds_chunk_write(&c,strm);
+    lib3ds_intd_write(file->current_frame,strm);
+  }
+  lib3ds_viewport_write(&file->viewport_keyf, strm);
   
   {
     Lib3dsNode *p;
     for (p=file->nodes; p!=0; p=p->next) {
-      if (!lib3ds_node_write(p, file, f)) {
+      if (!lib3ds_node_write(p, file, strm)) {
         return(LIB3DS_FALSE);
       }
-      if (!nodes_write(p, file, f)) {
+      if (!nodes_write(p, file, strm)) {
         return(LIB3DS_FALSE);
       }
@@ -862 +876 @@
   }
   
-  if (!lib3ds_chunk_write_end(&c,f)) {
+  if (!lib3ds_chunk_write_end(&c,strm)) {
     return(LIB3DS_FALSE);
   }
@@ -873 +887 @@
  */
 Lib3dsBool
-lib3ds_file_write(Lib3dsFile *file, FILE *f)
+lib3ds_file_write(Lib3dsFile *file, iostream *strm)
 {
   Lib3dsChunk c;
 
   c.chunk=LIB3DS_M3DMAGIC;
-  if (!lib3ds_chunk_write_start(&c,f)) {
+  if (!lib3ds_chunk_write_start(&c,strm)) {
     LIB3DS_ERROR_LOG;
     return(LIB3DS_FALSE);
@@ -888 +902 @@
     c.chunk=LIB3DS_M3D_VERSION;
     c.size=10;
-    lib3ds_chunk_write(&c,f);
-    lib3ds_dword_write(file->mesh_version, f);
-  }
-
-  if (!mdata_write(file, f)) {
+    lib3ds_chunk_write(&c,strm);
+    lib3ds_dword_write(file->mesh_version, strm);
+  }
+
+  if (!mdata_write(file, strm)) {
     return(LIB3DS_FALSE);
   }
-  if (!kfdata_write(file, f)) {
+  if (!kfdata_write(file, strm)) {
     return(LIB3DS_FALSE);
   }
 
-  if (!lib3ds_chunk_write_end(&c,f)) {
+  if (!lib3ds_chunk_write_end(&c,strm)) {
     return(LIB3DS_FALSE);
   }