Skip to content

Commit 6bd6182

Browse files
committed
Revert "Add teapot asset for Newton MPM demo"
This reverts commit 7c3f4c9.
1 parent df54acf commit 6bd6182

4 files changed

Lines changed: 4 additions & 15 deletions

File tree

.gitattributes

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
*.usd filter=lfs diff=lfs merge=lfs -text
22
*.usda filter=lfs diff=lfs merge=lfs -text
3-
*.usdc filter=lfs diff=lfs merge=lfs -text
43
*.psd filter=lfs diff=lfs merge=lfs -text
54
*.hdr filter=lfs diff=lfs merge=lfs -text
65
*.dae filter=lfs diff=lfs merge=lfs -text

scripts/demos/newton_cup_pour_mpm.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,9 @@
132132
CUP_ASSET_PATH = f"{CUP_BODY_PATH}/Asset"
133133
GROUND_PATH = "/World/Ground"
134134
VISUALS_PATH = "/World/Visuals"
135-
TEAPOT_USD_REL_PATH = "Props/Teapot/teapot_hollow_separate_lid.usdc"
135+
TEAPOT_USD_PATH = (
136+
"/home/maximiliank/Work/IsaacLab/source/isaaclab_assets/isaaclab_assets/rand/teapot_hollow_separate_lid.usdc"
137+
)
136138

137139
TABLE_TOP_Z = 0.85
138140
TABLE_HALF_EXTENTS = (0.85, 0.55, 0.03)
@@ -248,12 +250,7 @@ def cup_pose_at_time(sim_time: float) -> tuple[np.ndarray, np.ndarray, np.ndarra
248250
def get_teapot_usd_path() -> str:
249251
"""Return the local hollow teapot USD asset path."""
250252

251-
if args_cli.teapot_usd is not None:
252-
usd_path = os.path.abspath(args_cli.teapot_usd)
253-
else:
254-
from isaaclab_assets import ISAACLAB_ASSETS_DATA_DIR
255-
256-
usd_path = os.path.join(ISAACLAB_ASSETS_DATA_DIR, TEAPOT_USD_REL_PATH)
253+
usd_path = os.path.abspath(args_cli.teapot_usd or TEAPOT_USD_PATH)
257254
if not os.path.exists(usd_path):
258255
raise FileNotFoundError(
259256
f"Teapot USD not found: {usd_path}. Pass --teapot-usd with the local hollow teapot asset path."

source/isaaclab_assets/changelog.d/max-newton-mpm-manager.rst

Lines changed: 0 additions & 4 deletions
This file was deleted.

source/isaaclab_assets/data/Props/Teapot/teapot_hollow_separate_lid.usdc

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)