Commit: f48dd7814a1416b5dbc6b025c4e8d527c7012615 - main (git)

Commit MetaInfo

• Revisión: f48dd7814a1416b5dbc6b025c4e8d527c7012615 (tree)
• Tiempo: 2012-10-10 19:42:19
• Autor: h2so5 <h2so5@git....>
• Commiter: h2so5

Log Message

チャンネル機能を仮実装

Cambiar Resumen

• modified: client/3d/FieldPlayer.cpp
• modified: client/3d/FieldPlayer.hpp
• modified: client/3d/PlayerCharacter.cpp
• modified: client/3d/PlayerCharacter.hpp
• modified: client/3d/Stage.cpp
• modified: client/3d/Stage.hpp
• modified: client/CommandManager.cpp
• modified: client/CommandManager.hpp
• modified: client/PlayerManager.cpp
• modified: client/PlayerManager.hpp
• modified: client/WorldManager.cpp
• modified: client/WorldManager.hpp
• add: client/bin/server/channels/ch000/config.json
• add: client/bin/server/channels/ch001/config.json
• add: client/scene/ChannelChange.cpp
• add: client/scene/ChannelChange.hpp
• modified: client/scene/Connect.cpp
• modified: client/scene/Connect.hpp
• modified: client/scene/Include.hpp
• modified: client/scene/MainLoop.cpp
• modified: client/scene/Option.cpp

Diferencia incremental

--- a/client/3d/FieldPlayer.cpp
+++ b/client/3d/FieldPlayer.cpp
@@ -26,7 +26,7 @@ inline bool NearlyEqualRelative(const T& lhs, const T& rhs, const U& ratio)
 
 } // namespace
 
-FieldPlayer::FieldPlayer(CharacterDataProvider& data_provider, const StagePtr& stage, const TimerPtr& timer)
+FieldPlayer::FieldPlayer(CharacterDataProvider& data_provider, const std::shared_ptr<const StagePtr>& stage, const TimerPtr& timer)
 :       prev_stat_(),
         current_stat_(PlayerStatus( VGet(0, 0, 0), VGet(0, 0, 0), VGet(0, 0, 0),
                 0.0f, 0.0f, 0, 0, 1.0f, false)),
@@ -55,8 +55,8 @@ void FieldPlayer::Chara_ShadowRender() const
 	MV1_COLL_RESULT_POLY *HitRes ;
 	VERTEX3D Vertex[ 3 ] ;
 	VECTOR SlideVec ;
-	auto shadow_height = model_height_*stage_->map_scale();
-	auto shadow_size = shadow_size_ * stage_->map_scale();
+	auto shadow_height = model_height_ * (*stage_)->map_scale();
+	auto shadow_size = shadow_size_ * (*stage_)->map_scale();
 
 	// ライティングを無効にする
 	SetUseLighting( FALSE ) ;
@@ -68,7 +68,7 @@ void FieldPlayer::Chara_ShadowRender() const
 	SetTextureAddressMode( DX_TEXADDRESS_CLAMP ) ;
 
 	// キャラクターの直下に存在する地面のポリゴンを取得
-	HitResDim = MV1CollCheck_Capsule( stage_->map_handle().handle() , -1, VAdd( current_stat_.pos, VGet( 0, 0.5f * shadow_height, 0 ) ), VAdd( current_stat_.pos, VGet( 0.0f,-shadow_height, 0.0f ) ), shadow_size ) ;
+	HitResDim = MV1CollCheck_Capsule( (*stage_)->map_handle().handle() , -1, VAdd( current_stat_.pos, VGet( 0, 0.5f * shadow_height, 0 ) ), VAdd( current_stat_.pos, VGet( 0.0f,-shadow_height, 0.0f ) ), shadow_size ) ;
 
 	// 頂点データで変化が無い部分をセット
 	Vertex[ 0 ].dif = GetColorU8( 255,255,255,255 ) ;
@@ -137,9 +137,9 @@ void FieldPlayer::Draw() const
     MV1DrawModel(model_handle_.handle());
 	Chara_ShadowRender();
 
-    // DrawLine3D(current_stat_.pos, current_stat_.pos + VGet(2 * stage_->map_scale(), 0, 0), GetColor(255, 0, 0));
-    // DrawLine3D(current_stat_.pos, current_stat_.pos + VGet(0, 2 * stage_->map_scale(), 0), GetColor(0, 255, 0));
-    // DrawLine3D(current_stat_.pos, current_stat_.pos + VGet(0, 0, 2 * stage_->map_scale()), GetColor(0, 0, 255));
+    // DrawLine3D(current_stat_.pos, current_stat_.pos + VGet(2 * (*stage_)->map_scale(), 0, 0), GetColor(255, 0, 0));
+    // DrawLine3D(current_stat_.pos, current_stat_.pos + VGet(0, 2 * (*stage_)->map_scale(), 0), GetColor(0, 255, 0));
+    // DrawLine3D(current_stat_.pos, current_stat_.pos + VGet(0, 0, 2 * (*stage_)->map_scale()), GetColor(0, 0, 255));
 }
 
 void FieldPlayer::Init(tstring model_name)
