Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
miniaudio
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
miniaudio
Commits
544ec856
Commit
544ec856
authored
Apr 02, 2021
by
David Reid
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Another attempt at fixing a spatialization error.
parent
6d414a35
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
29 additions
and
9 deletions
+29
-9
research/miniaudio_engine.h
research/miniaudio_engine.h
+29
-9
No files found.
research/miniaudio_engine.h
View file @
544ec856
...
@@ -1753,6 +1753,8 @@ MA_API void ma_engine_listener_set_velocity(ma_engine* pEngine, ma_uint32 listen
...
@@ -1753,6 +1753,8 @@ MA_API void ma_engine_listener_set_velocity(ma_engine* pEngine, ma_uint32 listen
MA_API
ma_vec3f
ma_engine_listener_get_velocity
(
const
ma_engine
*
pEngine
,
ma_uint32
listenerIndex
);
MA_API
ma_vec3f
ma_engine_listener_get_velocity
(
const
ma_engine
*
pEngine
,
ma_uint32
listenerIndex
);
MA_API
void
ma_engine_listener_set_cone
(
ma_engine
*
pEngine
,
ma_uint32
listenerIndex
,
float
innerAngleInRadians
,
float
outerAngleInRadians
,
float
outerGain
);
MA_API
void
ma_engine_listener_set_cone
(
ma_engine
*
pEngine
,
ma_uint32
listenerIndex
,
float
innerAngleInRadians
,
float
outerAngleInRadians
,
float
outerGain
);
MA_API
void
ma_engine_listener_get_cone
(
const
ma_engine
*
pEngine
,
ma_uint32
listenerIndex
,
float
*
pInnerAngleInRadians
,
float
*
pOuterAngleInRadians
,
float
*
pOuterGain
);
MA_API
void
ma_engine_listener_get_cone
(
const
ma_engine
*
pEngine
,
ma_uint32
listenerIndex
,
float
*
pInnerAngleInRadians
,
float
*
pOuterAngleInRadians
,
float
*
pOuterGain
);
MA_API
void
ma_engine_listener_set_world_up
(
ma_engine
*
pEngine
,
ma_uint32
listenerIndex
,
float
x
,
float
y
,
float
z
);
MA_API
ma_vec3f
ma_engine_listener_get_world_up
(
const
ma_engine
*
pEngine
,
ma_uint32
listenerIndex
);
MA_API
ma_result
ma_engine_play_sound
(
ma_engine
*
pEngine
,
const
char
*
pFilePath
,
ma_sound_group
*
pGroup
);
/* Fire and forget. */
MA_API
ma_result
ma_engine_play_sound
(
ma_engine
*
pEngine
,
const
char
*
pFilePath
,
ma_sound_group
*
pGroup
);
/* Fire and forget. */
...
@@ -9369,18 +9371,18 @@ MA_API ma_result ma_spatializer_process_pcm_frames(ma_spatializer* pSpatializer,
...
@@ -9369,18 +9371,18 @@ MA_API ma_result ma_spatializer_process_pcm_frames(ma_spatializer* pSpatializer,
axisX
=
ma_vec3f_neg
(
axisX
);
axisX
=
ma_vec3f_neg
(
axisX
);
}
}
#if
1
#if
0
{
{
m
[
0
][
0
]
=
axisX
.
x
;
m
[
0
][
1
]
=
axisY
.
x
;
m
[
0
][
2
]
=
axisZ
.
x
;
m
[
0
][
3
]
=
-
ma_vec3f_dot
(
axisX
,
pListener
->
position
)
;
m[0][0] = axisX.x;
m[0][1] = axisY.x; m[0][2] = axisZ.x; m[0][3] = 0
;
m
[
1
][
0
]
=
axisX
.
y
;
m
[
1
][
1
]
=
axisY
.
y
;
m
[
1
][
2
]
=
axisZ
.
y
;
m
[
1
][
3
]
=
-
ma_vec3f_dot
(
axisY
,
pListener
->
position
)
;
m[1][0] = axisX.y;
m[1][1] = axisY.y; m[1][2] = axisZ.y; m[1][3] = 0
;
m
[
2
][
0
]
=
axisX
.
z
;
m
[
2
][
1
]
=
axisY
.
z
;
m
[
2
][
2
]
=
axisZ
.
z
;
m
[
2
][
3
]
=
-
ma_vec3f_dot
(
axisZ
,
pListener
->
position
)
;
m[2][0] = axisX.z;
m[2][1] = axisY.z; m[2][2] = axisZ.z; m[2][3] = 0
;
m
[
3
][
0
]
=
0
;
m
[
3
][
1
]
=
0
;
m
[
3
][
2
]
=
0
;
m
[
3
][
3
]
=
1
;
m[3][0] =
-ma_vec3f_dot(axisX, pListener->position); m[3][1] = -ma_vec3f_dot(axisY, pListener->position); m[3][2] = -ma_vec3f_dot(axisZ, pListener->position);
m[3][3] = 1;
}
}
#else
#else
{
{
m
[
0
][
0
]
=
axisX
.
x
;
m
[
1
][
0
]
=
axis
Y
.
x
;
m
[
2
][
0
]
=
axisZ
.
x
;
m
[
3
][
0
]
=
-
ma_vec3f_dot
(
axisX
,
pListener
->
position
);
m
[
0
][
0
]
=
axisX
.
x
;
m
[
1
][
0
]
=
axis
X
.
y
;
m
[
2
][
0
]
=
axisX
.
z
;
m
[
3
][
0
]
=
-
ma_vec3f_dot
(
axisX
,
pListener
->
position
);
m
[
0
][
1
]
=
axis
X
.
y
;
m
[
1
][
1
]
=
axisY
.
y
;
m
[
2
][
1
]
=
axisZ
.
y
;
m
[
3
][
1
]
=
-
ma_vec3f_dot
(
axisY
,
pListener
->
position
);
m
[
0
][
1
]
=
axis
Y
.
x
;
m
[
1
][
1
]
=
axisY
.
y
;
m
[
2
][
1
]
=
axisY
.
z
;
m
[
3
][
1
]
=
-
ma_vec3f_dot
(
axisY
,
pListener
->
position
);
m
[
0
][
2
]
=
axis
X
.
z
;
m
[
1
][
2
]
=
axisY
.
z
;
m
[
2
][
2
]
=
axisZ
.
z
;
m
[
3
][
2
]
=
-
ma_vec3f_dot
(
axisZ
,
pListener
->
position
);
m
[
0
][
2
]
=
axis
Z
.
x
;
m
[
1
][
2
]
=
axisZ
.
y
;
m
[
2
][
2
]
=
axisZ
.
z
;
m
[
3
][
2
]
=
-
ma_vec3f_dot
(
axisZ
,
pListener
->
position
);
m
[
0
][
3
]
=
0
;
m
[
1
][
3
]
=
0
;
m
[
2
][
3
]
=
0
;
m
[
3
][
3
]
=
1
;
m
[
0
][
3
]
=
0
;
m
[
1
][
3
]
=
0
;
m
[
2
][
3
]
=
0
;
m
[
3
][
3
]
=
1
;
}
}
#endif
#endif
...
@@ -9391,7 +9393,7 @@ MA_API ma_result ma_spatializer_process_pcm_frames(ma_spatializer* pSpatializer,
...
@@ -9391,7 +9393,7 @@ MA_API ma_result ma_spatializer_process_pcm_frames(ma_spatializer* pSpatializer,
origin which makes things simpler.
origin which makes things simpler.
*/
*/
v
=
pSpatializer
->
position
;
v
=
pSpatializer
->
position
;
#if
1
#if
0
{
{
relativePos.x = m[0][0] * v.x + m[0][1] * v.y + m[0][2] * v.z + m[0][3] * 1;
relativePos.x = m[0][0] * v.x + m[0][1] * v.y + m[0][2] * v.z + m[0][3] * 1;
relativePos.y = m[1][0] * v.x + m[1][1] * v.y + m[1][2] * v.z + m[1][3] * 1;
relativePos.y = m[1][0] * v.x + m[1][1] * v.y + m[1][2] * v.z + m[1][3] * 1;
...
@@ -10854,6 +10856,24 @@ MA_API void ma_engine_listener_get_cone(const ma_engine* pEngine, ma_uint32 list
...
@@ -10854,6 +10856,24 @@ MA_API void ma_engine_listener_get_cone(const ma_engine* pEngine, ma_uint32 list
ma_spatializer_listener_get_cone
(
&
pEngine
->
listeners
[
listenerIndex
],
pInnerAngleInRadians
,
pOuterAngleInRadians
,
pOuterGain
);
ma_spatializer_listener_get_cone
(
&
pEngine
->
listeners
[
listenerIndex
],
pInnerAngleInRadians
,
pOuterAngleInRadians
,
pOuterGain
);
}
}
MA_API
void
ma_engine_listener_set_world_up
(
ma_engine
*
pEngine
,
ma_uint32
listenerIndex
,
float
x
,
float
y
,
float
z
)
{
if
(
pEngine
==
NULL
||
listenerIndex
>=
pEngine
->
listenerCount
)
{
return
;
}
ma_spatializer_listener_set_world_up
(
&
pEngine
->
listeners
[
listenerIndex
],
x
,
y
,
z
);
}
MA_API
ma_vec3f
ma_engine_listener_get_world_up
(
const
ma_engine
*
pEngine
,
ma_uint32
listenerIndex
)
{
if
(
pEngine
==
NULL
||
listenerIndex
>=
pEngine
->
listenerCount
)
{
return
ma_vec3f_init_3f
(
0
,
1
,
0
);
}
return
ma_spatializer_listener_get_world_up
(
&
pEngine
->
listeners
[
listenerIndex
]);
}
#ifndef MA_NO_RESOURCE_MANAGER
#ifndef MA_NO_RESOURCE_MANAGER
MA_API
ma_result
ma_engine_play_sound_ex
(
ma_engine
*
pEngine
,
const
char
*
pFilePath
,
ma_node
*
pNode
,
ma_uint32
nodeInputBusIndex
)
MA_API
ma_result
ma_engine_play_sound_ex
(
ma_engine
*
pEngine
,
const
char
*
pFilePath
,
ma_node
*
pNode
,
ma_uint32
nodeInputBusIndex
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment