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

protect against render buffer underruns

Browse Source
This commit is contained in:
octarine-noise
2016-01-30 13:44:33 +01:00
parent b246c7acd0
commit d9a042b356
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/kotlin/mods/octarinecore/client/render/ModelRenderer.kt
View File

@@ -1,12 +1,12 @@
package mods.octarinecore.client.render package mods.octarinecore.client.render
import mods.octarinecore.client.resource.resourceManager
import mods.octarinecore.common.* import mods.octarinecore.common.*
import net.minecraft.client.Minecraft import net.minecraft.client.Minecraft
import net.minecraft.client.renderer.WorldRenderer import net.minecraft.client.renderer.WorldRenderer
import net.minecraft.client.renderer.texture.TextureAtlasSprite import net.minecraft.client.renderer.texture.TextureAtlasSprite
import net.minecraft.util.EnumFacing import net.minecraft.util.EnumFacing
import net.minecraft.util.EnumFacing.* import net.minecraft.util.EnumFacing.*
import java.lang.Math.max
class ModelRenderer() : ShadingContext() { class ModelRenderer() : ShadingContext() {
@@ -39,6 +39,9 @@ class ModelRenderer() : ShadingContext() {
rotation = rot rotation = rot
aoEnabled = Minecraft.isAmbientOcclusionEnabled() aoEnabled = Minecraft.isAmbientOcclusionEnabled()
// make sure we have space in the buffer for our quads plus one
worldRenderer.ensureSpaceForQuads(model.quads.size + 1)
model.quads.forEachIndexed { quadIdx, quad -> model.quads.forEachIndexed { quadIdx, quad ->
val drawIcon = icon(this, quadIdx, quad) val drawIcon = icon(this, quadIdx, quad)
if (drawIcon != null) { if (drawIcon != null) {
@@ -142,6 +145,13 @@ class RenderVertex() {
} }
} }
fun WorldRenderer.ensureSpaceForQuads(num: Int) {
rawIntBuffer.position(rawBufferIndex)
(num * vertexFormat.nextOffset).let {
if (it > rawIntBuffer.remaining()) growBuffer(max(it, 524288))
}
}
val allFaces: (EnumFacing) -> Boolean = { true } val allFaces: (EnumFacing) -> Boolean = { true }
val topOnly: (EnumFacing) -> Boolean = { it == UP } val topOnly: (EnumFacing) -> Boolean = { it == UP }

4
src/main/resources/META-INF/BetterFoliage_at.cfg
View File

@@ -5,3 +5,7 @@ public net.minecraft.client.renderer.BlockModelRenderer$AmbientOcclusionFace fie
public net.minecraft.client.resources.model.ModelBakery field_177610_k # blockModelShapes public net.minecraft.client.resources.model.ModelBakery field_177610_k # blockModelShapes
public net.minecraft.client.renderer.block.statemap.BlockStateMapper field_178450_a # blockStateMap public net.minecraft.client.renderer.block.statemap.BlockStateMapper field_178450_a # blockStateMap
public net.minecraft.client.renderer.WorldRenderer field_178999_b # rawIntBuffer
public net.minecraft.client.renderer.WorldRenderer func_178983_e(I)V # growBuffer
public net.minecraft.client.renderer.WorldRenderer field_179008_i # rawBufferIndex