Mirror/UltimateTrainingModpack
1
0
Fork 0
mirror of https://github.com/jugeeya/UltimateTrainingModpack.git synced 2025-03-16 11:26:11 +00:00
Code Issues Activity

Fixes to logic of calculating hitbox visualization effects for extended hitboxes

Browse source
This commit is contained in:
Shivam Dutt 2019-05-27 17:49:18 -05:00
parent 1f9d492626
commit 1247452ac9
1 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
source/hitbox_visualizer.hpp
View file

@ -66,27 +66,25 @@ void generate_hitbox_effects(L2CAgent *l2c_agent,
L2CValue rate(8.0f); L2CValue rate(8.0f);
float xDist = x2->raw_float - x->raw_float; float xDist, yDist, zDist;
float yDist = y2->raw_float - y->raw_float; int nEffects;
float zDist = z2->raw_float - z->raw_float;
int num_effects;
if (x2->type != L2C_void && y2->type != L2C_void && z2->type != L2C_void) { // extended hitbox if (x2->type != L2C_void && y2->type != L2C_void && z2->type != L2C_void) { // extended hitbox
float dist = sqrt(xDist * xDist + yDist * yDist + xDist * xDist); xDist = x2->raw_float - x->raw_float;
num_effects = ceil(dist / (size->raw_float * 0.95)); // just enough effects to form a continuous line yDist = y2->raw_float - y->raw_float;
if (num_effects < 2) zDist = z2->raw_float - z->raw_float;
num_effects = 2; float dist = sqrtf(xDist * xDist + yDist * yDist + zDist * zDist);
if (num_effects > 16) nEffects = (int)ceilf(dist / (size->raw_float * 1.875f)) + 1; // just enough effects to form a continuous line
num_effects = 16; if (nEffects < 2)
nEffects = 2;
if (nEffects > 16)
nEffects = 16;
} else { // non-extended hitbox } else { // non-extended hitbox
*x2 = *x; xDist = yDist = zDist = 0;
*y2 = *y; nEffects = 1;
*z2 = *z;
num_effects = 1;
} }
for (int i = 0; i < num_effects; i++) { for (int i = 0; i < nEffects; i++) {
float mult = (float)i / num_effects; float mult = nEffects <= 1 ? 0 : (float)i / (nEffects - 1);
L2CValue currX(x->raw_float + xDist * mult); L2CValue currX(x->raw_float + xDist * mult);
L2CValue currY(y->raw_float + yDist * mult); L2CValue currY(y->raw_float + yDist * mult);
L2CValue currZ(z->raw_float + zDist * mult); L2CValue currZ(z->raw_float + zDist * mult);