Merge branch 'main' into bug_fix_branch

.idea/workspace.xml

@@ -7,7 +7,6 @@
     <option name="/Default/RiderDebugger/RiderRestoreDecompile/RestoreDecompileSetting/@EntryValue" value="false" type="bool" />
     <option name="/Default/Housekeeping/GlobalSettingsUpgraded/IsUpgraded/@EntryValue" value="true" type="bool" />
     <option name="/Default/Housekeeping/FeatureSuggestion/FeatureSuggestionManager/DisabledSuggesters/=SwitchToGoToActionSuggester/@EntryIndexedValue" value="true" type="bool" />
-    <option name="/Default/Housekeeping/FeatureSuggestion/FeatureSuggestionManager/DisabledSuggesters/=SwitchToGoToActionSuggester/@EntryIndexRemoved" />
   </component>
   <component name="CMakePresetLoader">{
   &quot;useNewFormat&quot;: true
@@ -32,10 +31,8 @@
   <component name="ChangeListManager">
     <list default="true" id="db070755-9708-4a46-a9cb-e7c4dc1bfb77" name="Changes" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Highscores.txt" beforeDir="false" afterPath="$PROJECT_DIR$/Highscores.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/gamecube.h" beforeDir="false" afterPath="$PROJECT_DIR$/gamecube.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ScoreManager.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/ScoreManager.cpp" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/main.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/main.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/userinterface.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/userinterface.cpp" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -76,27 +73,27 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
+  <component name="PropertiesComponent">{
-  "keyToString": {
+  &quot;keyToString&quot;: {
-    "CMake Application.Prog3B.executor": "Run",
+    &quot;CMake Application.Prog3B.executor&quot;: &quot;Run&quot;,
-    "RunOnceActivity.RadMigrateCodeStyle": "true",
+    &quot;RunOnceActivity.RadMigrateCodeStyle&quot;: &quot;true&quot;,
-    "RunOnceActivity.ShowReadmeOnStart": "true",
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    "RunOnceActivity.cidr.known.project.marker": "true",
+    &quot;RunOnceActivity.cidr.known.project.marker&quot;: &quot;true&quot;,
-    "RunOnceActivity.git.unshallow": "true",
+    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
-    "RunOnceActivity.readMode.enableVisualFormatting": "true",
+    &quot;RunOnceActivity.readMode.enableVisualFormatting&quot;: &quot;true&quot;,
-    "RunOnceActivity.west.config.association.type.startup.service": "true",
+    &quot;RunOnceActivity.west.config.association.type.startup.service&quot;: &quot;true&quot;,
-    "cf.first.check.clang-format": "false",
+    &quot;cf.first.check.clang-format&quot;: &quot;false&quot;,
-    "cidr.known.project.marker": "true",
+    &quot;cidr.known.project.marker&quot;: &quot;true&quot;,
-    "git-widget-placeholder": "Zeit__zaeler",
+    &quot;git-widget-placeholder&quot;: &quot;bug__fix__branch&quot;,
-    "last_opened_file_path": "C:/Desktop/StudiumME/3.Sem/Prog3/B/MatrixPybind",
+    &quot;last_opened_file_path&quot;: &quot;C:/Desktop/StudiumME/3.Sem/Prog3/B/MatrixPybind&quot;,
-    "node.js.detected.package.eslint": "true",
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    "node.js.detected.package.tslint": "true",
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    "node.js.selected.package.eslint": "(autodetect)",
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    "node.js.selected.package.tslint": "(autodetect)",
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    "nodejs_package_manager_path": "npm",
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    "vue.rearranger.settings.migration": "true"
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
-}]]></component>
+}</component>
   <component name="RunManager" selected="CMake Application.Prog3B">
     <configuration name="Prog3B" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" EMULATE_TERMINAL="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="Prog3B" TARGET_NAME="Prog3B" CONFIG_NAME="Debug" RUN_TARGET_PROJECT_NAME="Prog3B" RUN_TARGET_NAME="Prog3B">
       <method v="2">
