Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified data/screenshots/metadata.pickle
Binary file not shown.
File renamed without changes
8 changes: 4 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
torch
numpy
torch==2.3
numpy<2.0
matplotlib
nptyping
nptyping==1.4.4
panda3d
pandas
sklearn
scikit-learn
torchvision
memory_profiler
seaborn
Expand Down
6 changes: 2 additions & 4 deletions src/simulator/services/resources/smart_unpickle.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,8 @@ class Size(NamedTuple):
width: int
height: int

class _PointMetaClass(type(NamedTuple), type(torch.Tensor)):
pass

class Point(NamedTuple, torch.Tensor, metaclass=_PointMetaClass):
# 修复元类定义,适配Python 3.8+
class Point(NamedTuple):
x: int
y: int

Expand Down
11 changes: 3 additions & 8 deletions src/simulator/views/gui/simulator_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,7 @@ def __init__(self, services: Services, mouse1_press_callbacks: List[Callable[[],
self.__services.ev_manager.register_listener(self)
self.__base = self.__services.graphics.window
self.__text = " t - find the path between the agent and goal\n\n" \
" mouse click - moves agent to mouse location \n\n mouse right click - moves goal to" \
" mouse location\n\n arrow keys, PgUp, PgDn - move agent / goal (Alt down)\n\n x - toggle trace" \
" animation (animations required)\n\n m - toggle map between Sparse and Dense\n\n o - take a " \
"default screenshot of the map\n\n p - take a custom screenshot of the scene\n\n w, a, s, d " \
"- orbit around the map\n\n q - top view of the map\n\n c, v - toggle Simulator Configuration /" \
" View Editor\n\n i - toggle Debug Overlay"
" mouse click - moves agent to mouse location\n\n mouse right click - moves goal to mouse location\n\n arrow keys, PgUp, PgDn - move agent / goal (Alt down)\n\n x - toggle trace animation (animations required)\n\n m - toggle map between Sparse and Dense\n\n o - take a default screenshot of the map\n\n p - take a custom screenshot of the scene\n\n w, a, s, d - orbit around the map\n\n q - top view of the map\n\n c, v - toggle Simulator Configuration / View Editor\n\n i - toggle Debug Overlay"

self.__algorithms = self.__services.settings.algorithms
self.__maps = self.__services.settings.maps
Expand All @@ -61,7 +56,7 @@ def __init__(self, services: Services, mouse1_press_callbacks: List[Callable[[],
borderWidth=(0.0, 0.0),
frameColor=WINDOW_BG_COLOUR,
pos=(-1, 0.5, 0.5),
frameSize=(-1.7, 1.3, -5.68, 0.85)
frameSize=(-1.7, 1.3, -6.2, 0.85)
)
# spacer #
DirectFrame(parent=self.__window.frame,
Expand Down Expand Up @@ -123,7 +118,7 @@ def __init__(self, services: Services, mouse1_press_callbacks: List[Callable[[],
text_align=TextNode.ALeft,
borderWidth=(.0, .0),
pos=(-1.55, 0.0, -3.2),
scale=(0.11, 1.1, 0.11))
scale=(0.14, 1.4, 0.14))

self.map_label = DirectLabel(parent=self.__window.frame,
text="Map:",
Expand Down