gloecknerni100842/I2_Projects
2
2
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: gloecknerni100842:eb4d95e236245494d28c0d3f1576348517ef3e8b
Branches Tags
gloecknerni100842:main
gloecknerni100842:jonas
gloecknerni100842:nico_v2_spassmitki
gloecknerni100842:nico
..
compare: gloecknerni100842:bc913662a2a06e6aa0b74e95af8bc0144915b245
Branches Tags
gloecknerni100842:main
gloecknerni100842:jonas
gloecknerni100842:nico_v2_spassmitki
gloecknerni100842:nico

No commits in common. "eb4d95e236245494d28c0d3f1576348517ef3e8b" and "bc913662a2a06e6aa0b74e95af8bc0144915b245" have entirely different histories.
eb4d95e236 ... bc913662a2

12 changed files with 19 additions and 199 deletions
Show Stats Expand all files Collapse all files

BIN
.DS_Store vendored
View File

Binary file not shown.

9
.gitignore vendored
View File

@ -1,9 +0,0 @@
I2_Wortsalat/Start_Mac/wordsalad_initial
I2_Wortsalat/Start_Mac/.DS_Store
I2_Wortsalat/.DS_Store
I2_Wortsalat/Start_Mac/input.o
.gitignore
I2_Wortsalat/Start_Mac/game.o
I2_Wortsalat/Start_Mac/runTests
.o
.a

8
I2_Wortsalat/.idea/.gitignore generated vendored
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

6
I2_Wortsalat/.idea/vcs.xml generated
View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/.." vcs="Git" />
</component>
</project>

BIN
I2_Wortsalat/Start_Mac/.DS_Store vendored
View File

Binary file not shown.

104
I2_Wortsalat/Start_Mac/game.c
View File

@ -10,116 +10,14 @@
/* * Wörter aus der Wortliste zufällig horizontal oder vertikal platzieren
* restliche Felder mit zufälligen Buchstaben füllen */
void fillRestWithRandom(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen)
{
for (int i = 0; i < searchFieldLen; i++)
{
for (int j = 0; j < searchFieldLen; j++)
{
if (salad[i][j] == EMPTY_CHAR) {
salad[i][j] = rand() % ('Z' - 'A' + 1) + 'A';
}
}
}
}
// Creates the word salad by placing words randomly and filling empty spaces
// - 2D array salad -> fertiger Wortsalat
// - searchFieldLen -> Dimension der Salatschüssel
// - 2D array words -> gegebene Wörter
// - wordCount -> anzahl an Wörtern
int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen, const char words[][MAX_WORD_LEN], unsigned int wordCount)
{
int placedWords = 0;
//Feld komplettmit EMPTY_CHAR füllen
for (int i = 0; i < searchFieldLen; i++)
{
for (int j = 0; j < searchFieldLen; j++)
{
salad[i][j] = EMPTY_CHAR;
}
}
//Wörter plazieren
for (int wordNumber = 0; wordNumber < wordCount; wordNumber++)
{
int wordLength = strlen(words[wordNumber]);
int placed = 0;
for (int attempt = 0; attempt < MAX_RAND_TRIES_PER_WORD && !placed; attempt++)
{
int horizontal = rand() % 2; // 0 = vertikal, 1 = horizontal
int x = rand() % searchFieldLen;
int y = rand() % searchFieldLen;
if (horizontal)
{
if (x + wordLength > searchFieldLen) continue; // passt nicht
//Prüfen ob kein anderes Wort im Weg
int fits = 1;
for (int i = 0; i < wordLength; i++)
{
if (salad[y][x + i] != EMPTY_CHAR)
{
fits = 0;
break;
}
}
//Wort plazieren
if (fits)
{
for (int i = 0; i < wordLength; i++)
{
salad[y][x + i] = words[wordNumber][i];
}
placed = 1;
placedWords++;
}
}
else //Wort vertikal plazieren
{
if (y + wordLength > searchFieldLen) continue;
//Prüfen ob kein anderes Wort im Weg
int fits = 1;
for (int i = 0; i < wordLength; i++)
{
if (salad[y + i][x] != EMPTY_CHAR)
{
fits = 0;
break;
}
}
//Wort plazieren
if (fits)
{
for (int i = 0; i < wordLength; i++)
{
salad[y + i][x] = words[wordNumber][i];
}
placed = 1;
placedWords++;
}
}
}
}
fillRestWithRandom(salad, searchFieldLen);
return placedWords;
}
// Prints the word salad to console
void showWordSalad(const char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen)
{
for( int i = 0; i < searchFieldLen; i++ )
{
for( int j = 0; j < searchFieldLen; j++ )
{
printf("%c", salad[i][j]);
}
}
}

1
I2_Wortsalat/Start_Mac/game.h
View File

