Borrado codigo en desuso (#254)

AdriAlvarez00 · web-flow · commit 5bbadefae7a3 · 2020-05-27T01:21:49.000+02:00
diff --git a/src/SourceFiles/ClientState.cpp b/src/SourceFiles/ClientState.cpp
@@ -78,7 +78,6 @@ void ClientState::render()
 	SpritePacket sprite;
 	while (!spritesToRender_.empty()) {
 		sprite = spritesToRender_.front();
-		//SDL_Game::instance()->getTexturesMngr()->getTexture(sprite.textureId)->render({sprite.posX,sprite.posY,sprite.width,sprite.height},sprite.rotationDegrees,sprite.frameNumberX,sprite.frameNumberY,sprite.flip);
 		SDL_Game::instance()->getTexturesMngr()->getTexture(sprite.textureId)->render({ sprite.posX, sprite.posY, sprite.width, sprite.height }, (double)sprite.rotationDegrees, (us)sprite.frameNumberX, (us)sprite.frameNumberY, (SDL_RendererFlip)sprite.flip);
 		spritesToRender_.pop();
 	}
diff --git a/src/SourceFiles/Entity.cpp b/src/SourceFiles/Entity.cpp
@@ -5,7 +5,6 @@ Entity::Entity(EntityManager* mngr) :
 }
 
 Entity::~Entity() {
-	//cout << "Entity destroyed" << endl;
 }
 
 void Entity::update()