@@ -150,17 +150,17 @@ void FieldPlayer::Init(tstring model_name)
 
 void FieldPlayer::ResetPosition()
 {
-    const auto& points = stage_->start_points();
+    const auto& points = (*stage_)->start_points();
     std::mt19937 engine(time(nullptr));
     std::uniform_int_distribution<int> distribution(0, points.size() - 1);
 
     current_stat_.pos = points[distribution(engine)];
-    current_stat_.pos.y = stage_->GetFloorY(current_stat_.pos + VGet(0, 20, 0), current_stat_.pos - VGet(0, 20, 0));
+    current_stat_.pos.y = (*stage_)->GetFloorY(current_stat_.pos + VGet(0, 20, 0), current_stat_.pos - VGet(0, 20, 0));
 }
 
 void FieldPlayer::RescuePosition()
 {
-    const auto& points = stage_->start_points();
+    const auto& points = (*stage_)->start_points();
     const auto& new_pos =
             std::min_element(points.begin(), points.end(),
             [this](const VECTOR& a, const VECTOR& b){
@@ -173,7 +173,7 @@ void FieldPlayer::RescuePosition()
             });
 
     current_stat_.pos = *new_pos;
-    current_stat_.pos.y = stage_->GetFloorY(current_stat_.pos - VGet(0, 100, 0), current_stat_.pos + VGet(0, 100, 0));
+    current_stat_.pos.y = (*stage_)->GetFloorY(current_stat_.pos - VGet(0, 100, 0), current_stat_.pos + VGet(0, 100, 0));
 	current_stat_.acc.y = 0;
 	current_stat_.vel.y = 0;
 }
@@ -226,7 +226,7 @@ void FieldPlayer::Update()
 	}
 
 	// 落ちた時に強制復帰
-	if (prev_stat_.pos.y < stage_->min_height()) {
+	if (prev_stat_.pos.y < (*stage_)->min_height()) {
 		RescuePosition();
 	}
     /*
@@ -267,7 +267,7 @@ void FieldPlayer::Update()
     data_provider_.set_motion(current_stat_.motion);
     data_provider_.set_vy(current_stat_.vel.y);
 
-    stage_->UpdateSkymapPosition(GetCameraTarget());
+    (*stage_)->UpdateSkymapPosition(GetCameraTarget());
 }
 
 void FieldPlayer::Move()
@@ -306,8 +306,8 @@ void FieldPlayer::Move()
 
 
     // 移動方向に障害物があるか、または床がない場合は移動不可能
-	auto front_collides = stage_->FrontCollides(
-            0.4, current_stat_.pos, prev_stat_.pos,1.0 * stage_->map_scale(), (model_height_ - 0.1) * stage_->map_scale() ,128);
+	auto front_collides = (*stage_)->FrontCollides(
+            0.4, current_stat_.pos, prev_stat_.pos,1.0 * (*stage_)->map_scale(), (model_height_ - 0.1) * (*stage_)->map_scale() ,128);
 
 	if(front_collides.first && current_stat_.acc.y == 0)
 	{
@@ -320,7 +320,7 @@ void FieldPlayer::Move()
         current_stat_.vel.x = current_stat_.vel.z = 0;
 	}
     // 50mの深さまで床検出
-    auto floor_exists = stage_->FloorExists(current_stat_.pos, model_height_, 50);
+    auto floor_exists = (*stage_)->FloorExists(current_stat_.pos, model_height_, 50);
 	if(!floor_exists.first)
 	{
 		current_stat_.pos.x = front_collides.second.x;
@@ -329,7 +329,7 @@ void FieldPlayer::Move()
 	}
 
     // 足が地面にめり込んでいるか
-    auto foot_floor_exists = stage_->FloorExists(current_stat_.pos, model_height_, 0);
+    auto foot_floor_exists = (*stage_)->FloorExists(current_stat_.pos, model_height_, 0);
 
     const auto pos_diff = current_stat_.pos - prev_stat_.pos;
     const auto pos_diff_length = VSize(pos_diff);
@@ -352,7 +352,7 @@ void FieldPlayer::Move()
 			// 接地点計算
 			//std::cout << "  ground collision check: current pos = " << current_stat_.pos << std::endl;
 
-			auto coll_info = MV1CollCheck_Line(stage_->map_handle().handle(), -1,
+			auto coll_info = MV1CollCheck_Line((*stage_)->map_handle().handle(), -1,
 				current_stat_.pos + VGet(0, y_max_limit, 0),
 				current_stat_.pos + VGet(0, y_min_limit, 0));
 			if (coll_info.HitFlag && NearlyEqualRelative(coll_info.HitPosition.y, floor_exists.second.y, 0.001))
@@ -372,9 +372,9 @@ void FieldPlayer::Move()
 				if (floor_exists.second.y < current_stat_.pos.y)
 				{
 					// 床はあるし、自分より低い位置なので落ちる
-					current_stat_.acc.y = -9.8 * stage_->map_scale();
+					current_stat_.acc.y = -9.8 * (*stage_)->map_scale();
 				}
-				else if (floor_exists.second.y < current_stat_.pos.y + 0.6 * stage_->map_scale())
+				else if (floor_exists.second.y < current_stat_.pos.y + 0.6 * (*stage_)->map_scale())
 				{
 					// 床があり、平らなので登る
 					auto delta = prev_stat_.pos - current_stat_.pos;
@@ -432,8 +432,8 @@ void FieldPlayer::Move()
                 // 上昇している
                 // std::cout << "  previous rising" << std::endl;
 
-                const auto player_top = VGet(0, model_height_ * stage_->map_scale(), 0);
-                auto coll_info = MV1CollCheck_Line(stage_->map_handle().handle(), -1,
+                const auto player_top = VGet(0, model_height_ * (*stage_)->map_scale(), 0);
+                auto coll_info = MV1CollCheck_Line((*stage_)->map_handle().handle(), -1,
                         prev_stat_.pos + player_top,
                         current_stat_.pos + player_top);
                 if (coll_info.HitFlag)
@@ -477,10 +477,10 @@ void FieldPlayer::InputFromUser()
         : 90.0f) * DX_PI_F / 180;
 
 	/*
-	auto warp_chk = stage_->CheckWarpPoint(current_stat_.pos);
+	auto warp_chk = (*stage_)->CheckWarpPoint(current_stat_.pos);
 	if (warp_chk && input.GetKeyCount(InputManager::KEYBIND_ENTER) > 0 )
 	{
-		stage_->SetHostChangeFlag(warp_chk);
+		(*stage_)->SetHostChangeFlag(warp_chk);
 	}
 	*/
 
@@ -534,7 +534,7 @@ void FieldPlayer::InputFromUser()
     {
         // 接地しており、かつ移動する
         any_move_ = true;
-        current_stat_.vel = VGet(sin(roty), 0, cos(roty)) * (-move_dir * move_speed * stage_->map_scale());
+        current_stat_.vel = VGet(sin(roty), 0, cos(roty)) * (-move_dir * move_speed * (*stage_)->map_scale());
         current_stat_.motion =
             current_stat_.is_walking ? motion.walk_ : motion.run_;
     }
@@ -543,19 +543,19 @@ void FieldPlayer::InputFromUser()
         // 空中にいる
         any_move_ = true;
         auto acc = 5.0f;
-		auto vel = current_stat_.vel + VGet(sin(roty), 0, cos(roty)) * (-move_dir * acc * stage_->map_scale());// * timer_->DeltaSec());// * ((6.0f-current_stat_.vel.y)/(stage_->map_scale()*12.0f))
+		auto vel = current_stat_.vel + VGet(sin(roty), 0, cos(roty)) * (-move_dir * acc * (*stage_)->map_scale());// * timer_->DeltaSec());// * ((6.0f-current_stat_.vel.y)/((*stage_)->map_scale()*12.0f))
         vel.y = 0;
 
-        if (VSize(vel) > std::max(move_speed, 1.0f) * stage_->map_scale())
+        if (VSize(vel) > std::max(move_speed, 1.0f) * (*stage_)->map_scale())
         {
-            vel = vel * (std::max(move_speed, 1.0f) * stage_->map_scale() / VSize(vel));
+            vel = vel * (std::max(move_speed, 1.0f) * (*stage_)->map_scale() / VSize(vel));
         }
         vel.y = current_stat_.vel.y;
         current_stat_.vel = vel;
 		current_stat_.acc.y = 
-			(current_stat_.acc.y + (0.2f * chg_acc * stage_->map_scale())) > -6.5f * stage_->map_scale() ? -6.5f * stage_->map_scale() :
-			current_stat_.acc.y + (0.2f * chg_acc * stage_->map_scale()) < -11.0f * stage_->map_scale() ? -11.0f * stage_->map_scale() :
-			current_stat_.acc.y + (0.2f * chg_acc * stage_->map_scale());
+			(current_stat_.acc.y + (0.2f * chg_acc * (*stage_)->map_scale())) > -6.5f * (*stage_)->map_scale() ? -6.5f * (*stage_)->map_scale() :
+			current_stat_.acc.y + (0.2f * chg_acc * (*stage_)->map_scale()) < -11.0f * (*stage_)->map_scale() ? -11.0f * (*stage_)->map_scale() :
+			current_stat_.acc.y + (0.2f * chg_acc * (*stage_)->map_scale());
     }
     else
     {
@@ -596,8 +596,8 @@ void FieldPlayer::InputFromUser()
                     input.GetGamepadCount(InputManager::PADBIND_JUMP) > 0))
     {
 			any_move_ = true;
-			current_stat_.acc.y = -9.8 * stage_->map_scale();
-			current_stat_.vel += VGet(0, jump_height_ * stage_->map_scale(), 0);
+			current_stat_.acc.y = -9.8 * (*stage_)->map_scale();
+			current_stat_.vel += VGet(0, jump_height_ * (*stage_)->map_scale(), 0);
 	}
 }
 

