Skip to content

Commit 80f8e31

Browse files
authored
(bugfix): remove direct usage of hsim_bindings for audio and fix missing reexports (#1788)
* Remove direct usage of hsim_bindings for audio and fix missing reexports * Add one more missing reexport * Add missing stub
1 parent 9fa1333 commit 80f8e31

5 files changed

Lines changed: 8 additions & 4 deletions

File tree

examples/tutorials/audio_agent.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
from numpy import ndarray # noqa: F401
1010

1111
import habitat_sim
12-
import habitat_sim._ext.habitat_sim_bindings as hsim_bindings
1312
import habitat_sim.sensor
1413
import habitat_sim.sim
1514

@@ -36,13 +35,13 @@ def main():
3635
with habitat_sim.Simulator(cfg) as sim:
3736

3837
# create the acoustic configs
39-
acoustics_config = hsim_bindings.RLRAudioPropagationConfiguration()
38+
acoustics_config = habitat_sim.sensor.RLRAudioPropagationConfiguration()
4039
acoustics_config.enableMaterials = True
4140

4241
# create channel layout
43-
channel_layout = hsim_bindings.RLRAudioPropagationChannelLayout()
42+
channel_layout = habitat_sim.sensor.RLRAudioPropagationChannelLayout()
4443
channel_layout.channelType = (
45-
hsim_bindings.RLRAudioPropagationChannelLayoutType.Binaural
44+
habitat_sim.sensor.RLRAudioPropagationChannelLayoutType.Binaural
4645
)
4746
channel_layout.channelCount = 2
4847

src/esp/bindings/SensorBindings.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,7 @@ void initSensorBindings(py::module& m) {
412412
py::class_<AudioEmptyStubChannelLayoutClass>(
413413
m, "RLRAudioPropagationChannelLayout")
414414
.def(py::init<>());
415+
m.attr("RLRAudioPropagationChannelLayoutType") = py::none();
415416
#endif // ESP_BUILD_WITH_AUDIO
416417

417418
#ifdef ESP_BUILD_WITH_AUDIO

src_python/habitat_sim/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@
8686
FisheyeSensorModelType,
8787
FisheyeSensorSpec,
8888
RLRAudioPropagationChannelLayout,
89+
RLRAudioPropagationChannelLayoutType,
8990
RLRAudioPropagationConfiguration,
9091
Sensor,
9192
SensorFactory,

src_python/habitat_sim/bindings/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
PathFinder,
2929
RigidState,
3030
RLRAudioPropagationChannelLayout,
31+
RLRAudioPropagationChannelLayoutType,
3132
RLRAudioPropagationConfiguration,
3233
SceneGraph,
3334
SceneNode,

src_python/habitat_sim/sensor.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
FisheyeSensorSpec,
1818
Observation,
1919
RLRAudioPropagationChannelLayout,
20+
RLRAudioPropagationChannelLayoutType,
2021
RLRAudioPropagationConfiguration,
2122
Sensor,
2223
SensorFactory,
@@ -49,5 +50,6 @@
4950
"AudioSensorSpec",
5051
"AudioSensor",
5152
"RLRAudioPropagationChannelLayout",
53+
"RLRAudioPropagationChannelLayoutType",
5254
"RLRAudioPropagationConfiguration",
5355
]

0 commit comments

Comments
 (0)