From fbd7a03e9e3f762dd18540fc65c6eab3af5ff03e Mon Sep 17 00:00:00 2001 From: ragnarok-clanker Date: Wed, 11 Nov 2026 12:37:25 +0000 Subject: [PATCH] Decompile fn_19866 (CEffectPrim::Render) Batch #16647 by eAthena: 0 byte-identical, 1 confirmed by peer review. - fn_19866 CEffectPrim::Render: logic confirmed by peer review Peer-reviewed-by: ragnarok-clanker, Yommy, br4yan Accepted without human review: peers confirmed the logic ("same" ahead by at least 3, with 70% of the votes). --- .../Primitives/EffectPrimitiveRendering.cpp | 235 +++++++++--------- 1 file changed, 115 insertions(+), 120 deletions(-) diff --git a/Source/Contents/Effects/Primitives/EffectPrimitiveRendering.cpp b/Source/Contents/Effects/Primitives/EffectPrimitiveRendering.cpp index 6cd0d9924..6804e7a84 100644 --- a/Source/Contents/Effects/Primitives/EffectPrimitiveRendering.cpp +++ b/Source/Contents/Effects/Primitives/EffectPrimitiveRendering.cpp @@ -193,33 +193,32 @@ void CEffectPrim::Render(int argument) { const float firstSin = ClientSine(static_cast(this->state.longitude - this->state.arcAngle)); const float secondCos = ClientCosine(static_cast(this->state.longitude + this->state.arcAngle)); const float secondSin = ClientSine(static_cast(this->state.longitude + this->state.arcAngle)); - RenderTriangle& triangle = this->state.triangles[0]; const float x = this->render.position.x; - triangle.vertices[0].x = x; + this->state.triangles[0].vertices[0].x = x; const float y = this->render.position.y; - triangle.vertices[0].y = y; - triangle.vertices[0].z = 0.000001f; - triangle.vertices[0].rhw = 0.999999f; - triangle.vertices[0].diffuse = this->state.argb; - triangle.vertices[0].u = 0.5f; - triangle.vertices[0].v = 0.0f; + this->state.triangles[0].vertices[0].y = y; + this->state.triangles[0].vertices[0].z = 0.000001f; + this->state.triangles[0].vertices[0].rhw = 0.999999f; + this->state.triangles[0].vertices[0].diffuse = this->state.argb; + this->state.triangles[0].vertices[0].u = 0.5f; + this->state.triangles[0].vertices[0].v = 0.0f; const float radius = this->state.heightSize; - triangle.vertices[1].x = radius * firstCos + x; - triangle.vertices[1].y = y - radius * firstSin; - triangle.vertices[2].x = radius * secondCos + x; - triangle.vertices[2].y = y - radius * secondSin; - triangle.vertices[1].v = 1.0f; - triangle.vertices[1].u = 1.0f; - triangle.vertices[1].diffuse = this->state.argb; - triangle.vertices[1].rhw = 0.999999f; - triangle.vertices[1].z = 0.000001f; - triangle.vertices[2].z = 0.000001f; - triangle.vertices[2].rhw = 0.999999f; - triangle.vertices[2].diffuse = this->state.argb; - triangle.vertices[2].u = 0.0f; - triangle.vertices[2].v = 1.0f; - triangle.texture = this->state.textures[0]; - g_renderer->queues.SubmitTriangle(triangle, 1, g_renderer->commands, g_renderer->fog.supported != 0, g_depthStart, g_depthEnd); + this->state.triangles[0].vertices[1].x = radius * firstCos + x; + this->state.triangles[0].vertices[1].y = y - radius * firstSin; + this->state.triangles[0].vertices[2].x = radius * secondCos + x; + this->state.triangles[0].vertices[2].y = y - radius * secondSin; + this->state.triangles[0].vertices[1].v = 1.0f; + this->state.triangles[0].vertices[1].u = 1.0f; + this->state.triangles[0].vertices[1].diffuse = this->state.argb; + this->state.triangles[0].vertices[1].rhw = 0.999999f; + this->state.triangles[0].vertices[1].z = 0.000001f; + this->state.triangles[0].vertices[2].z = 0.000001f; + this->state.triangles[0].vertices[2].rhw = 0.999999f; + this->state.triangles[0].vertices[2].diffuse = this->state.argb; + this->state.triangles[0].vertices[2].u = 0.0f; + this->state.triangles[0].vertices[2].v = 1.0f; + this->state.triangles[0].texture = this->state.textures[0]; + g_renderer->queues.SubmitTriangle(this->state.triangles[0], 1, g_renderer->commands, g_renderer->fog.supported != 0, g_depthStart, g_depthEnd); break; } case PP_2DCIRCLE: @@ -266,54 +265,52 @@ void CEffectPrim::Render(int argument) { const float bottom = y - scale * this->state.heightSize; const float right = scale * this->state.widthSize + x; const std::uint32_t color = this->state.argb; - RenderTriangle& first = this->state.triangles[0]; - first.vertices[0].x = x; - first.vertices[0].y = y; - first.vertices[0].z = 0.8f; - first.vertices[0].rhw = 1.0f; - first.vertices[0].diffuse = color; - first.vertices[0].u = 0.0f; - first.vertices[0].v = 0.0f; - first.vertices[1].x = right; - first.vertices[1].y = y; - first.vertices[1].z = 0.8f; - first.vertices[1].rhw = 1.0f; - first.vertices[1].diffuse = color; - first.vertices[1].u = 1.0f; - first.vertices[1].v = 0.0f; - first.vertices[2].x = x; - first.vertices[2].y = bottom; - first.vertices[2].z = 0.8f; - first.vertices[2].rhw = 1.0f; - first.vertices[2].diffuse = color; - first.vertices[2].u = 0.0f; - first.vertices[2].v = 1.0f; - first.texture = this->state.textures[this->render.curMotion]; - RenderTriangle& second = this->state.triangles[1]; - second.vertices[0].x = right; - second.vertices[0].y = y; - second.vertices[0].z = 0.8f; - second.vertices[0].rhw = 1.0f; - second.vertices[0].diffuse = color; - second.vertices[0].u = 1.0f; - second.vertices[0].v = 0.0f; - second.vertices[1].x = x; - second.vertices[1].y = bottom; - second.vertices[1].z = 0.8f; - second.vertices[1].rhw = 1.0f; - second.vertices[1].diffuse = color; - second.vertices[1].u = 0.0f; - second.vertices[1].v = 1.0f; - second.vertices[2].x = right; - second.vertices[2].y = bottom; - second.vertices[2].z = 0.8f; - second.vertices[2].rhw = 1.0f; - second.vertices[2].diffuse = color; - second.vertices[2].u = 1.0f; - second.vertices[2].v = 1.0f; - second.texture = this->state.textures[this->render.curMotion]; - g_renderer->queues.SubmitTriangle(first, static_cast(this->state.renderFlag), g_renderer->commands, g_renderer->fog.supported != 0, g_depthStart, g_depthEnd); - g_renderer->queues.SubmitTriangle(second, static_cast(this->state.renderFlag), g_renderer->commands, g_renderer->fog.supported != 0, g_depthStart, g_depthEnd); + this->state.triangles[0].vertices[0].x = x; + this->state.triangles[0].vertices[0].y = y; + this->state.triangles[0].vertices[0].z = 0.8f; + this->state.triangles[0].vertices[0].rhw = 1.0f; + this->state.triangles[0].vertices[0].diffuse = color; + this->state.triangles[0].vertices[0].u = 0.0f; + this->state.triangles[0].vertices[0].v = 0.0f; + this->state.triangles[0].vertices[1].x = right; + this->state.triangles[0].vertices[1].y = y; + this->state.triangles[0].vertices[1].z = 0.8f; + this->state.triangles[0].vertices[1].rhw = 1.0f; + this->state.triangles[0].vertices[1].diffuse = color; + this->state.triangles[0].vertices[1].u = 1.0f; + this->state.triangles[0].vertices[1].v = 0.0f; + this->state.triangles[0].vertices[2].x = x; + this->state.triangles[0].vertices[2].y = bottom; + this->state.triangles[0].vertices[2].z = 0.8f; + this->state.triangles[0].vertices[2].rhw = 1.0f; + this->state.triangles[0].vertices[2].diffuse = color; + this->state.triangles[0].vertices[2].u = 0.0f; + this->state.triangles[0].vertices[2].v = 1.0f; + this->state.triangles[0].texture = this->state.textures[this->render.curMotion]; + this->state.triangles[1].vertices[0].x = right; + this->state.triangles[1].vertices[0].y = y; + this->state.triangles[1].vertices[0].z = 0.8f; + this->state.triangles[1].vertices[0].rhw = 1.0f; + this->state.triangles[1].vertices[0].diffuse = color; + this->state.triangles[1].vertices[0].u = 1.0f; + this->state.triangles[1].vertices[0].v = 0.0f; + this->state.triangles[1].vertices[1].x = x; + this->state.triangles[1].vertices[1].y = bottom; + this->state.triangles[1].vertices[1].z = 0.8f; + this->state.triangles[1].vertices[1].rhw = 1.0f; + this->state.triangles[1].vertices[1].diffuse = color; + this->state.triangles[1].vertices[1].u = 0.0f; + this->state.triangles[1].vertices[1].v = 1.0f; + this->state.triangles[1].vertices[2].x = right; + this->state.triangles[1].vertices[2].y = bottom; + this->state.triangles[1].vertices[2].z = 0.8f; + this->state.triangles[1].vertices[2].rhw = 1.0f; + this->state.triangles[1].vertices[2].diffuse = color; + this->state.triangles[1].vertices[2].u = 1.0f; + this->state.triangles[1].vertices[2].v = 1.0f; + this->state.triangles[1].texture = this->state.textures[this->render.curMotion]; + g_renderer->queues.SubmitTriangle(this->state.triangles[0], static_cast(this->state.renderFlag), g_renderer->commands, g_renderer->fog.supported != 0, g_depthStart, g_depthEnd); + g_renderer->queues.SubmitTriangle(this->state.triangles[1], static_cast(this->state.renderFlag), g_renderer->commands, g_renderer->fog.supported != 0, g_depthStart, g_depthEnd); break; } case PP_3DCROSSTEXTURE: @@ -720,33 +717,32 @@ void CEffectPrim::Render(int argument) { const float firstSin = ClientSine(static_cast(this->state.longitude - this->state.arcAngle)); const float secondCos = ClientCosine(static_cast(this->state.longitude + this->state.arcAngle)); const float secondSin = ClientSine(static_cast(this->state.longitude + this->state.arcAngle)); - RenderTriangle& triangle = this->state.triangles[0]; const float x = this->render.position.x; - triangle.vertices[0].x = x; + this->state.triangles[0].vertices[0].x = x; const float y = this->render.position.y; - triangle.vertices[0].y = y; - triangle.vertices[0].z = 0.000001f; - triangle.vertices[0].rhw = 0.999999f; - triangle.vertices[0].diffuse = this->state.argb; - triangle.vertices[0].u = 0.5f; - triangle.vertices[0].v = 0.0f; + this->state.triangles[0].vertices[0].y = y; + this->state.triangles[0].vertices[0].z = 0.000001f; + this->state.triangles[0].vertices[0].rhw = 0.999999f; + this->state.triangles[0].vertices[0].diffuse = this->state.argb; + this->state.triangles[0].vertices[0].u = 0.5f; + this->state.triangles[0].vertices[0].v = 0.0f; const float radius = this->state.heightSize; - triangle.vertices[1].x = radius * firstCos + x; - triangle.vertices[1].y = y - radius * firstSin; - triangle.vertices[2].x = radius * secondCos + x; - triangle.vertices[2].y = y - radius * secondSin; - triangle.vertices[1].v = 1.0f; - triangle.vertices[1].u = 1.0f; - triangle.vertices[1].diffuse = this->state.argb; - triangle.vertices[1].rhw = 0.999999f; - triangle.vertices[1].z = 0.000001f; - triangle.vertices[2].z = 0.000001f; - triangle.vertices[2].rhw = 0.999999f; - triangle.vertices[2].diffuse = this->state.argb; - triangle.vertices[2].u = 0.0f; - triangle.vertices[2].v = 1.0f; - triangle.texture = this->state.textures[0]; - g_renderer->queues.SubmitTriangle(triangle, 1, g_renderer->commands, g_renderer->fog.supported != 0, g_depthStart, g_depthEnd); + this->state.triangles[0].vertices[1].x = radius * firstCos + x; + this->state.triangles[0].vertices[1].y = y - radius * firstSin; + this->state.triangles[0].vertices[2].x = radius * secondCos + x; + this->state.triangles[0].vertices[2].y = y - radius * secondSin; + this->state.triangles[0].vertices[1].v = 1.0f; + this->state.triangles[0].vertices[1].u = 1.0f; + this->state.triangles[0].vertices[1].diffuse = this->state.argb; + this->state.triangles[0].vertices[1].rhw = 0.999999f; + this->state.triangles[0].vertices[1].z = 0.000001f; + this->state.triangles[0].vertices[2].z = 0.000001f; + this->state.triangles[0].vertices[2].rhw = 0.999999f; + this->state.triangles[0].vertices[2].diffuse = this->state.argb; + this->state.triangles[0].vertices[2].u = 0.0f; + this->state.triangles[0].vertices[2].v = 1.0f; + this->state.triangles[0].texture = this->state.textures[0]; + g_renderer->queues.SubmitTriangle(this->state.triangles[0], 1, g_renderer->commands, g_renderer->fog.supported != 0, g_depthStart, g_depthEnd); break; } case PP_3DLINE: { @@ -756,30 +752,29 @@ void CEffectPrim::Render(int argument) { position[1] -= 10.0f; RenderVertex bottom{0, 0, 0, 0, 0, 0xFF000000u, 0, 0}; g_renderer->viewport.Project(position, wtm.values, bottom); - RenderTriangle& triangle = this->state.triangles[0]; - triangle.vertices[0].x = top.x; - triangle.vertices[2].x = bottom.x; - triangle.vertices[2].y = bottom.y; - triangle.vertices[2].z = bottom.z; - triangle.vertices[0].y = top.y; - triangle.vertices[0].z = top.z; - triangle.vertices[0].rhw = 0.999999f; - triangle.vertices[0].diffuse = 0x9CFFFFFFu; - triangle.vertices[0].u = 0.0f; - triangle.vertices[0].v = 0.0f; - triangle.vertices[1].x = top.x + 1.0f; - triangle.vertices[1].y = top.y; - triangle.vertices[1].z = top.z; - triangle.vertices[1].rhw = 0.999999f; - triangle.vertices[1].diffuse = 0x9BFFFFFFu; - triangle.vertices[1].u = 0.0f; - triangle.vertices[1].v = 0.0f; - triangle.vertices[2].rhw = 0.999999f; - triangle.vertices[2].diffuse = 0x9BFFFFFFu; - triangle.vertices[2].u = 0.0f; - triangle.vertices[2].v = 0.0f; - triangle.texture = nullptr; - g_renderer->queues.SubmitTriangle(triangle, 5, g_renderer->commands, g_renderer->fog.supported != 0, g_depthStart, g_depthEnd); + this->state.triangles[0].vertices[0].x = top.x; + this->state.triangles[0].vertices[2].x = bottom.x; + this->state.triangles[0].vertices[2].y = bottom.y; + this->state.triangles[0].vertices[2].z = bottom.z; + this->state.triangles[0].vertices[0].y = top.y; + this->state.triangles[0].vertices[0].z = top.z; + this->state.triangles[0].vertices[0].rhw = 0.999999f; + this->state.triangles[0].vertices[0].diffuse = 0x9CFFFFFFu; + this->state.triangles[0].vertices[0].u = 0.0f; + this->state.triangles[0].vertices[0].v = 0.0f; + this->state.triangles[0].vertices[1].x = top.x + 1.0f; + this->state.triangles[0].vertices[1].y = top.y; + this->state.triangles[0].vertices[1].z = top.z; + this->state.triangles[0].vertices[1].rhw = 0.999999f; + this->state.triangles[0].vertices[1].diffuse = 0x9BFFFFFFu; + this->state.triangles[0].vertices[1].u = 0.0f; + this->state.triangles[0].vertices[1].v = 0.0f; + this->state.triangles[0].vertices[2].rhw = 0.999999f; + this->state.triangles[0].vertices[2].diffuse = 0x9BFFFFFFu; + this->state.triangles[0].vertices[2].u = 0.0f; + this->state.triangles[0].vertices[2].v = 0.0f; + this->state.triangles[0].texture = nullptr; + g_renderer->queues.SubmitTriangle(this->state.triangles[0], 5, g_renderer->commands, g_renderer->fog.supported != 0, g_depthStart, g_depthEnd); break; } case 171: