UIListのバグを修正

近くのUnknownキャラクターのモデル名を表示

diff --git a/client/3d/Stage.cpp b/client/3d/Stage.cpp
index ff1c0e3..12d78f7 100644 (file)
--- a/client/3d/Stage.cpp
+++ b/client/3d/Stage.cpp
@@ -235,6 +235,20 @@ bool Stage::IsVisiblePoint(const VECTOR& point) const
     return (distance < 500000 && screen_pos.z > 0.0f && screen_pos.z < 1.0f);
 }
 
+bool Stage::IsNearPoint(const VECTOR& point) const
+{
+       MMO_PROFILE_FUNCTION;
+
+       const auto& camera = GetCameraPosition();
+
+       auto distance = (point.x - camera.x) * (point.x - camera.x) +
+               (point.y - camera.y) * (point.y - camera.y) +
+               (point.z - camera.z) * (point.z - camera.z);
+
+    auto screen_pos = ConvWorldPosToScreenPos(point);
+    return (distance < 10000 && screen_pos.z > 0.0f && screen_pos.z < 1.0f);
+}
+
 void Stage::UpdateSkymapPosition(const VECTOR& pos)
 {
     MV1SetPosition(skymap_handle_.handle(), VGet(pos.x, 800, pos.z));

diff --git a/client/3d/Stage.hpp b/client/3d/Stage.hpp
index b03698e..af2cfe0 100644 (file)
--- a/client/3d/Stage.hpp
+++ b/client/3d/Stage.hpp
@@ -26,6 +26,7 @@ class Stage {
         float height_begin, float height_end, size_t num_division) const;
 
         bool IsVisiblePoint(const VECTOR& point) const;
+        bool IsNearPoint(const VECTOR& point) const;
 
         const ModelHandle& map_handle() const;
         float map_scale() const;

diff --git a/client/PlayerManager.cpp b/client/PlayerManager.cpp
index 8e831bb..0ecdf31 100644 (file)
Binary files a/client/PlayerManager.cpp and b/client/PlayerManager.cpp differ

diff --git a/client/WorldManager.cpp b/client/WorldManager.cpp
index c0bb568..ead57de 100644 (file)
Binary files a/client/WorldManager.cpp and b/client/WorldManager.cpp differ

diff --git a/client/WorldManager.hpp b/client/WorldManager.hpp
index eda141b..b1cbd8a 100644 (file)
--- a/client/WorldManager.hpp
+++ b/client/WorldManager.hpp
@@ -21,6 +21,7 @@ class WorldManager {
         void Draw();
 
         bool IsVisiblePoint(const VECTOR& point);
+        bool IsNearPoint(const VECTOR& point);
         void ResetCameraPosition();
 
     public:

diff --git a/client/ui/UIList.cpp b/client/ui/UIList.cpp
index aeaa891..0ca450d 100644 (file)
--- a/client/ui/UIList.cpp
+++ b/client/ui/UIList.cpp
@@ -136,7 +136,7 @@ void UIList::ProcessInput(InputManager* input)
     for (auto it = items_.begin(); it != items_.end(); ++it) {
         auto item = *it;
         UIBasePtr item_ptr = *static_cast<UIBasePtr*>(item->GetPointerFromInternalField(0));
-               if (input->GetMousePos().first > absolute_y() && 
+               if (input->GetMousePos().second > absolute_y() && 
                        input->GetMousePos().second < absolute_y() + absolute_height()) {
                        item_ptr->ProcessInput(input);
                }

diff --git a/client/version.hpp b/client/version.hpp
index 9307a6e..4243b44 100644 (file)
--- a/client/version.hpp
+++ b/client/version.hpp
@@ -9,7 +9,7 @@
 
 #define MMO_VERSION_MAJOR 0
 #define MMO_VERSION_MINOR 3
-#define MMO_VERSION_REVISION 5
+#define MMO_VERSION_REVISION 6
 
 #define MMO_PROTOCOL_VERSION 2