Binary files a/client/3d/FieldPlayer.hpp and b/client/3d/FieldPlayer.hpp differ

--- a/client/3d/PlayerCharacter.cpp
+++ b/client/3d/PlayerCharacter.cpp
@@ -24,7 +24,7 @@ inline bool NearlyEqualRelative(const T& lhs, const T& rhs, const U& ratio)
 class PlayerCharacter::Impl
 {
 public:
-    Impl(CharacterDataProvider& data_provider, const StagePtr& stage, const TimerPtr& timer)
+    Impl(CharacterDataProvider& data_provider, const std::shared_ptr<const StagePtr>& stage, const TimerPtr& timer)
         : data_provider_(data_provider),
           model_handle_(-1),
           current_target_pos_(VGet(0, 1000, 0)),
@@ -67,8 +67,8 @@ public:
 		MV1_COLL_RESULT_POLY *HitRes ;
 		VERTEX3D Vertex[ 3 ] ;
 		VECTOR SlideVec ;
-		auto shadow_height = model_height_*stage_->map_scale();
-		auto shadow_size = shadow_size_ * stage_->map_scale();
+		auto shadow_height = model_height_ * (*stage_)->map_scale();
+		auto shadow_size = shadow_size_ * (*stage_)->map_scale();
 
 		// ライティングを無効にする
 		SetUseLighting( FALSE ) ;
@@ -80,7 +80,7 @@ public:
 		SetTextureAddressMode( DX_TEXADDRESS_CLAMP ) ;
 
 		// キャラクターの直下に存在する地面のポリゴンを取得
-		HitResDim = MV1CollCheck_Capsule( stage_->map_handle().handle(), -1, VAdd( current_pos_, VGet( 0.0f, 0.5f * shadow_height, 0.0f ) ), VAdd( current_pos_, VGet( 0.0f, -shadow_height, 0.0f ) ), shadow_size ) ;
+		HitResDim = MV1CollCheck_Capsule((*stage_)->map_handle().handle(), -1, VAdd( current_pos_, VGet( 0.0f, 0.5f * shadow_height, 0.0f ) ), VAdd( current_pos_, VGet( 0.0f, -shadow_height, 0.0f ) ), shadow_size ) ;
 
 		// 頂点データで変化が無い部分をセット
 		Vertex[ 0 ].dif = GetColorU8( 255,255,255,255 ) ;
@@ -206,7 +206,7 @@ public:
 
 				/*
 				const auto jump_result_y =
-					jump_height_ * stage_->map_scale() * (time_entire - time_now) * (jump_height_ / 5.0f) * 1.019952f + 
+					jump_height_ * (*stage_)->map_scale() * (time_entire - time_now) * (jump_height_ / 5.0f) * 1.019952f + 
 					0.5f * -9.8f * (time_entire - time_now) * (time_entire - time_now) * (1.0f / flight_duration_ideal_) * (jump_height_ / 5.0f) * (jump_height_ / 5.0f);	// 今からジャンプした際の最終的な位置
 				*/
 				static auto st_acc = -9.8f;
@@ -215,12 +215,12 @@ public:
 				
 				if(jump_flag_ == false && current_target_vec_y_ != 0){
 					for(acc;acc < -6.5f;acc+=0.1f){
-						prediction_vector = jump_height_ * stage_->map_scale() + (acc) * (time_entire - time_now) * (jump_height_ / 5.0f) * (1.0f / flight_duration_ideal_ );
+						prediction_vector = jump_height_ * (*stage_)->map_scale() + (acc) * (time_entire - time_now) * (jump_height_ / 5.0f) * (1.0f / flight_duration_ideal_ );
 						// ターゲット座標ではジャンプを始めている
 						if( prediction_vector > current_target_vec_y_ - 1 && prediction_vector < current_target_vec_y_ + 1)
 						{
 							// 目標座標でベクトルが上向きなら一致、ジャンプを始める
-							move_vec_y_ = jump_height_ * stage_->map_scale();
+							move_vec_y_ = jump_height_ * (*stage_)->map_scale();
 							jump_flag_ = true;
 						}//	それ以外はそのまま
 					}
@@ -231,7 +231,7 @@ public:
 				moved_pos = current_pos_ + diff_pos;
 				if( jump_flag_ == true )
 				{
-					move_vec_y_ += (st_acc * stage_->map_scale() * timer_->DeltaSec() * (1.0f/flight_duration_ideal_) * (jump_height_ / 5.0f));
+					move_vec_y_ += (st_acc * (*stage_)->map_scale() * timer_->DeltaSec() * (1.0f/flight_duration_ideal_) * (jump_height_ / 5.0f));
 					moved_pos.y = current_pos_.y + move_vec_y_ * timer_->DeltaSec() * (jump_height_ / 5.0f);
 				}
 
@@ -239,7 +239,7 @@ public:
                 float floor_y;
 				std::pair<bool, VECTOR> floor_coll;
 					// 足で接地検査
-					floor_coll = stage_->FloorExists(moved_pos,model_height_,0);
+					floor_coll = (*stage_)->FloorExists(moved_pos,model_height_,0);
                 //moved_pos.y = std::max(moved_pos.y, floor_y); // 床にあたっているときは床の方がyが高くなる
 				if(!jump_flag_){
 					// 登ったり下ったりできる段差の大きさの制限を求める
@@ -251,7 +251,7 @@ public:
 					// 接地点計算
 					//std::cout << "  ground collision check: current pos = " << current_stat_.pos << std::endl;
 
-					auto coll_info = MV1CollCheck_Line(stage_->map_handle().handle(), -1,
+					auto coll_info = MV1CollCheck_Line((*stage_)->map_handle().handle(), -1,
 						moved_pos + VGet(0, y_max_limit, 0),
 						moved_pos + VGet(0, y_min_limit, 0));
 					if(coll_info.HitFlag && NearlyEqualRelative(coll_info.HitPosition.y, floor_coll.second.y, 0.001)){
@@ -264,7 +264,7 @@ public:
 							moved_pos = current_pos_ + VSize(diff_pos) * VNorm(diff);
 						}
 					}
-					auto floor_exists = stage_->FloorExists(moved_pos, model_height_, 50);
+					auto floor_exists = (*stage_)->FloorExists(moved_pos, model_height_, 50);
 					if( floor_exists.first )
 					{
 						if( floor_exists.second.y < moved_pos.y && current_target_pos.y < moved_pos.y)
@@ -290,8 +290,8 @@ public:
 					}else{
 						// 上昇している
 
-						const auto player_top = VGet(0, model_height_ * stage_->map_scale(), 0);
-						auto coll_info = MV1CollCheck_Line(stage_->map_handle().handle(), -1,
+						const auto player_top = VGet(0, model_height_ * (*stage_)->map_scale(), 0);
+						auto coll_info = MV1CollCheck_Line((*stage_)->map_handle().handle(), -1,
 							current_pos_ + player_top,
 							moved_pos + player_top);
 						if (coll_info.HitFlag)
@@ -300,7 +300,7 @@ public:
 							// std::cout << "    current collided to ceiling" << std::endl;
 
 							moved_pos = coll_info.HitPosition - player_top;
-							move_vec_y_ = -(move_vec_y_ - (st_acc * stage_->map_scale() * timer_->DeltaSec() * (1.0f/flight_duration_ideal_) * (jump_height_ / 5.0f))) * 1.0; // 反射
+							move_vec_y_ = -(move_vec_y_ - (st_acc * (*stage_)->map_scale() * timer_->DeltaSec() * (1.0f/flight_duration_ideal_) * (jump_height_ / 5.0f))) * 1.0; // 反射
 						}
 					}
 				}
@@ -373,7 +373,7 @@ private:
     std::unique_ptr<MotionPlayer> motion_player_;
 	std::pair<bool, int> additional_motion_;
     TimerPtr timer_;
-    StagePtr stage_;
+    std::shared_ptr<const StagePtr> stage_;
 	int shadow_handle_;
 	float shadow_size_;
 	bool jump_end_;
@@ -383,7 +383,8 @@ private:
     } motion;
 };
 
-PlayerCharacter::PlayerCharacter(CharacterDataProvider& data_provider, const StagePtr& stage, const TimerPtr& timer)
+PlayerCharacter::PlayerCharacter(CharacterDataProvider& data_provider,
+	const std::shared_ptr<const StagePtr>& stage, const TimerPtr& timer)
     : impl_(new Impl(data_provider, stage, timer))
 {}
 

--- a/client/3d/PlayerCharacter.hpp
+++ b/client/3d/PlayerCharacter.hpp
@@ -10,7 +10,7 @@
 class PlayerCharacter : public Character
 {
 public:
-    PlayerCharacter(CharacterDataProvider& data_provider, const StagePtr& stage, const TimerPtr& timer);
+    PlayerCharacter(CharacterDataProvider& data_provider, const std::shared_ptr<const StagePtr>& stage, const TimerPtr& timer);
     virtual ~PlayerCharacter();
 
     void Draw() const;

--- a/client/3d/Stage.cpp
+++ b/client/3d/Stage.cpp
@@ -5,13 +5,15 @@
 #include "Stage.hpp"
 #include "../../common/Logger.hpp"
 #include "../Profiler.hpp"
+#include "../CommandManager.hpp"
 #include <string>
 
-Stage::Stage(const tstring& model_name) :
-    map_handle_(ResourceManager::LoadModelFromName(model_name)),
+Stage::Stage(const ChannelPtr& channel) :
+    map_handle_(ResourceManager::LoadModelFromName(unicode::ToTString(channel->stage))),
     map_scale_(map_handle_.property().get<float>("scale", 20.0)),
 	min_height_(map_handle_.property().get<float>("min_height", -200.0)),
-	host_change_flag_(false)
+	host_change_flag_(false),
+	channel_(channel)
 	{
     MV1SetScale(map_handle_.handle(), VGet(map_scale_, map_scale_, map_scale_));
     MV1SetupCollInfo(map_handle_.handle(), -1, 128, 64, 128);// 元の数値は256,256,256
@@ -34,6 +36,15 @@ Stage::Stage(const tstring& model_name) :
 			draw_after_meshes_.insert(i);
 		}
 	}
