diff options
| -rw-r--r-- | main.c | 685 | ||||
| -rw-r--r-- | maker.c | 383 |
2 files changed, 519 insertions, 549 deletions
@@ -1,8 +1,8 @@ #include <SDL2/SDL.h> #include <SDL2/SDL_ttf.h> +#include <math.h> #include <stdbool.h> #include <stdio.h> -#include <math.h> #define WINDOW_WIDTH 1920 #define WINDOW_HEIGHT 1088 @@ -15,26 +15,25 @@ // Map loading - needs to save maps to files. Maybe implement a map editor -// Enemies - Some kind of AI? gotta shoot at you and do damage. Maybe less chance to hit when moving +// Enemies - Some kind of AI? gotta shoot at you and do damage. Maybe less +// chance to hit when moving -// Weapons - need some sort of graphic for different weapon types. Have to shoot and be able to hit things. Hitboxes for enemies and such. +// Weapons - need some sort of graphic for different weapon types. Have to shoot +// and be able to hit things. Hitboxes for enemies and such. -struct Tile -{ +struct Tile { int type; bool discovered; }; -struct Player -{ +struct Player { float x; float y; float angle; int health; }; -struct Ray -{ +struct Ray { float angle; float xDir; float yDir; @@ -42,20 +41,19 @@ struct Ray int type; }; -void printText(SDL_Renderer *renderer, TTF_Font *font, char *str, int x, int y, int h, int r, int g, int b) - { - SDL_Color c = {r, g, b, 255}; +void printText(SDL_Renderer *renderer, TTF_Font *font, char *str, int x, int y, + int h, int r, int g, int b) { + SDL_Color c = {r, g, b, 255}; - SDL_Surface *s = TTF_RenderText_Solid(font, str, c); - SDL_Texture *t = SDL_CreateTextureFromSurface(renderer, s); + SDL_Surface *s = TTF_RenderText_Solid(font, str, c); + SDL_Texture *t = SDL_CreateTextureFromSurface(renderer, s); - SDL_Rect rect = {x, y, strlen(str) * (h / 2), h}; + SDL_Rect rect = {x, y, strlen(str) * (h / 2), h}; - SDL_RenderCopy(renderer, t, NULL, &rect); - } + SDL_RenderCopy(renderer, t, NULL, &rect); +} -void loadMap(char *file, int map_w, int map_h, struct Tile map[map_w][map_h]) -{ +void loadMap(char *file, int map_w, int map_h, struct Tile map[map_w][map_h]) { FILE *f; char mapString[64]; f = fopen(file, "r"); @@ -63,16 +61,12 @@ void loadMap(char *file, int map_w, int map_h, struct Tile map[map_w][map_h]) fgets(mapString, 64, f); int ch = getc(f), x = 0, y = 0; - while(ch != EOF) - { + while (ch != EOF) { printf("%c", ch); - if(ch == '\n') - { + if (ch == '\n') { y++; x = 0; - } - else - { + } else { map[x][y].type = ch - '0'; x++; } @@ -80,346 +74,339 @@ void loadMap(char *file, int map_w, int map_h, struct Tile map[map_w][map_h]) } } -float shootRay(float xDir, float yDir, float x, float y, float angle, float baseAngle, float map_depth, int map_w, int map_h, struct Tile map[map_w][map_h], int *type) - { - float stepX, stepY, vx, vy, hx, hy; - bool hit; - //Checking Vertical Intersections - if(xDir < 0.0) - { - stepX = -1; - vx = floor(x); - } - else - { - stepX = 1; - vx = ceil(x); - } - if(yDir < 0.0) - vy = y - (fabs(vx - x) * fabs(tan(angle))); +float shootRay(float xDir, float yDir, float x, float y, float angle, + float baseAngle, float map_depth, int map_w, int map_h, + struct Tile map[map_w][map_h], int *type) { + float stepX, stepY, vx, vy, hx, hy; + bool hit; + // Checking Vertical Intersections + if (xDir < 0.0) { + stepX = -1; + vx = floor(x); + } else { + stepX = 1; + vx = ceil(x); + } + if (yDir < 0.0) + vy = y - (fabs(vx - x) * fabs(tan(angle))); + else + vy = y + (fabs(vx - x) * fabs(tan(angle))); + + // printf("xDir: %f yDir: %f\n", xDir, yDir); + // printf("--- Vertical check ---\n"); + // printf("x: %f, y: %f", vx, vy); + if (sqrt(pow(fabs(vx - x), 2) + pow(fabs(vy - y), 2)) > map_depth) + hit = true; + else if (xDir < 0.0 && map[(int)vx - 1][(int)vy].type != 0) + hit = true; + else if (map[(int)vx][(int)vy].type != 0) + hit = true; + else + hit = false; + // printf(" hit: %b\n", hit); + while (!hit) { + vx += stepX; + if (yDir < 0.0) + vy -= fabs(tan(angle)); else - vy = y + (fabs(vx - x) * fabs(tan(angle))); - - //printf("xDir: %f yDir: %f\n", xDir, yDir); - //printf("--- Vertical check ---\n"); - //printf("x: %f, y: %f", vx, vy); - if(sqrt(pow(fabs(vx - x), 2) + pow(fabs(vy - y), 2)) > map_depth) + vy += fabs(tan(angle)); + // printf("x: %f, y: %f", vx, vy); + if (sqrt(pow(fabs(vx - x), 2) + pow(fabs(vy - y), 2)) > map_depth) hit = true; - else if(xDir < 0.0 && map[(int)vx - 1][(int)vy].type != 0) - hit = true; - else if(map[(int)vx][(int)vy].type != 0) + else if (xDir < 0.0 && map[(int)vx - 1][(int)vy].type != 0) hit = true; - else - hit = false; - //printf(" hit: %b\n", hit); - while(!hit) - { - vx += stepX; - if(yDir < 0.0) - vy -= fabs(tan(angle)); - else - vy += fabs(tan(angle)); - //printf("x: %f, y: %f", vx, vy); - if(sqrt(pow(fabs(vx - x), 2) + pow(fabs(vy - y), 2)) > map_depth) - hit = true; - else if(xDir < 0.0 && map[(int)vx - 1][(int)vy].type != 0) - hit = true; - else if(map[(int)vx][(int)vy].type != 0) - hit = true; - //printf(" hit: %b\n", hit); - } - //printf("distance: %f\n", sqrt(pow(fabs(vx - x), 2) + pow(fabs(vy - y), 2))); - //printf("--- Done ---\n\n"); - - //Checking Horizontal Intersections - if(yDir < 0.0) - { - stepY = -1; - hy = floor(y); - } - else - { - stepY = 1; - hy = ceil(y); - } + else if (map[(int)vx][(int)vy].type != 0) + hit = true; + // printf(" hit: %b\n", hit); + } + // printf("distance: %f\n", sqrt(pow(fabs(vx - x), 2) + pow(fabs(vy - y), + // 2))); printf("--- Done ---\n\n"); + + // Checking Horizontal Intersections + if (yDir < 0.0) { + stepY = -1; + hy = floor(y); + } else { + stepY = 1; + hy = ceil(y); + } - if(xDir < 0.0) - hx = x - (fabs(hy - y) / fabs(tan(angle))); + if (xDir < 0.0) + hx = x - (fabs(hy - y) / fabs(tan(angle))); + else + hx = x + (fabs(hy - y) / fabs(tan(angle))); + + // printf("--- Horizontal check ---\n"); + // printf("x: %f, y: %f", hx, hy); + if (sqrt(pow(fabs(hx - x), 2) + pow(fabs(y - hy), 2)) > map_depth) + hit = true; + else if (yDir < 0.0 && map[(int)hx][(int)hy - 1].type != 0) + hit = true; + else if (map[(int)hx][(int)hy].type != 0) + hit = true; + else + hit = false; + // printf(" hit: %b\n", hit); + while (!hit) { + hy += stepY; + if (xDir < 0.0) + hx -= 1 / fabs(tan(angle)); else - hx = x + (fabs(hy - y) / fabs(tan(angle))); - - //printf("--- Horizontal check ---\n"); - //printf("x: %f, y: %f", hx, hy); - if(sqrt(pow(fabs(hx - x), 2) + pow(fabs(y - hy), 2)) > map_depth) + hx += 1 / fabs(tan(angle)); + // printf("x: %f, y: %f", hx, hy); + if (sqrt(pow(fabs(hx - x), 2) + pow(fabs(hy - y), 2)) > map_depth) + hit = true; + else if (yDir < 0.0 && map[(int)hx][(int)hy - 1].type != 0) hit = true; - else if(yDir < 0.0 && map[(int)hx][(int)hy - 1].type != 0) - hit = true; - else if(map[(int)hx][(int)hy].type != 0) + else if (map[(int)hx][(int)hy].type != 0) hit = true; + // printf(" hit: %b\n", hit); + } + // printf("distance: %f\n", sqrt(pow(fabs(hx - x), 2) + pow(fabs(hy - y), + // 2))); printf("--- Done ---\n\n"); + + float vdistance = sqrt(pow(fabs(vx - x), 2) + pow(fabs(vy - y), 2)), + hdistance = sqrt(pow(fabs(hx - x), 2) + pow(fabs(hy - y), 2)); + if (vdistance < hdistance) { + // if((fabs(ceil(vx) - vx) < 0.05) && (fabs(ceil(vy) - vy) < 0.05)) + // *type = 0; + if (xDir < 0.0) + *type = map[(int)vx - 1][(int)vy].type; else - hit = false; - //printf(" hit: %b\n", hit); - while(!hit) - { - hy += stepY; - if(xDir < 0.0) - hx -= 1/fabs(tan(angle)); - else - hx += 1/fabs(tan(angle)); - //printf("x: %f, y: %f", hx, hy); - if(sqrt(pow(fabs(hx - x), 2) + pow(fabs(hy - y), 2)) > map_depth) - hit = true; - else if(yDir < 0.0 && map[(int)hx][(int)hy - 1].type != 0) - hit = true; - else if(map[(int)hx][(int)hy].type != 0) - hit = true; - //printf(" hit: %b\n", hit); - } - //printf("distance: %f\n", sqrt(pow(fabs(hx - x), 2) + pow(fabs(hy - y), 2))); - //printf("--- Done ---\n\n"); - - float vdistance = sqrt(pow(fabs(vx - x), 2) + pow(fabs(vy - y), 2)), hdistance = sqrt(pow(fabs(hx - x), 2) + pow(fabs(hy - y), 2)); - if(vdistance < hdistance) - { - //if((fabs(ceil(vx) - vx) < 0.05) && (fabs(ceil(vy) - vy) < 0.05)) - // *type = 0; - if(xDir < 0.0) - *type = map[(int)vx - 1][(int)vy].type; - else - *type = map[(int)vx][(int)vy].type; - return(vdistance * cos(angle - baseAngle)); - } + *type = map[(int)vx][(int)vy].type; + return (vdistance * cos(angle - baseAngle)); + } else { + // if((fabs(ceil(hx) -hx) < 0.05) && (fabs(ceil(hy) - hy) < 0.05)) + // *type = 0; + if (yDir < 0.0) + *type = map[(int)hx][(int)hy - 1].type; else - { - //if((fabs(ceil(hx) -hx) < 0.05) && (fabs(ceil(hy) - hy) < 0.05)) - // *type = 0; - if(yDir < 0.0) - *type = map[(int)hx][(int)hy - 1].type; - else - *type = map[(int)hx][(int)hy].type; - return(hdistance * cos(angle - baseAngle)); - } + *type = map[(int)hx][(int)hy].type; + return (hdistance * cos(angle - baseAngle)); + } +} + +bool gameLoop(int map_w, int map_h, SDL_Renderer *renderer, SDL_Event event, + SDL_Window *window, struct Tile map[map_w][map_h]) { + int framerate = 30, ticksPerFrame = 1000 / framerate, startFrame = 0, + ray_n = WINDOW_WIDTH / 2; + float fov = 90 * (M_PI / 180), angle_step = fov / ray_n, + map_depth = sqrt(pow(map_w, 2) + pow(map_h, 2)), acceleration = 0.0, + sideAcceleration = 0.0, mouseMovement; + bool end = false; + + SDL_Rect floor = {0, WINDOW_HEIGHT / 2, WINDOW_WIDTH, WINDOW_HEIGHT / 2}; + SDL_Rect skybox = {0, 0, WINDOW_WIDTH, WINDOW_HEIGHT / 2}; + + // Make minimap squares 60x60 pixels. DONE + SDL_Rect minimap[map_w][map_h]; + for (int y = 0; y < map_h; y++) { + for (int x = 0; x < map_w; x++) { + minimap[x][y].x = x * 34 + WINDOW_WIDTH; + minimap[x][y].y = y * 34; + minimap[x][y].w = 34; + minimap[x][y].h = 34; + } } -bool gameLoop(int map_w, int map_h, SDL_Renderer *renderer, SDL_Event event, SDL_Window* window, struct Tile map[map_w][map_h]) - { - int framerate = 30, ticksPerFrame = 1000/framerate, startFrame = 0, ray_n = WINDOW_WIDTH / 2; - float fov = 90 * (M_PI/180), angle_step = fov/ray_n, map_depth = sqrt(pow(map_w, 2) + pow(map_h, 2)), acceleration = 0.0, sideAcceleration = 0.0, mouseMovement; - bool end = false; - - SDL_Rect floor = {0, WINDOW_HEIGHT / 2, WINDOW_WIDTH, WINDOW_HEIGHT / 2}; - SDL_Rect skybox = {0, 0, WINDOW_WIDTH, WINDOW_HEIGHT / 2}; - - // Make minimap squares 60x60 pixels. DONE - SDL_Rect minimap[map_w][map_h]; - for(int y = 0;y < map_h;y++) - { - for(int x = 0;x < map_w;x++) - { - minimap[x][y].x = x * 34 + WINDOW_WIDTH; - minimap[x][y].y = y * 34; - minimap[x][y].w = 34; - minimap[x][y].h = 34; - } + struct Player player; + player.x = 3.95; + player.y = 3.95; + player.angle = 0.0; + player.health = 10; + + // struct Ray ray[ray_n]; + struct Ray ray[ray_n + 1]; + SDL_Rect rayDisplay[ray_n + 1]; + + while (!end) { + startFrame = SDL_GetTicks(); + SDL_RenderClear(renderer); + + // Make player shoot out rays from position with an FoV of 60 degrees DONE + for (int i = 0; i <= ray_n; i++) { + ray[i].angle = player.angle - (fov / 2) + (angle_step * i); + ray[i].xDir = cos(ray[i].angle); + ray[i].yDir = sin(ray[i].angle); + + ray[i].distance = + shootRay(ray[i].xDir, ray[i].yDir, player.x, player.y, ray[i].angle, + player.angle, map_depth, map_w, map_h, map, &ray[i].type); + } + + /* --- CONTROLS --- */ + mouseMovement = 0; + while (SDL_PollEvent(&event)) { + switch (event.type) { + case SDL_MOUSEMOTION: + mouseMovement = (float)event.motion.xrel; + break; + case SDL_QUIT: + return true; + break; } + } + player.angle += mouseMovement / 25; + const Uint8 *keys = SDL_GetKeyboardState(NULL); + if (keys[SDL_SCANCODE_W]) { + if (acceleration < 0.5) + acceleration += 0.1; + } + if (keys[SDL_SCANCODE_S]) { + if (acceleration > -0.5) + acceleration -= 0.1; + } + if (keys[SDL_SCANCODE_A]) { + if (sideAcceleration < 0.5) + sideAcceleration -= 0.1; + } + if (keys[SDL_SCANCODE_D]) { + if (sideAcceleration > -0.5) + sideAcceleration += 0.1; + } + if (keys[SDL_SCANCODE_Q]) { + player.angle -= 5 * angle_step; + if (player.angle < 0.0) + player.angle += 2 * M_PI; + } + if (keys[SDL_SCANCODE_E]) { + player.angle += 5 * angle_step; + if (player.angle > 2 * M_PI) + player.angle -= 2 * M_PI; + } - struct Player player; - player.x = 3.95; - player.y = 3.95; - player.angle = 0.0; - player.health = 10; - - //struct Ray ray[ray_n]; - struct Ray ray[ray_n + 1]; - SDL_Rect rayDisplay[ray_n + 1]; - - while(!end) - { - startFrame = SDL_GetTicks(); - SDL_RenderClear(renderer); - - // Make player shoot out rays from position with an FoV of 60 degrees DONE - for(int i = 0;i <= ray_n;i++) - { - ray[i].angle = player.angle - (fov / 2) + (angle_step * i); - ray[i].xDir = cos(ray[i].angle); - ray[i].yDir = sin(ray[i].angle); - - ray[i].distance = shootRay(ray[i].xDir, ray[i].yDir, player.x, player.y, ray[i].angle, player.angle, map_depth, map_w, map_h, map, &ray[i].type); - } - - /* --- CONTROLS --- */ - mouseMovement = 0; - while(SDL_PollEvent(&event)) - { - switch(event.type) - { - case SDL_MOUSEMOTION: - mouseMovement = (float)event.motion.xrel; - break; - case SDL_QUIT: - return true; - break; - } - } - player.angle += mouseMovement / 25; - const Uint8* keys = SDL_GetKeyboardState(NULL); - if(keys[SDL_SCANCODE_W]) - { - if(acceleration < 0.5) - acceleration += 0.1; - } - if(keys[SDL_SCANCODE_S]) - { - if(acceleration > -0.5) - acceleration -= 0.1; - } - if(keys[SDL_SCANCODE_A]) - { - if(sideAcceleration < 0.5) - sideAcceleration -= 0.1; - } - if(keys[SDL_SCANCODE_D]) - { - if(sideAcceleration > -0.5) - sideAcceleration += 0.1; - } - if(keys[SDL_SCANCODE_Q]) - { - player.angle -= 5 * angle_step; - if(player.angle < 0.0) - player.angle += 2 * M_PI; - } - if(keys[SDL_SCANCODE_E]) - { - player.angle += 5 * angle_step; - if(player.angle > 2 * M_PI) - player.angle -= 2 * M_PI; - } - - if(map[(int)(player.x + acceleration * cos(player.angle))][(int)(player.y + acceleration * sin(player.angle))].type == 0) - { - player.x += acceleration * cos(player.angle); - player.y += acceleration * sin(player.angle); - } - if(map[(int)(player.x + sideAcceleration * cos(player.angle + M_PI_2))][(int)(player.y + sideAcceleration * sin(player.angle + M_PI_2))].type == 0) - { - player.x += sideAcceleration * cos(player.angle + M_PI_2); - player.y += sideAcceleration * sin(player.angle + M_PI_2); - } - if(acceleration > 0.0) - acceleration -= 0.1; - else if(acceleration < 0.0) - acceleration += 0.1; - if(acceleration < 0.01 && acceleration > -0.01) - acceleration = 0.0; - - if(sideAcceleration > 0.0) - sideAcceleration -= 0.1; - else if(sideAcceleration < 0.0) - sideAcceleration += 0.1; - if(sideAcceleration < 0.01 && sideAcceleration > -0.01) - sideAcceleration = 0.0; - - /* --- RENDERING --- */ - SDL_SetRenderDrawColor(renderer, 0, 213, 255, 255); - SDL_RenderFillRect(renderer, &skybox); - SDL_SetRenderDrawColor(renderer, 100, 100, 100, 255); - SDL_RenderFillRect(renderer, &floor); + if (map[(int)(player.x + acceleration * cos(player.angle))] + [(int)(player.y + acceleration * sin(player.angle))] + .type == 0) { + player.x += acceleration * cos(player.angle); + player.y += acceleration * sin(player.angle); + } + if (map[(int)(player.x + sideAcceleration * cos(player.angle + M_PI_2))] + [(int)(player.y + sideAcceleration * sin(player.angle + M_PI_2))] + .type == 0) { + player.x += sideAcceleration * cos(player.angle + M_PI_2); + player.y += sideAcceleration * sin(player.angle + M_PI_2); + } + if (acceleration > 0.0) + acceleration -= 0.1; + else if (acceleration < 0.0) + acceleration += 0.1; + if (acceleration < 0.01 && acceleration > -0.01) + acceleration = 0.0; + + if (sideAcceleration > 0.0) + sideAcceleration -= 0.1; + else if (sideAcceleration < 0.0) + sideAcceleration += 0.1; + if (sideAcceleration < 0.01 && sideAcceleration > -0.01) + sideAcceleration = 0.0; + + /* --- RENDERING --- */ + SDL_SetRenderDrawColor(renderer, 0, 213, 255, 255); + SDL_RenderFillRect(renderer, &skybox); + SDL_SetRenderDrawColor(renderer, 100, 100, 100, 255); + SDL_RenderFillRect(renderer, &floor); + SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255); + for (int y = 0; y < map_h; y++) { + for (int x = 0; x < map_w; x++) { + if (map[x][y].type == 0) + SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255); + if (map[x][y].type == 1) + SDL_SetRenderDrawColor(renderer, 255, 0, 0, 255); + if (map[x][y].type == 2) + SDL_SetRenderDrawColor(renderer, 0, 255, 0, 255); + if (map[x][y].type == 3) + SDL_SetRenderDrawColor(renderer, 0, 0, 255, 255); + SDL_RenderFillRect(renderer, &minimap[x][y]); + SDL_SetRenderDrawColor(renderer, 100, 100, 100, 50); + SDL_RenderDrawLine(renderer, (x * 34) + WINDOW_WIDTH, y * 34, + (x * 34) + 1920 + 34, y * 34); + SDL_RenderDrawLine(renderer, (x * 34) + WINDOW_WIDTH, y * 34, + (x * 34) + WINDOW_WIDTH, (y * 34) + 34); SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255); - for(int y = 0;y < map_h;y++) - { - for(int x = 0;x < map_w;x++) - { - if(map[x][y].type == 0) - SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255); - if(map[x][y].type == 1) - SDL_SetRenderDrawColor(renderer, 255, 0, 0, 255); - if(map[x][y].type == 2) - SDL_SetRenderDrawColor(renderer, 0, 255, 0, 255); - if(map[x][y].type == 3) - SDL_SetRenderDrawColor(renderer, 0, 0, 255, 255); - SDL_RenderFillRect(renderer, &minimap[x][y]); - SDL_SetRenderDrawColor(renderer, 100, 100, 100, 50); - SDL_RenderDrawLine(renderer, (x * 34) + WINDOW_WIDTH, y * 34, (x * 34) + 1920 + 34, y * 34); - SDL_RenderDrawLine(renderer, (x * 34) + WINDOW_WIDTH, y * 34, (x * 34) + WINDOW_WIDTH, (y * 34) + 34); - SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255); - } - } - - for(int i = 0;i <= ray_n;i++) - { - rayDisplay[i].w = 2; - rayDisplay[i].h = 800 / ray[i].distance; - rayDisplay[i].x = i * 2; - rayDisplay[i].y = WINDOW_HEIGHT / 2 - (rayDisplay[i].h / 2); - //if(ray[i].type == 0) - // SDL_SetRenderDrawColor(renderer, 50, 50, 50, 255); - if(ray[i].type == 1) - SDL_SetRenderDrawColor(renderer, 255, 0, 0, 255); - else if(ray[i].type == 2) - SDL_SetRenderDrawColor(renderer, 0, 255, 0, 255); - else if(ray[i].type == 3) - SDL_SetRenderDrawColor(renderer, 0, 0, 255, 255); - SDL_RenderFillRect(renderer, &rayDisplay[i]); - SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255); - SDL_RenderDrawLine(renderer, (player.x * 34) + WINDOW_WIDTH, player.y * 34, ((player.x + cos(ray[i].angle) * (ray[i].distance / cos(ray[i].angle - player.angle))) * 34) + WINDOW_WIDTH, (player.y + sin(ray[i].angle) * (ray[i].distance / cos(ray[i].angle - player.angle))) * 34); - SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255); - } + } + } + for (int i = 0; i <= ray_n; i++) { + rayDisplay[i].w = 2; + rayDisplay[i].h = 800 / ray[i].distance; + rayDisplay[i].x = i * 2; + rayDisplay[i].y = WINDOW_HEIGHT / 2 - (rayDisplay[i].h / 2); + // if(ray[i].type == 0) + // SDL_SetRenderDrawColor(renderer, 50, 50, 50, 255); + if (ray[i].type == 1) SDL_SetRenderDrawColor(renderer, 255, 0, 0, 255); - //SDL_RenderDrawLine(renderer, (player.x * 60) + WINDOW_WIDTH, player.y * 60, ((player.x + cos(player.angle)) * 60) + WINDOW_WIDTH, (player.y + sin(player.angle)) * 60); - SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255); - SDL_RenderPresent(renderer); - int ticks = startFrame - SDL_GetTicks(); - if(ticks < ticksPerFrame) - SDL_Delay(ticksPerFrame - ticks); - } - return true; + else if (ray[i].type == 2) + SDL_SetRenderDrawColor(renderer, 0, 255, 0, 255); + else if (ray[i].type == 3) + SDL_SetRenderDrawColor(renderer, 0, 0, 255, 255); + SDL_RenderFillRect(renderer, &rayDisplay[i]); + SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255); + SDL_RenderDrawLine( + renderer, (player.x * 34) + WINDOW_WIDTH, player.y * 34, + ((player.x + cos(ray[i].angle) * (ray[i].distance / + cos(ray[i].angle - player.angle))) * + 34) + + WINDOW_WIDTH, + (player.y + sin(ray[i].angle) * (ray[i].distance / + cos(ray[i].angle - player.angle))) * + 34); + SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255); + } + + SDL_SetRenderDrawColor(renderer, 255, 0, 0, 255); + // SDL_RenderDrawLine(renderer, (player.x * 60) + WINDOW_WIDTH, player.y * + // 60, ((player.x + cos(player.angle)) * 60) + WINDOW_WIDTH, (player.y + + // sin(player.angle)) * 60); + SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255); + SDL_RenderPresent(renderer); + int ticks = startFrame - SDL_GetTicks(); + if (ticks < ticksPerFrame) + SDL_Delay(ticksPerFrame - ticks); } + return true; +} -int main() - { - int map_w = 32, map_h = 32; - struct Tile map[map_w][map_h]; - bool quit = false; - - //for(int y = 0;y < map_h;y++) - // { - // for(int x = 0;x < map_w;x++) - // { - // if(x == 0 || x == map_w - 1 || y == 0 || y == map_h - 1) - // map[x][y].type = 1; - // else if(x == 3 && y == 5) - // map[x][y].type = 2; - // else if(x == 2 && y >= 2 && y <= 6) - // map[x][y].type = 3; - // else - // map[x][y].type = 0; - // } - // } - - loadMap("./maps/test-lineless.map", map_w, map_h, map); - - SDL_Window *window; - SDL_Renderer *renderer; - SDL_Event event; - - SDL_Init(SDL_INIT_VIDEO); - TTF_Init(); - - window = SDL_CreateWindow("Doom", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, WINDOW_WIDTH + 1088, WINDOW_HEIGHT, SDL_WINDOW_OPENGL); - renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED); - - SDL_SetRelativeMouseMode(SDL_TRUE); - - while(!quit) - { - quit = gameLoop(map_w, map_h, renderer, event, window, map); - } +int main() { + int map_w = 32, map_h = 32; + struct Tile map[map_w][map_h]; + bool quit = false; + + for (int y = 0; y < map_h; y++) { + for (int x = 0; x < map_w; x++) { + if (x == 0 || x == map_w - 1 || y == 0 || y == map_h - 1) + map[x][y].type = 1; + else if (x == 3 && y == 5) + map[x][y].type = 2; + else if (x == 2 && y >= 2 && y <= 6) + map[x][y].type = 3; + else + map[x][y].type = 0; + } + } - SDL_DestroyRenderer(renderer); - SDL_DestroyWindow(window); - SDL_Quit(); - return 0; + //loadMap("./maps/test.map", map_w, map_h, map); + + SDL_Window *window; + SDL_Renderer *renderer; + SDL_Event event; + + SDL_Init(SDL_INIT_VIDEO); + TTF_Init(); + + window = + SDL_CreateWindow("Doom", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, + WINDOW_WIDTH + 1088, WINDOW_HEIGHT, SDL_WINDOW_OPENGL); + renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED); + + SDL_SetRelativeMouseMode(SDL_TRUE); + + while (!quit) { + quit = gameLoop(map_w, map_h, renderer, event, window, map); } + + SDL_DestroyRenderer(renderer); + SDL_DestroyWindow(window); + SDL_Quit(); + return 0; +} @@ -5,226 +5,209 @@ #define WINDOW_SIDE 800 -struct Tile -{ +struct Tile { int type; }; -void printText(SDL_Renderer *renderer, TTF_Font *font, char *str, int x, int y, int h, int r, int g, int b) - { - SDL_Color c = {r, g, b, 255}; +void printText(SDL_Renderer *renderer, TTF_Font *font, char *str, int x, int y, + int h, int r, int g, int b) { + SDL_Color c = {r, g, b, 255}; - SDL_Surface *s = TTF_RenderText_Solid(font, str, c); - SDL_Texture *t = SDL_CreateTextureFromSurface(renderer, s); + SDL_Surface *s = TTF_RenderText_Solid(font, str, c); + SDL_Texture *t = SDL_CreateTextureFromSurface(renderer, s); - SDL_Rect rect = {x, y, strlen(str) * (h / 2), h}; + SDL_Rect rect = {x, y, strlen(str) * (h / 2), h}; - SDL_RenderCopy(renderer, t, NULL, &rect); + SDL_RenderCopy(renderer, t, NULL, &rect); +} + +int editor(SDL_Renderer *renderer, SDL_Event event, TTF_Font *font, int map_w, + int map_h, struct Tile map[map_w][map_h]) { + int framerate = 30, ticksPerFrame = 1000 / framerate, startFrame = 0; + int mx, my, type = 0, buttonPressed = 0; + float side = WINDOW_SIDE / map_w; + bool quit = false; + char ty[16] = ""; + + SDL_Rect dest[map_w][map_h]; + + for (int y = 0; y < map_h; y++) { + for (int x = 0; x < map_w; x++) { + map[x][y].type = 0; + dest[x][y].w = side; + dest[x][y].h = side; + dest[x][y].x = x * side; + dest[x][y].y = y * side + 40; + } } -int editor(SDL_Renderer *renderer, SDL_Event event, TTF_Font *font, int map_w, int map_h, struct Tile map[map_w][map_h]) - { - int framerate = 30, ticksPerFrame = 1000/framerate, startFrame = 0; - int mx, my, type = 0, buttonPressed = 0; - float side = WINDOW_SIDE / map_w; - bool quit = false; - char ty[16] = ""; - - SDL_Rect dest[map_w][map_h]; - - for(int y = 0;y < map_h;y++) - { - for(int x = 0;x < map_w;x++) - { - map[x][y].type = 0; - dest[x][y].w = side; - dest[x][y].h = side; - dest[x][y].x = x * side; - dest[x][y].y = y * side + 40; - } + while (!quit) { + startFrame = SDL_GetTicks(); + SDL_RenderClear(renderer); + while (SDL_PollEvent(&event)) { + switch (event.type) { + case SDL_KEYDOWN: + switch (event.key.keysym.sym) { + case SDLK_ESCAPE: + return 0; + break; + case SDLK_1: + type = 1; + break; + case SDLK_2: + type = 2; + break; + case SDLK_3: + type = 3; + break; + case SDLK_0: + type = 0; + break; + case SDLK_s: + return 1; + break; + } + break; + case SDL_MOUSEBUTTONDOWN: + switch (event.button.button) { + case SDL_BUTTON_LEFT: + buttonPressed = 1; + break; + } + break; + case SDL_MOUSEBUTTONUP: + buttonPressed = 0; + break; + case SDL_QUIT: + return 0; + break; } - - while(!quit) - { - startFrame = SDL_GetTicks(); - SDL_RenderClear(renderer); - while(SDL_PollEvent(&event)) - { - switch(event.type) - { - case SDL_KEYDOWN: - switch(event.key.keysym.sym) - { - case SDLK_ESCAPE: - return 0; - break; - case SDLK_1: - type = 1; - break; - case SDLK_2: - type = 2; - break; - case SDLK_3: - type = 3; - break; - case SDLK_0: - type = 0; - break; - case SDLK_s: - return 1; - break; - } - break; - case SDL_MOUSEBUTTONDOWN: - switch(event.button.button) - { - case SDL_BUTTON_LEFT: - buttonPressed = 1; - break; - } - break; - case SDL_MOUSEBUTTONUP: - buttonPressed = 0; - break; - case SDL_QUIT: - return 0; - break; - } - } - if(buttonPressed == 1) - { - int x, y; - SDL_GetMouseState(&x, &y); - map[(int)(x / side)][(int)((y - 40) / side)].type = type; - } - - SDL_GetMouseState(&mx, &my); - for(int y = 0;y < map_h;y++) - { - for(int x = 0;x < map_w;x++) - { - if(dest[x][y].x < mx && dest[x][y].x + side > mx && dest[x][y].y < my && dest[x][y].y + side > my) - SDL_SetRenderDrawColor(renderer, 150, 150, 150, 255); - else if(map[x][y].type == 0) - SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255); - if(map[x][y].type == 1) - SDL_SetRenderDrawColor(renderer, 255, 0, 0, 255); - if(map[x][y].type == 2) - SDL_SetRenderDrawColor(renderer, 0, 255, 0, 255); - if(map[x][y].type == 3) - SDL_SetRenderDrawColor(renderer, 0, 0, 255, 255); - SDL_RenderFillRect(renderer, &dest[x][y]); - SDL_SetRenderDrawColor(renderer, 100, 100, 100, 255); - SDL_RenderDrawLine(renderer, x * side, (y * side) + 40, (x * side) + side, (y * side) + 40); - SDL_RenderDrawLine(renderer, x * side, (y * side) + 40, x * side, (y * side) + side + 40); - SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255); - } - } - sprintf(ty, "Current Type: %i", type); - printText(renderer, font, ty, (WINDOW_SIDE / 2) - 100, 0, 40, 255, 255, 255); - SDL_RenderPresent(renderer); - int ticks = startFrame - SDL_GetTicks(); - if(ticks < ticksPerFrame) - SDL_Delay(ticksPerFrame - ticks); + } + if (buttonPressed == 1) { + int x, y; + SDL_GetMouseState(&x, &y); + map[(int)(x / side)][(int)((y - 40) / side)].type = type; + } + + SDL_GetMouseState(&mx, &my); + for (int y = 0; y < map_h; y++) { + for (int x = 0; x < map_w; x++) { + if (dest[x][y].x < mx && dest[x][y].x + side > mx && + dest[x][y].y < my && dest[x][y].y + side > my) + SDL_SetRenderDrawColor(renderer, 150, 150, 150, 255); + else if (map[x][y].type == 0) + SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255); + if (map[x][y].type == 1) + SDL_SetRenderDrawColor(renderer, 255, 0, 0, 255); + if (map[x][y].type == 2) + SDL_SetRenderDrawColor(renderer, 0, 255, 0, 255); + if (map[x][y].type == 3) + SDL_SetRenderDrawColor(renderer, 0, 0, 255, 255); + SDL_RenderFillRect(renderer, &dest[x][y]); + SDL_SetRenderDrawColor(renderer, 100, 100, 100, 255); + SDL_RenderDrawLine(renderer, x * side, (y * side) + 40, + (x * side) + side, (y * side) + 40); + SDL_RenderDrawLine(renderer, x * side, (y * side) + 40, x * side, + (y * side) + side + 40); + SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255); } - return 0; + } + sprintf(ty, "Current Type: %i", type); + printText(renderer, font, ty, (WINDOW_SIDE / 2) - 100, 0, 40, 255, 255, + 255); + SDL_RenderPresent(renderer); + int ticks = startFrame - SDL_GetTicks(); + if (ticks < ticksPerFrame) + SDL_Delay(ticksPerFrame - ticks); } + return 0; +} -void save(SDL_Renderer *renderer, SDL_Event event, TTF_Font *font, int map_w, int map_h, struct Tile map[map_w][map_h]) - { - int framerate = 30, ticksPerFrame = 1000/framerate, startFrame = 0, len = 0; - bool done = false; - char text[64] = "", filename_disp[64], filename[64]; - FILE *f; - SDL_StartTextInput(); - while(!done) - { - startFrame = SDL_GetTicks(); - SDL_RenderClear(renderer); - - sprintf(filename_disp, "%s.map", text); - - while(SDL_PollEvent(&event)) - { - switch(event.type) - { - case SDL_KEYDOWN: - switch(event.key.keysym.sym) - { - case SDLK_ESCAPE: - done = true; - break; - case SDLK_BACKSPACE: - text[strlen(text) - 1] = '\0'; - len--; - break; - case SDLK_RETURN: - // Save the map to file with name text - f = fopen(filename, "r"); - if(f == NULL) - { - printf("here\n"); - sprintf(filename, "./maps/%s", filename_disp); - f = fopen(filename, "w"); - fprintf(f, "%i %i\n", map_w, map_h); - for(int y = 0;y < map_h;y++) - { - for(int x = 0;x < map_w;x++) - { - if(x < map_w - 1) - fprintf(f, "|%i", map[x][y].type); - else - fprintf(f, "|%i|", map[x][y].type); - } - fprintf(f, "\n"); - } - fclose(f); - } - break; - } - break; - case SDL_TEXTINPUT: - if(strlen(text)<15) - { - strcat(text, event.text.text); - } - break; +void save(SDL_Renderer *renderer, SDL_Event event, TTF_Font *font, int map_w, + int map_h, struct Tile map[map_w][map_h]) { + int framerate = 30, ticksPerFrame = 1000 / framerate, startFrame = 0, len = 0; + bool done = false; + char text[64] = "", filename_disp[64], filename[64]; + FILE *f; + SDL_StartTextInput(); + while (!done) { + startFrame = SDL_GetTicks(); + SDL_RenderClear(renderer); + + sprintf(filename_disp, "%s.map", text); + + while (SDL_PollEvent(&event)) { + switch (event.type) { + case SDL_KEYDOWN: + switch (event.key.keysym.sym) { + case SDLK_ESCAPE: + done = true; + break; + case SDLK_BACKSPACE: + text[strlen(text) - 1] = '\0'; + len--; + break; + case SDLK_RETURN: + // Save the map to file with name text + f = fopen(filename, "r"); + if (f == NULL) { + f = fopen(filename, "w"); + fprintf(f, "%i %i\n", map_w, map_h); + for (int y = 0; y < map_h; y++) { + for (int x = 0; x < map_w; x++) { + if (x < map_w - 1) + fprintf(f, "|%i", map[x][y].type); + else + fprintf(f, "|%i|", map[x][y].type); } + fprintf(f, "\n"); + } } - //sprintf(filename, 64, "%s.txt", text); - printText(renderer, font, filename_disp, 0, 0, 100, 255, 255, 255); - - SDL_RenderPresent(renderer); - int ticks = startFrame - SDL_GetTicks(); - if(ticks < ticksPerFrame) - SDL_Delay(ticksPerFrame - ticks); + fclose(f); + break; + } + break; + case SDL_TEXTINPUT: + if (strlen(text) < 15) { + strcat(text, event.text.text); + } + break; } + } + // sprintf(filename, 64, "%s.txt", text); + printText(renderer, font, filename_disp, 0, 0, 100, 255, 255, 255); + + SDL_RenderPresent(renderer); + int ticks = startFrame - SDL_GetTicks(); + if (ticks < ticksPerFrame) + SDL_Delay(ticksPerFrame - ticks); } +} -int main() -{ - SDL_Window *window; - SDL_Renderer *renderer; - SDL_Event event; +int main() { + SDL_Window *window; + SDL_Renderer *renderer; + SDL_Event event; - SDL_Init(SDL_INIT_VIDEO); - TTF_Init(); - TTF_Font *font = TTF_OpenFont("OpenSans-Bold.ttf", 20); + SDL_Init(SDL_INIT_VIDEO); + TTF_Init(); + TTF_Font *font = TTF_OpenFont("OpenSans-Bold.ttf", 20); - window = SDL_CreateWindow("Doom Map Maker", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, WINDOW_SIDE, WINDOW_SIDE + 40, SDL_WINDOW_OPENGL); - renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED); + window = SDL_CreateWindow("Doom Map Maker", SDL_WINDOWPOS_UNDEFINED, + SDL_WINDOWPOS_UNDEFINED, WINDOW_SIDE, + WINDOW_SIDE + 40, SDL_WINDOW_OPENGL); + renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED); - int map_w = 32, map_h = 32, s = 1; - struct Tile map[map_w][map_h]; + int map_w = 32, map_h = 32, s = 1; + struct Tile map[map_w][map_h]; - while(s != 0) - { - s = editor(renderer, event, font, map_w, map_h, map); - if(s == 1) - save(renderer, event, font, map_w, map_h, map); - } + while (s != 0) { + s = editor(renderer, event, font, map_w, map_h, map); + if (s == 1) + save(renderer, event, font, map_w, map_h, map); + } - TTF_Quit(); - SDL_Quit(); - return 0; + TTF_Quit(); + SDL_Quit(); + return 0; } |