提交: 8b758e5dfb3e33bdd34068906a7bdc015bda817b - main (git)

Commit MetaInfo

• 修订版: 8b758e5dfb3e33bdd34068906a7bdc015bda817b (tree)
• 时间: 2012-09-30 03:00:28
• 作者: h2so5 <h2so5@git....>
• Commiter: h2so5

Log Message

チャンネル機能を仮実装

更改概述

• modified: client/Card.cpp
• modified: client/Card.hpp
• modified: client/Player.cpp
• modified: client/Player.hpp
• modified: client/PlayerManager.cpp
• modified: client/ui/UIList.cpp
• modified: client/ui/UIList.hpp
• modified: common/database/AccountProperty.hpp
• modified: common/network/Command.cpp
• modified: common/network/Session.cpp
• modified: common/network/Session.hpp
• modified: server/Account.cpp
• modified: server/Account.hpp
• modified: server/Server.cpp
• modified: server/Server.hpp
• modified: server/main.cpp
• modified: server/version.hpp

差异

--- a/client/Card.cpp
+++ b/client/Card.cpp
@@ -18,6 +18,7 @@
 #include "ResourceManager.hpp"
 #include "../common/unicode.hpp"
 #include "../common/network/Command.hpp"
+#include "../common/network/Utils.hpp"
 #include "../common/database/AccountProperty.hpp"
 #include "Profiler.hpp"
 #include "GenerateJSON.hpp"
@@ -403,6 +404,42 @@ Handle<Value> Card::Function_Account_updateTrip(const Arguments& args)
     return Undefined();
 }
 
+Handle<Value> Card::Function_Account_channel(const Arguments& args)
+{
+    auto self = static_cast<Card*>(args.Holder()->GetPointerFromInternalField(0));
+
+    int id = 0;
+    if (auto command_manager = self->manager_accessor_->command_manager().lock()) {
+        id = command_manager->user_id();
+    }
+    if (auto player_manager = self->manager_accessor_->player_manager().lock()) {
+        if (auto player = player_manager->GetFromId(id)) {
+            return Integer::New(player->channel());
+        }
+    }
+
+    return Undefined();
+}
+
+Handle<Value> Card::Function_Account_updateChannel(const Arguments& args)
+{
+    auto self = static_cast<Card*>(args.Holder()->GetPointerFromInternalField(0));
+
+	if (args.Length() >= 1 && args[0]->IsNumber()) {
+
+		int channel = args[0]->ToInteger()->Int32Value();
+
+		if (channel >= 0 && channel <= UCHAR_MAX) {
+			if (auto command_manager = self->manager_accessor_->command_manager().lock()) {
+				auto channel_str = network::Utils::Serialize((unsigned char)channel);
+				command_manager->Write(network::ServerUpdateAccountProperty(CHANNEL, channel_str));
+			}
+		}
+    }
+
+    return Undefined();
+}
+
 
 Handle<Value> Card::Function_Screen_width(const Arguments& args)
 {
@@ -931,6 +968,26 @@ void Card::SetFunctions()
     script_.SetFunction("Account.updateTrip", Function_Account_updateTrip);
 
     /**
+     * 現在のチャンネルを返します
+     *
+     * @method channel
+     * @return {Integer} チャンネル
+     *
+     * @static
+     */
+    script_.SetFunction("Account.channel", Function_Account_channel);
+
+    /**
+     * 現在のチャンネルを設定します
+     *
+     * @method updateChannel
+     * @param {Integer} channel チャンネル
+     *
+     * @static
+     */
+    script_.SetFunction("Account.updateChannel", Function_Account_updateChannel);
+
+    /**
      * カード
      *
      * @class Card

Binary files a/client/Card.hpp and b/client/Card.hpp differ

--- a/client/Player.cpp
+++ b/client/Player.cpp
@@ -33,6 +33,7 @@ id_(id),
 name_(""),
 model_name_(""),
 login_(false),
+channel_(0),
 revision_(0)
 {
     name_tip_image_handle_ = ResourceManager::LoadCachedDivGraph<4>(
@@ -291,6 +292,14 @@ Handle<Value> Player::Function_Player_login(const Arguments& args)
     return Boolean::New(self->login_);
 }
 
+Handle<Value> Player::Function_Player_channel(const Arguments& args)
+{
+    assert(args.This()->InternalFieldCount() > 0);
+    auto self = *static_cast<PlayerPtr*>(args.This()->GetPointerFromInternalField(0));
+    assert(self);
+    return Integer::New(self->channel_);
+}
+
 Handle<Value> Player::Function_Player_setBalloonContent(const Arguments& args)
 {
 
@@ -386,6 +395,13 @@ void Player::RegisterFunctionTemplate(Handle<FunctionTemplate>& func)
     */
     object->Set(String::New("login"), FunctionTemplate::New(Function_Player_login));
 
+    /**
+    * プレイヤーチャンネルを返します
+    *
+    * @method channel
+    * @return {Integer}　ログインしている時trueを返します
+    */
+    object->Set(String::New("channel"), FunctionTemplate::New(Function_Player_channel));
 
     /**
     * プレイヤーの頭上の吹き出しに表示する内容を設定します
@@ -541,6 +557,16 @@ void Player::set_model_name(const std::string& trip)
     model_name_ = trip;
 }
 
+std::string Player::current_model_name() const
+{
+    return current_model_name_;
+}
+
+void Player::set_current_model_name(const std::string& model_name)
+{
+    current_model_name_ = model_name;
+}
+
 bool Player::login() const
 {
     return login_;
@@ -551,6 +577,16 @@ void Player::set_login(bool login)
     login_ = login;
 }
 
+unsigned char Player::channel() const
+{
+	return channel_;
+}
+
+void Player::set_channel(unsigned char channel)
+{
+	channel_ = channel;
+}
+
 uint32_t Player::revision() const
 {
     return revision_;

--- a/client/Player.hpp
+++ b/client/Player.hpp
@@ -52,6 +52,7 @@ class Player : public std::enable_shared_from_this<Player> {
         static Handle<Value> Function_Player_name(const Arguments& args);
         static Handle<Value> Function_Player_trip(const Arguments& args);
         static Handle<Value> Function_Player_login(const Arguments& args);
+        static Handle<Value> Function_Player_channel(const Arguments& args);
         static Handle<Value> Function_Player_setBalloonContent(const Arguments& args);
         static Handle<Value> Function_Player_position(const Arguments& args);
 
@@ -65,12 +66,19 @@ class Player : public std::enable_shared_from_this<Player> {
         void set_trip(const std::string& trip);
         std::string model_name() const;
         void set_model_name(const std::string& model_name);
+
         bool login() const;
         void set_login(bool login);
+		unsigned char channel() const;
+		void set_channel(unsigned char channel);
+
         uint32_t revision() const;
         void set_revision(uint32_t revision);
         const PlayerPosition& position() const;
         void set_position(const PlayerPosition& pos);
+		
+        std::string current_model_name() const;
+        void set_current_model_name(const std::string& model_name);
 
         std::string ip_address() const;
         void set_ip_address(const std::string& ip_address);
@@ -88,8 +96,9 @@ class Player : public std::enable_shared_from_this<Player> {
         unsigned int id_;
         std::string name_;
         std::string trip_;
-        std::string model_name_;
+        std::string model_name_, current_model_name_;
         bool login_;
+		unsigned char channel_;
         unsigned int revision_;
         PlayerPosition pos_;
 

Binary files a/client/PlayerManager.cpp and b/client/PlayerManager.cpp differ

--- a/client/ui/UIList.cpp
+++ b/client/ui/UIList.cpp
@@ -49,7 +49,7 @@ Handle<Value> UIList::Function_addItem(const Arguments& args)
         if (args.This() != child) {
             UIBasePtr child_ptr = *static_cast<UIBasePtr*>(child->GetPointerFromInternalField(0));
             child_ptr->set_parent(args.This());
-            self->items_.push_back(Persistent<Object>::New(child));
+            self->items_.push_back(child_ptr);
         }
     }
     return args.This();
@@ -64,10 +64,9 @@ Handle<Value> UIList::Function_removeItem(const Arguments& args)
     assert(self);
 
     if (args.Length() > 0 && args[0]->IsObject()) {
-        auto child = args[0]->ToObject();
-        auto it = std::find(self->items_.begin(), self->items_.end(), child);
+        auto it = std::find(self->items_.begin(), self->items_.end(), self);
         if (it != self->items_.end()) {
-            UIBasePtr chid_ptr = *static_cast<UIBasePtr*>((*it)->GetPointerFromInternalField(0));
+            UIBasePtr chid_ptr = *it;
             chid_ptr->set_parent(Handle<Object>());
             self->items_.erase(it);
         }
@@ -84,7 +83,7 @@ Handle<Value> UIList::Function_clearItems(const Arguments& args)
     assert(self);
 
     BOOST_FOREACH(auto it, self->items_) {
-        UIBasePtr chid_ptr = *static_cast<UIBasePtr*>(it->GetPointerFromInternalField(0));
+        UIBasePtr chid_ptr = it;
         chid_ptr->set_parent(Handle<Object>());
     }
 	self->items_.clear();
@@ -159,9 +158,7 @@ void UIList::DefineInstanceTemplate(Handle<ObjectTemplate>* object)
 
 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));
+    BOOST_FOREACH (UIBasePtr& item_ptr, items_) {
 		if (input->GetMousePos().second > absolute_y() && 
 			input->GetMousePos().second < absolute_y() + absolute_height()) {
 			item_ptr->ProcessInput(input);
@@ -226,9 +223,7 @@ void UIList::Update()
 
     int content_height = 0;
     int index = 0;
-    for (auto it = items_.begin(); it != items_.end(); ++it) {
-        auto item = *it;
-        UIBasePtr item_ptr = *static_cast<UIBasePtr*>(item->GetPointerFromInternalField(0));
+    BOOST_FOREACH (UIBasePtr& item_ptr, items_) {
         item_ptr->set_offset_y(offset_y - BASE_BLOCK_SIZE);
         // item_ptr->set_offset_width(-18);
         item_ptr->Update();
@@ -271,8 +266,7 @@ void UIList::Draw()
     SetDrawArea(absolute_x(), absolute_y(),
             absolute_x() + absolute_width(), absolute_y() + absolute_height());
     if (item_start_ >= 0) {
-        for (int i = item_start_; i <= item_end_; i++) {
-            UIBasePtr item_ptr = *static_cast<UIBasePtr*>(items_[i]->GetPointerFromInternalField(0));
+        BOOST_FOREACH (UIBasePtr& item_ptr, items_) {
             item_ptr->Draw();
         }
     }

--- a/client/ui/UIList.hpp
+++ b/client/ui/UIList.hpp
@@ -33,7 +33,7 @@ class UIList : public UIBase {
     private:
         std::array<ImageHandlePtr,4> scrollbar_base_image_handle_;
 
-        std::vector<Persistent<Object>> items_;
+        std::vector<UIBasePtr> items_;
 
         int scroll_y_, max_scroll_y_, scroll_y_target_;
         int scrollbar_height_, scrollbar_y_;

--- a/common/database/AccountProperty.hpp
+++ b/common/database/AccountProperty.hpp
@@ -8,6 +8,7 @@ enum AccountProperty {
     REVISION =      0x0,
     PUBLIC_KEY =    0x1,
     LOGIN =         0x2,
+    CHANNEL =       0x3,
     NAME =          0xA3,
     TRIP =          0xA4,
     MODEL_NAME =    0xA5,

--- a/common/network/Command.cpp
+++ b/common/network/Command.cpp
@@ -136,7 +136,7 @@ ServerReceiveAccountInitializeData::ServerReceiveAccountInitializeData(const std
 }
 
 ServerUpdateAccountProperty::ServerUpdateAccountProperty(AccountProperty property, const std::string& value) :
-Command(header::ServerUpdateAccountProperty, Utils::Serialize(property, value))
+Command(header::ServerUpdateAccountProperty, Utils::Serialize(property) + value)
 {
 
 }

--- a/common/network/Session.cpp
+++ b/common/network/Session.cpp
@@ -25,7 +25,8 @@ namespace network {
       serialized_byte_sum_(0),
       compressed_byte_sum_(0),
 	  write_average_limit_(999999),
-      id_(0)
+      id_(0),
+	  channel_(0)
     {
 
     }
@@ -129,6 +130,16 @@ namespace network {
         id_ = id;
     }
 
+	unsigned char Session::channel() const
+	{
+		return channel_;
+	}
+
+	void Session::set_channel(unsigned char channel)
+	{
+		channel_ = channel;
+	}
+
     bool Session::online() const
     {
         return online_;

--- a/common/network/Session.hpp
+++ b/common/network/Session.hpp
@@ -60,6 +60,9 @@ namespace network {
             void set_id(UserID id);
             bool online() const;
 
+			unsigned char channel() const;
+			void set_channel(unsigned char channel);
+
             std::string global_ip() const;
             uint16_t udp_port() const;
             void set_global_ip(const std::string& global_ip);
@@ -118,6 +121,7 @@ namespace network {
 			int write_average_limit_;
 
             UserID id_;
+			unsigned char channel_;
     };
 
 }

--- a/server/Account.cpp
+++ b/server/Account.cpp
@@ -78,9 +78,9 @@ std::string Account::GetUserRevisionPatch(UserID user_id, uint32_t revision)
 
             PropertyMap& property_map = usermap_it->second;
 
-            for (auto it = property_map.begin(); it != property_map.end(); ++it) {
-                if (it->second.revision > revision) {
-                    patch += network::Utils::Serialize((uint16_t)it->first) + it->second.value;
+            BOOST_FOREACH (auto& property, property_map) {
+                if (property.second.revision > revision) {
+                    patch += network::Utils::Serialize((uint16_t)property.first) + property.second.value;
                 }
             }
         }
@@ -261,6 +261,18 @@ uint32_t Account::GetUserRevision(UserID user_id) const
     return revision;
 }
 
+void Account::SetUserChannel(UserID user_id, unsigned char channel)
+{
+    Set(user_id, CHANNEL, channel);
+}
+
+unsigned char Account::GetUserChannel(UserID user_id) const
+{
+    unsigned char channel = 0;
+    Get(user_id, CHANNEL, &channel);
+    return channel;
+}
+
 void Account::SetUserPosition(UserID user_id, const PlayerPosition& pos)
 {
     auto it = position_map_.find(user_id);

--- a/server/Account.hpp
+++ b/server/Account.hpp
@@ -48,6 +48,9 @@ class Account {
         uint16_t GetUserUDPPort(UserID) const;
         void SetUserUDPPort(UserID, uint16_t);
         uint32_t GetUserRevision(UserID) const;
+		
+        void SetUserChannel(UserID, unsigned char);
+        unsigned char GetUserChannel(UserID) const;
 
         void SetUserPosition(UserID, const PlayerPosition&);
         PlayerPosition GetUserPosition(UserID) const;

--- a/server/Server.cpp
+++ b/server/Server.cpp
@@ -153,21 +153,29 @@ namespace network {
 		Logger::Info("Active connection: %d", GetUserCount());
 	}
 
-    void Server::SendAll(const Command& command)
+    void Server::SendAll(const Command& command, int channel, bool limited)
     {
         BOOST_FOREACH(SessionWeakPtr& ptr, sessions_) {
             if (auto session = ptr.lock()) {
-                session->Send(command);
+				if (channel < 0 || (channel >= 0 && session->channel() == channel)) {
+					if (!limited || session->write_average_limit() > session->GetWriteByteAverage()) {
+						session->Send(command);
+					}
+				}
             }
         }
     }
 
-    void Server::SendAllLimited(const Command& command)
+    void Server::SendOthers(const Command& command, uint32_t self_id, int channel, bool limited)
     {
         BOOST_FOREACH(SessionWeakPtr& ptr, sessions_) {
             if (auto session = ptr.lock()) {
-				if (session->write_average_limit() > session->GetWriteByteAverage()) {
-					session->Send(command);
+				if (channel < 0 || (channel >= 0 && session->channel() == channel)) {
+					if (!limited || session->write_average_limit() > session->GetWriteByteAverage()) {
+						if (session->id() != self_id) {
+							session->Send(command);
+						}
+					}
 				}
             }
         }
@@ -185,34 +193,6 @@ namespace network {
 		}
 	}
 
-    void Server::SendOthers(const Command& command, SessionWeakPtr self_ptr)
-    {
-        BOOST_FOREACH(SessionWeakPtr& ptr, sessions_) {
-            if (auto session = ptr.lock()) {
-                if (auto self = self_ptr.lock()) {
-                    if (*session != *self) {
-                        session->Send(command);
-                    }
-                }
-            }
-        }
-    }
-
-    void Server::SendOthersLimited(const Command& command, SessionWeakPtr self_ptr)
-    {
-        BOOST_FOREACH(SessionWeakPtr& ptr, sessions_) {
-            if (auto session = ptr.lock()) {
-                if (auto self = self_ptr.lock()) {
-                    if (*session != *self) {
-						if (session->write_average_limit() > session->GetWriteByteAverage()) {
-							session->Send(command);
-						}
-                    }
-                }
-            }
-        }
-    }
-
     void Server::SendUDPTestPacket(const std::string& ip_address, uint16_t port)
     {
         using boost::asio::ip::udp;

--- a/server/Server.hpp
+++ b/server/Server.hpp
@@ -30,11 +30,10 @@ class Server {
         void Start(CallbackFuncPtr callback);
         void Stop();
         void Stop(int interrupt_type);
-        void SendAll(const Command&);
-		void SendAllLimited(const Command& command);
+
+        void SendAll(const Command&, int channel = -1, bool limited = false);
+        void SendOthers(const Command&, uint32_t self_id, int channel = -1, bool limited = false);
         void SendTo(const Command&, uint32_t);
-        void SendOthers(const Command&, SessionWeakPtr);
-        void SendOthersLimited(const Command&, SessionWeakPtr);
 
         bool Empty() const;
 		std::string GetStatusJSON() const;

--- a/server/main.cpp
+++ b/server/main.cpp
@@ -108,7 +108,7 @@ int main(int argc, char* argv[])
 						server.SendTo(send_command, user_id);
 					}
 				} else {
-					server.SendAll(send_command);
+					server.SendAll(send_command, session->channel());
 				}
 
 				Logger::Info("Receive JSON: %s", message_json.str());
@@ -124,8 +124,8 @@ int main(int argc, char* argv[])
                 PlayerPosition pos;
                 network::Utils::Deserialize(c.body(), &pos.x, &pos.y, &pos.z, &pos.theta, &pos.vy);
                 account.SetUserPosition(session->id(), pos);
-                server.SendOthersLimited(network::ClientUpdatePlayerPosition(session->id(),
-                        pos.x,pos.y,pos.z,pos.theta, pos.vy), c.session());
+                server.SendOthers(network::ClientUpdatePlayerPosition(session->id(),
+					pos.x,pos.y,pos.z,pos.theta, pos.vy), session->id(), session->channel(), true);
             }
         }
             break;
@@ -237,7 +237,7 @@ int main(int argc, char* argv[])
 
                 server.SendOthers(
                         network::ClientReceiveAccountRevisionUpdateNotify(session->id(),
-                                account.GetUserRevision(session->id())), c.session());
+                                account.GetUserRevision(session->id())), session->id());
 
                 Logger::Info(msg);
             }
@@ -265,8 +265,8 @@ int main(int argc, char* argv[])
         {
             if (auto session = c.session().lock()) {
                 AccountProperty property;
-                std::string value;
-                network::Utils::Deserialize(c.body(), &property, &value);
+				std::string buffer = c.body().substr(sizeof(AccountProperty));
+                network::Utils::Deserialize(c.body(), &property);
 
                 auto old_revision = account.GetUserRevision(session->id());
 
@@ -274,17 +274,24 @@ int main(int argc, char* argv[])
 
                 case NAME:
                     {
-                        account.SetUserName(session->id(), value);
+                        account.SetUserName(session->id(), buffer);
                     }
                     break;
                 case TRIP:
                     {
-                        account.SetUserTrip(session->id(), value);
+                        account.SetUserTrip(session->id(), buffer);
                     }
                     break;
                 case MODEL_NAME:
                     {
-                        account.SetUserModelName(session->id(), value);
+                        account.SetUserModelName(session->id(), buffer);
+                    }
+                    break;
+                case CHANNEL:
+                    {
+						unsigned char value;
+						network::Utils::Deserialize(buffer, &value);
+                        account.SetUserChannel(session->id(), value);
                     }
                     break;
                 default:

--- a/server/version.hpp
+++ b/server/version.hpp
@@ -8,10 +8,10 @@
 #define MMO_VERSION_TOSTRING(val) MMO_VERSION_TOSTRING_(val)
 
 #define MMO_VERSION_MAJOR 0
-#define MMO_VERSION_MINOR 1
-#define MMO_VERSION_REVISION 9
+#define MMO_VERSION_MINOR 2
+#define MMO_VERSION_REVISION 0
 
-#define MMO_PROTOCOL_VERSION 2
+#define MMO_PROTOCOL_VERSION 3
 
 #ifdef MMO_VERSION_BUILD
 #define MMO_VERSION_BUILD_TEXT " Build " MMO_VERSION_TOSTRING(MMO_VERSION_BUILD)