naming refactor

src/app/editor/overworld_editor.cc

@@ -44,25 +44,21 @@ absl::Status OverworldEditor::Update() {
     all_gfx_loaded_ = true;
 
     RETURN_IF_ERROR(overworld_.Load(rom_))
-    current_gfx_bmp_.Create(128, 512, 64, overworld_.GetCurrentGraphics());
+    palette_ = overworld_.AreaPalette();
+    current_gfx_bmp_.Create(128, 512, 64, overworld_.AreaGraphics());
+    current_gfx_bmp_.ApplyPalette(palette_);
     rom_.RenderBitmap(&current_gfx_bmp_);
 
-    auto tile16_palette = overworld_.GetCurrentPalette();
-    tile16_blockset_bmp_.Create(128, 8192, 128,
-                                overworld_.GetCurrentBlockset());
-    for (int j = 0; j < tile16_palette.colors.size(); j++) {
-      tile16_blockset_bmp_.SetPaletteColor(j, tile16_palette.GetColor(j));
-    }
+    tile16_blockset_bmp_.Create(128, 8192, 128, overworld_.Tile16Blockset());
+    tile16_blockset_bmp_.ApplyPalette(palette_);
     rom_.RenderBitmap(&tile16_blockset_bmp_);
     map_blockset_loaded_ = true;
 
     for (int i = 0; i < core::kNumOverworldMaps; ++i) {
       overworld_.SetCurrentMap(i);
-      auto palette = overworld_.GetCurrentPalette();
-      maps_bmp_[i].Create(512, 512, 512, overworld_.GetCurrentBitmapData());
-      for (int j = 0; j < palette.colors.size(); j++) {
-        maps_bmp_[i].SetPaletteColor(j, palette.GetColor(j));
-      }
+      auto palette = overworld_.AreaPalette();
+      maps_bmp_[i].Create(512, 512, 512, overworld_.BitmapData());
+      maps_bmp_[i].ApplyPalette(palette);
       rom_.RenderBitmap(&(maps_bmp_[i]));
     }
   }
@@ -73,10 +69,7 @@ absl::Status OverworldEditor::Update() {
     }
     UpdateSelectedTile16(selected_tile_, tile16_blockset_bmp_,
                          selected_tile_bmp_);
-    auto palette = overworld_.GetCurrentPalette();
-    for (int j = 0; j < palette.colors.size(); j++) {
-      selected_tile_bmp_.SetPaletteColor(j, palette.GetColor(j));
-    }
+    selected_tile_bmp_.ApplyPalette(palette_);
     rom_.RenderBitmap(&selected_tile_bmp_);
     update_selected_tile_ = false;
   }

src/app/editor/overworld_editor.h

