Skip to content

Commit 3f195ad

Browse files
committed
feat: fix pipette models to work properly with recording region functionality
1 parent 00421b9 commit 3f195ad

File tree

5 files changed

+172
-48
lines changed

5 files changed

+172
-48
lines changed

Assets/Prefabs/Probes/Pipette_100um.prefab

Lines changed: 42 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,38 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1 &1026607253182833388
4+
GameObject:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
serializedVersion: 6
10+
m_Component:
11+
- component: {fileID: 6751269961660561659}
12+
m_Layer: 10
13+
m_Name: Model
14+
m_TagString: Untagged
15+
m_Icon: {fileID: 0}
16+
m_NavMeshLayer: 0
17+
m_StaticEditorFlags: 0
18+
m_IsActive: 1
19+
--- !u!4 &6751269961660561659
20+
Transform:
21+
m_ObjectHideFlags: 0
22+
m_CorrespondingSourceObject: {fileID: 0}
23+
m_PrefabInstance: {fileID: 0}
24+
m_PrefabAsset: {fileID: 0}
25+
m_GameObject: {fileID: 1026607253182833388}
26+
serializedVersion: 2
27+
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
28+
m_LocalPosition: {x: 0, y: 0, z: 0}
29+
m_LocalScale: {x: 1, y: 1, z: 1}
30+
m_ConstrainProportionsScale: 0
31+
m_Children:
32+
- {fileID: 3870803029599558718}
33+
- {fileID: 4144110547788140338}
34+
m_Father: {fileID: 3485671869318689184}
35+
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
336
--- !u!1 &1420707051332254735
437
GameObject:
538
m_ObjectHideFlags: 0
@@ -151,12 +184,12 @@ Transform:
151184
m_PrefabAsset: {fileID: 0}
152185
m_GameObject: {fileID: 2698243037706463709}
153186
serializedVersion: 2
154-
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
155-
m_LocalPosition: {x: 0, y: 0, z: -1.92}
156-
m_LocalScale: {x: 0.125, y: 3.84, z: 0.125}
187+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
188+
m_LocalPosition: {x: 0, y: 1.9199998, z: 0}
189+
m_LocalScale: {x: 0.125, y: 3.8400002, z: 0.125}
157190
m_ConstrainProportionsScale: 0
158191
m_Children: []
159-
m_Father: {fileID: 3485671869318689184}
192+
m_Father: {fileID: 6751269961660561659}
160193
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
161194
--- !u!33 &267607643579158225
162195
MeshFilter:
@@ -236,12 +269,12 @@ Transform:
236269
m_PrefabAsset: {fileID: 0}
237270
m_GameObject: {fileID: 2888827817699935360}
238271
serializedVersion: 2
239-
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
240-
m_LocalPosition: {x: 0, y: 0, z: -5}
241-
m_LocalScale: {x: 0.1, y: 5, z: 0.1}
272+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
273+
m_LocalPosition: {x: 0, y: 5, z: 0}
274+
m_LocalScale: {x: 0.1, y: 5, z: 0.10000001}
242275
m_ConstrainProportionsScale: 0
243276
m_Children: []
244-
m_Father: {fileID: 3485671869318689184}
277+
m_Father: {fileID: 6751269961660561659}
245278
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
246279
--- !u!33 &5125959021611580786
247280
MeshFilter:
@@ -539,8 +572,7 @@ Transform:
539572
m_LocalScale: {x: 1, y: 1, z: 1}
540573
m_ConstrainProportionsScale: 0
541574
m_Children:
542-
- {fileID: 3870803029599558718}
543-
- {fileID: 4144110547788140338}
575+
- {fileID: 6751269961660561659}
544576
m_Father: {fileID: 4023158563732113569}
545577
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
546578
--- !u!33 &3485671869318689213
@@ -642,7 +674,6 @@ MonoBehaviour:
642674
_probeController: {fileID: 2207803182506741358}
643675
_lineMaterial: {fileID: 2100000, guid: ebc1facc3e73f274c8c4d918e266a49d, type: 2}
644676
_ghostMaterial: {fileID: 2100000, guid: b64d32d990074b34889dd43bce409aa6, type: 2}
645-
surfaceCoordinateWorldT: {x: 0, y: 0, z: 0}
646677
--- !u!114 &4368194536080577050
647678
MonoBehaviour:
648679
m_ObjectHideFlags: 0

Assets/Prefabs/Probes/Pipette_200um.prefab

