EffectPrimitiveState: name 84 CEffectPrim members after DHXJ (layout matches DHXJ member order with 12-byte std::vector and one extra 2026 dword at 0x1D8): stateCnt, duration, pattern, count, renderFlag, numSegment, speed/accel, gravSpeed/gravAccel, longitude/latitude/roll, size, alpha*, lati*/long*/roll* speeds and accels, radius*, width*/height*, orgPos, deltaPos/deltaPos2/deltaPos3, segPos, rotAxis, transform/rotTransform, etc. Pure rename, codegen unchanged (221/221 functions with includers).
This commit is contained in:
ragnarok-clanker
parent
19feaf8184
commit
bdd9736af4
8 changed files with 1053 additions and 1053 deletions
|
|
@ -17,111 +17,111 @@ EffectPrimitiveSlot::EffectPrimitiveSlot() {
|
|||
// INLINED
|
||||
EffectPrimitiveState::EffectPrimitiveState(RenderObjectState& render) {
|
||||
this->textures = nullptr;
|
||||
this->unknown_0208 = 0;
|
||||
this->unknown_0148 = 0;
|
||||
this->unknown_01CC = 0;
|
||||
this->playWaveType = 0;
|
||||
this->playWaveName = 0;
|
||||
this->type = 0;
|
||||
this->flags = 0;
|
||||
this->unknown_01C4 = 1;
|
||||
this->count = 0;
|
||||
this->pattern = 0;
|
||||
this->renderFlag = 1;
|
||||
this->unknown_014C.x = 0;
|
||||
this->unknown_014C.y = 0;
|
||||
this->unknown_014C.z = 0;
|
||||
this->unknown_0158 = 0;
|
||||
this->unknown_015C = 0;
|
||||
this->chRadiSpeed = 0;
|
||||
this->isDisappear = 0;
|
||||
this->unknown_0138 = 0;
|
||||
this->master = nullptr;
|
||||
this->unknown_01D4 = 0;
|
||||
this->chCnt = 0;
|
||||
this->unknown_01D8 = 0;
|
||||
this->unknown_01E0 = 0;
|
||||
this->unknown_0348 = 0;
|
||||
this->unknown_028C = 0;
|
||||
this->unknown_0288 = 36.0f;
|
||||
this->stateCnt = 0;
|
||||
this->radius = 0;
|
||||
this->minRadius = 0;
|
||||
this->arcAngle = 36.0f;
|
||||
render.angle = 0;
|
||||
this->unknown_01F8 = 180;
|
||||
this->scale = 1.0f;
|
||||
this->unknown_02F4 = 0;
|
||||
this->unknown_02F8 = 0;
|
||||
this->unknown_0354 = 0.0f;
|
||||
this->unknown_0360 = 0.0f;
|
||||
this->unknown_036C = 100.0f;
|
||||
this->unknown_02BC = 0.0f;
|
||||
this->unknown_031C = 0.0f;
|
||||
this->unknown_034C = 0.0f;
|
||||
this->unknown_0300 = 0;
|
||||
this->unknown_02FC = 0;
|
||||
this->unknown_0330 = 0;
|
||||
this->unknown_0334 = 0;
|
||||
this->unknown_0338 = 0;
|
||||
this->unknown_0358 = 0.0f;
|
||||
this->unknown_0364 = 0.0f;
|
||||
this->validAngle = 180;
|
||||
this->size = 1.0f;
|
||||
this->innerSize = 0;
|
||||
this->outerSize = 0;
|
||||
this->widthSize = 0.0f;
|
||||
this->heightSize = 0.0f;
|
||||
this->maxHeightSize = 100.0f;
|
||||
this->speed = 0.0f;
|
||||
this->sizeSpeed = 0.0f;
|
||||
this->radiusSpeed = 0.0f;
|
||||
this->outerSpeed = 0;
|
||||
this->innerSpeed = 0;
|
||||
this->longSpeed = 0;
|
||||
this->latiSpeed = 0;
|
||||
this->rollSpeed = 0;
|
||||
this->widthSpeed = 0.0f;
|
||||
this->heightSpeed = 0.0f;
|
||||
this->alphaSpeed = 0.0f;
|
||||
this->unknown_02EC = 0;
|
||||
this->unknown_02C0 = 0.0f;
|
||||
this->unknown_0320 = 0;
|
||||
this->unknown_0350 = 0.0f;
|
||||
this->unknown_02F0 = 0;
|
||||
this->unknown_033C = 0;
|
||||
this->unknown_0340 = 0;
|
||||
this->unknown_0344 = 0;
|
||||
this->unknown_0308 = 0;
|
||||
this->unknown_0304 = 0;
|
||||
this->unknown_035C = 0;
|
||||
this->unknown_0368 = 0;
|
||||
this->gravSpeed = 0;
|
||||
this->accel = 0.0f;
|
||||
this->sizeAccel = 0;
|
||||
this->radiusAccel = 0.0f;
|
||||
this->gravAccel = 0;
|
||||
this->longAccel = 0;
|
||||
this->latiAccel = 0;
|
||||
this->rollAccel = 0;
|
||||
this->outerAccel = 0;
|
||||
this->innerAccel = 0;
|
||||
this->widthAccel = 0;
|
||||
this->heightAccel = 0;
|
||||
this->red = 255;
|
||||
this->green = 255;
|
||||
this->blue = 255;
|
||||
this->unknown_0248 = 0;
|
||||
this->unknown_024C = 0;
|
||||
this->unknown_0250 = 0;
|
||||
this->unknown_0200 = -1;
|
||||
this->unknown_02C8 = 0.0001f;
|
||||
this->unknown_02CC = 0.0001f;
|
||||
this->unknown_029C = 0.0001f;
|
||||
this->unknown_02A4.x = 0;
|
||||
this->unknown_02A4.y = 0;
|
||||
this->unknown_02A4.z = 0;
|
||||
this->unknown_02B0.x = 0;
|
||||
this->unknown_02B0.y = 0;
|
||||
this->unknown_02B0.z = 0;
|
||||
this->unknown_02C4 = 0.0001f;
|
||||
this->unknown_02D0 = 0.0001f;
|
||||
this->unknown_02A0 = 0.0001f;
|
||||
this->unknown_01FC = 0;
|
||||
this->unknown_0234 = 0;
|
||||
this->unknown_0238 = 0;
|
||||
this->unknown_030C = 0;
|
||||
this->unknown_0310 = 0;
|
||||
this->unknown_0314 = 0.0f;
|
||||
this->lifetime = 100;
|
||||
this->unknown_01EC = -1;
|
||||
this->unknown_01F0 = -1;
|
||||
this->unknown_01C0 = -1;
|
||||
this->redSpeed = 0;
|
||||
this->greenSpeed = 0;
|
||||
this->blueSpeed = 0;
|
||||
this->changePoint = -1;
|
||||
this->changeWidthSpeed = 0.0001f;
|
||||
this->changeHeightSpeed = 0.0001f;
|
||||
this->changeSpeed = 0.0001f;
|
||||
this->changeSpeed3d.x = 0;
|
||||
this->changeSpeed3d.y = 0;
|
||||
this->changeSpeed3d.z = 0;
|
||||
this->changeAccel3d.x = 0;
|
||||
this->changeAccel3d.y = 0;
|
||||
this->changeAccel3d.z = 0;
|
||||
this->changeWidthAccel = 0.0001f;
|
||||
this->changeHeightAccel = 0.0001f;
|
||||
this->changeAccel = 0.0001f;
|
||||
this->RGBCycleCnt = 0;
|
||||
this->RGBCycleDelay = 0;
|
||||
this->commonPattern = 0;
|
||||
this->longitude = 0;
|
||||
this->latitude = 0;
|
||||
this->roll = 0.0f;
|
||||
this->duration = 100;
|
||||
this->fadeInCnt = -1;
|
||||
this->fadeOutCnt = -1;
|
||||
this->argb = -1;
|
||||
this->alpha = 254.0f;
|
||||
this->alphaDelta = 1.0f;
|
||||
this->unknown_02D4 = 254.0f;
|
||||
this->unknown_02D8 = 0;
|
||||
this->unknown_0254 = 1;
|
||||
this->unknown_01F4 = 1;
|
||||
this->unknown_01E8 = 4;
|
||||
this->maxAlpha = 254.0f;
|
||||
this->minAlpha = 0;
|
||||
this->repeatAnim = 1;
|
||||
this->numSegment = 1;
|
||||
this->animSpeed = 4;
|
||||
render.previousAnimation = 0;
|
||||
render.curMotion = 0;
|
||||
this->textureCount = 1;
|
||||
this->unknown_02E4 = 0;
|
||||
this->totalTexture = 1;
|
||||
this->v1 = 0;
|
||||
this->unknown_02DC = 0;
|
||||
this->unknown_02E8 = 1.0f;
|
||||
this->unknown_02E0 = 1.0f;
|
||||
this->v2 = 1.0f;
|
||||
this->u2 = 1.0f;
|
||||
this->unknown_01C8[0] = 0;
|
||||
this->unknown_FA10 = 0;
|
||||
this->unknown_FA14 = 0;
|
||||
|
||||
this->unknown_0370 = {};
|
||||
this->origin = {};
|
||||
this->offset = {};
|
||||
this->velocity = {};
|
||||
this->unknown_03A0 = {};
|
||||
this->unknown_03AC = {};
|
||||
this->speed3d = {};
|
||||
this->orgPos = {};
|
||||
this->deltaPos = {};
|
||||
this->deltaPos2 = {};
|
||||
this->deltaPos3 = {};
|
||||
this->deltaPosAccel = {};
|
||||
|
||||
for (vector3d& corner : this->corners) {
|
||||
for (vector3d& corner : this->segPos) {
|
||||
corner = {};
|
||||
}
|
||||
|
||||
|
|
@ -139,8 +139,8 @@ EffectPrimitiveState::EffectPrimitiveState(RenderObjectState& render) {
|
|||
}
|
||||
}
|
||||
|
||||
std::memcpy(this->matrix1, g_identityMatrix, sizeof(g_identityMatrix));
|
||||
std::memcpy(this->matrix2, g_identityMatrix, sizeof(g_identityMatrix));
|
||||
std::memcpy(this->transform, g_identityMatrix, sizeof(g_identityMatrix));
|
||||
std::memcpy(this->rotTransform, g_identityMatrix, sizeof(g_identityMatrix));
|
||||
std::memset(this->slots, 0, sizeof(this->slots));
|
||||
}
|
||||
|
||||
|
|
@ -200,15 +200,15 @@ void __stdcall Get_Angle(float x, float y, std::int16_t* angle) {
|
|||
void EffectPrimitiveState::Initialize(
|
||||
RenderObjectState& render, CRagEffect& master, const RenderObjectState& masterRender, int type, float x, float y, float z
|
||||
) {
|
||||
const float first = x + this->offset.x;
|
||||
const float first = x + this->deltaPos.x;
|
||||
this->master = &master;
|
||||
this->type = type;
|
||||
this->offset.x = first;
|
||||
this->offset.y = y + this->offset.y;
|
||||
this->offset.z = z + this->offset.z;
|
||||
this->origin = {masterRender.position.x, masterRender.position.y, masterRender.position.z};
|
||||
render.position.x = this->origin.x;
|
||||
render.position.y = this->origin.y;
|
||||
render.position.z = this->origin.z;
|
||||
this->unknown_013C = 0;
|
||||
this->count = type;
|
||||
this->deltaPos.x = first;
|
||||
this->deltaPos.y = y + this->deltaPos.y;
|
||||
this->deltaPos.z = z + this->deltaPos.z;
|
||||
this->orgPos = {masterRender.position.x, masterRender.position.y, masterRender.position.z};
|
||||
render.position.x = this->orgPos.x;
|
||||
render.position.y = this->orgPos.y;
|
||||
render.position.z = this->orgPos.z;
|
||||
this->isChangeProcessed = 0;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue