6 changed files with 70 additions and 136 deletions
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@ -7,6 +7,7 @@
    <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
@ -31,8 +32,10 @@
  <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$/gamecube.h" beforeDir="false" afterPath="$PROJECT_DIR$/gamecube.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Highscores.txt" beforeDir="false" afterPath="$PROJECT_DIR$/Highscores.txt" 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" />
@ -73,27 +76,27 @@
    <option name="hideEmptyMiddlePackages" value="true" />
    <option name="showLibraryContents" value="true" />
  </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;CMake Application.Prog3B.executor&quot;: &quot;Run&quot;,
-    &quot;RunOnceActivity.RadMigrateCodeStyle&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.cidr.known.project.marker&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.readMode.enableVisualFormatting&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.west.config.association.type.startup.service&quot;: &quot;true&quot;,
-    &quot;cf.first.check.clang-format&quot;: &quot;false&quot;,
-    &quot;cidr.known.project.marker&quot;: &quot;true&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;bug__fix__branch&quot;,
-    &quot;last_opened_file_path&quot;: &quot;C:/Desktop/StudiumME/3.Sem/Prog3/B/MatrixPybind&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "CMake Application.Prog3B.executor": "Run",
+    "RunOnceActivity.RadMigrateCodeStyle": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.cidr.known.project.marker": "true",
+    "RunOnceActivity.git.unshallow": "true",
+    "RunOnceActivity.readMode.enableVisualFormatting": "true",
+    "RunOnceActivity.west.config.association.type.startup.service": "true",
+    "cf.first.check.clang-format": "false",
+    "cidr.known.project.marker": "true",
+    "git-widget-placeholder": "Zeit__zaeler",
+    "last_opened_file_path": "C:/Desktop/StudiumME/3.Sem/Prog3/B/MatrixPybind",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "vue.rearranger.settings.migration": "true"
  }
-}</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">
@ -124,7 +127,6 @@
      <workItem from="1763895078693" duration="5675000" />
      <workItem from="1764526482502" duration="8000" />
      <workItem from="1764526493477" duration="4519000" />
-      <workItem from="1765791349412" duration="635000" />
    </task>
    <servers />
  </component>
--- a/Highscores.txt
+++ b/Highscores.txt
@ -1,2 +1 @@
-score 99
-time 99999.99
+11.34
--- a/ScoreManager.cpp
+++ b/ScoreManager.cpp
@ -1,35 +1,27 @@
 #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()) {
-    std::cout << "No highscore file found, creating new file.\n";
-    highScore = 9999;
-    bestTime = 99999.99;
-    return;
-  }
-
-  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;
+  if (file.is_open()) {
+    int value;
+    if (file >> value) {
+      if (value > 0) highScore = value;
+    }
+    file.close();
+  } else {
+    ;
+    }
 }

-
 void ScoreManager::incrementScore() {
  currentScore++;
 }
@ -38,35 +30,14 @@ void ScoreManager::resetScore() {
  currentScore = 0;
 }

-void ScoreManager::saveHighScore(int finalScore, double finalTime) {
-  bool updated = false;
-
-  if (finalScore < highScore) {
-    highScore = finalScore;
-    updated = true;
-  }
-
-  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;
-
+void ScoreManager::saveHighScore() {
+  if (highScore == std::numeric_limits<int>::max()) 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";
+  if (file.is_open()) {
+    file << highScore;
+    file.close();
+  } else {
+    std::cerr << "Error: Could not write to highscore file" << std::endl;
+     }
 }
-
--- a/ScoreManager.h
+++ b/ScoreManager.h
@ -3,23 +3,18 @@
 #include <limits>

 class ScoreManager {
-public:
-  ScoreManager(const std::string& filename);
+  public:
+    ScoreManager(const std::string& filename);

-  void incrementScore();
-  void resetScore();
-  void saveHighScore(int finalScore, double finalTime);
+    void incrementScore();
+    void resetScore();
+    void saveHighScore();
+    int getCurrentScore() const { return currentScore; }
+    int getHighScore() const { return (highScore == std::numeric_limits<int>::max()) ? 0 : highScore; }

-  int getCurrentScore() const { return currentScore; }
-  int getHighScore() const { return highScore; }
-  double getBestTime() const { return bestTime; }
-
-private:
-  int currentScore = 0;
-  int highScore = std::numeric_limits<int>::max();
-  double bestTime = std::numeric_limits<double>::max();
-
-  std::string highscoreFile;
-
-  void loadHighscore();
-};
+  private:
+    int currentScore = 0;
+    int highScore = std::numeric_limits<int>::max();
+    std::string highscoreFile;
+    void loadHighscore();
+    };
--- a/gamecube.h
+++ b/gamecube.h
@ -31,12 +31,4 @@ private:
    bool flippingForward = false;
    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
 };
--- a/main.cpp
+++ b/main.cpp
@ -31,13 +31,10 @@ 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 = score.getBestTime();
+    double highScoreTime = 43.4;

    //TODO: Hier die Anzahl der Züge abrufen.
    int currentScoreTurns = 0;
@ -56,7 +53,7 @@ int main()

    std::vector<Vec3> positions =createCubes(cubePairs);

-    // Nur x Farben für x Paare
+    // Nur 3 Farben für 3 Paare
    std::vector<Color> colors= getColors(cubePairs);


@ -91,11 +88,7 @@ int main()
    while (!WindowShouldClose())
    {
        // Klick-Erkennung
-        //if (!gameWon && IsMouseButtonPressed(MOUSE_LEFT_BUTTON))
-        if (!gameWon
-            && state != GameState::LockInput
-            && state != GameState::CheckingMatch
-            && IsMouseButtonPressed(MOUSE_LEFT_BUTTON))
+        if (!gameWon && IsMouseButtonPressed(MOUSE_LEFT_BUTTON))
        {
            Vector2 mouse = GetMousePosition();

@ -107,26 +100,12 @@ 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;
                    }
+
+
                }
            }
        }
@ -135,19 +114,17 @@ int main()
        for (auto &c : cubes)
        {
            c.Update(flipSpeed);
-        }

-
-        if (state == GameState::LockInput && first && second)
-        {
-            if (first->GetRotationY() == 180.0f && second->GetRotationY() == 180.0f)
+            // Sobald ein Würfel vollständig umgedreht ist → merken
+            if (c.IsFlipped() && !c.IsMatched())
            {
-                state = GameState::CheckingMatch;
+                if (!first) first = &c;
+                else if (!second && &c != first) second = &c;
            }
        }

        // Matching-Logik
-        if (state == GameState::CheckingMatch && first && second)
+        if (first && second)
        {
            //currentScoreTurns = score.getCurrentScore();
            Color col1 = first->GetColor();
@ -165,8 +142,6 @@ int main()
            }

            first = second = nullptr;
-            state = GameState::Idle;
-            std::cout <<"unlock";
        }

        // Gewinnprüfung
@ -202,7 +177,7 @@ int main()

            if (currentScoreTime <= highScoreTime) highScoreTime = currentScoreTime;
            if (currentScoreTurns <= highScoreTurns) highScoreTurns = currentScoreTurns;
-            score.saveHighScore(currentScoreTurns, currentScoreTime);
+            score.saveHighScore();
            userInterface.showScore(currentScoreTime, highScoreTime, currentScoreTurns, highScoreTurns);
        }
        else