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

improved laser rendering for composite architects, #1544

Browse source
This commit is contained in:
SpaceToad 2014-09-06 18:51:49 +02:00
parent b9f10af73b
commit 416180819b
8 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
buildcraft_resources/assets/buildcraft/textures/entities/blue_stripes.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.4 KiB

5
common/buildcraft/builders/RenderArchitect.java
View file

@ -41,9 +41,10 @@ public class RenderArchitect extends RenderBoxProvider {
if (laser != null) { if (laser != null) {
GL11.glPushMatrix(); GL11.glPushMatrix();
RenderLaser RenderLaser
.doRenderLaser( .doRenderLaserWave(
TileEntityRendererDispatcher.instance.field_147553_e, TileEntityRendererDispatcher.instance.field_147553_e,
laser, EntityLaser.LASER_TEXTURES[4]); laser, EntityLaser.LASER_TEXTURES[3]);
GL11.glPopMatrix(); GL11.glPopMatrix();
} }
} }

4
common/buildcraft/builders/TileArchitect.java
View file

@ -55,7 +55,7 @@ public class TileArchitect extends TileBuildCraft implements IInventory, IBoxPro
private RecursiveBlueprintReader reader; private RecursiveBlueprintReader reader;
public TileArchitect() { public TileArchitect() {
box.kind = Kind.STRIPES; box.kind = Kind.BLUE_STRIPES;
} }
@Override @Override
@ -260,7 +260,7 @@ public class TileArchitect extends TileBuildCraft implements IInventory, IBoxPro
public void addSubBlueprint(TileEntity sub) { public void addSubBlueprint(TileEntity sub) {
subBlueprints.add(new BlockIndex(sub)); subBlueprints.add(new BlockIndex(sub));
LaserData laser = new LaserData(new Position(this), new Position(sub)); LaserData laser = new LaserData(new Position(sub), new Position(this));
laser.head.x += 0.5F; laser.head.x += 0.5F;
laser.head.y += 0.5F; laser.head.y += 0.5F;

4
common/buildcraft/builders/urbanism/RenderBoxProvider.java
View file

@ -28,6 +28,8 @@ public class RenderBoxProvider extends TileEntitySpecialRenderer {
private static final ResourceLocation LASER_GREEN = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_ENTITIES + "/laser_3.png"); private static final ResourceLocation LASER_GREEN = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_ENTITIES + "/laser_3.png");
private static final ResourceLocation LASER_BLUE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_ENTITIES + "/laser_4.png"); private static final ResourceLocation LASER_BLUE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_ENTITIES + "/laser_4.png");
private static final ResourceLocation STRIPES = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_ENTITIES + "/stripes.png"); private static final ResourceLocation STRIPES = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_ENTITIES + "/stripes.png");
private static final ResourceLocation BLUE_STRIPES = new ResourceLocation("buildcraft",
DefaultProps.TEXTURE_PATH_ENTITIES + "/blue_stripes.png");
public RenderBoxProvider() { public RenderBoxProvider() {
} }
@ -81,6 +83,8 @@ public class RenderBoxProvider extends TileEntitySpecialRenderer {
return LASER_BLUE; return LASER_BLUE;
case STRIPES: case STRIPES:
return STRIPES; return STRIPES;
case BLUE_STRIPES:
return BLUE_STRIPES;
} }
return null; return null;

3
common/buildcraft/core/Box.java
View file

@ -32,7 +32,8 @@ public class Box implements IBox {
LASER_YELLOW, LASER_YELLOW,
LASER_GREEN, LASER_GREEN,
LASER_BLUE, LASER_BLUE,
STRIPES STRIPES,
BLUE_STRIPES,
} }
@NetworkData @NetworkData

3
common/buildcraft/core/EntityLaser.java
View file

@ -22,7 +22,8 @@ public abstract class EntityLaser extends Entity {
new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_ENTITIES + "/laser_2.png"), new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_ENTITIES + "/laser_2.png"),
new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_ENTITIES + "/laser_3.png"), new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_ENTITIES + "/laser_3.png"),
new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_ENTITIES + "/laser_4.png"), new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_ENTITIES + "/laser_4.png"),
new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_ENTITIES + "/stripes.png")}; new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_ENTITIES + "/stripes.png"),
new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_ENTITIES + "/blue_stripes.png")};
public LaserData data = new LaserData(); public LaserData data = new LaserData();

2
common/buildcraft/core/LaserData.java
View file

@ -22,7 +22,7 @@ public class LaserData {
@NetworkData @NetworkData
public boolean isVisible = true; public boolean isVisible = true;
public double renderSize = 0; public double renderSize = 1.0 / 16.0;
public double angleY = 0; public double angleY = 0;
public double angleZ = 0; public double angleZ = 0;

1
common/buildcraft/core/render/RenderLaser.java
View file

@ -123,6 +123,7 @@ public class RenderLaser extends Render {
GL11.glPushMatrix(); GL11.glPushMatrix();
GL11.glTranslated(laser.head.x, laser.head.y, laser.head.z);
laser.update(); laser.update();
GL11.glRotatef((float) laser.angleZ, 0, 1, 0); GL11.glRotatef((float) laser.angleZ, 0, 1, 0);