Commit: 36 - OpenXOPS (svn)

X operations（XOPS）に非常に近いFPSゲームを制作・リメイクし、成果物をオープンソースとして公開することを目的としたプロジェクトです。

Commit MetaInfo

• Revision: 36 (tree)
• Time: 2015-02-13 02:54:42
• Author: xops-mikan

Log Message

エフェクトのシステムを変更し、薬莢や血の描画を改善。

Change Summary

• modified: trunk/objectmanager.cpp
• modified: trunk/object.cpp
• modified: trunk/objectmanager.h
• modified: trunk/object.h

Incremental Difference

--- trunk/objectmanager.cpp	(revision 35)
+++ trunk/objectmanager.cpp	(revision 36)
@@ -466,6 +466,33 @@
 	return -1;
 }
 
+//! @brief エフェクト追加
+//! @param pos_x X座標
+//! @param pos_y Y座標
+//! @param pos_z Z座標
+//! @param move_x X軸移動量
+//! @param move_y Y軸移動量
+//! @param move_z Z軸移動量
+//! @param size 表示倍率
+//! @param rotation 回転角度
+//! @param count 表示フレーム数
+//! @param texture テクスチャの認識番号
+//! @param settype エフェクトの種類　（Effect_Type を組み合せる）
+//! @return 成功：データ番号（0以上）　失敗：-1
+int ObjectManager::AddEffect(float pos_x, float pos_y, float pos_z, float move_x, float move_y, float move_z, float size, float rotation, int count, int texture, int settype)
+{
+	for(int i=0; i<MAX_EFFECT; i++){
+		if( EffectIndex[i].GetDrawFlag() == false ){
+			EffectIndex[i].SetPosData(pos_x, pos_y, pos_z, 0.0f);
+			EffectIndex[i].SetParamData(move_x, move_y, move_z, size, rotation, count, texture, settype, true);
+			EffectIndex[i].SetDrawFlag(true);
+			return i;
+		}
+	}
+
+	return -1;
+}
+
 //! @brief 出血させる
 //! @param x X座標
 //! @param y Y座標
