提交: 36a9b6d90a74974c7a3e8257ad2b2ce70490c6c9 - main (git)

Commit MetaInfo

• 修訂: 36a9b6d90a74974c7a3e8257ad2b2ce70490c6c9 (tree)
• 時間: 2012-10-30 00:06:54
• 作者: angeart <angeart@git....>
• Commiter: angeart

Log Message

Revert "Merge branch 'develop' of git.sourceforge.jp:/gitroot/mmo/main into develop"

This reverts commit 455021345c1be906effcf822785d700bdcc9d032, reversing
changes made to fb6cb99cec98522b70040ffe060e4deb7564548c.

Change Summary

• modified: client/3d/FieldPlayer.cpp
• modified: client/3d/FieldPlayer.hpp
• modified: client/3d/Stage.cpp
• modified: client/CommandManager.cpp
• modified: client/CommandManager.hpp
• modified: client/scene/ChannelChange.cpp
• modified: client/scene/ChannelChange.hpp
• modified: client/scene/Connect.cpp
• modified: client/scene/MainLoop.cpp

差異

--- a/client/3d/FieldPlayer.cpp
+++ b/client/3d/FieldPlayer.cpp
@@ -142,23 +142,19 @@ void FieldPlayer::Draw() const
     // DrawLine3D(current_stat_.pos, current_stat_.pos + VGet(0, 0, 2 * (*stage_)->map_scale()), GetColor(0, 0, 255));
 }
 
-void FieldPlayer::Init(tstring model_name, const std::shared_ptr<VECTOR>& init_position)
+void FieldPlayer::Init(tstring model_name)
 {
     LoadModel(model_name);
-    ResetPosition(init_position);
+    ResetPosition();
 }
 
-void FieldPlayer::ResetPosition(const std::shared_ptr<VECTOR>& init_position)
+void FieldPlayer::ResetPosition()
 {
-	if (init_position) {
-		current_stat_.pos = *init_position;
-	} else {
-		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)];
-	}
+    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));
 }
 

--- a/client/3d/FieldPlayer.hpp
+++ b/client/3d/FieldPlayer.hpp
@@ -53,8 +53,8 @@ public:
 
     void Draw() const;
     void Update();
-    void Init(tstring model_path, const std::shared_ptr<VECTOR>& init_position);
-    void ResetPosition(const std::shared_ptr<VECTOR>& init_position);
+    void Init(tstring model_path);
+    void ResetPosition();
     void RescuePosition();
 
 	void LoadModel(const tstring& name);

--- a/client/3d/Stage.cpp
+++ b/client/3d/Stage.cpp
@@ -41,7 +41,7 @@ Stage::Stage(const ChannelPtr& channel,const ConfigManagerPtr &config_manager) :
 	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(), warp_point.position);
+		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);
 	}

--- a/client/CommandManager.cpp
+++ b/client/CommandManager.cpp
@@ -113,16 +113,7 @@ void CommandManager::FetchCommand(const network::Command& command)
 				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);
-
-				std::shared_ptr<VECTOR> destination;
-				if (!warp_point.second.get_child("destination", ptree()).empty()) {
-					auto dest_x = warp_point.second.get<float>("destination.x", 0);
-					auto dest_y = warp_point.second.get<float>("destination.y", 0);
-					auto dest_z = warp_point.second.get<float>("destination.z", 0);
-					destination = std::make_shared<VECTOR>(VGet(dest_x, dest_y, dest_z));
-				}
-				Channel::WarpPoint point = {VGet(x, y, z), channel, "", destination};
-
+				Channel::WarpPoint point = {x, y, z, channel, ""};
 				ptr->warp_points.push_back(point);
 			}
 			channels_[id] = ptr;

