Gottfried/glitchy-engine-beef
1
0
Fork 0
mirror of https://github.com/aharabada/glitchy-engine-beef.git synced 2026-09-05 13:01:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Start of material editor

Browse Source
This commit is contained in:
Simon Lübeß
2025-03-03 20:29:35 +01:00
parent 10e8b3c282
commit 6d50208700
12 changed files with 304 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GlitchyEngine/src/ImGui/ImGuiExtension.bf
+56 -31
View File
@@ -176,7 +176,7 @@ namespace ImGui
(.(55, 55, 230), .(55, 55, 150), .(90, 90, 230)),
(.(230, 25, 45), .(230, 25, 45), .(230, 25, 45)));
public static bool EditVector<NumComponents>(StringView label, ref float[NumComponents] value, float[NumComponents] resetValues = .(), float dragSpeed = 0.1f, float columnWidth = 100f, float[NumComponents] minValue = .(), float[NumComponents] maxValue = .(), bool[NumComponents] componentEnabled = .()) where NumComponents : const int32
public static bool EditVector<NumComponents>(StringView label, ref float[NumComponents] value, float[NumComponents] resetValues = .(), float dragSpeed = 0.1f, float columnWidth = 100f, float[NumComponents] minValue = .(), float[NumComponents] maxValue = .(), bool[NumComponents] componentEnabled = .(true, )) where NumComponents : const int32
{
const String[?] componentNames = .("X", "Y", "Z", "W");
const String[?] componentIds = .("##X", "##Y", "##Z", "##W");
@@ -185,27 +185,36 @@ namespace ImGui
bool changed = false;
bool deactivated = false;
PushID(label);
defer PopID();
int currentId = ImGui.GetID("");
if (!label.IsEmpty)
{
PushID(label);
defer:: PopID();
Columns(2);
defer:: Columns(1);
SetColumnWidth(0, columnWidth);
Columns(2);
defer Columns(1);
SetColumnWidth(0, columnWidth);
//int currentId = ImGui.GetID("");
TextUnformatted(label);
TextUnformatted(label);
NextColumn();
PushMultiItemsWidths(NumComponents, CalcItemWidth());
NextColumn();
}
float lineHeight = GetFont().FontSize + GetStyle().FramePadding.y * 2.0f;
ImGui.Vec2 buttonSize = .(lineHeight + 3.0f, lineHeight);
PushStyleVar(.ItemSpacing, Vec2.Zero);
float itemWidth = CalcItemWidth();
float itemWidthNoButton = itemWidth - buttonSize.y * NumComponents;
bool hideButtons = (itemWidthNoButton / NumComponents) < ImGui.CalcTextSize("0.000").x;
PushMultiItemsWidths(NumComponents, hideButtons ? itemWidth : itemWidthNoButton);
PushStyleVar(.ItemSpacing, Vec2.Zero);
for (int i < NumComponents)
{
if (i > 0)
@@ -219,13 +228,16 @@ namespace ImGui
ImGui.BeginDisabled(!componentEnabled[i]);
if (Button(componentNames[i], buttonSize))
if (!hideButtons)
{
value[i] = resetValues[i];
changed = true;
if (Button(componentNames[i], buttonSize))
{
value[i] = resetValues[i];
changed = true;
}
SameLine();
}
SameLine();
if (DragFloat(componentIds[i], &value[i], dragSpeed, minValue[i], maxValue[i]))
{
@@ -278,7 +290,7 @@ namespace ImGui
return VectorEditor<4>(label, ref *(float[4]*)&value, (float[4])resetValues, dragSpeed, (float[4])minValue, (float[4])maxValue, (bool[4])componentEnabled, format);
}
public static bool VectorEditor<NumComponents>(StringView label, ref float[NumComponents] value, float[NumComponents] resetValues = .(), float dragSpeed = 0.1f, float[NumComponents] minValue = .(), float[NumComponents] maxValue = .(), bool[NumComponents] componentEnabled = .(), StringView[NumComponents] numberFormat = .()) where NumComponents : const int32
public static bool VectorEditor<NumComponents>(StringView label, ref float[NumComponents] value, float[NumComponents] resetValues = .(), float dragSpeed = 0.1f, float[NumComponents] minValue = .(), float[NumComponents] maxValue = .(), bool[NumComponents] componentEnabled = .(true, ), StringView[NumComponents] numberFormat = .()) where NumComponents : const int32
{
const String[?] componentNames = .("X", "Y", "Z", "W");
const String[?] componentIds = .("##X", "##Y", "##Z", "##W");
@@ -297,7 +309,16 @@ namespace ImGui
float lineHeight = GetFont().FontSize + GetStyle().FramePadding.y * 2.0f;
ImGui.Vec2 buttonSize = .(lineHeight + 3.0f, lineHeight);
float dragFloatWidth = componentWidth - buttonSize.x - GetStyle().FramePadding.x;
float dragFloatWidth = componentWidth - buttonSize.x;
bool showButtons = dragFloatWidth > CalcTextSize("0.000").x;
if (!showButtons)
{
dragFloatWidth = componentWidth;
}
dragFloatWidth -= GetStyle().FramePadding.x * 2;
componentLoop: for (int i < NumComponents)
{
@@ -314,16 +335,19 @@ namespace ImGui
//PushItemWidth(buttonSize.x);
if (Button(componentNames[i], buttonSize))
if (showButtons)
{
value[i] = resetValues[i];
changed = true;
if (Button(componentNames[i], buttonSize))
{
value[i] = resetValues[i];
changed = true;
}
PushStyleVar(.ItemSpacing, Vec2.Zero);
SameLine();
}
PushStyleVar(.ItemSpacing, Vec2.Zero);
SameLine();
StringView format = "0.#####";
if (!numberFormat[i].IsWhiteSpace)
@@ -356,7 +380,8 @@ namespace ImGui
PopItemWidth();
PopStyleVar();
if (showButtons)
PopStyleVar();
EndDisabled();
GlitchyEngine/src/Renderer/Material.bf
+10 -2
View File
@@ -27,6 +27,9 @@ public class Material : Asset
private BufferCollection _bufferCollection ~ _?.ReleaseRef();
public Dictionary<StringView, BufferVariable> Variables => _variables;
public TextureCollection Textures => _textureCollection;
public Effect Effect
{
get => _effect;
@@ -313,7 +316,7 @@ public class Material : Asset
}
}
public class TextureCollection
public class TextureCollection : IEnumerable<(String key, TextureEntry value)>
{
public enum TextureFlags
{
@@ -328,7 +331,7 @@ public class TextureCollection
Readonly = 0x8
}
private struct TextureEntry
public struct TextureEntry
{
public AssetHandle<Texture> TextureHandle;
public int32? groupTarget;
@@ -465,4 +468,9 @@ public class TextureCollection
}
protected extern Result<void> SetTexturePlatform();
public Dictionary<String, TextureEntry>.Enumerator GetEnumerator()
{
return _entries.GetEnumerator();
}
}