mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2025-02-14 14:20:24 -05:00
![David Chavez](/assets/img/avatar_default.png)
* Fixed soh filters * add more makefile changes * almost ready * more updates * update * update * Update Makefiles to handle both platforms * Allow for overriding the CXX and CC executables * Restore original structure while supporting custom CXX flags * Remove some platform specific libs * Dynamic target name * Make X11 paths package-agnostic * Remove changes to `gfx_opengl.cpp` * Use OpenGL2 on MacOS instead of OpenGL3 * make it actually render something * render at least the first texture, still need to figure out the second one * Let’s use OpenGL 3 again * maybe this works to get the right texture? link's eyes still look off a bit * did this work? * set the platform to macos * actual numbers are right, but logic is ugly XXX/TODO, i know * add zlib to ldflags for ZAPDUtils * A bit of cleanup * Revert unneeded changes * Remove GL_CHECK * Fix issues with z64 branch * use an std::map instead of a giant array * three point filter fix (#2) * Fix mac compilation * fix audio for 64 bit * revert audio heap size, keep bigger pools * Add more Apple specific checks to our modifications * Add building instructions for macOS * Remove unecessary step from building instructions * Add missing SDL2 & GLEW to Linux LDLIBS * Update BUILDING.md Co-authored-by: BountyChocolate123456 <101743444+BountyChocolate123456@users.noreply.github.com> * Update soh/.gitignore to include other arch binaries Co-authored-by: BountyChocolate123456 <101743444+BountyChocolate123456@users.noreply.github.com> * Use right platform name for debugging window Co-authored-by: BountyChocolate123456 <101743444+BountyChocolate123456@users.noreply.github.com> * Fix stormlib on macos (arm64) * Simplify some of the ifdef checks * Revert an older no longer necessary fix * Remove remaining unecessary deviations * Update building instructions after StormLib changes * Feature: Use OpenGL 4.1 (#1) * Further tweak the BUILDING * Tidy up * reword -j message * Add Jenkins CI Support (#2) * Fix type issues * add target <appbundle> and <filledappbundle> add makefile targets to create an .app `filledappbundle` creates the target with the .otr included this should perhaps be moved to Application Support though * pull gcc's rpath from otool output * move make target to the end so it's not default * Add Jenkins and make exe in par with other platforms * Actually save build artefacts * Fix artefact path * Remove x11 mentions and linking (not used) * Update building instructions for generating app * use appsupport directory * Add new app icon * Update target to match macOS types * Update more audio types * fix null deref in Audio_PlayFanfare * Remove old import from z64 * address final nit with apple ifdefs Co-authored-by: KiritoDev <36680385+KiritoDv@users.noreply.github.com> Co-authored-by: Jeffrey Crowell <github@crowell.biz> Co-authored-by: BountyChocolate123456 <101743444+BountyChocolate123456@users.noreply.github.com>
132 lines
2.4 KiB
C++
132 lines
2.4 KiB
C++
#pragma once
|
|
|
|
#include "Resource.h"
|
|
#include <vector>
|
|
#include <map>
|
|
#include <string>
|
|
|
|
namespace Ship
|
|
{
|
|
struct AdsrEnvelope
|
|
{
|
|
int16_t delay;
|
|
int16_t arg;
|
|
};
|
|
|
|
struct AdpcmBook
|
|
{
|
|
/* 0x00 */ uint32_t order;
|
|
/* 0x04 */ uint32_t npredictors;
|
|
/* 0x08 */ std::vector<int16_t> books; // size 8 * order * npredictors. 8-byte aligned
|
|
};
|
|
|
|
struct AdpcmLoop
|
|
{
|
|
/* 0x00 */ uint32_t start;
|
|
/* 0x04 */ uint32_t end;
|
|
/* 0x08 */ uint32_t count;
|
|
/* 0x10 */ std::vector<int16_t> states;
|
|
};
|
|
|
|
struct SoundFontEntry
|
|
{
|
|
std::string sampleFileName;
|
|
float tuning;
|
|
};
|
|
|
|
struct DrumEntry
|
|
{
|
|
uint8_t releaseRate;
|
|
uint8_t pan;
|
|
uint8_t loaded;
|
|
std::string sampleFileName;
|
|
float tuning;
|
|
std::vector<AdsrEnvelope*> env;
|
|
};
|
|
|
|
struct InstrumentEntry
|
|
{
|
|
bool isValidEntry;
|
|
uint8_t loaded;
|
|
uint8_t normalRangeLo;
|
|
uint8_t normalRangeHi;
|
|
uint8_t releaseRate;
|
|
std::vector<AdsrEnvelope*> env;
|
|
SoundFontEntry* lowNotesSound = nullptr;
|
|
SoundFontEntry* normalNotesSound = nullptr;
|
|
SoundFontEntry* highNotesSound = nullptr;
|
|
};
|
|
|
|
class AudioSequenceV2 : public ResourceFile
|
|
{
|
|
public:
|
|
void ParseFileBinary(BinaryReader* reader, Resource* res) override;
|
|
static std::vector<AdsrEnvelope*> ReadEnvelopeData(BinaryReader* reader);
|
|
};
|
|
|
|
class AudioSoundFontV2 : public ResourceFile
|
|
{
|
|
public:
|
|
void ParseFileBinary(BinaryReader* reader, Resource* res) override;
|
|
static std::vector<AdsrEnvelope*> ReadEnvelopeData(BinaryReader* reader);
|
|
};
|
|
|
|
class AudioSampleV2 : public ResourceFile
|
|
{
|
|
public:
|
|
void ParseFileBinary(BinaryReader* reader, Resource* res) override;
|
|
};
|
|
|
|
class AudioV2 : public ResourceFile
|
|
{
|
|
public:
|
|
void ParseFileBinary(BinaryReader* reader, Resource* res) override;
|
|
};
|
|
|
|
class AudioSequence : public Resource
|
|
{
|
|
public:
|
|
std::vector<char> seqData;
|
|
uint8_t seqNumber;
|
|
uint8_t medium;
|
|
uint8_t cachePolicy;
|
|
std::vector<uint8_t> fonts;
|
|
};
|
|
|
|
class AudioSoundFont : public Resource
|
|
{
|
|
public:
|
|
uint32_t ptr;
|
|
uint32_t size;
|
|
uint32_t id;
|
|
uint8_t medium;
|
|
uint8_t cachePolicy;
|
|
uint16_t data1;
|
|
uint16_t data2;
|
|
uint16_t data3;
|
|
|
|
std::vector<DrumEntry> drums;
|
|
std::vector<SoundFontEntry*> soundEffects;
|
|
std::vector<InstrumentEntry> instruments;
|
|
};
|
|
|
|
class AudioSample : public Resource
|
|
{
|
|
public:
|
|
uint32_t originalOffset;
|
|
uint8_t codec;
|
|
uint8_t medium;
|
|
uint8_t unk_bit26;
|
|
uint8_t unk_bit25;
|
|
|
|
std::vector<uint8_t> data;
|
|
AdpcmLoop loop;
|
|
AdpcmBook book;
|
|
};
|
|
|
|
class Audio : public Resource
|
|
{
|
|
public:
|
|
};
|
|
}
|