質問編集履歴
1
文章を修正しました。
test
CHANGED
|
File without changes
|
test
CHANGED
|
@@ -16,6 +16,10 @@
|
|
|
16
16
|
|
|
17
17
|
/アップデート
|
|
18
18
|
|
|
19
|
+
|
|
20
|
+
|
|
21
|
+
//アップデート
|
|
22
|
+
|
|
19
23
|
void Game::Update()
|
|
20
24
|
|
|
21
25
|
{
|
|
@@ -26,19 +30,25 @@
|
|
|
26
30
|
|
|
27
31
|
glm::vec3 p2 = mMesh->at(1).getPosition();
|
|
28
32
|
|
|
33
|
+
|
|
34
|
+
|
|
29
35
|
float p1_r = 1; //半径
|
|
30
36
|
|
|
31
37
|
float p2_r = 1; //半径
|
|
32
38
|
|
|
33
39
|
|
|
34
40
|
|
|
35
|
-
float a = ((p2.x - p1.x)
|
|
41
|
+
float a = (sqrt(p2.x - p1.x)) + (sqrt(p2.y - p1.y)) + (sqrt(p2.z - p1.z));
|
|
36
42
|
|
|
43
|
+
float b = (sqrt(p1.x - p2.x)) + (sqrt(p1.y - p2.y)) + (sqrt(p1.z - p2.z));
|
|
44
|
+
|
|
45
|
+
|
|
46
|
+
|
|
37
|
-
if (a <= ((p1_r + p2_r)
|
|
47
|
+
if (a <= (sqrt(p1_r + p2_r)))
|
|
38
48
|
|
|
39
49
|
{
|
|
40
50
|
|
|
41
|
-
printf("
|
|
51
|
+
printf("当たり\n");
|
|
42
52
|
|
|
43
53
|
}
|
|
44
54
|
|
|
@@ -46,7 +56,7 @@
|
|
|
46
56
|
|
|
47
57
|
{
|
|
48
58
|
|
|
49
|
-
printf("
|
|
59
|
+
printf("no hit \n");
|
|
50
60
|
|
|
51
61
|
}
|
|
52
62
|
|