diff --git a/README.md b/README.md index e9151f5..4b4732c 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,4 @@ Fantasy Welt oder Realistisch? ## TODO -- Bug with movement of sprite after spawning a few other sprites -- Drawn Rectangle problems with negative width/height -- Selecting Sprites for moving all selected to the same destination \ No newline at end of file +- Macht es Sinn ein einzelnes "Game" struct zu haben, das alle möglichen Pointer hat zu allen arrays, camera, textures etc? diff --git a/inputHandler.c b/inputHandler.c index 1012804..3bf879f 100644 --- a/inputHandler.c +++ b/inputHandler.c @@ -3,9 +3,6 @@ #include "sprite.h" #include -//TODO: Macht es Sinn ein einzelnes "Game" struct zu haben, das alle möglichen Pointer hat zu allen arrays, camera, textures etc? -// Man hat einen Übergabeparameter mit dem man dann alles verändern kann, man muss nicht alles was man verändern will einzeln übergeben - void mouseInput(InputHandler *inputHandler, Sprite *sprites, int *spriteAmount, Texture2D *texture, Camera2D *camera){ inputHandler->cursorPos.x = GetMousePosition().x; @@ -28,7 +25,6 @@ void mouseInput(InputHandler *inputHandler, Sprite *sprites, int *spriteAmount, float width = GetMousePosition().x - inputHandler->rectStart.x; float height = GetMousePosition().y - inputHandler->rectStart.y; if(width + height <= 1){ - //printf("Klick\n"); SpriteAdd(sprites, spriteAmount, texture, inputHandler->cursorPos.x + (*camera).target.x - (texture->width)/2, inputHandler->cursorPos.y + (*camera).target.y - (texture->height)/2); } } diff --git a/inputHandler.o b/inputHandler.o deleted file mode 100644 index 91d79f0..0000000 Binary files a/inputHandler.o and /dev/null differ diff --git a/isometricMap.c b/isometricMap.c index f2f8dd6..7865edf 100644 --- a/isometricMap.c +++ b/isometricMap.c @@ -4,10 +4,8 @@ IsometricMap * IsometricMapInit(int x, int y){ IsometricMap* map = (IsometricMap *) malloc(sizeof(IsometricMap)); - //Texture2D textures[10]; map->tileTextures[0] = LoadTexture("assets/grass.png"); map->tileTextures[1] = LoadTexture("assets/tower.png"); - //map->tileTextures = textures; Tile* tiles[x]; int n = 0; @@ -15,15 +13,12 @@ IsometricMap * IsometricMapInit(int x, int y){ tiles[n] = (Tile*)malloc(y*sizeof(Tile)); } - //printf("%ld\n", sizeof(tiles)); - map->sizeX = x; map->sizeY = y; int i = 0; int j = 0; - for(i=0; i < x; i++){ for(j=0; j < y; j++){ if(i != j){ @@ -44,8 +39,6 @@ IsometricMap * IsometricMapInit(int x, int y){ Vector2 * IsometricMapCalcOffsetForTileAt(int x, int y, int textureSize){ - //Vector2 offset = {0, 0}; - Vector2* offset = (Vector2 *)malloc(sizeof(Vector2)); offset->x = x * textureSize/2; diff --git a/isometricMap.h b/isometricMap.h index 5a77fb0..03b833d 100644 --- a/isometricMap.h +++ b/isometricMap.h @@ -5,20 +5,18 @@ typedef struct IsometricMap{ Texture2D tileTextures[10]; - //tiles -> two dimensional Array Tile **tiles; int sizeX; int sizeY; } IsometricMap; +// TODO: void IsometricMapAddTile(IsometricMap isometricMap); - Tile IsometricMapGetTileFromArrayPosition(int x, int y); - Tile IsometricMapGetTileFromWorldCoordinates(float x, float y); - Vector2 * IsometricMapCalcOffsetForTileAt(int x, int y, int textureSize); +// Working IsometricMap * IsometricMapInit(int x, int y); #endif \ No newline at end of file diff --git a/isometricMap.o b/isometricMap.o deleted file mode 100644 index a5159da..0000000 Binary files a/isometricMap.o and /dev/null differ diff --git a/isometricRenderer.o b/isometricRenderer.o deleted file mode 100644 index cfb8467..0000000 Binary files a/isometricRenderer.o and /dev/null differ diff --git a/main.c b/main.c index 54c0991..08d0f4d 100644 --- a/main.c +++ b/main.c @@ -43,8 +43,6 @@ int main(){ BeginMode2D(camera); - //IsometricRendererRenderMap(&isometricRenderer, 50); - IsometricRendererRenderIsometricMap(map); int i; diff --git a/main.o b/main.o deleted file mode 100644 index 04d3f5e..0000000 Binary files a/main.o and /dev/null differ diff --git a/spiel b/spiel deleted file mode 100755 index 5b3d1c4..0000000 Binary files a/spiel and /dev/null differ diff --git a/sprite.o b/sprite.o deleted file mode 100644 index a7d1287..0000000 Binary files a/sprite.o and /dev/null differ diff --git a/tile.o b/tile.o deleted file mode 100644 index ec204ad..0000000 Binary files a/tile.o and /dev/null differ