コミット: 1805b3669dd4aae057d67b7a96b9fe9af9a09ca5 - main (git)

コミットメタ情報

• リビジョン: 1805b3669dd4aae057d67b7a96b9fe9af9a09ca5 (tree)
• 日時: 2012-09-30 02:12:46
• 作者: angeart <angeart@git....>
• コミッター: angeart

ログメッセージ

ジャンプモーションありのコード

変更サマリ

• modified: client/3d/FieldPlayer.cpp
• modified: client/3d/FieldPlayer.hpp
• modified: client/3d/MotionPlayer.cpp
• modified: client/3d/MotionPlayer.hpp

差分

--- a/client/3d/FieldPlayer.cpp
+++ b/client/3d/FieldPlayer.cpp
@@ -254,10 +254,27 @@ void FieldPlayer::Update()
 	}else if(additional_motion_.flag_)
 	{
 		bool connect_prev = true;
-		motion_player_->Play(additional_motion_.handle_, connect_prev, 400, -1, false,additional_motion_.isloop_,additional_motion_.nextanim_handle_,additional_motion_.loopcheck_);
+		motion_player_->Play(
+			additional_motion_.handle_,
+			additional_motion_.connection_,
+			additional_motion_.connection_time_,
+			-1,
+			false,
+			additional_motion_.isloop_,
+			additional_motion_.nextanim_handle_,
+			additional_motion_.loopcheck_);
 		additional_motion_.loopcheck_ = false;
 		additional_motion_.flag_ = false;
 		additional_motion_.nextanim_handle_ = -1;
+		additional_motion_.connection_ = true;
+		additional_motion_.next_connection_ = true;
+	}else if(additional_motion_.motion_change_)
+	{
+		if(motion_player_->GetPlayEnd())
+		{
+			additional_motion_.motion_change_ = false;
+			motion_player_->Play(current_stat_.motion, true, 200, -1, false);
+		}
 	}
     // モーション再生時刻更新
     motion_player_->Next(timer_->Delta());
@@ -341,7 +358,7 @@ void FieldPlayer::Move()
         if (prev_stat_.acc.y == 0)
         {
 			jump_wait_ = false;
-            // 前回接地していた
+           // 前回接地していた
             // std::cout << "  previous on the ground" << std::endl;
 
 			// 登ったり下ったりできる段差の大きさの制限を求める
@@ -417,16 +434,19 @@ void FieldPlayer::Move()
                 // 落下している
                 // std::cout << "  previous falling" << std::endl;
 
-                // 地面に食い込むのを防止する
+                // 地面に食い込むのを防止する	
 
                 if (foot_floor_exists.first)
                 {
                     // 地面に到達した
                     // std::cout << "    current on the ground" << std::endl;
 					additional_motion_.handle_ = motion.end_jmp_;
+					additional_motion_.connection_ = false;
 					additional_motion_.isloop_ = false;
-					additional_motion_.nextanim_handle_ = motion.stand_;
+					additional_motion_.nextanim_handle_ = current_stat_.motion;
+					additional_motion_.loopcheck_ = true;
 					additional_motion_.flag_ = true;
+					additional_motion_.motion_change_ = true;
                     current_stat_.pos = foot_floor_exists.second;
                     current_stat_.acc.y = 0;
                     current_stat_.vel.y = 0;
@@ -602,11 +622,22 @@ void FieldPlayer::InputFromUser()
                     input.GetGamepadCount(InputManager::PADBIND_JUMP) > 0))
     {
 		jump_wait_ = true;
-		additional_motion_.handle_ = motion.pre_jmp_;
-		additional_motion_.isloop_ = false;
-		additional_motion_.flag_ = true;
-		additional_motion_.nextanim_handle_ = motion.jmp_;
-		additional_motion_.loopcheck_ = true;
+		if(move_dir == 0)
+		{
+			additional_motion_.handle_ = motion.pre_jmp_;
+			additional_motion_.isloop_ = false;
+			additional_motion_.flag_ = true;
+			additional_motion_.nextanim_handle_ = motion.jmp_;
+			additional_motion_.loopcheck_ = true;
+			additional_motion_.next_connection_ = false;
+		}else if(current_stat_.acc.y == 0){
+			additional_motion_.handle_ = motion.jmp_;
+			additional_motion_.isloop_ = true;
+			any_move_ = true;
+			current_stat_.acc.y = -9.8 * stage_->map_scale();
+			current_stat_.vel += VGet(0, jump_height_ * stage_->map_scale(), 0);
+			additional_motion_.flag_ = true;
+		}
     }
 
 	if (current_stat_.acc.y == 0 && jump_wait_)
