Skip to content

Commit

Permalink
Merge branch 'feature/USD' into test/auto-unit-test
Browse files Browse the repository at this point in the history
  • Loading branch information
qbp758 committed Oct 2, 2023
2 parents 9ed9063 + c257eb9 commit b79f5c0
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion python/rainbow/util/USD.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,4 +102,4 @@ def set_animation_time(self, duration: float) -> None:
def save(self) -> None:
""" Save the scene to a USD file
"""
self.stage.GetRootLayer().Export(self.file_path)
self.stage.GetRootLayer().Export(self.file_path)
1 change: 1 addition & 0 deletions python/soft_body_app/hanging_beam_simulation.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@ def run():
app.initialize_usd('./hanging_beam_simulation.usda')
app.simulate(T = 5.0, update_viewer = False, non_update_bodies = ["wall"])


if __name__ == "__main__":
run()
1 change: 1 addition & 0 deletions python/soft_body_app/midpoint_traction_beam_simulation.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,6 @@ def center_beam(x):
app.initialize_usd('./midpoint_traction_beam_simulation.usda')
app.simulate(T = 5.0, update_viewer = False)


if __name__ == "__main__":
run()
3 changes: 2 additions & 1 deletion python/soft_body_app/soft_sheet.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def run():
app = SoftBodyApplication(time_step=0.0001)

# Create a soft material named "default_material"
app.create_soft_material("default_material", model_name="SNH")
app.create_soft_material("default_material")
app.set_friction_coefficient("default_material", "default_material", 0.5)
app.set_damping_coefficient("default_material", 0.5)

Expand All @@ -30,5 +30,6 @@ def run():
app.initialize_usd('./soft_sheet.usda')
app.simulate(T = 5.0, update_viewer = False)


if __name__ == "__main__":
run()
2 changes: 1 addition & 1 deletion python/unit_tests/test_utils_USD.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,4 @@ def test_set_animation_time(self):
), duration, "Animation time was not set correctly.")

if __name__ == "__main__":
unittest.main()
unittest.main()

0 comments on commit b79f5c0

Please sign in to comment.