Anvilcraft/WarpDrive
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #31 from drpepper240/cameraFix

Browse source 
Camera fix
This commit is contained in:
Cr0s 2014-07-31 19:34:50 +04:00
commit 601daf192f
3 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
src/assets/warpdrive/textures/blocks/camOverlay.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
src/assets/warpdrive/textures/blocks/lasercamOverlay.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

27
src/cr0s/WarpDrive/EntityCamera.java
View file

@ -52,6 +52,8 @@ public final class EntityCamera extends EntityLivingBase
private float oldFOV;
private float oldSens;
private boolean isCentered = true;
public EntityCamera(World world, ChunkPosition pos, EntityPlayer player)
{
super(world);
@ -74,13 +76,12 @@ public final class EntityCamera extends EntityLivingBase
if (FMLCommonHandler.instance().getEffectiveSide().isClient())
{
mc.renderViewEntity.rotationYaw = player.rotationYaw;
//mc.renderViewEntity.rotationYawHead = player.rotationYawHead;
mc.renderViewEntity.rotationPitch = player.rotationPitch;
// Perform zoom
if (Mouse.isButtonDown(1) && waitTicks-- == 2)
if (Mouse.isButtonDown(1) && waitTicks-- <= 0)
{
waitTicks = 2;
waitTicks = 4;
zoom();
}
@ -89,9 +90,9 @@ public final class EntityCamera extends EntityLivingBase
ClientCameraUtils.resetCam();
this.setDead();
}
else if (Keyboard.isKeyDown(Keyboard.KEY_SPACE) && fireWaitTicks-- == 0)
else if (Mouse.isButtonDown(0) && fireWaitTicks-- <= 0)
{
fireWaitTicks = 2;
fireWaitTicks = 1;
// Make a shoot with camera-laser
if (worldObj.getBlockId(xCoord, yCoord, zCoord) == WarpDriveConfig.i.laserCamID)
@ -124,10 +125,22 @@ public final class EntityCamera extends EntityLivingBase
else if (Keyboard.isKeyDown(Keyboard.KEY_S) && (dx != -1))
{
dx = -1;
}
else if (Keyboard.isKeyDown(Keyboard.KEY_C)) //centering view
{
isCentered = !isCentered;
return;
}
}
this.setPosition(xCoord + dx, yCoord + dy, zCoord + dz);
if (isCentered)
{
this.setPosition(xCoord + 0.5, yCoord + 0.75, zCoord + 0.5);
} else {
this.setPosition(xCoord + dx, yCoord + dy, zCoord + dz);
}
}
}
@ -263,4 +276,4 @@ public final class EntityCamera extends EntityLivingBase
public ChunkCoordinates getPlayerCoordinates() {
return new ChunkCoordinates(xCoord, yCoord, zCoord);
}*/
}
}