mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

settle for ObjectRepository and write load / save

This commit is contained in:
Ted John 2016-06-25 00:58:56 +01:00
parent 0fa703a1cb
commit 06bf6bb39d
5 changed files with 335 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openrct2.vcxproj
View File

@ -117,7 +117,7 @@
<ClCompile Include="src\network\TcpSocket.cpp" />
<ClCompile Include="src\network\twitch.cpp" />
<ClCompile Include="src\object.c" />
<ClCompile Include="src\object\ObjectCache.cpp" />
<ClCompile Include="src\object\ObjectRepository.cpp" />
<ClCompile Include="src\object_list.c" />
<ClCompile Include="src\openrct2.c" />
<ClCompile Include="src\paint\map_element\banner.c" />
@ -418,7 +418,7 @@
<ClInclude Include="src\network\network.h" />
<ClInclude Include="src\network\NetworkKey.h" />
<ClInclude Include="src\object.h" />
<ClInclude Include="src\object\ObjectCache.h" />
<ClInclude Include="src\object\ObjectRepository.h" />
<ClInclude Include="src\object_list.h" />
<ClInclude Include="src\openrct2.h" />
<ClInclude Include="src\paint\map_element\map_element.h" />

149
src/object/ObjectCache.cpp
View File

@ -1,149 +0,0 @@
#pragma region Copyright (c) 2014-2016 OpenRCT2 Developers
/*****************************************************************************
* OpenRCT2, an open source clone of Roller Coaster Tycoon 2.
*
* OpenRCT2 is the work of many authors, a full list can be found in contributors.md
* For more information, visit https://github.com/OpenRCT2/OpenRCT2
*
* OpenRCT2 is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* A full copy of the GNU General Public License can be found in licence.txt
*****************************************************************************/
#pragma endregion
#include "../common.h"
#include "../core/Guard.hpp"
#include "../core/IStream.hpp"
#include "../core/Memory.hpp"
#include "../core/String.hpp"
#include "ObjectCache.h"
extern "C"
{
#include "../object.h"
}
struct ObjectCacheEntry
{
rct_object_entry_extended ObjectEntry;
utf8 * Path;
uint32 NumImages;
utf8 * Name;
size_t ChunkSize;
uint16 NumRequiredObjects;
rct_object_entry_extended * RequiredObjects;
union
{
struct
{
uint16 NumThemeObjects;
rct_object_entry_extended * ThemeObjects;
};
struct
{
uint8 RideFlags;
uint8 RideCategory[2];
uint8 RideType[3];
};
};
void Dispose()
{
Memory::Free(RequiredObjects);
Memory::Free(ThemeObjects);
RequiredObjects = nullptr;
ThemeObjects = nullptr;
}
void Read(IStream * stream)
{
Guard::Assert(RequiredObjects == nullptr);
Guard::Assert(ThemeObjects == nullptr);
ObjectEntry = stream->ReadValue<rct_object_entry_extended>();
Path = stream->ReadString();
NumImages = stream->ReadValue<uint32>();
Name = stream->ReadString();
ChunkSize = stream->ReadValue<size_t>();
NumRequiredObjects = stream->ReadValue<uint16>();
RequiredObjects = Memory::AllocateArray<rct_object_entry_extended>(NumRequiredObjects);
for (uint16 i = 0; i < NumRequiredObjects; i++)
{
RequiredObjects[i] = stream->ReadValue<rct_object_entry_extended>();
}
switch (ObjectEntry.flags & 0x0F) {
case OBJECT_TYPE_RIDE:
RideFlags = stream->ReadValue<uint8>();
for (int i = 0; i < 2; i++)
{
RideCategory[i] = stream->ReadValue<uint8>();
}
for (int i = 0; i < 3; i++)
{
RideType[i] = stream->ReadValue<uint8>();
}
break;
case OBJECT_TYPE_SCENERY_SETS:
NumThemeObjects = stream->ReadValue<uint16>();
for (uint16 i = 0; i < NumThemeObjects; i++)
{
ThemeObjects[i] = stream->ReadValue<rct_object_entry_extended>();
}
break;
}
}
void Write(IStream * stream)
{
stream->WriteValue(ObjectEntry);
stream->WriteString(Path);
stream->WriteValue(NumImages);
stream->WriteString(Name);
stream->WriteValue(ChunkSize);
stream->WriteValue(NumRequiredObjects);
for (uint16 i = 0; i < NumRequiredObjects; i++)
{
stream->WriteValue(RequiredObjects[i]);
}
switch (ObjectEntry.flags & 0x0F) {
case OBJECT_TYPE_RIDE:
stream->WriteValue<uint8>(RideFlags);
for (int i = 0; i < 2; i++)
{
stream->WriteValue<uint8>(RideCategory[i]);
}
for (int i = 0; i < 3; i++)
{
stream->WriteValue<uint8>(RideType[i]);
}
break;
case OBJECT_TYPE_SCENERY_SETS:
stream->WriteValue<uint16>(NumThemeObjects);
for (uint16 i = 0; i < NumThemeObjects; i++)
{
stream->WriteValue<rct_object_entry_extended>(ThemeObjects[i]);
}
break;
}
}
};
class ObjectCache : IObjectCache
{
void Load() override
{
// TODO
}
void Save() override
{
// TODO
}
};

