Skip to content

Commit

Permalink
update to 2024-06
Browse files Browse the repository at this point in the history
  • Loading branch information
schiele committed Aug 3, 2024
1 parent e14b4e1 commit b7c6044
Show file tree
Hide file tree
Showing 375 changed files with 144,343 additions and 11,153 deletions.
8 changes: 6 additions & 2 deletions colors.scad
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ function ldraw_color_LDConfig(id) = (
(id==184) ? ["#D60026FF","#333333"] : (
(id==185) ? ["#0059A3FF","#333333"] : (
(id==186) ? ["#008E3CFF","#333333"] : (
(id==187) ? ["#57392CFF","#333333"] : (
(id==189) ? ["#AC8247FF","#333333"] : (
(id==200) ? ["#708224FF","#333333"] : (
(id==297) ? ["#AA7F2EFF","#333333"] : (
Expand Down Expand Up @@ -212,7 +213,8 @@ function ldraw_color_LDConfig(id) = (
(id==494) ? ["#D0D0D0FF","#333333"] : (
(id==495) ? ["#AE7A59FF","#333333"] : (
(id==10047) ? ["#FFFFFF10","#FFFFFF"] : (
(id>=2*16^6) ? [chr(35, [for (i=[5:-1:0])let(n=floor(id/16^i)%16) n+(n<10?48:55)]),chr(35, [for (i=[5:-1:0])let(n=15-floor(id/16^i)%16) n+(n<10?48:55)])] :"UNKNOWN")))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))));
(id==10000) ? ["#EBDFD1FF","#333333"] : (
(id>=2*16^6) ? [chr(35, [for (i=[5:-1:0])let(n=floor(id/16^i)%16) n+(n<10?48:55)]),chr(35, [for (i=[5:-1:0])let(n=15-floor(id/16^i)%16) n+(n<10?48:55)])] :"UNKNOWN")))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))));
function ldraw_color_LDCfgalt(id) = (
(id==0) ? ["#1B2A34FF","#2B4354"] : (
(id==1) ? ["#1E5AA8FF","#16437D"] : (
Expand Down Expand Up @@ -354,6 +356,7 @@ function ldraw_color_LDCfgalt(id) = (
(id==184) ? ["#D60026FF","#A3001D"] : (
(id==185) ? ["#0059A3FF","#003D70"] : (
(id==186) ? ["#008E3CFF","#005B26"] : (
(id==187) ? ["#57392CFF","#36231B"] : (
(id==189) ? ["#AC8247FF","#896738"] : (
(id==200) ? ["#708224FF","#4F5C19"] : (
(id==297) ? ["#AA7F2EFF","#805F23"] : (
Expand Down Expand Up @@ -426,4 +429,5 @@ function ldraw_color_LDCfgalt(id) = (
(id==494) ? ["#D0D0D0FF","#EAEAEA"] : (
(id==495) ? ["#AE7A59FF","#BF967D"] : (
(id==10047) ? ["#FFFFFF10","#FFFFFF"] : (
(id>=2*16^6) ? [chr(35, [for (i=[5:-1:0])let(n=floor(id/16^i)%16) n+(n<10?48:55)]),chr(35, [for (i=[5:-1:0])let(n=15-floor(id/16^i)%16) n+(n<10?48:55)])] :"UNKNOWN")))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))));
(id==10000) ? ["#EBDFD1FF","#DBC5AD"] : (
(id>=2*16^6) ? [chr(35, [for (i=[5:-1:0])let(n=floor(id/16^i)%16) n+(n<10?48:55)]),chr(35, [for (i=[5:-1:0])let(n=15-floor(id/16^i)%16) n+(n<10?48:55)])] :"UNKNOWN")))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))));
49 changes: 49 additions & 0 deletions p/2-4stud4f1w.scad
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
use <../lib.scad>
use <2-4cylo.scad>
use <3-16cyli.scad>
use <3-16edge.scad>
use <3-16ring3.scad>
use <st4jfil4.scad>
function ldraw_lib__2_4stud4f1w() = [
// 0 Half Stud Tube Open with 1 Fillet Wide
// 0 Name: 2-4stud4f1w.dat
// 0 Author: Bertrand Lequy [Berth]
// 0 !LDRAW_ORG Primitive UPDATE 2024-06
// 0 !LICENSE Licensed under CC BY 4.0 : see CAreadme.txt
//
// 0 BFC CERTIFY CCW
[0,"BFC","CERTIFY"],
[0,"BFC","CCW"],
//
// 0 !HISTORY 2024-03-23 [OrionP] Updated ring primitives
// 0 !HISTORY 2024-07-29 [OrionP] Official Update 2024-06
//
// 0 BFC INVERTNEXT
[0,"BFC","INVERTNEXT"],
// 1 16 0 -4 0 0 0 6 0 4 0 6 0 0 2-4cylo.dat
[1,16,0,-4,0,0,0,6,0,4,0,6,0,0, ldraw_lib__2_4cylo()],
//
// 1 16 0 -4 0 0 0 2 0 1 0 2 0 0 3-16ring3.dat
[1,16,0,-4,0,0,0,2,0,1,0,2,0,0, ldraw_lib__3_16ring3()],
// 1 16 0 -4 0 0 0 2 0 1 0 -2 0 0 3-16ring3.dat
[1,16,0,-4,0,0,0,2,0,1,0,-2,0,0, ldraw_lib__3_16ring3()],
// 1 16 0 -4 0 0 0 8 0 4 0 8 0 0 3-16cyli.dat
[1,16,0,-4,0,0,0,8,0,4,0,8,0,0, ldraw_lib__3_16cyli()],
// 1 16 0 -4 0 0 0 8 0 4 0 -8 0 0 3-16cyli.dat
[1,16,0,-4,0,0,0,8,0,4,0,-8,0,0, ldraw_lib__3_16cyli()],
//
// 1 16 0 -4 0 0 0 8 0 4 0 8 0 0 3-16edge.dat
[1,16,0,-4,0,0,0,8,0,4,0,8,0,0, ldraw_lib__3_16edge()],
// 1 16 0 -4 0 0 0 8 0 4 0 -8 0 0 3-16edge.dat
[1,16,0,-4,0,0,0,8,0,4,0,-8,0,0, ldraw_lib__3_16edge()],
// 1 16 0 0 0 0 0 8 0 4 0 8 0 0 3-16edge.dat
[1,16,0,0,0,0,0,8,0,4,0,8,0,0, ldraw_lib__3_16edge()],
// 1 16 0 0 0 0 0 8 0 4 0 -8 0 0 3-16edge.dat
[1,16,0,0,0,0,0,8,0,4,0,-8,0,0, ldraw_lib__3_16edge()],
//
// 1 16 0 0 0 1 0 0 0 1 0 0 0 1 st4jfil4.dat
[1,16,0,0,0,1,0,0,0,1,0,0,0,1, ldraw_lib__st4jfil4()],
];
module ldraw_lib__2_4stud4f1w(step=0, col=false, unit=2/5, alt=false, line=0.2, solid=!$preview)
makepoly(ldraw_lib__2_4stud4f1w(), step=step, col=col, unit=unit, alt=alt, line=line, solid=solid);
ldraw_lib__2_4stud4f1w(line=0.2);
46 changes: 46 additions & 0 deletions p/3-8con5.scad
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
use <../lib.scad>
function ldraw_lib__3_8con5() = [
// 0 Cone 5 x 0.375
// 0 Name: 3-8con5.dat
// 0 Author: Willy Tschager [Holly-Wood]
// 0 !LDRAW_ORG Primitive UPDATE 2024-06
// 0 !LICENSE Licensed under CC BY 4.0 : see CAreadme.txt
//
// 0 BFC CERTIFY CCW
[0,"BFC","CERTIFY"],
[0,"BFC","CCW"],
//
// 0 !HISTORY 2024-07-29 [OrionP] Official Update 2024-06
//
// 4 16 5 1 0 4.6195 1 1.9135 5.5434 0 2.2962 6 0 0
[4,16,5,1,0,4.6195,1,1.9135,5.5434,0,2.2962,6,0,0],
// 4 16 4.6195 1 1.9135 3.5355 1 3.5355 4.2426 0 4.2426 5.5434 0 2.2962
[4,16,4.6195,1,1.9135,3.5355,1,3.5355,4.2426,0,4.2426,5.5434,0,2.2962],
// 4 16 3.5355 1 3.5355 1.9135 1 4.6195 2.2962 0 5.5434 4.2426 0 4.2426
[4,16,3.5355,1,3.5355,1.9135,1,4.6195,2.2962,0,5.5434,4.2426,0,4.2426],
// 4 16 1.9135 1 4.6195 0 1 5 0 0 6 2.2962 0 5.5434
[4,16,1.9135,1,4.6195,0,1,5,0,0,6,2.2962,0,5.5434],
// 4 16 0 1 5 -1.9135 1 4.6195 -2.2962 0 5.5434 0 0 6
[4,16,0,1,5,-1.9135,1,4.6195,-2.2962,0,5.5434,0,0,6],
// 4 16 -1.9135 1 4.6195 -3.5355 1 3.5355 -4.2426 0 4.2426 -2.2962 0 5.5434
[4,16,-1.9135,1,4.6195,-3.5355,1,3.5355,-4.2426,0,4.2426,-2.2962,0,5.5434],
// 0 // conditional lines
// 5 24 5 1 0 6 0 0 5 1 -2.071 4.6195 1 1.9135
[5,24,5,1,0,6,0,0,5,1,-2.071,4.6195,1,1.9135],
// 5 24 4.6195 1 1.9135 5.5434 0 2.2962 5 1 0 3.5355 1 3.5355
[5,24,4.6195,1,1.9135,5.5434,0,2.2962,5,1,0,3.5355,1,3.5355],
// 5 24 3.5355 1 3.5355 4.2426 0 4.2426 4.6195 1 1.9135 1.9135 1 4.6195
[5,24,3.5355,1,3.5355,4.2426,0,4.2426,4.6195,1,1.9135,1.9135,1,4.6195],
// 5 24 1.9135 1 4.6195 2.2962 0 5.5434 3.5355 1 3.5355 0 1 5
[5,24,1.9135,1,4.6195,2.2962,0,5.5434,3.5355,1,3.5355,0,1,5],
// 5 24 0 1 5 0 0 6 1.9135 1 4.6195 -1.9135 1 4.6195
[5,24,0,1,5,0,0,6,1.9135,1,4.6195,-1.9135,1,4.6195],
// 5 24 -1.9135 1 4.6195 -2.2962 0 5.5434 0 1 5 -3.5355 1 3.5355
[5,24,-1.9135,1,4.6195,-2.2962,0,5.5434,0,1,5,-3.5355,1,3.5355],
// 5 24 -3.5355 1 3.5355 -4.2426 0 4.2426 -1.9135 1 4.6195 -5 1 2.071
[5,24,-3.5355,1,3.5355,-4.2426,0,4.2426,-1.9135,1,4.6195,-5,1,2.071],
// 0 // Build by LDPartEditor (PrimGen 2.X)
];
module ldraw_lib__3_8con5(step=0, col=false, unit=2/5, alt=false, line=0.2, solid=!$preview)
makepoly(ldraw_lib__3_8con5(), step=step, col=col, unit=unit, alt=alt, line=line, solid=solid);
ldraw_lib__3_8con5(line=0.2);
140 changes: 71 additions & 69 deletions p/4-4con36.scad
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ use <../lib.scad>
function ldraw_lib__4_4con36() = [
// 0 Cone 36 x 1.0
// 0 Name: 4-4con36.dat
// 0 Author: John Riley [jriley]
// 0 !LDRAW_ORG Primitive UPDATE 2012-01
// 0 !LICENSE Licensed under CC BY 2.0 and CC BY 4.0 : see CAreadme.txt
// 0 Author: Willy Tschager [Holly-Wood]
// 0 !LDRAW_ORG Primitive UPDATE 2024-06
// 0 !LICENSE Licensed under CC BY 4.0 : see CAreadme.txt
//
// 0 BFC CERTIFY CCW
[0,"BFC","CERTIFY"],
Expand All @@ -13,73 +13,75 @@ function ldraw_lib__4_4con36() = [
// 0 !HISTORY 2009-05-02 [PTadmin] Official Update 2009-01
// 0 !HISTORY 2012-02-16 [Philo] Changed to CCW
// 0 !HISTORY 2012-03-30 [PTadmin] Official Update 2012-01
// 0 !HISTORY 2024-03-03 [Holly-Wood] Complete regeneration, original by jriley
// 0 !HISTORY 2024-07-29 [OrionP] Official Update 2024-06
//
//
// 4 16 33.2604 1 13.7772 34.1843 0 14.1599 37 0 0 36 1 0
[4,16,33.2604,1,13.7772,34.1843,0,14.1599,37,0,0,36,1,0],
// 4 16 25.4556 1 25.4556 26.1627 0 26.1627 34.1843 0 14.1599 33.2604 1 13.7772
[4,16,25.4556,1,25.4556,26.1627,0,26.1627,34.1843,0,14.1599,33.2604,1,13.7772],
// 4 16 13.7772 1 33.2604 14.1599 0 34.1843 26.1627 0 26.1627 25.4556 1 25.4556
[4,16,13.7772,1,33.2604,14.1599,0,34.1843,26.1627,0,26.1627,25.4556,1,25.4556],
// 4 16 0 1 36 0 0 37 14.1599 0 34.1843 13.7772 1 33.2604
[4,16,0,1,36,0,0,37,14.1599,0,34.1843,13.7772,1,33.2604],
// 4 16 -13.7772 1 33.2604 -14.1599 0 34.1843 0 0 37 0 1 36
[4,16,-13.7772,1,33.2604,-14.1599,0,34.1843,0,0,37,0,1,36],
// 4 16 -25.4556 1 25.4556 -26.1627 0 26.1627 -14.1599 0 34.1843 -13.7772 1 33.2604
[4,16,-25.4556,1,25.4556,-26.1627,0,26.1627,-14.1599,0,34.1843,-13.7772,1,33.2604],
// 4 16 -33.2604 1 13.7772 -34.1843 0 14.1599 -26.1627 0 26.1627 -25.4556 1 25.4556
[4,16,-33.2604,1,13.7772,-34.1843,0,14.1599,-26.1627,0,26.1627,-25.4556,1,25.4556],
// 4 16 -36 1 0 -37 0 0 -34.1843 0 14.1599 -33.2604 1 13.7772
[4,16,-36,1,0,-37,0,0,-34.1843,0,14.1599,-33.2604,1,13.7772],
// 4 16 -33.2604 1 -13.7772 -34.1843 0 -14.1599 -37 0 0 -36 1 0
[4,16,-33.2604,1,-13.7772,-34.1843,0,-14.1599,-37,0,0,-36,1,0],
// 4 16 -25.4556 1 -25.4556 -26.1627 0 -26.1627 -34.1843 0 -14.1599 -33.2604 1 -13.7772
[4,16,-25.4556,1,-25.4556,-26.1627,0,-26.1627,-34.1843,0,-14.1599,-33.2604,1,-13.7772],
// 4 16 -13.7772 1 -33.2604 -14.1599 0 -34.1843 -26.1627 0 -26.1627 -25.4556 1 -25.4556
[4,16,-13.7772,1,-33.2604,-14.1599,0,-34.1843,-26.1627,0,-26.1627,-25.4556,1,-25.4556],
// 4 16 0 1 -36 0 0 -37 -14.1599 0 -34.1843 -13.7772 1 -33.2604
[4,16,0,1,-36,0,0,-37,-14.1599,0,-34.1843,-13.7772,1,-33.2604],
// 4 16 13.7772 1 -33.2604 14.1599 0 -34.1843 0 0 -37 0 1 -36
[4,16,13.7772,1,-33.2604,14.1599,0,-34.1843,0,0,-37,0,1,-36],
// 4 16 25.4556 1 -25.4556 26.1627 0 -26.1627 14.1599 0 -34.1843 13.7772 1 -33.2604
[4,16,25.4556,1,-25.4556,26.1627,0,-26.1627,14.1599,0,-34.1843,13.7772,1,-33.2604],
// 4 16 33.2604 1 -13.7772 34.1843 0 -14.1599 26.1627 0 -26.1627 25.4556 1 -25.4556
[4,16,33.2604,1,-13.7772,34.1843,0,-14.1599,26.1627,0,-26.1627,25.4556,1,-25.4556],
// 4 16 36 1 0 37 0 0 34.1843 0 -14.1599 33.2604 1 -13.7772
[4,16,36,1,0,37,0,0,34.1843,0,-14.1599,33.2604,1,-13.7772],
//
// 5 24 36 1 0 37 0 0 33.2604 1 13.7772 33.2604 1 -13.7772
[5,24,36,1,0,37,0,0,33.2604,1,13.7772,33.2604,1,-13.7772],
// 5 24 33.2604 1 13.7772 34.1843 0 14.1599 25.4556 1 25.4556 36 1 0
[5,24,33.2604,1,13.7772,34.1843,0,14.1599,25.4556,1,25.4556,36,1,0],
// 5 24 25.4556 1 25.4556 26.1627 0 26.1627 13.7772 1 33.2604 33.2604 1 13.7772
[5,24,25.4556,1,25.4556,26.1627,0,26.1627,13.7772,1,33.2604,33.2604,1,13.7772],
// 5 24 13.7772 1 33.2604 14.1599 0 34.1843 0 1 36 25.4556 1 25.4556
[5,24,13.7772,1,33.2604,14.1599,0,34.1843,0,1,36,25.4556,1,25.4556],
// 5 24 0 1 36 0 0 37 -13.7772 1 33.2604 13.7772 1 33.2604
[5,24,0,1,36,0,0,37,-13.7772,1,33.2604,13.7772,1,33.2604],
// 5 24 -13.7772 1 33.2604 -14.1599 0 34.1843 -25.4556 1 25.4556 0 1 36
[5,24,-13.7772,1,33.2604,-14.1599,0,34.1843,-25.4556,1,25.4556,0,1,36],
// 5 24 -25.4556 1 25.4556 -26.1627 0 26.1627 -33.2604 1 13.7772 -13.7772 1 33.2604
[5,24,-25.4556,1,25.4556,-26.1627,0,26.1627,-33.2604,1,13.7772,-13.7772,1,33.2604],
// 5 24 -33.2604 1 13.7772 -34.1843 0 14.1599 -36 1 0 -25.4556 1 25.4556
[5,24,-33.2604,1,13.7772,-34.1843,0,14.1599,-36,1,0,-25.4556,1,25.4556],
// 5 24 -36 1 0 -37 0 0 -33.2604 1 -13.7772 -33.2604 1 13.7772
[5,24,-36,1,0,-37,0,0,-33.2604,1,-13.7772,-33.2604,1,13.7772],
// 5 24 -33.2604 1 -13.7772 -34.1843 0 -14.1599 -25.4556 1 -25.4556 -36 1 0
[5,24,-33.2604,1,-13.7772,-34.1843,0,-14.1599,-25.4556,1,-25.4556,-36,1,0],
// 5 24 -25.4556 1 -25.4556 -26.1627 0 -26.1627 -13.7772 1 -33.2604 -33.2604 1 -13.7772
[5,24,-25.4556,1,-25.4556,-26.1627,0,-26.1627,-13.7772,1,-33.2604,-33.2604,1,-13.7772],
// 5 24 -13.7772 1 -33.2604 -14.1599 0 -34.1843 0 1 -36 -25.4556 1 -25.4556
[5,24,-13.7772,1,-33.2604,-14.1599,0,-34.1843,0,1,-36,-25.4556,1,-25.4556],
// 5 24 0 1 -36 0 0 -37 13.7772 1 -33.2604 -13.7772 1 -33.2604
[5,24,0,1,-36,0,0,-37,13.7772,1,-33.2604,-13.7772,1,-33.2604],
// 5 24 13.7772 1 -33.2604 14.1599 0 -34.1843 25.4556 1 -25.4556 0 1 -36
[5,24,13.7772,1,-33.2604,14.1599,0,-34.1843,25.4556,1,-25.4556,0,1,-36],
// 5 24 25.4556 1 -25.4556 26.1627 0 -26.1627 33.2604 1 -13.7772 13.7772 1 -33.2604
[5,24,25.4556,1,-25.4556,26.1627,0,-26.1627,33.2604,1,-13.7772,13.7772,1,-33.2604],
// 5 24 33.2604 1 -13.7772 34.1843 0 -14.1599 36 1 0 25.4556 1 -25.4556
[5,24,33.2604,1,-13.7772,34.1843,0,-14.1599,36,1,0,25.4556,1,-25.4556],
// 4 16 36 1 0 33.2604 1 13.7772 34.1843 0 14.1599 37 0 0
[4,16,36,1,0,33.2604,1,13.7772,34.1843,0,14.1599,37,0,0],
// 4 16 33.2604 1 13.7772 25.4556 1 25.4556 26.1627 0 26.1627 34.1843 0 14.1599
[4,16,33.2604,1,13.7772,25.4556,1,25.4556,26.1627,0,26.1627,34.1843,0,14.1599],
// 4 16 25.4556 1 25.4556 13.7772 1 33.2604 14.1599 0 34.1843 26.1627 0 26.1627
[4,16,25.4556,1,25.4556,13.7772,1,33.2604,14.1599,0,34.1843,26.1627,0,26.1627],
// 4 16 13.7772 1 33.2604 0 1 36 0 0 37 14.1599 0 34.1843
[4,16,13.7772,1,33.2604,0,1,36,0,0,37,14.1599,0,34.1843],
// 4 16 0 1 36 -13.7772 1 33.2604 -14.1599 0 34.1843 0 0 37
[4,16,0,1,36,-13.7772,1,33.2604,-14.1599,0,34.1843,0,0,37],
// 4 16 -13.7772 1 33.2604 -25.4556 1 25.4556 -26.1627 0 26.1627 -14.1599 0 34.1843
[4,16,-13.7772,1,33.2604,-25.4556,1,25.4556,-26.1627,0,26.1627,-14.1599,0,34.1843],
// 4 16 -25.4556 1 25.4556 -33.2604 1 13.7772 -34.1843 0 14.1599 -26.1627 0 26.1627
[4,16,-25.4556,1,25.4556,-33.2604,1,13.7772,-34.1843,0,14.1599,-26.1627,0,26.1627],
// 4 16 -33.2604 1 13.7772 -36 1 0 -37 0 0 -34.1843 0 14.1599
[4,16,-33.2604,1,13.7772,-36,1,0,-37,0,0,-34.1843,0,14.1599],
// 4 16 -36 1 0 -33.2604 1 -13.7772 -34.1843 0 -14.1599 -37 0 0
[4,16,-36,1,0,-33.2604,1,-13.7772,-34.1843,0,-14.1599,-37,0,0],
// 4 16 -33.2604 1 -13.7772 -25.4556 1 -25.4556 -26.1627 0 -26.1627 -34.1843 0 -14.1599
[4,16,-33.2604,1,-13.7772,-25.4556,1,-25.4556,-26.1627,0,-26.1627,-34.1843,0,-14.1599],
// 4 16 -25.4556 1 -25.4556 -13.7772 1 -33.2604 -14.1599 0 -34.1843 -26.1627 0 -26.1627
[4,16,-25.4556,1,-25.4556,-13.7772,1,-33.2604,-14.1599,0,-34.1843,-26.1627,0,-26.1627],
// 4 16 -13.7772 1 -33.2604 0 1 -36 0 0 -37 -14.1599 0 -34.1843
[4,16,-13.7772,1,-33.2604,0,1,-36,0,0,-37,-14.1599,0,-34.1843],
// 4 16 0 1 -36 13.7772 1 -33.2604 14.1599 0 -34.1843 0 0 -37
[4,16,0,1,-36,13.7772,1,-33.2604,14.1599,0,-34.1843,0,0,-37],
// 4 16 13.7772 1 -33.2604 25.4556 1 -25.4556 26.1627 0 -26.1627 14.1599 0 -34.1843
[4,16,13.7772,1,-33.2604,25.4556,1,-25.4556,26.1627,0,-26.1627,14.1599,0,-34.1843],
// 4 16 25.4556 1 -25.4556 33.2604 1 -13.7772 34.1843 0 -14.1599 26.1627 0 -26.1627
[4,16,25.4556,1,-25.4556,33.2604,1,-13.7772,34.1843,0,-14.1599,26.1627,0,-26.1627],
// 4 16 33.2604 1 -13.7772 36 1 0 37 0 0 34.1843 0 -14.1599
[4,16,33.2604,1,-13.7772,36,1,0,37,0,0,34.1843,0,-14.1599],
// 0 // conditional lines
// 5 24 36 1 0 37 0 0 33.2604 1 -13.7772 33.2604 1 13.7772
[5,24,36,1,0,37,0,0,33.2604,1,-13.7772,33.2604,1,13.7772],
// 5 24 33.2604 1 13.7772 34.1843 0 14.1599 36 1 0 25.4556 1 25.4556
[5,24,33.2604,1,13.7772,34.1843,0,14.1599,36,1,0,25.4556,1,25.4556],
// 5 24 25.4556 1 25.4556 26.1627 0 26.1627 33.2604 1 13.7772 13.7772 1 33.2604
[5,24,25.4556,1,25.4556,26.1627,0,26.1627,33.2604,1,13.7772,13.7772,1,33.2604],
// 5 24 13.7772 1 33.2604 14.1599 0 34.1843 25.4556 1 25.4556 0 1 36
[5,24,13.7772,1,33.2604,14.1599,0,34.1843,25.4556,1,25.4556,0,1,36],
// 5 24 0 1 36 0 0 37 13.7772 1 33.2604 -13.7772 1 33.2604
[5,24,0,1,36,0,0,37,13.7772,1,33.2604,-13.7772,1,33.2604],
// 5 24 -13.7772 1 33.2604 -14.1599 0 34.1843 0 1 36 -25.4556 1 25.4556
[5,24,-13.7772,1,33.2604,-14.1599,0,34.1843,0,1,36,-25.4556,1,25.4556],
// 5 24 -25.4556 1 25.4556 -26.1627 0 26.1627 -13.7772 1 33.2604 -33.2604 1 13.7772
[5,24,-25.4556,1,25.4556,-26.1627,0,26.1627,-13.7772,1,33.2604,-33.2604,1,13.7772],
// 5 24 -33.2604 1 13.7772 -34.1843 0 14.1599 -25.4556 1 25.4556 -36 1 0
[5,24,-33.2604,1,13.7772,-34.1843,0,14.1599,-25.4556,1,25.4556,-36,1,0],
// 5 24 -36 1 0 -37 0 0 -33.2604 1 13.7772 -33.2604 1 -13.7772
[5,24,-36,1,0,-37,0,0,-33.2604,1,13.7772,-33.2604,1,-13.7772],
// 5 24 -33.2604 1 -13.7772 -34.1843 0 -14.1599 -36 1 0 -25.4556 1 -25.4556
[5,24,-33.2604,1,-13.7772,-34.1843,0,-14.1599,-36,1,0,-25.4556,1,-25.4556],
// 5 24 -25.4556 1 -25.4556 -26.1627 0 -26.1627 -33.2604 1 -13.7772 -13.7772 1 -33.2604
[5,24,-25.4556,1,-25.4556,-26.1627,0,-26.1627,-33.2604,1,-13.7772,-13.7772,1,-33.2604],
// 5 24 -13.7772 1 -33.2604 -14.1599 0 -34.1843 -25.4556 1 -25.4556 0 1 -36
[5,24,-13.7772,1,-33.2604,-14.1599,0,-34.1843,-25.4556,1,-25.4556,0,1,-36],
// 5 24 0 1 -36 0 0 -37 -13.7772 1 -33.2604 13.7772 1 -33.2604
[5,24,0,1,-36,0,0,-37,-13.7772,1,-33.2604,13.7772,1,-33.2604],
// 5 24 13.7772 1 -33.2604 14.1599 0 -34.1843 0 1 -36 25.4556 1 -25.4556
[5,24,13.7772,1,-33.2604,14.1599,0,-34.1843,0,1,-36,25.4556,1,-25.4556],
// 5 24 25.4556 1 -25.4556 26.1627 0 -26.1627 13.7772 1 -33.2604 33.2604 1 -13.7772
[5,24,25.4556,1,-25.4556,26.1627,0,-26.1627,13.7772,1,-33.2604,33.2604,1,-13.7772],
// 5 24 33.2604 1 -13.7772 34.1843 0 -14.1599 25.4556 1 -25.4556 36 1 0
[5,24,33.2604,1,-13.7772,34.1843,0,-14.1599,25.4556,1,-25.4556,36,1,0],
// 0 // Build by LDPartEditor (PrimGen 2.X)
];
module ldraw_lib__4_4con36(step=0, col=false, unit=2/5, alt=false, line=0.2, solid=!$preview)
makepoly(ldraw_lib__4_4con36(), step=step, col=col, unit=unit, alt=alt, line=line, solid=solid);
Expand Down
27 changes: 14 additions & 13 deletions p/48/1-16con19.scad
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ use <../../lib.scad>
function ldraw_lib__48__1_16con19() = [
// 0 Hi-Res Cone 19 x 0.0625
// 0 Name: 48\1-16con19.dat
// 0 Author: Joerg Sommerer [Brickaneer]
// 0 !LDRAW_ORG 48_Primitive UPDATE 2014-02
// 0 !LICENSE Licensed under CC BY 2.0 and CC BY 4.0 : see CAreadme.txt
// 0 Author: Willy Tschager [Holly-Wood]
// 0 !LDRAW_ORG 48_Primitive UPDATE 2024-06
// 0 !LICENSE Licensed under CC BY 4.0 : see CAreadme.txt
//
// 0 BFC CERTIFY CCW
[0,"BFC","CERTIFY"],
Expand All @@ -13,7 +13,8 @@ function ldraw_lib__48__1_16con19() = [
// 0 !HISTORY 2012-04-05 [MagFors] Recreated with tangential cond-lines
// 0 !HISTORY 2013-07-21 [PTadmin] Official Update 2013-01
// 0 !HISTORY 2014-12-23 [PTadmin] Official Update 2014-02
//
// 0 !HISTORY 2024-03-07 [Holly-Wood] Complete regeneration, original by Brickaneer
// 0 !HISTORY 2024-07-29 [OrionP] Official Update 2024-06
//
// 4 16 19 1 0 18.8366 1 2.4795 19.828 0 2.61 20 0 0
[4,16,19,1,0,18.8366,1,2.4795,19.828,0,2.61,20,0,0],
Expand All @@ -22,15 +23,15 @@ function ldraw_lib__48__1_16con19() = [
// 4 16 18.3521 1 4.9172 17.5541 1 7.2713 18.478 0 7.654 19.318 0 5.176
[4,16,18.3521,1,4.9172,17.5541,1,7.2713,18.478,0,7.654,19.318,0,5.176],
// 0 // conditional lines
// 5 24 19 1 0 20 0 0 19 1 -2.5014 18.8375 1 2.48
[5,24,19,1,0,20,0,0,19,1,-2.5014,18.8375,1,2.48],
// 5 24 18.8366 1 2.4795 19.828 0 2.61 19 1 0 18.3526 1 4.9176
[5,24,18.8366,1,2.4795,19.828,0,2.61,19,1,0,18.3526,1,4.9176],
// 5 24 18.3521 1 4.9172 19.318 0 5.176 18.8375 1 2.48 17.5537 1 7.271
[5,24,18.3521,1,4.9172,19.318,0,5.176,18.8375,1,2.48,17.5537,1,7.271],
// 5 24 17.5541 1 7.2713 18.478 0 7.654 18.3526 1 4.9176 16.5965 1 9.582
[5,24,17.5541,1,7.2713,18.478,0,7.654,18.3526,1,4.9176,16.5965,1,9.582],
// 0 // Build by Primitive Generator 2
// 5 24 19 1 0 20 0 0 19 1 -2.5023 18.8366 1 2.4795
[5,24,19,1,0,20,0,0,19,1,-2.5023,18.8366,1,2.4795],
// 5 24 18.8366 1 2.4795 19.828 0 2.61 19 1 0 18.3521 1 4.9172
[5,24,18.8366,1,2.4795,19.828,0,2.61,19,1,0,18.3521,1,4.9172],
// 5 24 18.3521 1 4.9172 19.318 0 5.176 18.8366 1 2.4795 17.5541 1 7.2713
[5,24,18.3521,1,4.9172,19.318,0,5.176,18.8366,1,2.4795,17.5541,1,7.2713],
// 5 24 17.5541 1 7.2713 18.478 0 7.654 18.3521 1 4.9172 16.5965 1 9.5817
[5,24,17.5541,1,7.2713,18.478,0,7.654,18.3521,1,4.9172,16.5965,1,9.5817],
// 0 // Build by LDPartEditor (PrimGen 2.X)
];
module ldraw_lib__48__1_16con19(step=0, col=false, unit=2/5, alt=false, line=0.2, solid=!$preview)
makepoly(ldraw_lib__48__1_16con19(), step=step, col=col, unit=unit, alt=alt, line=line, solid=solid);
Expand Down
Loading

0 comments on commit b7c6044

Please sign in to comment.