Skip to content

Fix NumPy 2.x scalar type errors in locomotion demos #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Tagrikli wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix NumPy 2.x scalar type errors in locomotion demos #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions Demos/Locomotion/Biped/Sequence.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@ def GetIndexPair(self, timestamp: float):
0.0,
self.Timestamps.size - 1,
)
ratio = Tensor.Clamp(ratio, 0.0, self.Timestamps.size - 1)
ratio = Tensor.Clamp(ratio, 0.0, self.Timestamps.size - 1).item()
a = int(math.floor(ratio))
b = int(math.ceil(ratio))
w = Utility.Ratio(timestamp, self.Timestamps[a], self.Timestamps[b])
w = Tensor.Clamp(w, 0.0, 1.0)
w = Tensor.Clamp(w, 0.0, 1.0).item()
return a, b, w

def GetLength(self):
Expand Down
4 changes: 2 additions & 2 deletions Demos/Locomotion/Quadruped/Sequence.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@ def GetIndexPair(self, timestamp: float):
0.0,
self.Timestamps.size - 1,
)
ratio = Tensor.Clamp(ratio, 0.0, self.Timestamps.size - 1)
ratio = Tensor.Clamp(ratio, 0.0, self.Timestamps.size - 1).item()
a = int(math.floor(ratio))
b = int(math.ceil(ratio))
w = Utility.Ratio(timestamp, self.Timestamps[a], self.Timestamps[b])
w = Tensor.Clamp(w, 0.0, 1.0)
w = Tensor.Clamp(w, 0.0, 1.0).item()
return a, b, w

def GetLength(self):
Expand Down
6 changes: 5 additions & 1 deletion ai4animation/Standalone/GUI.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,11 @@ def Screen(self):
return Rectangle(x, y, w, h)

def Tuple(self):
return (self.x, self.y, self.width, self.height)
def to_scalar(v):
if hasattr(v, "item"):
return v.item()
return float(v)
return (to_scalar(self.x), to_scalar(self.y), to_scalar(self.width), to_scalar(self.height))

def Copy(self):
return Rectangle(self.x, self.y, self.width, self.height)
Expand Down