Skip to content

Commit 03af242

Browse files
SadayoshiShimazakiSadayoshiShimazaki
committed
Update ToF AR Samples Basic V1.1.0
1 parent f4865d4 commit 03af242

File tree

108 files changed

+6642
-790
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+6642
-790
lines changed

‎Assets/TofArSamplesBasic/Body/ColorBody.unity‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
41-
m_IndirectSpecularColor: {r: 0, g: 0.99999946, b: 0.99999946, a: 1}
41+
m_IndirectSpecularColor: {r: 0.4439403, g: 0.4931519, b: 0.5722083, a: 1}
4242
m_UseRadianceAmbientProbe: 0
4343
--- !u!157 &3
4444
LightmapSettings:
@@ -154,6 +154,10 @@ PrefabInstance:
154154
propertyPath: m_Enabled
155155
value: 0
156156
objectReference: {fileID: 0}
157+
- target: {fileID: 696184252838813497, guid: e487fb299aff7184ca9f1b9ad1593c7f, type: 3}
158+
propertyPath: TexMapper3d
159+
value:
160+
objectReference: {fileID: 2146784386}
157161
- target: {fileID: 2152707496459267295, guid: e487fb299aff7184ca9f1b9ad1593c7f, type: 3}
158162
propertyPath: fitter
159163
value:
@@ -1717,6 +1721,17 @@ MonoBehaviour:
17171721
m_Script: {fileID: 11500000, guid: 49f6a342c6e419e49aae3be59c315ca2, type: 3}
17181722
m_Name:
17191723
m_EditorClassIdentifier:
1724+
--- !u!114 &2146784386 stripped
1725+
MonoBehaviour:
1726+
m_CorrespondingSourceObject: {fileID: 2168188090061114249, guid: 63a7b27353b687d46bab0660341dc4cb, type: 3}
1727+
m_PrefabInstance: {fileID: 2146784381}
1728+
m_PrefabAsset: {fileID: 0}
1729+
m_GameObject: {fileID: 0}
1730+
m_Enabled: 1
1731+
m_EditorHideFlags: 0
1732+
m_Script: {fileID: 11500000, guid: 78e4b94184d0f704ca5e77c1be8e00f2, type: 3}
1733+
m_Name:
1734+
m_EditorClassIdentifier:
17201735
--- !u!1001 &7007125705492320193
17211736
PrefabInstance:
17221737
m_ObjectHideFlags: 0

‎Assets/TofArSamplesBasic/Body/Scripts/BodyViewSettings.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,15 @@ void MakeUIOffset()
7373
itemOffsetX = settings.AddItem("Offset X", BodyModelController.OffsetMin,
7474
BodyModelController.OffsetMax, BodyModelController.OffsetStep,
7575
offset.x, ChangeOffsetX);
76+
itemOffsetX.IsNotifyImmediately = true;
7677
itemOffsetY = settings.AddItem("Offset Y", BodyModelController.OffsetMin,
7778
BodyModelController.OffsetMax, BodyModelController.OffsetStep,
7879
offset.y, ChangeOffsetY);
80+
itemOffsetY.IsNotifyImmediately = true;
7981
itemOffsetZ = settings.AddItem("Offset Z", BodyModelController.OffsetMin,
8082
BodyModelController.OffsetMax, BodyModelController.OffsetStep,
8183
offset.z, ChangeOffsetZ);
84+
itemOffsetZ.IsNotifyImmediately = true;
8285

8386
settings.AddItem("Reset Offset", ResetOffset);
8487
modelCtrl.OnChangeOffset += OnChangeOffset;
@@ -149,6 +152,7 @@ void MakeUIScale()
149152
itemScale = settings.AddItem("Scale", BodyModelController.ScaleMin,
150153
BodyModelController.ScaleMax, BodyModelController.ScaleStep,
151154
scale, ChangeScale);
155+
itemScale.IsNotifyImmediately = true;
152156

153157
settings.AddItem("Reset Scale", ResetScale);
154158

‎Assets/TofArSamplesBasic/Body/Scripts/VrmVisualizer.cs‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,24 @@ public void Awake()
118118
this.widthVrm = ((anim.GetBoneTransform(HumanBodyBones.LeftUpperArm).position - anim.GetBoneTransform(HumanBodyBones.Neck).position).magnitude + (anim.GetBoneTransform(HumanBodyBones.Neck).position - anim.GetBoneTransform(HumanBodyBones.RightUpperArm).position).magnitude);
119119
}
120120

