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.

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

Update to 4.26 #441

Open
wants to merge 15 commits into
base: develop
Choose a base branch
from
Open

Update to 4.26 #441

Changes from 2 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9973555
Update arguments on Linux to use new offscreen rendering method
vinhowe Jan 22, 2021
64d5faf
Fix typo
vinhowe Jan 22, 2021
54bce84
Add untested Windows support for offscreen rendering
vinhowe Jan 23, 2021
86fb5e3
Merge branch 'develop' into 4.26
vinhowe Jan 27, 2021
93cd2bb
Remove reference to unused variable environment
vinhowe Jan 28, 2021
f5c8655
Add test image baseline updates
vinhowe Jan 28, 2021
6681cf6
Use the cv2 import that the IDE likes better
vinhowe Jan 28, 2021
2ae4ddc
Add an extra tick for handagent to move in tests
vinhowe Jan 29, 2021
f2b09e6
Update for https://github.com/BYU-PCCL/holodeck-engine/pull/217
vinhowe Jan 29, 2021
8fc86fb
Merge branch 'develop' into 4.26
vinhowe Apr 29, 2021
4cf16e6
Merge branch 'develop' into 4.26
vinhowe Apr 29, 2021
689cc41
Update dev version for 4.26 dev build
vinhowe Apr 29, 2021
2398095
Fix environment setup for IMU tests
vinhowe Apr 29, 2021
531c6e5
Make IMU resting test wait longer
vinhowe Apr 29, 2021
74d15cc
Make Black happy
vinhowe Apr 29, 2021
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
25 changes: 15 additions & 10 deletions src/holodeck/environments.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,16 +606,21 @@ def __linux_start_process__(self, binary_path, task_key, gl_version, verbose,
loading_semaphore = \
posix_ipc.Semaphore('/HOLODECK_LOADING_SEM' + self._uuid, os.O_CREAT | os.O_EXCL,
initial_value=0)
# Copy the environment variables and remove the DISPLAY variable to hide viewport
# https://answers.unrealengine.com/questions/815764/in-the-release-notes-it-says-the-engine-can-now-cr.html?sort=oldest
environment = dict(os.environ.copy())
if not show_viewport and 'DISPLAY' in environment:
del environment['DISPLAY']
arguments = [binary_path, task_key, '-HolodeckOn',
'-LOG=HolodeckLog.txt', '-ForceRes', '-ResX=' + str(self._window_size[1]),
'-ResY=' + str(self._window_size[0]), '--HolodeckUUID=' + self._uuid,
'-TicksPerSec=' + str(self._ticks_per_sec)]
if not show_viewport:
arguments.append('-RenderOffScreen')
vinhowe marked this conversation as resolved.
Show resolved Hide resolved

# Copy the environment variables and remove the DISPLAY variable to hide viewport
# https://answers.unrealengine.com/questions/815764/in-the-release-notes-it-says-the-engine-can-now-cr.html?sort=oldest
environment = dict(os.environ.copy())
if 'DISPLAY' in environment:
del environment['DISPLAY']

self._world_process = \
subprocess.Popen([binary_path, task_key, '-HolodeckOn', '-opengl' + str(gl_version),
'-LOG=HolodeckLog.txt', '-ForceRes', '-ResX=' + str(self._window_size[1]),
'-ResY=' + str(self._window_size[0]), '--HolodeckUUID=' + self._uuid,
'-TicksPerSec=' + str(self._ticks_per_sec)],
subprocess.Popen(arguments,
stdout=out_stream,
stderr=out_stream,
env=environment)
Expand All @@ -626,7 +631,7 @@ def __linux_start_process__(self, binary_path, task_key, gl_version, verbose,
loading_semaphore.acquire(10)
except posix_ipc.BusyError:
raise HolodeckException("Timed out waiting for binary to load. Ensure that holodeck is "
"not being run with root priveleges.")
"not being run with root privileges.")
loading_semaphore.unlink()
loading_semaphore.close()

Expand Down