New Types added to File Streams.

Blackvoxel · Aug 5, 2021 · 4c65a59 · 4c65a59
1 parent d56dc62
commit 4c65a59
Show file tree

Hide file tree

Showing 3 changed files with 118 additions and 1 deletion.
diff --git a/src/z/ZStream_File.cpp b/src/z/ZStream_File.cpp
@@ -239,7 +239,55 @@ ZStream & ZStream_File::operator << (ZString const & Data)
  return(*this);
 }
 
+ZStream & ZStream_File::operator << (double const Data)
+{
+ if (Fl && WriteOk)
+ {
+ if (1!=fwrite(&Data,sizeof(double),1,(FILE *)Fl)) Error = true;
+ }
+ else Error = true;
+ return(*this);
+}
 
+ZStream & ZStream_File::operator << (float const Data)
+{
+ if (Fl && WriteOk)
+ {
+ if (1!=fwrite(&Data,sizeof(float),1,(FILE *)Fl)) Error = true;
+ }
+ else Error = true;
+ return(*this);
+}
+
+ZStream & ZStream_File::operator << (ZVector3d const & Data)
+{
+ if (Fl && WriteOk)
+ {
+ if (1!=fwrite(&Data,sizeof(ZVector3d),1,(FILE *)Fl)) Error = true;
+ }
+ else Error = true;
+ return(*this);
+}
+
+ZStream & ZStream_File::operator << (ZVector3L const & Data)
+{
+ if (Fl && WriteOk)
+ {
+ if (1!=fwrite(&Data,sizeof(ZVector3L),1,(FILE *)Fl)) Error = true;
+ }
+ else Error = true;
+ return(*this);
+}
+
+ZStream & ZStream_File::operator << (bool const Data)
+{
+ if (Fl && WriteOk)
+ {
+ if (1!=fwrite(&Data,sizeof(bool),1,(FILE *)Fl)) Error = true;
+ }
+ else Error = true;
+ return(*this);
+}
 
 ZStream & ZStream_File::operator >> (ULong &Data)
 {
@@ -347,6 +395,55 @@ ZStream & ZStream_File::operator >> (ZString & Data)
  return(*this);
 }
 
+ZStream & ZStream_File::operator >> (double & Data)
+{
+ if (Fl && ReadOk)
+ {
+ if (1!=fread(&Data,sizeof(double),1,(FILE *)Fl)) Error = true;
+ }
+ else Error = true;
+ return(*this);
+}
+ZStream & ZStream_File::operator >> (float & Data)
+{
+ if (Fl && ReadOk)
+ {
+ if (1!=fread(&Data,sizeof(float),1,(FILE *)Fl)) Error = true;
+ }
+ else Error = true;
+ return(*this);
+}
+
+ZStream & ZStream_File::operator >> (ZVector3d & Data)
+{
+ if (Fl && ReadOk)
+ {
+ if (1!=fread(&Data,sizeof(ZVector3d),1,(FILE *)Fl)) Error = true;
+ }
+ else Error = true;
+ return(*this);
+}
+
+ZStream & ZStream_File::operator >> (ZVector3L & Data)
+{
+ if (Fl && ReadOk)
+ {
+ if (1!=fread(&Data,sizeof(ZVector3L),1,(FILE *)Fl)) Error = true;
+ }
+ else Error = true;
+ return(*this);
+}
+
+ZStream & ZStream_File::operator >> (bool & Data)
+{
+ if (Fl && ReadOk)
+ {
+ if (1!=fread(&Data,sizeof(bool),1,(FILE *)Fl)) Error = true;
+ }
+ else Error = true;
+ return(*this);
+}
+
 bool ZStream_File::CopyFileFrom(ZStream &SrcStream)
 {
  char * Buffer;

diff --git a/src/z/ZStream_File.h b/src/z/ZStream_File.h
@@ -78,6 +78,12 @@ class ZStream_File : public ZStream
  ZStream & operator << (char const * const Data);
  ZStream & operator << (ZString const * const Data);
  ZStream & operator << (ZString const & Data);
+ ZStream & operator << (double const Data);
+ ZStream & operator << (float const Data);
+ ZStream & operator << (ZVector3d const & Data);
+ ZStream & operator << (ZVector3L const & Data);
+ ZStream & operator << (bool const Data);
+
 
  ZStream & operator >> (ULong &Data);
  ZStream & operator >> (Long &Data);
@@ -88,7 +94,11 @@ class ZStream_File : public ZStream
  ZStream & operator >> (char * Data);
  ZStream & operator >> (ZString * Data);
  ZStream & operator >> (ZString & Data);
-
+ ZStream & operator >> (double & Data);
+ ZStream & operator >> (float & Data);
+ ZStream & operator >> (ZVector3d & Data);
+ ZStream & operator >> (ZVector3L & Data);
+ ZStream & operator >> (bool & Data);
 
  bool CopyFileFrom(ZStream &SrcStream);
  bool AppendToOpenedFileFrom(ZStream &SrcStream);

diff --git a/src/z/ZStreams.h b/src/z/ZStreams.h
@@ -67,6 +67,11 @@ class ZStream
  virtual ZStream & operator << (char const * const Data)=0;
  virtual ZStream & operator << (ZString const * const Data)=0;
  virtual ZStream & operator << (ZString const & Data)=0;
+ virtual ZStream & operator << (double const Data)=0;
+ virtual ZStream & operator << (float const Data)=0;
+ virtual ZStream & operator << (ZVector3d const & Data)=0;
+ virtual ZStream & operator << (ZVector3L const & Data)=0;
+ virtual ZStream & operator << (bool const data)=0;
 
  virtual ZStream & operator >> (ULong &Data)=0;
  virtual ZStream & operator >> (Long &Data)=0;
@@ -77,6 +82,11 @@ class ZStream
  virtual ZStream & operator >> (char * Data)=0;
  virtual ZStream & operator >> (ZString * Data)=0;
  virtual ZStream & operator >> (ZString & Data)=0;
+ virtual ZStream & operator >> (double & Data)=0;
+ virtual ZStream & operator >> (float & Data)=0;
+ virtual ZStream & operator >> (ZVector3d & Data)=0;
+ virtual ZStream & operator >> (ZVector3L & Data)=0;
+ virtual ZStream & operator >> (bool & Data)=0;
 
  virtual bool CopyFileFrom(ZStream &SrcStream)= 0;
  virtual bool AppendToOpenedFileFrom(ZStream &SrcStream) = 0;