Skip to content
This repository has been archived by the owner on Aug 11, 2024. It is now read-only.

fixed the setting if the camera parent isn't null and we're upgrading the rig #398

Merged
merged 3 commits into from
Nov 2, 2019

Conversation

StephenHodgson
Copy link
Contributor

No description provided.

…ad-upgrade

# Conflicts:
#	XRTK-Core/Packages/com.xrtk.core/Services/CameraSystem/DefaultCameraRig.cs
@SimonDarksideJ SimonDarksideJ merged commit d1430b9 into dev/UpdatedPlaySpacehead Nov 2, 2019
@SimonDarksideJ SimonDarksideJ deleted the fix/player-head-upgrade branch November 2, 2019 18:46
SimonDarksideJ added a commit that referenced this pull request Nov 3, 2019
…et automatically (#397)

* Updated changes to include a "Head" object to reposition the camera for platforms where Unity does not adjust camera height for a platform.  Height is gathered from the API (e.g. Oculus)

* Minor fix

* Moved Camera height configuration to CameraSystem profile
Exposed new Initial Height property
Added Pose Driver

* fixed the setting if the camera parent isn't null and we're upgrading the rig (#398)

* fixed the setting if the camera parent isn't null and we're upgrading the rig

* fixed formatting

* Updated patch following testing

* Better checking and cleanup.

Removed custom pose driver.

* missed a few things

* Fixed errors about duplicate destroys and camera parenting

* bit of cleanup

* Added back default head height

* Set height via property

* Initialize PlayspaceTransform in head setup

* updated flag on pose driver to UseRelativeTransform = true

added an additional check for interface type before attemtping to destroy the camera rig component

* Removed head transform

* Change Requests for playspace rig changes (#399)

* Better checking and cleanup.

Removed custom pose driver.

* missed a few things

* Fixed errors about duplicate destroys and camera parenting

* bit of cleanup

* Added back default head height

* Set height via property

* Initialize PlayspaceTransform in head setup

* updated flag on pose driver to UseRelativeTransform = true

added an additional check for interface type before attemtping to destroy the camera rig component

* Removed head transform

* Updated CameraSpace -> PlaySpace where applicable
Fixed Active check for CameraSystem

* Reverting system check change

* Updated controllers to use the Body transform

* updated body transform for use with controllers (#400)

* revert

* revert

* Updated teleport and spatial awareness systems

updated all the submodule checkouts
XRTK-Build-Bot pushed a commit that referenced this pull request Nov 3, 2019
…et automatically (#397)

* Updated changes to include a "Head" object to reposition the camera for platforms where Unity does not adjust camera height for a platform.  Height is gathered from the API (e.g. Oculus)

* Minor fix

* Moved Camera height configuration to CameraSystem profile
Exposed new Initial Height property
Added Pose Driver

* fixed the setting if the camera parent isn't null and we're upgrading the rig (#398)

* fixed the setting if the camera parent isn't null and we're upgrading the rig

* fixed formatting

* Updated patch following testing

* Better checking and cleanup.

Removed custom pose driver.

* missed a few things

* Fixed errors about duplicate destroys and camera parenting

* bit of cleanup

* Added back default head height

* Set height via property

* Initialize PlayspaceTransform in head setup

* updated flag on pose driver to UseRelativeTransform = true

added an additional check for interface type before attemtping to destroy the camera rig component

* Removed head transform

* Change Requests for playspace rig changes (#399)

* Better checking and cleanup.

Removed custom pose driver.

* missed a few things

* Fixed errors about duplicate destroys and camera parenting

* bit of cleanup

* Added back default head height

* Set height via property

* Initialize PlayspaceTransform in head setup

* updated flag on pose driver to UseRelativeTransform = true

added an additional check for interface type before attemtping to destroy the camera rig component

* Removed head transform

* Updated CameraSpace -> PlaySpace where applicable
Fixed Active check for CameraSystem

* Reverting system check change

* Updated controllers to use the Body transform

* updated body transform for use with controllers (#400)

* revert

* revert

* Updated teleport and spatial awareness systems

updated all the submodule checkouts
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants