Changeset 10076 for OpenSceneGraph/trunk/src/osgPlugins/3ds/background.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/background.cpp (modified) (17 diffs)

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

@@ -36 +36 @@
 
 static Lib3dsBool
-solid_bgnd_read(Lib3dsBackground *background, FILE *f)
+solid_bgnd_read(Lib3dsBackground *background, iostream *strm)
 {
   Lib3dsChunk c;
   Lib3dsWord chunk;
           
-  if (!lib3ds_chunk_read_start(&c, LIB3DS_SOLID_BGND, f)) {
+  if (!lib3ds_chunk_read_start(&c, LIB3DS_SOLID_BGND, 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:
-        lib3ds_rgb_read(background->solid.col, f);
+        lib3ds_rgb_read(background->solid.col, strm);
         break;
       case LIB3DS_COLOR_F:
-        lib3ds_rgb_read(background->solid.col, f);
+        lib3ds_rgb_read(background->solid.col, strm);
         break;
       default:
@@ -58 +58 @@
   }
   
-  lib3ds_chunk_read_end(&c, f);
-  return(LIB3DS_TRUE);
-}
-
-
-static Lib3dsBool
-v_gradient_read(Lib3dsBackground *background, FILE *f)
+  lib3ds_chunk_read_end(&c, strm);
+  return(LIB3DS_TRUE);
+}
+
+
+static Lib3dsBool
+v_gradient_read(Lib3dsBackground *background, iostream *strm)
 {
   Lib3dsChunk c;
@@ -73 +73 @@
   
 
-  if (!lib3ds_chunk_read_start(&c, LIB3DS_V_GRADIENT, f)) {
+  if (!lib3ds_chunk_read_start(&c, LIB3DS_V_GRADIENT, strm)) {
     return(LIB3DS_FALSE);
   }
-  background->gradient.percent=lib3ds_float_read(f);
-  lib3ds_chunk_read_tell(&c, f);
+  background->gradient.percent=lib3ds_float_read(strm);
+  lib3ds_chunk_read_tell(&c, strm);
 
   index[0]=index[1]=0;
-  while ((chunk=lib3ds_chunk_read_next(&c, f))!=0) {
+  while ((chunk=lib3ds_chunk_read_next(&c, strm))!=0) {
     switch (chunk) {
       case LIB3DS_COLOR_F:
-        lib3ds_rgb_read(col[0][index[0]],f);
+        lib3ds_rgb_read(col[0][index[0]],strm);
         index[0]++;
         break;
       case LIB3DS_LIN_COLOR_F:
-        lib3ds_rgb_read(col[1][index[1]],f);
+        lib3ds_rgb_read(col[1][index[1]],strm);
         index[1]++;
         have_lin=1;
@@ -103 +103 @@
     }
   }
-  lib3ds_chunk_read_end(&c, f);
+  lib3ds_chunk_read_end(&c, strm);
   return(LIB3DS_TRUE);
 }
@@ -112 +112 @@
  */
 Lib3dsBool
-lib3ds_background_read(Lib3dsBackground *background, FILE *f)
-{
-  Lib3dsChunk c;
-
-  if (!lib3ds_chunk_read(&c, f)) {
+lib3ds_background_read(Lib3dsBackground *background, iostream *strm)
+{
+  Lib3dsChunk c;
+
+  if (!lib3ds_chunk_read(&c, strm)) {
     return(LIB3DS_FALSE);
   }
@@ -123 +123 @@
     case LIB3DS_BIT_MAP:
       {
-        if (!lib3ds_string_read(background->bitmap.name, 64, f)) {
+        if (!lib3ds_string_read(background->bitmap.name, 64, strm)) {
             return(LIB3DS_FALSE);
         }
@@ -130 +130 @@
       case LIB3DS_SOLID_BGND:
         {
-          lib3ds_chunk_read_reset(&c, f);
-          if (!solid_bgnd_read(background, f)) {
+          lib3ds_chunk_read_reset(&c, strm);
+          if (!solid_bgnd_read(background, strm)) {
             return(LIB3DS_FALSE);
           }
@@ -138 +138 @@
       case LIB3DS_V_GRADIENT:
         {
-          lib3ds_chunk_read_reset(&c, f);
-          if (!v_gradient_read(background, f)) {
+          lib3ds_chunk_read_reset(&c, strm);
+          if (!v_gradient_read(background, strm)) {
             return(LIB3DS_FALSE);
           }
@@ -166 +166 @@
 
 static Lib3dsBool
-colorf_write(Lib3dsRgba rgb, FILE *f)
+colorf_write(Lib3dsRgba rgb, iostream *strm)
 {
   Lib3dsChunk c;
@@ -172 +172 @@
   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);
 }
@@ -200 +200 @@
  */
 Lib3dsBool
-lib3ds_background_write(Lib3dsBackground *background, FILE *f)
+lib3ds_background_write(Lib3dsBackground *background, iostream *strm)
 {
   if (strlen(background->bitmap.name)) { /*---- LIB3DS_BIT_MAP ----*/
@@ -206 +206 @@
     c.chunk=LIB3DS_BIT_MAP;
     c.size=6+1+strlen(background->bitmap.name);
-    lib3ds_chunk_write(&c,f);
-    lib3ds_string_write(background->bitmap.name, f);
+    lib3ds_chunk_write(&c,strm);
+    lib3ds_string_write(background->bitmap.name, strm);
   }
 
@@ -214 +214 @@
     c.chunk=LIB3DS_SOLID_BGND;
     c.size=42;
-    lib3ds_chunk_write(&c,f);
-    colorf_write(background->solid.col,f);
+    lib3ds_chunk_write(&c,strm);
+    colorf_write(background->solid.col,strm);
   }
 
@@ -224 +224 @@
     c.chunk=LIB3DS_V_GRADIENT;
     c.size=118;
-    lib3ds_chunk_write(&c,f);
-    lib3ds_float_write(background->gradient.percent,f);
-    colorf_write(background->gradient.top,f);
-    colorf_write(background->gradient.middle,f);
-    colorf_write(background->gradient.bottom,f);
+    lib3ds_chunk_write(&c,strm);
+    lib3ds_float_write(background->gradient.percent,strm);
+    colorf_write(background->gradient.top,strm);
+    colorf_write(background->gradient.middle,strm);
+    colorf_write(background->gradient.bottom,strm);
   }
 
@@ -235 +235 @@
     c.chunk=LIB3DS_USE_BIT_MAP;
     c.size=6;
-    lib3ds_chunk_write(&c,f);
+    lib3ds_chunk_write(&c,strm);
   }
 
@@ -242 +242 @@
     c.chunk=LIB3DS_USE_SOLID_BGND;
     c.size=6;
-    lib3ds_chunk_write(&c,f);
+    lib3ds_chunk_write(&c,strm);
   }
 
@@ -249 +249 @@
     c.chunk=LIB3DS_USE_V_GRADIENT;
     c.size=6;
-    lib3ds_chunk_write(&c,f);
+    lib3ds_chunk_write(&c,strm);
   }