11//========= Copyright 2016-2022, HTC Corporation. All rights reserved. ===========
22
33#pragma warning disable 0649
4- using HTC . UnityPlugin . Utility ;
5- using HTC . UnityPlugin . VRModuleManagement ;
64using System ;
7- using System . Collections . Generic ;
8- using System . Runtime . InteropServices ;
95using UnityEngine ;
10- #if VIU_OCULUSVR_AVATAR
11- using Oculus . Avatar ;
12- #endif
136
147namespace HTC . UnityPlugin . Vive . OculusVRExtension
158{
@@ -30,9 +23,6 @@ private struct ChildTransforms
3023 "the scene view for lining things up. Use tracked device " +
3124 "index instead to ensure the correct model is displayed for all users." ;
3225
33- private const uint LEFT_INDEX = 1 ;
34- private const uint RIGHT_INDEX = 2 ;
35-
3626 [ Tooltip ( MODEL_OVERRIDE_WARNNING ) ]
3727 [ SerializeField ]
3828 private string m_modelOverride ;
@@ -45,36 +35,8 @@ private struct ChildTransforms
4535 [ SerializeField ]
4636 private bool m_updateDynamically = true ;
4737
48- private uint m_deviceIndex = VRModule . INVALID_DEVICE_INDEX ;
49- private MeshFilter m_meshFilter ;
50- private MeshRenderer m_meshRenderer ;
51- private IndexedTable < string , ChildTransforms > m_chilTransforms = new IndexedTable < string , ChildTransforms > ( ) ;
52- private IndexedTable < int , Material > m_materials = new IndexedTable < int , Material > ( ) ;
53- private HashSet < string > m_loadingRenderModels = new HashSet < string > ( ) ;
54- private bool m_isAppQuit ;
55-
56- private string preferedModelName
57- {
58- get
59- {
60- if ( ! string . IsNullOrEmpty ( m_modelOverride ) ) { return m_modelOverride ; }
61- #if UNITY_EDITOR
62- if ( ! Application . isPlaying )
63- {
64- return string . Empty ;
65- }
66- else
67- #endif
68- {
69- return VRModule . GetCurrentDeviceState ( m_deviceIndex ) . renderModelName ;
70- }
71- }
72- }
73-
74- private Shader preferedShader { get { return m_shaderOverride == null ? Shader . Find ( "Standard" ) : m_shaderOverride ; } }
75-
7638 public bool updateDynamically { get { return m_updateDynamically ; } set { m_updateDynamically = value ; } }
77- public bool isLoadingModel { get { return m_loadingRenderModels . Count > 0 ; } }
39+ public bool isLoadingModel { get { return false ; } }
7840 public string loadedModelName { get ; private set ; }
7941 public bool isModelLoaded { get { return ! string . IsNullOrEmpty ( loadedModelName ) ; } }
8042 public Shader loadedShader { get ; private set ; }
0 commit comments