diff --git a/Assets/Scenes/Main Scene.unity b/Assets/Scenes/Main Scene.unity index dbd8e48..b1fd078 100644 --- a/Assets/Scenes/Main Scene.unity +++ b/Assets/Scenes/Main Scene.unity @@ -403,6 +403,96 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!1 &366364277 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 366364280} + - component: {fileID: 366364279} + - component: {fileID: 366364278} + m_Layer: 0 + m_Name: SmoothCamera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &366364278 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 366364277} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2ffc551ccb4dd594480259b7ba64e98a, type: 3} + m_Name: + m_EditorClassIdentifier: + target: {fileID: 371544748} + smoothSpeed: 0.125 + PosotionOffset: {x: 0, y: 0, z: 0} +--- !u!20 &366364279 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 366364277} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.01 + far clip plane: 30 + field of view: 90 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 8400000, guid: 8b89ad719d680a54c9496ca4789c5069, type: 2} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &366364280 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 366364277} + m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068} + m_LocalPosition: {x: -0.58, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &367081677 GameObject: m_ObjectHideFlags: 0 @@ -604,7 +694,7 @@ Camera: width: 1 height: 1 near clip plane: 0.01 - far clip plane: 1000 + far clip plane: 100 field of view: 90 orthographic: 0 orthographic size: 5 @@ -2511,8 +2601,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 995594085} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.01, y: -0.02, z: 0.05} - m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_LocalPosition: {x: -0.01, y: -0.02, z: 0.06} + m_LocalScale: {x: 0.09, y: 0.09, z: 0.09} m_Children: [] m_Father: {fileID: 367081678} m_RootOrder: 0 @@ -2610,6 +2700,78 @@ MonoBehaviour: Hand: 3 duration: 0.05 amplitude: 1 +--- !u!1 &1079558957 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1079558958} + - component: {fileID: 1079558960} + - component: {fileID: 1079558959} + m_Layer: 5 + m_Name: RawImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1079558958 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1079558957} + 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_Children: [] + m_Father: {fileID: 1482928095} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + 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: 1280, y: 720} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1079558959 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1079558957} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 8400000, guid: 8b89ad719d680a54c9496ca4789c5069, type: 2} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &1079558960 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1079558957} + m_CullTransparentMesh: 1 --- !u!1 &1146353685 stripped GameObject: m_CorrespondingSourceObject: {fileID: -7257406874482555907, guid: ea6463ca199d52046962b69f2ab654ef, type: 3} @@ -2709,8 +2871,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1213452594} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.01, y: -0.02, z: 0.05} - m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_LocalPosition: {x: 0.01, y: -0.02, z: 0.06} + m_LocalScale: {x: 0.09, y: 0.09, z: 0.09} m_Children: [] m_Father: {fileID: 141732346} m_RootOrder: 0 @@ -2971,6 +3133,106 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!1 &1482928091 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1482928095} + - component: {fileID: 1482928094} + - component: {fileID: 1482928093} + - component: {fileID: 1482928092} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1482928092 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1482928091} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1482928093 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1482928091} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1280, y: 720} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &1482928094 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1482928091} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &1482928095 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1482928091} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 1079558958} + m_Father: {fileID: 0} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} --- !u!1 &1522911141 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7675345320277832881, guid: ea6463ca199d52046962b69f2ab654ef, type: 3} @@ -3039,7 +3301,7 @@ MonoBehaviour: m_OriginBaseGameObject: {fileID: 1647048262} m_CameraFloorOffsetObject: {fileID: 281366679} m_RequestedTrackingOriginMode: 2 - m_CameraYOffset: 1.1176 + m_CameraYOffset: 1.8 --- !u!4 &1647048264 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/ButtonToKey.cs b/Assets/Scripts/ButtonToKey.cs index e804046..edfc397 100644 --- a/Assets/Scripts/ButtonToKey.cs +++ b/Assets/Scripts/ButtonToKey.cs @@ -8,34 +8,24 @@ public class ButtonToKey : MonoBehaviour public static extern uint MapVirtualKey(uint uCode, uint uMapType); [DllImport("user32.dll")] static extern void keybd_event(byte bVk, byte bScan, uint dwFlags, UIntPtr dwExtraInfo); - //public enum VirtualKeyCode; public byte keyToPress; - public Light lightTarget; - public float frequency; - public float amplitude; + //public Light lightTarget; - // Start is called before the first frame update void Start() { - lightTarget.gameObject.SetActive(false); - } - - // Update is called once per frame - void Update() - { - + //lightTarget.gameObject.SetActive(false); } private void OnTriggerEnter(Collider other) { keybd_event(System.Convert.ToByte(keyToPress), (byte)MapVirtualKey((uint)keyToPress, 0), 0, UIntPtr.Zero); - lightTarget.gameObject.SetActive(true); + //lightTarget.gameObject.SetActive(true); } private void OnTriggerExit(Collider other) { keybd_event(System.Convert.ToByte(keyToPress), (byte)MapVirtualKey((uint)keyToPress, 0), 2, UIntPtr.Zero); - lightTarget.gameObject.SetActive(false); + //lightTarget.gameObject.SetActive(false); } } diff --git a/Assets/Scripts/Camera.renderTexture b/Assets/Scripts/Camera.renderTexture new file mode 100644 index 0000000..06db451 --- /dev/null +++ b/Assets/Scripts/Camera.renderTexture @@ -0,0 +1,38 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!84 &8400000 +RenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Camera + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + m_IsAlphaChannelOptional: 0 + serializedVersion: 3 + m_Width: 1280 + m_Height: 720 + m_AntiAliasing: 1 + m_MipCount: -1 + m_DepthFormat: 2 + m_ColorFormat: 8 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_EnableCompatibleFormat: 1 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 0 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 diff --git a/Assets/Scripts/Camera.renderTexture.meta b/Assets/Scripts/Camera.renderTexture.meta new file mode 100644 index 0000000..33ba0b7 --- /dev/null +++ b/Assets/Scripts/Camera.renderTexture.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8b89ad719d680a54c9496ca4789c5069 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 8400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/CameraFollow.cs b/Assets/Scripts/CameraFollow.cs new file mode 100644 index 0000000..f793583 --- /dev/null +++ b/Assets/Scripts/CameraFollow.cs @@ -0,0 +1,14 @@ +using UnityEngine; + +public class CameraFollow : MonoBehaviour { + + public Transform target; + public float smoothSpeed = 0.125f; + public Vector3 PosotionOffset; + void FixedUpdate () + { + transform.position = Vector3.Lerp(transform.position, target.position + PosotionOffset, smoothSpeed); + transform.rotation = Quaternion.Lerp(transform.rotation, target.rotation, smoothSpeed); + } + +} diff --git a/Assets/Scripts/CameraFollow.cs.meta b/Assets/Scripts/CameraFollow.cs.meta new file mode 100644 index 0000000..b4d3bc7 --- /dev/null +++ b/Assets/Scripts/CameraFollow.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2ffc551ccb4dd594480259b7ba64e98a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/RefreshResolution.cs b/Assets/Scripts/RefreshResolution.cs new file mode 100644 index 0000000..38316d5 --- /dev/null +++ b/Assets/Scripts/RefreshResolution.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class RefreshResolution : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/Scripts/RefreshResolution.cs.meta b/Assets/Scripts/RefreshResolution.cs.meta new file mode 100644 index 0000000..dde9651 --- /dev/null +++ b/Assets/Scripts/RefreshResolution.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: cc346b594af94984daa3682599352549 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index da1064b..5923bcf 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -42,8 +42,8 @@ PlayerSettings: m_SplashScreenLogos: [] m_VirtualRealitySplashScreen: {fileID: 0} m_HolographicTrackingLossScreen: {fileID: 0} - defaultScreenWidth: 1024 - defaultScreenHeight: 1024 + defaultScreenWidth: 1280 + defaultScreenHeight: 720 defaultScreenWidthWeb: 960 defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 @@ -88,7 +88,7 @@ PlayerSettings: bakeCollisionMeshes: 0 forceSingleInstance: 0 useFlipModelSwapchain: 1 - resizableWindow: 0 + resizableWindow: 1 useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games gpuSkinning: 1 @@ -134,13 +134,18 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 0.1 + bundleVersion: 0.2 preloadedAssets: - {fileID: 0} - {fileID: 0} - {fileID: 0} - {fileID: 0} - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1