Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/use unityengine vectors #11

Merged
merged 23 commits into from
Jul 17, 2021
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
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
#### 4.0.0 (2021-07-10)

##### Build System / Dependencies

* bump version ([29016a2c](https://github.com/psydack/uimgui/commit/29016a2c51021c5832d1227e06ceb012610df590))

##### New Features

* label for addons ([f4c3f094](https://github.com/psydack/uimgui/commit/f4c3f09442658f8ca07a9f2e84c88a6ee8b494c1))

#### 3.0.1 (2021-06-22)

##### Documentation Changes
Expand Down
32 changes: 31 additions & 1 deletion Editor/Editors/UImGuiEditor.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using ImGuiNET;
using System.Text;
using UImGui.Platform;
using UImGui.Renderer;
using UnityEditor;
using UnityEngine;

Expand All @@ -22,6 +23,10 @@ internal class UImGuiEditor : UnityEditor.Editor
private SerializedProperty _cursorShapes;
private readonly StringBuilder _messages = new StringBuilder();

private bool usingImNodes = true;
private bool usingImGuizmo = true;
private bool usingImPlot = true;

public override void OnInspectorGUI()
{
serializedObject.Update();
Expand Down Expand Up @@ -74,11 +79,29 @@ private void OnEnable()
_shaders = serializedObject.FindProperty("_shaders");
_style = serializedObject.FindProperty("_style");
_cursorShapes = serializedObject.FindProperty("_cursorShapes");

#if UIMGUI_REMOVE_IMNODES
usingImNodes = false;
#endif
#if UIMGUI_REMOVE_IMGUIZMO
usingImGuizmo = false;
#endif
#if UIMGUI_REMOVE_IMPLOT
usingImPlot = false;
#endif
}

private void CheckRequirements()
{
EditorGUILayout.LabelField("ImGUI Version: " + ImGui.GetVersion());
var textImGui = $"ImGUI: {ImGui.GetVersion()}";
var textImNodes = $"ImNodes: { (usingImNodes ? "0.4 - 2021-07-09" : "disabled") }";
var textImGuizmo = $"ImGuizmo: { (usingImGuizmo ? "?? - 2021-07-09" : "disabled") }";
var textImPlot = $"ImPlot: { (usingImPlot ? "0.10 - 2021-07-09" : "disabled") }";

EditorGUILayout.LabelField(textImGui);
EditorGUILayout.LabelField(textImNodes);
EditorGUILayout.LabelField(textImGuizmo);
EditorGUILayout.LabelField(textImPlot);
EditorGUILayout.Space();

_messages.Clear();
Expand All @@ -92,6 +115,13 @@ private void CheckRequirements()
_messages.AppendLine("Must assign a RenderFeature when using the URP.");
}

#if !UNITY_2020_1_OR_NEWER
if ((RenderType)_renderer.enumValueIndex == RenderType.Mesh)
{
_messages.AppendLine("Use procedural.");
}
#endif

SerializedProperty configFlags = _initialConfiguration.FindPropertyRelative("ImGuiConfig");
if (!PlatformUtility.IsAvailable((InputType)_platform.enumValueIndex))
{
Expand Down
Binary file removed Plugins/ImGui.NET.dll
Binary file not shown.
2 changes: 1 addition & 1 deletion Plugins/System.Runtime.CompilerServices.Unsafe.dll.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Plugins/osx-x64.meta → Plugins/imgui.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Plugins/imgui/ImGui.NET.dll
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file added Plugins/imgui/cimgui.dll
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion Plugins/linux-x64.meta → Plugins/imguizmo.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Plugins/imguizmo/ImGuizmo.NET.dll
Binary file not shown.
70 changes: 70 additions & 0 deletions Plugins/imguizmo/ImGuizmo.NET.dll.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Plugins/imguizmo/cimguizmo.dll
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Plugins/win-x64.meta → Plugins/imnodes.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Plugins/imnodes/ImNodes.NET.dll
Binary file not shown.
70 changes: 70 additions & 0 deletions Plugins/imnodes/ImNodes.NET.dll.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Plugins/imnodes/cimnodes.dll
Binary file not shown.
63 changes: 63 additions & 0 deletions Plugins/imnodes/cimnodes.dll.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Plugins/implot/ImPlot.NET.dll
Binary file not shown.
Loading