Skip to content

Commit aeedb3e

Browse files
lowercasebtwlowercasebtw
committed
Uniform Storage Cleanup
1 parent 2e9fa5a commit aeedb3e

5 files changed

Lines changed: 201 additions & 96 deletions

File tree

‎src/main/java/btw/lowercase/renderer/uniform/UniformStorage.java‎

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

‎src/main/kotlin/org/visuals/legacy/animatium/renderer/uniform/UniformKey.kt‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,30 @@
1+
/**
2+
* Animatium
3+
* The all-you-could-want legacy animations mod for modern minecraft versions.
4+
* Brings back animations from the 1.7/1.8 era and more.
5+
* <p>
6+
* Copyright (C) 2024-2025 lowercasebtw
7+
* Copyright (C) 2024-2025 mixces
8+
* Copyright (C) 2024-2025 Contributors to the project retain their copyright
9+
* <p>
10+
* This program is free software: you can redistribute it and/or modify
11+
* it under the terms of the GNU General Public License as published by
12+
* the Free Software Foundation, either version 3 of the License, or
13+
* (at your option) any later version.
14+
* <p>
15+
* This program is distributed in the hope that it will be useful,
16+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
17+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18+
* GNU General Public License for more details.
19+
* <p>
20+
* You should have received a copy of the GNU General Public License
21+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
22+
* <p>
23+
* "MINECRAFT" LINKING EXCEPTION TO THE GPL
24+
*/
25+
126
package org.visuals.legacy.animatium.renderer.uniform
227

3-
import btw.lowercase.renderer.uniform.UniformSerializer
428
import org.joml.*
529

630
interface UniformKey<T> {

‎src/main/kotlin/org/visuals/legacy/animatium/renderer/uniform/UniformSerializer.kt‎

Lines changed: 32 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,28 @@
1+
/**
2+
* Animatium
3+
* The all-you-could-want legacy animations mod for modern minecraft versions.
4+
* Brings back animations from the 1.7/1.8 era and more.
5+
* <p>
6+
* Copyright (C) 2024-2025 lowercasebtw
7+
* Copyright (C) 2024-2025 mixces
8+
* Copyright (C) 2024-2025 Contributors to the project retain their copyright
9+
* <p>
10+
* This program is free software: you can redistribute it and/or modify
11+
* it under the terms of the GNU General Public License as published by
12+
* the Free Software Foundation, either version 3 of the License, or
13+
* (at your option) any later version.
14+
* <p>
15+
* This program is distributed in the hope that it will be useful,
16+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
17+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18+
* GNU General Public License for more details.
19+
* <p>
20+
* You should have received a copy of the GNU General Public License
21+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
22+
* <p>
23+
* "MINECRAFT" LINKING EXCEPTION TO THE GPL
24+
*/
25+
126
package org.visuals.legacy.animatium.renderer.uniform
227

328
import com.mojang.blaze3d.buffers.Std140SizeCalculator
@@ -32,7 +57,7 @@ abstract class UniformSerializer<T> {
3257
}
3358

3459
override fun size(calculator: Std140SizeCalculator) {
35-
calculator.putInt()
60+
calculator.putMat4f()
3661
}
3762
}
3863

@@ -42,7 +67,7 @@ abstract class UniformSerializer<T> {
4267
}
4368

4469
override fun size(calculator: Std140SizeCalculator) {
45-
calculator.putInt()
70+
calculator.putVec2()
4671
}
4772
}
4873

@@ -52,7 +77,7 @@ abstract class UniformSerializer<T> {
5277
}
5378

5479
override fun size(calculator: Std140SizeCalculator) {
55-
calculator.putInt()
80+
calculator.putIVec2()
5681
}
5782
}
5883

@@ -62,7 +87,7 @@ abstract class UniformSerializer<T> {
6287
}
6388

6489
override fun size(calculator: Std140SizeCalculator) {
65-
calculator.putInt()
90+
calculator.putVec3()
6691
}
6792
}
6893

@@ -72,7 +97,7 @@ abstract class UniformSerializer<T> {
7297
}
7398

7499
override fun size(calculator: Std140SizeCalculator) {
75-
calculator.putInt()
100+
calculator.putIVec3()
76101
}
77102
}
78103

@@ -83,7 +108,7 @@ abstract class UniformSerializer<T> {
83108
}
84109

85110
override fun size(calculator: Std140SizeCalculator) {
86-
calculator.putInt()
111+
calculator.putVec4()
87112
}
88113
}
89114

@@ -93,7 +118,7 @@ abstract class UniformSerializer<T> {
93118
}
94119

95120
override fun size(calculator: Std140SizeCalculator) {
96-
calculator.putInt()
121+
calculator.putIVec4()
97122
}
98123
}
99124
}

‎src/main/kotlin/org/visuals/legacy/animatium/renderer/uniform/UniformStorage.kt‎