Lines changed: 42 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -151,12 +151,12 @@ Transform:
151151
m_PrefabAsset: {fileID: 0}
152152
m_GameObject: {fileID: 2698243037706463709}
153153
serializedVersion: 2
154-
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
155-
m_LocalPosition: {x: 0, y: 0, z: -1.92}
156-
m_LocalScale: {x: 0.225, y: 3.84, z: 0.225}
154+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
155+
m_LocalPosition: {x: 0, y: 1.9199998, z: 0}
156+
m_LocalScale: {x: 0.22500001, y: 3.8400002, z: 0.22500002}
157157
m_ConstrainProportionsScale: 0
158158
m_Children: []
159-
m_Father: {fileID: 3485671869318689184}
159+
m_Father: {fileID: 4665772870319396272}
160160
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
161161
--- !u!33 &267607643579158225
162162
MeshFilter:
@@ -236,12 +236,12 @@ Transform:
236236
m_PrefabAsset: {fileID: 0}
237237
m_GameObject: {fileID: 2888827817699935360}
238238
serializedVersion: 2
239-
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
240-
m_LocalPosition: {x: 0, y: 0, z: -5}
241-
m_LocalScale: {x: 0.2, y: 5, z: 0.2}
239+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
240+
m_LocalPosition: {x: 0, y: 5, z: 0}
241+
m_LocalScale: {x: 0.2, y: 5, z: 0.20000002}
242242
m_ConstrainProportionsScale: 0
243243
m_Children: []
244-
m_Father: {fileID: 3485671869318689184}
244+
m_Father: {fileID: 4665772870319396272}
245245
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
246246
--- !u!33 &5125959021611580786
247247
MeshFilter:
@@ -539,8 +539,7 @@ Transform:
539539
m_LocalScale: {x: 1, y: 1, z: 1}
540540
m_ConstrainProportionsScale: 0
541541
m_Children:
542-
- {fileID: 3870803029599558718}
543-
- {fileID: 4144110547788140338}
542+
- {fileID: 4665772870319396272}
544543
m_Father: {fileID: 4023158563732113569}
545544
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
546545
--- !u!33 &3485671869318689213
@@ -642,7 +641,6 @@ MonoBehaviour:
642641
_probeController: {fileID: 2207803182506741358}
643642
_lineMaterial: {fileID: 2100000, guid: ebc1facc3e73f274c8c4d918e266a49d, type: 2}
644643
_ghostMaterial: {fileID: 2100000, guid: b64d32d990074b34889dd43bce409aa6, type: 2}
645-
surfaceCoordinateWorldT: {x: 0, y: 0, z: 0}
646644
--- !u!114 &4368194536080577050
647645
MonoBehaviour:
648646
m_ObjectHideFlags: 0
@@ -703,3 +701,36 @@ MonoBehaviour:
703701
IsSetToDropToSurfaceWithDepthChangedEvent:
704702
m_PersistentCalls:
705703
m_Calls: []
704+
--- !u!1 &4940020979612041078
705+
GameObject:
706+
m_ObjectHideFlags: 0
707+
m_CorrespondingSourceObject: {fileID: 0}
708+
m_PrefabInstance: {fileID: 0}
709+
m_PrefabAsset: {fileID: 0}
710+
serializedVersion: 6
711+
m_Component:
712+
- component: {fileID: 4665772870319396272}
713+
m_Layer: 10
714+
m_Name: Model
715+
m_TagString: Untagged
716+
m_Icon: {fileID: 0}
717+
m_NavMeshLayer: 0
718+
m_StaticEditorFlags: 0
719+
m_IsActive: 1
720+
--- !u!4 &4665772870319396272
721+
Transform:
722+
m_ObjectHideFlags: 0
723+
m_CorrespondingSourceObject: {fileID: 0}
724+
m_PrefabInstance: {fileID: 0}
725+
m_PrefabAsset: {fileID: 0}
726+
m_GameObject: {fileID: 4940020979612041078}
727+
serializedVersion: 2
728+
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
729+
m_LocalPosition: {x: 0, y: 0, z: 0}
730+
m_LocalScale: {x: 1, y: 1, z: 1}
731+
m_ConstrainProportionsScale: 0
732+
m_Children:
733+
- {fileID: 3870803029599558718}
734+
- {fileID: 4144110547788140338}
735+
m_Father: {fileID: 3485671869318689184}
736+
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}

Assets/Prefabs/Probes/Pipette_25um.prefab

