Added map engine into map test. More map engine features.

essial · essial · commit b0adec178eda · 2023-12-13T01:24:16.000-05:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,10 +3,11 @@ cmake_minimum_required(VERSION 3.20)
 project(Abyss)
 
 if (NOT CMAKE_BUILD_TYPE)
-  message(STATUS "No build type selected, defaulting to Release")
-  set(CMAKE_BUILD_TYPE Release)
+    message(STATUS "No build type selected, defaulting to Release")
+    set(CMAKE_BUILD_TYPE Release)
 endif ()
 
+
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 set(CMAKE_DISABLE_SOURCE_CHANGES ON)
 set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
@@ -32,9 +33,9 @@ include_stormlib()
 include_casclib()
 
 if (APPLE)
-  find_library(OSX_VIDEOTOOLBOX VideoToolbox)
-  find_library(OSX_COREMEDIA CoreMedia)
-  find_library(OSX_SECURITY Security)
+    find_library(OSX_VIDEOTOOLBOX VideoToolbox)
+    find_library(OSX_COREMEDIA CoreMedia)
+    find_library(OSX_SECURITY Security)
 endif ()
 
 add_subdirectory(src)
diff --git a/src/Abyss/MapEngine/MapEngine.cpp b/src/Abyss/MapEngine/MapEngine.cpp
@@ -5,9 +5,8 @@
 #include <future>
 
 namespace Abyss::MapEngine {
-MapEngine::MapEngine(DataTypes::Palette _palette, const int width, const int height, std::vector<DataTypes::DT1> dt1s,
-                     std::vector<DataTypes::DS1> ds1s)
-    : _width(width), _height(height), _palette(std::move(_palette)), _dt1s(std::move(dt1s)), _ds1s(std::move(ds1s)) {
+MapEngine::MapEngine(const int width, const int height, std::vector<DataTypes::DT1> dt1s, std::vector<DataTypes::DS1> ds1s)
+    : _width(width), _height(height), _dt1s(std::move(dt1s)), _ds1s(std::move(ds1s)) {
 
     std::vector<std::future<void>> futures;
 
@@ -171,13 +170,18 @@ void MapEngine::render() const {
 }
 
 void MapEngine::setCameraPosition(int x, int y) {
-    _cameraPosition.x = x;
-    _cameraPosition.y = y;
+    _cameraPosition.x = x - 320;
+    _cameraPosition.y = y - 260;
 }
 
 void MapEngine::getCameraPosition(int &x, int &y) const {
-    x = _cameraPosition.x;
-    y = _cameraPosition.y;
+    x = _cameraPosition.x + 320;
+    y = _cameraPosition.y + 260;
+}
+
+void MapEngine::getMapSize(int &width, int &height) const {
+    width = _width;
+    height = _height;
 }
 
 
diff --git a/src/Abyss/MapEngine/MapEngine.h b/src/Abyss/MapEngine/MapEngine.h
@@ -2,7 +2,6 @@
 
 #include "Abyss/DataTypes/DS1.h"
 #include "Abyss/DataTypes/DT1.h"
-#include "Abyss/DataTypes/Palette.h"
 
 #include <vector>
 #include <string>
@@ -13,10 +12,9 @@ namespace Abyss::MapEngine {
 class MapEngine {
     const int _width{};
     const int _height{};
-    const DataTypes::Palette _palette;
     std::vector<DataTypes::DT1> _dt1s;
     std::vector<DataTypes::DS1> _ds1s;
-    SDL_Point _cameraPosition{0, 0};
+    SDL_Point _cameraPosition{-320, -260};
 
     struct {
         std::vector<DataTypes::TileMap> floor{};
@@ -26,11 +24,11 @@ class MapEngine {
     } _layers;
 
 public:
-    MapEngine(DataTypes::Palette _palette, int width, int height, std::vector<DataTypes::DT1> dt1s,
-              std::vector<DataTypes::DS1> ds1s);
+    MapEngine(int width, int height, std::vector<DataTypes::DT1> dt1s, std::vector<DataTypes::DS1> ds1s);
     void stampDs1(uint32_t ds1Index, int originX, int originY);
     void render() const;
     void setCameraPosition(int x, int y);
     void getCameraPosition(int &x, int &y) const;
+    void getMapSize(int &width, int &height) const;
 };
 } // namespace Abyss::MapEngine
diff --git a/src/OD2/Scenes/MapTest/MapTest.cpp b/src/OD2/Scenes/MapTest/MapTest.cpp
@@ -19,6 +19,13 @@ MapTest::MapTest() {
             continue;
         _mapSelections.push_back(levelName);
     }
+
+    _selectedLevelName = _mapSelections.front();
+    onLevelChanged(_selectedLevelName);
+    if (!_selectedLevelAltName.empty()) {
+        _selectedLevelAltName = _mapAltSelections.front();
+        loadTile(_selectedLevelAltName);
+    }
 }
 
 void MapTest::onLevelChanged(const std::string &levelName) {
@@ -94,7 +101,7 @@ void MapTest::processEvent(const SDL_Event &event) {
             Abyss::AbyssEngine::getInstance().getMouseState().getPosition(mx, my);
             _mousePressedPosition.x = mx;
             _mousePressedPosition.y = my;
-            _startCameraPosition = _cameraPosition;
+            _mapEngine->getCameraPosition(_startCameraPosition.x, _startCameraPosition.y);
             SDL_CaptureMouse(SDL_TRUE);
             break;
         }
@@ -113,8 +120,8 @@ void MapTest::processEvent(const SDL_Event &event) {
             int mx;
             int my;
             Abyss::AbyssEngine::getInstance().getMouseState().getPosition(mx, my);
-            _cameraPosition.x = _startCameraPosition.x + (_mousePressedPosition.x - mx);
-            _cameraPosition.y = _startCameraPosition.y + (_mousePressedPosition.y - my);
+            _mapEngine->setCameraPosition(_startCameraPosition.x + (_mousePressedPosition.x - mx),
+                                          _startCameraPosition.y + (_mousePressedPosition.y - my));
         }
         break;
     }
@@ -131,7 +138,6 @@ void MapTest::loadTile(const std::string &altName) {
     const auto &levelType = getLevelType(levelTypeId);
     const auto &palette = Common::PaletteManager::getInstance().getPalette("Act" + std::to_string(act));
 
-    _dt1s.clear();
     std::vector<std::string> dt1sToLoad{};
 
     for (int i = 1; i <= 31; ++i) {
@@ -141,15 +147,14 @@ void MapTest::loadTile(const std::string &altName) {
         if (dt1 != "None" && dt1 != "Expansion" && dt1 != "0" && std::ranges::find(dt1sToLoad, dt1) == dt1sToLoad.end()) {
             auto filePath = "/data/global/tiles/" + dt1;
             std::ranges::transform(filePath, filePath.begin(), [](const auto c) { return std::tolower(c); });
-            _dt1s.emplace_back("/data/global/tiles/" + dt1, palette);
             dt1sToLoad.push_back("/data/global/tiles/" + dt1);
         }
     }
 
-    _ds1 = std::make_unique<Abyss::DataTypes::DS1>("/data/global/tiles/" + altName);
+    Abyss::DataTypes::DS1 ds1("/data/global/tiles/" + altName);
 
     // Add all the DS1 files to the DT1s
-    for (auto &file : _ds1->files) {
+    for (auto &file : ds1.files) {
         std::ranges::replace(file, '\\', '/');
         if (file.starts_with("/d2/")) // Because why not?
             file = file.substr(3);
@@ -161,99 +166,43 @@ void MapTest::loadTile(const std::string &altName) {
             if (file.starts_with("/d2/"))
                 file = file.substr(3);
 
-            _dt1s.emplace_back(file, palette);
             dt1sToLoad.push_back(file);
         }
     }
 
-    _ds1->bindTileReferences(_dt1s);
+    const auto dsSubIndex = std::ranges::find(_mapAltSelections, altName) - _mapAltSelections.begin();
+    // Load all dt1s into a vector
+    std::vector<Abyss::DataTypes::DT1> dt1s{};
+    dt1s.reserve(dt1sToLoad.size());
+    for (const auto &dt1 : dt1sToLoad)
+        dt1s.emplace_back(dt1, palette);
+
+    const auto mapWidth = ds1.width;
+    const auto mapHeight = ds1.height;
+
+    _mapEngine = std::make_unique<Abyss::MapEngine::MapEngine>(mapWidth, mapHeight, std::move(dt1s), std::vector{std::move(ds1)});
+    _mapEngine->stampDs1(0, 0, 0);
 
-    // // Center the map
-    const auto mapCenterX = _ds1->width / 2;
-    const auto mapCenterY = _ds1->height / 2;
-    //
-    // // Convert center to ortho
+    // Center the map
+    const auto mapCenterX = mapWidth / 2;
+    const auto mapCenterY = mapHeight / 2;
+
+    // Convert center to ortho
     const auto orthoCenterX = (mapCenterX - mapCenterY) * 80;
     const auto orthoCenterY = (mapCenterX + mapCenterY) * 40;
 
     // Adjust camera position
-    _cameraPosition.x = orthoCenterX - 320;
-    _cameraPosition.y = orthoCenterY - 260;
-
+    _mapEngine->setCameraPosition(orthoCenterX, orthoCenterY);
 }
 
 void MapTest::render() {
-    const auto &renderer = Abyss::AbyssEngine::getInstance().getRenderer();
-    SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255);
-    SDL_RenderClear(renderer);
-
-    if (_ds1) {
-        for (int tileY = 0; tileY < _ds1->height; ++tileY) {
-            for (int tileX = 0; tileX < _ds1->width; ++tileX) {
-                const auto posX = (tileX - tileY) * 80;
-                const auto posY = (tileX + tileY) * 40;
-
-                // Draw lower walls
-                for (const auto &layer : _ds1->layers.wall) {
-                    if (const auto &tile = layer[tileX + tileY * _ds1->width];
-                        tile.dt1Ref && tile.type >= Abyss::DataTypes::TileType::LowerWallsEquivalentToLeftWall)
-                        tile.dt1Ref->drawTile(posX - _cameraPosition.x, posY - _cameraPosition.y, tile.dt1Index);
-                }
+    SDL_SetRenderDrawColor(Abyss::AbyssEngine::getInstance().getRenderer(), 0, 0, 0, 255);
+    SDL_RenderClear(Abyss::AbyssEngine::getInstance().getRenderer());
 
-                // Draw floors
-                for (const auto &layer : _ds1->layers.floor) {
-                    if (const auto &tile = layer[tileX + tileY * _ds1->width]; tile.dt1Ref)
-                        tile.dt1Ref->drawTile(posX - _cameraPosition.x, posY - _cameraPosition.y, tile.dt1Index);
-                }
-                // Draw shadows
-                for (const auto &layer : _ds1->layers.shadow) {
-                    if (const auto &tile = layer[tileX + tileY * _ds1->width]; tile.dt1Ref)
-                        tile.dt1Ref->drawTile(posX - _cameraPosition.x, posY - _cameraPosition.y, tile.dt1Index);
-                }
-            }
-        }
-
-        for (int tileY = 0; tileY < _ds1->height; ++tileY) {
-            for (int tileX = 0; tileX < _ds1->width; ++tileX) {
-                const auto posX = (tileX - tileY) * 80;
-                const auto posY = (tileX + tileY) * 40;
-
-                // Draw upper
-                for (const auto &layer : _ds1->layers.wall) {
-                    if (const auto &tile = layer[tileX + tileY * _ds1->width];
-                        tile.dt1Ref && ((tile.type >= Abyss::DataTypes::TileType::LeftWall && tile.type <=
-                                         Abyss::DataTypes::TileType::RightWallWithDoor) || (
-                                            tile.type >= Abyss::DataTypes::TileType::PillarsColumnsAndStandaloneObjects && tile.type <=
-                                            Abyss::DataTypes::TileType::Tree))) {
-                        tile.dt1Ref->drawTile(posX - _cameraPosition.x, posY - _cameraPosition.y + 96, tile.dt1Index);
-
-                        // Super special condition. This was fun to figure out :(
-                        if (tile.type == Abyss::DataTypes::TileType::RightPartOfNorthCornerWall)
-                            tile.dt1Ref->drawTile(posX - _cameraPosition.x, posY - _cameraPosition.y + 96, tile.dt1IndexAlt);
-                    }
-
-                }
+    if (_mapEngine)
+        _mapEngine->render();
 
-            }
-        }
-
-        for (int tileY = 0; tileY < _ds1->height; ++tileY) {
-            for (int tileX = 0; tileX < _ds1->width; ++tileX) {
-                const auto posX = (tileX - tileY) * 80;
-                const auto posY = (tileX + tileY) * 40;
-
-                // Draw Roof
-                for (const auto &layer : _ds1->layers.wall) {
-                    if (const auto &tile = layer[tileX + tileY * _ds1->width];
-                        tile.dt1Ref && tile.type == Abyss::DataTypes::TileType::Roof)
-                        tile.dt1Ref->drawTile(posX - _cameraPosition.x, posY - _cameraPosition.y - 72, tile.dt1Index);
-                }
-
-            }
-        }
-    }
-
-    ImGui::SetNextWindowSize(ImVec2(250, 200), ImGuiCond_FirstUseEver);
+    ImGui::SetNextWindowSize(ImVec2(350, 200), ImGuiCond_FirstUseEver);
     ImGui::Begin("Debug");
 
     // Level selection
@@ -264,7 +213,9 @@ void MapTest::render() {
                 if (_selectedLevelName != levelName) {
                     onLevelChanged(levelName);
                     _selectedLevelName = levelName;
-                    _selectedLevelAltName = "";
+                    _selectedLevelAltName = _mapAltSelections.empty() ? "" : _mapAltSelections.front();
+                    if (!_selectedLevelAltName.empty())
+                        loadTile(_selectedLevelAltName);
                 }
 
             if (isSelected)
@@ -291,6 +242,22 @@ void MapTest::render() {
         }
     }
 
+    ImGui::Separator();
+
+    // Show map information
+    if (_mapEngine) {
+        int mapWidth;
+        int mapHeight;
+        _mapEngine->getMapSize(mapWidth, mapHeight);
+        int cameraPosX;
+        int cameraPosY;
+        _mapEngine->getCameraPosition(cameraPosX, cameraPosY);
+
+        ImGui::LabelText("Map size", "%d, %d", mapWidth, mapHeight);
+        ImGui::LabelText("Camera position", "%d, %d", cameraPosX, cameraPosY);
+        ImGui::LabelText("DS1", "%s", _selectedLevelAltName.c_str());
+    }
+
     ImGui::End();
 }
 
diff --git a/src/OD2/Scenes/MapTest/MapTest.h b/src/OD2/Scenes/MapTest/MapTest.h
@@ -1,8 +1,7 @@
 #pragma once
 
 #include "Abyss/Common/Scene.h"
-#include "Abyss/DataTypes/DS1.h"
-#include "Abyss/DataTypes/DT1.h"
+#include "Abyss/MapEngine/MapEngine.h"
 #include "OD2/Common/DataTableManager.h"
 
 #include <memory>
@@ -16,13 +15,11 @@ class MapTest final : public Abyss::Common::Scene {
     std::vector<std::string> _mapAltSelections{};
     std::string _selectedLevelName{};
     std::string _selectedLevelAltName{};
-    std::vector<Abyss::DataTypes::DT1> _dt1s;
-    std::unique_ptr<Abyss::DataTypes::DS1> _ds1{};
-    SDL_Point _cameraPosition{0, 0};
     SDL_Point _mousePressedPosition{0, 0};
     SDL_Point _startCameraPosition{0, 0};
-
     bool _isMouseDragging{false};
+    std::unique_ptr<Abyss::MapEngine::MapEngine> _mapEngine;
+    int _mapWidth;
 
     void onLevelChanged(const std::string &levelName);
     static const Common::DataTableRow &getLevelPrest(std::string_view name);
diff --git a/src/OD2/main.cpp b/src/OD2/main.cpp
@@ -201,7 +201,7 @@ int main(const int argc, char **argv) {
         engine.setScene(std::make_unique<OD2::Scenes::MainMenu::MainMenu>());
 
         Abyss::Common::Log::info("Startup complete");
-        engine.setMasterVolumeLevel(0.0f);
+        //engine.setMasterVolumeLevel(0.0f);
 
         engine.run();
     } catch (const std::exception &exception) {
