diff --git a/habitat/config/default.py b/habitat/config/default.py index 8a813685543c69cc0bca0512d74bf03c7021add9..044c49dcd87afdf108ea5e0e83b7b03319b9af6e 100644 --- a/habitat/config/default.py +++ b/habitat/config/default.py @@ -249,6 +249,10 @@ _C.SIMULATOR.HABITAT_SIM_V0.GPU_DEVICE_ID = 0 _C.SIMULATOR.HABITAT_SIM_V0.GPU_GPU = False # Whether or not the agent slides on collisions _C.SIMULATOR.HABITAT_SIM_V0.ALLOW_SLIDING = True +_C.SIMULATOR.HABITAT_SIM_V0.ENABLE_PHYSICS = False +_C.SIMULATOR.HABITAT_SIM_V0.PHYSICS_CONFIG_FILE = ( + "./data/default.phys_scene_config.json" +) # ----------------------------------------------------------------------------- # PYROBOT # ----------------------------------------------------------------------------- diff --git a/habitat/sims/habitat_simulator/habitat_simulator.py b/habitat/sims/habitat_simulator/habitat_simulator.py index 2487c97f6aab9e79186dd3acbf33d27ccf9bf0c3..ba3b820672ec759852ab149f6595e97d91ebcf59 100644 --- a/habitat/sims/habitat_simulator/habitat_simulator.py +++ b/habitat/sims/habitat_simulator/habitat_simulator.py @@ -178,6 +178,10 @@ class HabitatSim(Simulator): sim_config.scene.id = self.config.SCENE sim_config.gpu_device_id = self.config.HABITAT_SIM_V0.GPU_DEVICE_ID sim_config.allow_sliding = self.config.HABITAT_SIM_V0.ALLOW_SLIDING + sim_config.enable_physics = self.config.HABITAT_SIM_V0.ENABLE_PHYSICS + sim_config.physics_config_file = ( + self.config.HABITAT_SIM_V0.PHYSICS_CONFIG_FILE + ) agent_config = habitat_sim.AgentConfiguration() overwrite_config( config_from=self._get_agent_config(), config_to=agent_config