Skip to content

Commit

Permalink
Change majority of GL calls using doubles to using floats
Browse files Browse the repository at this point in the history
  • Loading branch information
pupnewfster committed Jul 8, 2019
1 parent b97f3c4 commit b48a64d
Show file tree
Hide file tree
Showing 36 changed files with 55 additions and 55 deletions.
2 changes: 1 addition & 1 deletion src/main/java/mekanism/client/render/FluidRenderer.java
Expand Up @@ -22,7 +22,7 @@ public final class FluidRenderer {
private static Map<ValveRenderData, DisplayInteger> cachedValveFluids = new HashMap<>();

public static void translateToOrigin(Coord4D origin) {
GlStateManager.translate(getX(origin.x), getY(origin.y), getZ(origin.z));
GlStateManager.translate((float) getX(origin.x), (float) getY(origin.y), (float) getZ(origin.z));
}

public static int getStages(RenderData data) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/mekanism/client/render/MekanismRenderer.java
Expand Up @@ -201,7 +201,7 @@ public static void renderObject(Model3D object) {
}

GlStateManager.pushMatrix();
GlStateManager.translate(object.minX, object.minY, object.minZ);
GlStateManager.translate((float) object.minX, (float) object.minY, (float) object.minZ);
RenderResizableCuboid.INSTANCE.renderCube(object);
GlStateManager.popMatrix();
}
Expand Down
Expand Up @@ -26,7 +26,7 @@ public final class MinerVisualRenderer {

public static void render(TileEntityDigitalMiner miner) {
GlStateManager.pushMatrix();
GlStateManager.translate(getX(miner.getPos().getX()), getY(miner.getPos().getY()), getZ(miner.getPos().getZ()));
GlStateManager.translate((float) getX(miner.getPos().getX()), (float) getY(miner.getPos().getY()), (float) getZ(miner.getPos().getZ()));
GlStateManager.shadeModel(GL11.GL_SMOOTH);
GlStateManager.disableAlpha();
GlStateManager.enableBlend();
Expand Down
Expand Up @@ -129,7 +129,7 @@ public static double getValue(Vec3d vector, Axis axis) {
*/
public void renderCubeFromCentre(Model3D cuboid) {
GlStateManager.pushMatrix();
GlStateManager.translate(-cuboid.sizeX() / 2D, -cuboid.sizeY() / 2D, -cuboid.sizeZ() / 2D);
GlStateManager.translate((float) -cuboid.sizeX() / 2F, (float) -cuboid.sizeY() / 2F, (float) -cuboid.sizeZ() / 2F);
renderCube(cuboid, EnumShadeArgument.NONE, null, null, null);
GlStateManager.popMatrix();
}
Expand Down
Expand Up @@ -52,7 +52,7 @@ public void doRender(@Nonnull EntityBalloon balloon, double x, double y, double

public void render(EnumColor color, double x, double y, double z) {
GlStateManager.pushMatrix();
GlStateManager.translate(x, y, z);
GlStateManager.translate((float) x, (float) y, (float) z);
GlStateManager.rotate(180, 1, 0, 0);
mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Balloon.png"));
model.render(0.0625F, color);
Expand Down
Expand Up @@ -44,7 +44,7 @@ public void doRender(@Nonnull EntityFlame entity, double x, double y, double z,

bindTexture(getEntityTexture(entity));

GlStateManager.translate(x, y, z);
GlStateManager.translate((float) x, (float) y, (float) z);
GlStateManager.rotate((entity.prevRotationYaw + (entity.rotationYaw - entity.prevRotationYaw) * partialTick) - 90F, 0, 1, 0);
GlStateManager.rotate(entity.prevRotationPitch + (entity.rotationPitch - entity.prevRotationPitch) * partialTick, 0, 0, 1);

Expand Down
Expand Up @@ -29,7 +29,7 @@ public RenderObsidianTNTPrimed(RenderManager renderManager) {
public void doRender(@Nonnull EntityObsidianTNT entityobsidiantnt, double x, double y, double z, float entityYaw, float partialTicks) {
BlockRendererDispatcher renderer = Minecraft.getMinecraft().getBlockRendererDispatcher();
GlStateManager.pushMatrix();
GlStateManager.translate(x, y + 0.5, z);
GlStateManager.translate((float) x, (float) y + 0.5F, (float) z);

if (entityobsidiantnt.fuse - partialTicks + 1.0F < 10.0F) {
float f = 1.0F - (entityobsidiantnt.fuse - partialTicks + 1.0F) / 10.0F;
Expand Down
Expand Up @@ -67,9 +67,9 @@ protected void renderBlockSpecific(@Nonnull ItemStack stack, TransformType trans
GlStateManager.pushMatrix();
GlStateManager.scale(0.4F, 0.4F, 0.4F);
GLSMHelper.color(tier.getBaseTier());
GlStateManager.translate(0, Math.sin(Math.toRadians(MekanismClient.ticksPassed * 3)) / 7, 0);
GlStateManager.rotate(MekanismClient.ticksPassed * 4, 0, 1, 0);
GlStateManager.rotate(36F + MekanismClient.ticksPassed * 4, 0, 1, 1);
GlStateManager.translate(0, (float) Math.sin(Math.toRadians(3 * MekanismClient.ticksPassed)) / 7, 0);
GlStateManager.rotate(4 * MekanismClient.ticksPassed, 0, 1, 0);
GlStateManager.rotate(36F + 4 * MekanismClient.ticksPassed, 0, 1, 1);
core.render(0.0625F);
GLSMHelper.resetColor();
GlStateManager.popMatrix();
Expand Down
Expand Up @@ -26,7 +26,7 @@ public static void renderStack(@Nonnull ItemStack stack, TransformType transform
} else if (transformType != TransformType.GUI) {
GlStateManager.rotate(90, 0, 1, 0);
}
GlStateManager.translate(0.35, 0.1, 0);
GlStateManager.translate(0.35F, 0.1F, 0);
MekanismRenderer.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "DigitalMiner.png"));
digitalMiner.render(0.022F, ItemDataUtils.getDouble(stack, "energyStored") > 0, Minecraft.getMinecraft().renderEngine, true);
GlStateManager.popMatrix();
Expand Down
Expand Up @@ -51,7 +51,7 @@ public static void renderStack(@Nonnull ItemStack stack, TransformType transform
GlStateManager.blendFunc(SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA);

MekanismRenderer.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
GlStateManager.translate(-0.5, -0.5, -0.5);
GlStateManager.translate(-0.5F, -0.5F, -0.5F);
GlowInfo glowInfo = GLSMHelper.enableGlow(fluid);

DisplayInteger[] displayList = getListAndRender(fluid);
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/mekanism/client/render/tileentity/RenderBin.java
Expand Up @@ -36,18 +36,18 @@ public void render(EnumFacing facing, ItemStack itemType, int clientAmount, bool
GlStateManager.pushMatrix();
switch (facing) {
case NORTH:
GlStateManager.translate(x + 0.73, y + 0.83, z - 0.0001);
GlStateManager.translate((float) x + 0.73F, (float) y + 0.83F, (float) z - 0.0001F);
break;
case SOUTH:
GlStateManager.translate(x + 0.27, y + 0.83, z + 1.0001);
GlStateManager.translate((float) x + 0.27F, (float) y + 0.83F, (float) z + 1.0001F);
GlStateManager.rotate(180, 0, 1, 0);
break;
case WEST:
GlStateManager.translate(x - 0.0001, y + 0.83, z + 0.27);
GlStateManager.translate((float) x - 0.0001F, (float) y + 0.83F, (float) z + 0.27F);
GlStateManager.rotate(90, 0, 1, 0);
break;
case EAST:
GlStateManager.translate(x + 1.0001, y + 0.83, z + 0.73);
GlStateManager.translate((float) x + 1.0001F, (float) y + 0.83F, (float) z + 0.73F);
GlStateManager.rotate(-90, 0, 1, 0);
break;
default:
Expand All @@ -73,7 +73,7 @@ private void renderText(String text, EnumFacing side, float maxScale, double x,
GlStateManager.enablePolygonOffset();
float displayWidth = 1;
float displayHeight = 1;
GlStateManager.translate(x, y, z);
GlStateManager.translate((float) x, (float) y, (float) z);

switch (side) {
case SOUTH:
Expand Down
Expand Up @@ -19,7 +19,7 @@ public class RenderChemicalCrystallizer extends TileEntitySpecialRenderer<TileEn
@Override
public void render(TileEntityChemicalCrystallizer tileEntity, double x, double y, double z, float partialTick, int destroyStage, float alpha) {
GlStateManager.pushMatrix();
GlStateManager.translate(x + 0.5, y + 1.5, z + 0.5);
GlStateManager.translate((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F);
bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalCrystallizer.png"));
GLSMHelper.rotate(tileEntity.facing, 0, 180, 90, 270);
GlStateManager.rotate(180, 0, 0, 1);
Expand Down
Expand Up @@ -18,7 +18,7 @@ public class RenderChemicalDissolutionChamber extends TileEntitySpecialRenderer<
@Override
public void render(TileEntityChemicalDissolutionChamber tileEntity, double x, double y, double z, float partialTick, int destroyStage, float alpha) {
GlStateManager.pushMatrix();
GlStateManager.translate(x + 0.5, y + 1.5, z + 0.5);
GlStateManager.translate((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F);
bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalDissolutionChamber.png"));
GLSMHelper.rotate(tileEntity.facing, 0, 180, 90, 270);
GlStateManager.rotate(180, 0, 0, 1);
Expand Down
Expand Up @@ -67,7 +67,7 @@ public void render(S configurable, double x, double y, double z, float partialTi

GLSMHelper.color(data.color, 0.6F);
bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
GlStateManager.translate(x, y, z);
GlStateManager.translate((float) x, (float) y, (float) z);
int display = getOverlayDisplay(pos.sideHit, type).display;
GlStateManager.callList(display);
GLSMHelper.resetColor();
Expand Down
Expand Up @@ -19,7 +19,7 @@ public class RenderDigitalMiner extends TileEntitySpecialRenderer<TileEntityDigi
@Override
public void render(TileEntityDigitalMiner tileEntity, double x, double y, double z, float partialTick, int destroyStage, float alpha) {
GlStateManager.pushMatrix();
GlStateManager.translate(x + 0.5, y + 1.5, z + 0.5);
GlStateManager.translate((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F);
bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "DigitalMiner.png"));

GLSMHelper.rotate(tileEntity.facing, 0, 180, 90, 270);
Expand Down
Expand Up @@ -36,7 +36,7 @@ public void render(TileEntityEnergyCube tileEntity, double x, double y, double z
GlStateManager.disableAlpha();
GlStateManager.enableBlend();
GlStateManager.blendFunc(SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA);
GlStateManager.translate(x + 0.5, y + 1.5, z + 0.5);
GlStateManager.translate((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F);
switch (tileEntity.facing) {
case DOWN:
GlStateManager.rotate(90, -1, 0, 0);
Expand Down Expand Up @@ -66,7 +66,7 @@ public void render(TileEntityEnergyCube tileEntity, double x, double y, double z

if (tileEntity.getEnergy() / tileEntity.getMaxEnergy() > 0.1) {
GlStateManager.pushMatrix();
GlStateManager.translate(x + 0.5, y + 0.5, z + 0.5);
GlStateManager.translate((float) x + 0.5F, (float) y + 0.5F, (float) z + 0.5F);
bindTexture(coreTexture);
GlStateManager.shadeModel(GL11.GL_SMOOTH);
GlStateManager.disableAlpha();
Expand All @@ -79,7 +79,7 @@ public void render(TileEntityEnergyCube tileEntity, double x, double y, double z
GlStateManager.pushMatrix();
GlStateManager.scale(0.4F, 0.4F, 0.4F);
GLSMHelper.color(tileEntity.tier.getBaseTier());
GlStateManager.translate(0, Math.sin(Math.toRadians(3 * ticks)) / 7, 0);
GlStateManager.translate(0, (float) Math.sin(Math.toRadians(3 * ticks)) / 7, 0);
GlStateManager.rotate(4 * ticks, 0, 1, 0);
GlStateManager.rotate(36F + 4 * ticks, 0, 1, 1);
core.render(0.0625F);
Expand Down
Expand Up @@ -51,7 +51,7 @@ public void render(FluidTankTier tier, FluidStack fluid, float fluidScale, boole
GlStateManager.enableBlend();
GlStateManager.blendFunc(SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA);
bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
GlStateManager.translate(x, y, z);
GlStateManager.translate((float) x, (float) y, (float) z);
GlowInfo glowInfo = GLSMHelper.enableGlow(fluid);

DisplayInteger[] displayList = getListAndRender(fluid);
Expand Down Expand Up @@ -83,7 +83,7 @@ public void render(FluidTankTier tier, FluidStack fluid, float fluidScale, boole
GlStateManager.enableBlend();
GlStateManager.blendFunc(SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA);
bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
GlStateManager.translate(x, y, z);
GlStateManager.translate((float) x, (float) y, (float) z);
GlowInfo glowInfo = GLSMHelper.enableGlow(valveFluid);
GLSMHelper.color(valveFluid);
DisplayInteger[] valveList = getValveRender(valveFluid);
Expand Down
Expand Up @@ -18,7 +18,7 @@ public class RenderPersonalChest extends TileEntitySpecialRenderer<TileEntityPer
@Override
public void render(TileEntityPersonalChest tileEntity, double x, double y, double z, float partialTick, int destroyStage, float alpha) {
GlStateManager.pushMatrix();
GlStateManager.translate(x, y + 1, z);
GlStateManager.translate((float) x, (float) y + 1F, (float) z);
GlStateManager.rotate(90, 0, 1, 0);
bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "PersonalChest.png"));

Expand Down
Expand Up @@ -19,7 +19,7 @@ public class RenderQuantumEntangloporter extends TileEntitySpecialRenderer<TileE
@Override
public void render(TileEntityQuantumEntangloporter tileEntity, double x, double y, double z, float partialTick, int destroyStage, float alpha) {
GlStateManager.pushMatrix();
GlStateManager.translate(x + 0.5, y + 1.5, z + 0.5);
GlStateManager.translate((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F);
bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "QuantumEntangloporter.png"));
GLSMHelper.rotate(tileEntity.facing, 0, 180, 90, 270);
GlStateManager.rotate(180, 0, 0, 1);
Expand Down
Expand Up @@ -18,7 +18,7 @@ public class RenderResistiveHeater extends TileEntitySpecialRenderer<TileEntityR
@Override
public void render(TileEntityResistiveHeater tileEntity, double x, double y, double z, float partialTick, int destroyStage, float alpha) {
GlStateManager.pushMatrix();
GlStateManager.translate(x + 0.5, y + 1.5, z + 0.5);
GlStateManager.translate((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F);
bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ResistiveHeater.png"));
GLSMHelper.rotate(tileEntity.facing, 0, 180, 90, 270);
GlStateManager.rotate(180, 0, 0, 1);
Expand Down
Expand Up @@ -18,7 +18,7 @@ public class RenderRotaryCondensentrator extends TileEntitySpecialRenderer<TileE
@Override
public void render(TileEntityRotaryCondensentrator tileEntity, double x, double y, double z, float partialTick, int destroyStage, float alpha) {
GlStateManager.pushMatrix();
GlStateManager.translate(x + 0.5, y + 1.5, z + 0.5);
GlStateManager.translate((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F);
bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "RotaryCondensentrator.png"));
GLSMHelper.rotate(tileEntity.facing, 0, 180, 90, 270);
GlStateManager.rotate(180, 0, 0, 1);
Expand Down
Expand Up @@ -18,7 +18,7 @@ public class RenderSecurityDesk extends TileEntitySpecialRenderer<TileEntitySecu
@Override
public void render(TileEntitySecurityDesk tileEntity, double x, double y, double z, float partialTick, int destroyStage, float alpha) {
GlStateManager.pushMatrix();
GlStateManager.translate(x + 0.5, y + 1.5, z + 0.5);
GlStateManager.translate((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F);
bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SecurityDesk.png"));
GLSMHelper.rotate(tileEntity.facing, 0, 180, 90, 270);
GlStateManager.rotate(180, 0, 0, 1);
Expand Down
Expand Up @@ -18,7 +18,7 @@ public class RenderSeismicVibrator extends TileEntitySpecialRenderer<TileEntityS
@Override
public void render(TileEntitySeismicVibrator tileEntity, double x, double y, double z, float partialTick, int destroyStage, float alpha) {
GlStateManager.pushMatrix();
GlStateManager.translate(x + 0.5, y + 1.5, z + 0.5);
GlStateManager.translate((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F);
bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SeismicVibrator.png"));
GLSMHelper.rotate(tileEntity.facing, 0, 180, 90, 270);
GlStateManager.rotate(180, 0, 0, 1);
Expand Down
Expand Up @@ -18,7 +18,7 @@ public class RenderSolarNeutronActivator extends TileEntitySpecialRenderer<TileE
@Override
public void render(TileEntitySolarNeutronActivator tileEntity, double x, double y, double z, float partialTick, int destroyStage, float alpha) {
GlStateManager.pushMatrix();
GlStateManager.translate(x + 0.5, y + 1.5, z + 0.5);
GlStateManager.translate((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F);
bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SolarNeutronActivator.png"));
GLSMHelper.rotate(tileEntity.facing, 0, 180, 90, 270);
GlStateManager.rotate(180, 0, 0, 1);
Expand Down
Expand Up @@ -40,7 +40,7 @@ public void render(TileEntityTeleporter tileEntity, double x, double y, double z
GLSMHelper.color(EnumColor.PURPLE, 0.75F);

bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
GlStateManager.translate(x, y, z);
GlStateManager.translate((float) x, (float) y, (float) z);
Coord4D obj = Coord4D.get(tileEntity).offset(EnumFacing.WEST);
int type = 0;
IBlockState s = obj.getBlockState(tileEntity.getWorld());
Expand Down
Expand Up @@ -78,13 +78,13 @@ public void render(TileEntityLogisticalTransporter transporter, double x, double
for (TransporterStack stack : getReducedTransit(inTransit)) {
entityItem.setItem(stack.itemStack);
float[] pos = TransporterUtils.getStackPosition(transporter.getTransmitter(), stack, partial);
double xShifted = x + pos[0];
double yShifted = y + pos[1];
double zShifted = z + pos[2];
float xShifted = (float) x + pos[0];
float yShifted = (float) y + pos[1];
float zShifted = (float) z + pos[2];

GlStateManager.pushMatrix();
GlStateManager.translate(xShifted, yShifted, zShifted);
GlStateManager.scale(0.75, 0.75, 0.75);
GlStateManager.scale(0.75F, 0.75F, 0.75F);
renderer.doRender(entityItem, 0, 0, 0, 0, 0);
GlStateManager.popMatrix();

Expand Down Expand Up @@ -124,9 +124,9 @@ public void render(TileEntityLogisticalTransporter transporter, double x, double
GlStateManager.blendFunc(SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA);
GLSMHelper.colorAlpha(0.8F);
bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
GlStateManager.translate(x, y, z);
GlStateManager.scale(0.5, 0.5, 0.5);
GlStateManager.translate(0.5, 0.5, 0.5);
GlStateManager.translate((float) x, (float) y, (float) z);
GlStateManager.scale(0.5F, 0.5F, 0.5F);
GlStateManager.translate(0.5F, 0.5F, 0.5F);

int display = getOverlayDisplay(pos.sideHit, mode).display;
GlStateManager.callList(display);
Expand Down

0 comments on commit b48a64d

Please sign in to comment.