27
src/object/ObjectCache.h
View File

@ -1,27 +0,0 @@
#pragma region Copyright (c) 2014-2016 OpenRCT2 Developers
/*****************************************************************************
* OpenRCT2, an open source clone of Roller Coaster Tycoon 2.
*
* OpenRCT2 is the work of many authors, a full list can be found in contributors.md
* For more information, visit https://github.com/OpenRCT2/OpenRCT2
*
* OpenRCT2 is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* A full copy of the GNU General Public License can be found in licence.txt
*****************************************************************************/
#pragma endregion
#pragma once
#include "../common.h"
interface IObjectCache
{
virtual ~IObjectCache();
virtual void Load() abstract;
virtual void Save() abstract;
};

275
src/object/ObjectRepository.cpp Normal file
View File

@ -0,0 +1,275 @@
#pragma region Copyright (c) 2014-2016 OpenRCT2 Developers
/*****************************************************************************
* OpenRCT2, an open source clone of Roller Coaster Tycoon 2.
*
* OpenRCT2 is the work of many authors, a full list can be found in contributors.md
* For more information, visit https://github.com/OpenRCT2/OpenRCT2
*
* OpenRCT2 is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* A full copy of the GNU General Public License can be found in licence.txt
*****************************************************************************/
#pragma endregion
#include <vector>
#include "../common.h"
#include "../core/FileStream.hpp"
#include "../core/Guard.hpp"
#include "../core/IStream.hpp"
#include "../core/Memory.hpp"
#include "../core/String.hpp"
#include "ObjectRepository.h"
extern "C"
{
#include "../object.h"
#include "../platform/platform.h"
}
constexpr uint16 OBJECT_REPOSITORY_VERSION = 6;
struct ObjectRepositoryHeader
{
uint16 Version;
uint32 TotalFiles;
uint64 TotalFileSize;
uint32 FileDateModifiedChecksum;
uint32 NumItems;
};
struct QueryDirectoryResult
{
uint32 TotalFiles;
uint64 TotalFileSize;
uint32 FileDateModifiedChecksum;
};
class ObjectRepository : public IObjectRepository
{
std::vector<ObjectRepositoryItem> _items;
QueryDirectoryResult _queryDirectoryResult;
public:
void LoadOrConstruct()
{
_queryDirectoryResult = QueryDirectory();
if (!Load())
{
Construct();
Save();
}
}
const ObjectRepositoryItem * FindObject(const rct_object_entry * objectEntry) override
{
for (uint32 i = 0; i < _items.size(); i++)
{
ObjectRepositoryItem * item = &_items[i];
rct_object_entry * itemEntry = (rct_object_entry*)&item->ObjectEntry;
if (object_entry_compare(itemEntry, objectEntry))
{
return item;
}
}
return nullptr;
}
private:
void Construct()
{
// TODO
}
bool Load()
{
utf8 path[MAX_PATH];
GetRepositoryPath(path, sizeof(path));
try
{
auto fs = FileStream(path, FILE_MODE_OPEN);
auto header = fs.ReadValue<ObjectRepositoryHeader>();
if (header.Version == OBJECT_REPOSITORY_VERSION &&
header.TotalFiles == _queryDirectoryResult.TotalFiles &&
header.TotalFileSize == _queryDirectoryResult.TotalFileSize &&
header.FileDateModifiedChecksum == _queryDirectoryResult.FileDateModifiedChecksum)
{
// Header matches, so the index is not out of date
for (uint32 i = 0; i < header.NumItems; i++)
{
ObjectRepositoryItem item = ReadItem(&fs);
_items.push_back(item);
}
return true;
}
log_info("Object repository is out of date.");
return false;
}
catch (IOException ex)
{
return false;
}
}
void Save() const
{
utf8 path[MAX_PATH];
GetRepositoryPath(path, sizeof(path));
try
{
auto fs = FileStream(path, FILE_MODE_WRITE);
// Write header
ObjectRepositoryHeader header;
header.Version = OBJECT_REPOSITORY_VERSION;
header.TotalFiles = _queryDirectoryResult.TotalFiles;
header.TotalFileSize = _queryDirectoryResult.TotalFileSize;
header.FileDateModifiedChecksum = _queryDirectoryResult.FileDateModifiedChecksum;
header.NumItems = _items.size();
fs.WriteValue(header);
// Write items
for (uint32 i = 0; i < header.NumItems; i++)
{
fs.WriteValue(_items[i]);
}
}
catch (IOException ex)
{
log_error("Unable to write object repository index.");
}
}
static ObjectRepositoryItem ReadItem(IStream * stream)
{
ObjectRepositoryItem item = { 0 };
item.ObjectEntry = stream->ReadValue<rct_object_entry_extended>();
item.Path = stream->ReadString();
item.NumImages = stream->ReadValue<uint32>();
item.Name = stream->ReadString();
item.ChunkSize = stream->ReadValue<size_t>();
item.NumRequiredObjects = stream->ReadValue<uint16>();
item.RequiredObjects = Memory::AllocateArray<rct_object_entry_extended>(item.NumRequiredObjects);
for (uint16 i = 0; i < item.NumRequiredObjects; i++)
{
item.RequiredObjects[i] = stream->ReadValue<rct_object_entry_extended>();
}
switch (item.ObjectEntry.flags & 0x0F) {
case OBJECT_TYPE_RIDE:
item.RideFlags = stream->ReadValue<uint8>();
for (int i = 0; i < 2; i++)
{
item.RideCategory[i] = stream->ReadValue<uint8>();
}
for (int i = 0; i < 3; i++)
{
item.RideType[i] = stream->ReadValue<uint8>();
}
break;
case OBJECT_TYPE_SCENERY_SETS:
item.NumThemeObjects = stream->ReadValue<uint16>();
item.ThemeObjects = Memory::AllocateArray<rct_object_entry_extended>(item.NumThemeObjects);
for (uint16 i = 0; i < item.NumThemeObjects; i++)
{
item.ThemeObjects[i] = stream->ReadValue<rct_object_entry_extended>();
}
break;
}
return item;
}
static void WriteItem(IStream * stream, const ObjectRepositoryItem &item)
{
stream->WriteValue(item.ObjectEntry);
stream->WriteString(item.Path);
stream->WriteValue(item.NumImages);
stream->WriteString(item.Name);
stream->WriteValue(item.ChunkSize);
stream->WriteValue(item.NumRequiredObjects);
for (uint16 i = 0; i < item.NumRequiredObjects; i++)
{
stream->WriteValue(item.RequiredObjects[i]);
}
switch (item.ObjectEntry.flags & 0x0F) {
case OBJECT_TYPE_RIDE:
stream->WriteValue<uint8>(item.RideFlags);
for (int i = 0; i < 2; i++)
{
stream->WriteValue<uint8>(item.RideCategory[i]);
}
for (int i = 0; i < 3; i++)
{
stream->WriteValue<uint8>(item.RideType[i]);
}
break;
case OBJECT_TYPE_SCENERY_SETS:
stream->WriteValue<uint16>(item.NumThemeObjects);
for (uint16 i = 0; i < item.NumThemeObjects; i++)
{
stream->WriteValue<rct_object_entry_extended>(item.ThemeObjects[i]);
}
break;
}
}
static void FreeItem(ObjectRepositoryItem * item)
{
Memory::Free(item->RequiredObjects);
Memory::Free(item->ThemeObjects);
item->RequiredObjects = nullptr;
item->ThemeObjects = nullptr;
}
static void GetRepositoryPath(utf8 * buffer, size_t bufferSize)
{
platform_get_user_directory(buffer, nullptr);
strcat(buffer, "objects.idx");
}
static QueryDirectoryResult QueryDirectory()
{
QueryDirectoryResult result = { 0 };
// Enumerate through each object in the directory
int enumFileHandle = platform_enumerate_files_begin(gRCT2AddressObjectDataPath);
if (enumFileHandle != INVALID_HANDLE)
{
file_info enumFileInfo;
while (platform_enumerate_files_next(enumFileHandle, &enumFileInfo))
{
result.TotalFiles++;
result.TotalFileSize += enumFileInfo.size;
result.FileDateModifiedChecksum ^=
(uint32)(enumFileInfo.last_modified >> 32) ^
(uint32)(enumFileInfo.last_modified & 0xFFFFFFFF);
result.FileDateModifiedChecksum = ror32(result.FileDateModifiedChecksum, 5);
}
platform_enumerate_files_end(enumFileHandle);
}
return result;
}
};
static ObjectRepository * _objectRepository = nullptr;
IObjectRepository * GetObjectRepository()
{
if (_objectRepository == nullptr)
{
_objectRepository = new ObjectRepository();
_objectRepository->LoadOrConstruct();
}
return _objectRepository;
}