Lines changed: 143 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,143 @@
1+
/**
2+
* Animatium
3+
* The all-you-could-want legacy animations mod for modern minecraft versions.
4+
* Brings back animations from the 1.7/1.8 era and more.
5+
* <p>
6+
* Copyright (C) 2024-2025 lowercasebtw
7+
* Copyright (C) 2024-2025 mixces
8+
* Copyright (C) 2024-2025 Contributors to the project retain their copyright
9+
* <p>
10+
* This program is free software: you can redistribute it and/or modify
11+
* it under the terms of the GNU General Public License as published by
12+
* the Free Software Foundation, either version 3 of the License, or
13+
* (at your option) any later version.
14+
* <p>
15+
* This program is distributed in the hope that it will be useful,
16+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
17+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18+
* GNU General Public License for more details.
19+
* <p>
20+
* You should have received a copy of the GNU General Public License
21+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
22+
* <p>
23+
* "MINECRAFT" LINKING EXCEPTION TO THE GPL
24+
*/
25+
26+
package org.visuals.legacy.animatium.renderer.uniform
27+
28+
import com.mojang.blaze3d.buffers.GpuBuffer
29+
import com.mojang.blaze3d.buffers.Std140SizeCalculator
30+
import com.mojang.blaze3d.systems.CommandEncoder
31+
import com.mojang.blaze3d.systems.RenderSystem
32+
import org.lwjgl.system.MemoryStack
33+
34+
class UniformStorage : AutoCloseable {
35+
private val name: String
36+
private val ubo: GpuBuffer
37+
private val keys: MutableList<UniformKey<*>>
38+
private val values = LinkedHashMap<UniformKey<*>, Any?>()
39+
private val size: Int
40+
41+
private var dirty = true
42+
private var closed = false
43+
44+
private constructor(name: String, keys: List<UniformKey<*>>, size: Int) {
45+
this.name = name
46+
this.ubo = RenderSystem.getDevice().createBuffer(
47+
{ "Dynamic Uniform Storage (${this.name})" },
48+
GpuBuffer.USAGE_UNIFORM or GpuBuffer.USAGE_COPY_DST,
49+
size.toLong()
50+
)
51+
this.keys = keys.toMutableList()
52+
this.size = size
53+
for (key in this.keys) {
54+
this.values[key] = null
55+
}
56+
}
57+
58+
companion object {
59+
fun builder(name: String) = Builder(name)
60+
}
61+
62+
fun <T> set(key: UniformKey<T>, value: T): UniformStorage {
63+
if (this.closed) {
64+
throw RuntimeException("Cannot set value in uniform storage \"" + this.name + "\" as it has been closed!")
65+
} else if (!this.keys.contains(key)) {
66+
throw UnsupportedOperationException("Uniform storage does not contain key '" + key.name() + "'!")
67+
} else {
68+
val currentValue = this.values[key]
69+
if (currentValue != values) {
70+
this.dirty = true
71+
this.values[key] = value
72+
}
73+
74+
return this
75+
}
76+
}
77+
78+
fun <T> get(key: UniformKey<T>): T? =
79+
if (!this.keys.contains(key)) {
80+
null
81+
} else {
82+
this.values[key] as T?
83+
}
84+
85+
fun update(commandEncoder: CommandEncoder) {
86+
if (this.closed) {
87+
throw RuntimeException("Cannot update uniform storage \"" + this.name + "\" as it has been closed!")
88+
} else if (this.dirty) {
89+
val slice = this.ubo.slice()
90+
MemoryStack.stackPush().use { stack ->
91+
val buffer = stack.malloc(this.size)
92+
for (entry in this.values) {
93+
val key = entry.key
94+
val value = entry.value
95+
if (value == null) {
96+
throw RuntimeException("Failed to bind \"" + key.name() + "\" in Uniform Storage (" + this.name + ") as value is not set!")
97+
} else {
98+
(key.serializer() as UniformSerializer<Any>).put(buffer, value)
99+
}
100+
}
101+
102+
commandEncoder.writeToBuffer(slice, buffer)
103+
}
104+
105+
this.dirty = false
106+
}
107+
}
108+
109+
fun update() = this.update(RenderSystem.getDevice().createCommandEncoder())
110+
111+
fun slice() = this.ubo.slice()
112+
113+
fun isClose() = this.closed
114+
115+
override fun close() {
116+
if (!this.closed) {
117+
this.closed = true
118+
this.ubo.close()
119+
this.keys.clear()
120+
this.values.clear()
121+
}
122+
}
123+
124+
class Builder(private val name: String) {
125+
private val keys = arrayListOf<UniformKey<*>>()
126+
private val calculator = Std140SizeCalculator()
127+
128+
fun with(key: UniformKey<*>): Builder {
129+
this.keys.add(key)
130+
key.serializer().size(this.calculator)
131+
return this
132+
}
133+
134+
fun build(): UniformStorage {
135+
val size = this.calculator.get()
136+
if (size == 0) {
137+
throw RuntimeException("Cannot build Uniform Storage (" + this.name + ") as it contains no uniforms!")
138+
} else {
139+
return UniformStorage(this.name, this.keys, size)
140+
}
141+
}
142+
}
143+
}

‎src/main/resources/assets/animatium/shaders/core/legacy_sky.vsh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ out float sphericalVertexDistance;
1212
void main() {
1313
vec4 eye = ModelViewMat * vec4(Position, 1.0);
1414
#ifdef PLANAR_FOG
15-
float dist = -eye.z;
15+
float dist = abs(eye.z);
1616
cylindricalVertexDistance = dist;
1717
sphericalVertexDistance = dist;
1818
#else

0 commit comments

Comments
 (0)