RC 4.52.123 Input optimization, colors, see notes.

Asteroids Reimagined/EnemyControl.cpp

@@ -383,20 +383,50 @@ void EnemyControl::FixedUpdate()
 	if (Managers.EM.TimerElapsed(UFOSpawnTimerID)) SpawnUFO();
 }
 
+void EnemyControl::NextWave()
+{
+	Wave++;
+}
+
 void EnemyControl::NewGame()
 {
 	DeathStar->NewGame();
-	Reset();
 
 	for (const auto& rock : Rocks)
 	{
 		rock->Destroy();
 	}
 }
 
-void EnemyControl::NextWave()
+void EnemyControl::Reset()
 {
-	Wave++;
+	BossWave = false;
+	ClearForBossWave = false;
+	Wave = 0;
+	UFOSpawnCount = 0;
+	RockSpawnCount = StartRockCount;
+
+	Managers.EM.ResetTimer(UFOSpawnTimerID, 35.0f);
+	Managers.EM.ResetTimer(DeathStarSpawnTimerID);
+
+	UFOSpawnTimeAmount = 30.0f;
+	EnemyOneSpawnTimeAmount = 15.0f;
+	EnemyTwoSpawnTimeAmount = 20.0f;
+
+	for (const auto& enemy : EnemyOnes)
+	{
+		enemy->Reset();
+	}
+
+	for (const auto& enemy : EnemyTwos)
+	{
+		enemy->Reset();
+	}
+
+	for (const auto& ufo : UFOs)
+	{
+		ufo->Reset();
+	}
 }
 
 void EnemyControl::SpawnRocks(Vector3 position, int count, TheRock::RockSize size)
@@ -1010,35 +1040,4 @@ void EnemyControl::HaveHomingMineChaseEnemy()
 
 		mine->ChaseEnemy(closestEnemy);
 	}
-}
-
-void EnemyControl::Reset()
-{
-	BossWave = false;
-	ClearForBossWave = false;
-	Wave = 0;
-	UFOSpawnCount = 0;
-	RockSpawnCount = StartRockCount;
-
-	Managers.EM.ResetTimer(UFOSpawnTimerID, 35.0f);
-	Managers.EM.ResetTimer(DeathStarSpawnTimerID);
-
-	UFOSpawnTimeAmount = 30.0f;
-	EnemyOneSpawnTimeAmount = 15.0f;
-	EnemyTwoSpawnTimeAmount = 20.0f;
-
-	for (const auto& enemy : EnemyOnes)
-	{
-		enemy->Reset();
-	}
-
-	for (const auto& enemy : EnemyTwos)
-	{
-		enemy->Reset();
-	}
-
-	for (const auto& ufo : UFOs)
-	{
-		ufo->Reset();
-	}
-}
+}

Asteroids Reimagined/EnemyControl.h

@@ -78,8 +78,9 @@ class EnemyControl : public Common
 	void Update();
 	void FixedUpdate();
 
-	void NewGame();
 	void NextWave();
+	void NewGame();
+	void Reset();
 
 private:
 	bool NoMoreRocks = false;
@@ -145,6 +146,4 @@ class EnemyControl : public Common
 	void MakeReadyForBossWave();
 	void DoBossStuff();
 	void HaveHomingMineChaseEnemy();
-
-	void Reset();
 };

Asteroids Reimagined/Game.cpp

@@ -184,7 +184,7 @@ void Game::Draw2D()
 {
 
 }
-
+// For Game Input when game is paused or not.
 void Game::GameInput()
 {
 	Logic->GameInput();

Asteroids Reimagined/GameLogic.cpp

@@ -143,7 +143,7 @@ void GameLogic::FixedUpdate()
 		}
 	}
 }
-
+//For Game Input when game is paused or not.
 void GameLogic::GameInput()
 {
 	if (State == Pause)
@@ -209,6 +209,18 @@ void GameLogic::GameInput()
 		}
 #endif
 	}
+
+	if (IsKeyPressed(KEY_I))
+	{
+		if (Player->AltMouseMode)
+		{
+			Player->AltMouseMode = false;
+		}
+		else
+		{
+			Player->AltMouseMode = true;
+		}
+	}
 }
 
 void GameLogic::SpawnPowerUp(Vector3 position)
@@ -290,6 +302,7 @@ void GameLogic::AddPlayerShipModels(int number)
 void GameLogic::NewGame()
 {
 	Player->NewGame();
+	Enemies->Reset();
 	Enemies->NewGame();
 	HighScores->Reset();
 

Asteroids Reimagined/Main.cpp

@@ -32,7 +32,7 @@ int WinMain()
 	int windowHeight = 960; //height
 	int windowWidth = 1280; //width
 
-	InitWindow(windowWidth, windowHeight, "Asteroids Reimagined - RC 4.50.123");
+	InitWindow(windowWidth, windowHeight, "Asteroids Reimagined - RC 4.52.123");
 	InitAudioDevice();
 
 	Image icon = LoadImage("icon.png");
@@ -41,7 +41,7 @@ int WinMain()
 
 	if (IsWindowState(FLAG_VSYNC_HINT)) ClearWindowState(FLAG_VSYNC_HINT);
 	glfwSwapInterval(0);
-	SetTargetFPS(200);
+	SetTargetFPS(120);
 
 	static Utilities TheUtilities = {};
 
@@ -69,22 +69,23 @@ int WinMain()
 
 	while (!WindowShouldClose())
 	{
+		game.ProcessInput();
+
 		if (game.Logic->State != GameState::Pause)
 		{
+			Managers.EM.Input();
+
 			float deltaTime = GetFrameTime() * 0.5f;
+			float fixedDeltaTime = deltaTime * 2.0f;
 
 			Managers.EM.Update(deltaTime);
 			game.Update(deltaTime);
 			Managers.EM.Update(deltaTime);
 			game.Update(deltaTime);
-			Managers.EM.FixedUpdate(deltaTime * 2.0f);
-			game.FixedUpdate(deltaTime * 2.0f);
-
-			Managers.EM.Input();
+			Managers.EM.FixedUpdate(fixedDeltaTime);
+			game.FixedUpdate(fixedDeltaTime);
 		}
 
-		game.ProcessInput();
-
 		BeginDrawing();
 		ClearBackground({ 8, 2, 16, 100 });
 		BeginMode3D(TheCamera);