Merge branch 'develop'

.gitignore

@@ -39,7 +39,7 @@ Assets/QuestRdp/Models*
 
 # Depend
 Assets/Oculus*
-Assets/QuestView*
+#Assets/QuestView*
 Assets/MeshBaker*
 Assets/SimplestMeshBaker*
 Assets/TextMesh Pro*

.vscode/launch.json

@@ -0,0 +1,39 @@
+{
+ // IntelliSense を使用して利用可能な属性を学べます。
+ // 既存の属性の説明をホバーして表示します。
+ // 詳細情報は次を確認してください: https://go.microsoft.com/fwlink/?linkid=830387
+ "version": "0.2.0",
+ "configurations": [
+ {
+ "name": "Unity Editor",
+ "type": "unity",
+ "path": "/e:/Unity/quest-rdp/Library/EditorInstance.json",
+ "request": "launch"
+ },
+ {
+ "name": "Windows Player",
+ "type": "unity",
+ "request": "launch"
+ },
+ {
+ "name": "OSX Player",
+ "type": "unity",
+ "request": "launch"
+ },
+ {
+ "name": "Linux Player",
+ "type": "unity",
+ "request": "launch"
+ },
+ {
+ "name": "iOS Player",
+ "type": "unity",
+ "request": "launch"
+ },
+ {
+ "name": "Android Player",
+ "type": "unity",
+ "request": "launch"
+ }
+ ]
+}

Assets/QrdpSwitchMenu.cs

@@ -0,0 +1,29 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class QrdpSwitchMenu : MonoBehaviour
+{
+
+ public GameObject menu;
+
+ private void Update()
+ {
+ if (OVRInput.GetDown(OVRInput.Button.Three))
+ {
+ Switch();
+ }
+ }
+
+ void Switch()
+ {
+ if (menu.activeSelf)
+ {
+ menu.SetActive(false);
+ }
+ else
+ {
+ menu.SetActive(true);
+ }
+ }
+}

Assets/QuestRdp/Prefabs/Mouse/reticle.prefab

@@ -27,7 +27,7 @@ Transform:
  m_GameObject: {fileID: 1670910706049606806}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
+ m_LocalScale: {x: 0.02, y: 0.02, z: 0.02}
  m_Children: []
  m_Father: {fileID: 0}
  m_RootOrder: 0

Assets/QuestRdp/Prefabs/Video/Materials/GrabBar.mat

@@ -0,0 +1,77 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 6
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: GrabBar
+ m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+ m_ShaderKeywords: 
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Floats:
+ - _BumpScale: 1
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DstBlend: 0
+ - _GlossMapScale: 1
+ - _Glossiness: 0.5
+ - _GlossyReflections: 1
+ - _Metallic: 0
+ - _Mode: 0
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _SmoothnessTextureChannel: 0
+ - _SpecularHighlights: 1
+ - _SrcBlend: 1
+ - _UVSec: 0
+ - _ZWrite: 1
+ m_Colors:
+ - _Color: {r: 0, g: 0, b: 0, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

Assets/QuestRdp/Prefabs/Video/Monitor.prefab

@@ -114,7 +114,7 @@ RectTransform:
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
  m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 160, y: 30}
+ m_SizeDelta: {x: 240, y: 45}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &346787368526818155
 CanvasRenderer:
@@ -273,7 +273,7 @@ MeshRenderer:
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
- - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+ - {fileID: 2100000, guid: 29fd85e4790466443a419257970336ff, type: 2}
  m_StaticBatchInfo:
  firstSubMesh: 0
  subMeshCount: 0
@@ -828,7 +828,7 @@ RectTransform:
  m_GameObject: {fileID: 5575995518672484332}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
+ m_LocalScale: {x: 1.5, y: 1.5, z: 1}
  m_Children: []
  m_Father: {fileID: 8710143362222627190}
  m_RootOrder: 0