@@ -473,22 +500,10 @@
 void ObjectManager::SetHumanBlood(float x, float y, float z)
 {
 	if( GameConfig.GetBloodFlag() == true ){
-		for(int i=0; i<MAX_EFFECT; i++){
-			if( EffectIndex[i].GetDrawFlag() == false ){
-				EffectIndex[i].SetPosData(x+1.0f, y+1.0f, z+1.0f, 0.0f);
-				EffectIndex[i].SetParamData(10.0f, (float)M_PI/18*GetRand(18), (int)GAMEFPS * 1, Resource->GetEffectBloodTexture(), EFFECT_FALL, true);
-				EffectIndex[i].SetDrawFlag(true);
-				break;
-			}
+		for(int i=0; i<2; i++){
+			float rx = (float)M_PI/18*GetRand(36);
+			AddEffect(x + cos(rx)*1.0f, y + (float)(GetRand(20)-10)/10, z + sin(rx)*1.0f, cos(rx)*0.5f, 0.5f, sin(rx)*0.5f, 10.0f, (float)M_PI/18*GetRand(18), (int)GAMEFPS * 1, Resource->GetEffectBloodTexture(), EFFECT_FALL);
 		}
-		for(int i=0; i<MAX_EFFECT; i++){
-			if( EffectIndex[i].GetDrawFlag() == false ){
-				EffectIndex[i].SetPosData(x-1.0f, y-1.0f, z-1.0f, 0.0f);
-				EffectIndex[i].SetParamData(10.0f, (float)M_PI/18*GetRand(18), (int)GAMEFPS * 1, Resource->GetEffectBloodTexture(), EFFECT_FALL, true);
-				EffectIndex[i].SetDrawFlag(true);
-				break;
-			}
-		}
 	}
 }
 
@@ -775,14 +790,7 @@
 void ObjectManager::HitBulletMap(float x, float y, float z)
 {
 	//エフェクト（煙）を表示
-	for(int i=0; i<MAX_EFFECT; i++){
-		if( EffectIndex[i].GetDrawFlag() == false ){
-			EffectIndex[i].SetPosData(x, y, z, 0.0f);
-			EffectIndex[i].SetParamData(5.0f, (float)M_PI/18*GetRand(18), (int)(GAMEFPS * 0.5f), Resource->GetEffectSmokeTexture(), EFFECT_DISAPPEAR | EFFECT_MAGNIFY, true);
-			EffectIndex[i].SetDrawFlag(true);
-			break;
-		}
-	}
+	AddEffect(x, y, z, 0.0f, 0.05f, 0.0f, 5.0f, (float)M_PI/18*GetRand(18), (int)(GAMEFPS * 0.5f), Resource->GetEffectSmokeTexture(), EFFECT_DISAPPEAR | EFFECT_MAGNIFY);
 
 	//効果音を再生
 	GameSound->HitMap(x, y, z);
@@ -844,14 +852,7 @@
 	SmallObjectIndex[HitSmallObject_id].HitBullet(attacks);
 
 	//エフェクト（煙）を表示
-	for(int i=0; i<MAX_EFFECT; i++){
-		if( EffectIndex[i].GetDrawFlag() == false ){
-			EffectIndex[i].SetPosData(x, y, z, 0.0f);
-			EffectIndex[i].SetParamData(5.0f, (float)M_PI/18*GetRand(18), (int)(GAMEFPS * 0.5f), Resource->GetEffectSmokeTexture(), EFFECT_DISAPPEAR | EFFECT_MAGNIFY, true);
-			EffectIndex[i].SetDrawFlag(true);
-			break;
-		}
-	}
+	AddEffect(x, y, z, 0.0f, 0.05f, 0.0f, 5.0f, (float)M_PI/18*GetRand(18), (int)(GAMEFPS * 0.5f), Resource->GetEffectSmokeTexture(), EFFECT_DISAPPEAR | EFFECT_MAGNIFY);
 
 	//効果音を再生
 	int id;
@@ -996,49 +997,14 @@
 	}
 
 	//エフェクト（フラッシュ）の表示
-	for(int i=0; i<MAX_EFFECT; i++){
-		if( EffectIndex[i].GetDrawFlag() == false ){
-			EffectIndex[i].SetPosData(gx, gy, gz, 0.0f);
-			EffectIndex[i].SetParamData(30.0f, 0.0f, 2, Resource->GetEffectMflashTexture(), EFFECT_NORMAL, true);
-			EffectIndex[i].SetDrawFlag(true);
-			break;
-		}
-	}
+	AddEffect(gx, gy, gz, 0.0f, 0.0f, 0.0f, 30.0f, 0.0f, 2, Resource->GetEffectMflashTexture(), EFFECT_NORMAL);
 
 	//エフェクト（煙）の表示
 	float rnd = (float)M_PI/18*GetRand(18);
-	for(int i=0; i<MAX_EFFECT; i++){
-		if( EffectIndex[i].GetDrawFlag() == false ){
-			EffectIndex[i].SetPosData(gx+1.0f, gy+1.0f, gz+1.0f, 0.0f);
-			EffectIndex[i].SetParamData(10.0f, rnd, (int)GAMEFPS * 3, Resource->GetEffectSmokeTexture(), EFFECT_DISAPPEAR | EFFECT_MAGNIFY | EFFECT_ROTATION, true);
-			EffectIndex[i].SetDrawFlag(true);
-			break;
-		}
-	}
-	for(int i=0; i<MAX_EFFECT; i++){
-		if( EffectIndex[i].GetDrawFlag() == false ){
-			EffectIndex[i].SetPosData(gx-1.0f, gy-1.0f, gz-1.0f, 0.0f);
-			EffectIndex[i].SetParamData(10.0f, rnd*-1, (int)GAMEFPS * 3, Resource->GetEffectSmokeTexture(), EFFECT_DISAPPEAR | EFFECT_MAGNIFY | EFFECT_ROTATION, true);
-			EffectIndex[i].SetDrawFlag(true);
-			break;
-		}
-	}
-	for(int i=0; i<MAX_EFFECT; i++){
-		if( EffectIndex[i].GetDrawFlag() == false ){
-			EffectIndex[i].SetPosData(gx-1.0f, gy-1.0f, gz+1.0f, 0.0f);
-			EffectIndex[i].SetParamData(10.0f, rnd, (int)GAMEFPS * 3, Resource->GetEffectSmokeTexture(), EFFECT_DISAPPEAR | EFFECT_MAGNIFY | EFFECT_ROTATION, true);
-			EffectIndex[i].SetDrawFlag(true);
-			break;
-		}
-	}
-	for(int i=0; i<MAX_EFFECT; i++){
-		if( EffectIndex[i].GetDrawFlag() == false ){
-			EffectIndex[i].SetPosData(gx+1.0f, gy+1.0f, gz-1.0f, 0.0f);
-			EffectIndex[i].SetParamData(10.0f, rnd*-1, (int)GAMEFPS * 3, Resource->GetEffectSmokeTexture(), EFFECT_DISAPPEAR | EFFECT_MAGNIFY | EFFECT_ROTATION, true);
-			EffectIndex[i].SetDrawFlag(true);
-			break;
-		}
-	}
+	AddEffect(gx+1.0f, gy+1.0f, gz+1.0f, 0.0f, 0.05f, 0.0f, 10.0f, rnd, (int)GAMEFPS * 3, Resource->GetEffectSmokeTexture(), EFFECT_DISAPPEAR | EFFECT_MAGNIFY | EFFECT_ROTATION);
+	AddEffect(gx-1.0f, gy-1.0f, gz-1.0f, 0.0f, 0.05f, 0.0f, 10.0f, rnd*-1, (int)GAMEFPS * 3, Resource->GetEffectSmokeTexture(), EFFECT_DISAPPEAR | EFFECT_MAGNIFY | EFFECT_ROTATION);
+	AddEffect(gx-1.0f, gy-1.0f, gz+1.0f, 0.0f, 0.05f, 0.0f, 10.0f, rnd, (int)GAMEFPS * 3, Resource->GetEffectSmokeTexture(), EFFECT_DISAPPEAR | EFFECT_MAGNIFY | EFFECT_ROTATION);
+	AddEffect(gx+1.0f, gy+1.0f, gz-1.0f, 0.0f, 0.05f, 0.0f, 10.0f, rnd*-1, (int)GAMEFPS * 3, Resource->GetEffectSmokeTexture(), EFFECT_DISAPPEAR | EFFECT_MAGNIFY | EFFECT_ROTATION);
 
 	//効果音を再生
 	GameSound->GrenadeExplosion(gx, gy, gz);
@@ -1073,38 +1039,10 @@
 
 		//エフェクト（煙）の表示
 		float rnd = (float)M_PI/18*GetRand(18);
-		for(int i=0; i<MAX_EFFECT; i++){
-			if( EffectIndex[i].GetDrawFlag() == false ){
-				EffectIndex[i].SetPosData(hx+1.0f, hy+1.0f, hz+1.0f, 0.0f);
-				EffectIndex[i].SetParamData(10.0f, rnd, (int)GAMEFPS * 3, Resource->GetEffectSmokeTexture(), EFFECT_DISAPPEAR | EFFECT_MAGNIFY | EFFECT_ROTATION, true);
-				EffectIndex[i].SetDrawFlag(true);
-				break;
-			}
-		}
-		for(int i=0; i<MAX_EFFECT; i++){
-			if( EffectIndex[i].GetDrawFlag() == false ){
-				EffectIndex[i].SetPosData(hx-1.0f, hy-1.0f, hz-1.0f, 0.0f);
-				EffectIndex[i].SetParamData(10.0f, rnd*-1, (int)GAMEFPS * 3, Resource->GetEffectSmokeTexture(), EFFECT_DISAPPEAR | EFFECT_MAGNIFY | EFFECT_ROTATION, true);
-				EffectIndex[i].SetDrawFlag(true);
-				break;
-			}
-		}
-		for(int i=0; i<MAX_EFFECT; i++){
-			if( EffectIndex[i].GetDrawFlag() == false ){
-				EffectIndex[i].SetPosData(hx-1.0f, hy-1.0f, hz+1.0f, 0.0f);
-				EffectIndex[i].SetParamData(10.0f, rnd, (int)GAMEFPS * 3, Resource->GetEffectSmokeTexture(), EFFECT_DISAPPEAR | EFFECT_MAGNIFY | EFFECT_ROTATION, true);
-				EffectIndex[i].SetDrawFlag(true);
-				break;
-			}
-		}
-		for(int i=0; i<MAX_EFFECT; i++){
-			if( EffectIndex[i].GetDrawFlag() == false ){
-				EffectIndex[i].SetPosData(hx+1.0f, hy+1.0f, hz-1.0f, 0.0f);
-				EffectIndex[i].SetParamData(10.0f, rnd*-1, (int)GAMEFPS * 3, Resource->GetEffectSmokeTexture(), EFFECT_DISAPPEAR | EFFECT_MAGNIFY | EFFECT_ROTATION, true);
-				EffectIndex[i].SetDrawFlag(true);
-				break;
-			}
-		}
+		AddEffect(hx+1.0f, hy+1.0f, hz+1.0f, 0.0f, 0.05f, 0.0f, 10.0f, rnd, (int)GAMEFPS * 3, Resource->GetEffectSmokeTexture(), EFFECT_DISAPPEAR | EFFECT_MAGNIFY | EFFECT_ROTATION);
+		AddEffect(hx-1.0f, hy-1.0f, hz-1.0f, 0.0f, 0.05f, 0.0f, 10.0f, rnd*-1, (int)GAMEFPS * 3, Resource->GetEffectSmokeTexture(), EFFECT_DISAPPEAR | EFFECT_MAGNIFY | EFFECT_ROTATION);
+		AddEffect(hx-1.0f, hy-1.0f, hz+1.0f, 0.0f, 0.05f, 0.0f, 10.0f, rnd, (int)GAMEFPS * 3, Resource->GetEffectSmokeTexture(), EFFECT_DISAPPEAR | EFFECT_MAGNIFY | EFFECT_ROTATION);
+		AddEffect(hx+1.0f, hy+1.0f, hz-1.0f, 0.0f, 0.05f, 0.0f, 10.0f, rnd*-1, (int)GAMEFPS * 3, Resource->GetEffectSmokeTexture(), EFFECT_DISAPPEAR | EFFECT_MAGNIFY | EFFECT_ROTATION);
 	}
 }
 
