From 6094a3f2d65224d2c5357055399072ea1aafc6c1 Mon Sep 17 00:00:00 2001 From: JFrit Date: Fri, 2 Apr 2021 19:07:57 -0400 Subject: [PATCH] Fix feature-based cue bug involving incorrect distance --- Assets/Scenes/AttentionExperiment.unity | 402 +++++++++---------- Assets/Scripts/AttentionCue.cs | 2 +- Assets/Scripts/Trial Manager/TrialManager.cs | 2 + Assets/StreamingAssets/TEMPLATE.json | 2 +- ProjectSettings/ProjectSettings.asset | 2 +- 5 files changed, 206 insertions(+), 204 deletions(-) diff --git a/Assets/Scenes/AttentionExperiment.unity b/Assets/Scenes/AttentionExperiment.unity index 7695b19..808250f 100644 --- a/Assets/Scenes/AttentionExperiment.unity +++ b/Assets/Scenes/AttentionExperiment.unity @@ -1644,169 +1644,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 28} m_Pivot: {x: 0.5, y: 1} ---- !u!43 &704935582 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 24 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 8 - localAABB: - m_Center: {x: 0, y: 0.01, z: 0} - m_Extent: {x: 1.65, y: 0, z: 1.275} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 000004000100010004000500010005000200020005000600020006000300030006000700030007000000000007000400 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 8 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 12 - format: 0 - dimension: 4 - - stream: 0 - offset: 28 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 288 - _typelessdata: 0000c03f0ad7233c000090bf000000000000803f0000803f0000803f00000000000000000000c0bf0ad7233c000090bf000000000000803f0000803f0000803f0000803f000000000000c0bf0ad7233c0000903f000000000000803f0000803f0000803f00000000000000000000c03f0ad7233c0000903f000000000000803f0000803f0000803f0000803f000000003333d33f0ad7233c3333a3bf000000000000803f0000803f00000000000000000000803f3333d3bf0ad7233c3333a3bf000000000000803f0000803f000000000000803f0000803f3333d3bf0ad7233c3333a33f000000000000803f0000803f00000000000000000000803f3333d33f0ad7233c3333a33f000000000000803f0000803f000000000000803f0000803f - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0.01, z: 0} - m_Extent: {x: 1.65, y: 0, z: 1.275} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - offset: 0 - size: 0 - path: --- !u!1001 &731932731 PrefabInstance: m_ObjectHideFlags: 0 @@ -2134,11 +1971,11 @@ PrefabInstance: - target: {fileID: 2348914, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 892773038} + objectReference: {fileID: 1596613685} - target: {fileID: 3380982, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} propertyPath: m_Mesh value: - objectReference: {fileID: 704935582} + objectReference: {fileID: 1401858392} - target: {fileID: 20000014031267948, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} propertyPath: m_AllowDynamicResolution @@ -2351,40 +2188,6 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1.05, y: 0.01, z: 1} m_Center: {x: 0, y: 0, z: 0} ---- !u!21 &892773038 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Sprites/Default - m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _AlphaTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - PixelSnap: 0 - - _EnableExternalAlpha: 0 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _Flip: {r: 1, g: 1, b: 1, a: 1} - - _RendererColor: {r: 1, g: 1, b: 1, a: 1} --- !u!1 &895827636 GameObject: m_ObjectHideFlags: 0 @@ -4550,6 +4353,169 @@ Transform: type: 3} m_PrefabInstance: {fileID: 798916333} m_PrefabAsset: {fileID: 0} +--- !u!43 &1401858392 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 24 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 8 + localAABB: + m_Center: {x: 0, y: 0.01, z: 0} + m_Extent: {x: 1.65, y: 0, z: 1.275} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000004000100010004000500010005000200020005000600020006000300030006000700030007000000000007000400 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 8 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 12 + format: 0 + dimension: 4 + - stream: 0 + offset: 28 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 288 + _typelessdata: 0000c03f0ad7233c000090bf000000000000803f0000803f0000803f00000000000000000000c0bf0ad7233c000090bf000000000000803f0000803f0000803f0000803f000000000000c0bf0ad7233c0000903f000000000000803f0000803f0000803f00000000000000000000c03f0ad7233c0000903f000000000000803f0000803f0000803f0000803f000000003333d33f0ad7233c3333a3bf000000000000803f0000803f00000000000000000000803f3333d3bf0ad7233c3333a3bf000000000000803f0000803f000000000000803f0000803f3333d3bf0ad7233c3333a33f000000000000803f0000803f00000000000000000000803f3333d33f0ad7233c3333a33f000000000000803f0000803f000000000000803f0000803f + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0.01, z: 0} + m_Extent: {x: 1.65, y: 0, z: 1.275} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + offset: 0 + size: 0 + path: --- !u!1 &1446592570 GameObject: m_ObjectHideFlags: 0 @@ -4643,7 +4609,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1474771029 Transform: m_ObjectHideFlags: 0 @@ -4890,6 +4856,40 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1595836267} m_PrefabAsset: {fileID: 0} +--- !u!21 &1596613685 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Sprites/Default + m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - PixelSnap: 0 + - _EnableExternalAlpha: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} --- !u!1 &1688054822 GameObject: m_ObjectHideFlags: 0 @@ -5099,7 +5099,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1748376987 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/AttentionCue.cs b/Assets/Scripts/AttentionCue.cs index 4d6218a..6cfb1e6 100644 --- a/Assets/Scripts/AttentionCue.cs +++ b/Assets/Scripts/AttentionCue.cs @@ -42,7 +42,7 @@ public void OnEnable() var startingPosition = -cueDistance * direction; gameObject.transform.localPosition = new Vector3(startingPosition.x, startingPosition.y, sessionSettings.attentionCueDepth); - var speed = cueDistance / sessionSettings.attentionCueDuration; + var speed = 1000 * cueDistance / sessionSettings.attentionCueDuration; _velocity = speed * direction; break; diff --git a/Assets/Scripts/Trial Manager/TrialManager.cs b/Assets/Scripts/Trial Manager/TrialManager.cs index 3b3565f..f95255e 100644 --- a/Assets/Scripts/Trial Manager/TrialManager.cs +++ b/Assets/Scripts/Trial Manager/TrialManager.cs @@ -300,6 +300,8 @@ private IEnumerator TrialRoutine(Trial trial) outerStimulus.SetActive(false); innerStimulus.SetActive(false); stimulusSpacer.SetActive(false); + attentionCue.SetActive(false); + laserManager.DeactivateBothLasers(); // Start trial over if fixation was broken if (_isFixationBroken) diff --git a/Assets/StreamingAssets/TEMPLATE.json b/Assets/StreamingAssets/TEMPLATE.json index 5b64eeb..b794e36 100644 --- a/Assets/StreamingAssets/TEMPLATE.json +++ b/Assets/StreamingAssets/TEMPLATE.json @@ -36,7 +36,7 @@ "EnableBuddyDots": true, - "StimulusSpacingMeters": 0.05, + "StimulusSpacingMeters": 0.0001, "StimulusDepthMeters": 0.57, diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 87a8664..03c2cca 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -126,8 +126,8 @@ PlayerSettings: Others: 1 bundleVersion: 1.0 preloadedAssets: - - {fileID: 6405742922248523384, guid: efde690a735af1f4a89b7bfd2c31a41a, type: 2} - {fileID: 0} + - {fileID: 6405742922248523384, guid: efde690a735af1f4a89b7bfd2c31a41a, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1