diff options
| -rw-r--r-- | 2d/_collisions/polygon_polygon.html | 14 | ||||
| -rw-r--r-- | 2d/_collisions/polygon_polygon/snippet2.cpp | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/2d/_collisions/polygon_polygon.html b/2d/_collisions/polygon_polygon.html index 69938ff..9826ba4 100644 --- a/2d/_collisions/polygon_polygon.html +++ b/2d/_collisions/polygon_polygon.html @@ -290,9 +290,9 @@ }; <span class="code_keyword">struct</span> Edge { - <span class="code_keyword">Vector2</span> normal; - <span class="code_keyword">Vector2</span> start; - <span class="code_keyword">Vector2</span> end; + <span class="code_keyword">Vector2</span> normal; + <span class="code_keyword">Vector2</span> start; + <span class="code_keyword">Vector2</span> end; }; <span class="code_keyword">struct</span> SATResult { @@ -390,13 +390,13 @@ IntersectionResult getIntersection(ConvexPolygon* first, ConvexPolygon* second) <span class="code_keyword">return</span> ir; } - ir.intersect = true; - ir.relativeVelocity = first->body.velocity - second->body.velocity; - ir.collisionNormal = sat.minOverlapEdge->normal; + ir.intersect = true; + ir.relativeVelocity = first->body.velocity - second->body.velocity; + ir.collisionNormal = sat.minOverlapEdge->normal; ir.firstPointOfApplication = sat.overlapPoint - first->body.position; ir.secondPointOfApplication = sat.overlapPoint - second->body.position;; - <span class="code_keyword">return</span> ir; + <span class="code_keyword">return</span> ir; } </code></pre> </p> </section> diff --git a/2d/_collisions/polygon_polygon/snippet2.cpp b/2d/_collisions/polygon_polygon/snippet2.cpp index 8cbdcbe..a279f65 100644 --- a/2d/_collisions/polygon_polygon/snippet2.cpp +++ b/2d/_collisions/polygon_polygon/snippet2.cpp @@ -7,9 +7,9 @@ struct IntersectionResult { }; struct Edge { - Vector2 normal; - Vector2 start; - Vector2 end; + Vector2 normal; + Vector2 start; + Vector2 end; }; struct SATResult { @@ -107,11 +107,11 @@ IntersectionResult getIntersection(ConvexPolygon* first, ConvexPolygon* second) return ir; } - ir.intersect = true; - ir.relativeVelocity = first->body.velocity - second->body.velocity; - ir.collisionNormal = sat.minOverlapEdge->normal; + ir.intersect = true; + ir.relativeVelocity = first->body.velocity - second->body.velocity; + ir.collisionNormal = sat.minOverlapEdge->normal; ir.firstPointOfApplication = sat.overlapPoint - first->body.position; ir.secondPointOfApplication = sat.overlapPoint - second->body.position;; - return ir; + return ir; } |