diff --git a/panda/src/downloader/decompressor.I b/panda/src/downloader/decompressor.I new file mode 100644 index 0000000000..fce4d3b8f7 --- /dev/null +++ b/panda/src/downloader/decompressor.I @@ -0,0 +1,15 @@ +// Filename: decompressor.I +// Created by: mike (09Jan97) +// +//////////////////////////////////////////////////////////////////// + +//////////////////////////////////////////////////////////////////// +// Function: Decompressor::get_progress +// Access: Public +// Description: +//////////////////////////////////////////////////////////////////// +INLINE float Decompressor:: +get_progress(void) const { + nassertr(_source_file_length > 0, 0.0); + return ((float)_total_bytes_read / (float)_source_file_length); +} diff --git a/panda/src/downloader/decompressor.h b/panda/src/downloader/decompressor.h index eb72db34c5..165011f116 100644 --- a/panda/src/downloader/decompressor.h +++ b/panda/src/downloader/decompressor.h @@ -39,6 +39,8 @@ PUBLISHED: bool decompress(Filename &source_file); + INLINE float get_progress(void) const; + private: void init(PT(Buffer) buffer); @@ -57,4 +59,6 @@ private: ZDecompressor *_decompressor; }; +#include "decompressor.I" + #endif diff --git a/panda/src/downloader/extractor.I b/panda/src/downloader/extractor.I new file mode 100644 index 0000000000..9ef04beb6c --- /dev/null +++ b/panda/src/downloader/extractor.I @@ -0,0 +1,15 @@ +// Filename: extractor.I +// Created by: mike (09Jan97) +// +//////////////////////////////////////////////////////////////////// + +//////////////////////////////////////////////////////////////////// +// Function: Extractor::get_progress +// Access: Public +// Description: +//////////////////////////////////////////////////////////////////// +INLINE float Extractor:: +get_progress(void) const { + nassertr(_source_file_length > 0, 0.0); + return ((float)_total_bytes_read / (float)_source_file_length); +} diff --git a/panda/src/downloader/extractor.h b/panda/src/downloader/extractor.h index 67db8e7a25..1d96671c43 100644 --- a/panda/src/downloader/extractor.h +++ b/panda/src/downloader/extractor.h @@ -37,6 +37,8 @@ PUBLISHED: bool extract(Filename &source_file, const Filename &rel_path = ""); + INLINE float get_progress(void) const; + private: void init(PT(Buffer) buffer); @@ -53,4 +55,6 @@ private: Filename _rel_path; }; +#include "extractor.I" + #endif