Ordnerstruktur aufgeräumt und README geupdated

main
Jonathan Hager 3 years ago
parent 201ed7f070
commit 4a1a2cb4e3
Signed by: JonathanHager
GPG Key ID: 34881E488569708C

@ -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
}

@ -1,6 +1,6 @@
{ {
"C_Cpp.errorSquiggles": "Disabled",
"files.associations": { "files.associations": {
"inputhandling.h": "c", "isometricrenderer.h": "c"
"isometricmap.h": "c"
} }
} }

@ -1,6 +1,6 @@
#include "inputHandler.h" #include "inputHandler.h"
#include "raylib.h" #include "raylib.h"
#include "sprite.h" #include "../sprite.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <math.h> #include <math.h>

@ -1,7 +1,7 @@
#ifndef INPUTHANDLER_H_ #ifndef INPUTHANDLER_H_
#define INPUTHANDLER_H_ #define INPUTHANDLER_H_
#include "raylib.h" #include "raylib.h"
#include "sprite.h" #include "../sprite.h"
typedef struct InputHandler{ typedef struct InputHandler{
int pressed; int pressed;

@ -7,20 +7,20 @@ main.o: main.c
sprite.o: sprite.c sprite.o: sprite.c
gcc -c sprite.c -lraylib -lGL -lm -lpthread -ldl -lrt -lX11 gcc -c sprite.c -lraylib -lGL -lm -lpthread -ldl -lrt -lX11
inputHandler.o: inputHandler.c inputHandler.o: Input/inputHandler.c
gcc -c inputHandler.c -lraylib -lGL -lm -lpthread -ldl -lrt -lX11 gcc -c Input/inputHandler.c -lraylib -lGL -lm -lpthread -ldl -lrt -lX11
list.o: List/list.c list.o: List/list.c
gcc -c List/list.c gcc -c List/list.c
isometricRenderer.o: isometricRenderer.c isometricRenderer.o: IsometricMap/isometricRenderer.c
gcc -c isometricRenderer.c -lraylib -lGL -lm -lpthread -ldl -lrt -lX11 gcc -c IsometricMap/isometricRenderer.c -lraylib -lGL -lm -lpthread -ldl -lrt -lX11
isometricMap.o: isometricMap.c isometricMap.o: IsometricMap/isometricMap.c
gcc -c isometricMap.c -lraylib -lGL -lm -lpthread -ldl -lrt -lX11 gcc -c IsometricMap/isometricMap.c -lraylib -lGL -lm -lpthread -ldl -lrt -lX11
tile.o: tile.c tile.o: IsometricMap/tile.c
gcc -c tile.c -lraylib -lGL -lm -lpthread -ldl -lrt -lX11 gcc -c IsometricMap/tile.c -lraylib -lGL -lm -lpthread -ldl -lrt -lX11
clean: clean:
rm *.o spiel rm *.o spiel

@ -13,5 +13,6 @@ Fantasy Welt oder Realistisch?
## TODO ## 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
- Bug in isometricRenderer.c -> Segmentation Fault + Sprites in LinkedList speichern
+ LinkedList erweitern

@ -2,27 +2,24 @@
#include "stdio.h" #include "stdio.h"
#include <stdlib.h> #include <stdlib.h>
#include "sprite.h" #include "sprite.h"
#include "inputHandler.h" #include "Input/inputHandler.h"
#include "raymath.h" #include "raymath.h"
#include "List/list.h" #include "List/list.h"
#include "isometricRenderer.h" #include "IsometricMap/isometricRenderer.h"
#include "isometricMap.h" #include "IsometricMap/isometricMap.h"
int main(){ int main(){
InitWindow(800, 450, "basic window"); InitWindow(800, 450, "basic window");
Texture2D texture;
Sprite sprites[100]; Sprite sprites[100];
int spriteAmount = 0;
Texture2D texture;
texture = LoadTexture("assets/amulet.png"); 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}; Sprite cursorSprite = {&texture, 450, 225};
SpriteAdd(sprites, &spriteAmount, &texture, 0, 0);
InputHandler inputHandler; InputHandler inputHandler;
@ -31,8 +28,6 @@ int main(){
camera.rotation = 0.0f; camera.rotation = 0.0f;
camera.zoom = 1.0f; camera.zoom = 1.0f;
SpriteAdd(sprites, &spriteAmount, &texture, 0, 0);
IsometricMap *map = IsometricMapInit(20, 10); IsometricMap *map = IsometricMapInit(20, 10);
SetTargetFPS(60); SetTargetFPS(60);

Loading…
Cancel
Save