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

Fixed clientRenderMask being protected

Browse source
This commit is contained in:
Calclavia 2014-11-10 11:53:00 +08:00
parent 3091c6ebf0
commit f713f9e46c
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/scala/resonantinduction/core/prefab/part/connector/PartFramedNode.scala
View file

@ -20,7 +20,7 @@ import scala.collection.mutable
abstract class PartFramedNode extends PartAbstract with TPartNodeProvider with TSlottedPart with TNormalOcclusion with TIconHitEffects
{
/** Bitmask connections */
protected var clientRenderMask = 0x00
var clientRenderMask = 0x00
@SideOnly(Side.CLIENT)
protected var breakIcon: IIcon = null

8
src/main/scala/resonantinduction/mechanical/mech/gear/RenderGear.scala
View file

@ -39,13 +39,9 @@ object RenderGear extends ISimpleItemRenderer
GL11.glRotated(angle, 0, 1, 0)
if (isLarge)
{
RenderGear.model.renderOnly("LargeGear")
}
else
{
RenderGear.model.renderOnly("SmallGear")
}
}
def renderDynamic(part: PartGear, x: Double, y: Double, z: Double, tier: Int)
@ -53,9 +49,9 @@ object RenderGear extends ISimpleItemRenderer
if (part.getMultiBlock.isPrimary)
{
GL11.glPushMatrix()
GL11.glTranslatef(x.asInstanceOf[Float] + 0.5f, y.asInstanceOf[Float] + 0.5f, z.asInstanceOf[Float] + 0.5f)
GL11.glTranslatef(x.toFloat + 0.5f, y.toFloat + 0.5f, z.toFloat + 0.5f)
GL11.glPushMatrix()
renderGear(part.placementSide.ordinal, part.tier, part.getMultiBlock.isConstructed, Math.toDegrees(part.mechanicalNode.angle))
renderGear(part.placementSide.ordinal, part.tier, part.getMultiBlock.isConstructed, Math.toDegrees(part.mechanicalNode.angle) * (part.placementSide.offsetX + part.placementSide.offsetY + part.placementSide.offsetZ))
GL11.glPopMatrix()
GL11.glPopMatrix()
}