Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions Editor/MarkerEditor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using System;
using System.IO;
using System.Linq;
using System.Reflection;
using UnityEditor;
using UnityEditor.Animations;
using UnityEngine;
Expand Down Expand Up @@ -542,8 +543,10 @@ public void Generate()
// constrain cull object to avatar
Transform cull = marker.transform.Find("Cull");
cull.GetComponent<VRCParentConstraint>().Sources[0] = new VRCConstraintSource(descriptor.transform, 1f, Vector3.zero, Vector3.zero);
cull.GetComponent<VRCParentConstraint>().RequestFullNativeUpdate();

Type constraintType = typeof(VRC.Dynamics.VRCConstraintBase);
MethodInfo method = constraintType.GetMethod("RequestFullNativeUpdate",
BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
method.Invoke(cull.GetComponent<VRCParentConstraint>(), new object[0]);
if (useIndexFinger)
{
DestroyImmediate(markerTarget.GetChild(0).gameObject); // destroy Flip
Expand Down Expand Up @@ -593,7 +596,9 @@ public void Generate()
}
}
}
localConstraint.RequestFullNativeUpdate();

method.Invoke(localConstraint, new object[0]);

DestroyImmediate(targets.gameObject); // remove the "Targets" container object when finished

// set anything not adjustable to a medium-ish amount
Expand Down
48 changes: 24 additions & 24 deletions Resources/Animations/M_Cull Off.anim
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 1000
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
Expand All @@ -32,7 +32,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.016666668
value: 1000
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
Expand All @@ -53,7 +53,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 1000
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
Expand All @@ -62,7 +62,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.016666668
value: 1000
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
Expand All @@ -83,7 +83,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 1000
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
Expand All @@ -92,7 +92,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.016666668
value: 1000
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
Expand All @@ -113,7 +113,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 1000
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
Expand All @@ -122,7 +122,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.016666668
value: 1000
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
Expand All @@ -143,7 +143,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 1000
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
Expand All @@ -152,7 +152,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.016666668
value: 1000
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
Expand All @@ -173,7 +173,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 1000
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
Expand All @@ -182,7 +182,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.016666668
value: 1000
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
Expand Down Expand Up @@ -287,7 +287,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 1000
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
Expand All @@ -296,7 +296,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.016666668
value: 1000
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
Expand All @@ -317,7 +317,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 1000
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
Expand All @@ -326,7 +326,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.016666668
value: 1000
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
Expand All @@ -347,7 +347,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 1000
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
Expand All @@ -356,7 +356,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.016666668
value: 1000
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
Expand All @@ -377,7 +377,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 1000
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
Expand All @@ -386,7 +386,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.016666668
value: 1000
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
Expand All @@ -407,7 +407,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 1000
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
Expand All @@ -416,7 +416,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.016666668
value: 1000
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
Expand All @@ -437,7 +437,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 1000
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
Expand All @@ -446,7 +446,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.016666668
value: 1000
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
Expand Down
Loading