mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-06-01 18:43:33 +02:00
Code Issues Releases Wiki Activity
master
VVVVVV/desktop_version/src/BinaryBlob.h

70 lines
1.7 KiB
C
Raw Permalink 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>
Use fixed-size int types for resourceheader Since this refers to specific exported file data, let's make sure this is portable. I'm not sure if we'll ever ship on systems where sizeof(int) != 4 or sizeof(bool) != 1, but better to be safer and future-proof than not.
2021-09-24 07:18:45 +02:00
#include <stdint.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) \
Untabify every single file YOLO. This is a repeat of #642. As before, I just did rg -l '\t' | xargs -n 1 sed -i -e 's/\t/ /g' inside the desktop_version/ folder.
2021-09-07 03:56:39 +02:00
FOREACH_TRACK(blob, "music/0levelcomplete.ogg") \
FOREACH_TRACK(blob, "music/1pushingonwards.ogg") \
FOREACH_TRACK(blob, "music/2positiveforce.ogg") \
FOREACH_TRACK(blob, "music/3potentialforanything.ogg") \
FOREACH_TRACK(blob, "music/4passionforexploring.ogg") \
FOREACH_TRACK(blob, "music/5intermission.ogg") \
FOREACH_TRACK(blob, "music/6presentingvvvvvv.ogg") \
FOREACH_TRACK(blob, "music/7gamecomplete.ogg") \
FOREACH_TRACK(blob, "music/8predestinedfate.ogg") \
FOREACH_TRACK(blob, "music/9positiveforcereversed.ogg") \
FOREACH_TRACK(blob, "music/10popularpotpourri.ogg") \
FOREACH_TRACK(blob, "music/11pipedream.ogg") \
FOREACH_TRACK(blob, "music/12pressurecooker.ogg") \
FOREACH_TRACK(blob, "music/13pacedenergy.ogg") \
FOREACH_TRACK(blob, "music/14piercingthesky.ogg") \
FOREACH_TRACK(blob, "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
{
Untabify every single file YOLO. This is a repeat of #642. As before, I just did rg -l '\t' | xargs -n 1 sed -i -e 's/\t/ /g' inside the desktop_version/ folder.
2021-09-07 03:56:39 +02:00
char name[48];
Use fixed-size int types for resourceheader Since this refers to specific exported file data, let's make sure this is portable. I'm not sure if we'll ever ship on systems where sizeof(int) != 4 or sizeof(bool) != 1, but better to be safer and future-proof than not.
2021-09-24 07:18:45 +02:00
int32_t start_UNUSED;
int32_t size;
uint8_t valid;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
};
class binaryBlob
{
public:
Untabify every single file YOLO. This is a repeat of #642. As before, I just did rg -l '\t' | xargs -n 1 sed -i -e 's/\t/ /g' inside the desktop_version/ folder.
2021-09-07 03:56:39 +02:00
binaryBlob(void);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
#ifdef VVV_COMPILEMUSIC
Untabify every single file YOLO. This is a repeat of #642. As before, I just did rg -l '\t' | xargs -n 1 sed -i -e 's/\t/ /g' inside the desktop_version/ folder.
2021-09-07 03:56:39 +02:00
void AddFileToBinaryBlob(const char* _path);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Untabify every single file YOLO. This is a repeat of #642. As before, I just did rg -l '\t' | xargs -n 1 sed -i -e 's/\t/ /g' inside the desktop_version/ folder.
2021-09-07 03:56:39 +02:00
void writeBinaryBlob(const char* _name);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
#endif
Untabify every single file YOLO. This is a repeat of #642. As before, I just did rg -l '\t' | xargs -n 1 sed -i -e 's/\t/ /g' inside the desktop_version/ folder.
2021-09-07 03:56:39 +02:00
bool unPackBinary(const char* _name);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Untabify every single file YOLO. This is a repeat of #642. As before, I just did rg -l '\t' | xargs -n 1 sed -i -e 's/\t/ /g' inside the desktop_version/ folder.
2021-09-07 03:56:39 +02:00
int getIndex(const char* _name);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Untabify every single file YOLO. This is a repeat of #642. As before, I just did rg -l '\t' | xargs -n 1 sed -i -e 's/\t/ /g' inside the desktop_version/ folder.
2021-09-07 03:56:39 +02:00
int getSize(int _index);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Untabify every single file YOLO. This is a repeat of #642. As before, I just did rg -l '\t' | xargs -n 1 sed -i -e 's/\t/ /g' inside the desktop_version/ folder.
2021-09-07 03:56:39 +02: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
Untabify every single file YOLO. This is a repeat of #642. As before, I just did rg -l '\t' | xargs -n 1 sed -i -e 's/\t/ /g' inside the desktop_version/ folder.
2021-09-07 03:56:39 +02:00
char* getAddress(int _index);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Untabify every single file YOLO. This is a repeat of #642. As before, I just did rg -l '\t' | xargs -n 1 sed -i -e 's/\t/ /g' inside the desktop_version/ folder.
2021-09-07 03:56:39 +02:00
void clear(void);
Don't leak binaryBlob
2020-06-07 22:11:35 +02:00
Untabify every single file YOLO. This is a repeat of #642. As before, I just did rg -l '\t' | xargs -n 1 sed -i -e 's/\t/ /g' inside the desktop_version/ folder.
2021-09-07 03:56:39 +02:00
static const int max_headers = 128;
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
Ifdef `numberofHeaders` out if not compiling music This variable is only used when compiling music. Since it doesn't actually keep track of the number of headers otherwise, ifdef it behind VVV_COMPILEMUSIC.
2021-09-24 06:55:58 +02:00
#ifdef VVV_COMPILEMUSIC
Untabify every single file YOLO. This is a repeat of #642. As before, I just did rg -l '\t' | xargs -n 1 sed -i -e 's/\t/ /g' inside the desktop_version/ folder.
2021-09-07 03:56:39 +02:00
int numberofHeaders;
Ifdef `numberofHeaders` out if not compiling music This variable is only used when compiling music. Since it doesn't actually keep track of the number of headers otherwise, ifdef it behind VVV_COMPILEMUSIC.
2021-09-24 06:55:58 +02:00
#endif
Untabify every single file YOLO. This is a repeat of #642. As before, I just did rg -l '\t' | xargs -n 1 sed -i -e 's/\t/ /g' inside the desktop_version/ folder.
2021-09-07 03:56:39 +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 New Issue Copy Permalink