From b328c214a9cd771eb8f2223640d3e5d39f95ac40 Mon Sep 17 00:00:00 2001
From: terric <terric.ying@gmail.com>
Date: Tue, 21 Nov 2023 15:53:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
1. 更新版本至 2023.1.17
2. 修复面部采样不准的问题
---
Assets/Resources/UI/FaceDetectUI.prefab | 386 ++++++++++++------
Assets/Scenes/FaceDetect.unity | 233 ++++++++++-
Assets/Scenes/YogaMain.unity | 2 +-
.../Scripts/PoseCheck/MotionCaptureManager.cs | 5 +
Assets/Scripts/UI/Component.meta | 8 +
.../{ => UI/Component}/FaceDetectManager.cs | 90 +++-
.../Component}/FaceDetectManager.cs.meta | 0
.../{ => UI/Component}/MeditationManager.cs | 0
.../Component}/MeditationManager.cs.meta | 0
.../UI/Component}/PanelItemManager.cs | 2 -
.../UI/Component}/PanelItemManager.cs.meta | 0
Assets/Scripts/UI/FaceDetectUI.cs | 6 +
Assets/Settings/High_PipelineAsset.asset | 5 +-
Assets/Settings/Low_PipelineAsset.asset | 5 +-
Assets/Settings/Medium_PipelineAsset.asset | 5 +-
Assets/Settings/URP-HighFidelity.asset | 5 +-
Assets/Settings/Very High_PipelineAsset.asset | 5 +-
Assets/Settings/Very Low_PipelineAsset.asset | 5 +-
Packages/manifest.json | 2 +-
Packages/packages-lock.json | 16 +-
ProjectSettings/ProjectSettings.asset | 1 +
ProjectSettings/ProjectVersion.txt | 4 +-
22 files changed, 640 insertions(+), 145 deletions(-)
create mode 100644 Assets/Scripts/UI/Component.meta
rename Assets/Scripts/{ => UI/Component}/FaceDetectManager.cs (68%)
rename Assets/Scripts/{ => UI/Component}/FaceDetectManager.cs.meta (100%)
rename Assets/Scripts/{ => UI/Component}/MeditationManager.cs (100%)
rename Assets/Scripts/{ => UI/Component}/MeditationManager.cs.meta (100%)
rename Assets/{ => Scripts/UI/Component}/PanelItemManager.cs (86%)
rename Assets/{ => Scripts/UI/Component}/PanelItemManager.cs.meta (100%)
diff --git a/Assets/Resources/UI/FaceDetectUI.prefab b/Assets/Resources/UI/FaceDetectUI.prefab
index 9e7bbb9..e7b6868 100644
--- a/Assets/Resources/UI/FaceDetectUI.prefab
+++ b/Assets/Resources/UI/FaceDetectUI.prefab
@@ -396,8 +396,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: -300, y: 0}
- m_SizeDelta: {x: -600, y: 0}
+ m_AnchoredPosition: {x: 0, y: 50}
+ m_SizeDelta: {x: 0, y: -100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7345997695529505356
CanvasRenderer:
@@ -420,7 +420,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 0.392}
+ m_Color: {r: 1, g: 1, b: 1, a: 0}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -467,6 +467,273 @@ MonoBehaviour:
m_OnValueChanged:
m_PersistentCalls:
m_Calls: []
+--- !u!1 &2847583706665315191
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3214993924287872455}
+ - component: {fileID: 4468664795937707024}
+ - component: {fileID: 8460138717325046201}
+ m_Layer: 5
+ m_Name: Text (TMP)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3214993924287872455
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2847583706665315191}
+ m_LocalRotation: {x: 1, y: 0, z: 0, w: 0}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 1143634904695382361}
+ m_LocalEulerAnglesHint: {x: 180, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4468664795937707024
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2847583706665315191}
+ m_CullTransparentMesh: 1
+--- !u!114 &8460138717325046201
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2847583706665315191}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Back
+ m_isRightToLeft: 0
+ m_fontAsset: {fileID: 11400000, guid: b04f3173f946b754db673ac13842f4c1, type: 2}
+ m_sharedMaterial: {fileID: 21728410361126204, guid: b04f3173f946b754db673ac13842f4c1, type: 2}
+ m_fontSharedMaterials: []
+ m_fontMaterial: {fileID: 0}
+ m_fontMaterials: []
+ m_fontColor32:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+ m_enableVertexGradient: 0
+ m_colorMode: 3
+ m_fontColorGradient:
+ topLeft: {r: 1, g: 1, b: 1, a: 1}
+ topRight: {r: 1, g: 1, b: 1, a: 1}
+ bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+ bottomRight: {r: 1, g: 1, b: 1, a: 1}
+ m_fontColorGradientPreset: {fileID: 0}
+ m_spriteAsset: {fileID: 0}
+ m_tintAllSprites: 0
+ m_StyleSheet: {fileID: 0}
+ m_TextStyleHashCode: -1183493901
+ m_overrideHtmlColors: 0
+ m_faceColor:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_fontSize: 40
+ m_fontSizeBase: 40
+ m_fontWeight: 400
+ m_enableAutoSizing: 0
+ m_fontSizeMin: 18
+ m_fontSizeMax: 72
+ m_fontStyle: 0
+ m_HorizontalAlignment: 2
+ m_VerticalAlignment: 512
+ m_textAlignment: 65535
+ m_characterSpacing: 0
+ m_wordSpacing: 0
+ m_lineSpacing: 0
+ m_lineSpacingMax: 0
+ m_paragraphSpacing: 0
+ m_charWidthMaxAdj: 0
+ m_enableWordWrapping: 1
+ m_wordWrappingRatios: 0.4
+ m_overflowMode: 0
+ m_linkedTextComponent: {fileID: 0}
+ parentLinkedComponent: {fileID: 0}
+ m_enableKerning: 1
+ m_enableExtraPadding: 0
+ checkPaddingRequired: 0
+ m_isRichText: 1
+ m_parseCtrlCharacters: 1
+ m_isOrthographic: 1
+ m_isCullingEnabled: 0
+ m_horizontalMapping: 0
+ m_verticalMapping: 0
+ m_uvLineOffset: 0
+ m_geometrySortingOrder: 0
+ m_IsTextObjectScaleStatic: 0
+ m_VertexBufferAutoSizeReduction: 0
+ m_useMaxVisibleDescender: 1
+ m_pageToDisplay: 1
+ m_margin: {x: 0, y: 0, z: 0, w: 0}
+ m_isUsingLegacyAnimationComponent: 0
+ m_isVolumetricText: 0
+ m_hasFontAssetChanged: 0
+ m_baseMaterial: {fileID: 0}
+ m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1 &3554032430536705821
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1143634904695382361}
+ - component: {fileID: 6144850760974050223}
+ - component: {fileID: 2486682882303427592}
+ - component: {fileID: 7976059553184794949}
+ m_Layer: 5
+ m_Name: Back
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1143634904695382361
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3554032430536705821}
+ m_LocalRotation: {x: 1, y: 0, z: 0, w: 0}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 3214993924287872455}
+ m_Father: {fileID: 8175218532742092749}
+ m_LocalEulerAnglesHint: {x: 180, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0}
+ m_AnchorMax: {x: 0.5, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 500, y: 70}
+ m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &6144850760974050223
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3554032430536705821}
+ m_CullTransparentMesh: 1
+--- !u!114 &2486682882303427592
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3554032430536705821}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: 20212af14cce713469fe4731c71daf13, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!114 &7976059553184794949
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3554032430536705821}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_WrapAround: 0
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 1
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_SelectedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_SelectedTrigger: Selected
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 2486682882303427592}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 2528519554286326098}
+ m_TargetAssemblyTypeName: FaceDetectUI, Assembly-CSharp
+ m_MethodName: OnBackBtnClicked
+ m_Mode: 1
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
--- !u!1 &4963945909222252759
GameObject:
m_ObjectHideFlags: 0
@@ -496,7 +763,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 8671011216973125690}
- - {fileID: 8187157507461303736}
+ - {fileID: 1143634904695382361}
m_Father: {fileID: 6876832796388901115}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -863,114 +1130,3 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!1 &8707892115324916262
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 8187157507461303736}
- m_Layer: 5
- m_Name: RightPanel
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &8187157507461303736
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8707892115324916262}
- 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_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 5437315403060543764}
- m_Father: {fileID: 8175218532742092749}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 1, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 600, y: 0}
- m_Pivot: {x: 1, y: 0.5}
---- !u!1 &9115426994727668051
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 5437315403060543764}
- - component: {fileID: 8201464007740546615}
- - component: {fileID: 3557048328179530757}
- m_Layer: 5
- m_Name: Image
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &5437315403060543764
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 9115426994727668051}
- 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_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 8187157507461303736}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: -100, y: -100}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &8201464007740546615
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 9115426994727668051}
- m_CullTransparentMesh: 1
---- !u!114 &3557048328179530757
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 9115426994727668051}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 0}
- m_Type: 0
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
- m_PixelsPerUnitMultiplier: 1
diff --git a/Assets/Scenes/FaceDetect.unity b/Assets/Scenes/FaceDetect.unity
index e45fd2b..6d60eab 100644
--- a/Assets/Scenes/FaceDetect.unity
+++ b/Assets/Scenes/FaceDetect.unity
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
- m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
+ m_IndirectSpecularColor: {r: 0.44402242, g: 0.49316543, b: 0.5722324, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -351,6 +351,7 @@ GameObject:
- component: {fileID: 646394128}
- component: {fileID: 646394127}
- component: {fileID: 646394126}
+ - component: {fileID: 646394129}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
@@ -432,6 +433,50 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &646394129
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 646394125}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_RenderShadows: 1
+ m_RequiresDepthTextureOption: 2
+ m_RequiresOpaqueTextureOption: 2
+ m_CameraType: 0
+ m_Cameras: []
+ m_RendererIndex: -1
+ m_VolumeLayerMask:
+ serializedVersion: 2
+ m_Bits: 1
+ m_VolumeTrigger: {fileID: 0}
+ m_VolumeFrameworkUpdateModeOption: 2
+ m_RenderPostProcessing: 0
+ m_Antialiasing: 0
+ m_AntialiasingQuality: 2
+ m_StopNaN: 0
+ m_Dithering: 0
+ m_ClearDepth: 1
+ m_AllowXRRendering: 1
+ m_AllowHDROutput: 1
+ m_UseScreenCoordOverride: 0
+ m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
+ m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
+ m_RequiresDepthTexture: 0
+ m_RequiresColorTexture: 0
+ m_Version: 2
+ m_TaaSettings:
+ quality: 3
+ frameInfluence: 0.1
+ jitterScale: 1
+ mipBias: 0
+ varianceClampScale: 0.9
+ contrastAdaptiveSharpening: 0
--- !u!1 &1014002332
GameObject:
m_ObjectHideFlags: 0
@@ -534,8 +579,8 @@ Transform:
m_GameObject: {fileID: 1014002332}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 451.89722, y: 517.59607, z: 1.1159155}
- m_LocalScale: {x: 1, y: 1, z: 1}
+ m_LocalPosition: {x: -3602, y: 483.1, z: 1145}
+ m_LocalScale: {x: 10, y: 10, z: 10}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
@@ -564,7 +609,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 8e70eedba9f1bed4a8797bcea48dc596, type: 3}
m_Name:
m_EditorClassIdentifier:
- _requestedDeviceName:
+ _requestedDeviceName: 0
_requestedWidth: 640
_requestedHeight: 480
_requestedIsFrontFacing: 0
@@ -575,13 +620,49 @@ MonoBehaviour:
_timeoutFrameCount: 300
onInitialized:
m_PersistentCalls:
- m_Calls: []
+ m_Calls:
+ - m_Target: {fileID: 1014002338}
+ m_TargetAssemblyTypeName: FaceDetectManager, Assembly-CSharp
+ m_MethodName: OnWebCamTextureToMatHelperInitialized
+ m_Mode: 1
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
onDisposed:
m_PersistentCalls:
- m_Calls: []
+ m_Calls:
+ - m_Target: {fileID: 1014002338}
+ m_TargetAssemblyTypeName: FaceDetectManager, Assembly-CSharp
+ m_MethodName: OnWebCamTextureToMatHelperDisposed
+ m_Mode: 1
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
onErrorOccurred:
m_PersistentCalls:
- m_Calls: []
+ m_Calls:
+ - m_Target: {fileID: 1014002338}
+ m_TargetAssemblyTypeName: FaceDetectManager, Assembly-CSharp
+ m_MethodName: OnWebCamTextureToMatHelperErrorOccurred
+ m_Mode: 0
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
avoidAndroidFrontCameraLowLightIssue: 0
--- !u!1 &1359769552
GameObject:
@@ -685,6 +766,143 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
+--- !u!1 &1969623176
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1969623180}
+ - component: {fileID: 1969623179}
+ - component: {fileID: 1969623178}
+ - component: {fileID: 1969623177}
+ m_Layer: 0
+ m_Name: DebugCamera
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!114 &1969623177
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1969623176}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_RenderShadows: 1
+ m_RequiresDepthTextureOption: 2
+ m_RequiresOpaqueTextureOption: 2
+ m_CameraType: 1
+ m_Cameras: []
+ m_RendererIndex: -1
+ m_VolumeLayerMask:
+ serializedVersion: 2
+ m_Bits: 1
+ m_VolumeTrigger: {fileID: 0}
+ m_VolumeFrameworkUpdateModeOption: 2
+ m_RenderPostProcessing: 0
+ m_Antialiasing: 0
+ m_AntialiasingQuality: 2
+ m_StopNaN: 0
+ m_Dithering: 0
+ m_ClearDepth: 1
+ m_AllowXRRendering: 1
+ m_AllowHDROutput: 1
+ m_UseScreenCoordOverride: 0
+ m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
+ m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
+ m_RequiresDepthTexture: 0
+ m_RequiresColorTexture: 0
+ m_Version: 2
+ m_TaaSettings:
+ quality: 3
+ frameInfluence: 0.1
+ jitterScale: 1
+ mipBias: 0
+ varianceClampScale: 0.9
+ contrastAdaptiveSharpening: 0
+--- !u!81 &1969623178
+AudioListener:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1969623176}
+ m_Enabled: 1
+--- !u!20 &1969623179
+Camera:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1969623176}
+ m_Enabled: 1
+ serializedVersion: 2
+ m_ClearFlags: 4
+ m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+ m_projectionMatrixMode: 1
+ m_GateFitMode: 2
+ m_FOVAxisMode: 0
+ m_Iso: 200
+ m_ShutterSpeed: 0.005
+ m_Aperture: 16
+ m_FocusDistance: 10
+ m_FocalLength: 50
+ m_BladeCount: 5
+ m_Curvature: {x: 2, y: 11}
+ m_BarrelClipping: 0.25
+ m_Anamorphism: 0
+ m_SensorSize: {x: 36, y: 24}
+ m_LensShift: {x: 0, y: 0}
+ m_NormalizedViewPortRect:
+ serializedVersion: 2
+ x: 0
+ y: 0
+ width: 1
+ height: 1
+ near clip plane: 0.3
+ far clip plane: 500
+ field of view: 23
+ orthographic: 0
+ orthographic size: 5
+ m_Depth: 0
+ m_CullingMask:
+ serializedVersion: 2
+ m_Bits: 1
+ m_RenderingPath: -1
+ m_TargetTexture: {fileID: 0}
+ 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 &1969623180
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1969623176}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: -3604, y: 481, z: 699}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2144637746
GameObject:
m_ObjectHideFlags: 0
@@ -762,3 +980,4 @@ SceneRoots:
- {fileID: 575233881}
- {fileID: 1359769556}
- {fileID: 2144637749}
+ - {fileID: 1969623180}
diff --git a/Assets/Scenes/YogaMain.unity b/Assets/Scenes/YogaMain.unity
index 0f9740f..239b59d 100644
--- a/Assets/Scenes/YogaMain.unity
+++ b/Assets/Scenes/YogaMain.unity
@@ -937,7 +937,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: df35b0c19ca97734e87299a664cea35f, type: 3}
m_Name:
m_EditorClassIdentifier:
- _requestedDeviceName: 1
+ _requestedDeviceName: 0
_requestedWidth: 1280
_requestedHeight: 960
_requestedIsFrontFacing: 0
diff --git a/Assets/Scripts/PoseCheck/MotionCaptureManager.cs b/Assets/Scripts/PoseCheck/MotionCaptureManager.cs
index 9c86b62..d072c38 100644
--- a/Assets/Scripts/PoseCheck/MotionCaptureManager.cs
+++ b/Assets/Scripts/PoseCheck/MotionCaptureManager.cs
@@ -256,6 +256,11 @@ namespace Yoga
}
}
+ public void OnWebCamTextureToMatHelperErrorOccurred(WebCamTextureToMatHelper.ErrorCode errorCode)
+ {
+ Debug.Log("OnWebCamTextureToMatHelperErrorOccurred " + errorCode);
+ }
+
public void ScoreUpdate()
{
diff --git a/Assets/Scripts/UI/Component.meta b/Assets/Scripts/UI/Component.meta
new file mode 100644
index 0000000..36229b2
--- /dev/null
+++ b/Assets/Scripts/UI/Component.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d2633bc37a5930a4da7b62cf17916ee1
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/FaceDetectManager.cs b/Assets/Scripts/UI/Component/FaceDetectManager.cs
similarity index 68%
rename from Assets/Scripts/FaceDetectManager.cs
rename to Assets/Scripts/UI/Component/FaceDetectManager.cs
index dd5e771..74e7de0 100644
--- a/Assets/Scripts/FaceDetectManager.cs
+++ b/Assets/Scripts/UI/Component/FaceDetectManager.cs
@@ -18,10 +18,19 @@ public class FaceDetectManager : MonoBehaviour
private Mat mat4Process;
private Mat grayMat4Process;
private Mat mat4Display;
+ private Mat mat4DisplayTexture;
private Mat lndmrk;
private MatOfRect detectionResult;
private Rect detectRect;
int[] faceRect = new int[4];
+ bool webCamReady = false;
+
+ int webCamOrVideoOrImage = 0; //0 : webcam, 1 : video, 2 : image
+ int lndmrkMode = 1; //0: 51, 1: 84
+ int lndmrkLevel = 3;
+ bool kalmanOrNot = true;
+
+ float lndmrkEstScore;
private FaceDetectUI panel;
@@ -58,8 +67,8 @@ public class FaceDetectManager : MonoBehaviour
if (mat4Display != null)
mat4Display.Dispose();
- //if (mat4DisplayTexture != null)
- // mat4DisplayTexture.Dispose();
+ if (mat4DisplayTexture != null)
+ mat4DisplayTexture.Dispose();
//if (probExp != null)
// probExp.Dispose();
@@ -173,14 +182,44 @@ public class FaceDetectManager : MonoBehaviour
return;
mat4Display = _webCamTextureToMatHelper.GetMat();
- mat4Display.copyTo(mat4Process);
+ //mat4Display.copyTo(mat4Process);
+ mat4Process = mat4Display.clone();
//Face Detect
panel.RefreshData(LandmarkDetect());
+
+ if (webCamReady == true)
+ {
+ if (mat4Display.rows() == videoTexture.height)
+ {
+ mat4Display.copyTo(mat4DisplayTexture);
+ Utils.matToTexture2D(mat4DisplayTexture, videoTexture);
+ }
+ }
}
private Dictionary<string, string> LandmarkDetect()
{
+ if (dnnUtils.GetEstimateLandmarkSuccessOrNot() == false || lndmrkEstScore < 0.25) //If It Failed To Track Facial Landmark in Previous Frame
+ {
+ //Face Detect!!!
+ Imgproc.cvtColor(mat4Process, grayMat4Process, OpenCVCompact.Imgproc.COLOR_RGBA2GRAY); //Face Detection Should Use Gray Image
+
+ if (dnnUtils.DetectFace(grayMat4Process, detectionResult, 32, 1024, true)) //Detect Face
+ {
+ detectRect = detectionResult.toArray()[0];
+ faceRect[0] = detectRect.x; faceRect[1] = detectRect.y; faceRect[2] = detectRect.width; faceRect[3] = detectRect.height;
+
+ lndmrkEstScore = dnnUtils.EstimateFacialLandmark(mat4Process.nativeObj, ref faceRect[0], lndmrk.nativeObj, lndmrkMode, kalmanOrNot, lndmrkLevel);
+ }
+ }
+ else
+ {
+ //Track Facial Landmark If It Succeeded In Previous Frame
+ faceRect = dnnUtils.SquareFromInnerLandmark(lndmrk.nativeObj);
+ lndmrkEstScore = dnnUtils.EstimateFacialLandmark(mat4Process.nativeObj, ref faceRect[0], lndmrk.nativeObj, lndmrkMode, kalmanOrNot, lndmrkLevel);
+ }
+
Mat prob = new Mat();
Dictionary<string, string> retVal = null;
@@ -209,4 +248,49 @@ public class FaceDetectManager : MonoBehaviour
return retVal;
}
+
+ public void OnWebCamTextureToMatHelperInitialized()
+ {
+ Mat webCamTextureMat = _webCamTextureToMatHelper.GetMat();
+
+ videoTexture = new Texture2D(webCamTextureMat.cols(), webCamTextureMat.rows(), TextureFormat.RGBA32, false);
+ gameObject.GetComponent<Renderer>().material.mainTexture = videoTexture;
+ gameObject.transform.localScale = new Vector3(webCamTextureMat.cols(), webCamTextureMat.rows(), 1);
+
+ mat4Display = new Mat(webCamTextureMat.rows(), webCamTextureMat.cols(), CvType.CV_8UC4);
+ mat4DisplayTexture = new Mat(webCamTextureMat.rows(), webCamTextureMat.cols(), CvType.CV_8UC4);
+
+ Debug.Log("Screen.width " + Screen.width + " Screen.height " + Screen.height + " Screen.orientation " + Screen.orientation);
+
+ float width = webCamTextureMat.width();
+ float height = webCamTextureMat.height();
+
+ float widthScale = (float)Screen.width / width;
+ float heightScale = (float)Screen.height / height;
+ if (widthScale < heightScale)
+ {
+ Camera.main.orthographicSize = (width * (float)Screen.height / (float)Screen.width) / 2;
+ }
+ else
+ {
+ Camera.main.orthographicSize = height / 2;
+ }
+
+ dnnUtils.InitHeadPoseEstimationCameraInfo(webCamTextureMat.cols(), webCamTextureMat.rows());
+
+ webCamReady = true;
+ Debug.Log("OnWebCamTextureToMatHelperInitialized");
+ }
+
+
+ public void OnWebCamTextureToMatHelperDisposed()
+ {
+ Debug.Log("OnWebCamTextureToMatHelperDisposed");
+
+ }
+
+ public void OnWebCamTextureToMatHelperErrorOccurred(OpenCVCompact.WebCamTextureToMatHelper.ErrorCode errorCode)
+ {
+ Debug.Log("OnWebCamTextureToMatHelperErrorOccurred " + errorCode);
+ }
}
diff --git a/Assets/Scripts/FaceDetectManager.cs.meta b/Assets/Scripts/UI/Component/FaceDetectManager.cs.meta
similarity index 100%
rename from Assets/Scripts/FaceDetectManager.cs.meta
rename to Assets/Scripts/UI/Component/FaceDetectManager.cs.meta
diff --git a/Assets/Scripts/MeditationManager.cs b/Assets/Scripts/UI/Component/MeditationManager.cs
similarity index 100%
rename from Assets/Scripts/MeditationManager.cs
rename to Assets/Scripts/UI/Component/MeditationManager.cs
diff --git a/Assets/Scripts/MeditationManager.cs.meta b/Assets/Scripts/UI/Component/MeditationManager.cs.meta
similarity index 100%
rename from Assets/Scripts/MeditationManager.cs.meta
rename to Assets/Scripts/UI/Component/MeditationManager.cs.meta
diff --git a/Assets/PanelItemManager.cs b/Assets/Scripts/UI/Component/PanelItemManager.cs
similarity index 86%
rename from Assets/PanelItemManager.cs
rename to Assets/Scripts/UI/Component/PanelItemManager.cs
index 74d1d77..ffe42d1 100644
--- a/Assets/PanelItemManager.cs
+++ b/Assets/Scripts/UI/Component/PanelItemManager.cs
@@ -1,7 +1,5 @@
using TMPro;
-using TMPro.EditorUtilities;
using UnityEngine;
-using UnityEngine.UI;
public class PanelItemManager : MonoBehaviour
{
diff --git a/Assets/PanelItemManager.cs.meta b/Assets/Scripts/UI/Component/PanelItemManager.cs.meta
similarity index 100%
rename from Assets/PanelItemManager.cs.meta
rename to Assets/Scripts/UI/Component/PanelItemManager.cs.meta
diff --git a/Assets/Scripts/UI/FaceDetectUI.cs b/Assets/Scripts/UI/FaceDetectUI.cs
index ec93778..65145d9 100644
--- a/Assets/Scripts/UI/FaceDetectUI.cs
+++ b/Assets/Scripts/UI/FaceDetectUI.cs
@@ -59,4 +59,10 @@ public class FaceDetectUI : UIPanelBase
index++;
}
}
+
+ public void OnBackBtnClicked()
+ {
+ UIManager.Instance.CloseCurrent();
+ LoadingManager.Instance.Load("Boot");
+ }
}
diff --git a/Assets/Settings/High_PipelineAsset.asset b/Assets/Settings/High_PipelineAsset.asset
index 8846396..d02775d 100644
--- a/Assets/Settings/High_PipelineAsset.asset
+++ b/Assets/Settings/High_PipelineAsset.asset
@@ -35,7 +35,6 @@ MonoBehaviour:
m_ShEvalMode: 0
m_LightProbeSystem: 0
m_ProbeVolumeMemoryBudget: 1024
- m_ProbeVolumeBlendingMemoryBudget: 128
m_SupportProbeVolumeStreaming: 0
m_ProbeVolumeSHBands: 1
m_MainLightRenderingMode: 1
@@ -116,6 +115,10 @@ MonoBehaviour:
m_PrefilterDBufferMRT1: 1
m_PrefilterDBufferMRT2: 1
m_PrefilterDBufferMRT3: 1
+ m_PrefilterSoftShadowsQualityLow: 1
+ m_PrefilterSoftShadowsQualityMedium: 1
+ m_PrefilterSoftShadowsQualityHigh: 1
+ m_PrefilterSoftShadows: 0
m_PrefilterScreenCoord: 1
m_PrefilterNativeRenderPass: 1
m_ShaderVariantLogLevel: 0
diff --git a/Assets/Settings/Low_PipelineAsset.asset b/Assets/Settings/Low_PipelineAsset.asset
index 7a2859c..9ab9a63 100644
--- a/Assets/Settings/Low_PipelineAsset.asset
+++ b/Assets/Settings/Low_PipelineAsset.asset
@@ -35,7 +35,6 @@ MonoBehaviour:
m_ShEvalMode: 0
m_LightProbeSystem: 0
m_ProbeVolumeMemoryBudget: 1024
- m_ProbeVolumeBlendingMemoryBudget: 128
m_SupportProbeVolumeStreaming: 0
m_ProbeVolumeSHBands: 1
m_MainLightRenderingMode: 0
@@ -116,6 +115,10 @@ MonoBehaviour:
m_PrefilterDBufferMRT1: 1
m_PrefilterDBufferMRT2: 1
m_PrefilterDBufferMRT3: 1
+ m_PrefilterSoftShadowsQualityLow: 1
+ m_PrefilterSoftShadowsQualityMedium: 1
+ m_PrefilterSoftShadowsQualityHigh: 1
+ m_PrefilterSoftShadows: 0
m_PrefilterScreenCoord: 1
m_PrefilterNativeRenderPass: 1
m_ShaderVariantLogLevel: 0
diff --git a/Assets/Settings/Medium_PipelineAsset.asset b/Assets/Settings/Medium_PipelineAsset.asset
index 4d2cd4a..ce5f95e 100644
--- a/Assets/Settings/Medium_PipelineAsset.asset
+++ b/Assets/Settings/Medium_PipelineAsset.asset
@@ -35,7 +35,6 @@ MonoBehaviour:
m_ShEvalMode: 0
m_LightProbeSystem: 0
m_ProbeVolumeMemoryBudget: 1024
- m_ProbeVolumeBlendingMemoryBudget: 128
m_SupportProbeVolumeStreaming: 0
m_ProbeVolumeSHBands: 1
m_MainLightRenderingMode: 1
@@ -116,6 +115,10 @@ MonoBehaviour:
m_PrefilterDBufferMRT1: 1
m_PrefilterDBufferMRT2: 1
m_PrefilterDBufferMRT3: 1
+ m_PrefilterSoftShadowsQualityLow: 1
+ m_PrefilterSoftShadowsQualityMedium: 1
+ m_PrefilterSoftShadowsQualityHigh: 1
+ m_PrefilterSoftShadows: 0
m_PrefilterScreenCoord: 1
m_PrefilterNativeRenderPass: 1
m_ShaderVariantLogLevel: 0
diff --git a/Assets/Settings/URP-HighFidelity.asset b/Assets/Settings/URP-HighFidelity.asset
index d86cae7..3cb2db2 100644
--- a/Assets/Settings/URP-HighFidelity.asset
+++ b/Assets/Settings/URP-HighFidelity.asset
@@ -35,7 +35,6 @@ MonoBehaviour:
m_ShEvalMode: 0
m_LightProbeSystem: 0
m_ProbeVolumeMemoryBudget: 1024
- m_ProbeVolumeBlendingMemoryBudget: 128
m_SupportProbeVolumeStreaming: 0
m_ProbeVolumeSHBands: 1
m_MainLightRenderingMode: 1
@@ -116,6 +115,10 @@ MonoBehaviour:
m_PrefilterDBufferMRT1: 1
m_PrefilterDBufferMRT2: 1
m_PrefilterDBufferMRT3: 1
+ m_PrefilterSoftShadowsQualityLow: 1
+ m_PrefilterSoftShadowsQualityMedium: 1
+ m_PrefilterSoftShadowsQualityHigh: 1
+ m_PrefilterSoftShadows: 0
m_PrefilterScreenCoord: 1
m_PrefilterNativeRenderPass: 1
m_ShaderVariantLogLevel: 0
diff --git a/Assets/Settings/Very High_PipelineAsset.asset b/Assets/Settings/Very High_PipelineAsset.asset
index d948755..9a259f5 100644
--- a/Assets/Settings/Very High_PipelineAsset.asset
+++ b/Assets/Settings/Very High_PipelineAsset.asset
@@ -35,7 +35,6 @@ MonoBehaviour:
m_ShEvalMode: 0
m_LightProbeSystem: 0
m_ProbeVolumeMemoryBudget: 1024
- m_ProbeVolumeBlendingMemoryBudget: 128
m_SupportProbeVolumeStreaming: 0
m_ProbeVolumeSHBands: 1
m_MainLightRenderingMode: 1
@@ -116,6 +115,10 @@ MonoBehaviour:
m_PrefilterDBufferMRT1: 1
m_PrefilterDBufferMRT2: 1
m_PrefilterDBufferMRT3: 1
+ m_PrefilterSoftShadowsQualityLow: 1
+ m_PrefilterSoftShadowsQualityMedium: 1
+ m_PrefilterSoftShadowsQualityHigh: 1
+ m_PrefilterSoftShadows: 0
m_PrefilterScreenCoord: 1
m_PrefilterNativeRenderPass: 1
m_ShaderVariantLogLevel: 0
diff --git a/Assets/Settings/Very Low_PipelineAsset.asset b/Assets/Settings/Very Low_PipelineAsset.asset
index 7621229..3120c7d 100644
--- a/Assets/Settings/Very Low_PipelineAsset.asset
+++ b/Assets/Settings/Very Low_PipelineAsset.asset
@@ -35,7 +35,6 @@ MonoBehaviour:
m_ShEvalMode: 0
m_LightProbeSystem: 0
m_ProbeVolumeMemoryBudget: 1024
- m_ProbeVolumeBlendingMemoryBudget: 128
m_SupportProbeVolumeStreaming: 0
m_ProbeVolumeSHBands: 1
m_MainLightRenderingMode: 0
@@ -116,6 +115,10 @@ MonoBehaviour:
m_PrefilterDBufferMRT1: 1
m_PrefilterDBufferMRT2: 1
m_PrefilterDBufferMRT3: 1
+ m_PrefilterSoftShadowsQualityLow: 1
+ m_PrefilterSoftShadowsQualityMedium: 1
+ m_PrefilterSoftShadowsQualityHigh: 1
+ m_PrefilterSoftShadows: 0
m_PrefilterScreenCoord: 1
m_PrefilterNativeRenderPass: 1
m_ShaderVariantLogLevel: 0
diff --git a/Packages/manifest.json b/Packages/manifest.json
index 42e4171..6deb1f8 100644
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -6,7 +6,7 @@
"com.unity.adaptiveperformance.samsung.android": "5.0.0",
"com.unity.feature.characters-animation": "1.0.0",
"com.unity.ide.visualstudio": "2.0.22",
- "com.unity.render-pipelines.universal": "15.0.6",
+ "com.unity.render-pipelines.universal": "15.0.7",
"com.unity.textmeshpro": "3.0.6",
"com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.6",
"com.unity.ugui": "1.0.0",
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
index 2ce4815..6ea0eab 100644
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -51,7 +51,7 @@
"url": "https://packages.unity.cn"
},
"com.unity.burst": {
- "version": "1.8.8",
+ "version": "1.8.9",
"depth": 1,
"source": "registry",
"dependencies": {
@@ -120,7 +120,7 @@
"url": "https://packages.unity.cn"
},
"com.unity.render-pipelines.core": {
- "version": "15.0.6",
+ "version": "15.0.7",
"depth": 1,
"source": "builtin",
"dependencies": {
@@ -132,14 +132,14 @@
}
},
"com.unity.render-pipelines.universal": {
- "version": "15.0.6",
+ "version": "15.0.7",
"depth": 0,
"source": "builtin",
"dependencies": {
"com.unity.mathematics": "1.2.1",
"com.unity.burst": "1.8.4",
- "com.unity.render-pipelines.core": "15.0.6",
- "com.unity.shadergraph": "15.0.6"
+ "com.unity.render-pipelines.core": "15.0.7",
+ "com.unity.shadergraph": "15.0.7"
}
},
"com.unity.searcher": {
@@ -150,11 +150,11 @@
"url": "https://packages.unity.cn"
},
"com.unity.shadergraph": {
- "version": "15.0.6",
+ "version": "15.0.7",
"depth": 1,
"source": "builtin",
"dependencies": {
- "com.unity.render-pipelines.core": "15.0.6",
+ "com.unity.render-pipelines.core": "15.0.7",
"com.unity.searcher": "4.9.2"
}
},
@@ -175,7 +175,7 @@
"url": "https://packages.unity.cn"
},
"com.unity.test-framework": {
- "version": "1.3.7",
+ "version": "1.3.9",
"depth": 1,
"source": "registry",
"dependencies": {
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index a5f7436..3c23873 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -48,6 +48,7 @@ PlayerSettings:
defaultScreenHeightWeb: 600
m_StereoRenderingPath: 0
m_ActiveColorSpace: 0
+ unsupportedMSAAFallback: 0
m_SpriteBatchVertexThreshold: 300
m_MTRendering: 1
mipStripping: 0
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
index 84faf9e..82ffd74 100644
--- a/ProjectSettings/ProjectVersion.txt
+++ b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2023.1.13f1c1
-m_EditorVersionWithRevision: 2023.1.13f1c1 (7c920d2dc0bc)
+m_EditorVersion: 2023.1.17f1c1
+m_EditorVersionWithRevision: 2023.1.17f1c1 (2400b5b7cae7)