+
+	BOOST_FOREACH(const auto& warp_point, channel_->warp_points) {
+		auto handle = ResourceManager::LoadModelFromName(_T("warpobj:ワープオブジェクト"));
+		float scale = handle.property().get<float>("scale", 80.0);
+		MV1SetPosition(handle.handle(), VGet(warp_point.x, warp_point.y, warp_point.z));
+		MV1SetScale(handle.handle(), VGet(scale, scale, scale));
+		warpobj_handles_.push_back(handle);
+	}
+
 	/*
     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) {
@@ -85,6 +96,10 @@ void Stage::Draw()
 
     MV1DrawModel(skymap_handle_.handle());
 
+	BOOST_FOREACH(const auto& warp_point_handle, warpobj_handles_) {
+		MV1DrawModel(warp_point_handle.handle());
+	}
+
 	/*
 	BOOST_FOREACH(auto warp_handle,warpobj_array_)
 	{

--- a/client/3d/Stage.hpp
+++ b/client/3d/Stage.hpp
@@ -11,9 +11,12 @@
 #include "../ResourceManager.hpp"
 #include "../ui/InputBox.hpp"
 
+struct Channel;
+typedef std::shared_ptr<Channel> ChannelPtr;
+
 class Stage {
     public:
-        Stage(const tstring& model_path);
+        Stage(const ChannelPtr& channel);
         ~Stage();
         void Draw();
         void DrawAfter();
@@ -50,13 +53,13 @@ class Stage {
 		std::unordered_set<int> draw_after_meshes_;
 
         ModelHandle skymap_handle_;
-		ModelHandle warpobj_handle_;
-		std::vector<ModelHandle> warpobj_array_;
+		std::vector<ModelHandle> warpobj_handles_;
 
         std::vector<VECTOR> start_points_;
 		std::vector<VECTOR> warp_points_;
 
 		bool host_change_flag_;
+		ChannelPtr channel_;
 };
 
 typedef std::shared_ptr<Stage> StagePtr;

--- a/client/CommandManager.cpp
+++ b/client/CommandManager.cpp
@@ -76,12 +76,12 @@ void CommandManager::FetchCommand(const network::Command& command)
 	// サーバーデータ受信
 	case ClientReceiveServerInfo:
 	{
-		network::Utils::Deserialize(command.body(), & stage_);
-		if (ResourceManager::NameToFullPath(unicode::ToTString(stage_)).empty()) {
-			status_ = STATUS_ERROR_NOSTAGE;
-		} else {
-			status_ = STATUS_READY;
-		}
+		//network::Utils::Deserialize(command.body(), & stage_);
+		//if (ResourceManager::NameToFullPath(unicode::ToTString(stage_)).empty()) {
+		//	status_ = STATUS_ERROR_NOSTAGE;
+		//} else {
+		//	status_ = STATUS_READY;
+		//}
 	}
 	break;
 
@@ -101,6 +101,47 @@ void CommandManager::FetchCommand(const network::Command& command)
 		}
 
 		auto channels = pt.get_child("channels", ptree());
+		BOOST_FOREACH(const auto& channel, channels) {
+			auto ptr = std::make_shared<Channel>();
+			auto id = boost::lexical_cast<int>(channel.first.substr(2));
+			ptr->name = channel.second.get<std::string>("name");
+			ptr->stage = channel.second.get<std::string>("stage");
+
+			auto warp_points = channel.second.get_child("warp_points", ptree());
+			BOOST_FOREACH(const auto& warp_point, warp_points) {
+				auto channel = warp_point.second.get<unsigned char>("channel", 0);
+				auto x = warp_point.second.get<float>("position.x", 0);
+				auto y = warp_point.second.get<float>("position.y", 0);
+				auto z = warp_point.second.get<float>("position.z", 0);
+				Channel::WarpPoint point = {x, y, z, channel, ""};
+				ptr->warp_points.push_back(point);
+			}
+			channels_[id] = ptr;
+		}
+
+		// 存在しないチャンネルへのワープポイントを削除
+		BOOST_FOREACH(const auto& channel, channels_) {
+			auto& warp_points = channel.second->warp_points;
+			auto end_it = std::remove_if(warp_points.begin(),
+				warp_points.end(),
+				[this](Channel::WarpPoint& point) -> bool {
+				auto it = channels_.find(point.channel);
+				if (it != channels_.end()) {
+					point.name = it->second->name;
+					return false;
+				} else {
+					return true;
+				}
+			});
+			warp_points.erase(end_it, warp_points.end());
+		}
+
+		if (ResourceManager::NameToFullPath(
+			unicode::ToTString(channels_[0]->stage)).empty()) {
+			status_ = STATUS_ERROR_NOSTAGE;
+		} else {
+			status_ = STATUS_READY;
+		}
 	}
 	break;
 
@@ -210,11 +251,22 @@ CommandManager::Status CommandManager::status() const
 	return status_;
 }
 
-std::string CommandManager::stage() const
+const std::map<unsigned char, ChannelPtr>& CommandManager::channels() const
 {
-	return stage_;
+	return channels_;
 }
 
+ChannelPtr CommandManager::current_channel() const
+{
+	PlayerManagerPtr player_manager = manager_accessor_->player_manager().lock();
+	if (auto myself = player_manager->GetMyself()) {
+		return channels_.at(myself->channel());
+	} else {
+		return ChannelPtr();
+	}
+}
+
+
 double CommandManager::GetReadByteAverage() const
 {
     if (client_) {

--- a/client/CommandManager.hpp
+++ b/client/CommandManager.hpp
@@ -12,6 +12,21 @@ namespace network {
     class Command;
 }
 
+struct Channel {
+	public:
+		struct WarpPoint {
+			float x, y, z;
+			unsigned int channel;
+			std::string name;
+		};
+
+	public:
+		std::string name, stage;
+		std::vector<WarpPoint> warp_points;
+};
+
+typedef std::shared_ptr<Channel> ChannelPtr;
+
 typedef std::unique_ptr<network::Client> ClientUniqPtr;
 
 class CommandManager {
@@ -38,7 +53,8 @@ class CommandManager {
 
         void set_client(ClientUniqPtr client);
         unsigned int user_id();
-		std::string stage() const;
+		const std::map<unsigned char, ChannelPtr>& channels() const;
+		ChannelPtr current_channel() const;
 
 		void FetchCommand(const network::Command& command);
 
@@ -48,7 +64,8 @@ class CommandManager {
         ManagerAccessorPtr manager_accessor_;
         ClientUniqPtr client_;
 		Status status_;
-		std::string stage_;
+
+		std::map<unsigned char, ChannelPtr> channels_;
 };
 
 typedef std::shared_ptr<CommandManager> CommandManagerPtr;

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

--- a/client/PlayerManager.hpp
+++ b/client/PlayerManager.hpp
@@ -15,6 +15,9 @@ class CharacterDataProvider;
 class Timer;
 typedef std::shared_ptr<Timer> TimerPtr;
 
+class Stage;
+typedef std::shared_ptr<Stage> StagePtr;
+
 class InputManager;
 
 class PlayerManager : public std::enable_shared_from_this<PlayerManager> {
@@ -51,6 +54,8 @@ class PlayerManager : public std::enable_shared_from_this<PlayerManager> {
         std::shared_ptr<CharacterManager> charmgr_;
         std::map<unsigned int, std::unique_ptr<CharacterDataProvider>> char_data_providers_;
 
+		const std::shared_ptr<StagePtr> stage_ptr_holder_;
+
         int font_handle_;
         std::array<int, 4> name_tip_image_handle_;
 

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

--- a/client/WorldManager.hpp
+++ b/client/WorldManager.hpp
@@ -9,12 +9,9 @@
 
 class InputManager;
 
-class Stage;
-typedef std::shared_ptr<Stage> StagePtr;
-
 class WorldManager {
     public:
-        WorldManager(const ManagerAccessorPtr& manager_accessor = ManagerAccessorPtr());
+        WorldManager(const StagePtr& stage, const ManagerAccessorPtr& manager_accessor = ManagerAccessorPtr());
         void Init();
         void ProcessInput(InputManager* input);
         void Update();

--- /dev/null
+++ b/client/bin/server/channels/ch000/config.json
@@ -0,0 +1,12 @@
+{
+	"name": "ケロリン町チャンネル",
+	"stage": "stage:ケロリン町",
+	"capacity": 20,
+	"warp_points":
+		[
+			{
+				"position": {"x": 0, "y": 0, "z": 0},
+				"channel": 1
+			}
+		]
+}
\ No newline at end of file

--- /dev/null
+++ b/client/bin/server/channels/ch001/config.json
@@ -0,0 +1,12 @@
+{
+	"name": "ゲキド街チャンネル",
+	"stage": "stage:ゲキド街",
+	"capacity": 25,
+	"warp_points":
+		[
+			{
+				"position": {"x": 0, "y": 0, "z": 0},
+				"channel": 0
+			}
+		]
+}
\ No newline at end of file

--- /dev/null
+++ b/client/scene/ChannelChange.cpp
@@ -0,0 +1,61 @@
+//
+// ChannelChange.cpp
+//
+
+#include "MainLoop.hpp"
+#include "ChannelChange.hpp"
+#include "../../common/Logger.hpp"
+#include "../../common/network/Utils.hpp"
+#include "../3d/Stage.hpp"
+
+namespace scene {
+ChannelChange::ChannelChange(unsigned char channel, const ManagerAccessorPtr& manager_accessor) :
+	manager_accessor_(manager_accessor),
+    card_manager_(manager_accessor->card_manager().lock()),
+    command_manager_(manager_accessor->command_manager().lock()),
+    account_manager_(manager_accessor->account_manager().lock()),
+    config_manager_(manager_accessor->config_manager().lock()),
+    player_manager_(manager_accessor->player_manager().lock())
+{
+
+	auto channel_str = (unsigned char)channel;
+	command_manager_->Write(network::ServerUpdateAccountProperty(CHANNEL, network::Utils::Serialize(channel_str)));
+
+	auto channel_ptr = command_manager_->channels().at(channel);
+	StagePtr stage = std::make_shared<Stage>(channel_ptr);
+	world_manager_ = std::make_shared<WorldManager>(stage, manager_accessor);
+    manager_accessor_->set_world_manager(world_manager_);
+}
+
+ChannelChange::~ChannelChange()
+{
+}
+
+void ChannelChange::Begin()
+{
+
+}
+
+void ChannelChange::End()
+{
+}
+
+void ChannelChange::Update()
+{
+	//if(world_manager_->stage()->host_change_flag())
+	//{
+		//account_manager_->set_host(world_manager_->stage()->host_change_flag().second);
+		next_scene_ = std::make_shared<scene::MainLoop>(manager_accessor_);
+	//}
+}
+
+void ChannelChange::ProcessInput(InputManager* input)
+{
+
+}
+
+void ChannelChange::Draw()
+{
+}
+
+}
\ No newline at end of file

--- /dev/null
+++ b/client/scene/ChannelChange.hpp
@@ -0,0 +1,34 @@
+//
+// ChannelChange.h
+//
+
+#pragma once
+
+#include <memory>
+#include "Base.hpp"
+#include "../ManagerAccessor.hpp"
+
+namespace scene {
+
+class ChannelChange : public Base{
+
+	public:
+		ChannelChange(unsigned char channel, const ManagerAccessorPtr&);
+		~ChannelChange();
+        void Begin();
+        void Update();
+		void ProcessInput(InputManager*);
+        void Draw();
+        void End();
+
+    private:
+        ManagerAccessorPtr manager_accessor_;
+        CardManagerPtr card_manager_;
+        CommandManagerPtr command_manager_;
+        AccountManagerPtr account_manager_;
+        ConfigManagerPtr config_manager_;
+        WorldManagerPtr world_manager_;
+		PlayerManagerPtr player_manager_;
+};
+
+}
\ No newline at end of file

--- a/client/scene/Connect.cpp
+++ b/client/scene/Connect.cpp
@@ -5,9 +5,11 @@
 #include "MainLoop.hpp"
 #include "Title.hpp"
 #include "Connect.hpp"
+#include "ChannelChange.hpp"
 #include <vector>
 #include <algorithm>
 #include "../ResourceManager.hpp"
+#include "../PlayerManager.hpp"
 #include "../../common/Logger.hpp"
 
 namespace scene {
@@ -17,9 +19,11 @@ Connect::Connect(const ManagerAccessorPtr& manager_accessor) :
               account_manager_(manager_accessor->account_manager().lock()),
               config_manager_(manager_accessor->config_manager().lock()),
 			  command_manager_(std::make_shared<CommandManager>(manager_accessor_)),
+			  player_manager_(std::make_shared<PlayerManager>(manager_accessor_)),
 			  return_flag_(false)
 {
     manager_accessor_->set_command_manager(command_manager_);
+    manager_accessor_->set_player_manager(player_manager_);
 }
 
 Connect::~Connect()
@@ -87,11 +91,11 @@ void Connect::Update()
 		message_.set_text(_T("エラー：サーバーとクライアントのバージョンが対応していません"));
 		command_manager_->set_client(ClientUniqPtr());
 		break;
-	case CommandManager::STATUS_ERROR_NOSTAGE:
-		message_.set_text((tformat(_T("エラー：接続するにはステージデータ「%s」が必要です")) % 
-			unicode::ToTString(command_manager_->stage())).str());
-		command_manager_->set_client(ClientUniqPtr());
-		break;
+	//case CommandManager::STATUS_ERROR_NOSTAGE:
+	//	message_.set_text((tformat(_T("エラー：接続するにはステージデータ「%s」が必要です")) % 
+	//		unicode::ToTString(command_manager_->stage())).str());
+	//	command_manager_->set_client(ClientUniqPtr());
+	//	break;
 	}
 
     button_.Update();
@@ -99,7 +103,7 @@ void Connect::Update()
     message_.Update();
 
     if (command_manager_->status() == CommandManager::STATUS_READY) {
-        next_scene_= std::make_shared<scene::MainLoop>(manager_accessor_);
+        next_scene_= std::make_shared<scene::ChannelChange>(0, manager_accessor_);
 	} else if (return_flag_) {
 		next_scene_= std::make_shared<scene::Title>(manager_accessor_);
     }

--- a/client/scene/Connect.hpp
+++ b/client/scene/Connect.hpp
@@ -32,6 +32,7 @@ class Connect : public Base {
         AccountManagerPtr account_manager_;
         ConfigManagerPtr config_manager_;
 		CommandManagerPtr command_manager_;
+		PlayerManagerPtr player_manager_;
 		
 		UILabel message_;
 		UILabel button_label_;

--- a/client/scene/Include.hpp
+++ b/client/scene/Include.hpp
@@ -7,3 +7,4 @@
 #include "Init.hpp"
 #include "Title.hpp"
 #include "MainLoop.hpp"
+#include "ChannelChange.hpp"

--- a/client/scene/MainLoop.cpp
+++ b/client/scene/MainLoop.cpp
@@ -5,6 +5,7 @@
 #include "MainLoop.hpp"
 #include "Option.hpp"
 #include "Dashboard.hpp"
+#include "ChannelChange.hpp"
 #include <vector>
 #include <algorithm>
 #include "../ResourceManager.hpp"
@@ -17,10 +18,10 @@
 namespace scene {
 MainLoop::MainLoop(const ManagerAccessorPtr& manager_accessor) :
       manager_accessor_(manager_accessor),
-      player_manager_(std::make_shared<PlayerManager>(manager_accessor_)),
+      player_manager_(manager_accessor->player_manager().lock()),
       card_manager_(manager_accessor->card_manager().lock()),
       command_manager_(manager_accessor->command_manager().lock()),
-      world_manager_(std::make_shared<WorldManager>(manager_accessor_)),
+      world_manager_(manager_accessor->world_manager().lock()),
       account_manager_(manager_accessor->account_manager().lock()),
       config_manager_(manager_accessor->config_manager().lock()),
       window_manager_(std::make_shared<WindowManager>(manager_accessor_)),
@@ -29,8 +30,6 @@ MainLoop::MainLoop(const ManagerAccessorPtr& manager_accessor) :
 	  snapshot_number_(0),
 	  snapshot_(false)
 {
-    manager_accessor_->set_player_manager(player_manager_);
-    manager_accessor_->set_world_manager(world_manager_);
     manager_accessor_->set_window_manager(window_manager_);
 
     inputbox_->ReloadTabs();
@@ -98,6 +97,18 @@ void MainLoop::ProcessInput(InputManager* input)
 		snapshot_ = true;
 	}
 
+	if (const auto& channel = command_manager_->current_channel()) {
+		BOOST_FOREACH(const auto& warp_point, channel->warp_points) {
+			auto point = VGet(warp_point.x, warp_point.y + 30, warp_point.z);
+			const auto& pos = player_manager_->GetMyself()->position();
+
+			auto distance = VSize(VGet(warp_point.x - pos.x, warp_point.y - pos.y, warp_point.z - pos.z));
+			if (distance < 50 && input->GetKeyCount(KEY_INPUT_M) == 1) {
+				next_scene_ = std::make_shared<scene::ChannelChange>(warp_point.channel, manager_accessor_);
+			}
+		}
+	}
+
 }
 
 void MainLoop::Draw()
@@ -129,6 +140,38 @@ void MainLoop::Draw()
 		snapshot_number_++;
 		snapshot_ = false;
 	}
+	
+	if (const auto& channel = command_manager_->current_channel()) {
+		BOOST_FOREACH(const auto& warp_point, channel->warp_points) {
+			auto point = VGet(warp_point.x, warp_point.y + 30, warp_point.z);
+			const auto& pos = player_manager_->GetMyself()->position();
+
+			auto distance = VSize(VGet(warp_point.x - pos.x, warp_point.y - pos.y, warp_point.z - pos.z));
+
+			if (world_manager_->stage()->IsVisiblePoint(point)) {
+				auto screen_pos = ConvWorldPosToScreenPos(point);
+				int x = (screen_pos.x / 2) * 2;
+				int y = (screen_pos.y / 2) * 2 - 16;
+
+				UILabel label_;
+				label_.set_width(160);
+				if (distance < 50) {
+					label_.set_text(unicode::ToTString(warp_point.name) + _T("\nＭキーで転送します"));
+					label_.set_bgcolor(UIBase::Color(255,0,0,150));
+				} else {
+					label_.set_text(unicode::ToTString(warp_point.name));
+					label_.set_bgcolor(UIBase::Color(0,0,0,150));
+				}
+				label_.set_textcolor(UIBase::Color(255,255,255,255));
+
+				label_.set_left(x - 60);
+				label_.set_top(y + 10);
+
+				label_.Update();
+				label_.Draw();
+			}
+		}
+	}
 }
 
 void MainLoop::End()

--- a/client/scene/Option.cpp
+++ b/client/scene/Option.cpp
@@ -290,8 +290,10 @@ StatusTab::StatusTab(const ManagerAccessorPtr& manager_accessor) :
 
 	items_.push_back(std::make_shared<TextItem>(_LT("option.status.channel"),
 		std::make_shared<std::function<tstring(void)>>(
-		[player_manager](){
-			return (tformat(_T("%d")) % static_cast<int>(player_manager->GetMyself()->channel())).str();
+		[player_manager, command_manager]() -> tstring {
+			auto channel = player_manager->GetMyself()->channel();
+			auto name = command_manager->channels().at(channel)->name;
+			return (tformat(_T("%s (%d)")) % unicode::ToTString(name) % static_cast<int>(channel)).str();
 		}), manager_accessor_));
 
 	items_.push_back(std::make_shared<TextItem>(_LT("option.status.user_id"),
@@ -302,8 +304,10 @@ StatusTab::StatusTab(const ManagerAccessorPtr& manager_accessor) :
 
 	items_.push_back(std::make_shared<TextItem>(_LT("option.status.stage"),
 		std::make_shared<std::function<tstring(void)>>(
-		[command_manager](){
-			return unicode::ToTString(command_manager->stage());
+		[player_manager, command_manager]() -> tstring {
+			auto channel = player_manager->GetMyself()->channel();
+			auto stage = command_manager->channels().at(channel)->stage;
+			return unicode::ToTString(stage);
 		}), manager_accessor_));
 
 	items_.push_back(std::make_shared<TextItem>(_LT("option.status.position"),