AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-19 04:15:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

3d text: light

Browse Source
This commit is contained in:
Bixilon 2022-04-22 01:47:08 +02:00
parent d152e8dc91
commit e2cbcaadb2
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/de/bixilon/minosoft/gui/rendering/font/CharData.kt
View File

@ -128,19 +128,19 @@ class CharData(
return (width * scale).ceil return (width * scale).ceil
} }
fun render3d(transform: Mat4, mesh: WorldMesh, color: RGBColor, shadow: Boolean, italic: Boolean, bold: Boolean, strikethrough: Boolean, underlined: Boolean, scale: Float): Float { fun render3d(transform: Mat4, mesh: WorldMesh, color: RGBColor, shadow: Boolean, italic: Boolean, bold: Boolean, strikethrough: Boolean, underlined: Boolean, scale: Float, light: Int): Float {
val consumer = MeshConsumer(mesh.opaqueMesh!!, transform) val consumer = MeshConsumer(mesh.opaqueMesh!!, transform, light)
render(Vec2i(0, 0), color, shadow, italic, bold, strikethrough, underlined, consumer, null, scale) render(Vec2i(0, 0), color, shadow, italic, bold, strikethrough, underlined, consumer, null, scale)
return width.toFloat() return width.toFloat()
} }
private class MeshConsumer(val mesh: SingleWorldMesh, val transform: Mat4) : GUIVertexConsumer { private class MeshConsumer(val mesh: SingleWorldMesh, val transform: Mat4, val light: Int) : GUIVertexConsumer {
override val order: Array<Pair<Int, Int>> get() = mesh.order override val order: Array<Pair<Int, Int>> get() = mesh.order
override fun addVertex(position: Vec2t<*>, texture: AbstractTexture, uv: Vec2, tint: RGBColor, options: GUIVertexOptions?) { override fun addVertex(position: Vec2t<*>, texture: AbstractTexture, uv: Vec2, tint: RGBColor, options: GUIVertexOptions?) {
val transformed = transform * Vec4(position.x.toFloat() / ChatComponentRenderer.TEXT_BLOCK_RESOLUTION, -position.y.toFloat() / ChatComponentRenderer.TEXT_BLOCK_RESOLUTION, 1.0f, 1.0f) val transformed = transform * Vec4(position.x.toFloat() / ChatComponentRenderer.TEXT_BLOCK_RESOLUTION, -position.y.toFloat() / ChatComponentRenderer.TEXT_BLOCK_RESOLUTION, 1.0f, 1.0f)
mesh.addVertex(transformed.array, uv, texture, tint.rgb, 0xFF) mesh.addVertex(transformed.array, uv, texture, tint.rgb, light)
} }
override fun addCache(cache: GUIMeshCache) { override fun addCache(cache: GUIMeshCache) {

4
src/main/java/de/bixilon/minosoft/gui/rendering/font/renderer/ChatComponentRenderer.kt
View File

@ -56,7 +56,7 @@ interface ChatComponentRenderer<T : ChatComponent> {
} }
} }
fun render3dFlat(renderWindow: RenderWindow, position: Vec3, scale: Float, rotation: Vec3, mesh: WorldMesh, text: ChatComponent) { fun render3dFlat(renderWindow: RenderWindow, position: Vec3, scale: Float, rotation: Vec3, mesh: WorldMesh, text: ChatComponent, light: Int) {
val rotationMatrix = Mat4() val rotationMatrix = Mat4()
.rotateDegreesAssign(rotation) .rotateDegreesAssign(rotation)
.translateAssign(Vec3(0, 0, -1)) .translateAssign(Vec3(0, 0, -1))
@ -71,7 +71,7 @@ interface ChatComponentRenderer<T : ChatComponent> {
for ((index, char) in text.codePoints().toArray().withIndex()) { for ((index, char) in text.codePoints().toArray().withIndex()) {
val data = renderWindow.font[char] ?: continue val data = renderWindow.font[char] ?: continue
val color = ChatColors[index % ChatColors.VALUES.size] val color = ChatColors[index % ChatColors.VALUES.size]
val width = data.render3d(transformMatrix, mesh, color, false, false, false, false, false, scale) + Font.HORIZONTAL_SPACING val width = data.render3d(transformMatrix, mesh, color, shadow = false, italic = false, bold = false, strikethrough = false, underlined = false, scale = scale, light = light) + Font.HORIZONTAL_SPACING
transformMatrix.translateAssign(Vec3((width / TEXT_BLOCK_RESOLUTION) * scale, 0, 0)) transformMatrix.translateAssign(Vec3((width / TEXT_BLOCK_RESOLUTION) * scale, 0, 0))
} }
} }

6
src/main/java/de/bixilon/minosoft/gui/rendering/world/entities/renderer/sign/SignBlockEntityRenderer.kt
View File

@ -44,13 +44,13 @@ class SignBlockEntityRenderer(
if (block is StandingSignBlock) { if (block is StandingSignBlock) {
// println("Rendering standing sign at $position (${block.resourceLocation})") // println("Rendering standing sign at $position (${block.resourceLocation})")
} else if (block is WallSignBlock) { } else if (block is WallSignBlock) {
renderWallText(position, mesh, blockState) renderWallText(position, mesh, light[6].toInt())
} }
return true return true
} }
private fun renderWallText(position: Vec3i, mesh: WorldMesh, blockState: BlockState) { private fun renderWallText(position: Vec3i, mesh: WorldMesh, light: Int) {
val yRotation = when (val rotation = this.blockState.properties[BlockProperties.FACING].nullCast<Directions>() ?: Directions.NORTH) { val yRotation = when (val rotation = this.blockState.properties[BlockProperties.FACING].nullCast<Directions>() ?: Directions.NORTH) {
Directions.SOUTH -> 0.0f Directions.SOUTH -> 0.0f
Directions.EAST -> 90.0f Directions.EAST -> 90.0f
@ -64,7 +64,7 @@ class SignBlockEntityRenderer(
val textPosition = position.toVec3 + rotationVector val textPosition = position.toVec3 + rotationVector
for (line in sign.lines) { for (line in sign.lines) {
ChatComponentRenderer.render3dFlat(renderWindow, textPosition, TEXT_SCALE, Vec3(0.0f, yRotation, 0.0f), mesh, line) ChatComponentRenderer.render3dFlat(renderWindow, textPosition, TEXT_SCALE, Vec3(0.0f, yRotation, 0.0f), mesh, line, light)
textPosition.y -= 0.11f textPosition.y -= 0.11f
} }
} }