archive/dawd3
Archived
1
Fork 0
Code Issues 33 Pull requests Projects Releases Packages Wiki Activity Actions

fma device / modulator block

Browse source
This commit is contained in:
りき萌 2023-05-01 22:13:35 +02:00
parent bc5b72bd5f
commit 5647373b8e
19 changed files with 378 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
proj/block/modulator_front.ase Normal file
View file

Binary file not shown.

BIN
proj/block/modulator_side.ase Normal file
View file

Binary file not shown.

BIN
proj/block/template/device_side.ase
View file

Binary file not shown.

15
src/main/generated/.cache/f3798f81c7b6fecad2cbfec741314f8a66c0eca3
View file

@ -1,4 +1,4 @@
// 1.19.2 2023-05-01T19:34:50.889753306 Models
// 1.19.2 2023-05-01T21:31:37.661214642 Models
0812a674d14cfc6fbb7c0e2ac1b473bf2afe1965 assets/dawd3/models/item/brown_patch_cable.json
6e01a1aa07f3a36d7950a1b00d1bc6e9045b9995 assets/dawd3/blockstates/knob.json
bf0e322e33123cb6873c2da4e8c6ab85688deb4e assets/dawd3/models/item/gray_patch_cable.json
@ -17,22 +17,25 @@ a4e8bc89d39021eb8d56ad7735216cb851d67287 assets/dawd3/models/item/light_blue_pat
8c4b8147bfea2bdb8c1d348bc332a60d2cd82d68 assets/dawd3/models/item/phase.json
aa1a1807d2c46f1f25e3d0c507952fefb5b3cd9f assets/dawd3/models/item/knob.json
d65fd7b21da2adf55a0b076103103da7e7bb453a assets/dawd3/models/block/speaker.json
fe4987cffd1253462cc8440c90ff2341ac3026a4 assets/dawd3/models/block/triangle_oscillator.json
df1b924ee7f1a4f9a6496f52a27d74b449ef05fc assets/dawd3/models/block/triangle_oscillator.json
becb814a10bcf2d3e071a6479e9b2289165d0059 assets/dawd3/models/item/modulator.json
8aa966337109315240614d5257eb72f959eba5d8 assets/dawd3/models/item/orange_patch_cable.json
4748361fec856c3fe328ac0036ee642a5865fa99 assets/dawd3/models/block/pulse_oscillator.json
46e362f3f96c54438c29132f76441e6cddb94564 assets/dawd3/models/block/pulse_oscillator.json
12c4bfd825b2476955afcd3bb23c1f736ce68caa assets/dawd3/models/item/yellow_patch_cable.json
aab1bce7ec4e7c7dccd3d33d4242de12b63a981d assets/dawd3/models/item/white_patch_cable.json
6cdda36e539e23acf3db70d761338e88932a6ebb assets/dawd3/models/item/purple_patch_cable.json
e3c6aacd49a6395f37047d3df31f91a18a411267 assets/dawd3/models/item/speaker.json
f69a4acfdf715c64f64830ce0a79aa452ad4760a assets/dawd3/models/item/saw_oscillator.json
851149820d465dc203cc75e8808a5387e8eb5426 assets/dawd3/models/block/modulator.json
32bb0e6e3bf75b9005602e8fb1042ad5d41286ad assets/dawd3/models/item/lime_patch_cable.json
c5998d4ae85e7a16010e66b4b165ddd6b7f0f3ac assets/dawd3/models/block/phase.json
1358574aaed0a49a6a4fdaba4ceb330463dcc421 assets/dawd3/models/block/phase.json
292685c025f28911bca9252da3e4ac72998b3c7a assets/dawd3/blockstates/pulse_oscillator.json
956d8f117df95cf62c8cac375cff853df96840d6 assets/dawd3/models/item/pink_patch_cable.json
2adb4f854a9f13090dffaf8ab9dfe0553cc59a80 assets/dawd3/models/item/triangle_oscillator.json
3b1811bab3ba394ba03b67ac2efc72cb35316dc8 assets/dawd3/blockstates/sine_oscillator.json
9c18a8292a0c9990cd23bebf5c6191c2114ccc6d assets/dawd3/models/item/black_patch_cable.json
8688de3eadb6579cac89522683c394f18733e614 assets/dawd3/models/block/knob.json
96135c420e211d0cfee4aff9e1ae98484b4603c4 assets/dawd3/models/block/saw_oscillator.json
0afd7ba8d87444961a33cb87bba122fca5ebef8e assets/dawd3/models/block/saw_oscillator.json
67ff4ae22c5f716f1aa2b6e2dac31d12be2336d1 assets/dawd3/blockstates/modulator.json
9690e1f7ff13a8ea72a1edb87c8afd6d0a228925 assets/dawd3/models/item/pulse_oscillator.json
64c9ff6a94721f17a823c9d253559e5b9e73662a assets/dawd3/models/block/sine_oscillator.json
50023b9cff64844a4001e3e78d3f0ac828f2724a assets/dawd3/models/block/sine_oscillator.json

