Commit: 350 - OpenXOPS (svn)

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

Commit MetaInfo

• Revision: 350 (tree)
• Time: 2023-02-05 21:27:23
• Author: xops-mikan

Log Message

弾丸管理クラス（bullet）の弾速をint型からfloat型に変更、弾の当たり判定を修正

Change Summary

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

Incremental Difference

--- trunk/object.cpp	(revision 349)
+++ trunk/object.cpp	(revision 350)
@@ -2773,10 +2773,10 @@
 	rotation_y = 0.0f;
 	attacks = 0;
 	penetration = 0;
-	speed = 0;
+	speed = 0.0f;
 	teamid = 0;
 	humanid = 0;
-	ontargetcnt = 0;
+	ontargetcnt = 0.0f;
 	cnt = 0;
 }
 
@@ -2807,7 +2807,7 @@
 //! @param _humanid 人のデータ番号
 //! @param _ontargetcnt 命中時のカウント数
 //! @param init オブジェクトを初期化
-void bullet::SetParamData(int _attacks, int _penetration, int _speed, int _teamid, int _humanid, float _ontargetcnt, bool init)
+void bullet::SetParamData(int _attacks, int _penetration, float _speed, int _teamid, int _humanid, float _ontargetcnt, bool init)
 {
 	attacks = _attacks;
 	penetration = _penetration;
@@ -2843,7 +2843,7 @@
 //! @param _teamid チーム番号を受け取るポインタ（NULL可）
 //! @param _humanid 人のデータ番号を受け取るポインタ（NULL可）
 //! @param _ontargetcnt 命中時のカウント数を受け取るポインタ（NULL可）
-void bullet::GetParamData(int *_attacks, int *_penetration, int *_speed, int *_teamid, int *_humanid, float *_ontargetcnt)
+void bullet::GetParamData(int *_attacks, int *_penetration, float *_speed, int *_teamid, int *_humanid, float *_ontargetcnt)
 {
 	if( _attacks != NULL ){ *_attacks = attacks; }
 	if( _penetration != NULL ){ *_penetration = penetration; }

--- trunk/object.h	(revision 349)
+++ trunk/object.h	(revision 350)
@@ -303,7 +303,7 @@
 	float rotation_y;	//!< 回転角度
 	int attacks;		//!< 攻撃力
 	int penetration;	//!< 貫通力
-	int speed;			//!< 弾速
+	float speed;		//!< 弾速
 	int teamid;			//!< チーム番号
 	int humanid;		//!< 人のデータ番号
 	float ontargetcnt;	//!< 命中時のカウント数
@@ -313,9 +313,9 @@
 	bullet(int modelid = -1, int textureid = -1);
 	~bullet();
 	virtual void SetPosData(float x, float y, float z, float rx, float ry);
-	virtual void SetParamData(int _attacks, int _penetration, int _speed, int _teamid, int _humanid, float _ontargetcnt, bool init);
+	virtual void SetParamData(int _attacks, int _penetration, float _speed, int _teamid, int _humanid, float _ontargetcnt, bool init);
 	virtual void GetPosData(float *x, float *y, float *z, float *rx, float *ry);
-	virtual void GetParamData(int *_attacks, int *_penetration, int *_speed, int *_teamid, int *_humanid, float *_ontargetcnt);
+	virtual void GetParamData(int *_attacks, int *_penetration, float *_speed, int *_teamid, int *_humanid, float *_ontargetcnt);
 	virtual int ProcessObject();
 	virtual void Render(class D3DGraphics *d3dg, bool NoModel);
 };

--- trunk/objectmanager.cpp	(revision 349)
+++ trunk/objectmanager.cpp	(revision 350)
@@ -682,7 +682,7 @@
 	float brx, bry;
 	int attacks;
 	int penetration;
-	int speed;
+	float speed;
 	int teamid;
 	int humanid;
 	float ontargetcnt;
@@ -703,12 +703,12 @@
 	vz = sinf(brx)*cosf(bry);
 
 	//マップとの当たり判定（弾道上にブロックがあるか）
-	if( CollD->CheckALLBlockIntersectRay(bx, by, bz, vx, vy, vz, NULL, NULL, &Dist, (float)speed) == true ){
+	if( CollD->CheckALLBlockIntersectRay(bx, by, bz, vx, vy, vz, NULL, NULL, &Dist, speed) == true ){
 		mapflag = 1;
 	}
 
 	// BULLET_SPEEDSCALE定数 の分解能を算出
-	int maxcnt = (int)ceilf(speed / BULLET_SPEEDSCALE);
+	int maxcnt = (int)roundf(speed / BULLET_SPEEDSCALE);
 
 	// BULLET_SPEEDSCALE定数 の分解能で当たり判定
 	for(int cnt=0; cnt<maxcnt; cnt++){
@@ -720,9 +720,9 @@
 		}
 
 		float bvx, bvy, bvz;
-		bvx = bx + vx * BULLET_SPEEDSCALE * cnt;
-		bvy = by + vy * BULLET_SPEEDSCALE * cnt;
-		bvz = bz + vz * BULLET_SPEEDSCALE * cnt;
+		bvx = bx + vx * BULLET_SPEEDSCALE * (cnt+1);
+		bvy = by + vy * BULLET_SPEEDSCALE * (cnt+1);
+		bvz = bz + vz * BULLET_SPEEDSCALE * (cnt+1);
 
 		//人との当たり判定
 		for(int i=0; i<MAX_HUMAN; i++){
@@ -2015,7 +2015,7 @@
 
 			//銃弾を発射
 			newbullet->SetPosData(pos_x, pos_y + WEAPONSHOT_HEIGHT, pos_z, rx2, ry2);
-			newbullet->SetParamData(attacks, ParamData.penetration, (int)((float)ParamData.speed * BULLET_SPEEDSCALE), teamid, human_id, ontargetcnt, true);
+			newbullet->SetParamData(attacks, ParamData.penetration, (float)ParamData.speed * BULLET_SPEEDSCALE, teamid, human_id, ontargetcnt, true);
 			newbullet->SetEnableFlag(true);
 
 			//対人判定用リスト初期化
@@ -2763,8 +2763,8 @@
 	if( demomode == false ){
 		//弾オブジェクトの処理
 		for(int i=0; i<MAX_BULLET; i++){
-			float bx, by, bz, brx, bry;
-			int speed, teamid;
+			float bx, by, bz, brx, bry, speed;
+			int teamid;
 			float mx, my, mz;
 
 			CollideBullet(&BulletIndex[i]);		//当たり判定を実行