10 Commits
Author SHA1 Message Date
marcelbls c6cdebfc84 Zähler eingebaut und versucht highscore zu fixen
Zähler eingebaut und versucht highscore zu fixen
2025-12-01 13:11:11 +01:00
pumcookie aa5ca11829 ScoreManager Score Part 2025-11-30 20:36:17 +01:00
Legaeli c0c25360cb Added user interface 2025-11-25 11:24:28 +01:00
Niklumm 9b3e642475 small max cube_count fix 2025-11-23 13:35:52 +01:00
Niklumm 9e5719f8f0 working flexible cube count 2025-11-23 13:31:24 +01:00
Legaeli f0a7363497 fuck your idea 2025-11-18 09:01:46 +01:00
Niklumm edb628f7ba idea changed 2025-11-18 08:58:36 +01:00
Legaeli 4ea94f1917 Test fix. Alles klappt (hoffentlich) 2025-11-18 08:53:50 +01:00
Niklumm d06404f865 FInal ohne .idea im git ignore
Test weil es chris fickt
2025-11-18 08:48:40 +01:00
Niklumm 79f97d6121 FINALFINALFINAL
es klappt nicht anfassen
2025-11-18 08:47:23 +01:00
26 changed files with 6552 additions and 218 deletions
+1 -1
View File
@@ -1,3 +1,3 @@
cmake-build-debug/
cmake-build-debug-mingw/
.idea/
.idea/workspace.xml
-8
View File
@@ -1,8 +0,0 @@
# Default ignored files
/shelf/
/workspace.xml
# Editor-based HTTP Client requests
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml
-2
View File
@@ -1,2 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module classpath="CMake" type="CPP_MODULE" version="4" />
-180
View File
@@ -1,180 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="AutoImportSettings">
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="BackendCodeEditorMiscSettings">
<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
}</component>
<component name="CMakeProjectFlavorService">
<option name="flavorId" value="CMakePlainProjectFlavor" />
</component>
<component name="CMakeReloadState">
<option name="reloaded" value="true" />
</component>
<component name="CMakeRunConfigurationManager">
<generated>
<config projectName="Prog3B" targetName="Prog3B" />
</generated>
</component>
<component name="CMakeSettings">
<configurations>
<configuration PROFILE_NAME="Debug-MinGW" ENABLED="true" CONFIG_NAME="Debug" TOOLCHAIN_NAME="MinGW" />
</configurations>
</component>
<component name="ChangeListManager">
<list default="true" id="e1b17018-ef5c-443f-8959-8b1378194905" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/.cmake/api/v1/query/cache-v2" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/.cmake/api/v1/query/cmakeFiles-v1" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/.cmake/api/v1/query/codemodel-v2" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/.cmake/api/v1/query/toolchains-v1" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/.cmake/api/v1/reply/cache-v2-506b4a27f13cc8523a25.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/.cmake/api/v1/reply/cmakeFiles-v1-2dbdd8c36bd9d0b6cb5f.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-001fc019e0d09cfdc09a.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/.cmake/api/v1/reply/directory-.-Debug-d0094a50bb2071803777.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/.cmake/api/v1/reply/index-2025-11-17T13-55-54-0914.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/.cmake/api/v1/reply/target-Prog3B-Debug-905f0a97f45a37cca373.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/.cmake/api/v1/reply/toolchains-v1-6082f31f4c46160119db.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/.ninja_deps" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/.ninja_log" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeCache.txt" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.30.5/CMakeCCompiler.cmake" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.30.5/CMakeCXXCompiler.cmake" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.30.5/CMakeDetermineCompilerABI_C.bin" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.30.5/CMakeDetermineCompilerABI_CXX.bin" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.30.5/CMakeRCCompiler.cmake" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.30.5/CMakeSystem.cmake" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.30.5/CompilerIdC/CMakeCCompilerId.c" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.30.5/CompilerIdC/a.exe" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.30.5/CompilerIdCXX/CMakeCXXCompilerId.cpp" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.30.5/CompilerIdCXX/a.exe" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/CMakeConfigureLog.yaml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/CMakeDirectoryInformation.cmake" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Makefile.cmake" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Makefile2" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Prog3B.dir/DependInfo.cmake" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Prog3B.dir/build.make" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Prog3B.dir/cmake_clean.cmake" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Prog3B.dir/compiler_depend.make" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Prog3B.dir/compiler_depend.ts" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Prog3B.dir/depend.make" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Prog3B.dir/flags.make" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Prog3B.dir/includes_CXX.rsp" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Prog3B.dir/link.txt" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Prog3B.dir/linkLibs.rsp" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Prog3B.dir/objects1.rsp" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Prog3B.dir/progress.make" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/TargetDirectories.txt" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/clion-Debug-log.txt" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/clion-environment.txt" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/cmake.check_cache" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/progress.marks" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/Makefile" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/Prog3B.exe" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/Testing/Temporary/LastTest.log" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/build.ninja" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/cmake_install.cmake" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/compile_commands.json" beforeDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="ClangdSettings">
<option name="formatViaClangd" value="false" />
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="CMakeBuildProfile:Debug" />
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="ProjectColorInfo">{
&quot;customColor&quot;: &quot;&quot;,
&quot;associatedIndex&quot;: 0
}</component>
<component name="ProjectId" id="34yCUQNT5FEzK3w2FlmvvgM9a9g" />
<component name="ProjectViewState">
<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;CMake Application.Prog3B_tests.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;main&quot;,
&quot;last_opened_file_path&quot;: &quot;C:/Users/marce/Desktop/Prog Praktikum C++/Vorlesung/Lambda&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;settings.editor.selected.configurable&quot;: &quot;CMakeSettings&quot;,
&quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
}
}</component>
<component name="RunManager" selected="CMake Application.Prog3B">
<configuration default="true" type="CLionExternalRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" EMULATE_TERMINAL="false" PASS_PARENT_ENVS_2="true">
<method v="2">
<option name="CLION.EXTERNAL.BUILD" enabled="true" />
</method>
</configuration>
<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-MinGW" RUN_TARGET_PROJECT_NAME="Prog3B" RUN_TARGET_NAME="Prog3B">
<method v="2">
<option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
</method>
</configuration>
<configuration name="Prog3B_tests" 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_tests" CONFIG_NAME="Debug-MinGW" RUN_TARGET_PROJECT_NAME="Prog3B" RUN_TARGET_NAME="Prog3B_tests">
<method v="2">
<option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
</method>
</configuration>
<list>
<item itemvalue="CMake Application.Prog3B" />
<item itemvalue="CMake Application.Prog3B_tests" />
</list>
</component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="e1b17018-ef5c-443f-8959-8b1378194905" name="Changes" comment="" />
<created>1762176441912</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1762176441912</updated>
<workItem from="1762176443926" duration="3810000" />
<workItem from="1762783055261" duration="74000" />
<workItem from="1763367345575" duration="665000" />
<workItem from="1763368121506" duration="692000" />
<workItem from="1763385066418" duration="421000" />
<workItem from="1763385896177" duration="1973000" />
</task>
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="3" />
</component>
<component name="VCPKGProject">
<isAutomaticCheckingOnLaunch value="false" />
<isAutomaticFoundErrors value="true" />
<isAutomaticReloadCMake value="true" />
</component>
<component name="VcsManagerConfiguration">
<option name="LAST_COMMIT_MESSAGE" value="" />
</component>
</project>
View File
View File
View File
-1
View File
@@ -2,7 +2,6 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/Programmieren 3B.iml" filepath="$PROJECT_DIR$/.idea/Programmieren 3B.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/Stone_Development.iml" filepath="$PROJECT_DIR$/.idea/Stone_Development.iml" />
</modules>
</component>
View File
+141
View File
@@ -0,0 +1,141 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="AutoImportSettings">
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="BackendCodeEditorMiscSettings">
<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
}</component>
<component name="CMakeProjectFlavorService">
<option name="flavorId" value="CMakePlainProjectFlavor" />
</component>
<component name="CMakeReloadState">
<option name="reloaded" value="true" />
</component>
<component name="CMakeRunConfigurationManager">
<generated>
<config projectName="Prog3B" targetName="Prog3B" />
<config projectName="Prog3B" targetName="Prog3B_tests" />
</generated>
</component>
<component name="CMakeSettings">
<configurations>
<configuration PROFILE_NAME="Debug" ENABLED="true" CONFIG_NAME="Debug" />
</configurations>
</component>
<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$/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" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="ClangdSettings">
<option name="formatViaClangd" value="false" />
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="CMakeBuildProfile:Debug" />
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="HighlightingSettingsPerFile">
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
</component>
<component name="ProjectApplicationVersion">
<option name="ide" value="CLion" />
<option name="majorVersion" value="2024" />
<option name="minorVersion" value="3.4" />
<option name="productBranch" value="Classic" />
</component>
<component name="ProjectColorInfo">{
&quot;customColor&quot;: &quot;&quot;,
&quot;associatedIndex&quot;: 1
}</component>
<component name="ProjectId" id="35dvDDehATN0hwwCgiPHEpDQPia" />
<component name="ProjectViewState">
<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>
<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">
<option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
</method>
</configuration>
<configuration name="Prog3B_tests" 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_tests" CONFIG_NAME="Debug" RUN_TARGET_PROJECT_NAME="Prog3B" RUN_TARGET_NAME="Prog3B_tests">
<method v="2">
<option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
</method>
</configuration>
<list>
<item itemvalue="CMake Application.Prog3B" />
<item itemvalue="CMake Application.Prog3B_tests" />
</list>
</component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="db070755-9708-4a46-a9cb-e7c4dc1bfb77" name="Changes" comment="" />
<created>1763452643165</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1763452643165</updated>
<workItem from="1763452645145" duration="329000" />
<workItem from="1763652636624" duration="1226000" />
<workItem from="1763653877709" duration="28000" />
<workItem from="1763895078693" duration="5675000" />
<workItem from="1764526482502" duration="8000" />
<workItem from="1764526493477" duration="4519000" />
</task>
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="3" />
</component>
<component name="VCPKGProject">
<isAutomaticCheckingOnLaunch value="false" />
<isAutomaticFoundErrors value="true" />
<isAutomaticReloadCMake value="true" />
</component>
</project>
+5 -1
View File
@@ -15,6 +15,11 @@ endif()
set(SRC_FILES
${CMAKE_CURRENT_LIST_DIR}/main.cpp
${CMAKE_CURRENT_LIST_DIR}/gamecube.cpp
${CMAKE_CURRENT_LIST_DIR}/gamematrix.cpp
${CMAKE_CURRENT_LIST_DIR}/createCube.cpp
${CMAKE_CURRENT_LIST_DIR}/userinterface.cpp
${CMAKE_CURRENT_LIST_DIR}/raygui_impl.cpp
${CMAKE_CURRENT_LIST_DIR}/ScoreManager.cpp
)
set(INCLUDE_DIRS
@@ -50,7 +55,6 @@ target_include_directories(${EXECUTABLE_NAME} PRIVATE ${INCLUDE_DIRS})
# === Bibliotheken verlinken ===
target_link_libraries(${EXECUTABLE_NAME} PRIVATE
${CMAKE_CURRENT_LIST_DIR}/${OS_DIR}/libgamematrix.a
${CMAKE_CURRENT_LIST_DIR}/${OS_DIR}/libraylib.a
)
+1
View File
@@ -0,0 +1 @@
11.34
+43
View File
@@ -0,0 +1,43 @@
#include "ScoreManager.h"
#include <fstream>
#include <iostream>
#include <limits>
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 >> value) {
if (value > 0) highScore = value;
}
file.close();
} else {
;
}
}
void ScoreManager::incrementScore() {
currentScore++;
}
void ScoreManager::resetScore() {
currentScore = 0;
}
void ScoreManager::saveHighScore() {
if (highScore == std::numeric_limits<int>::max()) return;
std::ofstream file(highscoreFile);
if (file.is_open()) {
file << highScore;
file.close();
} else {
std::cerr << "Error: Could not write to highscore file" << std::endl;
}
}
+20
View File
@@ -0,0 +1,20 @@
#pragma once
#include <string>
#include <limits>
class ScoreManager {
public:
ScoreManager(const std::string& filename);
void incrementScore();
void resetScore();
void saveHighScore();
int getCurrentScore() const { return currentScore; }
int getHighScore() const { return (highScore == std::numeric_limits<int>::max()) ? 0 : highScore; }
private:
int currentScore = 0;
int highScore = std::numeric_limits<int>::max();
std::string highscoreFile;
void loadHighscore();
};
+64
View File
@@ -0,0 +1,64 @@
#include "createCube.h"
#include <iostream>
std::vector<Vec3> createCubes(int pairs)
{
std::vector<int> fieldSize = calculateFieldSize(pairs);
std::vector<Vec3> cubePositions;
//std::cout<<(fieldSize[0])<<std::endl;
//std::cout<<(fieldSize[1]) <<std::endl;
int start_x = (fieldSize[0]/2) * -2;
int start_y = (fieldSize[1]/2) * -2;
for (int i = 0; i < fieldSize[0]; i++)
{
for (int j = 0; j < fieldSize[1]; j++)
{
cubePositions.push_back(Vec3(start_x + 2*i, 0, start_y + 2*j));
}
}
return cubePositions;
};
std::vector<int> calculateFieldSize(int pairs)
{
std::vector<int> best_field = {pairs, 2};
int cube_count = pairs *2;
int test_count = 3;
while (test_count < pairs)
{
for (int i = 3; i < pairs; i++)
{
if (test_count * i == cube_count && test_count + i < best_field[0] + best_field[1])
{
best_field[1] = test_count;
best_field[0] = i;
}
}
test_count++;
}
return best_field;
};
std::vector<Color> getColors(int pairs)
{
std::vector<Color> returnColors;
Color colors[] = {
{230, 25, 75, 255}, // Red
{60, 180, 75, 255}, // Green
{0, 130, 200, 255}, // Blue
{245, 130, 48, 255}, // Orange
{145, 30, 180, 255}, // Purple
{255, 225, 25, 255}, // Yellow
{70, 240, 240, 255}, // Cyan
{240, 50, 230, 255}, // Magenta
{210, 245, 60, 255}, // Lime
{250, 190, 190, 255} // Pink
};
for (int i = 0; i < pairs; i++)
{
returnColors.push_back(colors[i]);
}
std::cout << returnColors.size() << std::endl;
return returnColors;
};
+11
View File
@@ -0,0 +1,11 @@
#pragma once
#include "gamecube.h"
std::vector<Vec3> createCubes(int pairs);
std::vector<Color> getColors(int pairs);
std::vector<int> calculateFieldSize(int pairs);
+3 -3
View File
@@ -44,11 +44,11 @@ void gamecube::Draw() const
rlPushMatrix();
// Matrizen für Rotation und Translation erzeugen
auto matrix_a = gameMatrix::translate({ position.x, position.y, position.z});
auto matrix_b = gameMatrix::rot3D(rotation, 'y');
auto matrix_a = Matrix3D::gameMatrix::translate({ position.x, position.y, position.z});
auto matrix_b = Matrix3D::gameMatrix::rot3D(rotation, 'y');
// Matrizen multiplizieren (Translation * Rotation)
auto model = gameMatrix::matmul(matrix_a, matrix_b);
auto model = Matrix3D::gameMatrix::matmul(matrix_a, matrix_b);
// transform for raylib matrix
float f[16];
+87
View File
@@ -0,0 +1,87 @@
#include "gamematrix.h"
using namespace Matrix3D;
///
/// @param matrix1 - First matrix
/// @param matrix2 - Second matrix
/// @return Returns the multiplication of matrix 1 and matrix 2.
std::array<std::array<double,4>,4> gameMatrix::matmul(const std::array<std::array<double,4>,4>& matrix1,
const std::array<std::array<double,4>,4>& matrix2) {
std::array<std::array<double,4>,4> matrix3 = {};
if (matrix1[0].size() != matrix2.size()) {
throw std::invalid_argument("Number of columns of matrix 1 must be equal to number of rows of matrix 2");
};
for (int i = 0; i < matrix1.size(); i++) {
std::array<double,4> temp_array = {};
for (int j = 0; j < matrix2[i].size(); j++) {
double temp = 0;
for (int k = 0; k < matrix2.size(); k++) {
temp += matrix1[i][k] * matrix2[k][j];
}
temp_array[j] = temp;
}
matrix3[i] = temp_array;
}
return matrix3;
}
///
/// @param angle_deg Rotation angle
/// @param axis Rotation axis (x, y, z)
/// @return Returns a rotation matrix based on a given angle and axis.
std::array<std::array<double,4>,4> gameMatrix::rot3D(double angle_deg, char axis) {
if (axis != 'x' && axis != 'y' && axis != 'z') {
throw std::invalid_argument("Invalid axis");
};
const auto angle_rad = angle_deg * M_PI / 180;
std::array<std::array<double,4>,4> rotationMatrix = {};
switch (axis) {
case 'x': {
std::array<std::array<double,4>,4> rMx = {{
{1, 0, 0, 0},
{0, cos(angle_rad), -sin(angle_rad), 0},
{0, sin(angle_rad), cos(angle_rad), 0},
{0, 0, 0, 1}
}};
rotationMatrix = rMx;
}
break;
case 'y': {
std::array<std::array<double,4>,4> rMy = {{
{cos(angle_rad), 0, sin(angle_rad), 0},
{0, 1, 0, 0},
{-sin(angle_rad), 0, cos(angle_rad), 0},
{0, 0, 0, 1}
}};
rotationMatrix = rMy;
}
break;
case 'z': {
std::array<std::array<double,4>,4> rMz = {{
{cos(angle_rad), -sin(angle_rad), 0, 0},
{sin(angle_rad), cos(angle_rad), 0, 0},
{0, 0, 1, 0},
{0, 0, 0, 1}
}};
rotationMatrix = rMz;
}
break;
}
return rotationMatrix;
};
///
/// @param pos 3 point vector (x, y, z)
/// @return Returns a 4x4 translation matrix base on a given vector.
std::array<std::array<double,4>,4> gameMatrix::translate(const std::array<double, 3>& pos) {
std::array<std::array<double,4>,4> transMatrix = {{{1, 0, 0, pos[0]}, {0, 1, 0, pos[1]}, {0, 0, 1, pos[2]}, {0, 0, 0, 1}}};
return transMatrix;
};
+9 -2
View File
@@ -4,16 +4,23 @@
#include <stdexcept>
#include <cmath>
namespace Matrix3D {
class gameMatrix
{
public:
// Matrix Multiplikation
static std::array<std::array<double,4>,4> matmul(const std::array<std::array<double,4>,4>& A,
const std::array<std::array<double,4>,4>& B);
static std::array<std::array<double,4>,4> matmul(const std::array<std::array<double,4>,4>& matrix1,
const std::array<std::array<double,4>,4>& matrix2);
// Rotationsmatrix um Achse x/y/z
static std::array<std::array<double,4>,4> rot3D(double angle_deg, char axis);
// Verschiebung
static std::array<std::array<double,4>,4> translate(const std::array<double, 3>& pos);
private:
//TODO: Was für eine Rolle spielen Vec3 und Mat4???
struct Vec3 {double x,y,z;};
std::array<std::array<double,4>,4> Mat4 {};
};
}
+61 -7
View File
@@ -1,12 +1,20 @@
#include "gamecube.h"
#include "createCube.h"
#include "userinterface.h"
#include <algorithm>
#include <ctime>
#include <iostream>
#include "ScoreManager.h"
// -----------------------------------------------------------
// 3D Memory Game – Hauptprogramm
// -----------------------------------------------------------
int main()
{
UserInterface userInterface;
ScoreManager score("Highscores.txt");
//CHRIS WAR HIER
//AXIOM WAR HIER
// Zufall initialisieren
@@ -17,21 +25,41 @@ int main()
SetTargetFPS(60);
Camera3D camera{};
camera.position = {6.0f, 6.0f, 6.0f};
camera.position = {8.0f, 8.5f, 8.0f};
camera.target = {0.0f, 0.0f, 0.0f};
camera.up = {0.0f, 1.0f, 0.0f};
camera.fovy = 45.0f;
camera.projection = CAMERA_PERSPECTIVE;
//TODO: Hier die Zeit abrufen.
double currentScoreTime = 0.0;
double startTime = 0.0;
double highScoreTime = 43.4;
//TODO: Hier die Anzahl der Züge abrufen.
int currentScoreTurns = 0;
int highScoreTurns = score.getHighScore();
//if (currentScoreTime <= highScoreTime) highScoreTime = currentScoreTime;
//if (currentScoreTime <= highScoreTurns) highScoreTurns = currentScoreTurns;
int cubePairs = userInterface.getCubeCount();
if (cubePairs <= 0) {
userInterface.showMenu(currentScoreTime, highScoreTime, currentScoreTurns, highScoreTurns);
cubePairs = userInterface.getCubeCount();
// Startzeit speichern nach Enter
startTime = currentScoreTime;
}
std::vector<Vec3> positions =createCubes(cubePairs);
// Nur 3 Farben für 3 Paare
Color colors[] = { RED, GREEN, BLUE };
std::vector<Color> colors= getColors(cubePairs);
// 6 Karten-Positionen im 3x2 Raster
std::vector<Vec3> positions = {{-2, 0, -2}, {0, 0, -2}, {2, 0, -2},{-2, 0, 0}, {0, 0, 0}, {2, 0, 0}};
// Farben doppelt in einen Pool legen und mischen
std::vector<Color> colorPool;
for (int i = 0; i < 3; i++)
for (int i = 0; i < cubePairs; i++)
{
colorPool.push_back(colors[i]);
colorPool.push_back(colors[i]);
@@ -46,7 +74,7 @@ int main()
// Karten/Würfel erstellen
std::vector<gamecube> cubes;
for (int i = 0; i < 6; i++)
for (int i = 0; i < cubePairs*2; i++)
cubes.emplace_back(positions[i], colorPool[i]);
gamecube* first = nullptr;
@@ -71,7 +99,13 @@ int main()
Vector2 screenPos = GetWorldToScreen({c.GetPosition().x, c.GetPosition().y, c.GetPosition().z}, camera);
if (fabs(mouse.x - screenPos.x) < 40 && fabs(mouse.y - screenPos.y) < 40)
{
c.FlipForward();
score.incrementScore();
currentScoreTurns = score.getCurrentScore() / 2;
}
}
}
}
@@ -92,6 +126,7 @@ int main()
// Matching-Logik
if (first && second)
{
//currentScoreTurns = score.getCurrentScore();
Color col1 = first->GetColor();
Color col2 = second->GetColor();
@@ -113,9 +148,17 @@ int main()
if (!gameWon)
gameWon = std::all_of(cubes.begin(), cubes.end(), [](const gamecube &c){ return c.IsMatched(); });
//Zeit Berechnung
if (!gameWon)
{
currentScoreTime = GetTime() - startTime;
DrawText(TextFormat("%.2f", currentScoreTime), 10, 30, 20, DARKGRAY);
}
// -----------------------------------------------------------
// Zeichnen
// -----------------------------------------------------------
BeginDrawing();
ClearBackground(RAYWHITE);
BeginMode3D(camera);
@@ -125,11 +168,22 @@ int main()
EndMode3D();
if (gameWon)
if (gameWon) {
DrawText("Congrats! You found all pairs!", 150, 260, 30, DARKBLUE);
//TODO: Neue Scores zuweisen, current genügen.
//currentScoreTime = 17.3;
//currentScoreTurns = 10;
if (currentScoreTime <= highScoreTime) highScoreTime = currentScoreTime;
if (currentScoreTurns <= highScoreTurns) highScoreTurns = currentScoreTurns;
score.saveHighScore();
userInterface.showScore(currentScoreTime, highScoreTime, currentScoreTurns, highScoreTurns);
}
else
DrawText("Flip 2 cubes - find matching pairs!", 10, 10, 20, DARKGRAY);
EndDrawing();
}
+2
View File
@@ -0,0 +1,2 @@
#define RAYGUI_IMPLEMENTATION
#include "raygui.h"
+5994
View File
File diff suppressed because it is too large Load Diff
+4 -4
View File
@@ -1,7 +1,7 @@
#include <cassert>
#include <cmath>
#include <iostream>
#include "gamematrix.h"
#include "gamematrix.cpp"
void test_matmul_basic() {
std::array<std::array<double,4>,4> A = {{
@@ -18,7 +18,7 @@ void test_matmul_basic() {
{7, 7, 7, 7}
}};
auto C = gameMatrix::matmul(A, B);
auto C = Matrix3D::gameMatrix::matmul(A, B);
assert(C[0][0] == 2);
assert(C[0][1] == 3);
@@ -29,7 +29,7 @@ void test_matmul_basic() {
void test_translate_basic() {
std::array<double, 3> pos = {3, -2, 8};
auto T = gameMatrix::translate(pos);
auto T = Matrix3D::gameMatrix::translate(pos);
assert(T[0][3] == 3);
assert(T[1][3] == -2);
@@ -37,7 +37,7 @@ void test_translate_basic() {
}
void test_rot3D_basic() {
auto R = gameMatrix::rot3D(90, 'x');
auto R = Matrix3D::gameMatrix::rot3D(90, 'x');
// cos(90°) ≈ 0, sin(90°) ≈ 1
assert(std::abs(R[1][1]) < 1e-6);
assert(std::abs(R[1][2] + 1.0) < 1e-6);
+77
View File
@@ -0,0 +1,77 @@
#include "userinterface.h"
#include "raylib.h"
#include "raygui.h"
#include <iostream>
#include <cstring>
#include <format>
int UserInterface::getCubeCount() {
return cubeCount;
};
void UserInterface::showMenu(double &currentScoreTime, double &highScoreTime, int &currentScoreTurns, int &highScoreTurns) {
char textInput[3] = "3";
menuOpen = true;
Rectangle inputBox = {300, 250, 200, 50};
while (menuOpen && !WindowShouldClose()) {
BeginDrawing();
ClearBackground(RAYWHITE);
showScore(currentScoreTime, highScoreTime, currentScoreTurns, highScoreTurns);
if (wrongInput) {
DrawText("Falsche Eingabe.\nWie viele Würfelpaare? (2-10)", 220, 180, 20, DARKGRAY);
} else {
DrawText("Wie viele Würfelpaare? (2-10)", 220, 180, 20, DARKGRAY);
}
GuiTextBox(inputBox, textInput, 3, true);
if (IsKeyPressed(KEY_ENTER)) {
if (!(std::atoi(textInput) > 10 || std::atoi(textInput) <= 1)) {
menuOpen = false;
cubeCount = std::atoi(textInput);
currentScoreTime = GetTime();
} else {
wrongInput = true;
}
}
EndDrawing();
}
}
void UserInterface::showScore(double &currentScoreTime, double &highScoreTime, int &currentScoreTurns, int &highScoreTurns) {
Color currentScoreTimeColor = RED;
Color highScoreTimeColor = GREEN;
Color currentScoreTurnsColor = RED;
Color highScoreTurnsColor = GREEN;
if (currentScoreTime <= highScoreTime) {
currentScoreTimeColor = GREEN;
} else if (currentScoreTime < highScoreTime) {
currentScoreTimeColor = RED;
}
if (currentScoreTurns <= highScoreTurns) {
currentScoreTurnsColor = GREEN;
} else if (currentScoreTurns > highScoreTurns) {
currentScoreTurnsColor = RED;
}
if (!menuOpen) {
std::string currentTimeOutput = std::format("Deine Zeit: {:.2f}", currentScoreTime);
DrawText(currentTimeOutput.c_str(), 220, 100, 20, currentScoreTimeColor);
std::string currentTurnsOutput = "Deine Züge: " + std::to_string(currentScoreTurns);
DrawText(currentTurnsOutput.c_str(), 440, 100, 20, currentScoreTurnsColor);
}
std::string highTimeOutput = std::format("Beste Zeit: {:.2f}", highScoreTime);
DrawText(highTimeOutput.c_str(), 220, 120, 20, highScoreTimeColor);
std::string highTurnsOutput = "Wenigste Züge: " + std::to_string(highScoreTurns);
DrawText(highTurnsOutput.c_str(), 440, 120, 20, highScoreTurnsColor);
}
+20
View File
@@ -0,0 +1,20 @@
#pragma once
class UserInterface {
public:
int getCubeCount();
void showMenu(double &currentScoreTime, double &highScoreTime, int &currentScoreTurns, int &highScoreTurns);
void showScore(double &currentScoreTime, double &highScoreTime, int &currentScoreTurns, int &highScoreTurns);
bool menuOpen = false;
private:
int cubeCount = 0;
bool wrongInput = false;
};
#ifndef USERINTERFACE_H
#define USERINTERFACE_H
#endif //USERINTERFACE_H