Skip to content

Commit 2f4a855

Browse files
github-harunadevgithub-harunadev
committed
v1.2 (kinda rollback)
1 parent 159a763 commit 2f4a855

4 files changed

Lines changed: 19 additions & 324 deletions

File tree

‎Assets/harunadev/PrismStudio/VirtualTracker/VirtualTracker (Manual Prefab).prefab‎

Lines changed: 11 additions & 245 deletions
Original file line numberDiff line numberDiff line change
@@ -1,287 +1,53 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3-
--- !u!1 &12463398119130359
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: 7965861441830745695}
12-
- component: {fileID: 6336150367631636774}
13-
- component: {fileID: 8975688429523202899}
14-
m_Layer: 0
15-
m_Name: z
16-
m_TagString: Untagged
17-
m_Icon: {fileID: 0}
18-
m_NavMeshLayer: 0
19-
m_StaticEditorFlags: 0
20-
m_IsActive: 1
21-
--- !u!4 &7965861441830745695
22-
Transform:
23-
m_ObjectHideFlags: 0
24-
m_CorrespondingSourceObject: {fileID: 0}
25-
m_PrefabInstance: {fileID: 0}
26-
m_PrefabAsset: {fileID: 0}
27-
m_GameObject: {fileID: 12463398119130359}
28-
serializedVersion: 2
29-
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
30-
m_LocalPosition: {x: 0, y: 0, z: 0}
31-
m_LocalScale: {x: 1, y: 1, z: 1}
32-
m_ConstrainProportionsScale: 0
33-
m_Children: []
34-
m_Father: {fileID: 172343229795831016}
35-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
36-
--- !u!1818360608 &6336150367631636774
37-
PositionConstraint:
38-
m_ObjectHideFlags: 0
39-
m_CorrespondingSourceObject: {fileID: 0}
40-
m_PrefabInstance: {fileID: 0}
41-
m_PrefabAsset: {fileID: 0}
42-
m_GameObject: {fileID: 12463398119130359}
43-
m_Enabled: 1
44-
serializedVersion: 2
45-
m_Weight: 1
46-
m_TranslationAtRest: {x: 0, y: 0, z: 0}
47-
m_TranslationOffset: {x: 0, y: 0, z: 0}
48-
m_AffectTranslationX: 0
49-
m_AffectTranslationY: 0
50-
m_AffectTranslationZ: 1
51-
m_Active: 1
52-
m_IsLocked: 1
53-
m_Sources:
54-
- sourceTransform: {fileID: 0}
55-
weight: 0.001
56-
- sourceTransform: {fileID: 172343229795831016}
57-
weight: 1
58-
--- !u!114 &8975688429523202899
59-
MonoBehaviour:
60-
m_ObjectHideFlags: 0
61-
m_CorrespondingSourceObject: {fileID: 0}
62-
m_PrefabInstance: {fileID: 0}
63-
m_PrefabAsset: {fileID: 0}
64-
m_GameObject: {fileID: 12463398119130359}
65-
m_Enabled: 1
66-
m_EditorHideFlags: 0
67-
m_Script: {fileID: -802764141, guid: 80f1b8067b0760e4bb45023bc2e9de66, type: 3}
68-
m_Name:
69-
m_EditorClassIdentifier:
70-
rootTransform: {fileID: 0}
71-
shapeType: 0
72-
radius: 0.00000001
73-
height: 2
74-
position: {x: 0, y: 0, z: 0}
75-
rotation: {x: 0, y: 0, z: 0, w: 1}
76-
collisionTags: []
77-
--- !u!1 &1084464433050461503
78-
GameObject:
79-
m_ObjectHideFlags: 0
80-
m_CorrespondingSourceObject: {fileID: 0}
81-
m_PrefabInstance: {fileID: 0}
82-
m_PrefabAsset: {fileID: 0}
83-
serializedVersion: 6
84-
m_Component:
85-
- component: {fileID: 6546033797197395061}
86-
- component: {fileID: 727341377454902112}
87-
- component: {fileID: 2188424287283193286}
88-
m_Layer: 0
89-
m_Name: x
90-
m_TagString: Untagged
91-
m_Icon: {fileID: 0}
92-
m_NavMeshLayer: 0
93-
m_StaticEditorFlags: 0
94-
m_IsActive: 1
95-
--- !u!4 &6546033797197395061
96-
Transform:
97-
m_ObjectHideFlags: 0
98-
m_CorrespondingSourceObject: {fileID: 0}
99-
m_PrefabInstance: {fileID: 0}
100-
m_PrefabAsset: {fileID: 0}
101-
m_GameObject: {fileID: 1084464433050461503}
102-
serializedVersion: 2
103-
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
104-
m_LocalPosition: {x: 0, y: 0, z: 0}
105-
m_LocalScale: {x: 1, y: 1, z: 1}
106-
m_ConstrainProportionsScale: 0
107-
m_Children: []
108-
m_Father: {fileID: 172343229795831016}
109-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
110-
--- !u!1818360608 &727341377454902112
111-
PositionConstraint:
112-
m_ObjectHideFlags: 0
113-
m_CorrespondingSourceObject: {fileID: 0}
114-
m_PrefabInstance: {fileID: 0}
115-
m_PrefabAsset: {fileID: 0}
116-
m_GameObject: {fileID: 1084464433050461503}
117-
m_Enabled: 1
118-
serializedVersion: 2
119-
m_Weight: 1
120-
m_TranslationAtRest: {x: 0, y: 0, z: 0}
121-
m_TranslationOffset: {x: 0, y: 0, z: 0}
122-
m_AffectTranslationX: 1
123-
m_AffectTranslationY: 0
124-
m_AffectTranslationZ: 0
125-
m_Active: 1
126-
m_IsLocked: 1
127-
m_Sources:
128-
- sourceTransform: {fileID: 0}
129-
weight: 0.001
130-
- sourceTransform: {fileID: 172343229795831016}
131-
weight: 1
132-
--- !u!114 &2188424287283193286
133-
MonoBehaviour:
134-
m_ObjectHideFlags: 0
135-
m_CorrespondingSourceObject: {fileID: 0}
136-
m_PrefabInstance: {fileID: 0}
137-
m_PrefabAsset: {fileID: 0}
138-
m_GameObject: {fileID: 1084464433050461503}
139-
m_Enabled: 1
140-
m_EditorHideFlags: 0
141-
m_Script: {fileID: -802764141, guid: 80f1b8067b0760e4bb45023bc2e9de66, type: 3}
142-
m_Name:
143-
m_EditorClassIdentifier:
144-
rootTransform: {fileID: 0}
145-
shapeType: 0
146-
radius: 0.00000001
147-
height: 2
148-
position: {x: 0, y: 0, z: 0}
149-
rotation: {x: 0, y: 0, z: 0, w: 1}
150-
collisionTags: []
151-
--- !u!1 &3336083597888334462
3+
--- !u!1 &5892130515242338651
1524
GameObject:
1535
m_ObjectHideFlags: 0
1546
m_CorrespondingSourceObject: {fileID: 0}
1557
m_PrefabInstance: {fileID: 0}
1568
m_PrefabAsset: {fileID: 0}
1579
serializedVersion: 6
15810
m_Component:
159-
- component: {fileID: 8996142502059668828}
160-
- component: {fileID: 2077925362497864894}
161-
- component: {fileID: 5018287375078654805}
11+
- component: {fileID: 172343229795831016}
12+
- component: {fileID: 7402735349345704329}
16213
m_Layer: 0
163-
m_Name: y
14+
m_Name: VirtualTracker (Manual Prefab)
16415
m_TagString: Untagged
16516
m_Icon: {fileID: 0}
16617
m_NavMeshLayer: 0
16718
m_StaticEditorFlags: 0
16819
m_IsActive: 1
169-
--- !u!4 &8996142502059668828
20+
--- !u!4 &172343229795831016
17021
Transform:
17122
m_ObjectHideFlags: 0
17223
m_CorrespondingSourceObject: {fileID: 0}
17324
m_PrefabInstance: {fileID: 0}
17425
m_PrefabAsset: {fileID: 0}
175-
m_GameObject: {fileID: 3336083597888334462}
26+
m_GameObject: {fileID: 5892130515242338651}
17627
serializedVersion: 2
177-
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
28+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
17829
m_LocalPosition: {x: 0, y: 0, z: 0}
17930
m_LocalScale: {x: 1, y: 1, z: 1}
18031
m_ConstrainProportionsScale: 0
18132
m_Children: []
182-
m_Father: {fileID: 172343229795831016}
33+
m_Father: {fileID: 0}
18334
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
184-
--- !u!1818360608 &2077925362497864894
185-
PositionConstraint:
186-
m_ObjectHideFlags: 0
187-
m_CorrespondingSourceObject: {fileID: 0}
188-
m_PrefabInstance: {fileID: 0}
189-
m_PrefabAsset: {fileID: 0}
190-
m_GameObject: {fileID: 3336083597888334462}
191-
m_Enabled: 1
192-
serializedVersion: 2
193-
m_Weight: 1
194-
m_TranslationAtRest: {x: 0, y: 0, z: 0}
195-
m_TranslationOffset: {x: 0, y: 0, z: 0}
196-
m_AffectTranslationX: 0
197-
m_AffectTranslationY: 1
198-
m_AffectTranslationZ: 0
199-
m_Active: 1
200-
m_IsLocked: 1
201-
m_Sources:
202-
- sourceTransform: {fileID: 0}
203-
weight: 0.001
204-
- sourceTransform: {fileID: 172343229795831016}
205-
weight: 1
206-
--- !u!114 &5018287375078654805
35+
--- !u!114 &7402735349345704329
20736
MonoBehaviour:
20837
m_ObjectHideFlags: 0
20938
m_CorrespondingSourceObject: {fileID: 0}
21039
m_PrefabInstance: {fileID: 0}
21140
m_PrefabAsset: {fileID: 0}
212-
m_GameObject: {fileID: 3336083597888334462}
41+
m_GameObject: {fileID: 5892130515242338651}
21342
m_Enabled: 1
21443
m_EditorHideFlags: 0
21544
m_Script: {fileID: -802764141, guid: 80f1b8067b0760e4bb45023bc2e9de66, type: 3}
21645
m_Name:
21746
m_EditorClassIdentifier:
21847
rootTransform: {fileID: 0}
21948
shapeType: 0
220-
radius: 0.00000001
49+
radius: 0.00001
22150
height: 2
22251
position: {x: 0, y: 0, z: 0}
22352
rotation: {x: 0, y: 0, z: 0, w: 1}
22453
collisionTags: []
225-
--- !u!1 &5892130515242338651
226-
GameObject:
227-
m_ObjectHideFlags: 0
228-
m_CorrespondingSourceObject: {fileID: 0}
229-
m_PrefabInstance: {fileID: 0}
230-
m_PrefabAsset: {fileID: 0}
231-
serializedVersion: 6
232-
m_Component:
233-
- component: {fileID: 172343229795831016}
234-
- component: {fileID: 3340801928727204814}
235-
m_Layer: 0
236-
m_Name: VirtualTracker (Manual Prefab)
237-
m_TagString: Untagged
238-
m_Icon: {fileID: 0}
239-
m_NavMeshLayer: 0
240-
m_StaticEditorFlags: 0
241-
m_IsActive: 1
242-
--- !u!4 &172343229795831016
243-
Transform:
244-
m_ObjectHideFlags: 0
245-
m_CorrespondingSourceObject: {fileID: 0}
246-
m_PrefabInstance: {fileID: 0}
247-
m_PrefabAsset: {fileID: 0}
248-
m_GameObject: {fileID: 5892130515242338651}
249-
serializedVersion: 2
250-
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
251-
m_LocalPosition: {x: 0, y: 0, z: 0}
252-
m_LocalScale: {x: 1, y: 1, z: 1}
253-
m_ConstrainProportionsScale: 0
254-
m_Children:
255-
- {fileID: 6546033797197395061}
256-
- {fileID: 8996142502059668828}
257-
- {fileID: 7965861441830745695}
258-
m_Father: {fileID: 0}
259-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
260-
--- !u!1773428102 &3340801928727204814
261-
ParentConstraint:
262-
m_ObjectHideFlags: 0
263-
m_CorrespondingSourceObject: {fileID: 0}
264-
m_PrefabInstance: {fileID: 0}
265-
m_PrefabAsset: {fileID: 0}
266-
m_GameObject: {fileID: 5892130515242338651}
267-
m_Enabled: 1
268-
serializedVersion: 2
269-
m_Weight: 1
270-
m_TranslationAtRest: {x: 0, y: 0, z: 0}
271-
m_RotationAtRest: {x: 0, y: 0, z: 0}
272-
m_TranslationOffsets:
273-
- {x: 0, y: 0, z: 0}
274-
m_RotationOffsets:
275-
- {x: 0, y: 0, z: 0}
276-
m_AffectTranslationX: 1
277-
m_AffectTranslationY: 1
278-
m_AffectTranslationZ: 1
279-
m_AffectRotationX: 1
280-
m_AffectRotationY: 1
281-
m_AffectRotationZ: 1
282-
m_Active: 1
283-
m_IsLocked: 1
284-
m_Sources:
285-
- sourceTransform: {fileID: 1628141206562102982, guid: 8edf58b65e37faa4cbfe429de3538124,
286-
type: 3}
287-
weight: 1

