tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Fixed gutter fluid render

Browse source
This commit is contained in:
Calclavia 2014-12-02 19:50:23 +08:00
parent 37a09589c0
commit 1a6e8f4391
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/main/scala/resonantinduction/archaic/fluid/gutter/TileGutter.scala
View file

@ -131,12 +131,6 @@ class TileGutter extends TileFluidProvider(Material.rock)
override def activate(player: EntityPlayer, side: Int, vector3: Vector3): Boolean = override def activate(player: EntityPlayer, side: Int, vector3: Vector3): Boolean =
{ {
if (!world.isRemote)
{
fluidNode.onFluidChanged()
println(fluidNode.getFluidAmount)
}
if (player.getCurrentEquippedItem != null) if (player.getCurrentEquippedItem != null)
{ {
var itemStack: ItemStack = player.getCurrentEquippedItem var itemStack: ItemStack = player.getCurrentEquippedItem
@ -191,10 +185,10 @@ class TileGutter extends TileFluidProvider(Material.rock)
render(0, 0x0) render(0, 0x0)
} }
override def renderDynamic(position: Vector3, frame: Float, pass: Int) override def renderDynamic(pos: Vector3, frame: Float, pass: Int)
{ {
GL11.glPushMatrix() GL11.glPushMatrix()
GL11.glTranslated(position.x + 0.5, position.y + 0.5, position.z + 0.5) GL11.glTranslated(pos.x + 0.5, pos.y + 0.5, pos.z + 0.5)
render(0, clientRenderMask) render(0, clientRenderMask)
@ -207,11 +201,12 @@ class TileGutter extends TileFluidProvider(Material.rock)
{ {
GL11.glPushMatrix() GL11.glPushMatrix()
GL11.glScaled(0.99, 0.99, 0.99) GL11.glScaled(0.99, 0.99, 0.99)
val ySouthEast = FluidUtility.getAveragePercentageFilledForSides(classOf[TileGutter], percentageFilled, world, position, ForgeDirection.SOUTH, ForgeDirection.EAST) val ySouthEast = FluidUtility.getAveragePercentageFilledForSides(classOf[TileGutter], percentageFilled, world, toVectorWorld, ForgeDirection.SOUTH, ForgeDirection.EAST)
val yNorthEast = FluidUtility.getAveragePercentageFilledForSides(classOf[TileGutter], percentageFilled, world, position, ForgeDirection.NORTH, ForgeDirection.EAST) val yNorthEast = FluidUtility.getAveragePercentageFilledForSides(classOf[TileGutter], percentageFilled, world, toVectorWorld, ForgeDirection.NORTH, ForgeDirection.EAST)
val ySouthWest = FluidUtility.getAveragePercentageFilledForSides(classOf[TileGutter], percentageFilled, world, position, ForgeDirection.SOUTH, ForgeDirection.WEST) val ySouthWest = FluidUtility.getAveragePercentageFilledForSides(classOf[TileGutter], percentageFilled, world, toVectorWorld, ForgeDirection.SOUTH, ForgeDirection.WEST)
val yNorthWest = FluidUtility.getAveragePercentageFilledForSides(classOf[TileGutter], percentageFilled, world, position, ForgeDirection.NORTH, ForgeDirection.WEST) val yNorthWest = FluidUtility.getAveragePercentageFilledForSides(classOf[TileGutter], percentageFilled, world, toVectorWorld, ForgeDirection.NORTH, ForgeDirection.WEST)
FluidRenderUtility.renderFluidTesselation(tank, ySouthEast, yNorthEast, ySouthWest, yNorthWest) FluidRenderUtility.renderFluidTesselation(tank, ySouthEast, yNorthEast, ySouthWest, yNorthWest)
println(ySouthEast, yNorthEast, ySouthWest, yNorthWest)
GL11.glPopMatrix() GL11.glPopMatrix()
} }
} }