add hotfix

This commit is contained in:
h4570
2022-08-17 13:37:54 +02:00
parent 36098c9b62
commit a464fac9dc
2 changed files with 19 additions and 9 deletions
+7 -7
View File
@@ -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();
}
+12 -2
View File
@@ -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<float>(0xFFFFFF) / 32.0F, 1.0F);
Vec4 scale(2048.0F + displayOffset, 2048.0F + displayOffset,
static_cast<float>(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<u16>(ftoi4(converted1.x));
outputArray[0].y = static_cast<u16>(ftoi4(converted1.y));
outputArray[0].z = static_cast<u32>(ftoi4(converted1.z));