@@ -4142,20 +4142,13 @@ private static boolean linearPathIntersectsMultiPoint_(
41424142 SegmentIteratorImpl segIterA = ((MultiPathImpl ) multipathA ._getImpl ())
41434143 .querySegmentIterator ();
41444144
4145- boolean bContained = true ;
4146- boolean bInteriorHitFound = false ;
4147-
41484145 Envelope2D env_a = new Envelope2D ();
41494146 Envelope2D env_b = new Envelope2D ();
41504147 Envelope2D envInter = new Envelope2D ();
41514148 multipathA .queryEnvelope2D (env_a );
41524149 multipoint_b .queryEnvelope2D (env_b );
41534150 env_a .inflate (tolerance , tolerance );
41544151
4155- if (!env_a .contains (env_b )) {
4156- bContained = false ;
4157- }
4158-
41594152 env_b .inflate (tolerance , tolerance );
41604153 envInter .setCoords (env_a );
41614154 envInter .intersect (env_b );
@@ -4169,6 +4162,7 @@ private static boolean linearPathIntersectsMultiPoint_(
41694162
41704163 if (accel != null ) {
41714164 quadTreeA = accel .getQuadTree ();
4165+ quadTreePathsA = accel .getQuadTreeForPaths ();
41724166 if (quadTreeA == null ) {
41734167 qtA = InternalUtils .buildQuadTree (
41744168 (MultiPathImpl ) multipathA ._getImpl (), envInter );
@@ -4187,7 +4181,6 @@ private static boolean linearPathIntersectsMultiPoint_(
41874181 qtIterPathsA = quadTreePathsA .getIterator ();
41884182
41894183 Point2D ptB = new Point2D (), closest = new Point2D ();
4190- boolean b_intersects = false ;
41914184 double toleranceSq = tolerance * tolerance ;
41924185
41934186 for (int i = 0 ; i < multipoint_b .getPointCount (); i ++) {
@@ -5153,9 +5146,9 @@ private static final class OverlapEvent {
51535146 double m_scalar_a_0 ;
51545147 double m_scalar_a_1 ;
51555148 int m_ivertex_b ;
5156- int m_ipath_b ;
5157- double m_scalar_b_0 ;
5158- double m_scalar_b_1 ;
5149+ // int m_ipath_b;
5150+ // double m_scalar_b_0;
5151+ // double m_scalar_b_1;
51595152
51605153 static OverlapEvent construct (int ivertex_a , int ipath_a ,
51615154 double scalar_a_0 , double scalar_a_1 , int ivertex_b ,
@@ -5166,9 +5159,9 @@ static OverlapEvent construct(int ivertex_a, int ipath_a,
51665159 overlapEvent .m_scalar_a_0 = scalar_a_0 ;
51675160 overlapEvent .m_scalar_a_1 = scalar_a_1 ;
51685161 overlapEvent .m_ivertex_b = ivertex_b ;
5169- overlapEvent .m_ipath_b = ipath_b ;
5170- overlapEvent .m_scalar_b_0 = scalar_b_0 ;
5171- overlapEvent .m_scalar_b_1 = scalar_b_1 ;
5162+ // overlapEvent.m_ipath_b = ipath_b;
5163+ // overlapEvent.m_scalar_b_0 = scalar_b_0;
5164+ // overlapEvent.m_scalar_b_1 = scalar_b_1;
51725165 return overlapEvent ;
51735166 }
51745167 }
0 commit comments