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

minor cosmetic tweaks in log renderer

Browse Source
This commit is contained in:
octarine-noise
2016-04-01 18:23:29 +02:00
parent 983703133a
commit 07dc8888ef
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -159,8 +159,8 @@ abstract class AbstractRenderColumn(modId: String) : AbstractBlockRenderingHandl
val sideModel = when (quadrants[idx]) { val sideModel = when (quadrants[idx]) {
SMALL_RADIUS -> sideRoundSmall.model SMALL_RADIUS -> sideRoundSmall.model
LARGE_RADIUS -> if (upType == PARALLEL && quadrantsTop[idx] == SMALL_RADIUS) transitionTop.model LARGE_RADIUS -> if (upType == PARALLEL && quadrantsTop[idx] == SMALL_RADIUS) transitionTop.model
else if (downType == PARALLEL && quadrantsBottom[idx] == SMALL_RADIUS) transitionBottom.model else if (downType == PARALLEL && quadrantsBottom[idx] == SMALL_RADIUS) transitionBottom.model
else sideRoundLarge.model else sideRoundLarge.model
SQUARE -> sideSquare.model SQUARE -> sideSquare.model
else -> null else -> null
} }
@@ -179,8 +179,8 @@ abstract class AbstractRenderColumn(modId: String) : AbstractBlockRenderingHandl
var downModel: Model? = null var downModel: Model? = null
var upIcon = upTexture var upIcon = upTexture
var downIcon = downTexture var downIcon = downTexture
var shouldRotateUp = true var isLidUp = true
var shouldRotateDown = true var isLidDown = true
when (upType) { when (upType) {
NONSOLID -> upModel = flatTop(quadrants[idx]) NONSOLID -> upModel = flatTop(quadrants[idx])
@@ -190,7 +190,7 @@ abstract class AbstractRenderColumn(modId: String) : AbstractBlockRenderingHandl
} else { } else {
upIcon = sideTexture upIcon = sideTexture
upModel = extendTop(quadrants[idx]) upModel = extendTop(quadrants[idx])
shouldRotateUp = false isLidUp = false
} }
} }
PARALLEL -> { PARALLEL -> {
@@ -209,7 +209,7 @@ abstract class AbstractRenderColumn(modId: String) : AbstractBlockRenderingHandl
} else { } else {
downIcon = sideTexture downIcon = sideTexture
downModel = extendBottom(quadrants[idx]) downModel = extendBottom(quadrants[idx])
shouldRotateDown = false isLidDown = false
} }
} }
PARALLEL -> { PARALLEL -> {
@@ -227,8 +227,10 @@ abstract class AbstractRenderColumn(modId: String) : AbstractBlockRenderingHandl
blockContext.blockCenter, blockContext.blockCenter,
icon = upIcon, icon = upIcon,
postProcess = { ctx, qi, q, vi, v -> postProcess = { ctx, qi, q, vi, v ->
rotateUV((if (shouldRotateUp) idx else 0) + (if (logAxis == Axis.X) 1 else 0)) if (isLidUp) {
if (logAxis == Axis.X) mirrorUV(true, true) rotateUV(idx + if (logAxis == Axis.X) 1 else 0)
if (logAxis == Axis.X) mirrorUV(true, true)
}
} }
) )
if (downModel != null) modelRenderer.render( if (downModel != null) modelRenderer.render(
@@ -238,8 +240,10 @@ abstract class AbstractRenderColumn(modId: String) : AbstractBlockRenderingHandl
blockContext.blockCenter, blockContext.blockCenter,
icon = downIcon, icon = downIcon,
postProcess = { ctx, qi, q, vi, v -> postProcess = { ctx, qi, q, vi, v ->
rotateUV((if (shouldRotateDown) 3 - idx else 0) + (if (logAxis == Axis.X) 1 else 0)) if (isLidDown) {
if (logAxis != Axis.Y) mirrorUV(true, true) rotateUV((if (logAxis == Axis.X) 0 else 3) - idx)
if (logAxis != Axis.Y) mirrorUV(true, true)
}
} }
) )
} }