半透明のメッシュをキャラクターより後に描画するように変更

UIListの項目数が多いと描画が重くなる問題を修正
modelディレクトリを再帰的に検索するように変更

diff --git a/client/3d/Stage.cpp b/client/3d/Stage.cpp
index 1ad1c6a..c3eda92 100644 (file)
--- a/client/3d/Stage.cpp
+++ b/client/3d/Stage.cpp
@@ -26,6 +26,14 @@ Stage::Stage(const tstring& model_name) :
     if (start_points_.empty()) {
         start_points_.push_back(VGet(0, 0, 0));
     }
+
+       int handle = map_handle_.handle();
+       int frame_num = MV1GetMeshNum(handle);
+       for (int i = 0; i < frame_num; i++) {
+               if (MV1GetMeshSemiTransState(handle, i) == TRUE) {
+                       draw_after_meshes_.insert(i);
+               }
+       }
        /*
     auto warp_points_array = map_handle_.property().get_child("stage.warp_points", ptree());
     for (auto it = warp_points_array.begin(); it != warp_points_array.end(); ++it) {
@@ -67,8 +75,15 @@ void Stage::Draw()
 {
        MMO_PROFILE_FUNCTION;
 
+       int handle = map_handle_.handle();
+       int frame_num = MV1GetMeshNum(handle);
+       for (int i = 0; i < frame_num; i++) {
+               if (draw_after_meshes_.find(i) == draw_after_meshes_.end()) {
+                       MV1DrawMesh(handle, i);
+               }
+       }
+
     MV1DrawModel(skymap_handle_.handle());
-    MV1DrawModel(map_handle_.handle());
 
        /*
        BOOST_FOREACH(auto warp_handle,warpobj_array_)
@@ -78,6 +93,19 @@ void Stage::Draw()
        */
 }
 
+void Stage::DrawAfter()
+{
+       MMO_PROFILE_FUNCTION;
+
+       int handle = map_handle_.handle();
+       int frame_num = MV1GetMeshNum(handle);
+       for (int i = 0; i < frame_num; i++) {
+               if (draw_after_meshes_.find(i) != draw_after_meshes_.end()) {
+                       MV1DrawMesh(handle, i);
+               }
+       }
+}
+
 float Stage::GetFloorY(const VECTOR& v1, const VECTOR& v2) const
 {
        MMO_PROFILE_FUNCTION;

diff --git a/client/3d/Stage.hpp b/client/3d/Stage.hpp
index 22fab3f..fd3341e 100644 (file)
--- a/client/3d/Stage.hpp
+++ b/client/3d/Stage.hpp
@@ -16,6 +16,7 @@ class Stage {
         Stage(const tstring& model_path);
         ~Stage();
         void Draw();
+        void DrawAfter();
 
         float GetFloorY(const VECTOR& v1, const VECTOR& v2) const;
         bool GetFloorY(const VECTOR& v1, const VECTOR& v2, float* y) const;
@@ -45,6 +46,9 @@ class Stage {
         ModelHandle map_handle_;
         float map_scale_;
                float min_height_;
+
+               std::unordered_set<int> draw_after_meshes_;
+
         ModelHandle skymap_handle_;
                ModelHandle warpobj_handle_;
                std::vector<ModelHandle> warpobj_array_;

diff --git a/client/3d/gameloop.cpp b/client/3d/gameloop.cpp
index 973be0f..209f9ff 100644 (file)
--- a/client/3d/gameloop.cpp
+++ b/client/3d/gameloop.cpp
@@ -85,11 +85,13 @@ int GameLoop::Draw()
     FixCameraPosition();
 
     stage_->Draw();
-    //myself_->Draw();
+
     for (auto it = charmgr_->GetAll().begin(); it != charmgr_->GetAll().end(); ++it) {
         auto character = *it;
         character.second->Draw();
-    }
+       }
+
+    stage_->DrawAfter();
 
     return 0;
 }

diff --git a/client/InputManager.cpp b/client/InputManager.cpp
index 326abcc..aafd789 100644 (file)
Binary files a/client/InputManager.cpp and b/client/InputManager.cpp differ

diff --git a/client/ResourceManager.cpp b/client/ResourceManager.cpp
index d13dbc0..19aeb88 100644 (file)
Binary files a/client/ResourceManager.cpp and b/client/ResourceManager.cpp differ

diff --git a/client/stdafx.h b/client/stdafx.h
index b45033c..44d62ba 100644 (file)
--- a/client/stdafx.h
+++ b/client/stdafx.h
@@ -41,6 +41,7 @@
 #include <vector>
 #include <list>
 #include <map>
+#include <unordered_set>
 #include <deque>
 #include <queue>
 #include <array>

diff --git a/client/ui/UIList.cpp b/client/ui/UIList.cpp
index a03001f..75cc097 100644 (file)
--- a/client/ui/UIList.cpp
+++ b/client/ui/UIList.cpp
@@ -267,8 +267,12 @@ void UIList::Draw()
     SetDrawArea(absolute_x(), absolute_y(),
             absolute_x() + absolute_width(), absolute_y() + absolute_height());
     if (item_start_ >= 0) {
+               int index = 0;
         BOOST_FOREACH (UIBasePtr& item_ptr, items_) {
-            item_ptr->Draw();
+                       if (index >= item_start_ && index <=  item_end_) {
+                               item_ptr->Draw();
+                       }
+                       index++;
         }
     }
     SetDrawAreaFull();

diff --git a/client/version.hpp b/client/version.hpp
index d76f644..0f8ac0d 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 10
+#define MMO_VERSION_REVISION 11
 
 #define MMO_PROTOCOL_VERSION 2