121+
private void OnEnable()
122+
{
123+
TofArBodyManager.OnStreamStopped += OnBodyStreamStopped;
124+
}
125+
126+
private void OnDisable()
127+
{
128+
TofArBodyManager.OnStreamStopped -= OnBodyStreamStopped;
129+
}
130+
131+
private void OnBodyStreamStopped(object sender)
132+
{
133+
foreach (var rend in renderers)
134+
{
135+
rend.enabled = false;
136+
}
137+
}
138+
121139
private bool isFullbody;
122140

123141
private Vector3 rootPosition = Vector3.zero;

‎Assets/TofArSamplesBasic/Color/Scripts/ColorViewController.cs‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,5 +110,20 @@ protected override int GetPositionIndex()
110110
{
111111
return 0;
112112
}
113+
114+
protected override Vector2 GetAdjustedSize()
115+
{
116+
var currentResolution= TofArColorManager.Instance.GetProperty<ResolutionProperty>();
117+
118+
float defWidth = defaultImgSize.x;
119+
120+
float ratio = (float)currentResolution.width / currentResolution.height;
121+
122+
int width = (int)(defWidth );
123+
int height = (int)(defWidth / ratio);
124+
125+
return new Vector2(width, height);
126+
127+
}
113128
}
114129
}

‎Assets/TofArSamplesBasic/ColorDepth/BasicStream.unity‎

