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

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

@@ -97 +97 @@
  */
 Lib3dsBool
-lib3ds_camera_read(Lib3dsCamera *camera, FILE *f)
+lib3ds_camera_read(Lib3dsCamera *camera, iostream *strm)
 {
   Lib3dsChunk c;
   Lib3dsWord chunk;
 
-  if (!lib3ds_chunk_read_start(&c, LIB3DS_N_CAMERA, f)) {
+  if (!lib3ds_chunk_read_start(&c, LIB3DS_N_CAMERA, strm)) {
     return(LIB3DS_FALSE);
   }
@@ -108 +108 @@
     int i;
     for (i=0; i<3; ++i) {
-      camera->position[i]=lib3ds_float_read(f);
+      camera->position[i]=lib3ds_float_read(strm);
     }
     for (i=0; i<3; ++i) {
-      camera->target[i]=lib3ds_float_read(f);
-    }
-  }
-  camera->roll=lib3ds_float_read(f);
+      camera->target[i]=lib3ds_float_read(strm);
+    }
+  }
+  camera->roll=lib3ds_float_read(strm);
   {
     float s;
-    s=lib3ds_float_read(f);
+    s=lib3ds_float_read(strm);
     if (fabs(s)<LIB3DS_EPSILON) {
       camera->fov=45.0;
@@ -125 +125 @@
     }
   }
-  lib3ds_chunk_read_tell(&c, f);
+  lib3ds_chunk_read_tell(&c, strm);
   
-  while ((chunk=lib3ds_chunk_read_next(&c, f))!=0) {
+  while ((chunk=lib3ds_chunk_read_next(&c, strm))!=0) {
     switch (chunk) {
       case LIB3DS_CAM_SEE_CONE:
@@ -136 +136 @@
       case LIB3DS_CAM_RANGES:
         {
-          camera->near_range=lib3ds_float_read(f);
-          camera->far_range=lib3ds_float_read(f);
+          camera->near_range=lib3ds_float_read(strm);
+          camera->far_range=lib3ds_float_read(strm);
         }
         break;
@@ -145 +145 @@
   }
   
-  lib3ds_chunk_read_end(&c, f);
+  lib3ds_chunk_read_end(&c, strm);
   return(LIB3DS_TRUE);
 }
@@ -154 +154 @@
  */
 Lib3dsBool
-lib3ds_camera_write(Lib3dsCamera *camera, FILE *f)
+lib3ds_camera_write(Lib3dsCamera *camera, iostream *strm)
 {
   Lib3dsChunk c;
 
   c.chunk=LIB3DS_N_CAMERA;
-  if (!lib3ds_chunk_write_start(&c,f)) {
+  if (!lib3ds_chunk_write_start(&c,strm)) {
     return(LIB3DS_FALSE);
   }
 
-  lib3ds_vector_write(camera->position, f);
-  lib3ds_vector_write(camera->target, f);
-  lib3ds_float_write(camera->roll, f);
+  lib3ds_vector_write(camera->position, strm);
+  lib3ds_vector_write(camera->target, strm);
+  lib3ds_float_write(camera->roll, strm);
   if (fabs(camera->fov)<LIB3DS_EPSILON) {
-    lib3ds_float_write(2400.0f/45.0f, f);
+    lib3ds_float_write(2400.0f/45.0f, strm);
   }
   else {
-    lib3ds_float_write(2400.0f/camera->fov, f);
+    lib3ds_float_write(2400.0f/camera->fov, strm);
   }
 
@@ -177 +177 @@
     c.chunk=LIB3DS_CAM_SEE_CONE;
     c.size=6;
-    lib3ds_chunk_write(&c, f);
+    lib3ds_chunk_write(&c, strm);
   }
   {
@@ -183 +183 @@
     c.chunk=LIB3DS_CAM_RANGES;
     c.size=14;
-    lib3ds_chunk_write(&c, f);
-    lib3ds_float_write(camera->near_range, f);
-    lib3ds_float_write(camera->far_range, f);
-  }
-
-  if (!lib3ds_chunk_write_end(&c,f)) {
+    lib3ds_chunk_write(&c, strm);
+    lib3ds_float_write(camera->near_range, strm);
+    lib3ds_float_write(camera->far_range, strm);
+  }
+
+  if (!lib3ds_chunk_write_end(&c,strm)) {
     return(LIB3DS_FALSE);
   }