From c26d5f2cf11d3d72d4c791cf857a6ef939e75ff8 Mon Sep 17 00:00:00 2001 From: Rtch90 Date: Tue, 4 Sep 2012 21:36:57 +0100 Subject: [PATCH] [Change] Small amount of directory refactoring. --- Bin/LibD.pro | 10 ++-- src/System/Checksum.cpp | 68 -------------------------- src/System/Checksum.h | 12 ----- src/System/ConvertType.h | 55 --------------------- src/System/Filesystem/InputStream.cpp | 2 +- src/System/Filesystem/OutputStream.cpp | 2 +- src/System/SCCopyFile.cpp | 23 --------- src/System/SCCopyFile.h | 16 ------ 8 files changed, 7 insertions(+), 181 deletions(-) delete mode 100644 src/System/Checksum.cpp delete mode 100644 src/System/Checksum.h delete mode 100644 src/System/ConvertType.h delete mode 100644 src/System/SCCopyFile.cpp delete mode 100644 src/System/SCCopyFile.h diff --git a/Bin/LibD.pro b/Bin/LibD.pro index c69147f..bc198c7 100644 --- a/Bin/LibD.pro +++ b/Bin/LibD.pro @@ -37,7 +37,7 @@ HEADERS += ../src/Actor/Player.h \ ../src/Sprite/Sprite.h \ ../src/System/Debug.h \ ../src/System/ResourceManager.h \ - ../src/System/ConvertType.h \ + ../src/System/Convert/ConvertType.h \ ../src/System/Filesystem/InputStream.h \ ../src/System/Filesystem/OutputStream.h \ ../src/System/Filesystem/EmptyBuffer.h \ @@ -48,8 +48,8 @@ HEADERS += ../src/Actor/Player.h \ ../src/System/Filesystem/FilePackageManager.h \ ../src/System/Filesystem/InputStreamWrapper.h \ ../src/System/Filesystem/MemoryStream.h \ - ../src/System/SCCopyFile.cpp \ - ../src/System/Checksum.h \ + ../src/System/Filesystem/SCCopyFile.cpp \ + ../src/System/Filesystem/Checksum.h \ ../src/Texture/Texture.h \ ../src/Sound/Music.h \ ../src/TMXParser/base64.h \ @@ -107,8 +107,8 @@ SOURCES += ../src/Actor/Player.cpp \ ../src/System/Filesystem/FilePackageManager.cpp \ ../src/System/Filesystem/InputStreamWrapper.cpp \ ../src/System/Filesystem/MemoryStream.cpp \ - ../src/System/SCCopyFile.cpp \ - ../src/System/Checksum.cpp \ + ../src/System/Filesystem/SCCopyFile.cpp \ + ../src/System/Filesystem/Checksum.cpp \ ../src/Texture/Texture.cpp \ ../src/Sound/Music.cpp \ ../src/Actor/NPC.cpp \ diff --git a/src/System/Checksum.cpp b/src/System/Checksum.cpp deleted file mode 100644 index 00e1ecb..0000000 --- a/src/System/Checksum.cpp +++ /dev/null @@ -1,68 +0,0 @@ -#include "Checksum.h" -#include "Filesystem/InputStreamWrapper.h" -#include -#include - -using namespace saracraft; - -unsigned int Checksum::CountChecksumForFile(const char* filename) { - unsigned int chksum = 0; - int filesize = 0; - bool success = CountChecksumForFileImpl(&chksum, &filesize, filename); - if(success) { - return chksum; - } else { - assert(0); - return 0; - } -} - -bool Checksum::DoesChecksumAndSizeMatchFile(unsigned int checksum, int filesize, const char* filename) { - unsigned int chksum = 0; - int size = 0; - bool success = CountChecksumForFileImpl(&chksum, &size, filename); - if(success) { - if(chksum == checksum && filesize == size) - return true; - else - return false; - } else { - return false; - } -} - -bool Checksum::CountChecksumForFileImpl(unsigned int* checksum, int* filesize, const char* filename) { - assert(filename != NULL); - - filesystem::FB_FILE* f = filesystem::fb_fopen(filename, "rb"); - if(f == NULL) { - return false; - } - - int size = filesystem::fb_fsize(f); - - char* buf = new char[size]; - - bool success = true; - int got = filesystem::fb_fread(buf, size, 1, f); - if(got != 1) { - success = false; - } else { - success = true; - *filesize = size; - unsigned int hashCode = 1327341033; - int hashmult = 0; - for(int i = 0; i < size; i++) { - if((i % 73) == 0) - hashCode += (buf[i] << hashmult); - else - hashCode ^= (buf[i] << hashmult); - hashmult+=4; - if(hashmult > 23) hashmult -= 23; - } - delete [] buf; - filesystem::fb_fclose(f); - return success; - } -} - diff --git a/src/System/Checksum.h b/src/System/Checksum.h deleted file mode 100644 index 7fce821..0000000 --- a/src/System/Checksum.h +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once - -class Checksum { -public: - static unsigned int CountChecksumForFile(const char* filename); - static bool DoesChecksumAndSizeMatchFile(unsigned int checksum, - int filesize, const char* filename); -private: - static bool CountChecksumForFileImpl(unsigned int* checksum, - int* filesize, const char* filename); -}; - diff --git a/src/System/ConvertType.h b/src/System/ConvertType.h deleted file mode 100644 index ca93ad9..0000000 --- a/src/System/ConvertType.h +++ /dev/null @@ -1,55 +0,0 @@ -#pragma once - -#ifndef INCLUDED_CASSERT -#define INCLUSED_CASSERT -#include -#endif - -namespace saracraft { -namespace filesystem { - -template -struct ConvertBase { - enum { charCount = sizeof(T) }; - union Values { - unsigned char c[charCount]; - T t; - }; - - Values value; - - int GetSize(void) const { return charCount; } -}; - -template -struct ConvertFrom: private ConvertBase { - explicit ConvertFrom(const T& t) { - this->value.t = t; - } - using ConvertBase::GetSize; - - unsigned char GetByte(int index) const { - assert((index >= 0) && (index < GetSize())); - return this->value.c[index]; - } -}; - -template -struct ConvertTo: private ConvertBase { - using ConvertBase::GetSize; - - void SetByte(int index, unsigned char c) { - assert((index >= 0) && (index < GetSize())); - this->value.c[index] = c; - } - - const T& GetValue(void) const { - return this->value.t; - } -}; - -typedef unsigned short uint16_t; - -} // Namespaces.... -} - diff --git a/src/System/Filesystem/InputStream.cpp b/src/System/Filesystem/InputStream.cpp index 0ee5c0d..c7d6f91 100644 --- a/src/System/Filesystem/InputStream.cpp +++ b/src/System/Filesystem/InputStream.cpp @@ -1,6 +1,6 @@ #include -#include "../ConvertType.h" +#include "../Convert/ConvertType.h" #include #include "InputStream.h" diff --git a/src/System/Filesystem/OutputStream.cpp b/src/System/Filesystem/OutputStream.cpp index dbc4d5e..bd574bc 100644 --- a/src/System/Filesystem/OutputStream.cpp +++ b/src/System/Filesystem/OutputStream.cpp @@ -1,6 +1,6 @@ #include -#include "../ConvertType.h" +#include "../Convert/ConvertType.h" #include #include "OutputStream.h" diff --git a/src/System/SCCopyFile.cpp b/src/System/SCCopyFile.cpp deleted file mode 100644 index b190fc7..0000000 --- a/src/System/SCCopyFile.cpp +++ /dev/null @@ -1,23 +0,0 @@ -#include -#include -#include "Filesystem/InputStream.h" -#include "Filesystem/FilePackageManager.h" - -#include "SCCopyFile.h" - -namespace util { - -void SCCopyFile::CopyFile(const std::string& from, const std::string& to) { - std::fstream out(to.c_str(), std::ios::out); - saracraft::filesystem::InputStream in = saracraft::filesystem::FilePackageManager::GetInstance().GetFile(from); - - std::string temp; - temp.resize(in.GetSize()); - in.Read((unsigned char*)&temp[0], in.GetSize()); - out << temp << std::endl; - - out.close(); -} - -} // Namespace util. - diff --git a/src/System/SCCopyFile.h b/src/System/SCCopyFile.h deleted file mode 100644 index 4c404a1..0000000 --- a/src/System/SCCopyFile.h +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -namespace util { - -class SCCopyFile { -public: - - // TODO: This will currently only handle smallish text files - // propperly. - - /*** DON'T USE FOR BINARY FILES!!!! ***/ - static void CopyFile(const std::string& from, const std::string& to); -}; - -} // Namespace util. -