提交: 93 - OpenXOPS (svn)

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

Commit MetaInfo

• 修訂: 93 (tree)
• 時間: 2015-06-14 20:33:25
• 作者: xops-mikan

Log Message

ブロックの法線ベクトル算出を変更、当たり判定に用いる関数のバグ修正

Change Summary

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

差異

--- trunk/soundmanager.cpp	(revision 92)
+++ trunk/soundmanager.cpp	(revision 93)
@@ -455,7 +455,7 @@
 		speed = (float)sqrt(plist->move_x*plist->move_x + plist->move_y*plist->move_y + plist->move_z*plist->move_z);
 
 		//最短距離の座標を求める
-		min_dist = DistancePosRay(camera_x, camera_y, camera_z, plist->x, plist->y, plist->z, plist->move_x/speed, plist->move_y/speed, plist->move_z/speed, (float)speed*2);
+		min_dist = DistancePosRay(camera_x, camera_y, camera_z, plist->x, plist->y, plist->z, plist->move_x/speed, plist->move_y/speed, plist->move_z/speed);
 
 		//最短距離時の座標を求める
 		dist = (float)sqrt(dist2 - min_dist*min_dist);

--- trunk/collision.h	(revision 92)
+++ trunk/collision.h	(revision 93)
@@ -88,7 +88,7 @@
 bool CollideSphereRay(float s_x, float s_y, float s_z, float s_r, float RayPos_x, float RayPos_y, float RayPos_z, float RayDir_x, float RayDir_y, float RayDir_z, float *Dist, float maxDist);
 bool CollideAABBRay(float box_min_x, float box_min_y, float box_min_z, float box_max_x, float box_max_y, float box_max_z, float RayPos_x, float RayPos_y, float RayPos_z, float RayDir_x, float RayDir_y, float RayDir_z, float *Dist, float maxDist);
 bool CollideCylinderRay(float c_x, float c_y, float c_z, float c_r, float c_h, float RayPos_x, float RayPos_y, float RayPos_z, float RayDir_x, float RayDir_y, float RayDir_z, float *Dist, float maxDist);
-float DistancePosRay(float Pos_x, float Pos_y, float Pos_z, float RayPos_x, float RayPos_y, float RayPos_z, float RayDir_x, float RayDir_y, float RayDir_z, float maxDist);
+float DistancePosRay(float Pos_x, float Pos_y, float Pos_z, float RayPos_x, float RayPos_y, float RayPos_z, float RayDir_x, float RayDir_y, float RayDir_z);
 bool Collide2DLine(int A1x, int A1y, int A2x, int A2y, int B1x, int B1y, int B2x, int B2y, int *out_x, int *out_y);
 bool Get2DLineInBox(int line_x1, int line_y1, int line_x2, int line_y2, int box_x1, int box_y1, int box_x2, int box_y2, int *out_line_x1, int *out_line_y1, int *out_line_x2, int *out_line_y2);
 

--- trunk/datafile.cpp	(revision 92)
+++ trunk/datafile.cpp	(revision 93)
@@ -177,6 +177,10 @@
 	int uvID[4];
 	float g;
 	float xs, ys, zs;
+	float g1;
+	float xs1, ys1, zs1;
+	float g2;
+	float xs2, ys2, zs2;
 	float lx, ly, lz;
 	float rx, ry, rz, a;
 
@@ -193,18 +197,30 @@
 			blockdataface(j, vID, uvID);
 
 			//面の法線（ベクトル）と、その長さを求める
-			xs = ((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] ]));
-			ys = ((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] ]));
-			zs = ((data[i].x[ vID[3] ] - data[i].x[ vID[2] ]) * (data[i].y[ vID[0] ] - data[i].y[ vID[2] ])) - ((data[i].x[ vID[0] ] - data[i].x[ vID[2] ]) * (data[i].y[ vID[3] ] - data[i].y[ vID[2] ]));
-			g = (float)sqrt(xs * xs + ys * ys + zs * zs);
+			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] ]));
+			zs1 = ((data[i].x[ vID[3] ] - data[i].x[ vID[2] ]) * (data[i].y[ vID[0] ] - data[i].y[ vID[2] ])) - ((data[i].x[ vID[0] ] - data[i].x[ vID[2] ]) * (data[i].y[ vID[3] ] - data[i].y[ vID[2] ]));
+			g1 = (float)sqrt(xs1 * xs1 + ys1 * ys1 + zs1 * zs1);
 