@ -7,6 +7,5 @@
int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen, const char words[][MAX_WORD_LEN], unsigned int wordCount);
void showWordSalad(const char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen);
void fillRestWithRandom(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen);
#endif

30
I2_Wortsalat/Start_Mac/input.c
View File

@ -8,35 +8,5 @@
// Read words from file and store in 'words' array
int readWords(FILE *file, char words[][MAX_WORD_LEN], unsigned int maxWordCount)
{
char lines [(MAX_WORD_LEN + 2) * maxWordCount]; //Es wird davon ausgegangen, dass die Wörter nur durch eine Trennzeichen und ein Leerzeichen von einander gertrennt gespeichert werden
int word_counter = 0;
while (fgets(lines, sizeof(lines) , file) != NULL)
{
for (int i = 0; lines[i] != '\0'; i++) //Entfernen von \n aus dem String
{
lines[i] = toupper(lines[i]);
if (lines[i] == '\n')
{
lines[i] = '\0';
break;
}
}
char *single_word = strtok(lines, " ;,");
while (single_word != NULL && word_counter < maxWordCount)
{
strncpy(words[word_counter], single_word, MAX_WORD_LEN - 1);
words [word_counter][MAX_WORD_LEN -1] = '\0'; //Zur Sicherheit, damit \0 auf alle Fälle vorhanden ist
word_counter++;
single_word = strtok(NULL, " ;,");
}
}
return word_counter;
}

13
I2_Wortsalat/Start_Mac/main.c
View File

@ -38,20 +38,13 @@ int main(int argc, char *argv[])
// TODO:
// Check if all words were successfully placed
if(placedWords == wordCount)
{
printf("Eingabe war erfolgreich!\nDas Spiel beginnt:");
void startGame(wordSalad, searchFieldSize, words, numberOfWords, windowSize);
}
else
{
printf("Fehler! Es konnten nicht alle Woerter hinzugefuegt werden!\n Bitte Spiel neustarten!");
}
// Start the game if successful
// error message if some words couldn't be placed
}
else
{
// Print error message if file couldn't be opened
fprintf(stderr, "Could not open file %s for reading ...\n", argv[1]);
exitCode = EXIT_FAILURE;
}

10
I2_Wortsalat/Start_Mac/makefile
View File

@ -3,13 +3,13 @@ CFLAGS = -g -Wall
LDFLAGS = -framework OpenGL -framework CoreFoundation -framework CoreGraphics -framework IOKit -framework Cocoa -framework CoreVideo
ARCH := $(shell uname -m)
BINARIES = ./macos-$(ARCH)
raylibfolder = ./raylib
raylib_folder = ./raylib
unityfolder = ./unity
# --------------------------
# initiales Spiel bauen
# --------------------------
wordsalad_initial:
$(CC) -o wordsalad_initial $(BINARIES)/libwordsalad_complete.a $(BINARIES)/libraylib.a $(LDFLAGS)
@ -31,18 +31,16 @@ $(CC) -c $(CFLAGS) game.c
graphicalGame.o: graphicalGame.c
$(CC) -I$(raylibfolder) -c $(CFLAGS) graphicalGame.c
# --------------------------
# Unit Tests
# --------------------------
TEST_BIN = runTests
test: input.o game.o unit_tests.c $(BINARIES)/libunity.a
$(CC) -Wall -I$(unityfolder) -o $(TEST_BIN) input.o game.o unit_tests.c $(BINARIES)/libunity.a
# --------------------------
# Clean
# --------------------------
clean:
rm -f *.o wordsalad $(TEST_BIN)
rm -f *.o wordsalad

10
I2_Wortsalat/Start_Windows/game.c
View File

@ -14,18 +14,10 @@
int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen, const char words[][MAX_WORD_LEN], unsigned int wordCount)
{
}
// Prints the word salad to console
void showWordSalad(const char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen)
{
for( int i = 0; i < searchFieldLen; i++ )
{
for( int j = 0; j < searchFieldLen; j++ )
{
printf("%c", salad[i][j]);
}
}
}

13
I2_Wortsalat/Start_Windows/main.c
View File

@ -38,20 +38,13 @@ int main(int argc, char *argv[])
// TODO:
// Check if all words were successfully placed
if(placedWords == wordCount)
{
printf("Eingabe war erfolgreich!\nDas Spiel beginnt:");
void startGame(wordSalad, searchFieldSize, words, numberOfWords, windowSize);
}
else
{
printf("Fehler! Es konnten nicht alle Woerter hinzugefuegt werden!\n Bitte Spiel neustarten!");
}
// Start the game if successful
// error message if some words couldn't be placed
}
else
{
// Print error message if file couldn't be opened
fprintf(stderr, "Could not open file %s for reading ...\n", argv[1]);
exitCode = EXIT_FAILURE;
}