diff --git a/src/SourceFiles/FireBallGenerator.cpp b/src/SourceFiles/FireBallGenerator.cpp
@@ -12,8 +12,7 @@ void FireBallGenerator::init() {
 	particleEmitter_ = GETCMP1_(ParticleEmitter);
 	boilerViewer_ = entity_->getComponent<AnimatedViewer>(ComponentType::Viewer);
 	pos_ = col_->getPos();
-	radius = sqrt(pow(col_->getH(0), 2) + pow(col_->getW(0), 2))/*+0.5*/; //JAJA he hecho una hipotenusa despues del instiuto
-	//cout << "radius " << radius << endl;
+	radius = sqrt(pow(col_->getH(0), 2) + pow(col_->getW(0), 2)); //JAJA he hecho una hipotenusa despues del instiuto
 
 	//initialize constants
 	minCd_ = CONST(int, "FBGEN_MIN_COOLDOWN");
diff --git a/src/SourceFiles/GameState.cpp b/src/SourceFiles/GameState.cpp
@@ -39,10 +39,6 @@ void GameState::DebugInput() {
 	InputHandler* ih = SDL_Game::instance()->getInputHandler();
 	for (int i = 0; i < ih->getNumControllers(); i++)
 	{
-		/*cout << "----------------" << endl;
-		cout << "Mando " << i << endl;
-		cout << "----------------" << endl;*/
-
 		if (ih->isButtonJustDown(i, SDL_CONTROLLER_BUTTON_A)) {
 			cout << "just pressed A" << endl;
 		}
@@ -63,7 +59,7 @@ void GameState::DebugInput() {
 		}
 		b2Vec2 vI = ih->getStickDir(i, InputHandler::GAMEPADSTICK::LEFTSTICK);
 		b2Vec2 vD = ih->getStickDir(i, InputHandler::GAMEPADSTICK::RIGHTSTICK);
-		/*
+
 		if (vI.Length() != 0 || vD.Length() != 0) {
 			cout << "STICKS" << "--------" << endl;
 			b2Vec2 vI = ih->getStickDir(i, InputHandler::LEFTSTICK);
@@ -72,7 +68,7 @@ void GameState::DebugInput() {
 			cout << "Der: " << vD.x << " " << vD.y << endl;
 			cout << endl;
 		}
-		*/
+
 		double tD = ih->getTrigger(i, InputHandler::GAMEPADTRIGGER::RIGHTTRIGGER);
 		double tI = ih->getTrigger(i, InputHandler::GAMEPADTRIGGER::LEFTTRIGGER);
 		if (tD != 0 || tI != 0) {
diff --git a/src/SourceFiles/InputHandler.cpp b/src/SourceFiles/InputHandler.cpp
@@ -84,11 +84,6 @@ void InputHandler::clearJoysticks()
 		for (auto& ctrl : m_gameControllers) {
 			SDL_GameControllerClose(ctrl);
 		}
-		//for (unsigned int i = 0; i < SDL_NumJoysticks();
-		//	i++)
-		//{
-		//	SDL_GameControllerClose(m_gameControllers[i]);
-		//}
 	}
 }
 
@@ -258,10 +253,6 @@ void InputHandler::onJoyAxisChange(SDL_Event& event) {
 		{
 			*m_triggerValues[whichOne].first = abs(event.jaxis.value);
 		}
-		//else if (event.jaxis.value < -m_joystickDeadZone)
-		//{
-		//	m_joystickValues[whichOne].first->setY(-1);
-		//}
 		else
 		{
 			*m_triggerValues[whichOne].first = 0;
@@ -305,10 +296,6 @@ void InputHandler::onJoyAxisChange(SDL_Event& event) {
 		{
 			*m_triggerValues[whichOne].second = abs(event.jaxis.value);
 		}
-		//else if (event.jaxis.value < -m_joystickDeadZone)
-		//{
-		//	m_joystickValues[whichOne].first->setY(-1);
-		//}
 		else
 		{
 			*m_triggerValues[whichOne].second = 0;
@@ -356,14 +343,9 @@ bool InputHandler::mapJoystick(SDL_GameController* ctrl, json mapData) {
 	SDL_Joystick* joy = SDL_GameControllerGetJoystick(ctrl);
 	SDL_JoystickGetGUIDString(SDL_JoystickGetGUID(joy), guid, bits);
 
-	cout << "looking for " << guid << " mapString" << endl;
 	if (!(mapData[guid]).is_null()) {
-		cout << "found " << guid << " mapString" << endl;
 		string mapString = mapData[guid];
-		cout << SDL_GameControllerMappingForGUID(SDL_JoystickGetGUID(joy)) << endl;
 		int res = SDL_GameControllerAddMapping(mapString.c_str());
-		cout << "-----------------------------" << endl;
-		cout << SDL_GameControllerMappingForGUID(SDL_JoystickGetGUID(joy)) << endl;
 
 		return res == 1;
 	}
@@ -380,7 +362,6 @@ inline void InputHandler::onControllerAddedEvent(const SDL_Event& event)
 		int idOnExit = m_gameControllers.size();//su id fisica sera el lugar en el que lo inicialice SDL
 		int gameId; //Su id del juego sera el id que lea de la id fisica
 		if (disconnectedGameControllers_.empty()) {
-			//cout << "Nueva conexion de mando " << m_gameControllers.size() << endl;
 			initialiseNewController(event.cdevice.which);
 
 			//si es un mando nuevo, se corresponden
@@ -389,7 +370,6 @@ inline void InputHandler::onControllerAddedEvent(const SDL_Event& event)
 		else {
 			debugFlag_ReconectedController = true;
 			int id = disconnectedGameControllers_.front();
-			//cout << "Reconectado mando " << id << " en sistema" << m_gameControllers.size() << endl;
 			initialiseNewController(event.cdevice.which);
 			disconnectedGameControllers_.pop();
 
@@ -400,8 +380,6 @@ inline void InputHandler::onControllerAddedEvent(const SDL_Event& event)
 		systemToGameCtrlId.emplace(idOnExit, gameId);
 		gameToSystemCtrlId[gameId] = idOnExit;
 	}
-	else
-		cout << "No puede haber mas de 4 jugadores, desconecta un mando si quieres conectar este" << endl;
 }
 
 inline void InputHandler::onControllerRemovedEvent(const SDL_Event& event)
@@ -413,7 +391,10 @@ inline void InputHandler::onControllerRemovedEvent(const SDL_Event& event)
 		disconnectedGameControllers_.push(it->second);
 		systemToGameCtrlId.erase(it);
 	}
-	else throw "Se ha desconectado un mando no inicializado";
+	else {
+		//se ha desconectado un mando no inicializado
+		//eso es malo.
+	}
 }
 
 inline void InputHandler::initialiseNewController(int idOnEnter)
diff --git a/src/SourceFiles/MenuState.cpp b/src/SourceFiles/MenuState.cpp
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////
+/////////////// IN MEMORIAM ////////////////////
+//Cuando todo era más simple y no había online//
+///////////////////////////////////////////////
+
+
 /*#include "MenuState.h"
 #include "InputHandler.h"
 #include "SDL_Game.h"
diff --git a/src/SourceFiles/MidGameState.cpp b/src/SourceFiles/MidGameState.cpp
@@ -135,7 +135,6 @@ void MidGameState::update()
 		if (playerRockets_[roundWinner_]->getPosUIElement().x > rocketXPositionObjective_) {
 			currentState = waitingButton;
 			continueText->setActive(true);
-			//frameZoomStateEnds_ = currentFrame + zoomStateDuration_;
 		}
 		break;
 
diff --git a/src/SourceFiles/OptionsMenuState.cpp b/src/SourceFiles/OptionsMenuState.cpp
@@ -38,7 +38,6 @@ void OptionsMenuState::init()
 
 	OptionsText->addComponent<UIViewer>(Resources::OptionsText, b2Vec2((CONST(int, "WINDOW_WIDTH") / 2) - 340, (CONST(int, "WINDOW_HEIGHT") / 2) - 310), 2.5, 0);
 
-	//btns_.push_back(resumeText->addComponent<UIViewer>(Resources::ResumeText, b2Vec2((CONST(int, "WINDOW_WIDTH") / 2) - 260, (CONST(int, "WINDOW_HEIGHT") / 2) + offsetBetweenButtons_ * -1), 1.5, 0));
 	btns_.push_back(musicText->addComponent<UIViewer>(Resources::MusicText, b2Vec2((CONST(int, "WINDOW_WIDTH") / 2 - SDL_Game::instance()->getTexturesMngr()->getTexture(Resources::MusicText)->getFrameWidth() * 1.5),
 		(CONST(int, "WINDOW_HEIGHT") / 2) + offsetBetweenButtons_ * 0), 1.5, 0));
 	btns_.push_back(effectsText->addComponent<UIViewer>(Resources::EffectsText, b2Vec2((CONST(int, "WINDOW_WIDTH") / 2 - SDL_Game::instance()->getTexturesMngr()->getTexture(Resources::EffectsText)->getFrameWidth() * 1.5),
diff --git a/src/SourceFiles/PCE_Project.cpp b/src/SourceFiles/PCE_Project.cpp
@@ -17,25 +17,11 @@ int main(int argc, char* argv[]) {
 	//Colocar antes del constructor de SDL_Game
 	_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
 
-	/*if (SDLNet_Init() < 0) {
-		throw;
-	}
-
-	IPaddress ip;
-	if (SDLNet_ResolveHost(&ip, nullptr, 2000) < 0) {
-		throw;
-	}
-	TCPsocket masterSocket = SDLNet_TCP_Open(&ip);
-
-	if (!masterSocket) {
-		throw;
-	}*/
-
-	cout << sizeof(SpritePacket) << endl;
 
 	SDL_Game::instance()->start();
 
 	//descomentar para depurar
+	//cuando todo era simple
 	//while (true) {};
 	return 0;
 }
diff --git a/src/SourceFiles/PlayerController.cpp b/src/SourceFiles/PlayerController.cpp
@@ -103,10 +103,6 @@ void PlayerController::handleInput()
 		impulseForce_ = 0;
 		if (kBinder_ != nullptr) kBinder_->grabbed = false;
 		impulseCooldownTimer_ = 0;
-
-		//HAY QUE BORRAR-----------------------------------------------------------
-		//viewer_->startAnimation(0, 0, -1, 1);
-		//HAY QUE BORRAR-----------------------------------------------------------
 	}
 
 	if (ib->releaseGrab()) {
diff --git a/src/SourceFiles/PlayerFactory.cpp b/src/SourceFiles/PlayerFactory.cpp
@@ -15,12 +15,6 @@ Entity* PlayerFactory::createBasePlayer(EntityManager* eMan, b2World* physicsWor
 	p->addComponent<Transform>(SDL_Rect{ 0,0, CONST(int, "PLAYER_W_SPRITE"), CONST(int, "PLAYER_H_SPRITE") }, collP);
 	p->addComponent<AnimatedPlayer>(Resources::PlayerAnimSheet, CONST(int, "PLAYER_TIME_PER_FRAME"), skin);
 
-	//if (playerID == 0) { esto se activa despu�s del countdown
-	//p->addComponent<Hands>(Resources::Hands);
-	//p->addComponent<AttachesToObjects>();
-	//p->addComponent<PlayerController>();
-	//p->addComponent<ImpulseViewer>(Resources::ImpulseArrow, Resources::ImpulseBackground);
-	//p->addComponent<ColliderViewer>();
 	return p;
 }
 
diff --git a/src/SourceFiles/RouterLogic.cpp b/src/SourceFiles/RouterLogic.cpp
@@ -32,7 +32,6 @@ void RouterLogic::update()
 	for (int k = 0; k < numJug; k++) {
 		// puntos a�adidos = 1 / (numJugadores * (distancia + 1) para no dividir entre 0)
 		double points = CONST(int, "POINTS_WHEN_INSIDE_ROUTER") / (numJug * ((playersInsideRange_[k].posPlayer->getPos() - posRouter_->getPos()).Length() + 1));
-		//std::cout << "Player " << playersInsideRange_[k].id << " won " << points << " points	   (at RouterLogic.cpp, method update(), line 32)" << endl;
 		wifightGameMode_->addPoints(playersInsideRange_[k].id, min(points, CONST(double, "MAX_POINTS_PER_TICK")));
 
 		if (actFrame_ >= frameWhenUpdate_) {
diff --git a/src/SourceFiles/TutorialGameMode.cpp b/src/SourceFiles/TutorialGameMode.cpp
@@ -166,8 +166,7 @@ bool TutorialGameMode::onPlayerDead(int id) { //Returns false when player runs o
 		playerStocks_[id]--;
 		if (playerStocks_[id] <= 0) {
 			roundResults_.push_back(players_[id]);
-			/*if (roundResults_.size() == playerStocks_.size() - 1) {
-			}*/
+
 			return false;
 		}
 		else return true;
diff --git a/src/SourceFiles/WiFightGameMode.cpp b/src/SourceFiles/WiFightGameMode.cpp
@@ -45,7 +45,6 @@ void WiFightGameMode::addPoints(int player, double sumPoints)
 {
 	if (!roundFinished_) {
 		playerProgress_[player] += sumPoints;
-		//cout << "Player " << player << " progress: " << playerProgress_[player] << endl;
 		if (playerProgress_[player] >= pointsToWin_) {
 			cout << "Player " << player << " won!" << endl;
 			winnerId_ = player;

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,6 @@ void ClientState::render()`
`78`	`78`	`SpritePacket sprite;`
`79`	`79`	`while (!spritesToRender_.empty()) {`
`80`	`80`	`sprite = spritesToRender_.front();`
`81`		`- //SDL_Game::instance()->getTexturesMngr()->getTexture(sprite.textureId)->render({sprite.posX,sprite.posY,sprite.width,sprite.height},sprite.rotationDegrees,sprite.frameNumberX,sprite.frameNumberY,sprite.flip);`
`82`	`81`	`SDL_Game::instance()->getTexturesMngr()->getTexture(sprite.textureId)->render({ sprite.posX, sprite.posY, sprite.width, sprite.height }, (double)sprite.rotationDegrees, (us)sprite.frameNumberX, (us)sprite.frameNumberY, (SDL_RendererFlip)sprite.flip);`
`83`	`82`	`spritesToRender_.pop();`
`84`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@ Entity::Entity(EntityManager* mngr) :`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`Entity::~Entity() {`
`8`		`- //cout << "Entity destroyed" << endl;`
`9`	`8`	`}`
`10`	`9`
`11`	`10`	`void Entity::update()`
Original file line number	Diff line number	Diff line change
`@@ -84,11 +84,6 @@ void InputHandler::clearJoysticks()`
`84`	`84`	`for (auto& ctrl : m_gameControllers) {`
`85`	`85`	`SDL_GameControllerClose(ctrl);`
`86`	`86`	`}`
`87`		`- //for (unsigned int i = 0; i < SDL_NumJoysticks();`
`88`		`- // i++)`
`89`		`- //{`
`90`		`- // SDL_GameControllerClose(m_gameControllers[i]);`
`91`		`- //}`
`92`	`87`	`}`
`93`	`88`	`}`
`94`	`89`
`@@ -258,10 +253,6 @@ void InputHandler::onJoyAxisChange(SDL_Event& event) {`
`258`	`253`	`{`
`259`	`254`	`*m_triggerValues[whichOne].first = abs(event.jaxis.value);`
`260`	`255`	`}`
`261`		`- //else if (event.jaxis.value < -m_joystickDeadZone)`
`262`		`- //{`
`263`		`- // m_joystickValues[whichOne].first->setY(-1);`
`264`		`- //}`
`265`	`256`	`else`
`266`	`257`	`{`
`267`	`258`	`*m_triggerValues[whichOne].first = 0;`
`@@ -305,10 +296,6 @@ void InputHandler::onJoyAxisChange(SDL_Event& event) {`
`305`	`296`	`{`
`306`	`297`	`*m_triggerValues[whichOne].second = abs(event.jaxis.value);`
`307`	`298`	`}`
`308`		`- //else if (event.jaxis.value < -m_joystickDeadZone)`
`309`		`- //{`
`310`		`- // m_joystickValues[whichOne].first->setY(-1);`
`311`		`- //}`
`312`	`299`	`else`
`313`	`300`	`{`
`314`	`301`	`*m_triggerValues[whichOne].second = 0;`
`@@ -356,14 +343,9 @@ bool InputHandler::mapJoystick(SDL_GameController* ctrl, json mapData) {`
`356`	`343`	`SDL_Joystick* joy = SDL_GameControllerGetJoystick(ctrl);`
`357`	`344`	`SDL_JoystickGetGUIDString(SDL_JoystickGetGUID(joy), guid, bits);`
`358`	`345`
`359`		`- cout << "looking for " << guid << " mapString" << endl;`
`360`	`346`	`if (!(mapData[guid]).is_null()) {`
`361`		`- cout << "found " << guid << " mapString" << endl;`
`362`	`347`	`string mapString = mapData[guid];`
`363`		`- cout << SDL_GameControllerMappingForGUID(SDL_JoystickGetGUID(joy)) << endl;`
`364`	`348`	`int res = SDL_GameControllerAddMapping(mapString.c_str());`
`365`		`- cout << "-----------------------------" << endl;`
`366`		`- cout << SDL_GameControllerMappingForGUID(SDL_JoystickGetGUID(joy)) << endl;`
`367`	`349`
`368`	`350`	`return res == 1;`
`369`	`351`	`}`
`@@ -380,7 +362,6 @@ inline void InputHandler::onControllerAddedEvent(const SDL_Event& event)`
`380`	`362`	`int idOnExit = m_gameControllers.size();//su id fisica sera el lugar en el que lo inicialice SDL`
`381`	`363`	`int gameId; //Su id del juego sera el id que lea de la id fisica`
`382`	`364`	`if (disconnectedGameControllers_.empty()) {`
`383`		`- //cout << "Nueva conexion de mando " << m_gameControllers.size() << endl;`
`384`	`365`	`initialiseNewController(event.cdevice.which);`
`385`	`366`
`386`	`367`	`//si es un mando nuevo, se corresponden`
`@@ -389,7 +370,6 @@ inline void InputHandler::onControllerAddedEvent(const SDL_Event& event)`
`389`	`370`	`else {`
`390`	`371`	`debugFlag_ReconectedController = true;`
`391`	`372`	`int id = disconnectedGameControllers_.front();`
`392`		`- //cout << "Reconectado mando " << id << " en sistema" << m_gameControllers.size() << endl;`
`393`	`373`	`initialiseNewController(event.cdevice.which);`
`394`	`374`	`disconnectedGameControllers_.pop();`
`395`	`375`
`@@ -400,8 +380,6 @@ inline void InputHandler::onControllerAddedEvent(const SDL_Event& event)`
`400`	`380`	`systemToGameCtrlId.emplace(idOnExit, gameId);`
`401`	`381`	`gameToSystemCtrlId[gameId] = idOnExit;`
`402`	`382`	`}`
`403`		`- else`
`404`		`- cout << "No puede haber mas de 4 jugadores, desconecta un mando si quieres conectar este" << endl;`
`405`	`383`	`}`
`406`	`384`
`407`	`385`	`inline void InputHandler::onControllerRemovedEvent(const SDL_Event& event)`
`@@ -413,7 +391,10 @@ inline void InputHandler::onControllerRemovedEvent(const SDL_Event& event)`
`413`	`391`	`disconnectedGameControllers_.push(it->second);`
`414`	`392`	`systemToGameCtrlId.erase(it);`
`415`	`393`	`}`
`416`		`- else throw "Se ha desconectado un mando no inicializado";`
	`394`	`+ else {`
	`395`	`+ //se ha desconectado un mando no inicializado`
	`396`	`+ //eso es malo.`
	`397`	`+ }`
`417`	`398`	`}`
`418`	`399`
`419`	`400`	`inline void InputHandler::initialiseNewController(int idOnEnter)`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,6 @@ void MidGameState::update()`
`135`	`135`	`if (playerRockets_[roundWinner_]->getPosUIElement().x > rocketXPositionObjective_) {`
`136`	`136`	`currentState = waitingButton;`
`137`	`137`	`continueText->setActive(true);`
`138`		`- //frameZoomStateEnds_ = currentFrame + zoomStateDuration_;`
`139`	`138`	`}`
`140`	`139`	`break;`
`141`	`140`