Skip to content

Commit dfcd064

Browse files
committed
Update to v1.12.0
* 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
2 parents e229b68 + cdbb717 commit dfcd064

File tree

62 files changed

+2593
-304
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+2593
-304
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VIUProjectSettings.asset.
2323

2424
*.cfg
2525
*.log
26-
*.json
2726
*.vrmanifest
2827

2928
!package.json

.gitlab-ci.yml

Lines changed: 149 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
1+
stages:
2+
- editor
3+
- build
4+
5+
variables:
6+
UNITY_COMMAND: "xvfb-run --auto-servernum --server-args='-screen 0 640x480x24' /opt/Unity/Editor/Unity -batchmode -nographics -logfile /dev/stdout -quit"
7+
BUILD_SCENE_PATH: 'Assets/HTC.UnityPlugin/ViveInputUtility/Examples/1.UGUI/UGUI.unity'
8+
BUILD_OUTPUT_FOLDER: 'Builds/Win64'
9+
BUILD_OUTPUT_NAME: 'UGUI.exe'
10+
11+
.unity_activate: &unity_activate
12+
eval ${UNITY_COMMAND} -username "${UNITY_EMAIL}" -password "${UNITY_PASSWORD}" -serial "${UNITY_SERIAL}"
13+
14+
.unity_return_license: &unity_return_license
15+
eval ${UNITY_COMMAND} -returnLicense
16+
17+
.unity_template: &unity_template
18+
image: gableroux/unity3d:${IMAGE_TAG}
19+
cache:
20+
key: "${CI_PROJECT_ID}-${CI_COMMIT_REF_SLUG}-${CI_JOB_NAME}"
21+
paths:
22+
- "Library/"
23+
24+
before_script:
25+
- *unity_activate
26+
27+
script:
28+
- eval ${UNITY_COMMAND} -projectPath='.'
29+
30+
after_script:
31+
- *unity_return_license
32+
33+
.build_win64_unity_template: &build_win64_unity_template
34+
<<: *unity_template
35+
36+
artifacts:
37+
name: 'Win64'
38+
expire_in: 1 week
39+
paths:
40+
- ${BUILD_OUTPUT_FOLDER}
41+
42+
script:
43+
- eval ${UNITY_COMMAND} -projectPath='.' -executeMethod HTC.UnityPlugin.Vive.BuildUtils.Build ${BUILD_SCENE_PATH} ${BUILD_OUTPUT_FOLDER}/${BUILD_OUTPUT_NAME} 'StandaloneWindows64'
44+
45+
.no_asmdef_unity_template: &no_asmdef_unity_template
46+
<<: *unity_template
47+
48+
before_script:
49+
- find './Assets/HTC.UnityPlugin/' -type f -name '*.asmdef*' -delete
50+
- find './Assets/HTC.UnityPlugin/' -type f -name '*.asmref*' -delete
51+
- *unity_activate
52+
53+
.no_asmdef_build_win64_unity_template: &no_asmdef_build_win64_unity_template
54+
<<: *build_win64_unity_template
55+
56+
before_script:
57+
- find './Assets/HTC.UnityPlugin/' -type f -name '*.asmdef*' -delete
58+
- find './Assets/HTC.UnityPlugin/' -type f -name '*.asmref*' -delete
59+
- *unity_activate
60+
61+
editor:5.6.3-asset:
62+
<<: *no_asmdef_unity_template
63+
stage: editor
64+
variables:
65+
IMAGE_TAG: '5.6.3f1'
66+
67+
editor:2017.4-asset:
68+
<<: *no_asmdef_unity_template
69+
stage: editor
70+
variables:
71+
IMAGE_TAG: '2017.4.27f1-windows'
72+
73+
editor:2018.2-asset:
74+
<<: *no_asmdef_unity_template
75+
stage: editor
76+
variables:
77+
IMAGE_TAG: '2018.2.21f1-windows'
78+
79+
editor:2018.4-asset:
80+
<<: *no_asmdef_unity_template
81+
stage: editor
82+
variables:
83+
IMAGE_TAG: '2018.4.24f1-windows'
84+
85+
editor:2019.1-asset:
86+
<<: *no_asmdef_unity_template
87+
stage: editor
88+
variables:
89+
IMAGE_TAG: '2019.1.14f1-windows'
90+
91+
editor:2019.4-asset:
92+
<<: *no_asmdef_unity_template
93+
stage: editor
94+
variables:
95+
IMAGE_TAG: '2019.4.2f1-windows'
96+
97+
editor:2020.1-asset:
98+
<<: *no_asmdef_unity_template
99+
stage: editor
100+
variables:
101+
IMAGE_TAG: '2020.1.0f1-windows'
102+
103+
editor:2019.4-package:
104+
<<: *unity_template
105+
stage: editor
106+
variables:
107+
IMAGE_TAG: '2019.4.2f1-windows'
108+
109+
editor:2020.1-package:
110+
<<: *unity_template
111+
stage: editor
112+
variables:
113+
IMAGE_TAG: '2020.1.0f1-windows'
114+
115+
build:2018.4-asset-win64:
116+
<<: *no_asmdef_build_win64_unity_template
117+
stage: build
118+
variables:
119+
IMAGE_TAG: '2018.4.24f1-windows'
120+
121+
build:2019.2-asset-win64:
122+
<<: *no_asmdef_build_win64_unity_template
123+
stage: build
124+
variables:
125+
IMAGE_TAG: '2019.2.20f1-windows'
126+
127+
build:2019.4-asset-win64:
128+
<<: *no_asmdef_build_win64_unity_template
129+
stage: build
130+
variables:
131+
IMAGE_TAG: '2019.4.2f1-windows'
132+
133+
build:2020.1-asset-win64:
134+
<<: *no_asmdef_build_win64_unity_template
135+
stage: build
136+
variables:
137+
IMAGE_TAG: '2020.1.0f1-windows'
138+
139+
build:2019.4-package-win64:
140+
<<: *build_win64_unity_template
141+
stage: build
142+
variables:
143+
IMAGE_TAG: '2019.4.2f1-windows'
144+
145+
build:2020.1-package-win64:
146+
<<: *build_win64_unity_template
147+
stage: build
148+
variables:
149+
IMAGE_TAG: '2020.1.0f1-windows'

