mirror of https://github.com/PrimeDecomp/prime.git
parent
f6425fe3d8
commit
f3ef565768
|
@ -914,7 +914,7 @@ LIBS = [
|
||||||
"musyx/seq",
|
"musyx/seq",
|
||||||
"musyx/synth",
|
"musyx/synth",
|
||||||
["musyx/seq_api", True],
|
["musyx/seq_api", True],
|
||||||
"musyx/snd_synthapi",
|
["musyx/snd_synthapi", False, False],
|
||||||
"musyx/stream",
|
"musyx/stream",
|
||||||
"musyx/synthdata",
|
"musyx/synthdata",
|
||||||
"musyx/synthmacros",
|
"musyx/synthmacros",
|
||||||
|
@ -1141,7 +1141,10 @@ for lib in LIBS:
|
||||||
n.comment("Loose files")
|
n.comment("Loose files")
|
||||||
for object in lib["objects"]:
|
for object in lib["objects"]:
|
||||||
completed = False
|
completed = False
|
||||||
|
add_to_all = True
|
||||||
if type(object) is list:
|
if type(object) is list:
|
||||||
|
if len(object) > 2:
|
||||||
|
add_to_all = object[2]
|
||||||
completed = object[1]
|
completed = object[1]
|
||||||
object = object[0]
|
object = object[0]
|
||||||
|
|
||||||
|
@ -1163,6 +1166,7 @@ for lib in LIBS:
|
||||||
"basedir": os.path.dirname(f"$builddir/src/{object}"),
|
"basedir": os.path.dirname(f"$builddir/src/{object}"),
|
||||||
"basefile": f"$builddir/src/{object}"
|
"basefile": f"$builddir/src/{object}"
|
||||||
})
|
})
|
||||||
|
if add_to_all:
|
||||||
all_source_files.append(f"$builddir/src/{object}.o")
|
all_source_files.append(f"$builddir/src/{object}.o")
|
||||||
if os.path.exists(os.path.join("asm", f"{object}.s")):
|
if os.path.exists(os.path.join("asm", f"{object}.s")):
|
||||||
n.build(f"$builddir/asm/{object}.o", "as", f"asm/{object}.s")
|
n.build(f"$builddir/asm/{object}.o", "as", f"asm/{object}.s")
|
||||||
|
|
|
@ -11,6 +11,7 @@ class CArchitectureQueue {
|
||||||
public:
|
public:
|
||||||
bool Push(const CArchitectureMessage& msg) {
|
bool Push(const CArchitectureMessage& msg) {
|
||||||
x0_queue.push_back(msg);
|
x0_queue.push_back(msg);
|
||||||
|
return false; // TODO
|
||||||
}
|
}
|
||||||
void Pop(); // TODO
|
void Pop(); // TODO
|
||||||
void Clear(); // TODO
|
void Clear(); // TODO
|
||||||
|
|
|
@ -34,7 +34,7 @@ public:
|
||||||
float x30_;
|
float x30_;
|
||||||
bool x34_castShadows;
|
bool x34_castShadows;
|
||||||
float x38_;
|
float x38_;
|
||||||
EFalloffType x3c_falloff;
|
EFallofType x3c_falloff;
|
||||||
float x40_;
|
float x40_;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
#define _MUSYX_SYNTH
|
#define _MUSYX_SYNTH
|
||||||
|
|
||||||
#include "musyx/musyx_priv.h"
|
#include "musyx/musyx_priv.h"
|
||||||
#ifndef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@ void synthVolume(u8 volume, u16 time, u8 volgroup2, s32, s32);
|
||||||
/* TODO: Move this where it belongs */
|
/* TODO: Move this where it belongs */
|
||||||
void hwSetAUXProcessingCallbacks(u8 studio, SND_AUX_CALLBACK auxA, void* userA,
|
void hwSetAUXProcessingCallbacks(u8 studio, SND_AUX_CALLBACK auxA, void* userA,
|
||||||
SND_AUX_CALLBACK auxB, void* userB);
|
SND_AUX_CALLBACK auxB, void* userB);
|
||||||
#ifndef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -18,6 +18,7 @@ public:
|
||||||
cur = cur->get_next();
|
cur = cur->get_next();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
void push_back(const T&);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
struct node {
|
struct node {
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
#include "dolphin/os/OSReset.h"
|
||||||
|
|
||||||
volatile u8 DAT_800030e2 : 0x800030e2;
|
volatile u8 DAT_800030e2 : 0x800030e2;
|
||||||
typedef struct Unk {
|
typedef struct Unk {
|
||||||
u8 pad[0x24];
|
u8 pad[0x24];
|
||||||
|
@ -17,6 +19,8 @@ typedef struct OSResetQueue {
|
||||||
OSResetFunctionInfo* last;
|
OSResetFunctionInfo* last;
|
||||||
} OSResetQueue;
|
} OSResetQueue;
|
||||||
|
|
||||||
|
OSResetQueue ResetFunctionQueue;
|
||||||
|
|
||||||
void OSRegisterResetFunction(OSResetFunctionInfo* func) {
|
void OSRegisterResetFunction(OSResetFunctionInfo* func) {
|
||||||
OSResetFunctionInfo* tmp;
|
OSResetFunctionInfo* tmp;
|
||||||
OSResetFunctionInfo* iter;
|
OSResetFunctionInfo* iter;
|
||||||
|
|
|
@ -20,7 +20,7 @@ struct GXData {
|
||||||
extern GXData* __GXData;
|
extern GXData* __GXData;
|
||||||
|
|
||||||
static inline void write_bp_cmd(u32 cmd) {
|
static inline void write_bp_cmd(u32 cmd) {
|
||||||
GXWGFifo.uchar = GX_LOAD_BP_REG;
|
GXWGFifo.u8 = GX_LOAD_BP_REG;
|
||||||
GXWGFifo.u32 = cmd;
|
GXWGFifo.u32 = cmd;
|
||||||
__GXData->cpCRreg = 0;
|
__GXData->cpCRreg = 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -75,7 +75,7 @@ unkptr gpDefaultFont;
|
||||||
unkptr lbl_805A8C50;
|
unkptr lbl_805A8C50;
|
||||||
unkptr lbl_805A8C54;
|
unkptr lbl_805A8C54;
|
||||||
bool COsContext::mProgressiveMode;
|
bool COsContext::mProgressiveMode;
|
||||||
uint sARAMMemArray[2];
|
u32 sARAMMemArray[2];
|
||||||
float sInfiniteLoopTime;
|
float sInfiniteLoopTime;
|
||||||
|
|
||||||
#define GRAPHICS_FIFO_SIZE 0x60000
|
#define GRAPHICS_FIFO_SIZE 0x60000
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
#include "WorldFormat/CWorldLight.hpp"
|
#include "WorldFormat/CWorldLight.hpp"
|
||||||
|
|
||||||
#include "Kyoto/Streams/CInputStream.hpp"
|
#include "Kyoto/Streams/CInputStream.hpp"
|
||||||
#include <hacks.h>
|
// #include <hacks.h>
|
||||||
#include <rstl/math.hpp>
|
#include <rstl/math.hpp>
|
||||||
|
|
||||||
const CVector3f CWorldLight::kDefaultPosition = CVector3f(0.f, 0.f, 0.f);
|
const CVector3f CWorldLight::kDefaultPosition = CVector3f(0.f, 0.f, 0.f);
|
||||||
FORCEPADDING(sizeof(CVector3f)) kPadding;
|
// FORCEPADDING(sizeof(CVector3f)) kPadding;
|
||||||
const CVector3f CWorldLight::kDefaultDirection = CVector3f(0.f, 1.f, 0.f);
|
const CVector3f CWorldLight::kDefaultDirection = CVector3f(0.f, 1.f, 0.f);
|
||||||
|
|
||||||
CWorldLight::CWorldLight(CInputStream& in)
|
CWorldLight::CWorldLight(CInputStream& in)
|
||||||
|
@ -18,7 +18,7 @@ CWorldLight::CWorldLight(CInputStream& in)
|
||||||
, x30_(in.Get< float >())
|
, x30_(in.Get< float >())
|
||||||
, x34_castShadows(in.Get< bool >())
|
, x34_castShadows(in.Get< bool >())
|
||||||
, x38_(in.Get< float >())
|
, x38_(in.Get< float >())
|
||||||
, x3c_falloff((EFalloffType)in.Get< uint >())
|
, x3c_falloff((EFallofType)in.Get< uint >())
|
||||||
, x40_(in.Get< float >()) {}
|
, x40_(in.Get< float >()) {}
|
||||||
|
|
||||||
CLight CWorldLight::GetAsCGraphicsLight() const {
|
CLight CWorldLight::GetAsCGraphicsLight() const {
|
||||||
|
|
Loading…
Reference in New Issue