feat: Added portals

code/game/core.h

@@ -21,7 +21,7 @@ enum G_EDITOR_MODE {
   G_EDITOR_MODE_TILE,
   G_EDITOR_MODE_PROP,
   G_EDITOR_MODE_HITBOX,
-  G_EDITOR_MODE_POI,
+  G_EDITOR_MODE_PORTAL,
 };
 
 typedef struct G_Editor G_Editor;
@@ -32,6 +32,7 @@ struct G_Editor {
   G_EDITOR_MODE mode;
   V2f cursor;
   V2f dragStart;
+  U32 selectedNode;
 };
 
 typedef struct G_State G_State;

code/game/impl/aabb.c

@@ -11,7 +11,7 @@ bool AABB_Collide(AABB a, AABB b)
 bool AABB_Point(AABB a, V2f v)
 {
   bool collision_x = a.pos.x + a.size.x >= v.x && a.pos.x <= v.x;
-  bool collision_y = a.pos.x + a.size.y >= v.y && a.pos.y <= v.y;
+  bool collision_y = a.pos.y + a.size.y >= v.y && a.pos.y <= v.y;
   return collision_x && collision_y;
 }
 
@@ -45,4 +45,4 @@ bool AABB_Circle(F32 rad, V2f radOrigin, AABB a)
   F32 xSq = (Abs(aCentre.x) - Abs(radOrigin.x)) * (Abs(aCentre.x) - Abs(radOrigin.x));
   F32 ySq = (Abs(aCentre.y) - Abs(radOrigin.y)) * (Abs(aCentre.y) - Abs(radOrigin.y));
   return SDL_sqrt(xSq + ySq) < rad;
-}
+}

code/game/impl/bandit.c

