properly label third vanishing point control

stuffmatic · Jun 21, 2018 · a69b7e3 · a69b7e3
1 parent 49e78be
commit a69b7e3
Show file tree

Hide file tree

Showing 3 changed files with 89 additions and 21 deletions.
diff --git a/assets/master/lettersandnumbers.svg b/assets/master/lettersandnumbers.svg
diff --git a/src/gui/components/control-points-panel/glyph-paths.tsx b/src/gui/components/control-points-panel/glyph-paths.tsx
@@ -8,15 +8,15 @@ const glyphPaths = {
   figure1: [
     [
       [
-        -0.14017857500000003,
-        -0.2017857499999991
+        -0.1709821374999999,
+        -0.17589274999999988
       ],
       [
-        0.14017857500000003,
+        0.17098213750000008,
         -0.5
       ],
       [
-        0.14017857500000003,
+        0.17098213750000008,
         0.5
       ]
     ]
@@ -36,8 +36,8 @@ const glyphPaths = {
         -0.5
       ],
       [
-        0.1616765309894487,
-        -0.44311359142521106
+        0.1743789460156247,
+        -0.42194266260127244
       ],
       [
         0.25449087314016877,
@@ -61,6 +61,46 @@ const glyphPaths = {
       ]
     ]
   ],
+  figure3: [
+    [
+      [
+        -0.2996154278146203,
+        -0.5
+      ],
+      [
+        0.29947643427758486,
+        -0.5
+      ],
+      [
+        -0.0047942240463503425,
+        -0.1229716069431239
+      ],
+      [
+        0.23889560976979463,
+        -0.0032272708127613968
+      ],
+      [
+        0.3039342892843939,
+        0.23476335999326287
+      ],
+      [
+        0.19365929735725046,
+        0.4326920286972525
+      ],
+      [
+        -0.010173320728757339,
+        0.5
+      ],
+      [
+        -0.19275115944945523,
+        0.423699334047801
+      ],
+      [
+        -0.3039342892843946,
+        0.2220440473794813
+      ]
+    ]
+  ],
   x: [
     [
       [
@@ -150,8 +190,8 @@ function glyph(glyphPath: number[][][], position: Point2D, height: number, color
 
   return (
     <Group>
-      {scaled.map((path) => {
-        return (<Line points={path} strokeWidth={1} stroke={color} />)
+      {scaled.map((path, i) => {
+        return (<Line key={i} points={path} strokeWidth={1} stroke={color} />)
       })}
     </Group>
   )
@@ -177,6 +217,19 @@ export function axisGlyph(axis: Axis, position: Point2D, height: number) {
 }
 
 export function numberGlyph(num: number, color: string, position: Point2D, height: number) {
-  let glyphPath = num == 1 ? glyphPaths.figure1 : glyphPaths.figure2
+  let glyphPath: number[][][] = []
+  switch (num) {
+    case 1:
+      glyphPath = glyphPaths.figure1
+      break
+    case 2:
+      glyphPath = glyphPaths.figure2
+      break
+    case 3:
+      glyphPath = glyphPaths.figure3
+      break
+    default:
+      break
+  }
   return glyph(glyphPath, position, height, color)
 }
diff --git a/tools/letters_and_numbers_paths.py b/tools/letters_and_numbers_paths.py
@@ -3,7 +3,7 @@
 
 dom = parse('assets/master/lettersandnumbers.svg')
 groups = dom.getElementsByTagName('g')
-group_ids = ['gx', 'gy', 'gz', 'g1', 'g2']
+group_ids = ['gx', 'gy', 'gz', 'g1', 'g2', 'g3']
 coord_lists_by_id = {}
 for group in groups:
     id = group.attributes['id'].value
@@ -16,9 +16,9 @@
         coord_lists = []
         paths = group.getElementsByTagName('path')
         for path in paths:
-            print '  processing subpath'
             coords = []
             d = path.attributes['d'].value
+            print '  processing subpath', d
             parts = d.split(' ')
             for part in parts:
                 if len(part.split(',')) == 2: