diff --git a/game/graphics/opengl_renderer/shaders/sprite_3d.vert b/game/graphics/opengl_renderer/shaders/sprite_3d.vert index ad332f866d..43bc177e02 100644 --- a/game/graphics/opengl_renderer/shaders/sprite_3d.vert +++ b/game/graphics/opengl_renderer/shaders/sprite_3d.vert @@ -89,81 +89,26 @@ void main() { // STEP 2 - // multiplications from the right column vec4 transformed_pos_vf02 = matrix_transform(camera, xyz_sx); vec4 scales_vf01 = xyz_sx; // now used for something else. - // lq.xyzw vf12, 1020(vi00) | mulaw.xyzw ACC, vf28, vf00 - // vf12 is fog consts vec4 fog_consts_vf12 = vec4(fog_min, fog_max, max_scale, bonus); - // ilw.y vi08, 1(vi02) | maddax.xyzw ACC, vf25, vf01 - // load offset selector for the next round. - // nop | madday.xyzw ACC, vf26, vf01 - // nop | maddz.xyzw vf02, vf27, vf01 - // move.w vf05, vf00 | addw.z vf01, vf00, vf05 - // scales_vf01.z = sy scales_vf01.z = sy; // start building the scale vector - // flags_vf05.w = 1.0; // what are we building in flags right now?? - // nop | nop - // div Q, vf31.x, vf02.w | muly.z vf05, vf05, vf31 float Q = pfog0 / transformed_pos_vf02.w; quat.z *= deg_to_rad; - // nop | mul.xyzw vf03, vf02, vf29 - // vec4 scaled_pos_vf03 = transformed_pos_vf02 * (hmge_scale); - // nop | nop - // nop | nop - // nop | mulz.z vf04, vf05, vf05 (ts) + scales_vf01.z *= Q; // sy + scales_vf01.w *= Q; // sx - // the load is for rotation stuff, - // lq.xyzw vf14, 1001(vi00) | clipw.xyz vf03, vf03 (used for fcand) - // iaddi vi06, vi00, 0x1 | adda.xyzw ACC, vf11, vf11 (used for fmand) - - // upcoming fcand with 0x3f, that checks all of them. - // bool fcand_result = clip_xyz_plus_minus(scaled_pos_vf03); - // bool fmand_result = color_vf11.w == 0; // (really w+w, but I don't think it matters?) - - // L8: - // xgkick double buffer setup - // ior vi05, vi15, vi00 | mul.zw vf01, vf01, Q - scales_vf01.zw *= Q; // sy - // scales_vf01.w *= Q; // sx - - // lq.xyzw vf06, 998(vi00) | mulz.xyzw vf15, vf05, vf04 (ts) - // auto adgif_vf06 = adgif_giftag; - - // lq.xyzw vf14, 1002(vi00) ts| mula.xyzw ACC, vf05, vf14 (ts) - - // fmand vi01, vi06 | mul.xyz vf02, vf02, Q transformed_pos_vf02.xyz *= Q; - // ibne vi00, vi01, L10 | addz.x vf01, vf00, vf01 scales_vf01.x = scales_vf01.z; // = sy - // if (fmand_result) { - // continue; // reject! - // } - // lqi.xyzw vf07, vi03 | mulz.xyzw vf16, vf15, vf04 (ts) - // vf07 is first use adgif - - // lq.xyzw vf14, 1003(vi00) | madda.xyzw ACC, vf15, vf14 (ts both) - - // lqi.xyzw vf08, vi03 | add.xyzw vf10, vf02, vf30 - // vf08 is second user adgif vec4 offset_pos_vf10 = transformed_pos_vf02 + hvdf_offset; - // lqi.xyzw vf09, vi03 | mulw.x vf01, vf01, vf01 - // vf09 is third user adgif scales_vf01.x *= scales_vf01.w; // x = sx * sy - // sqi.xyzw vf06, vi05 | mulz.xyzw vf15, vf16, vf04 (ts) - // FIRST ADGIF IS adgif_vf06 - // packet.adgif_giftag = adgif_vf06; - - // just do all 5 now. - // packet.user_adgif = m_adgif[sprite_idx]; - offset_pos_vf10.w = max(offset_pos_vf10.w, fog_max); scales_vf01.z = max(scales_vf01.z, min_scale); @@ -175,9 +120,6 @@ void main() { scales_vf01.z = min(scales_vf01.z, fog_consts_vf12.z); scales_vf01.w = min(scales_vf01.w, fog_consts_vf12.z); - // bool use_first_giftag = offset_selector == 0; - - // auto flag_vi07 = m_vec_data_2d[sprite_idx].flag; scales_vf01.x = min(scales_vf01.x, 1.0); @@ -185,26 +127,9 @@ void main() { fragment_color.w *= scales_vf01.x; // is this right? doesn't this stall?? - // ibne vi00, vi09, L6 | nop - // if (transformed_pos_vf02.w != 0) { - // use_first_giftag = false; - // } - - // flag_vi07 = 0; // todo hack - // vec4* xy_array = xyz_array + flag_vi07; - // math::Vector color_integer_vf11 = color_vf11.cast(); - - // packet.color = color_integer_vf11; - - // if (fcand_result) { - // continue; // reject (could move earlier) - // } - mat3 rot = sprite_quat_to_rot(quat.x, quat.y, quat.z); vec4 transformed = sprite_transform2(position, xyz_array[vert_id], camera, rot, sx, sy, hvdf_offset, pfog0, fog_min, fog_max); - // packet.sprite_giftag = use_first_giftag ? sprite_2d_giftag : sprite_2d_giftag2; - tex_coord = st_array[vert_id].xyz; // correct xy offset