@@ -1602,6 +1540,8 @@
 	int weapon_paramid;
 	WeaponParameter ParamData;
 	float x, y, z;
+	float flashsize, smokesize, yakkyousize;
+	float rx, mx, my, mz;
 
 	//人の座標と角度を取得
 	HumanIndex[humanid].GetPosData(&pos_x, &pos_y, &pos_z, NULL);
@@ -1612,13 +1552,19 @@
 	if( GameParamInfo->GetWeapon(weapon_paramid, &ParamData) != 0 ){ return; }
 
 	//マズルフラッシュと煙のサイズを決定
-	float flashsize = 0.06f * ParamData.attacks;
-	float smokesize = flashsize;
-	float yakkyousize = 0.02f * ParamData.attacks;
+	flashsize = 0.06f * ParamData.attacks;
+	smokesize = flashsize;
+	yakkyousize = 0.01f * ParamData.attacks;
 	if( ParamData.silencer == true ){
 		flashsize /= 2;
 	}
 
+	//薬莢の移動量を決定
+	rx = rotation_x*-1 + (float)M_PI/2;
+	mx = cos(rx - (float)M_PI/2) * ParamData.yakkyou_sx /10;
+	my = (ParamData.yakkyou_sy + (GetRand(3)-1)) /10;
+	mz = sin(rx - (float)M_PI/2) * ParamData.yakkyou_sx /10;
+
 	//行列でエフェクト座標を計算
 	d3dg->SetWorldTransformHumanWeapon(pos_x, pos_y + 16.0f, pos_z, ParamData.flashx/10, ParamData.flashy/10, ParamData.flashz/10, rotation_x, armrotation_y*-1, 1.0f);
 	d3dg->GetWorldTransformPos(&x, &y, &z);
