Half of day 32.

handmade.h

@@ -105,12 +105,12 @@ typedef struct game_memory {
     B32 IsInitialized;
 
     U64 PermanentStorageSize;
-    void *PermanentStorage; /*  WARNING: This memory is REQUIRED to be zero
+    void *PermanentStorage; /* WARNING: This memory is REQUIRED to be zero
                                          initialized!!! (Done by the OS
                                          layer.) */
 
     U64 TransientStorageSize;
-    void *TransientStorage; /*  WARNING: This memory is REQUIRED to be zero
+    void *TransientStorage; /* WARNING: This memory is REQUIRED to be zero
                                          initialized!!! (Done by the OS
                                          layer.) */
 
@@ -137,26 +137,22 @@ void UpdateAndRender(thread_context *Thread, game_memory *Memory,
  */
 
 typedef struct cannonical_position {
+#if 1
     S32 TileMapX;
     S32 TileMapY;
 
     S32 TileX;
     S32 TileY;
+#else
+    U32 _TileX;
+    U32 _TileY;
+#endif
 
     /* NOTE: Tile-relative X and Y. */
-    F32 X;
-    F32 Y;
+    F32 TileRelX;
+    F32 TileRelY;
 } cannonical_position;
 
-typedef struct raw_position {
-    S32 TileMapX;
-    S32 TileMapY;
-
-    /* NOTE: Tile-map relative X and Y. */
-    F32 X;
-    F32 Y;
-} raw_position;
-
 typedef struct tile_map {
     U32 *Tiles;
 } tile_map;
@@ -164,6 +160,7 @@ typedef struct tile_map {
 typedef struct world {
     F32 TileSideInMeters;
     S32 TileSideInPixels;
+    F32 MetersToPixels;
 
     S32 CountX;
     S32 CountY;
@@ -178,11 +175,7 @@ typedef struct world {
 } world;
 
 typedef struct game_state {
-    S32 PlayerTileMapX;
-    S32 PlayerTileMapY;
-
-    F32 PlayerX;
-    F32 PlayerY;
+    cannonical_position PlayerP;
 } game_state;
 
 #endif