formatting
This commit is contained in:
parent
51f48a5740
commit
d18281b6bf
@ -52,11 +52,10 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if RtcIsEnabled
|
#if RtcIsEnabled
|
||||||
# define DX12_DEBUG 1
|
//# define DX12_DEBUG 1
|
||||||
# define DX12_SHADER_DEBUG 1
|
# define DX12_DEBUG 0
|
||||||
#else
|
#else
|
||||||
# define DX12_DEBUG 0
|
# define DX12_DEBUG 0
|
||||||
# define DX12_SHADER_DEBUG 0
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* ========================== *
|
/* ========================== *
|
||||||
|
|||||||
@ -143,7 +143,7 @@ void M_ReleaseTrackLocked(P_Lock *lock, M_Track *track)
|
|||||||
////////////////////////////////
|
////////////////////////////////
|
||||||
//~ Mixer control
|
//~ Mixer control
|
||||||
|
|
||||||
/* TODO: Rework interface to be command based instead of directly modifying tracks. */
|
/* TODO: Rework interface to be command based instead of directly modifying tracks. */
|
||||||
|
|
||||||
M_Handle M_PlaySound(SND_Sound *sound)
|
M_Handle M_PlaySound(SND_Sound *sound)
|
||||||
{
|
{
|
||||||
@ -299,7 +299,6 @@ M_PcmF32 M_MixAllTracks(Arena *arena, u64 frame_count)
|
|||||||
f32 speed = MaxF32(0, desc.speed);
|
f32 speed = MaxF32(0, desc.speed);
|
||||||
|
|
||||||
//- Determine sample range
|
//- Determine sample range
|
||||||
|
|
||||||
u64 source_samples_count = 0;
|
u64 source_samples_count = 0;
|
||||||
if (source_is_stereo)
|
if (source_is_stereo)
|
||||||
{
|
{
|
||||||
@ -340,7 +339,6 @@ M_PcmF32 M_MixAllTracks(Arena *arena, u64 frame_count)
|
|||||||
};
|
};
|
||||||
|
|
||||||
//- Resample
|
//- Resample
|
||||||
|
|
||||||
/* Transform 16 bit source -> 32 bit stereo at output duration */
|
/* Transform 16 bit source -> 32 bit stereo at output duration */
|
||||||
{
|
{
|
||||||
__profn("Resample");
|
__profn("Resample");
|
||||||
@ -398,7 +396,6 @@ M_PcmF32 M_MixAllTracks(Arena *arena, u64 frame_count)
|
|||||||
}
|
}
|
||||||
|
|
||||||
//- Spatialize
|
//- Spatialize
|
||||||
|
|
||||||
if (desc.flags & M_TrackFlag_Spatialize)
|
if (desc.flags & M_TrackFlag_Spatialize)
|
||||||
{
|
{
|
||||||
__profn("Spatialize");
|
__profn("Spatialize");
|
||||||
@ -455,7 +452,6 @@ M_PcmF32 M_MixAllTracks(Arena *arena, u64 frame_count)
|
|||||||
}
|
}
|
||||||
|
|
||||||
//- Mix into result
|
//- Mix into result
|
||||||
|
|
||||||
for (u64 i = 0; i < mix_pcm.count; ++i)
|
for (u64 i = 0; i < mix_pcm.count; ++i)
|
||||||
{
|
{
|
||||||
result.samples[i] += mix_pcm.samples[i] * desc.volume;
|
result.samples[i] += mix_pcm.samples[i] * desc.volume;
|
||||||
@ -463,7 +459,6 @@ M_PcmF32 M_MixAllTracks(Arena *arena, u64 frame_count)
|
|||||||
}
|
}
|
||||||
|
|
||||||
//- Update track effect data
|
//- Update track effect data
|
||||||
|
|
||||||
{
|
{
|
||||||
__profn("Update track effect data");
|
__profn("Update track effect data");
|
||||||
P_Lock lock = P_LockE(&g->mutex);
|
P_Lock lock = P_LockE(&g->mutex);
|
||||||
|
|||||||
@ -84,7 +84,7 @@ Struct(P_FileMap)
|
|||||||
};
|
};
|
||||||
|
|
||||||
////////////////////////////////
|
////////////////////////////////
|
||||||
//~ Watch types
|
//~ Watch info types
|
||||||
|
|
||||||
typedef i32 P_WatchInfoKind; enum
|
typedef i32 P_WatchInfoKind; enum
|
||||||
{
|
{
|
||||||
@ -239,18 +239,18 @@ Struct(P_WindowEvent)
|
|||||||
{
|
{
|
||||||
P_WindowEventKind kind;
|
P_WindowEventKind kind;
|
||||||
|
|
||||||
/* P_WindowEventKind_BUTTON_DOWN */
|
/* P_WindowEventKind_ButtonDown */
|
||||||
/* P_WindowEventKind_BUTTON_UP */
|
/* P_WindowEventKind_ButtonUp */
|
||||||
P_Btn button;
|
P_Btn button;
|
||||||
b32 is_repeat;
|
b32 is_repeat;
|
||||||
|
|
||||||
/* P_WindowEventKind_TEXT */
|
/* P_WindowEventKind_Text */
|
||||||
u32 text_codepoint;
|
u32 text_codepoint;
|
||||||
|
|
||||||
/* P_WindowEventKind_CURSOR_MOVE */
|
/* P_WindowEventKind_CursorMove */
|
||||||
Vec2 cursor_position;
|
Vec2 cursor_position;
|
||||||
|
|
||||||
/* P_WindowEventKind_MOUSE_MOVE */
|
/* P_WindowEventKind_MouseMove */
|
||||||
Vec2 mouse_delta;
|
Vec2 mouse_delta;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user