@@ -1625,15 +1571,7 @@
 	d3dg->ResetWorldTransform();
 
 	//マズルフラッシュ描画
-	for(int i=0; i<MAX_EFFECT; i++){
-		if( EffectIndex[i].GetDrawFlag() == false ){
-			//エフェクト設定
-			EffectIndex[i].SetPosData(x, y, z, 0.0f);
-			EffectIndex[i].SetParamData(flashsize, (float)M_PI/18*GetRand(18), 1, Resource->GetEffectMflashTexture(), EFFECT_NORMAL, true);
-			EffectIndex[i].SetDrawFlag(true);
-			break;
-		}
-	}
+	AddEffect(x, y, z, 0.0f, 0.0f, 0.0f, flashsize, (float)M_PI/18*GetRand(18), 1, Resource->GetEffectMflashTexture(), EFFECT_NORMAL);
 
 	//行列でエフェクト座標を計算
 	d3dg->SetWorldTransformHumanWeapon(pos_x, pos_y + 16.0f, pos_z, ParamData.flashx/10, ParamData.flashy/10, ParamData.flashz/10 - 0.1f, rotation_x, armrotation_y*-1, 1.0f);
@@ -1641,15 +1579,7 @@
 	d3dg->ResetWorldTransform();
 
 	//エフェクト（煙）の表示
