087b7e7abf
This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.
This reverts commit a9be52c41a.
77 lines
1.6 KiB
C++
77 lines
1.6 KiB
C++
#include "stdafx.h"
|
|
#include "net.minecraft.world.entity.h"
|
|
#include "net.minecraft.world.entity.ai.attributes.h"
|
|
#include "net.minecraft.world.entity.ai.control.h"
|
|
#include "net.minecraft.world.entity.monster.h"
|
|
#include "net.minecraft.world.phys.h"
|
|
#include "MoveControl.h"
|
|
|
|
const float MoveControl::MIN_SPEED = 0.0005f;
|
|
const float MoveControl::MIN_SPEED_SQR = MIN_SPEED * MIN_SPEED;
|
|
|
|
MoveControl::MoveControl(Mob *mob)
|
|
{
|
|
this->mob = mob;
|
|
wantedX = mob->x;
|
|
wantedY = mob->y;
|
|
wantedZ = mob->z;
|
|
|
|
speedModifier = 0.0;
|
|
|
|
_hasWanted = false;
|
|
}
|
|
|
|
bool MoveControl::hasWanted()
|
|
{
|
|
return _hasWanted;
|
|
}
|
|
|
|
double MoveControl::getSpeedModifier()
|
|
{
|
|
return speedModifier;
|
|
}
|
|
|
|
void MoveControl::setWantedPosition(double x, double y, double z, double speedModifier)
|
|
{
|
|
wantedX = x;
|
|
wantedY = y;
|
|
wantedZ = z;
|
|
this->speedModifier = speedModifier;
|
|
_hasWanted = true;
|
|
}
|
|
|
|
void MoveControl::tick()
|
|
{
|
|
mob->setYya(0);
|
|
if (!_hasWanted) return;
|
|
_hasWanted = false;
|
|
|
|
int yFloor = floor(mob->bb->y0 + .5f);
|
|
|
|
double xd = wantedX - mob->x;
|
|
double zd = wantedZ - mob->z;
|
|
double yd = wantedY - yFloor;
|
|
double dd = xd * xd + yd * yd + zd * zd;
|
|
if (dd < MIN_SPEED_SQR) return;
|
|
|
|
float yRotD = (float) (atan2(zd, xd) * 180 / PI) - 90;
|
|
|
|
mob->yRot = rotlerp(mob->yRot, yRotD, MAX_TURN);
|
|
mob->setSpeed((float) (speedModifier * mob->getAttribute(SharedMonsterAttributes::MOVEMENT_SPEED)->getValue()));
|
|
|
|
if (yd > 0 && xd * xd + zd * zd < 1) mob->getJumpControl()->jump();
|
|
}
|
|
|
|
float MoveControl::rotlerp(float a, float b, float max)
|
|
{
|
|
float diff = Mth::wrapDegrees(b - a);
|
|
if (diff > max)
|
|
{
|
|
diff = max;
|
|
}
|
|
if (diff < -max)
|
|
{
|
|
diff = -max;
|
|
}
|
|
return a + diff;
|
|
} |