@@ -29,10 +29,10 @@ static constexpr uint kTile8DisplayHeight = 64;
 static constexpr float kInputFieldSize = 30.f;
 
 static constexpr absl::string_view kToolsetColumnNames[] = {
-    "#undoTool",      "#redoTool",   "#drawTool",   "#separator2",
-    "#zoomOutTool",   "#zoomInTool", "#separator",  "#history",
-    "#entranceTool",  "#exitTool",   "#itemTool",   "#spriteTool",
-    "#transportTool", "#musicTool" };
+    "#undoTool",      "#redoTool",   "#drawTool",  "#separator2",
+    "#zoomOutTool",   "#zoomInTool", "#separator", "#history",
+    "#entranceTool",  "#exitTool",   "#itemTool",  "#spriteTool",
+    "#transportTool", "#musicTool"};
 
 static constexpr absl::string_view kOverworldSettingsColumnNames[] = {
     "##1stCol",    "##gfxCol",   "##palCol", "##sprgfxCol",
@@ -90,9 +90,9 @@ class OverworldEditor {
   zelda3::Overworld overworld_;
 
   gfx::SNESPalette palette_;
-  gfx::Bitmap tile16_blockset_bmp_;  // pointer size 1048576
-  gfx::Bitmap current_gfx_bmp_;      // pointer size 32768
-  gfx::Bitmap all_gfx_bmp;           // pointer size 456704
+  gfx::Bitmap tile16_blockset_bmp_;
+  gfx::Bitmap current_gfx_bmp_;
+  gfx::Bitmap all_gfx_bmp;
   gfx::Bitmap selected_tile_bmp_;
 
   gui::Canvas overworld_map_canvas_;

src/app/gfx/bitmap.cc

@@ -103,11 +103,13 @@ void Bitmap::CreateTexture(std::shared_ptr<SDL_Renderer> renderer) {
 }
 
 // Convert SNESPalette to SDL_Palette for surface.
-void Bitmap::ApplyPalette(const SNESPalette & palette) {
+void Bitmap::ApplyPalette(const SNESPalette &palette) {
   palette_ = palette;
-    SDL_SetPaletteColors(surface_->format->palette,
-                         palette_.GetSDL_Palette()->colors,
-                         0, 256);
+  for (int i = 0; i < palette.size_; ++i) {
+    surface_->format->palette->colors[i].r = palette.GetColor(i).rgb.x;
+    surface_->format->palette->colors[i].g = palette.GetColor(i).rgb.y;
+    surface_->format->palette->colors[i].b = palette.GetColor(i).rgb.z;
+  }
 }
 
 void Bitmap::SetPaletteColor(int id, gfx::SNESColor color) {

src/app/zelda3/overworld.h

@@ -24,18 +24,18 @@ class Overworld {
   auto GetTiles16() const { return tiles16; }
   auto GetOverworldMap(uint index) { return overworld_maps_[index]; }
   auto GetOverworldMaps() const { return overworld_maps_; }
-  auto GetCurrentBlockset() const {
-    return overworld_maps_[current_map_].GetCurrentBlockset();
+
+  auto AreaGraphics() const {
+    return overworld_maps_[current_map_].AreaGraphics();
   }
-  auto GetCurrentGraphics() const {
-    return overworld_maps_[current_map_].GetCurrentGraphics();
+  auto AreaPalette() const {
+    return overworld_maps_[current_map_].AreaPalette();
   }
-  auto GetCurrentBitmapData() const {
-    return overworld_maps_[current_map_].GetBitmapData();
-  }
-  auto GetCurrentPalette() const {
-    return overworld_maps_[current_map_].GetCurrentPalette();
+  auto BitmapData() const { return overworld_maps_[current_map_].BitmapData(); }
+  auto Tile16Blockset() const {
+    return overworld_maps_[current_map_].Tile16Blockset();
   }
+
   auto isLoaded() const { return is_loaded_; }
   void SetCurrentMap(int i) { current_map_ = i; }
 

src/app/zelda3/overworld_map.cc

@@ -156,6 +156,7 @@ OverworldMap::OverworldMap(int index, ROM& rom,
 absl::Status OverworldMap::BuildMap(int count, int game_state, int world,
                                     uchar* map_parent,
                                     OWBlockset& world_blockset) {
+  game_state_ = game_state;
   world_ = world;
   if (large_map_) {
     parent_ = map_parent[index_];
@@ -496,7 +497,7 @@ absl::Status OverworldMap::BuildTiles16Gfx(int count) {
 
           auto destination = xx + yy + offset + (mx + (my * 0x80));
           current_blockset_[destination] =
-              current_gfx_[source] + (info.palette_ * 0x10);
+              (current_gfx_[source] & 0x0F) + (info.palette_ * 0x10);
         }
       }
     }

src/app/zelda3/overworld_map.h

@@ -28,14 +28,13 @@ class OverworldMap {
   absl::Status BuildMap(int count, int game_state, int world, uchar* map_parent,
                         OWBlockset& world_blockset);
 
-  auto GetCurrentBlockset() const { return current_blockset_; }
-  auto GetCurrentGraphics() const { return current_gfx_; }
-  auto GetCurrentPalette() const { return current_palette_; }
-  auto GetBitmapData() const { return bitmap_data_; }
+  auto Tile16Blockset() const { return current_blockset_; }
+  auto AreaGraphics() const { return current_gfx_; }
+  auto AreaPalette() const { return current_palette_; }
+  auto BitmapData() const { return bitmap_data_; }
   auto SetLargeMap(bool is_set) { large_map_ = is_set; }
   auto IsLargeMap() const { return large_map_; }
   auto IsInitialized() const { return initialized_; }
-  auto IsBuilt() const { return built_; }
 
  private:
   void LoadAreaInfo();
@@ -52,8 +51,6 @@ class OverworldMap {
   int message_id_ = 0;
   int area_graphics_ = 0;
   int area_palette_ = 0;
-
-  // TODO SET ME 
   int game_state_ = 0;
 
   uchar sprite_graphics_[3];