chiark
/
gitweb
/
~ijackson
/
trains.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
00c0377
)
better layers
author
ian
<ian>
Sat, 7 Oct 2006 00:55:27 +0000
(
00:55
+0000)
committer
ian
<ian>
Sat, 7 Oct 2006 00:55:27 +0000
(
00:55
+0000)
layout/Makefile
patch
|
blob
|
history
layout/ours.m4
patch
|
blob
|
history
diff --git
a/layout/Makefile
b/layout/Makefile
index 70e5d2e53c41351d7bbd34a48280b66d18792b50..c6bee9c2d1bfb5bcb980e9fa8958d28abb2078ec 100644
(file)
--- a/
layout/Makefile
+++ b/
layout/Makefile
@@
-11,7
+11,7
@@
XLAYOUTOPTS_LAYER= -e'=5AN' -E'*~=5rsm' -e'p~=5r' -e'*~=9C' -e'*=*l'
LAYOUTOPTS_SEGS= '-e*=*rm'
LAYOUTOPTS_SEGS= '-e*=*rm'
-LAYERS_LS= 0 10 20
+LAYERS_LS= 0
4
10 20
LAYERS_PS= $(addsuffix .ps, $(LAYERS_LS))
LAYERS_L= $(addprefix ours-l, $(LAYERS_PS))
LAYERS_E= $(addprefix ours-e, $(LAYERS_PS))
LAYERS_PS= $(addsuffix .ps, $(LAYERS_LS))
LAYERS_L= $(addprefix ours-l, $(LAYERS_PS))
LAYERS_E= $(addprefix ours-e, $(LAYERS_PS))
diff --git
a/layout/ours.m4
b/layout/ours.m4
index 993b2c3ef1c185af7b8deb7712f0f1c0805bb27b..43d2fdbbe67b8279f9e091cb962c7517f5116d0c 100644
(file)
--- a/
layout/ours.m4
+++ b/
layout/ours.m4
@@
-56,8
+56,7
@@
rel top_2lk top_3lk 0 -37
segment /
segment /
-layer 2
-#rel top_3lk top_45x_br 85 -37 -2.25
+layer 8
rel top_3lk top_45x_br 67 -39 -2.25
extend -top_45x_br -top_4le0 len 120 -1200
rel top_3lk top_45x_br 67 -39 -2.25
extend -top_45x_br -top_4le0 len 120 -1200
@@
-198,8
+197,10
@@
segment -X7 20 -X9
join rim_0t bot_0rm_c 315 arcline
segment /
join rim_0t bot_0rm_c 315 arcline
segment /
+layer 2
join rim_2t bot_2rk 352 arcline
join rim_2t bot_2rk 352 arcline
+layer 2
join rim_3t bot_3rj_c 315 arcline
#---------- station branch curve
join rim_3t bot_3rj_c 315 arcline
#---------- station branch curve
@@
-221,20
+222,24
@@
segment -X10 160 -X8
join -leb_0k top_0lm_c 315 arcsline
segment /
join -leb_0k top_0lm_c 315 arcsline
segment /
-layer
2
+layer
8
extend top_5le top_5re0 len 30.0 315
extend top_5re0 top_45x_bl len 95 -1200
part top_45x scis_pecof bl
#---------- top main-line/station junction
extend top_5le top_5re0 len 30.0 315
extend top_5re0 top_45x_bl len 95 -1200
part top_45x scis_pecof bl
#---------- top main-line/station junction
-layer 2
-
+layer 8
rel top_0rme1 -top_2j_c 0 -37
part top_2j pt_pecofguess_ll c
rel top_0rme1 -top_2j_c 0 -37
part top_2j pt_pecofguess_ll c
-#part top_2j pt_peco_y c
-join top_2lk -top_2j_b 600
+layer 4
+extend top_2lk top_2j21 len 300
+
+layer 8
+join top_2j21 -top_2j_b 600
+
+layer 8
extend top_45x_tr top_4j21 len 95 1200
join top_4j21 -top_2j_a 500 twoarcs
extend top_45x_tr top_4j21 len 95 1200
join top_4j21 -top_2j_a 500 twoarcs
@@
-242,18
+247,25
@@
rel -top_0rm_a top_5j3b 0 -148
extend top_45x_tl top_5j3a len 95 -1200
join top_5j3a top_5j3b 315 twoarcs
extend top_45x_tl top_5j3a len 95 -1200
join top_5j3a top_5j3b 315 twoarcs
+layer 0
extend top_3lk top_3u1 len 335
rel -top_0rm_a top_3u2 -0 -105
join top_3u1 top_3u2 500 cross twoarcs !arcsline
extend top_3lk top_3u1 len 335
rel -top_0rm_a top_3u2 -0 -105
join top_3u1 top_3u2 500 cross twoarcs !arcsline
+layer 4
extend -rim_3t -rim_3tt ang 1 -389
extend -rim_3t -rim_3tt ang 1 -389
-
part top_3j pt_peco_cl c -rim_3tt
part top_3j pt_peco_cl c -rim_3tt
+
+layer 2
join top_3u2 -top_3j_b 315 arcline
join top_3u2 -top_3j_b 315 arcline
+layer 6
extend top_3j_a top_5j3c ang 45 -315
extend top_3j_a top_5j3c ang 45 -315
+
+layer 8
join top_5j3b -top_5j3c 315 arcline
join top_5j3b -top_5j3c 315 arcline
+layer 6
join -top_2j_c rim_2t 352
#---------- station
join -top_2j_c rim_2t 352
#---------- station
@@
-381,11
+393,13
@@
extend sta_3sc_b -sc_3 len 20 -450
extend -sc_3 -sc_5 len 50 230
join sc_6 sc_5 230
extend -sc_3 -sc_5 len 50 230
join sc_6 sc_5 230
-layer 1
2
+layer 1
3
extend sta_0y1_b high_6s0 ang 65 -230
extend sta_0y1_b high_6s0 ang 65 -230
+
+layer 16
extend high_6s0 high_6s1 uptoang 15 230
extend high_6s0 high_6s1 uptoang 15 230
-layer 1
5
+layer 1
8
extend high_6s1 high_6s2 len 100
layer 20
extend high_6s1 high_6s2 len 100
layer 20