コミット: 341 - OpenXOPS (svn)

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

コミットメタ情報

• リビジョン: 341 (tree)
• 日時: 2022-12-10 19:48:02
• 作者: xops-mikan

ログメッセージ

人とマップの当たり判定処理を改善

変更サマリ

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

差分

--- trunk/object.cpp	(revision 340)
+++ trunk/object.cpp	(revision 341)
@@ -1511,6 +1511,8 @@
 
 	float pos_x2, pos_y2, pos_z2;
 	float dist_x, dist_y, dist_z;
+	float box_min_x, box_min_y, box_min_z, box_max_x, box_max_y, box_max_z;
+	bool CheckBlockID[MAX_BLOCKS];
 	float speed;
 	float Dist;
 	bool FallFlag;
@@ -1537,63 +1539,56 @@
 	dist_y = pos_y - pos_y2;
 	dist_z = pos_z - pos_z2;
 
+	int bs = inblockdata->GetTotaldatas();
+
+	//人のAABBを作成
+	box_min_x = pos_x - HUMAN_MAPCOLLISION_CHECK_MAXDIST - COLLISION_ADDSIZE;
+	box_min_y = pos_y - HUMAN_MAPCOLLISION_CHECK_MAXDIST - COLLISION_ADDSIZE;
+	box_min_z = pos_z - HUMAN_MAPCOLLISION_CHECK_MAXDIST - COLLISION_ADDSIZE;
+	box_max_x = pos_x + HUMAN_MAPCOLLISION_CHECK_MAXDIST + COLLISION_ADDSIZE;
+	box_max_y = (pos_y + HUMAN_HEIGHT) + HUMAN_MAPCOLLISION_CHECK_MAXDIST + COLLISION_ADDSIZE;
+	box_max_z = pos_z + HUMAN_MAPCOLLISION_CHECK_MAXDIST + COLLISION_ADDSIZE;
+
+	//AABB判定で対象ブロックを粗削りする
+	for(int i=0; i<bs; i++){
+		CheckBlockID[i] = CollD->CheckBlockAABB(i, box_min_x, box_min_y, box_min_z, box_max_x, box_max_y, box_max_z);
+	}
+
 	speed = sqrtf(dist_x*dist_x + dist_z*dist_z);
 	if( (speed != 0.0f)||(move_y != 0.0f) ){
 
-		float box_min_x, box_min_y, box_min_z, box_max_x, box_max_y, box_max_z;
-
 		//頭部で当たり判定
-		//　※AABB判定で粗削りする
-		box_min_x = pos_x - speed - COLLISION_ADDSIZE;
-		box_min_y = (pos_y + HUMAN_HEIGHT-0.22f) - speed - COLLISION_ADDSIZE;
-		box_min_z = pos_z - speed - COLLISION_ADDSIZE;
-		box_max_x = pos_x + speed + COLLISION_ADDSIZE;
-		box_max_y = (pos_y + HUMAN_HEIGHT-0.22f) + speed + COLLISION_ADDSIZE;
-		box_max_z = pos_z + speed + COLLISION_ADDSIZE;
-		if( CollD->CheckALLBlockAABB(box_min_x, box_min_y, box_min_z, box_max_x, box_max_y, box_max_z) == true ){
-			if( CollisionBlockScratch(CollD, inblockdata, &pos_x, &pos_y, &pos_z, pos_x2, pos_y2, pos_z2, pos_x, pos_y + HUMAN_HEIGHT-0.22f, pos_z, 0x01) == true ){
-				if( move_y > 0.0f ){ move_y = 0.0f; }
+		for(int i=0; i<bs; i++){
+			if( CheckBlockID[i] == true ){
+				if( CollisionBlockScratch(CollD, inblockdata, i, &pos_x, &pos_y, &pos_z, pos_x2, pos_y2, pos_z2, pos_x, pos_y + HUMAN_HEIGHT-0.22f, pos_z, 0x01) == true ){
+					if( move_y > 0.0f ){ move_y = 0.0f; }
+				}
 			}
 		}
 
 		//足元で当たり判定
-		//　※AABB判定で粗削りする
-		box_min_x = pos_x - speed - COLLISION_ADDSIZE;
-		box_min_y = pos_y - speed - COLLISION_ADDSIZE;
-		box_min_z = pos_z - speed - COLLISION_ADDSIZE;
-		box_max_x = pos_x + speed + COLLISION_ADDSIZE;
-		box_max_y = pos_y + speed + COLLISION_ADDSIZE;
-		box_max_z = pos_z + speed + COLLISION_ADDSIZE;
-		if( CollD->CheckALLBlockAABB(box_min_x, box_min_y, box_min_z, box_max_x, box_max_y, box_max_z) == true ){
-			CollisionBlockScratch(CollD, inblockdata, &pos_x, &pos_y, &pos_z, pos_x2, pos_y2, pos_z2, pos_x, pos_y, pos_z, 0x00);
+		for(int i=0; i<bs; i++){
+			if( CheckBlockID[i] == true ){
+				CollisionBlockScratch(CollD, inblockdata, i, &pos_x, &pos_y, &pos_z, pos_x2, pos_y2, pos_z2, pos_x, pos_y, pos_z, 0x00);
+			}
 		}
 
 		//腰くらいで当たり判定
-		//　※AABB判定で粗削りする
-		box_min_x = (pos_x - speed*HUMAN_MAPCOLLISION_R) - speed - COLLISION_ADDSIZE;
-		box_min_y = (pos_y + HUMAN_MAPCOLLISION_HEIGHT) - speed - COLLISION_ADDSIZE;
-		box_min_z = (pos_z - speed*HUMAN_MAPCOLLISION_R) - speed - COLLISION_ADDSIZE;
-		box_max_x = (pos_x + speed*HUMAN_MAPCOLLISION_R) + speed + COLLISION_ADDSIZE;
-		box_max_y = (pos_y + HUMAN_MAPCOLLISION_HEIGHT) + speed + COLLISION_ADDSIZE;
-		box_max_z = (pos_z + speed*HUMAN_MAPCOLLISION_R) + speed + COLLISION_ADDSIZE;
-		if( CollD->CheckALLBlockAABB(box_min_x, box_min_y, box_min_z, box_max_x, box_max_y, box_max_z) == true ){
-			CollisionBlockScratch(CollD, inblockdata, &pos_x, &pos_y, &pos_z, pos_x2, pos_y2, pos_z2, pos_x + dist_x*HUMAN_MAPCOLLISION_R, pos_y + HUMAN_MAPCOLLISION_HEIGHT, pos_z + dist_z*HUMAN_MAPCOLLISION_R, 0x02);
-			CollisionBlockScratch(CollD, inblockdata, &pos_x, &pos_y, &pos_z, pos_x2, pos_y2, pos_z2, pos_x + dist_z*HUMAN_MAPCOLLISION_R, pos_y + HUMAN_MAPCOLLISION_HEIGHT, pos_z + dist_x*HUMAN_MAPCOLLISION_R, 0x02);
-			CollisionBlockScratch(CollD, inblockdata, &pos_x, &pos_y, &pos_z, pos_x2, pos_y2, pos_z2, pos_x + dist_z*HUMAN_MAPCOLLISION_R*-1, pos_y + HUMAN_MAPCOLLISION_HEIGHT, pos_z + dist_x*HUMAN_MAPCOLLISION_R*-1, 0x02);
+		for(int i=0; i<bs; i++){
+			if( CheckBlockID[i] == true ){
+				CollisionBlockScratch(CollD, inblockdata, i, &pos_x, &pos_y, &pos_z, pos_x2, pos_y2, pos_z2, pos_x + dist_x*HUMAN_MAPCOLLISION_R, pos_y + HUMAN_MAPCOLLISION_HEIGHT, pos_z + dist_z*HUMAN_MAPCOLLISION_R, 0x02);
+				CollisionBlockScratch(CollD, inblockdata, i, &pos_x, &pos_y, &pos_z, pos_x2, pos_y2, pos_z2, pos_x + dist_z*HUMAN_MAPCOLLISION_R, pos_y + HUMAN_MAPCOLLISION_HEIGHT, pos_z + dist_x*HUMAN_MAPCOLLISION_R, 0x02);
+				CollisionBlockScratch(CollD, inblockdata, i, &pos_x, &pos_y, &pos_z, pos_x2, pos_y2, pos_z2, pos_x + dist_z*HUMAN_MAPCOLLISION_R*-1, pos_y + HUMAN_MAPCOLLISION_HEIGHT, pos_z + dist_x*HUMAN_MAPCOLLISION_R*-1, 0x02);
+			}
 		}
 
 		if( AddCollisionFlag == true ){
 			//腰付近の追加当たり判定
-			//　※AABB判定で粗削りする
-			box_min_x = pos_x - speed - COLLISION_ADDSIZE;
-			box_min_y = pos_y - speed - COLLISION_ADDSIZE;
-			box_min_z = pos_z - speed - COLLISION_ADDSIZE;
-			box_max_x = pos_x + speed + COLLISION_ADDSIZE;
-			box_max_y = (pos_y + HUMAN_HEIGHT) + speed + COLLISION_ADDSIZE;
-			box_max_z = pos_x + speed + COLLISION_ADDSIZE;
-			if( CollD->CheckALLBlockAABB(box_min_x, box_min_y, box_min_z, box_max_x, box_max_y, box_max_z) == true ){
-				CollisionBlockScratch(CollD, inblockdata, &pos_x, &pos_y, &pos_z, pos_x2, pos_y2, pos_z2, pos_x, pos_y + HUMAN_MAPCOLLISION_ADD_HEIGHT_A, pos_z, 0x02);
-				CollisionBlockScratch(CollD, inblockdata, &pos_x, &pos_y, &pos_z, pos_x2, pos_y2, pos_z2, pos_x, pos_y + HUMAN_MAPCOLLISION_ADD_HEIGHT_B, pos_z, 0x02);
+			for(int i=0; i<bs; i++){
+				if( CheckBlockID[i] == true ){
+					CollisionBlockScratch(CollD, inblockdata, i, &pos_x, &pos_y, &pos_z, pos_x2, pos_y2, pos_z2, pos_x, pos_y + HUMAN_MAPCOLLISION_ADD_HEIGHT_A, pos_z, 0x02);
+					CollisionBlockScratch(CollD, inblockdata, i, &pos_x, &pos_y, &pos_z, pos_x2, pos_y2, pos_z2, pos_x, pos_y + HUMAN_MAPCOLLISION_ADD_HEIGHT_B, pos_z, 0x02);
+				}
 			}
 		}
 
@@ -1600,60 +1595,60 @@
 		//斜面を登る
 		if( (fabsf(move_x) > 0.2f)||(fabsf(move_z) > 0.2f) ){
 			if( move_y_upper == 0 ){
-				if(
-					(CollD->CheckALLBlockInside(pos_x + dist_x*2.0f, pos_y, pos_z + dist_z*2.0f) == true)&&
-					(CollD->CheckALLBlockInside(pos_x + dist_x*2.0f, pos_y + HUMAN_MAPCOLLISION_CLIMBHEIGHT, pos_z + dist_z*2.0f) == false)
-				){
-					int id, face;
-					blockdata bdata;
-					bool flag = false;
+				for(int i=0; i<bs; i++){
+					if( CheckBlockID[i] == true ){
+						if(
+							(CollD->CheckBlockInside(i, pos_x + dist_x*2.0f, pos_y, pos_z + dist_z*2.0f, true, NULL) == true)&&
+							(CollD->CheckBlockInside(i, pos_x + dist_x*2.0f, pos_y + HUMAN_MAPCOLLISION_CLIMBHEIGHT, pos_z + dist_z*2.0f, true, NULL) == false)
+						){
+							int face;
+							blockdata bdata;
+							bool flag = false;
 
-					//足元の面の角度を取得
-					if( CollD->CheckALLBlockIntersectDummyRay(pos_x, pos_y, pos_z, 0.0f, -1.0f, 0.0f, NULL, NULL, &Dist, 1.2f) == true ){
-						CollD->CheckALLBlockIntersectRay(pos_x, pos_y + HUMAN_MAPCOLLISION_CLIMBADDY, pos_z, 0.0f, -1.0f, 0.0f, &id, &face, &Dist, 1.2f + HUMAN_MAPCOLLISION_CLIMBADDY);
+							//足元の面の角度を取得
+							//　※足元にブロックがあることは確定なので、DummyRayは必要ない・・・はず。
+							if( CollD->CheckBlockIntersectRay(i, pos_x, pos_y + HUMAN_MAPCOLLISION_CLIMBADDY, pos_z, 0.0f, -1.0f, 0.0f, &face, &Dist, 1.2f + HUMAN_MAPCOLLISION_CLIMBADDY) == true ){
 
-						inblockdata->Getdata(&bdata, id);
+								inblockdata->Getdata(&bdata, i);
 
-						//斜面に立っているならば、上昇無効
-						if( acosf(bdata.material[face].vy) > HUMAN_MAPCOLLISION_SLOPEANGLE ){
-							flag = true;
+								//斜面に立っているならば、上昇無効
+								if( acosf(bdata.material[face].vy) > HUMAN_MAPCOLLISION_SLOPEANGLE ){
+									flag = true;
+								}
+							}
+
+							if( flag == false ){
+								pos_y += HUMAN_MAPCOLLISION_CLIMBADDY;
+								move_y *= 0.2f;
+							}
 						}
 					}
-
-					if( flag == false ){
-						pos_y += HUMAN_MAPCOLLISION_CLIMBADDY;
-						move_y *= 0.2f;
-					}
 				}
 			}
 		}
 
 		//移動先がブロックへめり込んでいるなら移動を無効にする
-		//　※AABB判定で粗削りする
-		box_min_x = pos_x - 1.0f - COLLISION_ADDSIZE;
-		box_min_y = (pos_y + 2.0f) - 1.0f - COLLISION_ADDSIZE;
-		box_min_z = pos_z - 1.0f - COLLISION_ADDSIZE;
-		box_max_x = pos_x + 1.0f + COLLISION_ADDSIZE;
-		box_max_y = (pos_y + (HUMAN_HEIGHT-2.0f*2)) + 1.0f + COLLISION_ADDSIZE;
-		box_max_z = pos_z + 1.0f + COLLISION_ADDSIZE;
-		if( CollD->CheckALLBlockAABB(box_min_x, box_min_y, box_min_z, box_max_x, box_max_y, box_max_z) == true ){
-			if(
-				(CollD->CheckALLBlockInside(pos_x, pos_y + 2.0f, pos_z) == true)||
-				(CollD->CheckALLBlockIntersectRay(pos_x, pos_y + 2.0f, pos_z, 0.0f, 1.0f, 0.0f, NULL, NULL, &Dist, (HUMAN_HEIGHT-2.0f*2)) == true)
-			){
-				pos_x = pos_x2;
-				pos_z = pos_z2;
-			}
-
-			//移動先がブロックにめり込む＆移動先もめり込む　ならば、移動を無効にする
-			if( CollD->CheckALLBlockInside(pos_x, pos_y + HUMAN_HEIGHT-0.6f, pos_z) == true ){
-				//メモ：↓この判定怪しい。十分に遠い位置であれば良く、11倍である必要はない？
-				if( CollD->CheckALLBlockInside(pos_x + move_x*11.0f, pos_y + HUMAN_HEIGHT-0.6f, pos_z + move_z*11.0f) == true ){
+		for(int i=0; i<bs; i++){
+			if( CheckBlockID[i] == true ){
+				if(
+					(CollD->CheckBlockInside(i, pos_x, pos_y + 2.0f, pos_z, true, NULL) == true)||
+					(CollD->CheckBlockIntersectRay(i, pos_x, pos_y + 2.0f, pos_z, 0.0f, 1.0f, 0.0f, NULL, &Dist, (HUMAN_HEIGHT-2.0f*2)) == true)
+				){
 					pos_x = pos_x2;
-					pos_y = pos_y2;
 					pos_z = pos_z2;
-					if( move_y > 0.0f ){ move_y = 0.0f; }
 				}
+
+				//移動先がブロックにめり込む＆移動先もめり込む　ならば、移動を無効にする
+				if( CollD->CheckBlockInside(i, pos_x, pos_y + HUMAN_HEIGHT-0.6f, pos_z, true, NULL) == true ){
+					//メモ：↓この判定怪しい。十分に遠い位置であれば良く、11倍である必要はない？
+					//　※AABBの判定範囲越えて遠いので、全部ブロック調べ直す。
+					if( CollD->CheckALLBlockInside(pos_x + move_x*11.0f, pos_y + HUMAN_HEIGHT-0.6f, pos_z + move_z*11.0f) == true ){
+						pos_x = pos_x2;
+						pos_y = pos_y2;
+						pos_z = pos_z2;
+						if( move_y > 0.0f ){ move_y = 0.0f; }
+					}
+				}
 			}
 		}
 	}
@@ -1663,7 +1658,7 @@
 	//落下処理
 	move_y_flag = false;
 	FallFlag = false;
-	for(int i=0; i<3; i++){
+	for(int ycnt=0; ycnt<3; ycnt++){
 		int cnt = 0;
 		float ang = atan2f(move_z, move_x);
 		float x, y, z;
@@ -1679,31 +1674,63 @@
 			//4方向判定 No.1
 			x = pos_x + cosf(ang)*HUMAN_MAPCOLLISION_GROUND_R1;
 			z = pos_z + sinf(ang)*HUMAN_MAPCOLLISION_GROUND_R1;
-			if( CollD->CheckALLBlockInside(x, y, z) == true ){ cnt += 1; }
+			for(int i=0; i<bs; i++){
+				if( CheckBlockID[i] == true ){
+					if( CollD->CheckBlockInside(i, x, y, z, true, NULL) == true ){ cnt += 1; break; }
+				}
+			}
 			x = pos_x - cosf(ang)*HUMAN_MAPCOLLISION_GROUND_R1;
 			z = pos_z - sinf(ang)*HUMAN_MAPCOLLISION_GROUND_R1;
-			if( CollD->CheckALLBlockInside(x, y, z) == true ){ cnt += 1; }
+			for(int i=0; i<bs; i++){
+				if( CheckBlockID[i] == true ){
+					if( CollD->CheckBlockInside(i, x, y, z, true, NULL) == true ){ cnt += 1; break; }
+				}
+			}
 			x = pos_x + cosf(ang + (float)M_PI/2)*HUMAN_MAPCOLLISION_GROUND_R1;
 			z = pos_z + sinf(ang + (float)M_PI/2)*HUMAN_MAPCOLLISION_GROUND_R1;
-			if( CollD->CheckALLBlockInside(x, y, z) == true ){ cnt += 1; }
+			for(int i=0; i<bs; i++){
+				if( CheckBlockID[i] == true ){
+					if( CollD->CheckBlockInside(i, x, y, z, true, NULL) == true ){ cnt += 1; break; }
+				}
+			}
 			x = pos_x + cosf(ang - (float)M_PI/2)*HUMAN_MAPCOLLISION_GROUND_R1;
 			z = pos_z + sinf(ang - (float)M_PI/2)*HUMAN_MAPCOLLISION_GROUND_R1;
-			if( CollD->CheckALLBlockInside(x, y, z) == true ){ cnt += 1; }
+			for(int i=0; i<bs; i++){
+				if( CheckBlockID[i] == true ){
+					if( CollD->CheckBlockInside(i, x, y, z, true, NULL) == true ){ cnt += 1; break; }
+				}
+			}
 			if( cnt == 4 ){ FallFlag = true; break; }
 
 			//4方向判定 No.2
 			x = pos_x + cosf(ang)*HUMAN_MAPCOLLISION_GROUND_R2;
 			z = pos_z + sinf(ang)*HUMAN_MAPCOLLISION_GROUND_R2;
-			if( CollD->CheckALLBlockInside(x, y, z) == true ){ cnt += 1; }
+			for(int i=0; i<bs; i++){
+				if( CheckBlockID[i] == true ){
+					if( CollD->CheckBlockInside(i, x, y, z, true, NULL) == true ){ cnt += 1; break; }
+				}
+			}
 			x = pos_x - cosf(ang)*HUMAN_MAPCOLLISION_GROUND_R2;
 			z = pos_z - sinf(ang)*HUMAN_MAPCOLLISION_GROUND_R2;
-			if( CollD->CheckALLBlockInside(x, y, z) == true ){ cnt += 1; }
+			for(int i=0; i<bs; i++){
+				if( CheckBlockID[i] == true ){
+					if( CollD->CheckBlockInside(i, x, y, z, true, NULL) == true ){ cnt += 1; break; }
+				}
+			}
 			x = pos_x + cosf(ang + (float)M_PI/2)*HUMAN_MAPCOLLISION_GROUND_R2;
 			z = pos_z + sinf(ang + (float)M_PI/2)*HUMAN_MAPCOLLISION_GROUND_R2;
-			if( CollD->CheckALLBlockInside(x, y, z) == true ){ cnt += 1; }
+			for(int i=0; i<bs; i++){
+				if( CheckBlockID[i] == true ){
+					if( CollD->CheckBlockInside(i, x, y, z, true, NULL) == true ){ cnt += 1; break; }
+				}
+			}
 			x = pos_x + cosf(ang - (float)M_PI/2)*HUMAN_MAPCOLLISION_GROUND_R2;
 			z = pos_z + sinf(ang - (float)M_PI/2)*HUMAN_MAPCOLLISION_GROUND_R2;
-			if( CollD->CheckALLBlockInside(x, y, z) == true ){ cnt += 1; }
+			for(int i=0; i<bs; i++){
+				if( CheckBlockID[i] == true ){
+					if( CollD->CheckBlockInside(i, x, y, z, true, NULL) == true ){ cnt += 1; break; }
+				}
+			}
 			if( cnt == 4 ){ FallFlag = true; break; }
 		}
 		else{
@@ -1712,12 +1739,22 @@
 			//真下判定
 			x = pos_x;
 			z = pos_z;
-			if( CollD->CheckALLBlockInside(x, y, z) == true ){ FallFlag = true; break; }
+			for(int i=0; i<bs; i++){
+				if( CheckBlockID[i] == true ){
+					if( CollD->CheckBlockInside(i, x, y, z, true, NULL) == true ){ FallFlag = true; break; }
+				}
+			}
+			if( FallFlag == true ){ break; }
 
 			//外側へ少し外して判定
 			x = pos_x + cosf(ang)*HUMAN_MAPCOLLISION_GROUND_R3;
 			z = pos_z + sinf(ang)*HUMAN_MAPCOLLISION_GROUND_R3;
-			if( CollD->CheckALLBlockInside(x, y, z) == true ){ FallFlag = true; break; }
+			for(int i=0; i<bs; i++){
+				if( CheckBlockID[i] == true ){
+					if( CollD->CheckBlockInside(i, x, y, z, true, NULL) == true ){ FallFlag = true; break; }
+				}
+			}
+			if( FallFlag == true ){ break; }
 		}
 
 		//落下速度加算
@@ -1757,9 +1794,17 @@
 		}
 
 		//足元のブロックと面番号を取得
-		if( CollD->CheckALLBlockIntersectDummyRay(pos_x, pos_y + 2.5f, pos_z, 0.0f, -1.0f, 0.0f, NULL, NULL, &Dist, (2.5f + 1.0f)) == true ){
-			CollD->CheckALLBlockIntersectRay(pos_x, pos_y + 2.5f, pos_z, 0.0f, -1.0f, 0.0f, &id, &face, &Dist, (2.5f + 1.0f));
+		id = -1;
+		for(int i=0; i<bs; i++){
+			if( CheckBlockID[i] == true ){
+				if( CollD->CheckBlockIntersectRay(i, pos_x, pos_y + 2.5f, pos_z, 0.0f, -1.0f, 0.0f, &face, &Dist, (2.5f + 1.0f)) == true ){
+					id = i;
+					break;
+				}
+			}
+		}
 
+		if( id != -1 ){
 			//ブロックIDと面番号を返す
 			if( underblock_id != NULL ){ *underblock_id = id; }
 			if( underblock_face != NULL ){ *underblock_face = face; }
@@ -1773,11 +1818,16 @@
 					move_y = bdata.material[face].vy * -0.5f;
 					move_z = bdata.material[face].vz * 1.2f;
 
-					if( CollD->CheckALLBlockInside(pos_x + move_x*3.0f, pos_y + move_y*3.0f, pos_z + move_z*3.0f) == true ){
-						move_y = 0.0f;
-						if( CollD->CheckALLBlockInside(pos_x + move_x*3.0f, pos_y, pos_z + move_z*3.0f) == true ){
-							move_x = 0.0f;
-							move_z = 0.0f;
+					for(int i=0; i<bs; i++){
+						if( CheckBlockID[i] == true ){
+							if( CollD->CheckBlockInside(i, pos_x + move_x*3.0f, pos_y + move_y*3.0f, pos_z + move_z*3.0f, true, NULL) == true ){
+								move_y = 0.0f;
+								if( CollD->CheckBlockInside(i, pos_x + move_x*3.0f, pos_y, pos_z + move_z*3.0f, true, NULL) == true ){
+									move_x = 0.0f;
+									move_z = 0.0f;
+									break;
+								}
+							}
 						}
 					}
 
@@ -1820,6 +1870,7 @@
 //! @brief ブロックと衝突時のベクトル計算
 //! @param CollD Collisionクラスのポインタ
 //! @param inblockdata BlockDataInterfaceクラスのポインタ
+//! @param blockid ブロックID
 //! @param px X座標
 //! @param py Y座標
 //! @param pz Z座標
@@ -1831,16 +1882,17 @@
 //! @param in_vz 判定するZ座標
 //! @param mode 座標補正モード（0x00：通常、0x01：Y座標上昇禁止、0x02：Y座標固定）
 //! @return 成功：true　失敗：false
-bool human::CollisionBlockScratch(class Collision *CollD, class BlockDataInterface *inblockdata, float *px, float *py, float *pz, float px_old, float py_old, float pz_old, float in_vx, float in_vy, float in_vz, int mode)
+bool human::CollisionBlockScratch(class Collision *CollD, class BlockDataInterface *inblockdata, int blockid, float *px, float *py, float *pz, float px_old, float py_old, float pz_old, float in_vx, float in_vy, float in_vz, int mode)
 {
 	if( CollD == NULL ){ return false; }
 	if( inblockdata == NULL ){ return false; }
+	if( (blockid < 0)||(inblockdata->GetTotaldatas() <= blockid) ){ return false; }
 	//if( (*px == px_old)&&(*py == py_old)&&(*pz == pz_old) ){ return false; }
 
 	float px2, py2, pz2;
 	float vx, vy, vz;
 	float dist;
-	int id, face;
+	int face;
 	float face_vx, face_vy, face_vz, face_angle, face_angle_per;
 	float temp;
 
@@ -1854,22 +1906,17 @@
 	vz = *pz - pz_old;
 	dist = VectorNormalization(&vx, &vy, &vz);
 
-	//追突したブロック面取得
+	//AABBを作る
 	float rmin_x, rmin_y, rmin_z, rmax_x, rmax_y, rmax_z;
-	id = -1;
 	GetAABBRay(in_vx - vx, in_vy - vy, in_vz - vz, vx, vy, vz, dist, &rmin_x, &rmin_y, &rmin_z, &rmax_x, &rmax_y, &rmax_z);
-	for(int i=0; i<inblockdata->GetTotaldatas(); i++){
-		if( CollD->CheckBlockAABB(i, rmin_x, rmin_y, rmin_z, rmax_x, rmax_y, rmax_z) == true ){
-			if( CollD->CheckBlockIntersectRay(i, in_vx - vx, in_vy - vy, in_vz - vz, vx, vy, vz, &face, &temp, dist) == true ){
-				id = i;
-				break;
-			}
-		}
-	}
-	if( id == -1 ){ return false; }
 
+	//追突したブロック面取得
+	face = -1;
+	if( CollD->CheckBlockAABB(blockid, rmin_x, rmin_y, rmin_z, rmax_x, rmax_y, rmax_z) == false ){ return false; } 
+	if( CollD->CheckBlockIntersectRay(blockid, in_vx - vx, in_vy - vy, in_vz - vz, vx, vy, vz, &face, &temp, dist) == false ){ return false; }
+
 	//ブロックに沿って移動するベクトルと進入角度を求める
-	if( CollD->ScratchAngleVector(id, face, vx, vy, vz, &vx, &vy, &vz, &face_angle) == false ){ return false; }
+	if( CollD->ScratchAngleVector(blockid, face, vx, vy, vz, &vx, &vy, &vz, &face_angle) == false ){ return false; }
 
 	//角度の割合算出
 	if( face_angle != 0.0f ){ face_angle_per = 1.0f - face_angle / ((float)M_PI); }
@@ -1877,7 +1924,7 @@
 
 	//ブロック面の法線ベクトル取得
 	blockdata bdata;
-	inblockdata->Getdata(&bdata, id);
+	inblockdata->Getdata(&bdata, blockid);
 	face_vx = bdata.material[face].vx;
 	face_vy = bdata.material[face].vy;
 	face_vz = bdata.material[face].vz;
@@ -1889,7 +1936,8 @@
 	*pz = vz*temp + pz_old;
 
 	//最終的な位置がブロックの内側ならば、移動無効
-	if( CollD->CheckALLBlockInside(*px, *py, *pz) == true ){
+	//if( CollD->CheckALLBlockInside(*px, *py, *pz) == true ){
+	if( CollD->CheckBlockInside(blockid, *px, *py, *pz, true, NULL) == true ){
 		*px = px2;
 		*py = py2;
 		*pz = pz2;

--- trunk/object.h	(revision 340)
+++ trunk/object.h	(revision 341)
@@ -179,7 +179,7 @@
 	int CheckAndProcessDead(class Collision *CollD);
 	void ControlProcess();
 	void CollisionMap(class Collision *CollD, class BlockDataInterface *inblockdata, bool AddCollisionFlag, bool player, int *underblock_id, int *underblock_face);
-	bool CollisionBlockScratch(class Collision *CollD, class BlockDataInterface *inblockdata, float *px, float *py, float *pz, float px_old, float py_old, float pz_old, float in_vx, float in_vy, float in_vz, int mode);
+	bool CollisionBlockScratch(class Collision *CollD, class BlockDataInterface *inblockdata, int blockid, float *px, float *py, float *pz, float px_old, float py_old, float pz_old, float in_vx, float in_vy, float in_vz, int mode);
 
 public:
 	human(class ParameterInfo *in_Param = NULL, float x = 0.0f, float y = 0.0f, float z = 0.0f, float rx = 0.0f, int id_param = -1, int dataid = 0, signed short int p4 = 0, int team = 0, bool flag = false);