Skip to content

Commit

Permalink
Update to v1.12.0
Browse files Browse the repository at this point in the history
* New Features
  - Add support for Wave XR Plugin
  - Add support for OpenVR XR Plugin preview4 and above
  - Add support for Oculus Link Quest

* Changes
  - Move VIUSettings.asset default path to folder under Assets\VIUSettings\Resources

* Bug Fixes
  - Optimize performance updating define symbols #186
  - Fix recommended settings did not skip check for values that are already using recommended value
  - Fix compile error when using Oculus Integration Unity Plugin v19 and above
  - Fix losing materials in example scenes when Universal Render Pipeline is applied
  - Fix GetReferencedAssemblyNameSet() for Unity 2017.3 and 2017.4
  - Fix SymbolRequirement.reqAnyMethods validation throwing exception when any argument type not found
  - Fix UnityWebRequest.SendWebRequest() in early Unity version (5.4 - 2017.1)

* Known Issue
  - Importing Oculus Integration v19 before upgrading VIU to v1.12.0 will cause compile error and brake VIUSettings.
    - Workaround: manually clear the "Scripting Define Symbols" in Player Settings should solve it
  • Loading branch information
lawwong committed Aug 11, 2020
2 parents e229b68 + cdbb717 commit dfcd064
Show file tree
Hide file tree
Showing 62 changed files with 2,593 additions and 304 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VIUProjectSettings.asset.

*.cfg
*.log
*.json
*.vrmanifest

!package.json
Expand Down
149 changes: 149 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
stages:
- editor
- build

variables:
UNITY_COMMAND: "xvfb-run --auto-servernum --server-args='-screen 0 640x480x24' /opt/Unity/Editor/Unity -batchmode -nographics -logfile /dev/stdout -quit"
BUILD_SCENE_PATH: 'Assets/HTC.UnityPlugin/ViveInputUtility/Examples/1.UGUI/UGUI.unity'
BUILD_OUTPUT_FOLDER: 'Builds/Win64'
BUILD_OUTPUT_NAME: 'UGUI.exe'

.unity_activate: &unity_activate
eval ${UNITY_COMMAND} -username "${UNITY_EMAIL}" -password "${UNITY_PASSWORD}" -serial "${UNITY_SERIAL}"

.unity_return_license: &unity_return_license
eval ${UNITY_COMMAND} -returnLicense

.unity_template: &unity_template
image: gableroux/unity3d:${IMAGE_TAG}
cache:
key: "${CI_PROJECT_ID}-${CI_COMMIT_REF_SLUG}-${CI_JOB_NAME}"
paths:
- "Library/"

before_script:
- *unity_activate

script:
- eval ${UNITY_COMMAND} -projectPath='.'

after_script:
- *unity_return_license

.build_win64_unity_template: &build_win64_unity_template
<<: *unity_template

artifacts:
name: 'Win64'
expire_in: 1 week
paths:
- ${BUILD_OUTPUT_FOLDER}

script:
- eval ${UNITY_COMMAND} -projectPath='.' -executeMethod HTC.UnityPlugin.Vive.BuildUtils.Build ${BUILD_SCENE_PATH} ${BUILD_OUTPUT_FOLDER}/${BUILD_OUTPUT_NAME} 'StandaloneWindows64'

.no_asmdef_unity_template: &no_asmdef_unity_template
<<: *unity_template

before_script:
- find './Assets/HTC.UnityPlugin/' -type f -name '*.asmdef*' -delete
- find './Assets/HTC.UnityPlugin/' -type f -name '*.asmref*' -delete
- *unity_activate

.no_asmdef_build_win64_unity_template: &no_asmdef_build_win64_unity_template
<<: *build_win64_unity_template

before_script:
- find './Assets/HTC.UnityPlugin/' -type f -name '*.asmdef*' -delete
- find './Assets/HTC.UnityPlugin/' -type f -name '*.asmref*' -delete
- *unity_activate

editor:5.6.3-asset:
<<: *no_asmdef_unity_template
stage: editor
variables:
IMAGE_TAG: '5.6.3f1'

