Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

smooth robots animations

Browse source
This commit is contained in:
Hea3veN 2015-05-07 22:20:53 -03:00
parent f1595ff391
commit cd88af1fef
2 changed files with 40 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/buildcraft/robotics/EntityRobot.java
View file

@ -100,6 +100,7 @@ public class EntityRobot extends EntityRobotBase implements
public ItemStack itemInUse;
public float itemAngle1 = 0;
public float renderItemAngle1 = 0;
public float itemAngle2 = 0;
public boolean itemActive = false;
public float itemActiveStage = 0;
@ -837,8 +838,9 @@ public class EntityRobot extends EntityRobotBase implements
int robotY = (int) Math.floor(posY);
int robotZ = (int) Math.floor(posZ);
if (z != robotZ || x != robotX)
if (z != robotZ || x != robotX) {
itemAngle1 = (float) Math.atan2(z - robotZ, x - robotX);
}
itemAngle2 = 0;
if (robotY < y) {

44
common/buildcraft/robotics/render/RenderRobot.java
View file

@ -85,6 +85,9 @@ public class RenderRobot extends Render implements IItemRenderer {
GL11.glPushMatrix();
GL11.glTranslated(x, y, z);
float robotYaw = getSmoothYaw(robot);
GL11.glRotatef((-robotYaw / (2f * (float) Math.PI) * 360f) + 180f, 0.0f, 1.0f, 0.0f);
if (robot.getStackInSlot(0) != null) {
GL11.glPushMatrix();
GL11.glTranslatef(-0.125F, 0, -0.125F);
@ -120,7 +123,6 @@ public class RenderRobot extends Render implements IItemRenderer {
if (robot.itemInUse != null) {
GL11.glPushMatrix();
GL11.glRotatef((float) (-robot.itemAngle1 / (2 * Math.PI) * 360) + 180, 0, 1, 0);
GL11.glRotatef((float) (robot.itemAngle2 / (2 * Math.PI) * 360), 0, 0, 1);
if (robot.itemActive) {
@ -161,7 +163,6 @@ public class RenderRobot extends Render implements IItemRenderer {
if (robot.getTexture() != null) {
renderManager.renderEngine.bindTexture(robot.getTexture());
float storagePercent = (float) robot.getBattery().getEnergyStored() / (float) robot.getBattery().getMaxEnergyStored();
box.rotateAngleY = -robot.itemAngle1;
doRenderRobot(1F / 16F, renderManager.renderEngine, storagePercent, robot.isActive());
}
@ -172,6 +173,35 @@ public class RenderRobot extends Render implements IItemRenderer {
GL11.glPopMatrix();
}
private float getSmoothYaw(EntityRobot robot) {
if (robot.itemAngle1 == robot.renderItemAngle1) {
return robot.itemAngle1;
}
float step = 0;
if (robot.itemAngle1 < robot.renderItemAngle1) {
step = (robot.itemAngle1 - robot.renderItemAngle1 <= Math.PI) ? -0.25f : 0.25f;
} else {
step = (robot.renderItemAngle1 - robot.itemAngle1 < Math.PI) ? -0.25f : 0.25f;
}
robot.renderItemAngle1 += step;
if (robot.renderItemAngle1 >= Math.PI) {
step *= -1;
robot.renderItemAngle1 -= (float) Math.PI;
}
if (robot.renderItemAngle1 <= -Math.PI) {
step *= -1;
robot.renderItemAngle1 += (float) Math.PI;
}
if ((step < 0 && robot.renderItemAngle1 < robot.itemAngle1) ||
(step > 0 && robot.itemAngle1 < robot.renderItemAngle1)) {
robot.renderItemAngle1 = robot.itemAngle1;
}
return robot.renderItemAngle1;
}
@Override
protected ResourceLocation getEntityTexture(Entity entity) {
return ((EntityRobot) entity).getTexture();
@ -225,7 +255,6 @@ public class RenderRobot extends Render implements IItemRenderer {
}
private void doRenderWearable(EntityRobot entity, TextureManager textureManager, ItemStack wearable) {
float robotYaw = 90f + entity.itemAngle1 * 180f / (float)Math.PI;
if (wearable.getItem() instanceof IRobotOverlayItem) {
((IRobotOverlayItem) wearable.getItem()).renderRobotOverlay(wearable, textureManager);
} else if (wearable.getItem() instanceof ItemArmor) {
@ -234,11 +263,12 @@ public class RenderRobot extends Render implements IItemRenderer {
GL11.glTranslatef(0.0f, -0.25f, 0.0f);
GL11.glRotatef(180F, 0, 0, 1);
textureManager.bindTexture(RenderBiped.getArmorResource(entity, wearable, 0, null));
ModelBiped model = ForgeHooksClient.getArmorModel(entity, wearable, 0, null);
if (model != null)
model.render(entity, 0, 0, 0, robotYaw, 0, 1 / 16F);
else
ModelBiped armorModel = ForgeHooksClient.getArmorModel(entity, wearable, 0, null);
if (armorModel != null) {
armorModel.render(entity, 0, 0, 0, -90f, 0, 1 / 16F);
} else {
helmetBox.render(1 / 16F);
}
GL11.glPopMatrix();
}
}