mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-11-19 01:19:41 +01:00
Code Issues Releases Wiki Activity
VVVVVV/desktop_version/src/BinaryBlob.h

68 lines
1.7 KiB
C
Raw Normal View History

Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
#ifndef BINARYBLOB_H
#define BINARYBLOB_H
Refactor extra binary blob tracks to not use STL data marshalling Just like I refactored text splitting to no longer use std::vectors, std::strings, or temporary heap allocations, decreasing memory usage and improving performance; there's no reason to use a temporary heap-allocated std::vector to grab all extra binary blob indices, when instead the iteration can just be more immediate. Instead, what I've done is replaced binaryBlob::getExtra() with binaryBlob::nextExtra(), which takes in a pointer to an index variable, and will increment the index variable until it reaches an extra track. After the caller processes the extra track, it is the caller's responsibility to increment the variable again before passing it back to getExtra(). This avoids all heap allocations and brings down the memory usage of processing extra tracks.
2021-02-18 08:48:41 +01:00
#include <stddef.h>
Add binaryBlob::getExtra() This needs to be done because m_headers is a private member of binaryBlob.
2020-07-01 00:27:57 +02:00
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
/* Laaaazyyyyyyy -flibit */
// #define VVV_COMPILEMUSIC
Refactor TRACK_NAMES to take in a blob parameter I'm going to introduce another binaryBlob object in to the mix, and I want to be able to re-use an existing FOREACH_TRACK #define without having to copy-paste it again. So, TRACK_NAMES now takes in a blob parameter, which will be passed to the temporary FOREACH_TRACK #define.
2021-02-16 01:38:10 +01:00
#define TRACK_NAMES(blob) \
FOREACH_TRACK(blob, "data/music/0levelcomplete.ogg") \
FOREACH_TRACK(blob, "data/music/1pushingonwards.ogg") \
FOREACH_TRACK(blob, "data/music/2positiveforce.ogg") \
FOREACH_TRACK(blob, "data/music/3potentialforanything.ogg") \
FOREACH_TRACK(blob, "data/music/4passionforexploring.ogg") \
FOREACH_TRACK(blob, "data/music/5intermission.ogg") \
FOREACH_TRACK(blob, "data/music/6presentingvvvvvv.ogg") \
FOREACH_TRACK(blob, "data/music/7gamecomplete.ogg") \
FOREACH_TRACK(blob, "data/music/8predestinedfate.ogg") \
FOREACH_TRACK(blob, "data/music/9positiveforcereversed.ogg") \
FOREACH_TRACK(blob, "data/music/10popularpotpourri.ogg") \
FOREACH_TRACK(blob, "data/music/11pipedream.ogg") \
FOREACH_TRACK(blob, "data/music/12pressurecooker.ogg") \
FOREACH_TRACK(blob, "data/music/13pacedenergy.ogg") \
FOREACH_TRACK(blob, "data/music/14piercingthesky.ogg") \
FOREACH_TRACK(blob, "data/music/predestinedfatefinallevel.ogg")
De-duplicate track names Instead of copy-pasting the entire list three times over, why not put it in an easy to use "X" macro?
2020-07-01 00:17:02 +02:00
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
struct resourceheader
{
char name[48];
Sigh.
2020-06-15 13:37:05 +02:00
int start_UNUSED;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
int size;
bool valid;
};
class binaryBlob
{
public:
Explicitly declare void for all void parameter functions (#628) Apparently in C, if you have `void test();`, it's completely okay to do `test(2);`. The function will take in the argument, but just discard it and throw it away. It's like a trash can, and a rude one at that. If you declare it like `void test(void);`, this is prevented. This is not a problem in C++ - doing `void test();` and `test(2);` is guaranteed to result in a compile error (this also means that right now, at least in all `.cpp` files, nobody is ever calling a void parameter function with arguments and having their arguments be thrown away). However, we may not be using C++ in the future, so I just want to lay down the precedent that if a function takes in no arguments, you must explicitly declare it as such. I would've added `-Wstrict-prototypes`, but it produces an annoying warning message saying it doesn't work in C++ mode if you're compiling in C++ mode. So it can be added later.
2021-02-25 23:23:59 +01:00
binaryBlob(void);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
#ifdef VVV_COMPILEMUSIC
void AddFileToBinaryBlob(const char* _path);
void writeBinaryBlob(const char* _name);
#endif
bool unPackBinary(const char* _name);
int getIndex(const char* _name);
int getSize(int _index);
Refactor extra binary blob tracks to not use STL data marshalling Just like I refactored text splitting to no longer use std::vectors, std::strings, or temporary heap allocations, decreasing memory usage and improving performance; there's no reason to use a temporary heap-allocated std::vector to grab all extra binary blob indices, when instead the iteration can just be more immediate. Instead, what I've done is replaced binaryBlob::getExtra() with binaryBlob::nextExtra(), which takes in a pointer to an index variable, and will increment the index variable until it reaches an extra track. After the caller processes the extra track, it is the caller's responsibility to increment the variable again before passing it back to getExtra(). This avoids all heap allocations and brings down the memory usage of processing extra tracks.
2021-02-18 08:48:41 +01:00
bool nextExtra(size_t* start);
Add binaryBlob::getExtra() This needs to be done because m_headers is a private member of binaryBlob.
2020-07-01 00:27:57 +02:00
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
char* getAddress(int _index);
Explicitly declare void for all void parameter functions (#628) Apparently in C, if you have `void test();`, it's completely okay to do `test(2);`. The function will take in the argument, but just discard it and throw it away. It's like a trash can, and a rude one at that. If you declare it like `void test(void);`, this is prevented. This is not a problem in C++ - doing `void test();` and `test(2);` is guaranteed to result in a compile error (this also means that right now, at least in all `.cpp` files, nobody is ever calling a void parameter function with arguments and having their arguments be thrown away). However, we may not be using C++ in the future, so I just want to lay down the precedent that if a function takes in no arguments, you must explicitly declare it as such. I would've added `-Wstrict-prototypes`, but it produces an annoying warning message saying it doesn't work in C++ mode if you're compiling in C++ mode. So it can be added later.
2021-02-25 23:23:59 +01:00
void clear(void);
Don't leak binaryBlob
2020-06-07 22:11:35 +02:00
Check index of tracks in musicclass::init() It's possible that musicReadBlob.getIndex() could return the sentinel value of -1 in case the header with that name is invalid, in which case we should simply not do anything. Otherwise it'll lead to segfaults. I opted to do the full bounds check just to be safe, too. For further safety, I hardcoded the max number of headers, 128, less, so 128 is copy-pasted less and in the future if it needs to be changed it'll only have to be changed in one place.
2020-08-14 11:02:16 +02:00
static const int max_headers = 128;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
private:
int numberofHeaders;
Check index of tracks in musicclass::init() It's possible that musicReadBlob.getIndex() could return the sentinel value of -1 in case the header with that name is invalid, in which case we should simply not do anything. Otherwise it'll lead to segfaults. I opted to do the full bounds check just to be safe, too. For further safety, I hardcoded the max number of headers, 128, less, so 128 is copy-pasted less and in the future if it needs to be changed it'll only have to be changed in one place.
2020-08-14 11:02:16 +02:00
resourceheader m_headers[max_headers];
char* m_memblocks[max_headers];
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
};
#endif /* BINARYBLOB_H */
Reference in a new issue Copy permalink