From: ian <ian>
Date: Mon, 26 Jan 2004 02:47:31 +0000 (+0000)
Subject: all peco n 80 points and crossings
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=8a122a5fac9422d7e9d7453aa9806ac385d10629;p=trains.git

all peco n 80 points and crossings
---

diff --git a/layout/parts.i4 b/layout/parts.i4
index fbca4f9..2a04533 100644
--- a/layout/parts.i4
+++ b/layout/parts.i4
@@ -1,24 +1,74 @@
-define(`def_ord_pt',`
- dnl OBJNAME-EXCLUDING-PT-L STRAIGHT-L CURVE-SHORTER CURVE-DIVERGE-Y
+define(`def_thing_l_r',`
+dnl OBJNAME-EXCLUDING-L
+ defobj $1r
+  abs c 200 200 0
+  objflip $1l c c =
+ enddefobj
+')
+
+define(`def_point_ord',`
+dnl OBJNAME-EXCLUDING-PT-L ANGLE STRAIGHT-L CURVE-LONGER CURVE-DIVERGE-Y
  defobj pt_$1l
   abs c 200 200 0
   extend c a len $3
-  rel a b $4 $5 $2
+  rel a b $4 -$5 $2
+  join c b 0
+ enddefobj
+ def_thing_l_r(`pt_$1')
+')
+
+define(`def_point_curve',`
+dnl OBJNAME-EXCLUDING-PT-L TIGHT-ANG TIGHT-RECT TIGHT-DIVERGE-Y SHALLOW...
+ defobj pt_$1l
+  abs c 200 200 0
+  rel c a $6 -$7 $5
+  rel c b $3 -$4 $2
+  join c a 0
   join c b 0
  enddefobj
- defobj pt_$1r
+ def_thing_l_r(`pt_$1')
+')
+
+define(`def_point_y',`
+dnl OBJNAME-EXCLUDING-PT HALF-ANG RECT HALF-DIVERGE-Y
+ defobj pt_$1
   abs c 200 200 0
-  objflip pt_$1l c c =
+  rel c l $3 -$4  $2
+  rel c r $3  $4 -$2
+  join c l 0
+  join c r 0
  enddefobj
 ')
 
-def_ord_pt(`peco_228',22.5, 87,  -0.5, -17)
-def_ord_pt(`peco_457',14,  126.5,-1.55,-13.21)
-def_ord_pt(`peco_914', 8,  160,  -0.4, -13.21)
+define(`def_crossing',`
+dnl OBJNAME-EXCLUDING-CROSS HALF-ANG HALF-LENGTH
+ defobj cross_$1
+  abs m 200 200 0
+  rel m ml 0 0 $2
+  rel m mr 0 0 -$2
+  extend ml tl len $3
+  extend mr tr len $3
+  extend mr bl len -$3
+  extend ml br len -$3
+ enddefobj
+')
+
+def_point_ord(`peco_s', 22.5, 87,  -0.5, 17)
+def_point_ord(`peco_m', 14,  126.5,-1.55,13.21)
+def_point_ord(`peco_l',  8,  160,  -0.4, 13.21)
  # catalogue says 123.7 for STRAIGHT-L ?!
 
-abs o 200 200 30
-obj pt_peco_914r o c =
+def_point_curve(`peco_c',  10, 154.4, 13.8,  3, 156.0, 0.8)
+ dnl 163.2-  } dist to markings on paper cribsheet from c
+ dnl 32.8-   }
+
+def_point_y(`peco_y', 4, 127, 8.4)
+
+def_crossing(`peco_s',  4,   93.75)
+def_crossing(`peco_l', 12.5, 46)
+
+abs o 300 200 30
+obj pt_peco_y o c =
 
 #extend c bx ang 22.5 -239.797
 #extend c b len 94.168 -239.797