-			//もし法線がおかしければ、もう一方の三角形で計算をやり直す
-			if( g < 0.01f ){
-				xs = ((data[i].y[ vID[1] ] - data[i].y[ vID[0] ]) * (data[i].z[ vID[2] ] - data[i].z[ vID[0] ])) - ((data[i].y[ vID[2] ] - data[i].y[ vID[0] ]) * (data[i].z[ vID[1] ] - data[i].z[ vID[0] ]));
-				ys = ((data[i].z[ vID[1] ] - data[i].z[ vID[0] ]) * (data[i].x[ vID[2] ] - data[i].x[ vID[0] ])) - ((data[i].z[ vID[2] ] - data[i].z[ vID[0] ]) * (data[i].x[ vID[1] ] - data[i].x[ vID[0] ]));
-				zs = ((data[i].x[ vID[1] ] - data[i].x[ vID[0] ]) * (data[i].y[ vID[2] ] - data[i].y[ vID[0] ])) - ((data[i].x[ vID[2] ] - data[i].x[ vID[0] ]) * (data[i].y[ vID[1] ] - data[i].y[ vID[0] ]));
-				g = (float)sqrt(xs * xs + ys * ys + zs * zs);
+			//もう一方の三角形でも計算する
+			xs2 = ((data[i].y[ vID[1] ] - data[i].y[ vID[0] ]) * (data[i].z[ vID[2] ] - data[i].z[ vID[0] ])) - ((data[i].y[ vID[2] ] - data[i].y[ vID[0] ]) * (data[i].z[ vID[1] ] - data[i].z[ vID[0] ]));
+			ys2 = ((data[i].z[ vID[1] ] - data[i].z[ vID[0] ]) * (data[i].x[ vID[2] ] - data[i].x[ vID[0] ])) - ((data[i].z[ vID[2] ] - data[i].z[ vID[0] ]) * (data[i].x[ vID[1] ] - data[i].x[ vID[0] ]));
+			zs2 = ((data[i].x[ vID[1] ] - data[i].x[ vID[0] ]) * (data[i].y[ vID[2] ] - data[i].y[ vID[0] ])) - ((data[i].x[ vID[2] ] - data[i].x[ vID[0] ]) * (data[i].y[ vID[1] ] - data[i].y[ vID[0] ]));
+			g2 = (float)sqrt(xs2 * xs2 + ys2 * ys2 + zs2 * zs2);
+
+			//正しい計算結果を採用する
+			if( g1 > g2 ){
+				xs = xs1;
+				ys = ys1;
+				zs = zs1;
+				g = g1;
 			}
+			else{
+				xs = xs2;
+				ys = ys2;
+				zs = zs2;
+				g = g2;
+			}
 
 			//法線（ベクトル）を正規化
 			data[i].material[j].vx = xs / g;

--- trunk/collision.cpp	(revision 92)
+++ trunk/collision.cpp	(revision 93)
@@ -956,7 +956,7 @@
 	}
 
 	//点（球体の中心）とレイの最短距離を求める
-	MinDist = DistancePosRay(s_x, s_y, s_z, RayPos_x, RayPos_y, RayPos_z, RayDir_x, RayDir_y, RayDir_z, maxDist);
+	MinDist = DistancePosRay(s_x, s_y, s_z, RayPos_x, RayPos_y, RayPos_z, RayDir_x, RayDir_y, RayDir_z);
 
 	if( MinDist <= s_r ){
 		RayDist = sqrt(d*d - MinDist*MinDist);		//（レイ始点から）点に最も近づく距離
@@ -1135,7 +1135,7 @@
 	d = sqrt(x*x + z*z);
 
 	//点（円柱の中心）とレイの最短距離を求める
-	cMinDist = DistancePosRay(c_x, 0.0f, c_z, RayPos_x, 0.0f, RayPos_z, RayDir_x, 0.0f, RayDir_z, maxDist);
+	cMinDist = DistancePosRay(c_x, 0.0f, c_z, RayPos_x, 0.0f, RayPos_z, RayDir_x, 0.0f, RayDir_z);
 
 	//最短距離が半径より離れている時点で当たらない
 	if( cMinDist > c_r ){
@@ -1231,28 +1231,37 @@
 //! @param RayDir_x レイのベクトルを指定する X成分
 //! @param RayDir_y レイのベクトルを指定する Y成分
 //! @param RayDir_z レイのベクトルを指定する Z成分
-//! @param maxDist 判定を行う最大距離
 //! @return 最短距離
 //! @warning RayPos（始点）と RayDir（ベクトル）を間違えないこと。
-float DistancePosRay(float Pos_x, float Pos_y, float Pos_z, float RayPos_x, float RayPos_y, float RayPos_z, float RayDir_x, float RayDir_y, float RayDir_z, float maxDist)
+//! @attention レイの方向は考慮されますが、レイの長さは考慮されません。
+float DistancePosRay(float Pos_x, float Pos_y, float Pos_z, float RayPos_x, float RayPos_y, float RayPos_z, float RayDir_x, float RayDir_y, float RayDir_z)
 {
 	float x1, y1, z1;
 	float x2, y2, z2;
 	float x3, y3, z3;
+	float Dot;
 
 	x1 = Pos_x - RayPos_x;
 	y1 = Pos_y - RayPos_y;
 	z1 = Pos_z - RayPos_z;
-	x2 = RayDir_x * maxDist;
-	y2 = RayDir_y * maxDist;
-	z2 = RayDir_z * maxDist;
+	x2 = RayDir_x;
+	y2 = RayDir_y;
+	z2 = RayDir_z;
 
+	//内積
+	Dot = x1 * x2 + y1 * y2 + z1 * z2;
+
+	//レイのベクトルが逆方向なら
+	if( Dot < 0.0f ){
+		return sqrt(x1*x1 + y1*y1 + z1*z1);
+	}
+
 	//外積
 	x3 = y1 * z2 - z1 * y2;
 	y3 = z1 * x2 - x1 * z2;
 	z3 = x1 * y2 - y1 * x2;
 
-	return sqrt(x3*x3 + y3*y3 + z3*z3) / maxDist;
+	return sqrt(x3*x3 + y3*y3 + z3*z3) / sqrt(RayDir_x*RayDir_x + RayDir_y*RayDir_y + RayDir_z*RayDir_z);
 }
 
 //! @brief 線分と線分の当たり判定（2D）