Skip to content

Commit 87f99f6

Browse files
author
lawwong
committed
Remove unused code
1 parent c1261e9 commit 87f99f6

3 files changed

Lines changed: 2 additions & 42 deletions

File tree

Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/OculusSettings.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,7 @@ public OculusRecommendedSettings()
5656
if (!Directory.Exists(asmdefFullPath))
5757
{
5858
MonoScript script = MonoScript.FromScriptableObject(VIUProjectSettings.Instance);
59-
string path = AssetDatabase.GetAssetPath(script);
6059
asmdefFullPath = Path.GetFullPath(AssetDatabase.GetAssetPath(script) + "/../../../.asmdefs/Oculus/");
61-
//Debug.Log("asmdefFullPath=" + asmdefFullPath);
6260
}
6361
string oculusFullPath = Path.GetFullPath(OCULUS_SDK_PATH);
6462
SafeCopy(asmdefFullPath + AVATAR_ASMDEF_FILE_NAME, oculusFullPath + "Avatar/" + AVATAR_ASMDEF_FILE_NAME);

Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/WindowsMRSettings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public static bool supportWindowsMR
4949

5050
private class WindowsMRSettings : VRPlatformSetting
5151
{
52-
private Foldouter m_foldouter = new Foldouter();
52+
//private Foldouter m_foldouter = new Foldouter();
5353

5454
public static WindowsMRSettings instance { get; private set; }
5555

Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Misc/OculusVRExtension/VIUOculusVRRenderModel.cs

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,8 @@
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;
64
using System;
7-
using System.Collections.Generic;
8-
using System.Runtime.InteropServices;
95
using UnityEngine;
10-
#if VIU_OCULUSVR_AVATAR
11-
using Oculus.Avatar;
12-
#endif
136

147
namespace 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

Comments
 (0)