* Fixed boats falling and a TP glitch #266 * Replaced every C-style cast with C++ ones * Replaced every C-style cast with C++ ones * Fixed boats falling and a TP glitch #266 * Updated NULL to nullptr and fixing some type issues * Modernized and fixed a few bugs - Replaced most instances of `NULL` with `nullptr`. - Replaced most `shared_ptr(new ...)` with `make_shared`. - Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances. * Fixing more conflicts * Replace int loops with size_t and start work on overrides
71 lines
1.7 KiB
C++
71 lines
1.7 KiB
C++
#include "stdafx.h"
|
|
#include "..\Minecraft.World\JavaMath.h"
|
|
#include "EchantmentTableParticle.h"
|
|
|
|
EchantmentTableParticle::EchantmentTableParticle(Level *level, double x, double y, double z, double xd, double yd, double zd) : Particle(level, x, y, z, xd, yd, zd)
|
|
{
|
|
this->xd = xd;
|
|
this->yd = yd;
|
|
this->zd = zd;
|
|
this->xStart = this->x = x;
|
|
this->yStart = this->y = y;
|
|
this->zStart = this->z = z;
|
|
|
|
unsigned int clr = Minecraft::GetInstance()->getColourTable()->getColor( eMinecraftColour_Particle_EnchantmentTable ); //0xE5E5FF
|
|
double r = ( (clr>>16)&0xFF )/255.0f, g = ( (clr>>8)&0xFF )/255.0, b = ( clr&0xFF )/255.0;
|
|
|
|
float br = random->nextFloat() * 0.6f + 0.4f;
|
|
rCol = r * br;
|
|
gCol = g * br;
|
|
bCol = b * br;
|
|
|
|
oSize = size = random->nextFloat() * 0.5f + 0.2f;
|
|
|
|
lifetime = static_cast<int>(Math::random() * 10) + 30;
|
|
noPhysics = true;
|
|
setMiscTex( static_cast<int>(Math::random() * 26 + 1 + 14 * 16) );
|
|
}
|
|
|
|
int EchantmentTableParticle::getLightColor(float a)
|
|
{
|
|
int br = Particle::getLightColor(a);
|
|
|
|
float pos = age / static_cast<float>(lifetime);
|
|
pos = pos * pos;
|
|
pos = pos * pos;
|
|
|
|
int br1 = (br) & 0xff;
|
|
int br2 = (br >> 16) & 0xff;
|
|
br2 += static_cast<int>(pos * 15 * 16);
|
|
if (br2 > 15 * 16) br2 = 15 * 16;
|
|
return br1 | br2 << 16;
|
|
}
|
|
|
|
float EchantmentTableParticle::getBrightness(float a)
|
|
{
|
|
float br = Particle::getBrightness(a);
|
|
float pos = age / static_cast<float>(lifetime);
|
|
pos = pos * pos;
|
|
pos = pos * pos;
|
|
return br * (1 - pos) + pos;
|
|
}
|
|
|
|
void EchantmentTableParticle::tick()
|
|
{
|
|
xo = x;
|
|
yo = y;
|
|
zo = z;
|
|
|
|
float pos = age / static_cast<float>(lifetime);
|
|
|
|
pos = 1 - pos;
|
|
|
|
float pp = 1 - pos;
|
|
pp = pp * pp;
|
|
pp = pp * pp;
|
|
x = xStart + xd * pos;
|
|
y = yStart + yd * pos - pp * 1.2f;
|
|
z = zStart + zd * pos;
|
|
|
|
if (age++ >= lifetime) remove();
|
|
} |