diff --git a/Assets/Materials/GUIOverlay.mat b/Assets/Materials/GUIOverlay.mat new file mode 100644 index 0000000..85a9c92 --- /dev/null +++ b/Assets/Materials/GUIOverlay.mat @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: GUIOverlay + m_Shader: {fileID: 4800000, guid: 3955f306692091e40a7120f9c6ef104c, type: 3} + m_ShaderKeywords: ETC1_EXTERNAL_ALPHA + m_LightmapFlags: 5 + m_EnableInstancingVariants: 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: 2800000, guid: ca849f0f639dff84faf630957499dc50, type: 3} + 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 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _Glossiness: 0.5 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Materials/GUIOverlay.mat.meta b/Assets/Materials/GUIOverlay.mat.meta new file mode 100644 index 0000000..fd1225d --- /dev/null +++ b/Assets/Materials/GUIOverlay.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3264d49bcc9a5994baec39653f84c21e +timeCreated: 1433005859 +licenseType: Store +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index 4c7f40c..175f961 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -81,7 +81,7 @@ GameObject: m_IsActive: 1 --- !u!1 &1000013604504344 GameObject: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 @@ -109,6 +109,7 @@ GameObject: - component: {fileID: 114000012947587150} - component: {fileID: 114000014037808996} - component: {fileID: 114204427439299378} + - component: {fileID: 114941094485981810} m_Layer: 0 m_Name: Player m_TagString: Player @@ -254,6 +255,7 @@ Transform: m_Children: - {fileID: 4000013377317106} - {fileID: 4000011114332734} + - {fileID: 4000012374394250} m_Father: {fileID: 4000010397047646} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -268,7 +270,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4000010397047646} - - {fileID: 4000012374394250} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -278,12 +279,12 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1000013604504344} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.29999995, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.5} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 4000012289534432} - m_RootOrder: 1 + m_Father: {fileID: 4000012171920516} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4000013377317106 Transform: @@ -754,9 +755,23 @@ MonoBehaviour: type: 2} m_TeleporterLinePrefab: {fileID: 1673332131935090, guid: 2147af4bafca3d44fa6e6fb46e7426d5, type: 2} - m_MaxDistance: 5 + m_MaxDistance: 10 m_LeftHand: 0 m_Button: 10 +--- !u!114 &114941094485981810 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1000014283173620} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 201d3915a464cbb459c7eca25d6ee92f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_MoveSpeed: 3 + m_StrafeSpeed: 1.5 + m_RotationSpeed: 75 --- !u!114 &114968490010128300 MonoBehaviour: m_ObjectHideFlags: 1 @@ -788,7 +803,7 @@ MonoBehaviour: type: 2} m_TeleporterLinePrefab: {fileID: 1673332131935090, guid: 2147af4bafca3d44fa6e6fb46e7426d5, type: 2} - m_MaxDistance: 5 + m_MaxDistance: 10 m_LeftHand: 1 m_Button: 10 --- !u!124 &124000013977040076 diff --git a/Assets/Prefabs/TESUnity.prefab b/Assets/Prefabs/TESUnity.prefab index 5c86ebe..fab3fad 100644 --- a/Assets/Prefabs/TESUnity.prefab +++ b/Assets/Prefabs/TESUnity.prefab @@ -49,9 +49,9 @@ MonoBehaviour: enableLog: 0 waterQuality: 0 useStaticBatching: 1 - cellRadius: 2 + cellRadius: 1 cellDetailRadius: 3 - cellRadiusOnLoad: 2 + cellRadiusOnLoad: 1 materialType: 1 renderPath: 2 cameraFarClip: 500 @@ -68,11 +68,11 @@ MonoBehaviour: animateLights: 1 dayNightCycle: 1 generateNormalMap: 1 - normalGeneratorIntensity: 10 - postProcessingQuality: 2 - antiAliasing: 1 + normalGeneratorIntensity: 1 + postProcessingQuality: 3 + antiAliasing: 3 waterBackSideTransparent: 0 - followHeadDirection: 1 + followHeadDirection: 0 directModePreview: 1 roomScale: 0 forceControllers: 1 diff --git a/Assets/Resources/Materials/Lightweight-PBR-Cutout.mat b/Assets/Resources/Materials/Lightweight-PBR-Cutout.mat index 2bffe83..d4430c1 100644 --- a/Assets/Resources/Materials/Lightweight-PBR-Cutout.mat +++ b/Assets/Resources/Materials/Lightweight-PBR-Cutout.mat @@ -75,7 +75,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _GlossMapScale: 1 - - _Glossiness: 0.15 + - _Glossiness: 0.2 - _GlossinessSource: 0 - _GlossyReflections: 1 - _Metallic: 0 diff --git a/Assets/Resources/Materials/Lightweight-PBR.mat b/Assets/Resources/Materials/Lightweight-PBR.mat index fb3d827..32915b2 100644 --- a/Assets/Resources/Materials/Lightweight-PBR.mat +++ b/Assets/Resources/Materials/Lightweight-PBR.mat @@ -75,7 +75,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _GlossMapScale: 1 - - _Glossiness: 0.15 + - _Glossiness: 0.2 - _GlossinessSource: 0 - _GlossyReflections: 1 - _Metallic: 0 diff --git a/Assets/Resources/Materials/Lightweight-Simple-Cutout.mat b/Assets/Resources/Materials/Lightweight-Simple-Cutout.mat index 4105930..bd193d0 100644 --- a/Assets/Resources/Materials/Lightweight-Simple-Cutout.mat +++ b/Assets/Resources/Materials/Lightweight-Simple-Cutout.mat @@ -83,7 +83,7 @@ Material: - _OcclusionStrength: 1 - _Parallax: 0.02 - _ReflectionSource: 0 - - _Shininess: 0.15 + - _Shininess: 0.8 - _SmoothnessTextureChannel: 0 - _SpecSource: 0 - _SpecularHighlights: 1 diff --git a/Assets/Resources/Materials/Lightweight-Simple.mat b/Assets/Resources/Materials/Lightweight-Simple.mat index de6f462..ac8a9e7 100644 --- a/Assets/Resources/Materials/Lightweight-Simple.mat +++ b/Assets/Resources/Materials/Lightweight-Simple.mat @@ -83,7 +83,7 @@ Material: - _OcclusionStrength: 1 - _Parallax: 0.02 - _ReflectionSource: 0 - - _Shininess: 0.15 + - _Shininess: 0.8 - _SmoothnessTextureChannel: 0 - _SpecSource: 0 - _SpecularHighlights: 1 diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index bc36574..0743368 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -210,6 +210,201 @@ Prefab: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 224000011834595538, guid: 077b1d90dd328134999603a3db4259c8, + type: 2} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224000011834595538, guid: 077b1d90dd328134999603a3db4259c8, + type: 2} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224000011834595538, guid: 077b1d90dd328134999603a3db4259c8, + type: 2} + propertyPath: m_AnchoredPosition.x + value: 95 + objectReference: {fileID: 0} + - target: {fileID: 224000011834595538, guid: 077b1d90dd328134999603a3db4259c8, + type: 2} + propertyPath: m_SizeDelta.x + value: 190 + objectReference: {fileID: 0} + - target: {fileID: 224000011846930594, guid: 077b1d90dd328134999603a3db4259c8, + type: 2} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224000011846930594, guid: 077b1d90dd328134999603a3db4259c8, + type: 2} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224000011846930594, guid: 077b1d90dd328134999603a3db4259c8, + type: 2} + propertyPath: m_AnchoredPosition.x + value: 95 + objectReference: {fileID: 0} + - target: {fileID: 224000011846930594, guid: 077b1d90dd328134999603a3db4259c8, + type: 2} + propertyPath: m_SizeDelta.x + value: 190 + objectReference: {fileID: 0} + - target: {fileID: 224000012084331744, guid: 077b1d90dd328134999603a3db4259c8, + type: 2} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224000012084331744, guid: 077b1d90dd328134999603a3db4259c8, + type: 2} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224000014133297852, guid: 077b1d90dd328134999603a3db4259c8, + type: 2} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224000014133297852, guid: 077b1d90dd328134999603a3db4259c8, + type: 2} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224000014133297852, guid: 077b1d90dd328134999603a3db4259c8, + type: 2} + propertyPath: m_AnchoredPosition.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 224000014133297852, guid: 077b1d90dd328134999603a3db4259c8, + type: 2} + propertyPath: m_SizeDelta.x + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 224000011236206996, guid: 077b1d90dd328134999603a3db4259c8, + type: 2} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224000011236206996, guid: 077b1d90dd328134999603a3db4259c8, + type: 2} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224000011236206996, guid: 077b1d90dd328134999603a3db4259c8, + type: 2} + propertyPath: m_AnchoredPosition.x + value: 95 + objectReference: {fileID: 0} + - target: {fileID: 224000011236206996, guid: 077b1d90dd328134999603a3db4259c8, + type: 2} + propertyPath: m_SizeDelta.x + value: 190 + objectReference: {fileID: 0} + - target: {fileID: 224000013191916716, guid: 077b1d90dd328134999603a3db4259c8, + type: 2} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224000013191916716, guid: 077b1d90dd328134999603a3db4259c8, + type: 2} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224000013191916716, guid: 077b1d90dd328134999603a3db4259c8, + type: 2} + propertyPath: m_AnchoredPosition.x + value: 95 + objectReference: {fileID: 0} + - target: {fileID: 224000013191916716, guid: 077b1d90dd328134999603a3db4259c8, + type: 2} + propertyPath: m_SizeDelta.x + value: 190 + objectReference: {fileID: 0} + - target: {fileID: 224000011834595538, guid: 077b1d90dd328134999603a3db4259c8, + type: 2} + propertyPath: m_AnchoredPosition.y + value: -18.507141 + objectReference: {fileID: 0} + - target: {fileID: 224000011834595538, guid: 077b1d90dd328134999603a3db4259c8, + type: 2} + propertyPath: m_SizeDelta.y + value: 37.014282 + objectReference: {fileID: 0} + - target: {fileID: 224000011846930594, guid: 077b1d90dd328134999603a3db4259c8, + type: 2} + propertyPath: m_AnchoredPosition.y + value: -68.50714 + objectReference: {fileID: 0} + - target: {fileID: 224000011846930594, guid: 077b1d90dd328134999603a3db4259c8, + type: 2} + propertyPath: m_SizeDelta.y + value: 42.985718 + objectReference: {fileID: 0} + - target: {fileID: 224000012084331744, guid: 077b1d90dd328134999603a3db4259c8, + type: 2} + propertyPath: m_AnchoredPosition.y + value: -18.507141 + objectReference: {fileID: 0} + - target: {fileID: 224000012084331744, guid: 077b1d90dd328134999603a3db4259c8, + type: 2} + propertyPath: m_SizeDelta.y + value: 37.014282 + objectReference: {fileID: 0} + - target: {fileID: 224000014133297852, guid: 077b1d90dd328134999603a3db4259c8, + type: 2} + propertyPath: m_AnchoredPosition.y + value: -18.507141 + objectReference: {fileID: 0} + - target: {fileID: 224000014133297852, guid: 077b1d90dd328134999603a3db4259c8, + type: 2} + propertyPath: m_SizeDelta.y + value: 37.014282 + objectReference: {fileID: 0} + - target: {fileID: 224000011236206996, guid: 077b1d90dd328134999603a3db4259c8, + type: 2} + propertyPath: m_AnchoredPosition.y + value: -10.746429 + objectReference: {fileID: 0} + - target: {fileID: 224000011236206996, guid: 077b1d90dd328134999603a3db4259c8, + type: 2} + propertyPath: m_SizeDelta.y + value: 21.492859 + objectReference: {fileID: 0} + - target: {fileID: 224000013191916716, guid: 077b1d90dd328134999603a3db4259c8, + type: 2} + propertyPath: m_AnchoredPosition.y + value: -32.23929 + objectReference: {fileID: 0} + - target: {fileID: 224000013191916716, guid: 077b1d90dd328134999603a3db4259c8, + type: 2} + propertyPath: m_SizeDelta.y + value: 21.492859 + objectReference: {fileID: 0} + - target: {fileID: 114000011369885652, guid: 077b1d90dd328134999603a3db4259c8, + type: 2} + propertyPath: m_Material + value: + objectReference: {fileID: 2100000, guid: 3264d49bcc9a5994baec39653f84c21e, type: 2} + - target: {fileID: 114000011222152088, guid: 077b1d90dd328134999603a3db4259c8, + type: 2} + propertyPath: m_Material + value: + objectReference: {fileID: 2100000, guid: 3264d49bcc9a5994baec39653f84c21e, type: 2} + - target: {fileID: 114000011982458964, guid: 077b1d90dd328134999603a3db4259c8, + type: 2} + propertyPath: m_Material + value: + objectReference: {fileID: 2100000, guid: 3264d49bcc9a5994baec39653f84c21e, type: 2} + - target: {fileID: 114000011390938836, guid: 077b1d90dd328134999603a3db4259c8, + type: 2} + propertyPath: m_Material + value: + objectReference: {fileID: 2100000, guid: 3264d49bcc9a5994baec39653f84c21e, type: 2} + - target: {fileID: 114000013770063488, guid: 077b1d90dd328134999603a3db4259c8, + type: 2} + propertyPath: m_Material + value: + objectReference: {fileID: 2100000, guid: 3264d49bcc9a5994baec39653f84c21e, type: 2} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 077b1d90dd328134999603a3db4259c8, type: 2} m_IsPrefabParent: 0 @@ -219,6 +414,48 @@ MonoBehaviour: type: 2} m_PrefabInternal: {fileID: 1112341914} m_Script: {fileID: 11500000, guid: 6ce3d5180db7d3a4e8b3bd844c434045, type: 3} +--- !u!1001 &519632578 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4000012289534432, guid: bb4f50960e3bc08459bb6f708eb7d79f, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4000012289534432, guid: bb4f50960e3bc08459bb6f708eb7d79f, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4000012289534432, guid: bb4f50960e3bc08459bb6f708eb7d79f, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4000012289534432, guid: bb4f50960e3bc08459bb6f708eb7d79f, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4000012289534432, guid: bb4f50960e3bc08459bb6f708eb7d79f, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4000012289534432, guid: bb4f50960e3bc08459bb6f708eb7d79f, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4000012289534432, guid: bb4f50960e3bc08459bb6f708eb7d79f, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4000012289534432, guid: bb4f50960e3bc08459bb6f708eb7d79f, type: 2} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: bb4f50960e3bc08459bb6f708eb7d79f, type: 2} + m_IsPrefabParent: 0 --- !u!1 &605367782 GameObject: m_ObjectHideFlags: 0 @@ -406,48 +643,6 @@ RectTransform: m_PrefabParentObject: {fileID: 224000013823953122, guid: 077b1d90dd328134999603a3db4259c8, type: 2} m_PrefabInternal: {fileID: 184929743} ---- !u!1001 &1025879892 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 4000012289534432, guid: bb4f50960e3bc08459bb6f708eb7d79f, type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4000012289534432, guid: bb4f50960e3bc08459bb6f708eb7d79f, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4000012289534432, guid: bb4f50960e3bc08459bb6f708eb7d79f, type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4000012289534432, guid: bb4f50960e3bc08459bb6f708eb7d79f, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4000012289534432, guid: bb4f50960e3bc08459bb6f708eb7d79f, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4000012289534432, guid: bb4f50960e3bc08459bb6f708eb7d79f, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4000012289534432, guid: bb4f50960e3bc08459bb6f708eb7d79f, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4000012289534432, guid: bb4f50960e3bc08459bb6f708eb7d79f, type: 2} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: bb4f50960e3bc08459bb6f708eb7d79f, type: 2} - m_IsPrefabParent: 0 --- !u!1001 &1112341914 Prefab: m_ObjectHideFlags: 0 @@ -664,25 +859,6 @@ RectTransform: m_PrefabParentObject: {fileID: 224000012350933038, guid: de2517ff4a7a99a48a683bc2b1defec0, type: 2} m_PrefabInternal: {fileID: 1562552968} ---- !u!1 &1452898648 stripped -GameObject: - m_PrefabParentObject: {fileID: 1000014283173620, guid: bb4f50960e3bc08459bb6f708eb7d79f, - type: 2} - m_PrefabInternal: {fileID: 1025879892} ---- !u!114 &1452898656 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1452898648} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 201d3915a464cbb459c7eca25d6ee92f, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MoveSpeed: 1 - m_StrafeSpeed: 0.5 - m_RotationSpeed: 1 --- !u!1001 &1562552968 Prefab: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Core/GUIUtils.cs b/Assets/Scripts/Core/GUIUtils.cs index d2734ed..039c33b 100644 --- a/Assets/Scripts/Core/GUIUtils.cs +++ b/Assets/Scripts/Core/GUIUtils.cs @@ -113,9 +113,6 @@ public static void SetCanvasToWorldSpace(Canvas canvas, Transform parent, float canvas.worldCamera = Camera.main; var canvasTransform = canvas.GetComponent(); canvasTransform.SetParent(parent); - canvasTransform.localPosition = new Vector3(0.0f, 0.0f, depth); - canvasTransform.localRotation = Quaternion.identity; - canvasTransform.localScale = new Vector3(scale, scale, scale); var canvasScaler = canvas.GetComponent(); if (canvasScaler != null) @@ -123,6 +120,10 @@ public static void SetCanvasToWorldSpace(Canvas canvas, Transform parent, float canvasTransform.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, canvasScaler.referenceResolution.x); canvasTransform.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, canvasScaler.referenceResolution.y); } + + canvasTransform.localPosition = new Vector3(0.0f, 0.0f, depth); + canvasTransform.localRotation = Quaternion.identity; + canvasTransform.localScale = new Vector3(scale, scale, scale); } public static GameObject CreateEventSystem() diff --git a/Assets/Scripts/Editor/BuildManagerEditor.cs b/Assets/Scripts/Editor/BuildManagerEditor.cs index d8fe237..ee0a427 100644 --- a/Assets/Scripts/Editor/BuildManagerEditor.cs +++ b/Assets/Scripts/Editor/BuildManagerEditor.cs @@ -128,7 +128,7 @@ private string GetBoolString(bool predicat) private void CopyDocs(ref string path, BuildTarget target) { - var docPath = Directory.GetCurrentDirectory().Replace('\\', '/'); + var docPath = Directory.GetCurrentDirectory().Replace('\\', '/') + "/"; Copy("README.md", ref docPath, ref path); Copy("README-VR.md", ref docPath, ref path); Copy("config.ini", ref docPath, ref path); diff --git a/Assets/Scripts/TES/Components/VR/PlayerXR.cs b/Assets/Scripts/TES/Components/VR/PlayerXR.cs index 5e8e920..7bb8ee0 100644 --- a/Assets/Scripts/TES/Components/VR/PlayerXR.cs +++ b/Assets/Scripts/TES/Components/VR/PlayerXR.cs @@ -20,6 +20,7 @@ public class PlayerXR : MonoBehaviour private Transform _transform = null; private RectTransform _canvas = null; private Transform _pivotCanvas = null; + private Transform m_HUD = null; [SerializeField] private bool _isSpectator = false; @@ -66,6 +67,7 @@ private void Start() _canvas = _mainCanvas.GetComponent(); _pivotCanvas = _canvas.parent; + m_HUD = _canvas.Find("HUD"); // Put the Canvas in WorldSpace and Attach it to the camera. _camTransform = Camera.main.GetComponent(); @@ -129,7 +131,7 @@ private void Update() if (InputManager.GetButtonDown("Recenter")) RecenterOrientationAndPosition(); - RecenterUI(true); + RecenterUI(); var centerEye = _camTransform; var root = centerEye.parent; diff --git a/Assets/Scripts/TES/Components/VR/RudderManager.cs b/Assets/Scripts/TES/Components/VR/RudderManager.cs index b845d5b..8f42dee 100644 --- a/Assets/Scripts/TES/Components/VR/RudderManager.cs +++ b/Assets/Scripts/TES/Components/VR/RudderManager.cs @@ -47,6 +47,8 @@ public void Update() if (m_Rudder == null) return; + + m_Axis = m_Rudder.GetAxis(m_ModeAxis); m_Tranform.Translate(m_Axis.GetXAxis() * m_StrafeSpeed * Time.deltaTime, 0, m_Axis.GetYAxis() * m_MoveSpeed * Time.deltaTime); m_Tranform.Rotate(0.0f, m_Axis.GetZRotation() * m_RotationSpeed * Time.deltaTime, 0.0f); diff --git a/Assets/Scripts/TES/GameSettings.cs b/Assets/Scripts/TES/GameSettings.cs index 49e8a7d..5bebcc9 100644 --- a/Assets/Scripts/TES/GameSettings.cs +++ b/Assets/Scripts/TES/GameSettings.cs @@ -109,7 +109,7 @@ public static string CheckSettings(TESManager tes) tes.renderPath = TESManager.RendererType.Forward; else if (value == "Deferred") tes.renderPath = TESManager.RendererType.Deferred; - else if (value == "Lightweight") + else if (value == "Lightweight") tes.renderPath = TESManager.RendererType.LightweightSRP; break; case "Shader": diff --git a/Assets/Scripts/TES/Materials/LightweightMaterial.cs b/Assets/Scripts/TES/Materials/LightweightMaterial.cs index c202e7f..45eb9f3 100644 --- a/Assets/Scripts/TES/Materials/LightweightMaterial.cs +++ b/Assets/Scripts/TES/Materials/LightweightMaterial.cs @@ -37,8 +37,6 @@ public override Material BuildMaterialFromProperties(MWMaterialProps mp) else material = BuildMaterial(); - material.SetFloat("_Glossiness", 0.25f); - if (mp.textures.mainFilePath != null) { material.mainTexture = m_textureManager.LoadTexture(mp.textures.mainFilePath); diff --git a/Assets/Scripts/TES/TESManager.cs b/Assets/Scripts/TES/TESManager.cs index cde25fd..6996c74 100644 --- a/Assets/Scripts/TES/TESManager.cs +++ b/Assets/Scripts/TES/TESManager.cs @@ -33,7 +33,7 @@ public enum RendererType Forward, Deferred, LightweightSRP, HDSRP } - public const string Version = "0.7.1"; + public const string Version = "0.8.0"; #region Inspector-set Members diff --git a/Assets/Scripts/TES/UI/UIManager.cs b/Assets/Scripts/TES/UI/UIManager.cs index c94dbee..6f1703a 100644 --- a/Assets/Scripts/TES/UI/UIManager.cs +++ b/Assets/Scripts/TES/UI/UIManager.cs @@ -23,35 +23,12 @@ public class UIManager : MonoBehaviour #region Public Fields - public UIBook Book - { - get { return _book; } - } - - public UIInteractiveText InteractiveText - { - get { return _interactiveText; } - } - - public UIScroll Scroll - { - get { return _scroll; } - } - - public UICrosshair Crosshair - { - get { return _crosshair; } - } - - public Transform HUD - { - get { return _hudTransform; } - } - - public Transform UI - { - get { return _uiTransform; } - } + public UIBook Book => _book; + public UIInteractiveText InteractiveText => _interactiveText; + public UIScroll Scroll => _scroll; + public UICrosshair Crosshair => _crosshair; + public Transform HUD => _hudTransform; + public Transform UI => _uiTransform; public bool Visible { diff --git a/Assets/Settings/PostProcess Volume Profile.asset b/Assets/Settings/PostProcess Volume Profile.asset index ceda4d4..8a12219 100644 --- a/Assets/Settings/PostProcess Volume Profile.asset +++ b/Assets/Settings/PostProcess Volume Profile.asset @@ -403,11 +403,11 @@ MonoBehaviour: overrideState: 0 value: 0.5 diffusion: - overrideState: 0 - value: 7 + overrideState: 1 + value: 5 anamorphicRatio: overrideState: 1 - value: 1 + value: 0 color: overrideState: 0 value: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Shaders/UIOverlay.shader b/Assets/Shaders/UIOverlay.shader new file mode 100644 index 0000000..da9ad8c --- /dev/null +++ b/Assets/Shaders/UIOverlay.shader @@ -0,0 +1,97 @@ +Shader "UI/Overlay" +{ + Properties + { + [PerRendererData] _MainTex ("Font Texture", 2D) = "white" {} + + _Color("Tint", Color) = (1,1,1,1) + + _StencilComp ("Stencil Comparison", Float) = 8 + _Stencil ("Stencil ID", Float) = 0 + _StencilOp ("Stencil Operation", Float) = 0 + _StencilWriteMask ("Stencil Write Mask", Float) = 255 + _StencilReadMask ("Stencil Read Mask", Float) = 255 + + _ColorMask ("Color Mask", Float) = 15 + } + + SubShader + { + LOD 100 + + Tags + { + "Queue" = "Transparent" + "IgnoreProjector" = "True" + "RenderType" = "Transparent" + "PreviewType"="Plane" + "CanUseSpriteAtlas" = "True" + } + + Stencil + { + Ref [_Stencil] + Comp [_StencilComp] + Pass [_StencilOp] + ReadMask [_StencilReadMask] + WriteMask [_StencilWriteMask] + } + + Cull Off + Lighting Off + ZWrite Off + ZTest Always + Offset -1, -1 + Blend SrcAlpha OneMinusSrcAlpha + ColorMask [_ColorMask] + + Pass + { + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #include "UnityCG.cginc" + #include "UnityUI.cginc" + + struct appdata_t + { + float4 vertex : POSITION; + float2 texcoord : TEXCOORD0; + float4 color : COLOR; + }; + + struct v2f + { + float4 vertex : SV_POSITION; + half2 texcoord : TEXCOORD0; + fixed4 color : COLOR; + }; + + sampler2D _MainTex; + float4 _MainTex_ST; + fixed4 _Color; + fixed4 _TextureSampleAdd; + + v2f vert (appdata_t v) + { + v2f o; + o.vertex = UnityObjectToClipPos(v.vertex); + o.texcoord = TRANSFORM_TEX(v.texcoord, _MainTex); + o.color = v.color * _Color; +#ifdef UNITY_HALF_TEXEL_OFFSET + o.vertex.xy += (_ScreenParams.zw-1.0)*float2(-1,1); +#endif + + return o; + } + + fixed4 frag (v2f i) : SV_Target + { + fixed4 col = (tex2D(_MainTex, i.texcoord) + _TextureSampleAdd) * i.color; + clip (col.a - 0.01); + return col; + } + ENDCG + } + } +} diff --git a/Assets/Shaders/UIOverlay.shader.meta b/Assets/Shaders/UIOverlay.shader.meta new file mode 100644 index 0000000..1d7cdee --- /dev/null +++ b/Assets/Shaders/UIOverlay.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 3955f306692091e40a7120f9c6ef104c +timeCreated: 1433005821 +licenseType: Store +ShaderImporter: + defaultTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 36c9537..6c82dfd 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -40,6 +40,7 @@ GraphicsSettings: - {fileID: 10623, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index f21c755..0935776 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -300,9 +300,9 @@ PlayerSettings: - m_BuildTarget: Standalone m_Enabled: 1 m_Devices: - - None - Oculus - OpenVR + - None - m_BuildTarget: Tizen m_Enabled: 0 m_Devices: []