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

Changed animation vars slightly

Browse source
This commit is contained in:
Robert S 2014-06-02 04:38:44 -04:00
parent 748837e0aa
commit dd9b37e997
2 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
atomic/src/main/scala/resonantinduction/atomic/particle/quantum/RenderQuantumAssembler.java
View file

@ -40,21 +40,21 @@ public class RenderQuantumAssembler extends TileEntitySpecialRenderer
bindTexture(TEXTURE);
GL11.glPushMatrix();
GL11.glRotatef(-tileEntity.rotationYaw1, 0, 1f, 0);
GL11.glRotatef(-tileEntity.rotation.floatX(), 0, 1f, 0);
MODEL.renderOnly(hands);
MODEL.renderOnly("Resonance_Crystal");
GL11.glPopMatrix();
/** Small Laser Arm */
GL11.glPushMatrix();
GL11.glRotatef(tileEntity.rotationYaw2, 0, 1f, 0);
GL11.glRotatef(tileEntity.rotation.floatY(), 0, 1f, 0);
MODEL.renderOnly(arms);
GL11.glPopMatrix();
/** Large Laser Arm */
GL11.glPushMatrix();
GL11.glRotatef(-tileEntity.rotationYaw3, 0, 1f, 0);
GL11.glRotatef(-tileEntity.rotation.floatZ(), 0, 1f, 0);
MODEL.renderOnly(largeArms);
GL11.glPopMatrix();

10
atomic/src/main/scala/resonantinduction/atomic/particle/quantum/TileQuantumAssembler.java
View file

@ -32,10 +32,8 @@ public class TileQuantumAssembler extends TileElectricalInventory implements IPa
int MAX_TIME = 20 * 120;
int time = 0;
/** Used for rendering. */
float rotationYaw1 = 0;
float rotationYaw2 = 0;
float rotationYaw3 = 0;
/** Used for rendering arm motion, X Y Z are not used as location data */
Vector3 rotation = new Vector3();
/** Used for rendering. */
EntityItem entityItem = null;
@ -134,9 +132,7 @@ public class TileQuantumAssembler extends TileElectricalInventory implements IPa
}
//Animation frame update
this.rotationYaw1 += 3;
this.rotationYaw2 += 2;
this.rotationYaw3 += 1;
this.rotation.translate(3, 2, 1);
}
}