AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-09-23 12:42:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

gun aiming no longer spawns own thread

Browse Source
This commit is contained in:
UnknownShadow200 2017-05-31 23:25:50 +10:00
parent 1e6cf8fe7b
commit 0c5ed2d936
2 changed files with 58 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
MCGalaxy/Commands/Fun/WeaponCmd.cs
View File

@ -19,6 +19,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading; using System.Threading;
using MCGalaxy.Maths; using MCGalaxy.Maths;
using MCGalaxy.Tasks;
namespace MCGalaxy.Commands.Fun { namespace MCGalaxy.Commands.Fun {
public abstract class WeaponCmd : Command { public abstract class WeaponCmd : Command {
@ -54,9 +55,10 @@ namespace MCGalaxy.Commands.Fun {
if (p.aiming) return; if (p.aiming) return;
p.aiming = true; p.aiming = true;
Thread aimThread = new Thread(() => DoAim(p)); AimState state = new AimState();
aimThread.Name = "MCG_WeaponAim"; state.player = p;
aimThread.Start(); SchedulerTask task = new SchedulerTask(AimCallback, state, TimeSpan.Zero, true);
p.CriticalTasks.Add(task);
} }
EndType GetEnd(Player p, string mode) { EndType GetEnd(Player p, string mode) {
@ -70,50 +72,58 @@ namespace MCGalaxy.Commands.Fun {
return EndType.Invalid; return EndType.Invalid;
} }
void DoAim(Player p) { class AimState {
List<Vec3U16> lastSent = new List<Vec3U16>(), toSend = new List<Vec3U16>(); public Player player;
while (p.aiming) { public Position oldPos = default(Position);
Vec3F32 dir = DirUtils.GetFlatDirVector(p.Rot.RotY, p.Rot.HeadX); public List<Vec3U16> lastSent = new List<Vec3U16>();
try { public List<Vec3U16> toSend = new List<Vec3U16>();
ushort x = (ushort)Math.Round(p.Pos.BlockX + dir.X * 3);
ushort y = (ushort)Math.Round(p.Pos.BlockY + dir.Y * 3);
ushort z = (ushort)Math.Round(p.Pos.BlockZ + dir.Z * 3);
int signX = Math.Sign(dir.X) >= 0 ? 1 : -1, signZ = Math.Sign(dir.Z) >= 0 ? 1 : -1;
CheckTile(p.level, toSend, x, y, z);
CheckTile(p.level, toSend, x + signX, y, z);
CheckTile(p.level, toSend, x, y, z + signZ);
CheckTile(p.level, toSend, x + signX, y, z + signZ);
// Revert all glass blocks now not in the ray from the player's direction
for (int i = 0; i < lastSent.Count; i++) {
Vec3U16 cP = lastSent[i];
if (toSend.Contains(cP)) continue;
if (p.level.IsValidPos(cP))
p.RevertBlock(cP.X, cP.Y, cP.Z);
lastSent.RemoveAt(i); i--;
}
// Place the new glass blocks that are in the ray from the player's direction
foreach (Vec3U16 cP in toSend) {
if (lastSent.Contains(cP)) continue;
lastSent.Add(cP);
p.SendBlockchange(cP.X, cP.Y, cP.Z, (ExtBlock)Block.glass);
}
toSend.Clear();
}
catch { }
Thread.Sleep(20);
}
foreach (Vec3U16 cP in lastSent) {
if (p.level.IsValidPos(cP))
p.RevertBlock(cP.X, cP.Y, cP.Z);
}
} }
void CheckTile(Level lvl, List<Vec3U16> toSend, int x, int y, int z) { static void AimCallback(SchedulerTask task) {
AimState state = (AimState)task.State;
Player p = state.player;
if (state.player.aiming) { DoAim(state); return; }
foreach (Vec3U16 cP in state.lastSent) {
if (!p.level.IsValidPos(cP)) continue;
p.RevertBlock(cP.X, cP.Y, cP.Z);
}
task.Repeating = false;
}
static void DoAim(AimState state) {
Player p = state.player;
Vec3F32 dir = DirUtils.GetFlatDirVector(p.Rot.RotY, p.Rot.HeadX);
ushort x = (ushort)Math.Round(p.Pos.BlockX + dir.X * 3);
ushort y = (ushort)Math.Round(p.Pos.BlockY + dir.Y * 3);
ushort z = (ushort)Math.Round(p.Pos.BlockZ + dir.Z * 3);
int signX = Math.Sign(dir.X) >= 0 ? 1 : -1, signZ = Math.Sign(dir.Z) >= 0 ? 1 : -1;
CheckTile(p.level, state.toSend, x, y, z);
CheckTile(p.level, state.toSend, x + signX, y, z);
CheckTile(p.level, state.toSend, x, y, z + signZ);
CheckTile(p.level, state.toSend, x + signX, y, z + signZ);
// Revert all glass blocks now not in the ray from the player's direction
for (int i = 0; i < state.lastSent.Count; i++) {
Vec3U16 cP = state.lastSent[i];
if (state.toSend.Contains(cP)) continue;
if (p.level.IsValidPos(cP))
p.RevertBlock(cP.X, cP.Y, cP.Z);
state.lastSent.RemoveAt(i); i--;
}
// Place the new glass blocks that are in the ray from the player's direction
foreach (Vec3U16 cP in state.toSend) {
if (state.lastSent.Contains(cP)) continue;
state.lastSent.Add(cP);
p.SendBlockchange(cP.X, cP.Y, cP.Z, (ExtBlock)Block.glass);
}
state.toSend.Clear();
}
static void CheckTile(Level lvl, List<Vec3U16> toSend, int x, int y, int z) {
Vec3U16 pos; Vec3U16 pos;
if (lvl.GetBlock(x, y - 1, z) == Block.air) { if (lvl.GetBlock(x, y - 1, z) == Block.air) {
pos.X = (ushort)x; pos.Y = (ushort)(y - 1); pos.Z = (ushort)z; pos.X = (ushort)x; pos.Y = (ushort)(y - 1); pos.Z = (ushort)z;
@ -160,7 +170,7 @@ namespace MCGalaxy.Commands.Fun {
return true; return true;
} }
} else if (p.level.physics >= 3) { } else if (p.level.physics >= 3) {
if (type != Block.glass && doExplode) { if (type != Block.glass && doExplode) {
p.level.MakeExplosion(pos.X, pos.Y, pos.Z, 1); p.level.MakeExplosion(pos.X, pos.Y, pos.Z, 1);
return true; return true;
} }

1
MCGalaxy/Commands/other/CmdFly.cs
View File

@ -61,7 +61,6 @@ namespace MCGalaxy.Commands.Misc {
foreach (Vec3U16 cP in state.last) { foreach (Vec3U16 cP in state.last) {
p.SendBlockchange(cP.X, cP.Y, cP.Z, ExtBlock.Air); p.SendBlockchange(cP.X, cP.Y, cP.Z, ExtBlock.Air);
} }
Player.Message(p, "Stopped flying"); Player.Message(p, "Stopped flying");
task.Repeating = false; task.Repeating = false;
} }