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

Got multimeter energy value rendering

Browse source
This commit is contained in:
Calclavia 2014-01-29 23:57:41 +08:00
parent a6c5eb6d72
commit daff7a091f
5 changed files with 28 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/resonantinduction/electrical/multimeter/GuiMultimeter.java
View file

@ -75,8 +75,8 @@ public class GuiMultimeter extends GuiContainerBase
this.fontRenderer.drawString(s, this.xSize / 2 - this.fontRenderer.getStringWidth(s) / 2, 15, 4210752); this.fontRenderer.drawString(s, this.xSize / 2 - this.fontRenderer.getStringWidth(s) / 2, 15, 4210752);
this.fontRenderer.drawString(EnumColor.INDIGO + LanguageUtility.getLocal("gui.resonantinduction.multimeter.energy"), 35, 15, 4210752); this.fontRenderer.drawString(EnumColor.INDIGO + LanguageUtility.getLocal("gui.resonantinduction.multimeter.energy"), 35, 15, 4210752);
this.renderUniversalDisplay(35, 25, this.multimeter.getNetwork().graph.get(0), mouseX, mouseY, Unit.JOULES); this.renderUniversalDisplay(35, 25, this.multimeter.getNetwork().graph.get(0), mouseX, mouseY, Unit.JOULES);
this.fontRenderer.drawString(EnumColor.INDIGO + LanguageUtility.getLocal("gui.resonantinduction.multimeter.energy"), 35, 35, 4210752); this.fontRenderer.drawString(EnumColor.INDIGO + LanguageUtility.getLocal("gui.resonantinduction.multimeter.capacity"), 35, 35, 4210752);
this.renderUniversalDisplay(35, 45, this.multimeter.getNetwork().graph.get(0), mouseX, mouseY, Unit.JOULES); this.renderUniversalDisplay(35, 45, this.multimeter.getNetwork().graph.getPeak(), mouseX, mouseY, Unit.JOULES);
this.fontRenderer.drawString(EnumColor.ORANGE + LanguageUtility.getLocal("gui.resonantinduction.multimeter.redstone"), 35, 58, 4210752); this.fontRenderer.drawString(EnumColor.ORANGE + LanguageUtility.getLocal("gui.resonantinduction.multimeter.redstone"), 35, 58, 4210752);
this.fontRenderer.drawString(EnumColor.RED + LanguageUtility.getLocal("gui.resonantinduction.multimeter." + this.multimeter.getMode().display), 35, 68, 4210752); this.fontRenderer.drawString(EnumColor.RED + LanguageUtility.getLocal("gui.resonantinduction.multimeter." + this.multimeter.getMode().display), 35, 68, 4210752);
this.fontRenderer.drawString(Unit.JOULES.name + "(s)", 35, 100, 4210752); this.fontRenderer.drawString(Unit.JOULES.name + "(s)", 35, 100, 4210752);

33
src/main/java/resonantinduction/electrical/multimeter/MultimeterNetwork.java
View file

