Skip to content

Commit d3dcafc

Browse files
committed
Merge branch 'feature/slider_joint' into develop
2 parents 47fa2e6 + ebc78e0 commit d3dcafc

39 files changed

+8518
-20003
lines changed
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
using System.Collections;
2+
using System.Collections.Generic;
3+
using UnityEngine;
4+
using UnityEditor;
5+
using ZO.Math;
6+
7+
namespace ZO.Editor {
8+
[CustomEditor(typeof(ZO.Physics.ZOPrismaticJoint))]
9+
10+
public class ZOPrismaticJointEditor : UnityEditor.Editor {
11+
12+
// private bool _isConfigurableJointHidden = false;
13+
// private ZO.Physics.ZOPrismaticJoint _prismaticJoint;
14+
// public override void OnInspectorGUI() {
15+
// DrawDefaultInspector();
16+
17+
// _prismaticJoint = target as ZO.Physics.ZOPrismaticJoint;
18+
19+
// }
20+
21+
22+
private void OnEnable() {
23+
ZO.Physics.ZOPrismaticJoint prismaticJoint = target as ZO.Physics.ZOPrismaticJoint;
24+
if (prismaticJoint.GetComponent<ConfigurableJoint>()) {
25+
26+
// prismaticJoint.GetComponent<ConfigurableJoint>().hideFlags = HideFlags.HideInInspector;
27+
}
28+
}
29+
30+
31+
}
32+
33+
}
34+

Samples~/ZeroSimSamples/Robots/SimpleRobotArm/SimpleRobotArm.zosim.meta renamed to Editor/CustomEditors/ZOPrismaticJointEditor.cs.meta

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
-18.1 KB
Binary file not shown.

Runtime/Plugins/Newtonsoft.Json.12.0.3/LICENSE.md

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

Runtime/Plugins/Newtonsoft.Json.12.0.3/LICENSE.md.meta

Lines changed: 0 additions & 7 deletions
This file was deleted.
Binary file not shown.

Runtime/Plugins/Newtonsoft.Json.12.0.3/lib/netstandard2.0.meta

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

Runtime/Plugins/Newtonsoft.Json.12.0.3/lib/netstandard2.0/Newtonsoft.Json.dll

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

Runtime/Plugins/Newtonsoft.Json.12.0.3/lib/netstandard2.0/Newtonsoft.Json.dll.meta

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

0 commit comments

Comments
 (0)