19
src/main/generated/assets/dawd3/blockstates/modulator.json Normal file
View file

@ -0,0 +1,19 @@
{
"variants": {
"facing=east": {
"model": "dawd3:block/modulator",
"y": 90
},
"facing=north": {
"model": "dawd3:block/modulator"
},
"facing=south": {
"model": "dawd3:block/modulator",
"y": 180
},
"facing=west": {
"model": "dawd3:block/modulator",
"y": 270
}
}
}

102
src/main/generated/assets/dawd3/models/block/modulator.json Normal file
View file

@ -0,0 +1,102 @@
{
"parent": "block/block",
"elements": [
{
"faces": {
"down": {
"cullface": "down",
"texture": "#bottom"
},
"east": {
"cullface": "east",
"texture": "#right"
},
"north": {
"cullface": "north",
"texture": "#front"
},
"south": {
"cullface": "south",
"texture": "#back"
},
"up": {
"cullface": "up",
"rotation": 180,
"texture": "#top"
},
"west": {
"cullface": "west",
"texture": "#left"
}
},
"from": [
0.0,
0.0,
0.0
],
"to": [
16.0,
16.0,
16.0
]
},
{
"faces": {
"north": {
"cullface": "north",
"texture": "#port",
"uv": [
0.0,
0.0,
4.0,
4.0
]
}
},
"from": [
9.0,
6.0,
-0.01
],
"to": [
13.0,
10.0,
0.01
]
},
{
"faces": {
"north": {
"cullface": "north",
"texture": "#port",
"uv": [
4.0,
0.0,
8.0,
4.0
]
}
},
"from": [
3.0,
6.0,
-0.01
],
"to": [
7.0,
10.0,
0.01
]
}
],
"textures": {
"back": "dawd3:block/modulator_side",
"bottom": "dawd3:block/modulator_side",
"front": "dawd3:block/modulator_front",
"left": "dawd3:block/modulator_side",
"particle": "dawd3:block/modulator_side",
"port": "dawd3:device/port",
"right": "dawd3:block/modulator_side",
"top": "dawd3:block/modulator_side"
}
}

48
src/main/generated/assets/dawd3/models/block/phase.json
View file

