Skip to content
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.

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

Upgrade to isaac sim 4.2 & VR #906

Draft
wants to merge 46 commits into
base: og-develop
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
4c9d1e1
Upgrade to isaac sim 4.2
hang-yin Sep 25, 2024
13fe889
Add version 4.2 to KIT_FILES
hang-yin Sep 25, 2024
36dee3b
Merge branch 'og-develop' of https://github.com/StanfordVL/OmniGibson…
hang-yin Oct 2, 2024
5c2d25a
Merge branch 'og-develop' of https://github.com/StanfordVL/OmniGibson…
hang-yin Oct 3, 2024
5cddc03
Fix ObjectsInFOVOfRobot test
hang-yin Oct 7, 2024
14051b2
Isaac 4 2 update
hang-yin Oct 7, 2024
c303a0b
Deprecate projection emitter
hang-yin Oct 7, 2024
ffdce57
Retrieve default shader input from shader node
hang-yin Oct 7, 2024
1e13d9e
Merge branch 'og-develop' into isaac_4_2
hang-yin Oct 7, 2024
aab3b3b
Unbreak ObjectsInFOVOfRobot test
hang-yin Oct 7, 2024
1e04111
Fix transform util
hang-yin Oct 7, 2024
8a7f3af
Fix material prim shader input bug
hang-yin Oct 8, 2024
c8cf5b9
Rename shader_input_names_by_type
hang-yin Oct 8, 2024
99f0999
Update robot pictures
hang-yin Oct 8, 2024
c210870
Mist effect initial implementation
hang-yin Oct 23, 2024
d03bfd4
VR scene tour demo without robot control
hang-yin Oct 31, 2024
4aeed8f
VR robot control with A1 demo
hang-yin Oct 31, 2024
97e85cc
Small infra changes for VR teleop
hang-yin Oct 31, 2024
552d87c
Teleop utils refactor, WIP
hang-yin Oct 31, 2024
90efba5
Update 4-2-0 kit file to include vr/xr extension
hang-yin Oct 31, 2024
2e6e63a
Merge branch 'isaac_4_2' of https://github.com/StanfordVL/OmniGibson …
hang-yin Nov 4, 2024
bc74a5c
WIP
hang-yin Nov 27, 2024
8f41145
Merge branch 'asset-conversion' of https://github.com/StanfordVL/Omni…
hang-yin Nov 27, 2024
bf3c2f9
Minor updates
hang-yin Dec 2, 2024
cfb5f30
Merge branch 'isaac_4_2' of https://github.com/StanfordVL/OmniGibson …
hang-yin Dec 2, 2024
f30bf9e
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 2, 2024
397a34d
Clean up vr utils
hang-yin Dec 3, 2024
0d808f2
Merge branch 'feat/np-opt' of https://github.com/StanfordVL/OmniGibso…
hang-yin Dec 4, 2024
54a351d
Allow headset to follow xformprim
hang-yin Dec 5, 2024
e73e1ab
Merge branch 'feat/np-opt' of https://github.com/StanfordVL/OmniGibso…
hang-yin Dec 5, 2024
d8d009e
Merge branch 'feat/np-opt' of https://github.com/StanfordVL/OmniGibso…
hang-yin Dec 5, 2024
20d4da2
Numpy optimization and data collection wrapper bug fixes
hang-yin Dec 9, 2024
4377a57
Allow VR free head orientation motion; optimize VR for data collection
hang-yin Dec 9, 2024
deccf82
Add view angle limits to VR
hang-yin Dec 12, 2024
40cc3f0
Merge branch 'og-develop' of https://github.com/StanfordVL/OmniGibson…
hang-yin Dec 17, 2024
f455421
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 17, 2024
ffa72bc
Merge branch 'feat/np-opt' of https://github.com/StanfordVL/OmniGibso…
hang-yin Dec 18, 2024
1c57085
Tiny bug fixes
hang-yin Dec 18, 2024
7d02e86
Merge branch 'isaac_4_2' of https://github.com/StanfordVL/OmniGibson …
hang-yin Dec 18, 2024
9615cd6
Write videos with data wrapper
hang-yin Dec 20, 2024
c10ed28
Add recording flag to data wrapper and VR support
hang-yin Dec 20, 2024
e935957
tmp fix
hang-yin Jan 19, 2025
f2c154a
Merge branch 'feat/data-wrapper-vr' of https://github.com/StanfordVL/…
hang-yin Jan 20, 2025
de6850c
TMP changes
hang-yin Jan 21, 2025
e944a68
quick change
hang-yin Jan 21, 2025
c73e7b8
tmp changes
hang-yin Jan 22, 2025
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
Prev Previous commit
Next Next commit
tmp fix
  • Loading branch information
hang-yin committed Jan 19, 2025
commit e9359571e826f383cd09a19400fd2e93fe6790f3
17 changes: 10 additions & 7 deletions omnigibson/tasks/behavior_task.py
Original file line number Diff line number Diff line change
Expand Up @@ -359,13 +359,16 @@ def assign_object_scope_with_cache(self, env):
if obj_inst in self.future_obj_instances:
entity = None
else:
assert obj_inst in inst_to_name, (
f"BDDL object instance {obj_inst} should exist in cached metadata "
f"from loaded scene, but could not be found!"
)
name = inst_to_name[obj_inst]
is_system = name in env.scene.available_systems.keys()
entity = env.scene.get_system(name) if is_system else env.scene.object_registry("name", name)
if obj_inst == "agent.n.01_1":
entity = self.get_agent(env)
else:
assert obj_inst in inst_to_name, (
f"BDDL object instance {obj_inst} should exist in cached metadata "
f"from loaded scene, but could not be found!"
)
name = inst_to_name[obj_inst]
is_system = name in env.scene.available_systems.keys()
entity = env.scene.get_system(name) if is_system else env.scene.object_registry("name", name)
self.object_scope[obj_inst] = BDDLEntity(
bddl_inst=obj_inst,
entity=entity,
Expand Down