OSDN > Developer > up2up > Chamber > main > Commit

main
Fork

Commit

PlayMotion()が正しく機能していなかったのを修正
ConfigManagerのメンバは仮の追加

--- a/client/3d/FieldPlayer.cpp

+++ b/client/3d/FieldPlayer.cpp

		@@ -135,7 +135,8 @@ void FieldPlayer::Update()
135	135	}else if(additional_motion_.first)
136	136	{
137	137	bool connect_prev = true;
138		- motion_player_->Play(additional_motion_.second, connect_prev, 200, -1, false);
	138	+ motion_player_->Play(additional_motion_.second, connect_prev, 400, -1, false);
	139	+ additional_motion_.first = false;
139	140	}
140	141	// モーション再生時刻更新
141	142	motion_player_->Next(timer_->Delta());

		@@ -393,7 +394,6 @@ void FieldPlayer::InputFromUser()
393	394	current_stat_.vel = VGet(sin(roty), 0, cos(roty)) * (-move_dir * move_speed * stage_->map_scale());
394	395	current_stat_.motion =
395	396	current_stat_.is_walking ? motion.walk_ : motion.run_;
396		- additional_motion_.first = false;
397	397	}
398	398	else if (current_stat_.acc.y != 0)
399	399	{

--- a/client/3d/PlayerCharacter.cpp

+++ b/client/3d/PlayerCharacter.cpp

		@@ -90,6 +90,7 @@ public:
90	90	{
91	91	bool connect_prev = true;
92	92	motion_player_->Play(additional_motion_.second, connect_prev, 200, -1, false);
	93	+ additional_motion_.first = false;
93	94	}
94	95
95	96	// TODO: Y下方向については重力加速度

--- a/client/ConfigManager.cpp

+++ b/client/ConfigManager.cpp

		@@ -80,3 +80,21 @@ int ConfigManager::udp_port() const
80	80	{
81	81	return udp_port_;
82	82	}
	83	+
	84	+bool ConfigManager::shader_blur() const
	85	+{
	86	+ return shader_blur_;
	87	+}
	88	+bool ConfigManager::shader_bloom() const
	89	+{
	90	+ return shader_bloom_;
	91	+}
	92	+bool ConfigManager::shader_shadow() const
	93	+{
	94	+ return shader_shadow_;
	95	+}
	96	+
	97	+bool ConfigManager::shader_depth_field() const
	98	+{
	99	+ return shader_depth_field_;
	100	+}

--- a/client/ConfigManager.hpp

+++ b/client/ConfigManager.hpp

		@@ -40,6 +45,11 @@ class ConfigManager
40	45	bool upnp() const;
41	46	int udp_port() const;
42	47
	48	+ bool shader_blur() const;
	49	+ bool shader_bloom() const;
	50	+ bool shader_shadow() const;
	51	+ bool shader_depth_field() const;
	52	+
43	53	private:
44	54	ManagerAccessorPtr manager_accessor_;
45	55	};