@@ -618,6 +649,14 @@ void FieldPlayer::InputFromUser()
 			current_stat_.vel += VGet(0, jump_height_ * stage_->map_scale(), 0);
 		}
 	}
+
+	if (stage_->CheckWarpPoint(current_stat_.pos))
+	{
+		//stage_->SetHostChangeFlag(true);
+
+		auto pos = ConvWorldPosToScreenPos(current_stat_.pos+VGet(0,25,25));
+		
+	}
 }
 
 void FieldPlayer::PlayMotion(const tstring& name,bool isloop)

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

--- a/client/3d/MotionPlayer.cpp
+++ b/client/3d/MotionPlayer.cpp
@@ -5,15 +5,15 @@
 
 MotionPlayer::MotionPlayer(int model_handle)
     : model_handle_(model_handle), prev_attach_index_(-1), current_attach_index_(-1),
-      connect_prev_(false), prev_blend_rate_(0), blend_time_(0),prev_anim_index_(-1),isloop_(true),isloopcheck_(false)
+      connect_prev_(false), prev_blend_rate_(0), blend_time_(0),prev_anim_index_(-1),isloop_(true),isloopcheck_(false),nextconnect_(true)
 {}
 
-void MotionPlayer::Play(int anim_index, bool connect_prev, int blend_time, int anim_src_model_handle, bool check_name, bool isloop, int nextanim_handle, bool isloopcheck)
+void MotionPlayer::Play(int anim_index, bool connect_prev, int blend_time, int anim_src_model_handle, bool check_name, bool isloop, int nextanim_handle, bool isloopcheck, bool nextconnect)
 {
  	if(nextanim_handle != -1)
 	{
 		prev_anim_index_ = nextanim_handle;
-	}else{
+	}else if(!isloop){
 		prev_anim_index_ = MV1GetAttachAnim(model_handle_,current_attach_index_);
 	}
 
@@ -25,6 +25,7 @@ void MotionPlayer::Play(int anim_index, bool connect_prev, int blend_time, int a
     blend_time_ = blend_time;
 	isloop_ = isloop;
 	isloopcheck_ = isloopcheck;
+	nextconnect_ = nextconnect;
 	if(!isloopcheck_)isplayend_ = false;
 
     prev_attach_index_ = current_attach_index_;
@@ -108,7 +109,7 @@ void MotionPlayer::AdvancePlayTime(int diff_time)
 		{
 			Stop();
 			isplayend_ = true;
-			Play(prev_anim_index_,connect_prev_,200,-1,false,true,-1,isloopcheck_);
+			Play(prev_anim_index_,nextconnect_,200,-1,false,true,-1,isloopcheck_);
 			return;
 		}
         anim_time -= anim_total_time;

--- a/client/3d/MotionPlayer.hpp
+++ b/client/3d/MotionPlayer.hpp
@@ -4,7 +4,7 @@ class MotionPlayer
 {
 public:
     MotionPlayer(int model_handle);
-    void Play(int anim_index, bool connect_prev, int blend_time, int anim_src_model_handle, bool check_name, bool isloop = true, int nextanim_handle = -1,bool isloopcheck = false);
+    void Play(int anim_index, bool connect_prev, int blend_time, int anim_src_model_handle, bool check_name, bool isloop = true, int nextanim_handle = -1,bool isloopcheck = false,bool nextconnect = true);
     void Next(int diff_time);
 	void Stop();
 	bool GetPlayEnd();
@@ -19,6 +19,7 @@ private:
 	int prev_anim_index_;
 	bool isplayend_;
 	bool isloopcheck_;
+	bool nextconnect_;
 
     void SetBlendRateToModel();
     void DetachPrevMotionIfExist();