diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 3dda58c106b577b58651c4fc781586d0f7faf9fa..e57576b74fc731d72c14f81b8d1ed06b20518051 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -852,7 +852,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Robot + m_Text: Mecha --- !u!222 &189453259 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2754,7 +2754,7 @@ Transform: - {fileID: 241179323} - {fileID: 241179321} m_Father: {fileID: 782819392} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &241179497 Transform: @@ -5733,7 +5733,7 @@ Transform: m_Children: - {fileID: 1266035751} m_Father: {fileID: 782819392} - m_RootOrder: 13 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!20 &539534430 Camera: @@ -5875,7 +5875,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 924189286} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -6053,7 +6053,6 @@ Transform: - {fileID: 1519727646} - {fileID: 2383778768217413471} - {fileID: 985577061} - - {fileID: 2039451268} - {fileID: 241179495} - {fileID: 1592921463} - {fileID: 881816033} @@ -6217,7 +6216,7 @@ Transform: m_Children: - {fileID: 924189286} m_Father: {fileID: 782819392} - m_RootOrder: 12 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &881816034 MonoBehaviour: @@ -6238,6 +6237,7 @@ MonoBehaviour: - {fileID: 2383778768216918911} - {fileID: 241665863} - {fileID: 985577081} + - {fileID: 1592921482} RealPersonProjection: {fileID: 287174137} RealBackground: {fileID: 332210471} AvatarManager: {fileID: 928895621} @@ -6326,6 +6326,7 @@ RectTransform: - {fileID: 1986184004} - {fileID: 1757447972} - {fileID: 134227187} + - {fileID: 1800909956} - {fileID: 1233076193} - {fileID: 685852293} m_Father: {fileID: 881816033} @@ -8553,7 +8554,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 924189286} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -8930,6 +8931,85 @@ Camera: type: 3} m_PrefabInstance: {fileID: 1819456834} m_PrefabAsset: {fileID: 0} +--- !u!1 &1419357101 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1419357102} + - component: {fileID: 1419357104} + - component: {fileID: 1419357103} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1419357102 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1419357101} + 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: 1800909956} + m_RootOrder: 0 + 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: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1419357103 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1419357101} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 50 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 5 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Robot +--- !u!222 &1419357104 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1419357101} + m_CullTransparentMesh: 1 --- !u!1 &1519727644 GameObject: m_ObjectHideFlags: 0 @@ -9107,7 +9187,7 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: 3d0648eeb83656f478c0d4608694cce5, type: 3} propertyPath: m_RootOrder - value: 11 + value: 10 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 3d0648eeb83656f478c0d4608694cce5, type: 3} @@ -10325,6 +10405,139 @@ MonoBehaviour: m_EditorClassIdentifier: StreamingClient: {fileID: 1519727645} RigidBodyId: 4 +--- !u!1 &1800909955 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1800909956} + - component: {fileID: 1800909959} + - component: {fileID: 1800909958} + - component: {fileID: 1800909957} + m_Layer: 5 + m_Name: SetRobot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1800909956 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1800909955} + 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: + - {fileID: 1419357102} + m_Father: {fileID: 924189286} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 1142, y: -431} + m_SizeDelta: {x: 200, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1800909957 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1800909955} + 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: 1800909958} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 881816034} + m_TargetAssemblyTypeName: ModesManager, Assembly-CSharp + m_MethodName: SetAvatar + m_Mode: 3 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 4 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1800909958 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1800909955} + 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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!222 &1800909959 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1800909955} + m_CullTransparentMesh: 1 --- !u!1 &1809509451 GameObject: m_ObjectHideFlags: 0 @@ -10762,10 +10975,6 @@ MonoBehaviour: WebcamScreen: {fileID: 332210471} ForegroundScreen: {fileID: 287174137} WebcamCamera: {fileID: 1567017347} - isDiagonalFOV: 1 - WebcamFOVInDegrees: 60 - TVDiagonalSizeInInches: 84 - PersonHeightInMeters: 1.72 BackWallDistanceInMeters: 4 DisplayCamera: {fileID: 963194227} DisplayCameraPoint: {fileID: 817502362} @@ -10825,7 +11034,7 @@ GameObject: - component: {fileID: 1986184006} - component: {fileID: 1986184005} m_Layer: 5 - m_Name: SetRobot + m_Name: SetMecha m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -10945,674 +11154,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1986184003} m_CullTransparentMesh: 1 ---- !u!1001 &2039451267 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 782819392} - m_Modifications: - - target: {fileID: 100096, guid: 412b92d4feeb9c548bfa98f62c4d1022, type: 3} - propertyPath: m_Name - value: unitychan - objectReference: {fileID: 0} - - target: {fileID: 100096, guid: 412b92d4feeb9c548bfa98f62c4d1022, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400096, guid: 412b92d4feeb9c548bfa98f62c4d1022, type: 3} - propertyPath: m_RootOrder - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 400096, guid: 412b92d4feeb9c548bfa98f62c4d1022, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400096, guid: 412b92d4feeb9c548bfa98f62c4d1022, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400096, guid: 412b92d4feeb9c548bfa98f62c4d1022, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400096, guid: 412b92d4feeb9c548bfa98f62c4d1022, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400096, guid: 412b92d4feeb9c548bfa98f62c4d1022, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 400096, guid: 412b92d4feeb9c548bfa98f62c4d1022, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 400096, guid: 412b92d4feeb9c548bfa98f62c4d1022, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 400096, guid: 412b92d4feeb9c548bfa98f62c4d1022, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400096, guid: 412b92d4feeb9c548bfa98f62c4d1022, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400096, guid: 412b92d4feeb9c548bfa98f62c4d1022, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9500000, guid: 412b92d4feeb9c548bfa98f62c4d1022, type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9500000, guid: 412b92d4feeb9c548bfa98f62c4d1022, type: 3} - propertyPath: m_Controller - value: - objectReference: {fileID: 9100000, guid: bca31d1e90f2d8d4dbb2f09e005fd8ee, type: 2} - m_RemovedComponents: - - {fileID: 11400002, guid: 412b92d4feeb9c548bfa98f62c4d1022, type: 3} - - {fileID: 11400000, guid: 412b92d4feeb9c548bfa98f62c4d1022, type: 3} - - {fileID: 11400004, guid: 412b92d4feeb9c548bfa98f62c4d1022, type: 3} - m_SourcePrefab: {fileID: 100100000, guid: 412b92d4feeb9c548bfa98f62c4d1022, type: 3} ---- !u!4 &2039451268 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400096, guid: 412b92d4feeb9c548bfa98f62c4d1022, - type: 3} - m_PrefabInstance: {fileID: 2039451267} - m_PrefabAsset: {fileID: 0} ---- !u!4 &2039451269 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400022, guid: 412b92d4feeb9c548bfa98f62c4d1022, - type: 3} - m_PrefabInstance: {fileID: 2039451267} - m_PrefabAsset: {fileID: 0} ---- !u!4 &2039451270 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400214, guid: 412b92d4feeb9c548bfa98f62c4d1022, - type: 3} - m_PrefabInstance: {fileID: 2039451267} - m_PrefabAsset: {fileID: 0} ---- !u!4 &2039451271 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400186, guid: 412b92d4feeb9c548bfa98f62c4d1022, - type: 3} - m_PrefabInstance: {fileID: 2039451267} - m_PrefabAsset: {fileID: 0} ---- !u!4 &2039451272 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400178, guid: 412b92d4feeb9c548bfa98f62c4d1022, - type: 3} - m_PrefabInstance: {fileID: 2039451267} - m_PrefabAsset: {fileID: 0} ---- !u!4 &2039451273 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400282, guid: 412b92d4feeb9c548bfa98f62c4d1022, - type: 3} - m_PrefabInstance: {fileID: 2039451267} - m_PrefabAsset: {fileID: 0} ---- !u!4 &2039451274 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400230, guid: 412b92d4feeb9c548bfa98f62c4d1022, - type: 3} - m_PrefabInstance: {fileID: 2039451267} - m_PrefabAsset: {fileID: 0} ---- !u!4 &2039451275 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400224, guid: 412b92d4feeb9c548bfa98f62c4d1022, - type: 3} - m_PrefabInstance: {fileID: 2039451267} - m_PrefabAsset: {fileID: 0} ---- !u!4 &2039451276 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400002, guid: 412b92d4feeb9c548bfa98f62c4d1022, - type: 3} - m_PrefabInstance: {fileID: 2039451267} - m_PrefabAsset: {fileID: 0} ---- !u!4 &2039451277 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400260, guid: 412b92d4feeb9c548bfa98f62c4d1022, - type: 3} - m_PrefabInstance: {fileID: 2039451267} - m_PrefabAsset: {fileID: 0} ---- !u!4 &2039451278 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400220, guid: 412b92d4feeb9c548bfa98f62c4d1022, - type: 3} - m_PrefabInstance: {fileID: 2039451267} - m_PrefabAsset: {fileID: 0} ---- !u!4 &2039451279 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400104, guid: 412b92d4feeb9c548bfa98f62c4d1022, - type: 3} - m_PrefabInstance: {fileID: 2039451267} - m_PrefabAsset: {fileID: 0} ---- !u!4 &2039451280 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400310, guid: 412b92d4feeb9c548bfa98f62c4d1022, - type: 3} - m_PrefabInstance: {fileID: 2039451267} - m_PrefabAsset: {fileID: 0} ---- !u!4 &2039451281 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400042, guid: 412b92d4feeb9c548bfa98f62c4d1022, - type: 3} - m_PrefabInstance: {fileID: 2039451267} - m_PrefabAsset: {fileID: 0} ---- !u!4 &2039451282 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400004, guid: 412b92d4feeb9c548bfa98f62c4d1022, - type: 3} - m_PrefabInstance: {fileID: 2039451267} - m_PrefabAsset: {fileID: 0} ---- !u!4 &2039451283 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400162, guid: 412b92d4feeb9c548bfa98f62c4d1022, - type: 3} - m_PrefabInstance: {fileID: 2039451267} - m_PrefabAsset: {fileID: 0} ---- !u!4 &2039451284 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400058, guid: 412b92d4feeb9c548bfa98f62c4d1022, - type: 3} - m_PrefabInstance: {fileID: 2039451267} - m_PrefabAsset: {fileID: 0} ---- !u!4 &2039451285 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400068, guid: 412b92d4feeb9c548bfa98f62c4d1022, - type: 3} - m_PrefabInstance: {fileID: 2039451267} - m_PrefabAsset: {fileID: 0} ---- !u!4 &2039451286 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400200, guid: 412b92d4feeb9c548bfa98f62c4d1022, - type: 3} - m_PrefabInstance: {fileID: 2039451267} - m_PrefabAsset: {fileID: 0} ---- !u!1 &2039451287 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 100096, guid: 412b92d4feeb9c548bfa98f62c4d1022, - type: 3} - m_PrefabInstance: {fileID: 2039451267} - m_PrefabAsset: {fileID: 0} ---- !u!114 &2039451288 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2039451287} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a70e525c82ce9413fa4d940ad7fcf1db, type: 3} - m_Name: - m_EditorClassIdentifier: - fixTransforms: 1 - references: - root: {fileID: 2039451268} - pelvis: {fileID: 2039451286} - leftThigh: {fileID: 2039451283} - leftCalf: {fileID: 2039451284} - leftFoot: {fileID: 2039451285} - rightThigh: {fileID: 2039451280} - rightCalf: {fileID: 2039451281} - rightFoot: {fileID: 2039451282} - leftUpperArm: {fileID: 2039451274} - leftForearm: {fileID: 2039451275} - leftHand: {fileID: 2039451276} - rightUpperArm: {fileID: 2039451270} - rightForearm: {fileID: 2039451271} - rightHand: {fileID: 2039451272} - head: {fileID: 2039451269} - spine: - - {fileID: 2039451279} - - {fileID: 2039451278} - eyes: [] - solver: - executedInEditor: 0 - IKPosition: {x: 0, y: 0, z: 0} - IKPositionWeight: 1 - root: {fileID: 2039451268} - iterations: 4 - chain: - - pin: 0 - pull: 1 - push: 0 - pushParent: 0 - reach: 0.1 - reachSmoothing: 1 - pushSmoothing: 1 - nodes: - - transform: {fileID: 2039451279} - weight: 1 - solverPosition: {x: 0, y: 0, z: 0} - solverRotation: {x: 0, y: 0, z: 0, w: 1} - defaultLocalPosition: {x: 0, y: 0, z: 0} - defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0} - length: 0 - effectorPositionWeight: 0 - effectorRotationWeight: 0 - offset: {x: 0, y: 0, z: 0} - children: 01000000020000000300000004000000 - childConstraints: - - pushElasticity: 0 - pullElasticity: 1 - bone1: {fileID: 2039451274} - bone2: {fileID: 2039451280} - - pushElasticity: 0 - pullElasticity: 1 - bone1: {fileID: 2039451270} - bone2: {fileID: 2039451283} - - pushElasticity: 0 - pullElasticity: 0 - bone1: {fileID: 2039451274} - bone2: {fileID: 2039451270} - - pushElasticity: 0 - pullElasticity: 0 - bone1: {fileID: 2039451283} - bone2: {fileID: 2039451280} - bendConstraint: - bone1: {fileID: 0} - bone2: {fileID: 0} - bone3: {fileID: 0} - bendGoal: {fileID: 0} - direction: {x: 1, y: 0, z: 0} - rotationOffset: {x: 0, y: 0, z: 0, w: 0} - weight: 0 - defaultLocalDirection: {x: 0, y: 0, z: 0} - defaultChildDirection: {x: 0, y: 0, z: 0} - - pin: 0 - pull: 1 - push: 0 - pushParent: 0 - reach: 0.1 - reachSmoothing: 1 - pushSmoothing: 1 - nodes: - - transform: {fileID: 2039451274} - weight: 1 - solverPosition: {x: 0, y: 0, z: 0} - solverRotation: {x: 0, y: 0, z: 0, w: 1} - defaultLocalPosition: {x: 0, y: 0, z: 0} - defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0} - length: 0 - effectorPositionWeight: 0 - effectorRotationWeight: 0 - offset: {x: 0, y: 0, z: 0} - - transform: {fileID: 2039451275} - weight: 1 - solverPosition: {x: 0, y: 0, z: 0} - solverRotation: {x: 0, y: 0, z: 0, w: 1} - defaultLocalPosition: {x: 0, y: 0, z: 0} - defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0} - length: 0 - effectorPositionWeight: 0 - effectorRotationWeight: 0 - offset: {x: 0, y: 0, z: 0} - - transform: {fileID: 2039451276} - weight: 1 - solverPosition: {x: 0, y: 0, z: 0} - solverRotation: {x: 0, y: 0, z: 0, w: 1} - defaultLocalPosition: {x: 0, y: 0, z: 0} - defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0} - length: 0 - effectorPositionWeight: 0 - effectorRotationWeight: 0 - offset: {x: 0, y: 0, z: 0} - children: - childConstraints: [] - bendConstraint: - bone1: {fileID: 0} - bone2: {fileID: 0} - bone3: {fileID: 0} - bendGoal: {fileID: 0} - direction: {x: 1, y: 0, z: 0} - rotationOffset: {x: 0, y: 0, z: 0, w: 0} - weight: 1 - defaultLocalDirection: {x: 0, y: 0, z: 0} - defaultChildDirection: {x: 0, y: 0, z: 0} - - pin: 0 - pull: 1 - push: 0 - pushParent: 0 - reach: 0.1 - reachSmoothing: 1 - pushSmoothing: 1 - nodes: - - transform: {fileID: 2039451270} - weight: 1 - solverPosition: {x: 0, y: 0, z: 0} - solverRotation: {x: 0, y: 0, z: 0, w: 1} - defaultLocalPosition: {x: 0, y: 0, z: 0} - defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0} - length: 0 - effectorPositionWeight: 0 - effectorRotationWeight: 0 - offset: {x: 0, y: 0, z: 0} - - transform: {fileID: 2039451271} - weight: 1 - solverPosition: {x: 0, y: 0, z: 0} - solverRotation: {x: 0, y: 0, z: 0, w: 1} - defaultLocalPosition: {x: 0, y: 0, z: 0} - defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0} - length: 0 - effectorPositionWeight: 0 - effectorRotationWeight: 0 - offset: {x: 0, y: 0, z: 0} - - transform: {fileID: 2039451272} - weight: 1 - solverPosition: {x: 0, y: 0, z: 0} - solverRotation: {x: 0, y: 0, z: 0, w: 1} - defaultLocalPosition: {x: 0, y: 0, z: 0} - defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0} - length: 0 - effectorPositionWeight: 0 - effectorRotationWeight: 0 - offset: {x: 0, y: 0, z: 0} - children: - childConstraints: [] - bendConstraint: - bone1: {fileID: 0} - bone2: {fileID: 0} - bone3: {fileID: 0} - bendGoal: {fileID: 0} - direction: {x: 1, y: 0, z: 0} - rotationOffset: {x: 0, y: 0, z: 0, w: 0} - weight: 1 - defaultLocalDirection: {x: 0, y: 0, z: 0} - defaultChildDirection: {x: 0, y: 0, z: 0} - - pin: 0 - pull: 1 - push: 0 - pushParent: 0 - reach: 0.1 - reachSmoothing: 1 - pushSmoothing: 1 - nodes: - - transform: {fileID: 2039451283} - weight: 1 - solverPosition: {x: 0, y: 0, z: 0} - solverRotation: {x: 0, y: 0, z: 0, w: 1} - defaultLocalPosition: {x: 0, y: 0, z: 0} - defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0} - length: 0 - effectorPositionWeight: 0 - effectorRotationWeight: 0 - offset: {x: 0, y: 0, z: 0} - - transform: {fileID: 2039451284} - weight: 1 - solverPosition: {x: 0, y: 0, z: 0} - solverRotation: {x: 0, y: 0, z: 0, w: 1} - defaultLocalPosition: {x: 0, y: 0, z: 0} - defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0} - length: 0 - effectorPositionWeight: 0 - effectorRotationWeight: 0 - offset: {x: 0, y: 0, z: 0} - - transform: {fileID: 2039451285} - weight: 1 - solverPosition: {x: 0, y: 0, z: 0} - solverRotation: {x: 0, y: 0, z: 0, w: 1} - defaultLocalPosition: {x: 0, y: 0, z: 0} - defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0} - length: 0 - effectorPositionWeight: 0 - effectorRotationWeight: 0 - offset: {x: 0, y: 0, z: 0} - children: - childConstraints: [] - bendConstraint: - bone1: {fileID: 0} - bone2: {fileID: 0} - bone3: {fileID: 0} - bendGoal: {fileID: 0} - direction: {x: 1, y: 0, z: 0} - rotationOffset: {x: 0, y: 0, z: 0, w: 0} - weight: 1 - defaultLocalDirection: {x: 0, y: 0, z: 0} - defaultChildDirection: {x: 0, y: 0, z: 0} - - pin: 0 - pull: 1 - push: 0 - pushParent: 0 - reach: 0.1 - reachSmoothing: 1 - pushSmoothing: 1 - nodes: - - transform: {fileID: 2039451280} - weight: 1 - solverPosition: {x: 0, y: 0, z: 0} - solverRotation: {x: 0, y: 0, z: 0, w: 1} - defaultLocalPosition: {x: 0, y: 0, z: 0} - defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0} - length: 0 - effectorPositionWeight: 0 - effectorRotationWeight: 0 - offset: {x: 0, y: 0, z: 0} - - transform: {fileID: 2039451281} - weight: 1 - solverPosition: {x: 0, y: 0, z: 0} - solverRotation: {x: 0, y: 0, z: 0, w: 1} - defaultLocalPosition: {x: 0, y: 0, z: 0} - defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0} - length: 0 - effectorPositionWeight: 0 - effectorRotationWeight: 0 - offset: {x: 0, y: 0, z: 0} - - transform: {fileID: 2039451282} - weight: 1 - solverPosition: {x: 0, y: 0, z: 0} - solverRotation: {x: 0, y: 0, z: 0, w: 1} - defaultLocalPosition: {x: 0, y: 0, z: 0} - defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0} - length: 0 - effectorPositionWeight: 0 - effectorRotationWeight: 0 - offset: {x: 0, y: 0, z: 0} - children: - childConstraints: [] - bendConstraint: - bone1: {fileID: 0} - bone2: {fileID: 0} - bone3: {fileID: 0} - bendGoal: {fileID: 0} - direction: {x: 1, y: 0, z: 0} - rotationOffset: {x: 0, y: 0, z: 0, w: 0} - weight: 1 - defaultLocalDirection: {x: 0, y: 0, z: 0} - defaultChildDirection: {x: 0, y: 0, z: 0} - effectors: - - bone: {fileID: 2039451279} - target: {fileID: 0} - positionWeight: 1 - rotationWeight: 0 - position: {x: 0, y: 0, z: 0} - rotation: {x: 0, y: 0, z: 0, w: 1} - positionOffset: {x: 0, y: 0, z: 0} - effectChildNodes: 1 - maintainRelativePositionWeight: 0 - childBones: - - {fileID: 2039451283} - - {fileID: 2039451280} - planeBone1: {fileID: 0} - planeBone2: {fileID: 0} - planeBone3: {fileID: 0} - planeRotationOffset: {x: 0, y: 0, z: 0, w: 1} - - bone: {fileID: 2039451274} - target: {fileID: 0} - positionWeight: 1 - rotationWeight: 0 - position: {x: 0, y: 0, z: 0} - rotation: {x: 0, y: 0, z: 0, w: 1} - positionOffset: {x: 0, y: 0, z: 0} - effectChildNodes: 1 - maintainRelativePositionWeight: 0 - childBones: [] - planeBone1: {fileID: 0} - planeBone2: {fileID: 0} - planeBone3: {fileID: 0} - planeRotationOffset: {x: 0, y: 0, z: 0, w: 1} - - bone: {fileID: 2039451270} - target: {fileID: 0} - positionWeight: 1 - rotationWeight: 0 - position: {x: 0, y: 0, z: 0} - rotation: {x: 0, y: 0, z: 0, w: 1} - positionOffset: {x: 0, y: 0, z: 0} - effectChildNodes: 1 - maintainRelativePositionWeight: 0 - childBones: [] - planeBone1: {fileID: 0} - planeBone2: {fileID: 0} - planeBone3: {fileID: 0} - planeRotationOffset: {x: 0, y: 0, z: 0, w: 1} - - bone: {fileID: 2039451283} - target: {fileID: 0} - positionWeight: 1 - rotationWeight: 0 - position: {x: 0, y: 0, z: 0} - rotation: {x: 0, y: 0, z: 0, w: 1} - positionOffset: {x: 0, y: 0, z: 0} - effectChildNodes: 1 - maintainRelativePositionWeight: 0 - childBones: [] - planeBone1: {fileID: 0} - planeBone2: {fileID: 0} - planeBone3: {fileID: 0} - planeRotationOffset: {x: 0, y: 0, z: 0, w: 1} - - bone: {fileID: 2039451280} - target: {fileID: 0} - positionWeight: 1 - rotationWeight: 0 - position: {x: 0, y: 0, z: 0} - rotation: {x: 0, y: 0, z: 0, w: 1} - positionOffset: {x: 0, y: 0, z: 0} - effectChildNodes: 1 - maintainRelativePositionWeight: 0 - childBones: [] - planeBone1: {fileID: 0} - planeBone2: {fileID: 0} - planeBone3: {fileID: 0} - planeRotationOffset: {x: 0, y: 0, z: 0, w: 1} - - bone: {fileID: 2039451276} - target: {fileID: 0} - positionWeight: 1 - rotationWeight: 1 - position: {x: 0, y: 0, z: 0} - rotation: {x: 0, y: 0, z: 0, w: 1} - positionOffset: {x: 0, y: 0, z: 0} - effectChildNodes: 1 - maintainRelativePositionWeight: 0 - childBones: [] - planeBone1: {fileID: 2039451274} - planeBone2: {fileID: 2039451270} - planeBone3: {fileID: 2039451279} - planeRotationOffset: {x: 0, y: 0, z: 0, w: 1} - - bone: {fileID: 2039451272} - target: {fileID: 0} - positionWeight: 1 - rotationWeight: 1 - position: {x: 0, y: 0, z: 0} - rotation: {x: 0, y: 0, z: 0, w: 1} - positionOffset: {x: 0, y: 0, z: 0} - effectChildNodes: 1 - maintainRelativePositionWeight: 0 - childBones: [] - planeBone1: {fileID: 2039451270} - planeBone2: {fileID: 2039451274} - planeBone3: {fileID: 2039451279} - planeRotationOffset: {x: 0, y: 0, z: 0, w: 1} - - bone: {fileID: 2039451285} - target: {fileID: 0} - positionWeight: 1 - rotationWeight: 1 - position: {x: 0, y: 0, z: 0} - rotation: {x: 0, y: 0, z: 0, w: 1} - positionOffset: {x: 0, y: 0, z: 0} - effectChildNodes: 1 - maintainRelativePositionWeight: 0 - childBones: [] - planeBone1: {fileID: 2039451283} - planeBone2: {fileID: 2039451280} - planeBone3: {fileID: 2039451279} - planeRotationOffset: {x: 0, y: 0, z: 0, w: 1} - - bone: {fileID: 2039451282} - target: {fileID: 0} - positionWeight: 1 - rotationWeight: 1 - position: {x: 0, y: 0, z: 0} - rotation: {x: 0, y: 0, z: 0, w: 1} - positionOffset: {x: 0, y: 0, z: 0} - effectChildNodes: 1 - maintainRelativePositionWeight: 0 - childBones: [] - planeBone1: {fileID: 2039451280} - planeBone2: {fileID: 2039451283} - planeBone3: {fileID: 2039451279} - planeRotationOffset: {x: 0, y: 0, z: 0, w: 1} - spineMapping: - spineBones: - - {fileID: 2039451286} - - {fileID: 2039451279} - - {fileID: 2039451278} - leftUpperArmBone: {fileID: 2039451274} - rightUpperArmBone: {fileID: 2039451270} - leftThighBone: {fileID: 2039451283} - rightThighBone: {fileID: 2039451280} - iterations: 3 - twistWeight: 1 - boneMappings: - - bone: {fileID: 2039451269} - maintainRotationWeight: 1 - limbMappings: - - parentBone: {fileID: 2039451277} - bone1: {fileID: 2039451274} - bone2: {fileID: 2039451275} - bone3: {fileID: 2039451276} - maintainRotationWeight: 1 - weight: 1 - - parentBone: {fileID: 2039451273} - bone1: {fileID: 2039451270} - bone2: {fileID: 2039451271} - bone3: {fileID: 2039451272} - maintainRotationWeight: 1 - weight: 1 - - parentBone: {fileID: 0} - bone1: {fileID: 2039451283} - bone2: {fileID: 2039451284} - bone3: {fileID: 2039451285} - maintainRotationWeight: 1 - weight: 1 - - parentBone: {fileID: 0} - bone1: {fileID: 2039451280} - bone2: {fileID: 2039451281} - bone3: {fileID: 2039451282} - maintainRotationWeight: 1 - weight: 1 - FABRIKPass: 1 - rootNode: {fileID: 2039451279} - spineStiffness: 0.5 - pullBodyVertical: 0.5 - pullBodyHorizontal: 0 ---- !u!114 &2039451289 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2039451287} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c740e78754ee2594687b6cdd35817aa5, type: 3} - m_Name: - m_EditorClassIdentifier: - LeftHandRotations: {x: 90, y: 0, z: 0} - RightHandRotations: {x: -90, y: 180, z: 0} - LeftFootRotations: {x: 0, y: 90, z: 90} - RightFootRotations: {x: 0, y: 90, z: 90} - HeadRotations: {x: 0, y: -90, z: -90} --- !u!1 &2102920608 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Camera/WebcamVisionTexture.cs b/Assets/Scripts/Camera/WebcamVisionTexture.cs index 2078ea3224accd5218a41612786c8cac147140b1..d3a4f5477c58120b89f045f56500113b2095d8d4 100644 --- a/Assets/Scripts/Camera/WebcamVisionTexture.cs +++ b/Assets/Scripts/Camera/WebcamVisionTexture.cs @@ -70,72 +70,6 @@ public class WebcamVisionTexture : MonoBehaviour contourCenter = new Point(imgWidth / 2, imgHeight / 2); } - public void AddImageToBackground() - { - Mat newImg = new Mat(); - //capture new image for background - capture.Read(newImg); - - //add transparent channel - Cv2.CvtColor(newImg, newImg, ColorConversionCodes.BGR2BGRA); - - //distort it to match camera settings - Cv2.Remap( - newImg, - newImg, - map1, - map2, - InterpolationFlags.Linear, - BorderTypes.Constant, - new Scalar(0, 0, 0, 0)); - - - if (registeredImages > maxImagesBG) - { - //set the center image - offlineBackground = newImg.Clone(); - centerOfflineBackground = newImg.Clone(); - - newImg.SaveImage("images/centerimg.png"); - //remove image - newImg.Dispose(); - - } else - { - //save image - backgroundImages.Add(newImg); - newImg.SaveImage("images/" + registeredImages + "img.png"); - - print(registeredImages++); - if (registeredImages == maxImagesBG) - { - print("finished taking pictures"); - CancelInvoke(); - registeredImages++; //increase it for center image - } - } - - - } - - /*private void StitcherBackground() - { - int[] imgnb = new int[] { 0, 17, 4, 16}; - List<Mat> images = new List<Mat>(); - - foreach(int nb in imgnb) - { - images.Add(new Mat("images/" + nb + "img.png")); - } - - Stitcher stit = Stitcher.Create(Stitcher.Mode.Scans); - Stitcher.Status status = stit.Stitch(images, offlineBackground); - print(status); - offlineBackground.SaveImage("bgstitch.png"); - - stit.Dispose(); - }*/ - private (Mat, Mat) ExtractBestMatchMat( List<Mat> images, Mat imgMask, @@ -776,19 +710,3 @@ public class WebcamVisionTexture : MonoBehaviour MatDisposer(backgroundImages.ToArray()); } } - - -/* -code to keep brightest pixel - - Vec4b bgPixel = offlineBackground.Get<Vec4b>(y, x); - Vec4b imgPixel = warpedImg.Get<Vec4b>(y, x); - int imgLight = (imgPixel.Item0 + imgPixel.Item1 + imgPixel.Item2) * imgPixel.Item3; - int bgLight = (bgPixel.Item0 + bgPixel.Item1 + bgPixel.Item2) * bgPixel.Item3; - - if (bgLight < imgLight) - offlineBackground.Set(y, x, imgPixel); - - - - */ \ No newline at end of file diff --git a/Assets/Scripts/OptiTrack.meta b/Assets/Scripts/OptiTrack.meta new file mode 100644 index 0000000000000000000000000000000000000000..25d638cdbf286782d10b4162a34ee63989619b80 --- /dev/null +++ b/Assets/Scripts/OptiTrack.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0402f732245a0c74895e9c1bc1bd5408 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/DisplaySkeleton.cs b/Assets/Scripts/OptiTrack/DisplaySkeleton.cs similarity index 100% rename from Assets/Scripts/DisplaySkeleton.cs rename to Assets/Scripts/OptiTrack/DisplaySkeleton.cs diff --git a/Assets/Scripts/DisplaySkeleton.cs.meta b/Assets/Scripts/OptiTrack/DisplaySkeleton.cs.meta similarity index 100% rename from Assets/Scripts/DisplaySkeleton.cs.meta rename to Assets/Scripts/OptiTrack/DisplaySkeleton.cs.meta diff --git a/Assets/Scripts/OptiTrackAvatarPos.cs b/Assets/Scripts/OptiTrack/OptiTrackAvatarPos.cs similarity index 100% rename from Assets/Scripts/OptiTrackAvatarPos.cs rename to Assets/Scripts/OptiTrack/OptiTrackAvatarPos.cs diff --git a/Assets/Scripts/OptiTrackAvatarPos.cs.meta b/Assets/Scripts/OptiTrack/OptiTrackAvatarPos.cs.meta similarity index 100% rename from Assets/Scripts/OptiTrackAvatarPos.cs.meta rename to Assets/Scripts/OptiTrack/OptiTrackAvatarPos.cs.meta diff --git a/Assets/Scripts/SceneCalibrator.cs b/Assets/Scripts/OptiTrack/SceneCalibrator.cs similarity index 96% rename from Assets/Scripts/SceneCalibrator.cs rename to Assets/Scripts/OptiTrack/SceneCalibrator.cs index 79d49bfe257429e79d1c4a5e60b8a85024fc86aa..0cf2699fe49af54f0e4d428dab620ef204cec5cf 100644 --- a/Assets/Scripts/SceneCalibrator.cs +++ b/Assets/Scripts/OptiTrack/SceneCalibrator.cs @@ -14,11 +14,7 @@ public class SceneCalibrator : MonoBehaviour public GameObject ForegroundScreen; public Camera WebcamCamera; - public bool isDiagonalFOV; - public float WebcamFOVInDegrees; - public float TVDiagonalSizeInInches; - public float PersonHeightInMeters; public float BackWallDistanceInMeters; public Camera DisplayCamera; diff --git a/Assets/Scripts/SceneCalibrator.cs.meta b/Assets/Scripts/OptiTrack/SceneCalibrator.cs.meta similarity index 100% rename from Assets/Scripts/SceneCalibrator.cs.meta rename to Assets/Scripts/OptiTrack/SceneCalibrator.cs.meta diff --git a/Assets/Scripts/UI.meta b/Assets/Scripts/UI.meta new file mode 100644 index 0000000000000000000000000000000000000000..25a1289ddcd76f01b4fc975a00aab590558eefdd --- /dev/null +++ b/Assets/Scripts/UI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bc66b70596f7fc844a3f1ca5602f4bc6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/FullscreenEditorMode.cs b/Assets/Scripts/UI/FullscreenEditorMode.cs similarity index 100% rename from Assets/Scripts/FullscreenEditorMode.cs rename to Assets/Scripts/UI/FullscreenEditorMode.cs diff --git a/Assets/Scripts/FullscreenEditorMode.cs.meta b/Assets/Scripts/UI/FullscreenEditorMode.cs.meta similarity index 100% rename from Assets/Scripts/FullscreenEditorMode.cs.meta rename to Assets/Scripts/UI/FullscreenEditorMode.cs.meta diff --git a/Assets/Scripts/ModesManager.cs b/Assets/Scripts/UI/ModesManager.cs similarity index 100% rename from Assets/Scripts/ModesManager.cs rename to Assets/Scripts/UI/ModesManager.cs diff --git a/Assets/Scripts/ModesManager.cs.meta b/Assets/Scripts/UI/ModesManager.cs.meta similarity index 100% rename from Assets/Scripts/ModesManager.cs.meta rename to Assets/Scripts/UI/ModesManager.cs.meta