@@ -127,6 +124,7 @@
       <workItem from="1763895078693" duration="5675000" />
       <workItem from="1764526482502" duration="8000" />
       <workItem from="1764526493477" duration="4519000" />
+      <workItem from="1765791349412" duration="635000" />
     </task>
     <servers />
   </component>

Highscores.txt

@@ -1 +1,2 @@
-11.34
+score 99
+time 99999.99

ScoreManager.cpp

@@ -1,27 +1,35 @@
 #include "ScoreManager.h"
 #include <fstream>
 #include <iostream>
-#include <limits>
 
-ScoreManager::ScoreManager(const std::string& filename) : highscoreFile(filename)
+ScoreManager::ScoreManager(const std::string& filename) : highscoreFile(filename) {
-{
-  std::cout << "test";
   loadHighscore();
 }
 
 void ScoreManager::loadHighscore() {
   std::ifstream file(highscoreFile);
-  if (file.is_open()) {
+
-    int value;
+  if (!file.is_open()) {
-    if (file >> value) {
+    std::cout << "No highscore file found, creating new file.\n";
-      if (value > 0) highScore = value;
+    highScore = 9999;
-    }
+    bestTime = 99999.99;
-    file.close();
+    return;
-  } else {
+  }
-    ;
+
-    }
+  std::string key;
+  while (file >> key) {
+    if (key == "score") file >> highScore;
+    else if (key == "time") file >> bestTime;
+  }
+
+  file.close();
+
+  // If file contains useless values (like old format), reset
+  if (highScore <= 0 || highScore > 9999) highScore = 9999;
+  if (bestTime <= 0 || bestTime > 99999.99) bestTime = 99999.99;
 }
 
+
 void ScoreManager::incrementScore() {
   currentScore++;
 }
@@ -30,14 +38,35 @@ void ScoreManager::resetScore() {
   currentScore = 0;
 }
 
-void ScoreManager::saveHighScore() {
+void ScoreManager::saveHighScore(int finalScore, double finalTime) {
-  if (highScore == std::numeric_limits<int>::max()) return;
+  bool updated = false;
-  std::ofstream file(highscoreFile);
 
-  if (file.is_open()) {
+  if (finalScore < highScore) {
-    file << highScore;
+    highScore = finalScore;
-    file.close();
+    updated = true;
-  } else {
+  }
-    std::cerr << "Error: Could not write to highscore file" << std::endl;
+
-     }
+  if (finalTime < bestTime) {
+    bestTime = finalTime;
+    updated = true;
+  }
+
+  // For safety: If file was default → always write
+  if (highScore == 9999 && bestTime == 99999.99)
+    updated = true;
+
+  if (!updated) return;
+
+  std::ofstream file(highscoreFile);
+  if (!file.is_open()) {
+    std::cerr << "❌ ERROR: Can't write highscore file\n";
+    return;
+  }
+
+  file << "score " << highScore << "\n";
+  file << "time " << bestTime << "\n";
+  file.close();
+
+  std::cout << "✅ Highscore updated!\n";
 }
+

ScoreManager.h

@@ -3,18 +3,23 @@
 #include <limits>
 
 class ScoreManager {
-  public:
+public:
-    ScoreManager(const std::string& filename);
+  ScoreManager(const std::string& filename);
 
-    void incrementScore();
+  void incrementScore();
-    void resetScore();
+  void resetScore();
-    void saveHighScore();
+  void saveHighScore(int finalScore, double finalTime);
-    int getCurrentScore() const { return currentScore; }
-    int getHighScore() const { return (highScore == std::numeric_limits<int>::max()) ? 0 : highScore; }
 
-  private:
+  int getCurrentScore() const { return currentScore; }
-    int currentScore = 0;
+  int getHighScore() const { return highScore; }
-    int highScore = std::numeric_limits<int>::max();
+  double getBestTime() const { return bestTime; }
-    std::string highscoreFile;
+
-    void loadHighscore();
+private:
-    };
+  int currentScore = 0;
+  int highScore = std::numeric_limits<int>::max();
+  double bestTime = std::numeric_limits<double>::max();
+
+  std::string highscoreFile;
+
+  void loadHighscore();
+};

gamecube.h

@@ -32,3 +32,11 @@ private:
     bool flippingBackward = false;
     float rotation = 0.0f;
 };
