Commit: 142 - OpenXOPS (svn)

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

Commit MetaInfo

• Revision: 142 (tree)
• Zeit: 2016-08-21 14:01:20
• Autor: xops-mikan

Log Message

人とマップ（歪んだブロック）との当たり判定を改善

Ändern Zusammenfassung

• modified: trunk/datafile.h
• modified: trunk/collision.cpp
• modified: trunk/object.cpp
• modified: trunk/datafile.cpp

Diff

--- trunk/datafile.h	(revision 141)
+++ trunk/datafile.h	(revision 142)
@@ -55,6 +55,9 @@
 	int textureID;				//!< textureID
 	float u[4];					//!< textureUV-U
 	float v[4];					//!< textureUV-V
+	float center_x;				//!< center
+	float center_y;				//!< center
+	float center_z;				//!< center
 	float vx;					//!< normal vector 
 	float vy;					//!< normal vector 
 	float vz;					//!< normal vector 

--- trunk/collision.cpp	(revision 141)
+++ trunk/collision.cpp	(revision 142)
@@ -253,10 +253,10 @@
 
 	blockdata->Getdata(&bdata, id);
 
-	//面の中心を基準点に、座標のベクトルを求める
-	vx = cbdata[id].polygon_center_x[face] - x;
-	vy = cbdata[id].polygon_center_y[face] - y;
-	vz = cbdata[id].polygon_center_z[face] - z;
+	//面の中心を基準点に、座標のベクトルを求める　※正確な中心点を使うこと
+	vx = bdata.material[face].center_x - x;
+	vy = bdata.material[face].center_y - y;
+	vz = bdata.material[face].center_z - z;
 
 	//内積
 	d = bdata.material[face].vx*vx + bdata.material[face].vy*vy + bdata.material[face].vz*vz;
@@ -330,10 +330,10 @@
 		return false;		//面とレイが平行か、面に対してレイが逆向き
 	}
 
-	//面の中心を基準点に、座標のベクトルを求める
-	vx1 = RayPos_x - cbdata[blockid].polygon_center_x[face];
-	vy1 = RayPos_y - cbdata[blockid].polygon_center_y[face];
-	vz1 = RayPos_z - cbdata[blockid].polygon_center_z[face];
+	//面の中心を基準点に、座標のベクトルを求める　※正確な中心点を使うこと
+	vx1 = RayPos_x - data.material[face].center_x;
+	vy1 = RayPos_y - data.material[face].center_y;
+	vz1 = RayPos_z - data.material[face].center_z;
 
 	//内積
 	d2 = data.material[face].vx*vx1 + data.material[face].vy*vy1 + data.material[face].vz*vz1;		//面までの最短距離が求まる
@@ -355,9 +355,9 @@
 	//　　面を形成する各4辺との位置関係を算出し、面の法線と比較する。
 
 	//外積
-	vx2 = ((cbdata[blockid].y[ vID[1] ] - cbdata[blockid].y[ vID[0] ]) * (z - cbdata[blockid].z[ vID[0] ])) - ((y - cbdata[blockid].y[ vID[0] ]) * (cbdata[blockid].z[ vID[1] ] - cbdata[blockid].z[ vID[0] ]));
-	vy2 = ((cbdata[blockid].z[ vID[1] ] - cbdata[blockid].z[ vID[0] ]) * (x - cbdata[blockid].x[ vID[0] ])) - ((z - cbdata[blockid].z[ vID[0] ]) * (cbdata[blockid].x[ vID[1] ] - cbdata[blockid].x[ vID[0] ]));
-	vz2 = ((cbdata[blockid].x[ vID[1] ] - cbdata[blockid].x[ vID[0] ]) * (y - cbdata[blockid].y[ vID[0] ])) - ((x - cbdata[blockid].x[ vID[0] ]) * (cbdata[blockid].y[ vID[1] ] - cbdata[blockid].y[ vID[0] ]));
+	vx2 = ((data.y[ vID[1] ] - data.y[ vID[0] ]) * (z - data.z[ vID[0] ])) - ((y - data.y[ vID[0] ]) * (data.z[ vID[1] ] - data.z[ vID[0] ]));
+	vy2 = ((data.z[ vID[1] ] - data.z[ vID[0] ]) * (x - data.x[ vID[0] ])) - ((z - data.z[ vID[0] ]) * (data.x[ vID[1] ] - data.x[ vID[0] ]));
+	vz2 = ((data.x[ vID[1] ] - data.x[ vID[0] ]) * (y - data.y[ vID[0] ])) - ((x - data.x[ vID[0] ]) * (data.y[ vID[1] ] - data.y[ vID[0] ]));
 
 	//内積
 	d1 = data.material[face].vx*vx2 + data.material[face].vy*vy2 + data.material[face].vz*vz2;		//ブロック面の法線との関係を算出
