From 4a1a2cb4e3df856319f9c80781751bee4ab16c67 Mon Sep 17 00:00:00 2001 From: Jonathan Hager Date: Tue, 22 Nov 2022 22:36:05 +0100 Subject: [PATCH] =?UTF-8?q?Ordnerstruktur=20aufger=C3=A4umt=20und=20README?= =?UTF-8?q?=20geupdated?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/c_cpp_properties.json | 17 ----------------- .vscode/settings.json | 4 ++-- inputHandler.c => Input/inputHandler.c | 2 +- inputHandler.h => Input/inputHandler.h | 2 +- isometricMap.c => IsometricMap/isometricMap.c | 0 isometricMap.h => IsometricMap/isometricMap.h | 0 .../isometricRenderer.c | 0 .../isometricRenderer.h | 0 tile.c => IsometricMap/tile.c | 0 tile.h => IsometricMap/tile.h | 0 Makefile | 16 ++++++++-------- README.md | 5 +++-- main.c | 19 +++++++------------ 13 files changed, 22 insertions(+), 43 deletions(-) delete mode 100644 .vscode/c_cpp_properties.json rename inputHandler.c => Input/inputHandler.c (99%) rename inputHandler.h => Input/inputHandler.h (93%) rename isometricMap.c => IsometricMap/isometricMap.c (100%) rename isometricMap.h => IsometricMap/isometricMap.h (100%) rename isometricRenderer.c => IsometricMap/isometricRenderer.c (100%) rename isometricRenderer.h => IsometricMap/isometricRenderer.h (100%) rename tile.c => IsometricMap/tile.c (100%) rename tile.h => IsometricMap/tile.h (100%) diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json deleted file mode 100644 index f52f716..0000000 --- a/.vscode/c_cpp_properties.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "configurations": [ - { - "name": "Linux", - "includePath": [ - "${workspaceFolder}/**" - ], - "defines": [], - "compilerPath": "/usr/bin/gcc", - "cStandard": "gnu17", - "cppStandard": "gnu++17", - "intelliSenseMode": "linux-gcc-x64", - "configurationProvider": "ms-vscode.makefile-tools" - } - ], - "version": 4 -} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index ab7a5ec..32391ac 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,6 +1,6 @@ { + "C_Cpp.errorSquiggles": "Disabled", "files.associations": { - "inputhandling.h": "c", - "isometricmap.h": "c" + "isometricrenderer.h": "c" } } \ No newline at end of file diff --git a/inputHandler.c b/Input/inputHandler.c similarity index 99% rename from inputHandler.c rename to Input/inputHandler.c index 0486e71..6bf4066 100644 --- a/inputHandler.c +++ b/Input/inputHandler.c @@ -1,6 +1,6 @@ #include "inputHandler.h" #include "raylib.h" -#include "sprite.h" +#include "../sprite.h" #include #include #include diff --git a/inputHandler.h b/Input/inputHandler.h similarity index 93% rename from inputHandler.h rename to Input/inputHandler.h index a13c63d..cf0ddc0 100644 --- a/inputHandler.h +++ b/Input/inputHandler.h @@ -1,7 +1,7 @@ #ifndef INPUTHANDLER_H_ #define INPUTHANDLER_H_ #include "raylib.h" -#include "sprite.h" +#include "../sprite.h" typedef struct InputHandler{ int pressed; diff --git a/isometricMap.c b/IsometricMap/isometricMap.c similarity index 100% rename from isometricMap.c rename to IsometricMap/isometricMap.c diff --git a/isometricMap.h b/IsometricMap/isometricMap.h similarity index 100% rename from isometricMap.h rename to IsometricMap/isometricMap.h diff --git a/isometricRenderer.c b/IsometricMap/isometricRenderer.c similarity index 100% rename from isometricRenderer.c rename to IsometricMap/isometricRenderer.c diff --git a/isometricRenderer.h b/IsometricMap/isometricRenderer.h similarity index 100% rename from isometricRenderer.h rename to IsometricMap/isometricRenderer.h diff --git a/tile.c b/IsometricMap/tile.c similarity index 100% rename from tile.c rename to IsometricMap/tile.c diff --git a/tile.h b/IsometricMap/tile.h similarity index 100% rename from tile.h rename to IsometricMap/tile.h diff --git a/Makefile b/Makefile index a98a099..e3d2fc2 100644 --- a/Makefile +++ b/Makefile @@ -7,20 +7,20 @@ main.o: main.c sprite.o: sprite.c gcc -c sprite.c -lraylib -lGL -lm -lpthread -ldl -lrt -lX11 -inputHandler.o: inputHandler.c - gcc -c inputHandler.c -lraylib -lGL -lm -lpthread -ldl -lrt -lX11 +inputHandler.o: Input/inputHandler.c + gcc -c Input/inputHandler.c -lraylib -lGL -lm -lpthread -ldl -lrt -lX11 list.o: List/list.c gcc -c List/list.c -isometricRenderer.o: isometricRenderer.c - gcc -c isometricRenderer.c -lraylib -lGL -lm -lpthread -ldl -lrt -lX11 +isometricRenderer.o: IsometricMap/isometricRenderer.c + gcc -c IsometricMap/isometricRenderer.c -lraylib -lGL -lm -lpthread -ldl -lrt -lX11 -isometricMap.o: isometricMap.c - gcc -c isometricMap.c -lraylib -lGL -lm -lpthread -ldl -lrt -lX11 +isometricMap.o: IsometricMap/isometricMap.c + gcc -c IsometricMap/isometricMap.c -lraylib -lGL -lm -lpthread -ldl -lrt -lX11 -tile.o: tile.c - gcc -c tile.c -lraylib -lGL -lm -lpthread -ldl -lrt -lX11 +tile.o: IsometricMap/tile.c + gcc -c IsometricMap/tile.c -lraylib -lGL -lm -lpthread -ldl -lrt -lX11 clean: rm *.o spiel diff --git a/README.md b/README.md index 48795cf..479fa7c 100644 --- a/README.md +++ b/README.md @@ -13,5 +13,6 @@ Fantasy Welt oder Realistisch? ## TODO -- Macht es Sinn ein einzelnes "Game" struct zu haben, das alle möglichen Pointer hat zu allen arrays, camera, textures etc? -- Bug in isometricRenderer.c -> Segmentation Fault \ No newline at end of file ++ Bug in isometricRenderer.c -> Segmentation Fault ++ Sprites in LinkedList speichern ++ LinkedList erweitern diff --git a/main.c b/main.c index 0fb7c36..2e9d7c7 100644 --- a/main.c +++ b/main.c @@ -2,27 +2,24 @@ #include "stdio.h" #include #include "sprite.h" -#include "inputHandler.h" +#include "Input/inputHandler.h" #include "raymath.h" #include "List/list.h" -#include "isometricRenderer.h" -#include "isometricMap.h" +#include "IsometricMap/isometricRenderer.h" +#include "IsometricMap/isometricMap.h" int main(){ InitWindow(800, 450, "basic window"); - - Texture2D texture; + Sprite sprites[100]; + int spriteAmount = 0; + Texture2D texture; texture = LoadTexture("assets/amulet.png"); - Texture2D isometricTexture = LoadTexture("assets/grass.png"); - IsometricRenderer *isometricRenderer = (IsometricRenderer *) malloc(sizeof(IsometricRenderer)); - isometricRenderer->texture = &isometricTexture; - - int spriteAmount = 0; Sprite cursorSprite = {&texture, 450, 225}; + SpriteAdd(sprites, &spriteAmount, &texture, 0, 0); InputHandler inputHandler; @@ -31,8 +28,6 @@ int main(){ camera.rotation = 0.0f; camera.zoom = 1.0f; - SpriteAdd(sprites, &spriteAmount, &texture, 0, 0); - IsometricMap *map = IsometricMapInit(20, 10); SetTargetFPS(60);