Lines changed: 44 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -120,13 +120,13 @@ Transform:
120120
m_PrefabAsset: {fileID: 0}
121121
m_GameObject: {fileID: 2698243037706463709}
122122
serializedVersion: 2
123-
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
124-
m_LocalPosition: {x: 0, y: 0, z: -1.92}
125-
m_LocalScale: {x: 0.05, y: 3.84, z: 0.05}
123+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
124+
m_LocalPosition: {x: 0, y: 1.92, z: 0}
125+
m_LocalScale: {x: 0.05, y: 3.84, z: 0.050000004}
126126
m_ConstrainProportionsScale: 0
127127
m_Children: []
128-
m_Father: {fileID: 3485671869318689184}
129-
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
128+
m_Father: {fileID: 3660772377889825401}
129+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
130130
--- !u!33 &267607643579158225
131131
MeshFilter:
132132
m_ObjectHideFlags: 0
@@ -205,13 +205,13 @@ Transform:
205205
m_PrefabAsset: {fileID: 0}
206206
m_GameObject: {fileID: 2888827817699935360}
207207
serializedVersion: 2
208-
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
209-
m_LocalPosition: {x: 0, y: 0, z: -5}
210-
m_LocalScale: {x: 0.025, y: 5, z: 0.025}
208+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
209+
m_LocalPosition: {x: 0, y: 5, z: 0}
210+
m_LocalScale: {x: 0.025, y: 5, z: 0.025000002}
211211
m_ConstrainProportionsScale: 0
212212
m_Children: []
213-
m_Father: {fileID: 3485671869318689184}
214-
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
213+
m_Father: {fileID: 3660772377889825401}
214+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
215215
--- !u!33 &5125959021611580786
216216
MeshFilter:
217217
m_ObjectHideFlags: 0
@@ -477,6 +477,39 @@ MonoBehaviour:
477477
m_StringArgument:
478478
m_BoolArgument: 0
479479
m_CallState: 2
480+
--- !u!1 &3156379734606293785
481+
GameObject:
482+
m_ObjectHideFlags: 0
483+
m_CorrespondingSourceObject: {fileID: 0}
484+
m_PrefabInstance: {fileID: 0}
485+
m_PrefabAsset: {fileID: 0}
486+
serializedVersion: 6
487+
m_Component:
488+
- component: {fileID: 3660772377889825401}
489+
m_Layer: 10
490+
m_Name: Model
491+
m_TagString: Untagged
492+
m_Icon: {fileID: 0}
493+
m_NavMeshLayer: 0
494+
m_StaticEditorFlags: 0
495+
m_IsActive: 1
496+
--- !u!4 &3660772377889825401
497+
Transform:
498+
m_ObjectHideFlags: 0
499+
m_CorrespondingSourceObject: {fileID: 0}
500+
m_PrefabInstance: {fileID: 0}
501+
m_PrefabAsset: {fileID: 0}
502+
m_GameObject: {fileID: 3156379734606293785}
503+
serializedVersion: 2
504+
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
505+
m_LocalPosition: {x: 0, y: 0, z: 0}
506+
m_LocalScale: {x: 1, y: 1, z: 1}
507+
m_ConstrainProportionsScale: 0
508+
m_Children:
509+
- {fileID: 3870803029599558718}
510+
- {fileID: 4144110547788140338}
511+
m_Father: {fileID: 3485671869318689184}
512+
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
480513
--- !u!1 &3485671869318689185
481514
GameObject:
482515
m_ObjectHideFlags: 0
@@ -508,8 +541,7 @@ Transform:
508541
m_LocalScale: {x: 1, y: 1, z: 1}
509542
m_ConstrainProportionsScale: 0
510543
m_Children:
511-
- {fileID: 3870803029599558718}
512-
- {fileID: 4144110547788140338}
544+
- {fileID: 3660772377889825401}
513545
m_Father: {fileID: 4023158563732113569}
514546
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
515547
--- !u!33 &3485671869318689213
@@ -610,7 +642,6 @@ MonoBehaviour:
610642
_probeController: {fileID: 2207803182506741358}
611643
_lineMaterial: {fileID: 2100000, guid: ebc1facc3e73f274c8c4d918e266a49d, type: 2}
612644
_ghostMaterial: {fileID: 2100000, guid: b64d32d990074b34889dd43bce409aa6, type: 2}
613-
surfaceCoordinateWorldT: {x: 0, y: 0, z: 0}
614645
--- !u!114 &4368194536080577050
615646
MonoBehaviour:
616647
m_ObjectHideFlags: 0

Assets/Prefabs/Probes/Pipette_50um.prefab

