From a464fac9dc61116718a36f4535719775c05f1d54 Mon Sep 17 00:00:00 2001 From: h4570 Date: Wed, 17 Aug 2022 13:37:54 +0200 Subject: [PATCH] add hotfix --- demo/src/states/game/game_state.cpp | 14 +++++++------- engine/src/renderer/3d/renderer_3d_utility.cpp | 14 ++++++++++++-- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/demo/src/states/game/game_state.cpp b/demo/src/states/game/game_state.cpp index d7a7a54..7d29555 100644 --- a/demo/src/states/game/game_state.cpp +++ b/demo/src/states/game/game_state.cpp @@ -78,6 +78,13 @@ void GameState::update() { auto shootAction = player->getShootAction(); enemyManager->update(terrain->heightmap, player->getPosition(), shootAction); + // Render other stuff + renderer.add(ship->pair); + renderer.add(player->pair); + renderer.add(enemyManager->getPairs()); + renderer.add(terrain->pair); + renderer.render(); + // Debug auto& utility = engine->renderer.renderer3D.utility; utility.drawBox(*player->getCameraInfo().looksAt, 0.3F); @@ -86,13 +93,6 @@ void GameState::update() { utility.drawBBox(firstEnemy->getCurrentBoundingBox().getTransformed( firstEnemy->getModelMatrix())); - // Render other stuff - renderer.add(ship->pair); - renderer.add(player->pair); - renderer.add(enemyManager->getPairs()); - renderer.add(terrain->pair); - renderer.render(); - // End frame engine->renderer.endFrame(); } diff --git a/engine/src/renderer/3d/renderer_3d_utility.cpp b/engine/src/renderer/3d/renderer_3d_utility.cpp index 2da199a..f14389f 100644 --- a/engine/src/renderer/3d/renderer_3d_utility.cpp +++ b/engine/src/renderer/3d/renderer_3d_utility.cpp @@ -274,6 +274,8 @@ Vec4 Renderer3DUtility::convertVertices(const Vec4& v, const Vec4& scale) { return output; } +int counter = 0; // TODO: Remove + bool Renderer3DUtility::calcLineVertices(xyz_t* outputArray, const Vec4& a, const Vec4& b, const u8& displayOffset) { @@ -293,12 +295,20 @@ bool Renderer3DUtility::calcLineVertices(xyz_t* outputArray, const Vec4& a, } // To screen space - const Vec4 scale(2048.0F + displayOffset, 2048.0F + displayOffset, - static_cast(0xFFFFFF) / 32.0F, 1.0F); + Vec4 scale(2048.0F + displayOffset, 2048.0F + displayOffset, + static_cast(0xFFFFFF) / 32.0F, 1.0F); auto converted1 = convertVertices(clippedVerts[0].position, scale); auto converted2 = convertVertices(clippedVerts[1].position, scale); + // TODO1: Czemu jak to usune to nie dziala? + // TODO2: Z index tutaj i w 2D! + if (counter++ > 50) { + counter = 0; + converted1.print("Test1"); + converted2.print("Test2"); + } + outputArray[0].x = static_cast(ftoi4(converted1.x)); outputArray[0].y = static_cast(ftoi4(converted1.y)); outputArray[0].z = static_cast(ftoi4(converted1.z));