small undo in rendering pipeline

This commit is contained in:
h4570
2020-12-13 00:23:04 +01:00
parent 0156d4444f
commit 4a1bca12aa
+12 -5
View File
@@ -71,12 +71,19 @@ void VifSender::uploadMicroProgram()
void VifSender::sendMatrices(const RenderData &t_renderData, const Vector3 &t_position, const Vector3 &t_rotation) void VifSender::sendMatrices(const RenderData &t_renderData, const Vector3 &t_position, const Vector3 &t_rotation)
{ {
Matrix viewProj = Matrix(); vec3ToNative(position, t_position, 1.0F);
viewProj.rotation(t_rotation); // model matrix vec3ToNative(rotation, t_rotation, 1.0F);
viewProj.translate(t_position); // model matrix MATRIX localWorld, localScreen;
viewProj *= *t_renderData.worldView * *t_renderData.perspective; // viewproj = model * (view * projection) create_local_world(localWorld, position, rotation);
create_local_screen(localScreen, localWorld, t_renderData.worldView->data, t_renderData.perspective->data);
// Small undo, because im testing new matrix funcs, which are DIFFERENT than PS2SDK, so cant be used right now.
// Matrix viewProj = Matrix();
// viewProj.rotation(t_rotation); // model matrix
// viewProj.translate(t_position); // model matrix
// viewProj *= *t_renderData.worldView * *t_renderData.perspective; // viewproj = model * (view * projection)
packet2_reset(matricesPacket, false); packet2_reset(matricesPacket, false);
packet2_utils_vu_add_unpack_data(matricesPacket, 0, &viewProj.data, 8, 0); // packet2_utils_vu_add_unpack_data(matricesPacket, 0, &viewProj.data, 8, 0);
packet2_utils_vu_add_unpack_data(matricesPacket, 0, localScreen, 8, 0);
packet2_utils_vu_add_end_tag(matricesPacket); packet2_utils_vu_add_end_tag(matricesPacket);
dma_channel_wait(DMA_CHANNEL_VIF1, 0); dma_channel_wait(DMA_CHANNEL_VIF1, 0);
dma_channel_send_packet2(matricesPacket, DMA_CHANNEL_VIF1, 1); dma_channel_send_packet2(matricesPacket, DMA_CHANNEL_VIF1, 1);