RuiFPB/tyra-linux
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

uncommented code

Browse Source
This commit is contained in:
h4570
2022-08-18 23:55:23 +02:00
parent 3817eadc14
commit 1456a79135
4 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
demo/src/states/game/enemy/enemy.cpp
+5 -4
View File
@@ -50,7 +50,8 @@ Enemy::Enemy(Engine* engine, const EnemyInfo& t_info) {
mesh->translation.translateY(-5.0F); mesh->translation.translateY(-5.0F);
audio = &engine->audio; audio = &engine->audio;
audio->adpcm.setVolume(30, info.adpcmChannel); audio->adpcm.setVolume(5, info.adpcmChannel);
// audio->adpcm.setVolume(30, info.adpcmChannel); // TEMP
allocateOptions(); allocateOptions();
@@ -87,9 +88,9 @@ void Enemy::update(const Heightmap& heightmap, const Vec4& playerPosition,
} }
void Enemy::handlePlayerShoot(const PlayerShootAction& shootAction) { void Enemy::handlePlayerShoot(const PlayerShootAction& shootAction) {
// if (!shootAction.isShooting) { if (!shootAction.isShooting) {
// return; return;
// } }
const auto& ray = shootAction.ray.value(); const auto& ray = shootAction.ray.value();
demo/src/states/game/enemy/enemy_manager.cpp
+1 -1
View File
@@ -43,7 +43,7 @@ EnemyManager::EnemyManager(Engine* engine, const Heightmap& heightmap) {
auto* sample = engine->audio.adpcm.load( auto* sample = engine->audio.adpcm.load(
FileUtils::fromCwd("game/models/zombie/punch.adpcm")); FileUtils::fromCwd("game/models/zombie/punch.adpcm"));
const int enemyCount = 1; const int enemyCount = 5;
for (int i = 0; i < enemyCount; i++) { for (int i = 0; i < enemyCount; i++) {
EnemyInfo info; EnemyInfo info;
info.adpcmChannel = 9 + i; info.adpcmChannel = 9 + i;
demo/src/states/game/game_state.cpp
+5 -5
View File
@@ -86,12 +86,12 @@ void GameState::update() {
renderer.render(); renderer.render();
// Debug // Debug
auto& utility = engine->renderer.renderer3D.utility; // auto& utility = engine->renderer.renderer3D.utility;
utility.drawBox(*player->getCameraInfo().looksAt, 0.3F); // utility.drawBox(*player->getCameraInfo().looksAt, 0.3F);
auto* firstEnemy = enemyManager->getPairs().front()->mesh; // auto* firstEnemy = enemyManager->getPairs().front()->mesh;
utility.drawBBox(firstEnemy->getCurrentBoundingBox().getTransformed( // utility.drawBBox(firstEnemy->getCurrentBoundingBox().getTransformed(
firstEnemy->getModelMatrix())); // firstEnemy->getModelMatrix()));
// End frame // End frame
engine->renderer.endFrame(); engine->renderer.endFrame();
demo/src/states/game/player/player.cpp
+2 -2
View File
@@ -35,9 +35,9 @@ PlayerShootAction Player::getShootAction() const {
PlayerShootAction action; PlayerShootAction action;
action.isShooting = weapon.isShooting; action.isShooting = weapon.isShooting;
// if (action.isShooting) { if (action.isShooting) {
action.ray = Ray(camera.position, camera.lookAt.getNormalized()); action.ray = Ray(camera.position, camera.lookAt.getNormalized());
// } }
return action; return action;
} }