Lines changed: 50 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -588,11 +588,11 @@ RectTransform:
588588
m_Father: {fileID: 1994002908}
589589
m_RootOrder: 1
590590
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
591-
m_AnchorMin: {x: 0.5, y: 1}
592-
m_AnchorMax: {x: 0.5, y: 1}
591+
m_AnchorMin: {x: 0.5, y: 0}
592+
m_AnchorMax: {x: 0.5, y: 0}
593593
m_AnchoredPosition: {x: 0, y: 0}
594594
m_SizeDelta: {x: 240, y: 60}
595-
m_Pivot: {x: 0.5, y: 1}
595+
m_Pivot: {x: 0.5, y: 0}
596596
--- !u!114 &117671708
597597
MonoBehaviour:
598598
m_ObjectHideFlags: 0
@@ -902,7 +902,7 @@ RectTransform:
902902
m_AnchorMin: {x: 0, y: 0}
903903
m_AnchorMax: {x: 1, y: 1}
904904
m_AnchoredPosition: {x: 0, y: 0}
905-
m_SizeDelta: {x: 0, y: -180}
905+
m_SizeDelta: {x: 0, y: 0}
906906
m_Pivot: {x: 0.5, y: 0.5}
907907
--- !u!1 &227757146
908908
GameObject:
@@ -913,6 +913,7 @@ GameObject:
913913
serializedVersion: 6
914914
m_Component:
915915
- component: {fileID: 227757147}
916+
- component: {fileID: 227757148}
916917
m_Layer: 5
917918
m_Name: Depth
918919
m_TagString: Untagged
@@ -941,6 +942,18 @@ RectTransform:
941942
m_AnchoredPosition: {x: 0, y: 0}
942943
m_SizeDelta: {x: 0, y: 0}
943944
m_Pivot: {x: 0.5, y: 0.5}
945+
--- !u!114 &227757148
946+
MonoBehaviour:
947+
m_ObjectHideFlags: 0
948+
m_CorrespondingSourceObject: {fileID: 0}
949+
m_PrefabInstance: {fileID: 0}
950+
m_PrefabAsset: {fileID: 0}
951+
m_GameObject: {fileID: 227757146}
952+
m_Enabled: 1
953+
m_EditorHideFlags: 0
954+
m_Script: {fileID: 11500000, guid: 1fd2bd74e00714f46985c4d1026cbf08, type: 3}
955+
m_Name:
956+
m_EditorClassIdentifier:
944957
--- !u!1001 &261588474
945958
PrefabInstance:
946959
m_ObjectHideFlags: 0
@@ -1309,11 +1322,11 @@ RectTransform:
13091322
m_Father: {fileID: 1907452549}
13101323
m_RootOrder: 1
13111324
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1312-
m_AnchorMin: {x: 0.5, y: 1}
1313-
m_AnchorMax: {x: 0.5, y: 1}
1325+
m_AnchorMin: {x: 0.5, y: 0}
1326+
m_AnchorMax: {x: 0.5, y: 0}
13141327
m_AnchoredPosition: {x: 0, y: 0}
13151328
m_SizeDelta: {x: 240, y: 60}
1316-
m_Pivot: {x: 0.5, y: 1}
1329+
m_Pivot: {x: 0.5, y: 0}
13171330
--- !u!114 &798952028
13181331
MonoBehaviour:
13191332
m_ObjectHideFlags: 0
@@ -1939,6 +1952,7 @@ GameObject:
19391952
serializedVersion: 6
19401953
m_Component:
19411954
- component: {fileID: 1907452549}
1955+
- component: {fileID: 1907452550}
19421956
m_Layer: 5
19431957
m_Name: Confidence
19441958
m_TagString: Untagged
@@ -1967,6 +1981,18 @@ RectTransform:
19671981
m_AnchoredPosition: {x: 0, y: 0}
19681982
m_SizeDelta: {x: 0, y: 0}
19691983
m_Pivot: {x: 0.5, y: 0.5}
1984+
--- !u!114 &1907452550
1985+
MonoBehaviour:
1986+
m_ObjectHideFlags: 0
1987+
m_CorrespondingSourceObject: {fileID: 0}
1988+
m_PrefabInstance: {fileID: 0}
1989+
m_PrefabAsset: {fileID: 0}
1990+
m_GameObject: {fileID: 1907452548}
1991+
m_Enabled: 1
1992+
m_EditorHideFlags: 0
1993+
m_Script: {fileID: 11500000, guid: 1fd2bd74e00714f46985c4d1026cbf08, type: 3}
1994+
m_Name:
1995+
m_EditorClassIdentifier:
19701996
--- !u!1 &1987035870
19711997
GameObject:
19721998
m_ObjectHideFlags: 0
@@ -2091,6 +2117,7 @@ GameObject:
20912117
serializedVersion: 6
20922118
m_Component:
20932119
- component: {fileID: 1994002908}
2120+
- component: {fileID: 1994002909}
20942121
m_Layer: 5
20952122
m_Name: Color
20962123
m_TagString: Untagged
@@ -2119,6 +2146,18 @@ RectTransform:
21192146
m_AnchoredPosition: {x: 0, y: 0}
21202147
m_SizeDelta: {x: 0, y: 0}
21212148
m_Pivot: {x: 0.5, y: 0.5}
2149+
--- !u!114 &1994002909
2150+
MonoBehaviour:
2151+
m_ObjectHideFlags: 0
2152+
m_CorrespondingSourceObject: {fileID: 0}
2153+
m_PrefabInstance: {fileID: 0}
2154+
m_PrefabAsset: {fileID: 0}
2155+
m_GameObject: {fileID: 1994002907}
2156+
m_Enabled: 1
2157+
m_EditorHideFlags: 0
2158+
m_Script: {fileID: 11500000, guid: 1fd2bd74e00714f46985c4d1026cbf08, type: 3}
2159+
m_Name:
2160+
m_EditorClassIdentifier:
21222161
--- !u!224 &2100310650 stripped
21232162
RectTransform:
21242163
m_CorrespondingSourceObject: {fileID: 5790388901095074546, guid: 6afeeb4a6e67eb044894a23c5d7c53e1, type: 3}
@@ -2244,8 +2283,8 @@ RectTransform:
22442283
m_Father: {fileID: 227757147}
22452284
m_RootOrder: 1
22462285
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
2247-
m_AnchorMin: {x: 0.5, y: 1}
2248-
m_AnchorMax: {x: 0.5, y: 1}
2249-
m_AnchoredPosition: {x: -0.000030517578, y: 0}
2286+
m_AnchorMin: {x: 0.5, y: 0}
2287+
m_AnchorMax: {x: 0.5, y: 0}
2288+
m_AnchoredPosition: {x: 0, y: 0}
22502289
m_SizeDelta: {x: 240, y: 60}
2251-
m_Pivot: {x: 0.5, y: 1}
2290+
m_Pivot: {x: 0.5, y: 0}

0 commit comments

Comments
 (0)