@@ -368,9 +368,9 @@
 
 
 	//外積
-	vx2 = ((cbdata[blockid].y[ vID[2] ] - cbdata[blockid].y[ vID[1] ]) * (z - cbdata[blockid].z[ vID[1] ])) - ((y - cbdata[blockid].y[ vID[1] ]) * (cbdata[blockid].z[ vID[2] ] - cbdata[blockid].z[ vID[1] ]));
-	vy2 = ((cbdata[blockid].z[ vID[2] ] - cbdata[blockid].z[ vID[1] ]) * (x - cbdata[blockid].x[ vID[1] ])) - ((z - cbdata[blockid].z[ vID[1] ]) * (cbdata[blockid].x[ vID[2] ] - cbdata[blockid].x[ vID[1] ]));
-	vz2 = ((cbdata[blockid].x[ vID[2] ] - cbdata[blockid].x[ vID[1] ]) * (y - cbdata[blockid].y[ vID[1] ])) - ((x - cbdata[blockid].x[ vID[1] ]) * (cbdata[blockid].y[ vID[2] ] - cbdata[blockid].y[ vID[1] ]));
+	vx2 = ((data.y[ vID[2] ] - data.y[ vID[1] ]) * (z - data.z[ vID[1] ])) - ((y - data.y[ vID[1] ]) * (data.z[ vID[2] ] - data.z[ vID[1] ]));
+	vy2 = ((data.z[ vID[2] ] - data.z[ vID[1] ]) * (x - data.x[ vID[1] ])) - ((z - data.z[ vID[1] ]) * (data.x[ vID[2] ] - data.x[ vID[1] ]));
+	vz2 = ((data.x[ vID[2] ] - data.x[ vID[1] ]) * (y - data.y[ vID[1] ])) - ((x - data.x[ vID[1] ]) * (data.y[ vID[2] ] - data.y[ vID[1] ]));
 
 	//内積
 	d1 = data.material[face].vx*vx2 + data.material[face].vy*vy2 + data.material[face].vz*vz2;		//ブロック面の法線との関係を算出
@@ -381,9 +381,9 @@
 
 
 	//外積
-	vx2 = ((cbdata[blockid].y[ vID[3] ] - cbdata[blockid].y[ vID[2] ]) * (z - cbdata[blockid].z[ vID[2] ])) - ((y - cbdata[blockid].y[ vID[2] ]) * (cbdata[blockid].z[ vID[3] ] - cbdata[blockid].z[ vID[2] ]));
-	vy2 = ((cbdata[blockid].z[ vID[3] ] - cbdata[blockid].z[ vID[2] ]) * (x - cbdata[blockid].x[ vID[2] ])) - ((z - cbdata[blockid].z[ vID[2] ]) * (cbdata[blockid].x[ vID[3] ] - cbdata[blockid].x[ vID[2] ]));
-	vz2 = ((cbdata[blockid].x[ vID[3] ] - cbdata[blockid].x[ vID[2] ]) * (y - cbdata[blockid].y[ vID[2] ])) - ((x - cbdata[blockid].x[ vID[2] ]) * (cbdata[blockid].y[ vID[3] ] - cbdata[blockid].y[ vID[2] ]));
+	vx2 = ((data.y[ vID[3] ] - data.y[ vID[2] ]) * (z - data.z[ vID[2] ])) - ((y - data.y[ vID[2] ]) * (data.z[ vID[3] ] - data.z[ vID[2] ]));
+	vy2 = ((data.z[ vID[3] ] - data.z[ vID[2] ]) * (x - data.x[ vID[2] ])) - ((z - data.z[ vID[2] ]) * (data.x[ vID[3] ] - data.x[ vID[2] ]));
+	vz2 = ((data.x[ vID[3] ] - data.x[ vID[2] ]) * (y - data.y[ vID[2] ])) - ((x - data.x[ vID[2] ]) * (data.y[ vID[3] ] - data.y[ vID[2] ]));
 
 	//内積
 	d1 = data.material[face].vx*vx2 + data.material[face].vy*vy2 + data.material[face].vz*vz2;		//ブロック面の法線との関係を算出
@@ -394,9 +394,9 @@
 
 
 	//外積
