mirror of
https://github.com/AquariaOSE/Aquaria.git
synced 2024-11-15 22:19:07 +00:00
6dc1c1e8d1
- HTTP networking support, mods can be downloaded via the builtin downloader. All network activity runs in a seperate thread, which is started as soon as any network activity is requested. - The master server is hard-coded to fg.wzff.de/aqmods/ if not specified otherwise; this setting can be overridden in the config file. - The mod selector screen is now a grid-view for much better navigation; also works with joystick. - VFS code is functionally similar to the old molebox-packed release for win32. The game could also have its data shipped in a Zip file or any other kind of archive. - It is still possible to build without VFS support, but then the mod downloader and soft-patching will not be available. The full commit history can be found here: https://github.com/fgenesis/Aquaria_clean/compare/master...vfs The most important commit messages follow: [...] This replaces all std::ifstream with InStream, and fopen(), ... with vfopen(), ... Some code is #ifdef'd for better performance and less memory-copying. VFILE is defined to whatever type of file is in use: - FILE if BBGE_BUILD_VFS is not defined - tttvfs::VFSFile if it is. Other changes: - [un]packFile() is now unused and obsolete. That code has not been adjusted to use VFILE. - glpng can now load from a memory buffer. - TinyXML uses the VFS for reading operations now. - The rather clunky binary stream loading of glfont2 got replaced with ByteBuffer, which gets its data in one block (necessary to use the VFS without implementing a somewhat STL-compliant std::ifstream replacement.) ------------- Implement loading mods from zip files. ------------- Implement soft-patching game data files. (Replacing textures/audio/... on the fly) ------------- Misc bits: - Extended GUI focus handling a bit - Fixed weirdness in texture loading... not sure but this seems more correct to me. Actually, considering that the texture will have its native size after restarting the game, the lines removed with this commit seem pretty useless.
104 lines
1.4 KiB
C++
104 lines
1.4 KiB
C++
#ifndef BBGE_MT_H
|
|
#define BBGE_MT_H
|
|
|
|
#include <cstddef>
|
|
#include <queue>
|
|
#include <map>
|
|
|
|
class Lockable
|
|
{
|
|
public:
|
|
Lockable();
|
|
virtual ~Lockable();
|
|
void lock();
|
|
void unlock();
|
|
|
|
protected:
|
|
inline void *mutex() { return _mtx; }
|
|
|
|
private:
|
|
void *_mtx;
|
|
};
|
|
|
|
class Waitable : public Lockable
|
|
{
|
|
public:
|
|
Waitable();
|
|
virtual ~Waitable();
|
|
void wait(); // releases the associated lock while waiting
|
|
void signal(); // signal a single waiting thread
|
|
void broadcast(); // signal all waiting threads
|
|
|
|
private:
|
|
void *_cond;
|
|
};
|
|
|
|
class MTGuard
|
|
{
|
|
public:
|
|
MTGuard(Lockable& x) : _obj(&x) { _obj->lock(); }
|
|
MTGuard(Lockable* x) : _obj(x) { _obj->lock(); }
|
|
~MTGuard() { _obj->unlock(); }
|
|
Lockable *_obj;
|
|
};
|
|
|
|
template <typename T> class BlockingQueue : public Waitable
|
|
{
|
|
public:
|
|
void push(const T& e)
|
|
{
|
|
lock();
|
|
_q.push(e);
|
|
unlock();
|
|
signal();
|
|
}
|
|
bool pop(T& e) // blocks if empty
|
|
{
|
|
lock();
|
|
while(_q.empty())
|
|
wait();
|
|
e = _q.front();
|
|
_q.pop();
|
|
unlock();
|
|
return true;
|
|
}
|
|
private:
|
|
std::queue<T> _q;
|
|
};
|
|
|
|
template <typename T> class LockedQueue : public Lockable
|
|
{
|
|
public:
|
|
void push(const T& e)
|
|
{
|
|
lock();
|
|
_q.push(e);
|
|
unlock();
|
|
}
|
|
bool pop(T& e) // continues if empty
|
|
{
|
|
lock();
|
|
if(_q.empty())
|
|
{
|
|
unlock();
|
|
return false;
|
|
}
|
|
e = _q.front();
|
|
_q.pop();
|
|
unlock();
|
|
return true;
|
|
}
|
|
bool empty()
|
|
{
|
|
lock();
|
|
bool e = _q.empty();
|
|
unlock();
|
|
return e;
|
|
}
|
|
|
|
private:
|
|
std::queue<T> _q;
|
|
};
|
|
|
|
|
|
#endif
|