@@ -100,25 +100,27 @@ TEST(ViewshedInternal, shrinkbox)
100100 EXPECT_EQ (extent, expected);
101101 };
102102
103- testExtent (3 * M_PI / 4 , M_PI / 4 , {-2 , 2 , -2 , 0 });
103+ // Angles are standard (0 right going counter-clockwise
104+ // We go clockwise from start to stop.
105+ testExtent (3 * M_PI / 4 , M_PI / 4 , {-2 , 3 , -2 , 1 });
104106 testExtent (M_PI / 4 , 3 * M_PI / 4 , {-3 , 3 , -2 , 2 });
105107 testExtent (0.321750554 , 2 * M_PI - 0.321750554 ,
106- {0 , 3 , -1 , 1 }); // <2, 1>, <2, -1>
108+ {0 , 3 , -1 , 2 }); // <2, 1>, <2, -1>
107109 testExtent (2 * M_PI - 0.321750554 , 0.321750554 ,
108110 {-3 , 3 , -2 , 2 }); // <2, -1>, <2, 1>
109- testExtent (7 * M_PI / 4 , 5 * M_PI / 4 , {-2 , 2 , 0 , 2 });
111+ testExtent (7 * M_PI / 4 , 5 * M_PI / 4 , {-2 , 3 , 0 , 2 });
110112 testExtent (5 * M_PI / 4 , 7 * M_PI / 4 , {-3 , 3 , -2 , 2 });
111113 testExtent (M_PI + 0.321750554 , M_PI - 0.321750554 ,
112- {-3 , 0 , -1 , 1 }); // <-2, -1>, <-2, 1>
114+ {-3 , 1 , -1 , 2 }); // <-2, -1>, <-2, 1>
113115 testExtent (M_PI - 0.321750554 , M_PI + 0.321750554 ,
114116 {-3 , 3 , -2 , 2 }); // <-2, 1>, <-2, -1>
115- testExtent (M_PI / 4 , 0.321750554 , {0 , 3 , -2 , 0 }); // <2, 2>, <2, 1>
117+ testExtent (M_PI / 4 , 0.321750554 , {0 , 3 , -2 , 1 }); // <2, 2>, <2, 1>
116118 testExtent (0.321750554 , M_PI / 4 , {-3 , 3 , -2 , 2 }); // <2, 1>, <2, 2>
117119 testExtent (M_PI / 4 , 7 * M_PI / 4 , {0 , 3 , -2 , 2 });
118120 testExtent (M_PI / 4 , M_PI + 0.321750554 ,
119121 {-3 , 3 , -2 , 2 }); // <2, 2>, <-2, -1>
120122 testExtent (M_PI + 0.321750554 , M_PI / 4 ,
121- {-3 , 2 , -2 , 1 }); // <-2, -1>, <2, 2>
123+ {-3 , 3 , -2 , 2 }); // <-2, -1>, <2, 2>
122124}
123125
124126} // namespace viewshed
0 commit comments