@@ -10,6 +10,11 @@ V2f shootTowards(Bandit *bandit, V2f target, Random* r)
 }
 
 void UpdateBandit(F32 delta, Bandit *bandit, World *world) {
+  for(int i = 0; i < world->portalCount; i++) {
+    if(AABB_Collide(world->portals[0].box, bandit->collision)) {
+      bandit->currentArea = world->portals[0].area;
+    }
+  }
   if (
       world->player.controls.shot && AABB_Slab(world->player.collision.pos, world->player.shotPos, bandit->collision) && bandit->currentArea == world->player.currentArea)
   {

code/game/impl/npc.c

@@ -4,6 +4,11 @@
 #include "core/math.h"
 
 void UpdateNPC(F32 delta, NPC *npc, World *world) {
+  for(int i = 0; i < world->portalCount; i++) {
+    if(AABB_Collide(world->portals[0].box, npc->collision)) {
+      npc->currentArea = world->portals[0].area;
+    }
+  }
   switch (npc->mode) {
     case NPC_ACTION_WAITING:
       npc->waitTime+=delta;

code/game/impl/player.c

@@ -165,6 +165,11 @@ void PlayerUpdate(F32 delta, Player *player) {
   dir = V2f_Scale(NormaliseV2F(dir), PLAYER_SPEED*delta);
   player->collision.pos.x += dir.x;
   player->collision.pos.y += dir.y;
+  for(int i = 0; i < player->world->portalCount; i++) {
+    if(AABB_Collide(player->world->portals[0].box, player->collision)) {
+      player->currentArea = player->world->portals[0].area;
+    }
+  }
 }
 
 void PlayerDraw(D_Context *draw, Player *player) {

code/game/impl/world.c

@@ -64,16 +64,6 @@ void RenderWorld(World *world, D_Context *draw) {
       );
     }
   }
-  for (int i = 0; i < world->navMesh->nodeCount; i++) {
-    NavNode n = world->navMesh->nodes[i];
-    D_Rect(
-      draw,
-      n.pos.x,
-      n.pos.y,
-      .texture = 0,
-      .scale = 0.2f,
-    );
-  }
   for(U32 i = 0; i < world->npcCount; i++) {
     NPC npc = world->npcs[i];
     if(npc.currentArea == world->player.currentArea) {
@@ -127,6 +117,11 @@ void SaveWorld(M_Arena *arena, World *world) {
   FS_FileWrite(file, world->map, sizeof(U32)*WORLD_MAP_MAX, offset);
   offset += sizeof(U32)*WORLD_MAP_MAX;
 
+  FS_FileWrite(file, &world->portalCount, sizeof(U32), offset);
+  offset += sizeof(U32);
+
+  FS_FileWrite(file, world->hitboxes, sizeof(World_Portal)*WORLD_PORTAL_MAX, offset);
+
   FS_FileClose(file);
   printf("Saved world :)\n");
 }
@@ -175,6 +170,12 @@ void LoadWorld(M_Arena *arena, World *world) {
   FS_FileRead(file, world->map, sizeof(U32)*WORLD_MAP_MAX, offset);
   offset += sizeof(U32)*WORLD_MAP_MAX;
 
+  FS_FileRead(file, &world->portalCount, sizeof(U32), offset);
+  offset += sizeof(U32);
+
+  world->portals = M_ArenaPush(arena, World_Portal, .count=WORLD_PORTAL_MAX);
+  FS_FileRead(file, world->hitboxes, sizeof(World_Portal)*WORLD_PORTAL_MAX, offset);
+
   FS_FileClose(file);
   printf("loaded world\n");
 }
@@ -195,14 +196,10 @@ void GenerateNavMesh(M_Arena *arena, World *world) {
     if(skip) {continue;}
     world->navMesh->nodes[world->navMesh->nodeCount].pos.x = x;
     world->navMesh->nodes[world->navMesh->nodeCount].pos.y = y;
-    U32 cost = 20;
-    if(Str8_Equal(world->tileTypes[world->map[i]].tag, S("path_middle"), STR8_EQUAL_IGNORE_CASE)) {
-      cost = 10;
-    }
     world->navMesh->nodes[world->navMesh->nodeCount].connectionCount = 0;
     for(int nx = -1; nx < 2; nx++){
       for(int ny = -1; ny < 2; ny++){
-        if((nx==ny) && nx==0) {continue;}
+        if(nx==0 && ny==0) {continue;}
         if(x+nx < 0 || x+nx > 95) {
           continue;
         }
@@ -216,14 +213,42 @@ void GenerateNavMesh(M_Arena *arena, World *world) {
             break;
           }
         }
-        if(skip) {continue;}
-        U32 index = x+nx + (y+ny)*96;
         U32 nCount = world->navMesh->nodeCount;
+        S32 index = -1;
+        for(int ohgod = 0; ohgod < nCount; ohgod++) {
+          if(world->navMesh->nodes[ohgod].pos.x == nx+x&& world->navMesh->nodes[ohgod].pos.y == y+ny) {
+            index=ohgod;
+            break;
+          }
+        }
+        F32 cost = 20;
+        if(ny+nx == 2) {
+          cost = 40;
+        };
+        if(Str8_Equal(world->tileTypes[world->map[i]].tag, S("path_middle"), STR8_EQUAL_IGNORE_CASE)) {
+          cost = 1;
+          if(Abs(ny+nx) == 2) {
+            cost = 4;
+          };
+        }
+        if(index < 0) {continue;}
+        skip |= index > nCount;
+        if(skip) {continue;}
         world->navMesh->nodes[nCount].connections[world->navMesh->nodes[nCount].connectionCount].NodeIndex = index;
         world->navMesh->nodes[nCount].connections[world->navMesh->nodes[nCount].connectionCount].Cost = cost;
+        world->navMesh->nodes[index].connections[world->navMesh->nodes[index].connectionCount].NodeIndex = nCount;
+        world->navMesh->nodes[index].connections[world->navMesh->nodes[index].connectionCount].Cost = cost;
         world->navMesh->nodes[nCount].connectionCount++;
+        world->navMesh->nodes[index].connectionCount++;
       }
     }
     world->navMesh->nodeCount++;
   }
+  for(int i = 0; i < world->npcCount; i++) {
+      world->npcs[i].mode = NPC_ACTION_WAITING;
+      world->npcs[i].maxWaitTime = Random_F32(&world->random, 20, 140);
+      world->npcs[i].waitTime = 0;
+      world->npcs[i].currentNavNode=0; 
+      world->npcs[i].pathIndex = 0;
+  }
 }

code/game/world.h

@@ -2,19 +2,21 @@
 #define LD_GAME_WORLD_H_
 
 #include "../core/math.h"
+#include "./aabb.h"
 
 #define WORLD_HITBOX_MAX 4096
 #define WORLD_PROP_MAX 2048
 #define WORLD_PROP_TYPE_MAX 64
 #define WORLD_TILE_TYPE_MAX 64
 #define WORLD_MAP_MAX 4800
+#define WORLD_PORTAL_MAX 64
 
 // Areas are which
 typedef U32 World_Area;
 enum World_Area
 {
-  WORLD_AREA_OUTSIDE = (1 << 0),
-  WORLD_AREA_SALOON = (1 << 1),
+  WORLD_AREA_OUTSIDE = 1,
+  WORLD_AREA_SALOON = 2,
 };
 
 typedef struct World_Tile World_Tile;
@@ -37,6 +39,13 @@ struct World_Prop
   V2f pos;
 };
 
+typedef struct World_Portal World_Portal;
+struct World_Portal
+{
+  AABB box;
+  World_Area area;
+};
+
 typedef struct World World;
 #include "player.h"
 #include "npc.h"
@@ -54,11 +63,14 @@ struct World {
   World_PropType *propTypes;
   World_Prop *props; 
   AABB *hitboxes; 
+  World_Portal *portals; 
   U32 *map;
 
   U32 propCount;
+  U32 portalCount;
   U32 hitboxCount;
 
+
   //// Player
   Player player;