mirror of
https://github.com/GTNewHorizons/ForgeMultipart.git
synced 2026-11-13 17:04:25 +00:00
fix Instance()
This commit is contained in:
6 files changed
+21
-21
No files matched your search
@@ -74,8 +74,8 @@ trait HollowMicroblockClient
|
||||
|
||||
override def drawBreaking(renderBlocks: RenderBlocks) {
|
||||
val state = CCRenderState.instance
|
||||
state.reset()
|
||||
state.setPipeline(
|
||||
state.resetInstance()
|
||||
state.setPipelineInstance(
|
||||
new Translation(x, y, z),
|
||||
new IconTransformation(renderBlocks.overrideBlockTexture)
|
||||
)
|
||||
|
||||
@@ -172,15 +172,15 @@ object ItemMicroPartRenderer extends IItemRenderer {
|
||||
GL11.glTranslatef(-0.5f, -0.5f, -0.5f)
|
||||
TextureUtils.bindAtlas(0)
|
||||
val state = CCRenderState.instance
|
||||
state.reset()
|
||||
state.resetInstance()
|
||||
state.useNormals = true
|
||||
state.pullLightmap()
|
||||
state.startDrawing()
|
||||
state.pullLightmapInstance()
|
||||
state.startDrawingInstance()
|
||||
val part =
|
||||
mcrClass.create(true, getMaterialID(item)).asInstanceOf[MicroblockClient]
|
||||
part.setShape(size, mcrClass.itemSlot)
|
||||
part.render(new Vector3(0.5, 0.5, 0.5).subtract(part.getBounds.center), -1)
|
||||
state.draw()
|
||||
state.drawInstance()
|
||||
GL11.glPopMatrix()
|
||||
}
|
||||
|
||||
|
||||
@@ -113,16 +113,16 @@ object ItemSawRenderer extends IItemRenderer {
|
||||
case _ => return
|
||||
}
|
||||
val state = CCRenderState.instance
|
||||
state.reset()
|
||||
state.resetInstance()
|
||||
state.useNormals = true
|
||||
state.pullLightmap()
|
||||
state.pullLightmapInstance()
|
||||
CCRenderState.changeTexture("microblock:textures/items/saw.png")
|
||||
state.startDrawing()
|
||||
state.startDrawingInstance()
|
||||
handle.render(t)
|
||||
holder.render(t)
|
||||
state.draw()
|
||||
state.drawInstance()
|
||||
GL11.glDisable(GL11.GL_CULL_FACE)
|
||||
state.startDrawing()
|
||||
state.startDrawingInstance()
|
||||
blade.render(
|
||||
t,
|
||||
new UVTranslation(
|
||||
@@ -130,7 +130,7 @@ object ItemSawRenderer extends IItemRenderer {
|
||||
(item.getItem.asInstanceOf[Saw].getCuttingStrength(item) - 1) * 4 / 64d
|
||||
)
|
||||
)
|
||||
state.draw()
|
||||
state.drawInstance()
|
||||
GL11.glEnable(GL11.GL_CULL_FACE)
|
||||
}
|
||||
}
|
||||
@@ -44,12 +44,12 @@ object MicroblockRender {
|
||||
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA)
|
||||
// TODO: update to use a thread local copy
|
||||
TextureUtils.bindAtlas(0)
|
||||
state.reset()
|
||||
state.resetInstance()
|
||||
state.alphaOverride = 80
|
||||
state.useNormals = true
|
||||
state.startDrawing()
|
||||
state.startDrawingInstance()
|
||||
part.render(Vector3.zero, -1)
|
||||
state.draw()
|
||||
state.drawInstance()
|
||||
|
||||
glDisable(GL_BLEND)
|
||||
glDepthMask(true)
|
||||
@@ -67,7 +67,7 @@ object MicroblockRender {
|
||||
faces: Int
|
||||
) {
|
||||
val localFace = face.get()
|
||||
CCRenderState.instance().setModel(localFace)
|
||||
CCRenderState.instance().setModelInstance(localFace)
|
||||
for (s <- 0 until 6 if (faces & 1 << s) == 0) {
|
||||
localFace.loadCuboidFace(c, s)
|
||||
mat.renderMicroFace(pos, pass, c)
|
||||
|
||||
@@ -37,8 +37,8 @@ object MultipartRenderer
|
||||
return
|
||||
|
||||
val state = CCRenderState.instance
|
||||
state.reset()
|
||||
state.pullLightmap()
|
||||
state.resetInstance()
|
||||
state.pullLightmapInstance()
|
||||
state.useNormals = true
|
||||
|
||||
val pos = new Vector3(x, y, z)
|
||||
@@ -83,7 +83,7 @@ object MultipartRenderer
|
||||
}
|
||||
|
||||
val state = CCRenderState.instance
|
||||
state.reset()
|
||||
state.resetInstance()
|
||||
state.lightMatrix.locate(world, x, y, z)
|
||||
return tmpart.renderStatic(new Vector3(x, y, z), pass)
|
||||
}
|
||||
|
||||
@@ -32,8 +32,8 @@ trait TCuboidPart extends TMultiPart {
|
||||
@SideOnly(Side.CLIENT)
|
||||
override def drawBreaking(renderBlocks: RenderBlocks) {
|
||||
val state = CCRenderState.instance
|
||||
state.reset()
|
||||
state.setPipeline(
|
||||
state.resetInstance()
|
||||
state.setPipelineInstance(
|
||||
new Translation(x, y, z),
|
||||
new IconTransformation(renderBlocks.overrideBlockTexture)
|
||||
)
|
||||
|
||||
Reference in new issue
Block a user