-	for(int i=0; i<MAX_EFFECT; i++){
-		if( EffectIndex[i].GetDrawFlag() == false ){
-			//エフェクト設定
-			EffectIndex[i].SetPosData(x, y, z, 0.0f);
-			EffectIndex[i].SetParamData(smokesize, (float)M_PI/18*GetRand(18), (int)(GAMEFPS/3), Resource->GetEffectSmokeTexture(), EFFECT_DISAPPEAR | EFFECT_MAGNIFY | EFFECT_ROTATION, true);
-			EffectIndex[i].SetDrawFlag(true);
-			break;
-		}
-	}
+	AddEffect(x, y, z, 0.0f, 0.05f, 0.0f, smokesize, (float)M_PI/18*GetRand(18), (int)(GAMEFPS/3), Resource->GetEffectSmokeTexture(), EFFECT_DISAPPEAR | EFFECT_MAGNIFY | EFFECT_ROTATION);
 
 	//行列でエフェクト座標を計算
 	d3dg->SetWorldTransformHumanWeapon(pos_x, pos_y + 16.0f, pos_z, ParamData.yakkyou_px/10, ParamData.yakkyou_py/10, ParamData.yakkyou_pz/10, rotation_x, armrotation_y*-1, 1.0f);
@@ -1657,15 +1587,7 @@
 	d3dg->ResetWorldTransform();
 
 	//薬莢描画
-	for(int i=0; i<MAX_EFFECT; i++){
-		if( EffectIndex[i].GetDrawFlag() == false ){
-			//エフェクト設定
-			EffectIndex[i].SetPosData(x, y, z, 0.0f);
-			EffectIndex[i].SetParamData(yakkyousize, (float)M_PI/18*GetRand(18), (int)(GAMEFPS/2), Resource->GetEffectYakkyouTexture(), EFFECT_ROTATION | EFFECT_FALL, true);
-			EffectIndex[i].SetDrawFlag(true);
-			break;
-		}
-	}
+	AddEffect(x, y, z, mx, my, mz, yakkyousize, (float)M_PI/18*GetRand(18), (int)(GAMEFPS/2), Resource->GetEffectYakkyouTexture(), EFFECT_ROTATION | EFFECT_FALL);
 }
 
 //! @brief 武器をリロード

