Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/asset-conversion' into asset-con…
Browse files Browse the repository at this point in the history
…version
  • Loading branch information
cremebrule committed Dec 12, 2024
2 parents c71dda8 + 541b15c commit a375fca
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
4 changes: 2 additions & 2 deletions omnigibson/examples/robots/import_custom_robot.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@
Helper script to download OmniGibson dataset and assets.
"""

import xml.etree.ElementTree as ET
from copy import deepcopy
from pathlib import Path

import click
import torch as th
import yaml
from addict import Dict
import xml.etree.ElementTree as ET

import omnigibson as og
import omnigibson.lazy as lazy
import omnigibson.utils.transform_utils as T
from omnigibson.macros import gm
from omnigibson.utils.asset_conversion_utils import (
_add_xform_properties,
_space_string_to_tensor,
find_all_prim_children_with_type,
import_og_asset_from_urdf,
_space_string_to_tensor,
)
from omnigibson.utils.python_utils import assert_valid_key
from omnigibson.utils.usd_utils import create_joint, create_primitive_mesh
Expand Down
4 changes: 3 additions & 1 deletion tests/test_object_states.py
Original file line number Diff line number Diff line change
Expand Up @@ -664,7 +664,9 @@ def test_toggled_on(env):
stove = env.scene.object_registry("name", "stove")
robot = env.robots[0]

stove.set_position_orientation([1.505, 0.3, 0.443], T.euler2quat(th.tensor([0, 0, -math.pi / 2.0], dtype=th.float32)))
stove.set_position_orientation(
[1.505, 0.3, 0.443], T.euler2quat(th.tensor([0, 0, -math.pi / 2.0], dtype=th.float32))
)
robot.set_position_orientation(position=[0.0, 0.38, 0.0], orientation=[0, 0, 0, 1])

assert not stove.states[ToggledOn].get_value()
Expand Down

0 comments on commit a375fca

Please sign in to comment.