@ -1,5 +1,6 @@
package resonantinduction.electrical.multimeter; package resonantinduction.electrical.multimeter;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import universalelectricity.api.net.IUpdate; import universalelectricity.api.net.IUpdate;
@ -9,7 +10,7 @@ import universalelectricity.core.net.NetworkTickHandler;
public class MultimeterNetwork extends Network<MultimeterNetwork, PartMultimeter> implements IUpdate public class MultimeterNetwork extends Network<MultimeterNetwork, PartMultimeter> implements IUpdate
{ {
public List<String> displayInformation; public final List<String> displayInformation = new ArrayList<String>();
public Graph graph = new Graph(20 * 10); public Graph graph = new Graph(20 * 10);
/** /**
@ -29,6 +30,14 @@ public class MultimeterNetwork extends Network<MultimeterNetwork, PartMultimeter
public Vector3 size = new Vector3(); public Vector3 size = new Vector3();
private long queueGraphValue = 0; private long queueGraphValue = 0;
private boolean doUpdate = false;
@Override
public void addConnector(PartMultimeter connector)
{
super.addConnector(connector);
NetworkTickHandler.addNetwork(this);
}
@Override @Override
public void reconstruct() public void reconstruct()
@ -46,28 +55,28 @@ public class MultimeterNetwork extends Network<MultimeterNetwork, PartMultimeter
@Override @Override
public void update() public void update()
{ {
if (queueGraphValue > 0) graph.add(queueGraphValue);
{ queueGraphValue = 0;
graph.add(queueGraphValue); displayInformation.clear();
queueGraphValue = 0; doUpdate = false;
}
} }
@Override @Override
public boolean canUpdate() public boolean canUpdate()
{ {
return getConnectors().size() > 0; return doUpdate && continueUpdate();
} }
@Override @Override
public boolean continueUpdate() public boolean continueUpdate()
{ {
return canUpdate(); return getConnectors().size() > 0;
} }
public void updateGraph(long detectedValue) public void updateGraph(long detectedValue)
{ {
queueGraphValue += detectedValue; queueGraphValue += detectedValue;
doUpdate = true;
} }
@Override @Override
@ -83,16 +92,16 @@ public class MultimeterNetwork extends Network<MultimeterNetwork, PartMultimeter
if (upperBound == null) if (upperBound == null)
{ {
upperBound = node.getPosition().translate(0.5); upperBound = node.getPosition().translate(1);
} }
if (lowerBound == null) if (lowerBound == null)
{ {
lowerBound = node.getPosition().translate(0.5); lowerBound = node.getPosition();
} }
upperBound = upperBound.max(node.getPosition().translate(0.5)); upperBound = upperBound.max(node.getPosition().translate(1));
lowerBound = lowerBound.min(node.getPosition().translate(0.5)); lowerBound = lowerBound.min(node.getPosition());
} }
@Override @Override

8
src/main/java/resonantinduction/electrical/multimeter/PartMultimeter.java
View file

@ -168,6 +168,7 @@ public class PartMultimeter extends JCuboidPart implements IConnector<Multimeter
super.update(); super.update();
this.ticks++; this.ticks++;
getNetwork().addConnector(this);
if (!world().isRemote) if (!world().isRemote)
{ {
@ -208,10 +209,7 @@ public class PartMultimeter extends JCuboidPart implements IConnector<Multimeter
if (getNetwork().graph.get(1) != detectedEnergy) if (getNetwork().graph.get(1) != detectedEnergy)
{ {
// writeDesc(getWriteStream());
writeGraph(getWriteStream()); writeGraph(getWriteStream());
// this.getWriteStream().writeByte(3).writeByte((byte)
// detectMode.ordinal()).writeLong(detectedEnergy).writeLong(detectedAverageEnergy).writeLong(energyLimit);
} }
} }
} }
@ -220,9 +218,7 @@ public class PartMultimeter extends JCuboidPart implements IConnector<Multimeter
{ {
for (EntityPlayer player : playersUsing) for (EntityPlayer player : playersUsing)
{ {
writeDesc(getWriteStream()); writeGraph(getWriteStream());
// this.getWriteStream().writeByte(3).writeByte((byte)
// detectMode.ordinal()).writeLong(detectedEnergy).writeLong(detectedAverageEnergy).writeLong(energyLimit);
} }
} }
} }

4
src/main/java/resonantinduction/electrical/multimeter/RenderMultimeter.java
View file

@ -85,14 +85,14 @@ public class RenderMultimeter
* Only one block renders this text. * Only one block renders this text.
* Render all the multimeter text * Render all the multimeter text
*/ */
if (part.getNetwork().center.distance(new Vector3(part.x(), part.y(), part.z()).translate(0.5)) < 0.8) if (part.getNetwork().center.distance(new Vector3(part.x(), part.y(), part.z()).translate(0.5)) < 1)
{ {
GL11.glPushMatrix(); GL11.glPushMatrix();
GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5); GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5);
Vector3 centerTranslation = part.getNetwork().center.clone().subtract(part.x(), part.y(), part.z()).add(-0.5); Vector3 centerTranslation = part.getNetwork().center.clone().subtract(part.x(), part.y(), part.z()).add(-0.5);
GL11.glTranslated(centerTranslation.x, centerTranslation.y, centerTranslation.z); GL11.glTranslated(centerTranslation.x, centerTranslation.y, centerTranslation.z);
RenderUtility.rotateFaceBlockToSideOutwards(part.getDirection().getOpposite()); RenderUtility.rotateFaceBlockToSideOutwards(part.getDirection().getOpposite());
GL11.glTranslated(0, 0.05, 0); GL11.glTranslated(0, 0.07, 0);
String display = UnitDisplay.getDisplay(part.getNetwork().graph.get(0), Unit.JOULES); String display = UnitDisplay.getDisplay(part.getNetwork().graph.get(0), Unit.JOULES);
if (dir.offsetX == 0) if (dir.offsetX == 0)
RenderUtility.renderText(display, (float) (part.getNetwork().size.x * 0.9f), 0.5f); RenderUtility.renderText(display, (float) (part.getNetwork().size.x * 0.9f), 0.5f);

2
src/main/resources/assets/resonantinduction/languages/en_US.properties
View file

@ -141,7 +141,7 @@ tooltip.multimeter.lastSave=Last Detection: %v KJ
## GUI Strings that can't be any other localization ## GUI Strings that can't be any other localization
gui.resonantinduction.multimeter.toggle=Toggle gui.resonantinduction.multimeter.toggle=Toggle
gui.resonantinduction.multimeter.averageEnergy=Average Energy: gui.resonantinduction.multimeter.capacity=Capacity:
gui.resonantinduction.multimeter.energy=Energy: gui.resonantinduction.multimeter.energy=Energy:
gui.resonantinduction.multimeter.redstone=Output Redstone If... gui.resonantinduction.multimeter.redstone=Output Redstone If...