--- trunk/object.cpp	(revision 35)
+++ trunk/object.cpp	(revision 36)
@@ -2509,6 +2509,9 @@
 {}
 
 //! @brief 設定値を設定
+//! @param in_move_x X軸移動量
+//! @param in_move_y Y軸移動量
+//! @param in_move_z Z軸移動量
 //! @param size 表示倍率
 //! @param rotation 回転角度
 //! @param count 表示フレーム数
@@ -2515,8 +2518,11 @@
 //! @param texture テクスチャの認識番号
 //! @param settype エフェクトの種類　（Effect_Type を組み合せる）
 //! @param init オブジェクトを初期化
-void effect::SetParamData(float size, float rotation, int count, int texture, int settype, bool init)
+void effect::SetParamData(float in_move_x, float in_move_y, float in_move_z, float size, float rotation, int count, int texture, int settype, bool init)
 {
+	move_x = in_move_x;
+	move_y = in_move_y;
+	move_z = in_move_z;
 	model_size = size;
 	rotation_texture = rotation;
 	cnt = count;
@@ -2550,6 +2556,11 @@
 	camera_rx = in_camera_rx;
 	camera_ry = in_camera_ry;
 
+	//座標移動
+	pos_x += move_x;
+	pos_y += move_y;
+	pos_z += move_z;
+
 	//特殊処理を実行
 	if( type & EFFECT_DISAPPEAR ){	//消す
 		alpha -= 1.0f/setcnt;
@@ -2566,11 +2577,8 @@
 		}
 	}
 	if( type & EFFECT_FALL ){		//落下
-		pos_y -= 1.0f;
+		move_y = (move_y - 0.17f) * 0.98f;
 	}
-	else{
-		pos_y += 0.05f;
-	}
 
 	//カウントを 1 引く
 	cnt -= 1;

--- trunk/objectmanager.h	(revision 35)
+++ trunk/objectmanager.h	(revision 36)
@@ -111,6 +111,7 @@
 	int AddHumanIndex(float px, float py, float pz, float rx, int CharacterID, int TeamID, int WeaponID[]);
 	int AddVisualWeaponIndex(int WeaponID, bool loadbullet);
 	int AddSmallObjectIndex(float px, float py, float pz, float rx, int paramID, bool MapColl);
+	int AddEffect(float pos_x, float pos_y, float pos_z, float move_x, float move_y, float move_z, float size, float rotation, int count, int texture, int settype);
 	void LoadPointData();
 	int GetPlayerID();
 	void SetPlayerID(int id);

--- trunk/object.h	(revision 35)
+++ trunk/object.h	(revision 36)
@@ -318,6 +318,9 @@
 	int type;			//!< 種類
 	float camera_rx;	//!< カメラ角度
 	float camera_ry;	//!< カメラ角度
+	float move_x;		//!< X軸移動量
+	float move_y;		//!< Y軸移動量
+	float move_z;		//!< Z軸移動量
 	float rotation_texture;	//!< 回転角度
 	float alpha;			//!< 透明度
 	int cnt;			//!< カウント
@@ -326,7 +329,7 @@
 public:
 	effect(float x = 0.0f, float y = 0.0f, float z = 0.0f, float size = 1.0f, float rotation = 0.0f, int count = 0, int texture = 0, int settype = 0);
 	~effect();
-	virtual void SetParamData(float size, float rotation, int count, int texture, int settype, bool init);
+	virtual void SetParamData(float in_move_x, float in_move_y, float in_move_z, float size, float rotation, int count, int texture, int settype, bool init);
 	virtual int RunFrame(float in_camera_rx, float in_camera_ry);
 	virtual void Render(class D3DGraphics *d3dg);
 };