@ -40,30 +40,6 @@
16.0
]
},
{
"faces": {
"north": {
"cullface": "north",
"texture": "#port",
"uv": [
0.0,
0.0,
4.0,
4.0
]
}
},
"from": [
9.0,
6.0,
-0.01
],
"to": [
13.0,
10.0,
0.01
]
},
{
"faces": {
"north": {
@ -87,6 +63,30 @@
10.0,
0.01
]
},
{
"faces": {
"north": {
"cullface": "north",
"texture": "#port",
"uv": [
0.0,
0.0,
4.0,
4.0
]
}
},
"from": [
9.0,
6.0,
-0.01
],
"to": [
13.0,
10.0,
0.01
]
}
],
"textures": {

48
src/main/generated/assets/dawd3/models/block/pulse_oscillator.json
View file

@ -40,30 +40,6 @@
16.0
]
},
{
"faces": {
"north": {
"cullface": "north",
"texture": "#port",
"uv": [
4.0,
0.0,
8.0,
4.0
]
}
},
"from": [
3.0,
3.0,
-0.01
],
"to": [
7.0,
7.0,
0.01
]
},
{
"faces": {
"north": {
@ -87,6 +63,30 @@
7.0,
0.01
]
},
{
"faces": {
"north": {
"cullface": "north",
"texture": "#port",
"uv": [
4.0,
0.0,
8.0,
4.0
]
}
},
"from": [
3.0,
3.0,
-0.01
],
"to": [
7.0,
7.0,
0.01
]
}
],
"textures": {

48
src/main/generated/assets/dawd3/models/block/saw_oscillator.json
View file

@ -40,30 +40,6 @@
16.0
]
},
{
"faces": {
"north": {
"cullface": "north",
"texture": "#port",
"uv": [
4.0,
0.0,
8.0,
4.0
]
}
},
"from": [
3.0,
6.0,
-0.01
],
"to": [
7.0,
10.0,
0.01
]
},
{
"faces": {
"north": {
@ -87,6 +63,30 @@
10.0,
0.01
]
},
{
"faces": {
"north": {
"cullface": "north",
"texture": "#port",
"uv": [
4.0,
0.0,
8.0,
4.0
]
}
},
"from": [
3.0,
6.0,
-0.01
],
"to": [
7.0,
10.0,
0.01
]
}
],
"textures": {

48
src/main/generated/assets/dawd3/models/block/sine_oscillator.json
View file

@ -40,30 +40,6 @@
16.0
]
},
{
"faces": {
"north": {
"cullface": "north",
"texture": "#port",
"uv": [
4.0,
0.0,
8.0,
4.0
]
}
},
"from": [
3.0,
6.0,
-0.01
],
"to": [
7.0,
10.0,
0.01
]
},
{
"faces": {
"north": {
@ -87,6 +63,30 @@
10.0,
0.01
]
},
{
"faces": {
"north": {
"cullface": "north",
"texture": "#port",
"uv": [
4.0,
0.0,
8.0,
4.0
]
}
},
"from": [
3.0,
6.0,
-0.01
],
"to": [
7.0,
10.0,
0.01
]
}
],
"textures": {

48
src/main/generated/assets/dawd3/models/block/triangle_oscillator.json
View file

@ -40,30 +40,6 @@
16.0
]
},
{
"faces": {
"north": {
"cullface": "north",
"texture": "#port",
"uv": [
0.0,
0.0,
4.0,
4.0
]
}
},
"from": [
9.0,
6.0,
-0.01
],
"to": [
13.0,
10.0,
0.01
]
},
{
"faces": {
"north": {
@ -87,6 +63,30 @@
10.0,
0.01
]
},
{
"faces": {
"north": {
"cullface": "north",
"texture": "#port",
"uv": [
0.0,
0.0,
4.0,
4.0
]
}
},
"from": [
9.0,
6.0,
-0.01
],
"to": [
13.0,
10.0,
0.01
]
}
],
"textures": {

3
src/main/generated/assets/dawd3/models/item/modulator.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "dawd3:block/modulator"
}

2
src/main/kotlin/net/liquidev/dawd3/audio/devices/ConstantDevice.kt → src/main/kotlin/net/liquidev/dawd3/audio/devices/math/ConstantDevice.kt
View file

@ -1,4 +1,4 @@
package net.liquidev.dawd3.audio.devices
package net.liquidev.dawd3.audio.devices.math
import net.liquidev.dawd3.Mod
import net.liquidev.dawd3.audio.device.*

48
src/main/kotlin/net/liquidev/dawd3/audio/devices/math/FmaDevice.kt Normal file
View file

@ -0,0 +1,48 @@
package net.liquidev.dawd3.audio.devices.math
import net.liquidev.dawd3.Mod
import net.liquidev.dawd3.audio.device.*
import net.minecraft.util.Identifier
class FmaDevice : Device<FmaDevice.Controls> {
companion object : DeviceDescriptor {
override val id = Identifier(Mod.id, "fma")
val inputPort = InputPortName(id, "input")
val outputPort = OutputPortName(id, "output")
val multiplyControl = ControlDescriptor(id, "multiply", 1f)
val addControl = ControlDescriptor(id, "add", 0f)
}
class Controls : ControlSet {
val multiply = Control(multiplyControl)
val add = Control(addControl)
override fun visitControls(visit: (ControlDescriptor, Control) -> Unit) {
visit(multiplyControl, multiply)
visit(addControl, add)
}
}
val input = InputPort()
val output = OutputPort(bufferCount = 1)
override fun process(sampleCount: Int, controls: Controls) {
val inputBuffer = input.getConnectedOutputBuffer(0, sampleCount)
val outputBuffer = output.buffers[0].getOrReallocate(sampleCount)
val multiply = controls.multiply.value
val add = controls.add.value
for (i in 0 until sampleCount) {
outputBuffer[i] = inputBuffer[i] * multiply + add
}
}
override fun visitInputPorts(visit: (InputPortName, InputPort) -> Unit) {
visit(inputPort, input)
}
override fun visitOutputPorts(visit: (OutputPortName, OutputPort) -> Unit) {
visit(outputPort, output)
}
}

4
src/main/kotlin/net/liquidev/dawd3/block/Blocks.kt
View file