‎Assets/harunadev/PrismStudio/VirtualTracker/VirtualTrackerCreator.cs‎

Lines changed: 8 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@
44
using UnityEditor;
55
using UnityEngine;
66
using UnityEngine.Animations;
7-
using VRC.SDK3.Avatars.Components;
87
using VRC.SDK3.Dynamics.Contact.Components;
98

109
public class VirtualTrackerCreator : EditorWindow
1110
{
12-
13-
public readonly string version = "1.1";
11+
public readonly string version = "1.2";
12+
readonly static string PrefabPath = "Assets/harunadev/PrismStudio/VirtualTracker/_ManualPrefab.prefab";
1413

1514
[MenuItem("GameObject/PrismStudio VirtualTracker/0")] static void c0(MenuCommand menuCommand) { CreateTracker(0, menuCommand); }
1615
[MenuItem("GameObject/PrismStudio VirtualTracker/1")] static void c1(MenuCommand menuCommand) { CreateTracker(1, menuCommand); }
@@ -64,42 +63,12 @@ static void CreateTracker(int index, MenuCommand menuCommand)
6463

6564
static void CreateTracker(int index, GameObject parent)
6665
{
67-
VRCAvatarDescriptor targetavatar = parent.GetComponentInParent<VRCAvatarDescriptor>();
68-
69-
if (targetavatar != null)
70-
{
71-
GameObject go = (GameObject)PrefabUtility.InstantiatePrefab(AssetDatabase.LoadAssetAtPath("Assets/harunadev/PrismStudio/VirtualTracker/VirtualTracker (Manual Prefab).prefab", typeof(GameObject)));
72-
go.name = "VirtualTracker " + index;
73-
74-
GameObjectUtility.SetParentAndAlign(go, targetavatar.gameObject);
75-
76-
go.transform.Find("x").GetComponent<PositionConstraint>().SetSource(0, new ConstraintSource()
77-
{
78-
sourceTransform = parent.transform,
79-
weight = 0.001f
80-
});
81-
go.transform.Find("y").GetComponent<PositionConstraint>().SetSource(0, new ConstraintSource()
82-
{
83-
sourceTransform = parent.transform,
84-
weight = 0.001f
85-
});
86-
go.transform.Find("z").GetComponent<PositionConstraint>().SetSource(0, new ConstraintSource()
87-
{
88-
sourceTransform = parent.transform,
89-
weight = 0.001f
90-
});
91-
92-
go.transform.Find("x").GetComponent<VRCContactSender>().collisionTags.Add("ps_vt_" + index + "_x");
93-
go.transform.Find("y").GetComponent<VRCContactSender>().collisionTags.Add("ps_vt_" + index + "_y");
94-
go.transform.Find("z").GetComponent<VRCContactSender>().collisionTags.Add("ps_vt_" + index + "_z");
95-
96-
Undo.RegisterCreatedObjectUndo(go, "Create " + go.name);
97-
Selection.activeObject = go;
98-
99-
} else
100-
{
101-
Debug.LogError("Selected object is not in VRCAvatarDescriptor!");
102-
}
66+
GameObject go = (GameObject)PrefabUtility.InstantiatePrefab(AssetDatabase.LoadAssetAtPath(PrefabPath, typeof(GameObject)));
67+
go.name = "VirtualTracker " + index;
68+
GameObjectUtility.SetParentAndAlign(go, parent);
69+
go.GetComponent<VRCContactSender>().collisionTags.Add("ps_rt_" + index);
70+
Undo.RegisterCreatedObjectUndo(go, "Create " + go.name);
71+
Selection.activeObject = go;
10372
}
10473

10574

‎Assets/harunadev/PrismStudio/VirtualTracker/World.prefab‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)