feat: TU19 (Dec 2014) Features & Content (#155)
* try to resolve merge conflict
* feat: TU19 (Dec 2014) Features & Content (#32)
* December 2014 files
* Working release build
* Fix compilation issues
* Add sound to Windows64Media
* Add DLC content and force Tutorial DLC
* Revert "Add DLC content and force Tutorial DLC"
This reverts commit 97a4399472.
* Disable broken light packing
* Disable breakpoint during DLC texture map load
Allows DLC loading but the DLC textures are still broken
* Fix post build not working
* ...
* fix vs2022 build
* fix cmake build
---------
Co-authored-by: Loki <lokirautio@gmail.com>
This commit is contained in:
@@ -8,8 +8,6 @@
|
||||
#include "JavaMath.h"
|
||||
#include "EyeOfEnderSignal.h"
|
||||
|
||||
|
||||
|
||||
void EyeOfEnderSignal::_init()
|
||||
{
|
||||
// 4J Stu - This function call had to be moved here from the Entity ctor to ensure that
|
||||
@@ -23,7 +21,6 @@ void EyeOfEnderSignal::_init()
|
||||
surviveAfterDeath = false;
|
||||
}
|
||||
|
||||
|
||||
EyeOfEnderSignal::EyeOfEnderSignal(Level *level) : Entity(level)
|
||||
{
|
||||
_init();
|
||||
@@ -34,7 +31,6 @@ void EyeOfEnderSignal::defineSynchedData()
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
bool EyeOfEnderSignal::shouldRenderAtSqrDistance(double distance)
|
||||
{
|
||||
double size = bb->getSize() * 4;
|
||||
@@ -49,8 +45,8 @@ EyeOfEnderSignal::EyeOfEnderSignal(Level *level, double x, double y, double z) :
|
||||
|
||||
setSize(0.25f, 0.25f);
|
||||
|
||||
this->setPos(x, y, z);
|
||||
this->heightOffset = 0;
|
||||
setPos(x, y, z);
|
||||
heightOffset = 0;
|
||||
}
|
||||
|
||||
void EyeOfEnderSignal::signalTo(double tx, int ty, double tz)
|
||||
@@ -85,8 +81,8 @@ void EyeOfEnderSignal::lerpMotion(double xd, double yd, double zd)
|
||||
if (xRotO == 0 && yRotO == 0)
|
||||
{
|
||||
float sd = (float) sqrt(xd * xd + zd * zd);
|
||||
yRotO = this->yRot = (float) (atan2(xd, zd) * 180 / PI);
|
||||
xRotO = this->xRot = (float) (atan2(yd, (double)sd) * 180 / PI);
|
||||
yRotO = yRot = (float) (atan2(xd, zd) * 180 / PI);
|
||||
xRotO = xRot = (float) (atan2(yd, (double)sd) * 180 / PI);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user