-	vx2 = ((cbdata[blockid].y[ vID[0] ] - cbdata[blockid].y[ vID[3] ]) * (z - cbdata[blockid].z[ vID[3] ])) - ((y - cbdata[blockid].y[ vID[3] ]) * (cbdata[blockid].z[ vID[0] ] - cbdata[blockid].z[ vID[3] ]));
-	vy2 = ((cbdata[blockid].z[ vID[0] ] - cbdata[blockid].z[ vID[3] ]) * (x - cbdata[blockid].x[ vID[3] ])) - ((z - cbdata[blockid].z[ vID[3] ]) * (cbdata[blockid].x[ vID[0] ] - cbdata[blockid].x[ vID[3] ]));
-	vz2 = ((cbdata[blockid].x[ vID[0] ] - cbdata[blockid].x[ vID[3] ]) * (y - cbdata[blockid].y[ vID[3] ])) - ((x - cbdata[blockid].x[ vID[3] ]) * (cbdata[blockid].y[ vID[0] ] - cbdata[blockid].y[ vID[3] ]));
+	vx2 = ((data.y[ vID[0] ] - data.y[ vID[3] ]) * (z - data.z[ vID[3] ])) - ((y - data.y[ vID[3] ]) * (data.z[ vID[0] ] - data.z[ vID[3] ]));
+	vy2 = ((data.z[ vID[0] ] - data.z[ vID[3] ]) * (x - data.x[ vID[3] ])) - ((z - data.z[ vID[3] ]) * (data.x[ vID[0] ] - data.x[ vID[3] ]));
+	vz2 = ((data.x[ vID[0] ] - data.x[ vID[3] ]) * (y - data.y[ vID[3] ])) - ((x - data.x[ vID[3] ]) * (data.y[ vID[0] ] - data.y[ vID[3] ]));
 
 	//内積
 	d1 = data.material[face].vx*vx2 + data.material[face].vy*vy2 + data.material[face].vz*vz2;		//ブロック面の法線との関係を算出

--- trunk/object.cpp	(revision 141)
+++ trunk/object.cpp	(revision 142)
@@ -1311,7 +1311,6 @@
 			else{
 				FallDistance = move_y;
 			}
-			FallDistance = move_y;
 			move_y_flag = true;
 		}
 		else{
@@ -1320,7 +1319,11 @@
 
 			//下方向へ当たり判定
 			if( CollD->CheckALLBlockIntersectDummyRay(pos_x, pos_y + offset, pos_z, 0, -1, 0, NULL, NULL, &Dist, move_y*-1 + offset) == true ){
-				CollD->CheckALLBlockIntersectRay(pos_x, pos_y + offset, pos_z, 0, -1, 0, &id, &face, &Dist, move_y + offset);
+				if( CollD->CheckALLBlockIntersectRay(pos_x, pos_y + offset, pos_z, 0, -1, 0, &id, &face, &Dist, move_y*-1 + offset) == false ){
+					//もし、-DummyRay()関数ではブロックが見つかるのに -Ray()関数で見つからないなら、おそらくブロックが歪んでいる。
+					//とりあず適当な値で誤魔化し、微振動を防ぐ。
+					Dist = offset;
+				}
 
 				if( Invincible == false ){
 					//ダメージ計算

--- trunk/datafile.cpp	(revision 141)
+++ trunk/datafile.cpp	(revision 142)
@@ -203,6 +203,21 @@
 			//ブロック頂点データの関連付けを取得
 			blockdataface(j, vID, uvID);
 
+			//中心点初期化
+			data[i].material[j].center_x = 0.0f;
+			data[i].material[j].center_y = 0.0f;
+			data[i].material[j].center_z = 0.0f;
+
+			//4頂点の中心点を算出
+			for(int k=0; k<4; k++){
+				data[i].material[j].center_x += data[i].x[ vID[k] ];
+				data[i].material[j].center_y += data[i].y[ vID[k] ];
+				data[i].material[j].center_z += data[i].z[ vID[k] ];
+			}
+			data[i].material[j].center_x /= 4;
+			data[i].material[j].center_y /= 4;
+			data[i].material[j].center_z /= 4;
+
 			//面の法線（ベクトル）と、その長さを求める
 			xs1 = ((data[i].y[ vID[3] ] - data[i].y[ vID[2] ]) * (data[i].z[ vID[0] ] - data[i].z[ vID[2] ])) - ((data[i].y[ vID[0] ] - data[i].y[ vID[2] ]) * (data[i].z[ vID[3] ] - data[i].z[ vID[2] ]));
 			ys1 = ((data[i].z[ vID[3] ] - data[i].z[ vID[2] ]) * (data[i].x[ vID[0] ] - data[i].x[ vID[2] ])) - ((data[i].z[ vID[0] ] - data[i].z[ vID[2] ]) * (data[i].x[ vID[3] ] - data[i].x[ vID[2] ]));