Estandaritzant noms segons convencions

This commit is contained in:
2024-10-10 20:27:31 +02:00
parent 9e5f41644e
commit d6c3c89872
67 changed files with 1457 additions and 1504 deletions

View File

@@ -1,9 +1,9 @@
#include "param.h"
#include <fstream> // for char_traits, basic_ostream, basic_ifstream, basi...
#include <iostream> // for cout
#include "utils.h" // for param_t, paramGame_t, zone_t, paramBalloon_t
#include <fstream> // for char_traits, basic_ostream, basic_ifstream, basi...
#include <iostream> // for cout
#include "utils.h" // for Param, ParamGame, Zone, ParamBalloon
param_t param;
Param param;
// Asigna variables a partir de dos cadenas
bool setParams(std::string var, std::string value);
@@ -17,41 +17,41 @@ void initParam()
// GAME
param.game.width = 320;
param.game.height = 256;
param.game.itemSize = 20;
param.game.gameArea.rect = {0, 0, param.game.width, param.game.height};
param.game.playArea.rect = {0, 0, param.game.width, 216};
param.game.item_size = 20;
param.game.game_area.rect = {0, 0, param.game.width, param.game.height};
param.game.play_area.rect = {0, 0, param.game.width, 216};
precalculateZones();
// SCOREBOARD
param.scoreboard = {0, 216, param.game.width, 40};
// FADE
param.fade.numSquaresWidth = param.game.width / 2;
param.fade.numSquaresHeight = param.game.height / 2;
param.fade.randomSquaresDelay = 1;
param.fade.randomSquaresMult = 500;
param.fade.postDuration = 80;
param.fade.venetianSize = 16;
param.fade.num_squares_width = param.game.width / 2;
param.fade.num_squares_height = param.game.height / 2;
param.fade.random_squares_delay = 1;
param.fade.random_squares_mult = 500;
param.fade.post_duration = 80;
param.fade.venetian_size = 16;
// TITLE
param.title.pressStartPosition = 160;
param.title.titleDuration = 800;
param.title.arcadeEditionPosition = 123;
param.title.titleCCPosition = 11;
param.title.press_start_position = 160;
param.title.title_duration = 800;
param.title.arcade_edition_position = 123;
param.title.title_c_c_position = 11;
// BACKGROUND
param.background.attenuateColor = {255, 255, 255};
param.background.attenuateAlpha = 32;
param.background.attenuate_color = {255, 255, 255};
param.background.attenuate_alpha = 32;
// BALLOONS
param.balloon1.vel = 2.60f;
param.balloon1.grav = 0.09f;
param.balloon2.vel = 3.50f;
param.balloon2.grav = 0.10f;
param.balloon3.vel = 4.50f;
param.balloon3.grav = 0.10f;
param.balloon4.vel = 4.95f;
param.balloon4.grav = 0.10f;
param.balloon_1.vel = 2.60f;
param.balloon_1.grav = 0.09f;
param.balloon_2.vel = 3.50f;
param.balloon_2.grav = 0.10f;
param.balloon_3.vel = 4.50f;
param.balloon_3.grav = 0.10f;
param.balloon_4.vel = 4.95f;
param.balloon_4.grav = 0.10f;
}
// Establece valores para los parametros a partir de un fichero de texto
@@ -168,60 +168,60 @@ bool setParams(std::string var, std::string value)
param.game.height = std::stoi(value);
}
else if (var == "game.itemSize")
else if (var == "game.item_size")
{
param.game.itemSize = std::stoi(value);
param.game.item_size = std::stoi(value);
}
else if (var == "game.playArea.rect.x")
else if (var == "game.play_area.rect.x")
{
param.game.playArea.rect.x = std::stoi(value);
param.game.play_area.rect.x = std::stoi(value);
}
else if (var == "game.playArea.rect.y")
else if (var == "game.play_area.rect.y")
{
param.game.playArea.rect.y = std::stoi(value);
param.game.play_area.rect.y = std::stoi(value);
}
else if (var == "game.playArea.rect.w")
else if (var == "game.play_area.rect.w")
{
param.game.playArea.rect.w = std::stoi(value);
param.game.play_area.rect.w = std::stoi(value);
}
else if (var == "game.playArea.rect.h")
else if (var == "game.play_area.rect.h")
{
param.game.playArea.rect.h = std::stoi(value);
param.game.play_area.rect.h = std::stoi(value);
}
// FADE
else if (var == "fade.numSquaresWidth")
else if (var == "fade.num_squares_width")
{
param.fade.numSquaresWidth = std::stoi(value);
param.fade.num_squares_width = std::stoi(value);
}
else if (var == "fade.numSquaresHeight")
else if (var == "fade.num_squares_height")
{
param.fade.numSquaresHeight = std::stoi(value);
param.fade.num_squares_height = std::stoi(value);
}
else if (var == "fade.randomSquaresDelay")
else if (var == "fade.random_squares_delay")
{
param.fade.randomSquaresDelay = std::stoi(value);
param.fade.random_squares_delay = std::stoi(value);
}
else if (var == "fade.randomSquaresMult")
else if (var == "fade.random_squares_mult")
{
param.fade.randomSquaresMult = std::stoi(value);
param.fade.random_squares_mult = std::stoi(value);
}
else if (var == "fade.postDuration")
else if (var == "fade.post_duration")
{
param.fade.postDuration = std::stoi(value);
param.fade.post_duration = std::stoi(value);
}
else if (var == "fade.venetianSize")
else if (var == "fade.venetian_size")
{
param.fade.venetianSize = std::stoi(value);
param.fade.venetian_size = std::stoi(value);
}
// SCOREBOARD
@@ -246,86 +246,86 @@ bool setParams(std::string var, std::string value)
}
// TITLE
else if (var == "title.pressStartPosition")
else if (var == "title.press_start_position")
{
param.title.pressStartPosition = std::stoi(value);
param.title.press_start_position = std::stoi(value);
}
else if (var == "title.titleDuration")
else if (var == "title.title_duration")
{
param.title.titleDuration = std::stoi(value);
param.title.title_duration = std::stoi(value);
}
else if (var == "title.arcadeEditionPosition")
else if (var == "title.arcade_edition_position")
{
param.title.arcadeEditionPosition = std::stoi(value);
param.title.arcade_edition_position = std::stoi(value);
}
else if (var == "title.titleCCPosition")
else if (var == "title.title_c_c_position")
{
param.title.titleCCPosition = std::stoi(value);
param.title.title_c_c_position = std::stoi(value);
}
// BACKGROUND
else if (var == "background.attenuateColor.r")
else if (var == "background.attenuate_color.r")
{
param.background.attenuateColor.r = std::stoi(value);
param.background.attenuate_color.r = std::stoi(value);
}
else if (var == "background.attenuateColor.g")
else if (var == "background.attenuate_color.g")
{
param.background.attenuateColor.g = std::stoi(value);
param.background.attenuate_color.g = std::stoi(value);
}
else if (var == "background.attenuateColor.b")
else if (var == "background.attenuate_color.b")
{
param.background.attenuateColor.b = std::stoi(value);
param.background.attenuate_color.b = std::stoi(value);
}
else if (var == "background.attenuateAlpha")
else if (var == "background.attenuate_alpha")
{
param.background.attenuateAlpha = std::stoi(value);
param.background.attenuate_alpha = std::stoi(value);
}
// BALLOON
else if (var == "balloon1.vel")
else if (var == "balloon_1.vel")
{
param.balloon1.vel = std::stof(value);
param.balloon_1.vel = std::stof(value);
}
else if (var == "balloon1.grav")
else if (var == "balloon_1.grav")
{
param.balloon1.grav = std::stof(value);
param.balloon_1.grav = std::stof(value);
}
else if (var == "balloon2.vel")
else if (var == "balloon_2.vel")
{
param.balloon2.vel = std::stof(value);
param.balloon_2.vel = std::stof(value);
}
else if (var == "balloon2.grav")
else if (var == "balloon_2.grav")
{
param.balloon2.grav = std::stof(value);
param.balloon_2.grav = std::stof(value);
}
else if (var == "balloon3.vel")
else if (var == "balloon_3.vel")
{
param.balloon3.vel = std::stof(value);
param.balloon_3.vel = std::stof(value);
}
else if (var == "balloon3.grav")
else if (var == "balloon_3.grav")
{
param.balloon3.grav = std::stof(value);
param.balloon_3.grav = std::stof(value);
}
else if (var == "balloon4.vel")
else if (var == "balloon_4.vel")
{
param.balloon4.vel = std::stof(value);
param.balloon_4.vel = std::stof(value);
}
else if (var == "balloon4.grav")
else if (var == "balloon_4.grav")
{
param.balloon4.grav = std::stof(value);
param.balloon_4.grav = std::stof(value);
}
// RESTO
@@ -341,19 +341,19 @@ bool setParams(std::string var, std::string value)
void precalculateZones()
{
// playArea
param.game.playArea.centerX = param.game.playArea.rect.w / 2;
param.game.playArea.firstQuarterX = param.game.playArea.rect.w / 4;
param.game.playArea.thirdQuarterX = param.game.playArea.rect.w / 4 * 3;
param.game.playArea.centerY = param.game.playArea.rect.h / 2;
param.game.playArea.firstQuarterY = param.game.playArea.rect.h / 4;
param.game.playArea.thirdQuarterY = param.game.playArea.rect.h / 4 * 3;
param.game.play_area.center_x = param.game.play_area.rect.w / 2;
param.game.play_area.first_quarter_x = param.game.play_area.rect.w / 4;
param.game.play_area.third_quarter_x = param.game.play_area.rect.w / 4 * 3;
param.game.play_area.center_y = param.game.play_area.rect.h / 2;
param.game.play_area.first_quarter_y = param.game.play_area.rect.h / 4;
param.game.play_area.third_quarter_y = param.game.play_area.rect.h / 4 * 3;
// gameArea
param.game.gameArea.rect = {0, 0, param.game.width, param.game.height};
param.game.gameArea.centerX = param.game.gameArea.rect.w / 2;
param.game.gameArea.firstQuarterX = param.game.gameArea.rect.w / 4;
param.game.gameArea.thirdQuarterX = param.game.gameArea.rect.w / 4 * 3;
param.game.gameArea.centerY = param.game.gameArea.rect.h / 2;
param.game.gameArea.firstQuarterY = param.game.gameArea.rect.h / 4;
param.game.gameArea.thirdQuarterY = param.game.gameArea.rect.h / 4 * 3;
param.game.game_area.rect = {0, 0, param.game.width, param.game.height};
param.game.game_area.center_x = param.game.game_area.rect.w / 2;
param.game.game_area.first_quarter_x = param.game.game_area.rect.w / 4;
param.game.game_area.third_quarter_x = param.game.game_area.rect.w / 4 * 3;
param.game.game_area.center_y = param.game.game_area.rect.h / 2;
param.game.game_area.first_quarter_y = param.game.game_area.rect.h / 4;
param.game.game_area.third_quarter_y = param.game.game_area.rect.h / 4 * 3;
}