@ -10,8 +10,9 @@ import net.liquidev.dawd3.block.device.AnyDeviceBlockDescriptor
import net.liquidev.dawd3.block.device.DeviceBlock
import net.liquidev.dawd3.block.device.DeviceBlockEntity
import net.liquidev.dawd3.block.device.DeviceBlockEntityRenderer
import net.liquidev.dawd3.block.devices.KnobBlockDescriptor
import net.liquidev.dawd3.block.devices.SpeakerBlockDescriptor
import net.liquidev.dawd3.block.devices.math.KnobBlockDescriptor
import net.liquidev.dawd3.block.devices.math.ModulatorBlockDescriptor
import net.liquidev.dawd3.block.devices.oscillator.*
import net.liquidev.dawd3.item.Items
import net.minecraft.block.Block
@ -62,6 +63,7 @@ object Blocks {
val speaker = registerDeviceBlock(SpeakerBlockDescriptor)
val knob = registerDeviceBlock(KnobBlockDescriptor)
val modulator = registerDeviceBlock(ModulatorBlockDescriptor)
val phase = registerDeviceBlock(PhaseBlockDescriptor)
val sineOscillator = registerDeviceBlock(SineOscillatorBlockDescriptor)

4
src/main/kotlin/net/liquidev/dawd3/block/devices/KnobBlockDescriptor.kt → src/main/kotlin/net/liquidev/dawd3/block/devices/math/KnobBlockDescriptor.kt
View file

@ -1,8 +1,8 @@
package net.liquidev.dawd3.block.devices
package net.liquidev.dawd3.block.devices.math
import net.liquidev.dawd3.Mod
import net.liquidev.dawd3.audio.device.DeviceInstance
import net.liquidev.dawd3.audio.devices.ConstantDevice
import net.liquidev.dawd3.audio.devices.math.ConstantDevice
import net.liquidev.dawd3.block.device.DeviceBlockDescriptor
import net.liquidev.dawd3.block.device.PhysicalPort
import net.liquidev.dawd3.block.device.descriptor.FaceTextures

71
src/main/kotlin/net/liquidev/dawd3/block/devices/math/ModulatorBlockDescriptor.kt Normal file
View file

@ -0,0 +1,71 @@
package net.liquidev.dawd3.block.devices.math
import net.liquidev.dawd3.Mod
import net.liquidev.dawd3.audio.device.DeviceInstance
import net.liquidev.dawd3.audio.devices.math.FmaDevice
import net.liquidev.dawd3.block.device.DeviceBlockDescriptor
import net.liquidev.dawd3.block.device.PhysicalPort
import net.liquidev.dawd3.block.device.descriptor.FaceTextures
import net.liquidev.dawd3.common.Cuboids
import net.liquidev.dawd3.ui.widget.Knob
import net.liquidev.dawd3.ui.widget.Widget
import net.liquidev.dawd3.ui.widget.Window
import net.minecraft.client.world.ClientWorld
import net.minecraft.text.Text
import net.minecraft.util.Identifier
import net.minecraft.util.math.Vec2f
object ModulatorBlockDescriptor : DeviceBlockDescriptor<ModulatorBlockDescriptor.ClientState, FmaDevice.Controls> {
override val id = Identifier(Mod.id, "modulator")
override val cuboid = Cuboids.fullBlock
override val portLayout = PhysicalPort.layout {
port(
FmaDevice.inputPort,
position = Vec2f(0.25f, 0.5f),
side = PhysicalPort.Side.Front,
)
port(
FmaDevice.outputPort,
position = Vec2f(0.75f, 0.5f),
side = PhysicalPort.Side.Front,
)
}
override val faceTextures = FaceTextures.withFrontAndSide { id }
class ClientState(controls: FmaDevice.Controls) : DeviceBlockDescriptor.ClientState {
override val logicalDevice = DeviceInstance.create(FmaDevice(), controls)
}
override fun initControls() = FmaDevice.Controls()
override fun onClientLoad(controls: FmaDevice.Controls, world: ClientWorld) =
ClientState(controls)
override val ui = object : DeviceBlockDescriptor.UI<FmaDevice.Controls> {
override fun open(controls: FmaDevice.Controls, x: Int, y: Int): Widget =
Window(x, y, 74, 48, Text.translatable("block.dawd3.modulator")).apply {
children.add(
Knob(
x = 14,
y = 18,
control = controls.add,
min = -48f,
max = 48f,
color = Knob.Color.Blue,
)
)
children.add(
Knob(
x = 42,
y = 18,
control = controls.multiply,
min = -8f,
max = 8f,
color = Knob.Color.Green,
)
)
}
}
}

BIN
src/main/resources/assets/dawd3/textures/block/modulator_front.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 279 B

BIN
src/main/resources/assets/dawd3/textures/block/modulator_side.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 268 B