58
src/object/ObjectRepository.h Normal file
View File

@ -0,0 +1,58 @@
#pragma region Copyright (c) 2014-2016 OpenRCT2 Developers
/*****************************************************************************
* OpenRCT2, an open source clone of Roller Coaster Tycoon 2.
*
* OpenRCT2 is the work of many authors, a full list can be found in contributors.md
* For more information, visit https://github.com/OpenRCT2/OpenRCT2
*
* OpenRCT2 is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* A full copy of the GNU General Public License can be found in licence.txt
*****************************************************************************/
#pragma endregion
#pragma once
#include "../common.h"
extern "C"
{
#include "../object.h"
}
struct ObjectRepositoryItem
{
rct_object_entry_extended ObjectEntry;
utf8 * Path;
uint32 NumImages;
utf8 * Name;
size_t ChunkSize;
uint16 NumRequiredObjects;
rct_object_entry_extended * RequiredObjects;
union
{
struct
{
uint16 NumThemeObjects;
rct_object_entry_extended * ThemeObjects;
};
struct
{
uint8 RideFlags;
uint8 RideCategory[2];
uint8 RideType[3];
};
};
};
interface IObjectRepository
{
virtual ~IObjectRepository() { }
virtual const ObjectRepositoryItem * FindObject(const rct_object_entry * objectEntry) abstract;
};
IObjectRepository * GetObjectRepository();