+
+enum class GameState
+{
+    Idle,          // kein Würfel offen, Eingabe erlaubt
+    OneFlipped,    // ein Würfel offen
+    CheckingMatch, // zwei Würfel vollständig aufgeklappt, Vergleich läuft
+    LockInput      // Würfel drehen gerade – Eingabe kurz blockiert
+};

main.cpp

@@ -31,10 +31,13 @@ int main()
     camera.fovy     = 45.0f;
     camera.projection = CAMERA_PERSPECTIVE;
 
+    GameState state = GameState::Idle;
+
+
     //TODO: Hier die Zeit abrufen.
     double currentScoreTime = 0.0;
     double startTime = 0.0;
-    double highScoreTime = 43.4;
+    double highScoreTime = score.getBestTime();
 
     //TODO: Hier die Anzahl der Züge abrufen.
     int currentScoreTurns = 0;
@@ -53,7 +56,7 @@ int main()
 
     std::vector<Vec3> positions =createCubes(cubePairs);
 
-    // Nur 3 Farben für 3 Paare
+    // Nur x Farben für x Paare
     std::vector<Color> colors= getColors(cubePairs);
 
 
@@ -88,7 +91,11 @@ int main()
     while (!WindowShouldClose())
     {
         // Klick-Erkennung
-        if (!gameWon && IsMouseButtonPressed(MOUSE_LEFT_BUTTON))
+        //if (!gameWon && IsMouseButtonPressed(MOUSE_LEFT_BUTTON))
+        if (!gameWon
+            && state != GameState::LockInput
+            && state != GameState::CheckingMatch
+            && IsMouseButtonPressed(MOUSE_LEFT_BUTTON))
         {
             Vector2 mouse = GetMousePosition();
 
@@ -100,12 +107,26 @@ int main()
 
                     if (fabs(mouse.x - screenPos.x) < 40 && fabs(mouse.y - screenPos.y) < 40)
                     {
+                        if (state == GameState::OneFlipped && first == &c)
+                            break;
+
                         c.FlipForward();
+
+                        if (state == GameState::Idle)
+                        {
+                            first = &c;
+                            state = GameState::OneFlipped;
+                        }else if (state == GameState::OneFlipped && first != &c)
+                        {
+                            second = &c;
+                            state = GameState::LockInput;
+                        }
+
                         score.incrementScore();
                         currentScoreTurns = score.getCurrentScore() / 2;
+
+                        break;
                     }
-
-
                 }
             }
         }
@@ -114,17 +135,19 @@ int main()
         for (auto &c : cubes)
         {
             c.Update(flipSpeed);
+        }
 
-            // Sobald ein Würfel vollständig umgedreht ist → merken
+
-            if (c.IsFlipped() && !c.IsMatched())
+        if (state == GameState::LockInput && first && second)
+        {
+            if (first->GetRotationY() == 180.0f && second->GetRotationY() == 180.0f)
             {
-                if (!first) first = &c;
+                state = GameState::CheckingMatch;
-                else if (!second && &c != first) second = &c;
             }
         }
 
         // Matching-Logik
-        if (first && second)
+        if (state == GameState::CheckingMatch && first && second)
         {
             //currentScoreTurns = score.getCurrentScore();
             Color col1 = first->GetColor();
@@ -142,6 +165,8 @@ int main()
             }
 
             first = second = nullptr;
+            state = GameState::Idle;
+            std::cout <<"unlock";
         }
 
         // Gewinnprüfung
@@ -177,7 +202,7 @@ int main()
 
             if (currentScoreTime <= highScoreTime) highScoreTime = currentScoreTime;
             if (currentScoreTurns <= highScoreTurns) highScoreTurns = currentScoreTurns;
-            score.saveHighScore();
+            score.saveHighScore(currentScoreTurns, currentScoreTime);
             userInterface.showScore(currentScoreTime, highScoreTime, currentScoreTurns, highScoreTurns);
         }
         else