StateMc/BetterFoliage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'kotlin-1.8' into kotlin-1.8.8

Browse Source
This commit is contained in:
octarine-noise
2016-01-18 12:51:21 +01:00
parent 0f985e996b 36c6b775db
commit dac7033e18
6 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/kotlin/mods/betterfoliage/client/render/AbstractRenderColumn.kt
View File

@@ -147,10 +147,10 @@ abstract class AbstractRenderColumn(modId: String) : AbstractBlockRenderingHandl
// set rotation for the current quadrant
val rotation = baseRotation + quadrantRotation
// disallow sharp discontinuities in the chamfer radius
// disallow sharp discontinuities in the chamfer radius, or tapering-in where inappropriate
if (quadrants[idx] == LARGE_RADIUS &&
upType == PARALLEL && quadrantsTop[idx] == SMALL_RADIUS &&
downType == PARALLEL && quadrantsBottom[idx] == SMALL_RADIUS) {
upType == PARALLEL && quadrantsTop[idx] != LARGE_RADIUS &&
downType == PARALLEL && quadrantsBottom[idx] != LARGE_RADIUS) {
quadrants[idx] = SMALL_RADIUS
}
@@ -179,6 +179,8 @@ abstract class AbstractRenderColumn(modId: String) : AbstractBlockRenderingHandl
var downModel: Model? = null
var upIcon = upTexture
var downIcon = downTexture
var shouldRotateUp = true
var shouldRotateDown = true
when (upType) {
NONSOLID -> upModel = flatTop(quadrants[idx])
@@ -188,6 +190,7 @@ abstract class AbstractRenderColumn(modId: String) : AbstractBlockRenderingHandl
} else {
upIcon = sideTexture
upModel = extendTop(quadrants[idx])
shouldRotateUp = false
}
}
PARALLEL -> {
@@ -206,6 +209,7 @@ abstract class AbstractRenderColumn(modId: String) : AbstractBlockRenderingHandl
} else {
downIcon = sideTexture
downModel = extendBottom(quadrants[idx])
shouldRotateDown = false
}
}
PARALLEL -> {
@@ -222,7 +226,7 @@ abstract class AbstractRenderColumn(modId: String) : AbstractBlockRenderingHandl
rotation,
blockContext.blockCenter,
icon = upIcon,
rotateUV = { 0 },
rotateUV = { if (shouldRotateUp) idx else 0 },
postProcess = noPost
)
if (downModel != null) modelRenderer.render(
@@ -231,7 +235,7 @@ abstract class AbstractRenderColumn(modId: String) : AbstractBlockRenderingHandl
rotation,
blockContext.blockCenter,
icon = downIcon,
rotateUV = { 0 },
rotateUV = { if (shouldRotateDown) 3 - idx else 0 },
postProcess = noPost
)
}

4
src/main/kotlin/mods/betterfoliage/client/render/RenderLeaves.kt
View File

@@ -14,8 +14,10 @@ import mods.octarinecore.random
import net.minecraft.block.material.Material
import net.minecraft.client.renderer.BlockRendererDispatcher
import net.minecraft.client.renderer.WorldRenderer
import net.minecraft.util.EnumFacing
import net.minecraft.util.EnumFacing.UP
import net.minecraft.util.EnumWorldBlockLayer
import net.minecraft.util.EnumFacing.Axis
import java.lang.Math.cos
import java.lang.Math.sin
@@ -23,7 +25,7 @@ class RenderLeaves : AbstractBlockRenderingHandler(BetterFoliageMod.MOD_ID) {
val leavesModel = model {
verticalRectangle(x1 = -0.5, z1 = 0.5, x2 = 0.5, z2 = -0.5, yBottom = -0.5 * 1.41, yTop = 0.5 * 1.41)
.setAoShader(edgeOrientedAuto(corner = cornerAoMaxGreen))
.setAoShader(edgeOrientedAuto(corner = cornerAo(Axis.Y)))
.setFlatShader(FlatOffset(Int3.zero))
.scale(Config.leaves.size)
.toCross(UP).addAll()