Assets/HTC.UnityPlugin/HTC.ViveInputUtility.asmdef

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"Oculus.Avatar",
77
"Oculus.VR",
88
"Oculus.Platform",
9-
"UnityEngine.SpatialTracking"
9+
"UnityEngine.SpatialTracking",
10+
"Unity.XR.OpenVR"
1011
],
1112
"includePlatforms": [],
1213
"excludePlatforms": [],

Assets/HTC.UnityPlugin/UPMRegistryTool.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/HTC.UnityPlugin/UPMRegistryTool/Editor.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/HTC.UnityPlugin/UPMRegistryTool/Editor/Resources.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
Copyright 2016-2020, HTC Corporation. All rights reserved.
2+
3+
The works ("Work") herein refer to the software developed or owned by
4+
HTC Corporation ("HTC") under the terms of the license. The information
5+
contained in the Work is the exclusive property of HTC. HTC grants the
6+
legal user the right to use the Work within the scope of the legitimate
7+
development of software. No further right is granted under this license,
8+
including but not limited to, distribution, reproduction and
9+
modification. Any other usage of the Works shall be subject to the
10+
written consent of HTC.
11+
12+
The use of the Work is permitted provided that the following conditions
13+
are met:
14+
* The Work is used in a source code form must retain the above
15+
copyright notice, this list of conditions and the following
16+
disclaimer.
17+
* The Work is used in binary form must reproduce the above copyright
18+
notice, this list of conditions and the following disclaimer in
19+
the documentation and/or other materials provided with the
20+
distributions.
21+
* Neither HTC nor the names of its contributors may be used to
22+
endorse or promote products derived from this software without
23+
specific prior written permission.
24+
25+
THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
26+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
27+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
28+
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
29+
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
30+
ARISING FROM, OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER
31+
DEALINGS IN THE WORK.

Assets/HTC.UnityPlugin/UPMRegistryTool/Editor/Resources/LICENSE.txt.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: 2096d9bc8547a3345935dcce472f5d3b, type: 3}
13+
m_Name: RegistryToolSettings
14+
m_EditorClassIdentifier:
15+
ProjectManifestPath: Packages/manifest.json
16+
LicenseResourcePath: LICENSE
17+
ViveRegistry:
18+
name: VIVE
19+
url: https://npm-registry.vive.com
20+
scopes:
21+
- com.htc.upm

Assets/HTC.UnityPlugin/UPMRegistryTool/Editor/Resources/RegistryToolSettings.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)