Minor updates to map rendering. (#74)

* Minor updates to map rendering.
* Increased buffer to prevent error on slower machines.

Author: essial

.gitignore

@@ -21,3 +21,4 @@ compile_flags.txt
 backends.txt
 lldb-vscode.json
 run.sh
+build.sh

apps/abyssengine/CMakeLists.txt

@@ -10,7 +10,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(APP_NAME abyssengine)
 
 if (MSVC)
-    set(OPTIONS WIN32)
+    set(OPTIONS WIN32 src/node/inputlistener.cpp src/node/inputlistener.h)
     set(SOURCE_EXTRA resource.rc)
     set(APP_NAME "AbyssEngine")
     add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_HAS_DEPRECATED_RESULT_OF=1)
@@ -54,6 +54,7 @@ target_sources(${APP_NAME} PRIVATE
         src/node/label.cpp
         src/node/button.cpp
         src/node/maprenderer.cpp
+        src/node/inputlistener.cpp
 
         # Scripting ----------------------------------------------------
         src/engine/scripthost.cpp
@@ -191,4 +192,3 @@ if (APPLE)
 endif(APPLE)
 
 target_compile_features(${APP_NAME} PRIVATE cxx_std_20)
-

apps/abyssengine/src/engine/scripthost.cpp

@@ -1,6 +1,7 @@
 #include "scripthost.h"
 #include "../node/d2rsprite.h"
 #include "../node/dc6sprite.h"
+#include "../node/inputlistener.h"
 #include "cascprovider.h"
 #include "engine.h"
 #include "filesystemprovider.h"
@@ -58,6 +59,7 @@ AbyssEngine::ScriptHost::ScriptHost(Engine *engine) : _engine(engine), _lua() {
 
     module.set_function("addLoaderProvider", &ScriptHost::LuaAddLoaderProvider, this);
     module.set_function("createButton", &ScriptHost::LuaCreateButton, this);
+    module.set_function("createInputListener", &ScriptHost::LuaCreateInputListener, this);
     module.set_function("createLabel", &ScriptHost::LuaCreateLabel, this);
     module.set_function("createMapRenderer", &ScriptHost::LuaCreateMapRenderer, this);
     module.set_function("createPalette", &ScriptHost::LuaCreatePalette, this);
@@ -80,6 +82,8 @@ AbyssEngine::ScriptHost::ScriptHost(Engine *engine) : _engine(engine), _lua() {
     module.set_function("setCursor", &ScriptHost::LuaSetCursor, this);
     module.set_function("showSystemCursor", &ScriptHost::LuaShowSystemCursor, this);
     module.set_function("shutdown", &ScriptHost::LuaFuncShutdown, this);
+    module.set_function("worldToOrtho", &ScriptHost::LuaWorldToOrtho, this);
+    module.set_function("orthoToWorld", &ScriptHost::LuaOrthoToWorld, this);
 
     // User Types -------------------------------------------------------------------------------------------------------------------------
 
@@ -134,6 +138,11 @@ AbyssEngine::ScriptHost::ScriptHost(Engine *engine) : _engine(engine), _lua() {
     spriteType["playMode"] = sol::property(&Sprite::LuaGetPlayMode, &Sprite::LuaSetPlayMode);
     spriteType["currentFrameIndex"] = sol::property(&Sprite::GetCurrentFrameIndex, &Sprite::SetCurrentFrameIndex);
 
+    // InputListener
+    auto inputListenerType = CreateLuaObjectType<InputListener>(module, "InputListener", sol::no_constructor);
+    inputListenerType["onMouseButton"] = &InputListener::LuaSetMouseButtonCallback;
+    inputListenerType["onMouseMove"] = &InputListener::LuaSetMouseMoveCallback;
+
     // Sound Effect
     auto soundEffect = module.new_usertype<SoundEffect>("SoundEffect", sol::no_constructor);
     soundEffect["play"] = &SoundEffect::Play;
@@ -185,10 +194,19 @@ AbyssEngine::ScriptHost::ScriptHost(Engine *engine) : _engine(engine), _lua() {
     ds1.set("width", sol::property(&LibAbyss::DS1::Width, &LibAbyss::DS1::Width));
     ds1.set("height", sol::property(&LibAbyss::DS1::Height, &LibAbyss::DS1::Height));
 
+    // DT1 Tile
+    auto dt1TileType = module.new_usertype<LibAbyss::DT1::Tile>("DT1Tile", sol::no_constructor);
+    dt1TileType["type"] = sol::readonly_property(&LibAbyss::DT1::Tile::Type);
+    dt1TileType["mainIndex"] = sol::readonly_property(&LibAbyss::DT1::Tile::MainIndex);
+    dt1TileType["subIndex"] = sol::readonly_property(&LibAbyss::DT1::Tile::SubIndex);
+
     // Zone
     auto zoneType = module.new_usertype<LibAbyss::Zone>("Zone", sol::no_constructor);
     zoneType["resetMap"] = &LibAbyss::Zone::ResetMap;
     zoneType["stamp"] = &LibAbyss::Zone::Stamp;
+    zoneType["getTileInfo"] = &LibAbyss::Zone::GetTileInfo;
+    zoneType["width"] = sol::readonly_property(&LibAbyss::Zone::WidthInTiles);
+    zoneType["height"] = sol::readonly_property(&LibAbyss::Zone::HeightInTiles);
 
     _environment.add(module);
 }
@@ -365,9 +383,7 @@ std::unique_ptr<AbyssEngine::Image> AbyssEngine::ScriptHost::LuaLoadImage(std::s
         throw std::runtime_error(absl::StrCat("Unknowns sprite format for file: ", spritePath));
 }
 
-std::unique_ptr<AbyssEngine::Sprite> AbyssEngine::ScriptHost::LuaCreateSprite(AbyssEngine::Image& image) {
-    return std::make_unique<Sprite>(image);
-}
+std::unique_ptr<AbyssEngine::Sprite> AbyssEngine::ScriptHost::LuaCreateSprite(AbyssEngine::Image &image) { return std::make_unique<Sprite>(image); }
 
 std::unique_ptr<AbyssEngine::Button> AbyssEngine::ScriptHost::LuaCreateButton(Image &image) { return std::make_unique<Button>(image); }
 
@@ -485,3 +501,15 @@ std::unique_ptr<LibAbyss::DS1> AbyssEngine::ScriptHost::LuaLoadDS1(std::string_v
     auto stream = _engine->GetLoader().Load(fileName);
     return std::make_unique<LibAbyss::DS1>(stream);
 }
+
+std::unique_ptr<AbyssEngine::InputListener> AbyssEngine::ScriptHost::LuaCreateInputListener() { return std::make_unique<InputListener>(); }
+
+std::tuple<int, int> AbyssEngine::ScriptHost::LuaWorldToOrtho(int x, int y) {
+    MapRenderer::WorldToOrtho(x, y);
+    return {x, y};
+}
+
+std::tuple<int, int> AbyssEngine::ScriptHost::LuaOrthoToWorld(int x, int y) {
+    MapRenderer::OrthoToWorld(x, y);
+    return {x, y};
+}

apps/abyssengine/src/engine/scripthost.h

@@ -13,6 +13,7 @@
 #include "../node/maprenderer.h"
 #include "../node/sprite.h"
 #include "provider.h"
+#include "../node/inputlistener.h"
 #include <filesystem>
 #include <libabyss/formats/d2/ds1.h>
 #include <libabyss/zone/zone.h>
@@ -141,6 +142,10 @@ class ScriptHost {
     /// \return The created DS1 stamp.
     std::unique_ptr<LibAbyss::DS1> LuaLoadDS1(std::string_view fileName);
 
+    /// Creates a new input listener
+    /// \return The input listener
+    std::unique_ptr<InputListener> LuaCreateInputListener();
+
     /// \brief Sets the cursor sprite and offsets
     /// \param sprite The sprite to use for the cursor.
     /// \param offsetX The X offset of the cursor.
@@ -152,11 +157,23 @@ class ScriptHost {
     /// \param callback The callback to call when the video is finished.
     void LuaPlayVideo(std::string_view videoPath, const sol::safe_function &callback);
 
-    /// \brief Plays video and audio (for videos with seperate audio tracks)
+    /// \brief Plays video and audio (for videos with separate audio tracks)
     /// \param videoPath The path to the video file.
     /// \param audioPath The path to the audio file.
     /// \param callback The callback to call when the video is finished.
     void LuaPlayVideoAndAudio(std::string_view videoPath, std::string_view audioPath, const sol::safe_function &callback);
+
+    /// Converts world coordinates to orthographic coordinates
+    /// \param x The world X coordinate.
+    /// \param y The world Y coordinate.
+    /// \return The X/Y ortho coordinates.
+    std::tuple<int, int> LuaWorldToOrtho(int x, int y);
+
+    /// Converts orthographic coordinates to world coordinates
+    /// \param x The ortho X coordinate.
+    /// \param y The ortho Y coordinate.
+    /// \return The X/Y world coordinates.
+    std::tuple<int, int> LuaOrthoToWorld(int x, int y);
 };
 
 } // namespace AbyssEngine

apps/abyssengine/src/node/inputlistener.cpp

@@ -0,0 +1,39 @@
+#include "inputlistener.h"
+#include "../common/overload.h"
+#include "../engine/engine.h"
+#include <utility>
+#include <variant>
+
+void AbyssEngine::InputListener::MouseEventCallback(const AbyssEngine::MouseEvent &event) {
+    std::visit(Overload{[this](const MouseMoveEvent &evt) {
+                            if (!this->_luaMouseMoveCallback.valid())
+                                return;
+
+                            auto result = this->_luaMouseMoveCallback(evt.X, evt.Y);
+
+                            if (result.valid())
+                                return;
+
+                            sol::error err = result;
+                            Engine::Get()->Panic(err.what());
+                        },
+                        [this](const MouseButtonEvent &evt) {
+                            if (!this->_luaMouseButtonCallback.valid())
+                                return;
+
+                            auto result = this->_luaMouseButtonCallback(evt.Button, evt.IsPressed);
+
+                            if (result.valid())
+                                return;
+
+                            sol::error err = result;
+                            Engine::Get()->Panic(err.what());
+                        }},
+               event);
+
+    Node::MouseEventCallback(event);
+}
+
+void AbyssEngine::InputListener::LuaSetMouseButtonCallback(sol::safe_function func) { this->_luaMouseButtonCallback = std::move(func); }
+
+void AbyssEngine::InputListener::LuaSetMouseMoveCallback(sol::safe_function func) { this->_luaMouseMoveCallback = std::move(func); }

apps/abyssengine/src/node/inputlistener.h

@@ -0,0 +1,21 @@
+#ifndef ABYSS_INPUTLISTENER_H
+#define ABYSS_INPUTLISTENER_H
+
+#include "node.h"
+namespace AbyssEngine {
+
+class InputListener : public Node {
+  public:
+    void MouseEventCallback(const MouseEvent &event) override;
+
+    void LuaSetMouseButtonCallback(sol::safe_function func);
+    void LuaSetMouseMoveCallback(sol::safe_function func);
+
+  private:
+    sol::safe_function _luaMouseButtonCallback;
+    sol::safe_function _luaMouseMoveCallback;
+};
+
+}
+
+#endif // ABYSS_INPUTLISTENER_H