Lines changed: 42 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,12 @@ Transform:
120120
m_PrefabAsset: {fileID: 0}
121121
m_GameObject: {fileID: 2698243037706463709}
122122
serializedVersion: 2
123-
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
124-
m_LocalPosition: {x: 0, y: 0, z: -1.92}
125-
m_LocalScale: {x: 0.075, y: 3.84, z: 0.075}
123+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
124+
m_LocalPosition: {x: 0, y: 1.9199998, z: 0}
125+
m_LocalScale: {x: 0.075, y: 3.8400002, z: 0.075}
126126
m_ConstrainProportionsScale: 0
127127
m_Children: []
128-
m_Father: {fileID: 3485671869318689184}
128+
m_Father: {fileID: 7372804797232836525}
129129
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
130130
--- !u!33 &267607643579158225
131131
MeshFilter:
@@ -205,12 +205,12 @@ Transform:
205205
m_PrefabAsset: {fileID: 0}
206206
m_GameObject: {fileID: 2888827817699935360}
207207
serializedVersion: 2
208-
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
209-
m_LocalPosition: {x: 0, y: 0, z: -5}
210-
m_LocalScale: {x: 0.05, y: 5, z: 0.05}
208+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
209+
m_LocalPosition: {x: 0, y: 5, z: 0}
210+
m_LocalScale: {x: 0.05, y: 5, z: 0.050000004}
211211
m_ConstrainProportionsScale: 0
212212
m_Children: []
213-
m_Father: {fileID: 3485671869318689184}
213+
m_Father: {fileID: 7372804797232836525}
214214
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
215215
--- !u!33 &5125959021611580786
216216
MeshFilter:
@@ -508,8 +508,7 @@ Transform:
508508
m_LocalScale: {x: 1, y: 1, z: 1}
509509
m_ConstrainProportionsScale: 0
510510
m_Children:
511-
- {fileID: 3870803029599558718}
512-
- {fileID: 4144110547788140338}
511+
- {fileID: 7372804797232836525}
513512
m_Father: {fileID: 4023158563732113569}
514513
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
515514
--- !u!33 &3485671869318689213
@@ -610,7 +609,6 @@ MonoBehaviour:
610609
_probeController: {fileID: 2207803182506741358}
611610
_lineMaterial: {fileID: 2100000, guid: ebc1facc3e73f274c8c4d918e266a49d, type: 2}
612611
_ghostMaterial: {fileID: 2100000, guid: b64d32d990074b34889dd43bce409aa6, type: 2}
613-
surfaceCoordinateWorldT: {x: 0, y: 0, z: 0}
614612
--- !u!114 &4368194536080577050
615613
MonoBehaviour:
616614
m_ObjectHideFlags: 0
@@ -671,3 +669,36 @@ MonoBehaviour:
671669
IsSetToDropToSurfaceWithDepthChangedEvent:
672670
m_PersistentCalls:
673671
m_Calls: []
672+
--- !u!1 &5492618716247240017
673+
GameObject:
674+
m_ObjectHideFlags: 0
675+
m_CorrespondingSourceObject: {fileID: 0}
676+
m_PrefabInstance: {fileID: 0}
677+
m_PrefabAsset: {fileID: 0}
678+
serializedVersion: 6
679+
m_Component:
680+
- component: {fileID: 7372804797232836525}
681+
m_Layer: 10
682+
m_Name: Model
683+
m_TagString: Untagged
684+
m_Icon: {fileID: 0}
685+
m_NavMeshLayer: 0
686+
m_StaticEditorFlags: 0
687+
m_IsActive: 1
688+
--- !u!4 &7372804797232836525
689+
Transform:
690+
m_ObjectHideFlags: 0
691+
m_CorrespondingSourceObject: {fileID: 0}
692+
m_PrefabInstance: {fileID: 0}
693+
m_PrefabAsset: {fileID: 0}
694+
m_GameObject: {fileID: 5492618716247240017}
695+
serializedVersion: 2
696+
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
697+
m_LocalPosition: {x: 0, y: 0, z: 0}
698+
m_LocalScale: {x: 1, y: 1, z: 1}
699+
m_ConstrainProportionsScale: 0
700+
m_Children:
701+
- {fileID: 3870803029599558718}
702+
- {fileID: 4144110547788140338}
703+
m_Father: {fileID: 3485671869318689184}
704+
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"Date": "11/29/2023 10:12:58 PM",
2+
"Date": "11/29/2023 10:20:31 PM",
33
"UnityVersion": "2022.3.12f1",
44
"com.unity.scriptablebuildpipeline": "1.21.20",
55
"com.unity.addressables": "1.21.18",
66
"traceEvents": [
7-
{"name": "Building Use Existing Build (requires built groups)", "ph": "X", "dur": 4539.3, "tid": 1, "ts": 1624, "pid": 1}
7+
{"name": "Building Use Existing Build (requires built groups)", "ph": "X", "dur": 1420.8, "tid": 1, "ts": 1589, "pid": 1}
88
]
99
}

0 commit comments

Comments
 (0)