Changeset 449:a99e5e724545

Timestamp:

09/07/13 13:08:59 (9 years ago)

Author:

Neil Muller <drnlmuller@…>

Branch:

default

Phase:

public

Rebase:

37616239396534316566353638373139323031336264633738353035613635343332666538313364

Message:

Better convex polygon protection

File:

• tools/area_editor.py (modified) (2 diffs)

tools/area_editor.py

@@ -380 +380 @@
                 try:
                     l = eval(text)
-                    args.append(' - - %s' % l[0])
-                    for coord in l[1:]:
-                        args.append('   - %s' % coord)
                 except Exception:
                     alert("Invalid polygon %s" % text)
@@ -388 +385 @@
                     return None
                 # Check for convexity
-                hull = pymunk.util.convex_hull(l)
-                if hull != l:
+                if not pymunk.util.is_convex(l):
                     alert("Invalid polygon %s - not convex" % text)
                     return None
+                if not pymunk.util.is_clockwise(l):
+                    l.reverse()
+                    if not pymunk.util.is_clockwise(l):
+                        alert("Invalid polygon %s - unable to make clockwise"
+                              % text)
+                        return None
+                args.append(' - - %s' % l[0])
+                for coord in l[1:]:
+                    args.append('   - %s' % coord)
             else:
                 args.append(' - ' + text)