editor:2017.4-asset:
<<: *no_asmdef_unity_template
stage: editor
variables:
IMAGE_TAG: '2017.4.27f1-windows'

editor:2018.2-asset:
<<: *no_asmdef_unity_template
stage: editor
variables:
IMAGE_TAG: '2018.2.21f1-windows'

editor:2018.4-asset:
<<: *no_asmdef_unity_template
stage: editor
variables:
IMAGE_TAG: '2018.4.24f1-windows'

editor:2019.1-asset:
<<: *no_asmdef_unity_template
stage: editor
variables:
IMAGE_TAG: '2019.1.14f1-windows'

editor:2019.4-asset:
<<: *no_asmdef_unity_template
stage: editor
variables:
IMAGE_TAG: '2019.4.2f1-windows'

editor:2020.1-asset:
<<: *no_asmdef_unity_template
stage: editor
variables:
IMAGE_TAG: '2020.1.0f1-windows'

editor:2019.4-package:
<<: *unity_template
stage: editor
variables:
IMAGE_TAG: '2019.4.2f1-windows'

editor:2020.1-package:
<<: *unity_template
stage: editor
variables:
IMAGE_TAG: '2020.1.0f1-windows'

build:2018.4-asset-win64:
<<: *no_asmdef_build_win64_unity_template
stage: build
variables:
IMAGE_TAG: '2018.4.24f1-windows'

build:2019.2-asset-win64:
<<: *no_asmdef_build_win64_unity_template
stage: build
variables:
IMAGE_TAG: '2019.2.20f1-windows'

build:2019.4-asset-win64:
<<: *no_asmdef_build_win64_unity_template
stage: build
variables:
IMAGE_TAG: '2019.4.2f1-windows'

build:2020.1-asset-win64:
<<: *no_asmdef_build_win64_unity_template
stage: build
variables:
IMAGE_TAG: '2020.1.0f1-windows'

build:2019.4-package-win64:
<<: *build_win64_unity_template
stage: build
variables:
IMAGE_TAG: '2019.4.2f1-windows'

build:2020.1-package-win64:
<<: *build_win64_unity_template
stage: build
variables:
IMAGE_TAG: '2020.1.0f1-windows'
3 changes: 2 additions & 1 deletion Assets/HTC.UnityPlugin/HTC.ViveInputUtility.asmdef
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"Oculus.Avatar",
"Oculus.VR",
"Oculus.Platform",
"UnityEngine.SpatialTracking"
"UnityEngine.SpatialTracking",
"Unity.XR.OpenVR"
],
"includePlatforms": [],
"excludePlatforms": [],
Expand Down
8 changes: 8 additions & 0 deletions Assets/HTC.UnityPlugin/UPMRegistryTool.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Assets/HTC.UnityPlugin/UPMRegistryTool/Editor.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Assets/HTC.UnityPlugin/UPMRegistryTool/Editor/Resources.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
Copyright 2016-2020, HTC Corporation. All rights reserved.

The works ("Work") herein refer to the software developed or owned by
HTC Corporation ("HTC") under the terms of the license. The information
contained in the Work is the exclusive property of HTC. HTC grants the
legal user the right to use the Work within the scope of the legitimate
development of software. No further right is granted under this license,
including but not limited to, distribution, reproduction and
modification. Any other usage of the Works shall be subject to the
written consent of HTC.

The use of the Work is permitted provided that the following conditions
are met:
* The Work is used in a source code form must retain the above
copyright notice, this list of conditions and the following
disclaimer.
* The Work is used in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distributions.
* Neither HTC nor the names of its contributors may be used to
endorse or promote products derived from this software without
specific prior written permission.

THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER
DEALINGS IN THE WORK.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2096d9bc8547a3345935dcce472f5d3b, type: 3}
m_Name: RegistryToolSettings
m_EditorClassIdentifier:
ProjectManifestPath: Packages/manifest.json
LicenseResourcePath: LICENSE
ViveRegistry:
name: VIVE
url: https://npm-registry.vive.com
scopes:
- com.htc.upm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Assets/HTC.UnityPlugin/UPMRegistryTool/Editor/Scripts.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit dfcd064

Please sign in to comment.