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

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

@@ -94 +94 @@
  */
 Lib3dsBool
-lib3ds_chunk_read(Lib3dsChunk *c, FILE *f)
-{
-  ASSERT(c);
-  ASSERT(f);
-  c->cur=ftell(f);
-  c->chunk=lib3ds_word_read(f);
-  c->size=lib3ds_dword_read(f);
+lib3ds_chunk_read(Lib3dsChunk *c, iostream *strm)
+{
+  ASSERT(c);
+  ASSERT(strm);
+  c->cur=strm->tellg();           
+  c->chunk=lib3ds_word_read(strm);
+  c->size=lib3ds_dword_read(strm);
   c->end=c->cur+c->size;
   c->cur+=6;
-  if (ferror(f) || (c->size<6)) {
+
+  if (strm->fail()||(c->size<6)) {    
     return(LIB3DS_FALSE);
   }
   return(LIB3DS_TRUE);
-  
-}
-
-
-/*!
- * \ingroup chunk
- */
-Lib3dsBool
-lib3ds_chunk_read_start(Lib3dsChunk *c, Lib3dsWord chunk, FILE *f)
-{
-  ASSERT(c);
-  ASSERT(f);
-  if (!lib3ds_chunk_read(c, f)) {
+}
+
+
+/*!
+ * \ingroup chunk
+ */
+Lib3dsBool
+lib3ds_chunk_read_start(Lib3dsChunk *c, Lib3dsWord chunk, iostream *strm)
+{
+  ASSERT(c);
+  ASSERT(strm);
+  if (!lib3ds_chunk_read(c, strm)) {
     return(LIB3DS_FALSE);
   }
@@ -131 +131 @@
  */
 void
-lib3ds_chunk_read_tell(Lib3dsChunk *c, FILE *f)
-{
-  c->cur=ftell(f);
+lib3ds_chunk_read_tell(Lib3dsChunk *c, iostream *strm)
+{
+    c->cur=strm->tellg();
 }
 
@@ -141 +141 @@
  */
 Lib3dsWord
-lib3ds_chunk_read_next(Lib3dsChunk *c, FILE *f)
+lib3ds_chunk_read_next(Lib3dsChunk *c, iostream *strm)
 {
   Lib3dsChunk d;
@@ -150 +150 @@
   }
 
-  fseek(f, (long)c->cur, SEEK_SET);
-  d.chunk=lib3ds_word_read(f);
-  d.size=lib3ds_dword_read(f);
+  strm->seekg((long)c->cur,ios_base::beg);
+  d.chunk=lib3ds_word_read(strm);
+  d.size=lib3ds_dword_read(strm);
   lib3ds_chunk_debug_dump(&d);
   c->cur+=d.size;
@@ -163 +163 @@
  */
 void
-lib3ds_chunk_read_reset(Lib3dsChunk *, FILE *f)
-{
-  fseek(f, -6, SEEK_CUR);
-}
-
-
-/*!
- * \ingroup chunk
- */
-void
-lib3ds_chunk_read_end(Lib3dsChunk *c, FILE *f)
+lib3ds_chunk_read_reset(Lib3dsChunk *, iostream *strm)
+{  
+  strm->seekg(-6,ios_base::cur);
+}
+
+
+/*!
+ * \ingroup chunk
+ */
+void
+lib3ds_chunk_read_end(Lib3dsChunk *c, iostream *strm)
 {
   lib3ds_chunk_debug_leave(c);
-  fseek(f, c->end, SEEK_SET);
+  strm->seekg(c->end,ios_base::beg);
 }
 
@@ -191 +191 @@
  */
 Lib3dsBool
-lib3ds_chunk_write(Lib3dsChunk *c, FILE *f)
-{
-  ASSERT(c);
-  if (!lib3ds_word_write(c->chunk, f)) {
+lib3ds_chunk_write(Lib3dsChunk *c, iostream *strm)
+{
+  ASSERT(c);
+  if (!lib3ds_word_write(c->chunk, strm)) {
     LIB3DS_ERROR_LOG;
     return(LIB3DS_FALSE);
   }
-  if (!lib3ds_dword_write(c->size, f)) {
+  if (!lib3ds_dword_write(c->size, strm)) {
     LIB3DS_ERROR_LOG;
     return(LIB3DS_FALSE);
@@ -210 +210 @@
  */
 Lib3dsBool
-lib3ds_chunk_write_start(Lib3dsChunk *c, FILE *f)
+lib3ds_chunk_write_start(Lib3dsChunk *c, iostream *strm)
 {
   ASSERT(c);
   c->size=0;
-  c->cur=ftell(f);
-  if (!lib3ds_word_write(c->chunk, f)) {
-    return(LIB3DS_FALSE);
-  }
-  if (!lib3ds_dword_write(c->size, f)) {
+  c->cur=strm->tellp();
+  if (!lib3ds_word_write(c->chunk, strm)) {
+    return(LIB3DS_FALSE);
+  }
+  if (!lib3ds_dword_write(c->size, strm)) {
     return(LIB3DS_FALSE);
   }
@@ -229 +229 @@
  */
 Lib3dsBool
-lib3ds_chunk_write_end(Lib3dsChunk *c, FILE *f)
-{
-  ASSERT(c);
-  c->size=ftell(f) - c->cur;
-  fseek(f, c->cur+2, SEEK_SET);
-  if (!lib3ds_dword_write(c->size, f)) {
+lib3ds_chunk_write_end(Lib3dsChunk *c, iostream *strm)
+{
+  ASSERT(c);
+  c->size=(Lib3dsDword)(strm->tellp()) - c->cur;
+  strm->seekp(c->cur+2,ios_base::beg);  
+  if (!lib3ds_dword_write(c->size, strm)) {
     LIB3DS_ERROR_LOG;
     return(LIB3DS_FALSE);
@@ -240 +240 @@
 
   c->cur+=c->size;
-  fseek(f, c->cur, SEEK_SET);
-  if (ferror(f)) {
+  strm->seekp(c->cur, ios_base::beg);
+  if (strm->fail()) {
     LIB3DS_ERROR_LOG;
     return(LIB3DS_FALSE);