Chieri/Firmament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Add macro wheels

Browse Source
This commit is contained in:
Linnea Gräf
2025-06-17 20:59:45 +02:00
parent 775933d516
commit 4b9e966ca7
24 changed files with 753 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/resources/assets/firmament/gui/config/macros/combos.xml
View File

@@ -3,7 +3,6 @@
>
<Panel background="TRANSPARENT" insets="10">
<Column>
<Meta beforeClose="@beforeClose"/>
<ScrollPanel width="380" height="300">
<Align horizontal="CENTER">
<Array data="@actions">

0
src/main/resources/assets/firmament/gui/config/macros/editor.xml → src/main/resources/assets/firmament/gui/config/macros/editor_combo.xml
View File

43
src/main/resources/assets/firmament/gui/config/macros/editor_wheel.xml Normal file
View File

@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="UTF-8" ?>
<Root xmlns="http://notenoughupdates.org/moulconfig" xmlns:firm="http://firmament.nea.moe/moulconfig"
>
<Center>
<Panel background="VANILLA" insets="10">
<Column>
<Row>
<firm:Button onClick="@back">
<Text text="←"/>
</firm:Button>
<Text text="Editing wheel macro"/>
</Row>
<Row>
<Text text="Key (Hold):"/>
<Align horizontal="RIGHT">
<firm:Fixed width="160">
<Indirect value="@button"/>
</firm:Fixed>
</Align>
</Row>
<Row>
<Text text="Menu Options:"/>
<Align horizontal="RIGHT">
<firm:Button onClick="@addOption">
<Text text="+"/>
</firm:Button>
</Align>
</Row>
<Array data="@editableCommands">
<Row>
<Text text="/"/>
<TextField value="@text" width="160"/>
<Align horizontal="RIGHT">
<firm:Button onClick="@delete">
<Text text="Delete"/>
</firm:Button>
</Align>
</Row>
</Array>
</Column>
</Panel>
</Center>
</Root>

33
src/main/resources/assets/firmament/gui/config/macros/index.xml
View File

@@ -1,16 +1,27 @@
<?xml version="1.0" encoding="UTF-8" ?>
<Root xmlns="http://notenoughupdates.org/moulconfig"
xmlns:firm="http://firmament.nea.moe/moulconfig">
>
<Center>
<Tabs>
<Tab>
<Tab.Header>
<Text text="Combo Macros"/>
</Tab.Header>
<Tab.Body>
<Fragment value="firmament:gui/config/macros/combos.xml" bind="@combos"/>
</Tab.Body>
</Tab>
</Tabs>
<Row>
<Tabs>
<Tab>
<Tab.Header>
<Text text="Combo Macros"/>
</Tab.Header>
<Tab.Body>
<Fragment value="firmament:gui/config/macros/combos.xml" bind="@combos"/>
</Tab.Body>
</Tab>
<Tab>
<Tab.Header>
<Text text="Macro Wheel"/>
</Tab.Header>
<Tab.Body>
<Fragment value="firmament:gui/config/macros/wheel.xml" bind="@wheels"/>
</Tab.Body>
</Tab>
</Tabs>
<Meta beforeClose="@beforeClose"/>
</Row>
</Center>
</Root>

54
src/main/resources/assets/firmament/gui/config/macros/wheel.xml Normal file
View File

@@ -0,0 +1,54 @@
<?xml version="1.0" encoding="UTF-8" ?>
<Root xmlns="http://notenoughupdates.org/moulconfig" xmlns:firm="http://firmament.nea.moe/moulconfig"
>
<Panel background="TRANSPARENT" insets="10">
<Column>
<ScrollPanel width="380" height="300">
<Align horizontal="CENTER">
<Array data="@wheels">
<Panel background="TRANSPARENT" insets="3">
<Panel background="VANILLA" insets="6">
<Column>
<Row>
<Text text="@keyCombo" width="250"/>
<Align horizontal="RIGHT">
<Row>
<firm:Button onClick="@edit">
<Text text="Edit"/>
</firm:Button>
<Spacer width="12"/>
<firm:Button onClick="@delete">
<Text text="Delete"/>
</firm:Button>
</Row>
</Align>
</Row>
<Array data="@commands">
<Text text="@text" width="280"/>
</Array>
</Column>
</Panel>
</Panel>
</Array>
</Align>
</ScrollPanel>
<Align horizontal="RIGHT">
<Row>
<firm:Button onClick="@discard">
<Text text="Discard Changes"/>
</firm:Button>
<firm:Button onClick="@saveAndClose">
<Text text="Save &amp; Close"/>
</firm:Button>
<firm:Button onClick="@save">
<Text text="Save"/>
</firm:Button>
<firm:Button onClick="@addWheel">
<Text text="Add Wheel"/>
</firm:Button>
</Row>
</Align>
</Column>
</Panel>
</Root>

22
src/main/resources/assets/firmament/shaders/circle_discard_color.fsh Normal file
View File

@@ -0,0 +1,22 @@
#version 150
in vec4 vertexColor;
in vec2 texCoord0;
uniform vec4 ColorModulator;
uniform float InnerCutoutRadius;
out vec4 fragColor;
void main() {
vec4 color = vertexColor;
if (color.a == 0.0) {
discard;
}
float d = length(texCoord0 - vec2(0.5));
if (d > 0.5 || d < InnerCutoutRadius)
{
discard;
}
fragColor = color * ColorModulator;
}