From eaa3f9df2a82b3b67a2b36225c2c0a6b7d0a0f3e Mon Sep 17 00:00:00 2001 From: Quanyi Li Date: Fri, 19 Jan 2024 14:13:34 +0000 Subject: [PATCH] Fix birdeye view (#601) * fix-API * time me to utils * fix main camera --- metadrive/engine/core/main_camera.py | 5 ++--- metadrive/utils/__init__.py | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/metadrive/engine/core/main_camera.py b/metadrive/engine/core/main_camera.py index 4b35c5873..0e18b9f3c 100644 --- a/metadrive/engine/core/main_camera.py +++ b/metadrive/engine/core/main_camera.py @@ -178,11 +178,10 @@ def set_bird_view_pos_hpr(self, position, hpr=None): Returns: """ - self.set_bird_view_pos_hpr(position) if self.engine.task_manager.hasTaskNamed(self.TOP_DOWN_TASK_NAME): # adjust hpr - p_pos = panda_vector(position) - self.camera_x, self.camera_y = p_pos[0], p_pos[1] + p_pos = panda_vector(position, self.engine.global_config["top_down_camera_initial_z"]) + self.camera_x, self.camera_y, self.top_down_camera_height = p_pos[0], p_pos[1], p_pos[2] self.camera_hpr = hpr or [0, 0, 0] self.engine.task_manager.add(self._top_down_task, self.TOP_DOWN_TASK_NAME, extraArgs=[], appendTask=True) diff --git a/metadrive/utils/__init__.py b/metadrive/utils/__init__.py index 0f42e0dd8..67c397704 100644 --- a/metadrive/utils/__init__.py +++ b/metadrive/utils/__init__.py @@ -1,6 +1,5 @@ from inspect import getsource from textwrap import dedent - import pygame from PIL import Image from pygments import highlight @@ -15,7 +14,7 @@ from metadrive.utils.random_utils import get_np_random, random_string from metadrive.utils.registry import get_metadrive_class from metadrive.utils.utils import is_mac, import_pygame, recursive_equal, setup_logger, merge_dicts, \ - concat_step_infos, is_win + concat_step_infos, is_win, time_me def generate_gif(frames, gif_name="demo.gif", is_pygame_surface=False, duration=30):