Show
Ignore:
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:
1 modified

Legend:

Unmodified
Added
Removed

  • OpenSceneGraph/trunk/src/osgPlugins/3ds/chunk.h

    r6461 r10076  
    2828#endif 
    2929 
     30#include <iostream> 
     31using namespace std; 
     32 
    3033#ifdef __cplusplus 
    3134extern "C" { 
    3235#endif 
     36 
    3337 
    3438typedef enum _Lib3dsChunks { 
    … …  
    268272 
    269273extern LIB3DSAPI void lib3ds_chunk_enable_dump(Lib3dsBool enable, Lib3dsBool unknown); 
    270 extern LIB3DSAPI Lib3dsBool lib3ds_chunk_read(Lib3dsChunk *c, FILE *f); 
    271 extern LIB3DSAPI Lib3dsBool lib3ds_chunk_read_start(Lib3dsChunk *c, Lib3dsWord chunk, FILE *f); 
    272 extern LIB3DSAPI void lib3ds_chunk_read_tell(Lib3dsChunk *c, FILE *f); 
    273 extern LIB3DSAPI Lib3dsWord lib3ds_chunk_read_next(Lib3dsChunk *c, FILE *f); 
    274 extern LIB3DSAPI void lib3ds_chunk_read_reset(Lib3dsChunk *c, FILE *f); 
    275 extern LIB3DSAPI void lib3ds_chunk_read_end(Lib3dsChunk *c, FILE *f); 
    276 extern LIB3DSAPI Lib3dsBool lib3ds_chunk_write(Lib3dsChunk *c, FILE *f); 
    277 extern LIB3DSAPI Lib3dsBool lib3ds_chunk_write_start(Lib3dsChunk *c, FILE *f); 
    278 extern LIB3DSAPI Lib3dsBool lib3ds_chunk_write_end(Lib3dsChunk *c, FILE *f); 
     274extern LIB3DSAPI Lib3dsBool lib3ds_chunk_read(Lib3dsChunk *c, iostream *strm); 
     275extern LIB3DSAPI Lib3dsBool lib3ds_chunk_read_start(Lib3dsChunk *c, Lib3dsWord chunk, iostream *strm); 
     276extern LIB3DSAPI void lib3ds_chunk_read_tell(Lib3dsChunk *c, iostream *strm); 
     277extern LIB3DSAPI Lib3dsWord lib3ds_chunk_read_next(Lib3dsChunk *c, iostream *strm); 
     278extern LIB3DSAPI void lib3ds_chunk_read_reset(Lib3dsChunk *c, iostream *strm); 
     279extern LIB3DSAPI void lib3ds_chunk_read_end(Lib3dsChunk *c, iostream *strm); 
     280extern LIB3DSAPI Lib3dsBool lib3ds_chunk_write(Lib3dsChunk *c, iostream *strm); 
     281extern LIB3DSAPI Lib3dsBool lib3ds_chunk_write_start(Lib3dsChunk *c, iostream *strm); 
     282extern LIB3DSAPI Lib3dsBool lib3ds_chunk_write_end(Lib3dsChunk *c, iostream *strm); 
    279283extern LIB3DSAPI const char* lib3ds_chunk_name(Lib3dsWord chunk); 
    280284extern LIB3DSAPI void lib3ds_chunk_unknown(Lib3dsWord chunk);