--- a/client/CommandManager.hpp
+++ b/client/CommandManager.hpp
@@ -15,10 +15,9 @@ namespace network {
 struct Channel {
 	public:
 		struct WarpPoint {
-			VECTOR position;
+			float x, y, z;
 			unsigned int channel;
 			std::string name;
-			std::shared_ptr<VECTOR> destination;
 		};
 
 	public:

--- a/client/scene/ChannelChange.cpp
+++ b/client/scene/ChannelChange.cpp
@@ -5,16 +5,12 @@
 #include "MainLoop.hpp"
 #include "ChannelChange.hpp"
 #include "../CommandManager.hpp"
-#include "../AccountManager.hpp"
 #include "../../common/Logger.hpp"
 #include "../../common/network/Utils.hpp"
 #include "../3d/Stage.hpp"
 
 namespace scene {
-ChannelChange::ChannelChange(
-	unsigned char channel,
-	const std::shared_ptr<VECTOR>& init_position,
-	const ManagerAccessorPtr& manager_accessor) :
+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()),
@@ -22,8 +18,7 @@ ChannelChange::ChannelChange(
     config_manager_(manager_accessor->config_manager().lock()),
     player_manager_(manager_accessor->player_manager().lock()),
 	channel_(channel),
-	fade_counter_(0),
-	init_position_(init_position)
+	fade_counter_(0)
 {
 
 }
@@ -59,10 +54,6 @@ void ChannelChange::Update()
 		world_manager_ = std::make_shared<WorldManager>(stage, manager_accessor_);
 		manager_accessor_->set_world_manager(world_manager_);
 
-		player_manager_->Init();
-		world_manager_->Init();	
-		world_manager_->myself()->Init(unicode::ToTString(account_manager_->model_name()), init_position_);
-
 		next_scene_ = std::make_shared<scene::MainLoop>(manager_accessor_);
 	}
 }

--- a/client/scene/ChannelChange.hpp
+++ b/client/scene/ChannelChange.hpp
@@ -13,10 +13,7 @@ namespace scene {
 class ChannelChange : public Base{
 
 	public:
-		ChannelChange(
-			unsigned char channel,
-			const std::shared_ptr<VECTOR>& destination,
-			const ManagerAccessorPtr&);
+		ChannelChange(unsigned char channel, const ManagerAccessorPtr&);
 		~ChannelChange();
         void Begin();
         void Update();
@@ -35,7 +32,6 @@ class ChannelChange : public Base{
 
 		unsigned char channel_;
 		int fade_counter_;
-		std::shared_ptr<VECTOR> init_position_;
 };
 
 }
\ No newline at end of file

--- a/client/scene/Connect.cpp
+++ b/client/scene/Connect.cpp
@@ -104,7 +104,7 @@ void Connect::Update()
     message_.Update();
 
     if (command_manager_->status() == CommandManager::STATUS_READY) {
-        next_scene_= std::make_shared<scene::ChannelChange>(0, std::shared_ptr<VECTOR>(), 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/MainLoop.cpp
+++ b/client/scene/MainLoop.cpp
@@ -50,6 +50,11 @@ MainLoop::MainLoop(const ManagerAccessorPtr& manager_accessor) :
 
 	window_manager_->RestorePosition();
 
+    player_manager_->Init();
+    world_manager_->Init();	
+
+    world_manager_->myself()->Init(unicode::ToTString(account_manager_->model_name()));
+
 	socket_server_manager_->Start();
 
 }
@@ -115,24 +120,12 @@ void MainLoop::ProcessInput(InputManager* input)
 
 	if (const auto& channel = command_manager_->current_channel()) {
 		BOOST_FOREACH(const auto& warp_point, channel->warp_points) {
-			auto point = warp_point.position;
-			point.y += 30;
+			auto point = VGet(warp_point.x, warp_point.y + 30, warp_point.z);
 			const auto& pos = player_manager_->GetMyself()->position();
 
-			auto distance = VSize(warp_point.position - VGet(pos.x, pos.y, pos.z));
+			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) {
-
-				// 同一チャンネルの場合は移動するだけ
-				if (player_manager_->GetMyself()->channel() == warp_point.channel) {
-					if (warp_point.destination) {
-						world_manager_->myself()->ResetPosition(warp_point.destination);
-					}
-				} else {
-					next_scene_ = std::make_shared<scene::ChannelChange>(
-						warp_point.channel,
-						warp_point.destination,
-						manager_accessor_);
-				}
+				next_scene_ = std::make_shared<scene::ChannelChange>(warp_point.channel, manager_accessor_);
 			}
 		}
 	}
@@ -171,11 +164,10 @@ void MainLoop::Draw()
 	
 	if (const auto& channel = command_manager_->current_channel()) {
 		BOOST_FOREACH(const auto& warp_point, channel->warp_points) {
-			auto point = warp_point.position;
-			point.y += 30;
+			auto point = VGet(warp_point.x, warp_point.y + 30, warp_point.z);
 			const auto& pos = player_manager_->GetMyself()->position();
-			
-			auto distance = VSize(warp_point.position - VGet(pos.x, pos.y, pos.z));
+
+			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);