guballaro99746/Stone_Development
2
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Compare commits

base: guballaro99746:ef779381a60f73a567035119b49cce7f13d2cef7
Branches Tags
guballaro99746:main
guballaro99746:bug_fix_branch
guballaro99746:Zeit_zaeler
guballaro99746:Flexible-cube-count
guballaro99746:project_developer
guballaro99746:backup_161125
guballaro99746:project_leader
...
compare: guballaro99746:58ff9f2e6376e182bcad1e89b79311c79073d449
Branches Tags
guballaro99746:bug_fix_branch
guballaro99746:main
guballaro99746:Zeit_zaeler
guballaro99746:Flexible-cube-count
guballaro99746:project_developer
guballaro99746:backup_161125
guballaro99746:project_leader

2 Commits
ef779381a6 ... 58ff9f2e63

Author SHA1 Message Date
Niklumm
58ff9f2e63 Merge branch 'main' into bug_fix_branch 2025-12-15 10:48:42 +01:00
Niklumm
a4b18d1207 bug fixed 2025-12-15 10:47:32 +01:00
3 changed files with 64 additions and 33 deletions
Show Stats Expand all files Collapse all files

46
.idea/workspace.xml generated
View File

@ -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$/ScoreManager.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/ScoreManager.cpp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/gamecube.h" beforeDir="false" afterPath="$PROJECT_DIR$/gamecube.h" 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[{
"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 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>
}</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>

8
gamecube.h
View File

@ -31,4 +31,12 @@ 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
};

43
main.cpp
View File

@ -31,6 +31,9 @@ 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;
@ -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;
else if (!second && &c != first) second = &c;
state = GameState::CheckingMatch;
}
}
// 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