commit 3d0e670b1c6d24036007c6e4d3419468170eb6c3
parent a501ef438acfb88bf822ea12e1fdd586e8e1baaf
Author: Louis Burda <quent.burda@gmail.com>
Date: Thu, 8 Jul 2021 21:43:42 +0200
bump enochecker, remove old stls, replace solidname in file for havoc 15
Diffstat:
7 files changed, 162 insertions(+), 947 deletions(-)
diff --git a/checker/src/checker.py b/checker/src/checker.py
@@ -1014,19 +1014,22 @@ async def havoc_fluff_upload(di: DependencyInjector) -> None:
return
model = rand.choice(extra_models)
stlfile = open(model, "rb").read()
+ modelname = fakeid()
if model.endswith("-bin.stl"):
- modelname = fakeid(minlen=15, maxlen=15)
- stlfile = modelname + stlfile[15:] # replaces "OpenSCAD Model\n"
+ solidname = fakeid(minlen=15, maxlen=15)
+ stlfile = solidname + stlfile[15:] # replaces "OpenSCAD Model\n"
else:
- modelname = fakeid()
- stlfile = stlfile.replace(b"OpenSCAD_Model", modelname)
+ solidname = fakeid()
+ stlfile = stlfile.replace(b"OpenSCAD_Model", solidname)
# Simple Upload
session = await di.get(Session)
+ if randbool():
+ await do_auth(session, fakeid(), check=True, newuser=True);
modelid = await do_upload(session, modelname, stlfile, check=True)
assert modelid is not None
await check_in_search(
- session, modelname, [modelname, modelid, stlfile], download=True
+ session, modelname, [modelname, solidname, modelid, stlfile], download=True
)
diff --git a/checker/src/models/cubes.stl b/checker/src/models/cubes.stl
@@ -1,506 +0,0 @@
-solid OpenSCAD_Model
- facet normal -0 0 1
- outer loop
- vertex -11.4086 -2.98836 5
- vertex -1.66667 -5 5
- vertex -1.66667 4.10765 5
- endloop
- endfacet
- facet normal 0 0 1
- outer loop
- vertex -11.4086 -2.98836 5
- vertex -1.66667 4.10765 5
- vertex -7.98836 6.40856 5
- endloop
- endfacet
- facet normal 0 0 1
- outer loop
- vertex -1.66667 -5 5
- vertex -11.4086 -2.98836 5
- vertex -2.01164 -6.40856 5
- endloop
- endfacet
- facet normal 0 0 1
- outer loop
- vertex -1.49896 -5 5
- vertex -1.66667 -5 5
- vertex -2.01164 -6.40856 5
- endloop
- endfacet
- facet normal 0 0 -1
- outer loop
- vertex 0.372597 -5 5
- vertex -1.49896 -5 5
- vertex 0.0220356 -4.24822 5
- endloop
- endfacet
- facet normal -0 0 -1
- outer loop
- vertex 8.33333 -0.372597 5
- vertex 2.12147 -0.416752 5
- vertex 8.33333 0.126715 5
- endloop
- endfacet
- facet normal 0 0 -1
- outer loop
- vertex 2.12147 -0.416752 5
- vertex 1.40856 2.98836 5
- vertex 1.64757 5 5
- endloop
- endfacet
- facet normal 0 0 -1
- outer loop
- vertex 0.0220356 -4.24822 5
- vertex 2.12147 -0.416752 5
- vertex 8.33333 -0.372597 5
- endloop
- endfacet
- facet normal 0 0 -1
- outer loop
- vertex -1.49896 -5 5
- vertex 2.12147 -0.416752 5
- vertex 0.0220356 -4.24822 5
- endloop
- endfacet
- facet normal -0 0 -1
- outer loop
- vertex 2.12147 -0.416752 5
- vertex -1.49896 -5 5
- vertex 1.40856 2.98836 5
- endloop
- endfacet
- facet normal 0 0 -1
- outer loop
- vertex -1.66667 4.10765 5
- vertex 1.64757 5 5
- vertex 1.40856 2.98836 5
- endloop
- endfacet
- facet normal -0 0 -1
- outer loop
- vertex 1.64757 5 5
- vertex -1.66667 4.10765 5
- vertex -1.66667 5 5
- endloop
- endfacet
- facet normal -0 0 1
- outer loop
- vertex 1.24991 9.54519 5
- vertex 8.33333 5 5
- vertex 11.2119 10.4168 5
- endloop
- endfacet
- facet normal 0 0 1
- outer loop
- vertex 8.33333 5 5
- vertex 1.24991 9.54519 5
- vertex 1.64757 5 5
- endloop
- endfacet
- facet normal -0 0 1
- outer loop
- vertex 8.33333 5 5
- vertex 12.0834 0.454804 5
- vertex 11.2119 10.4168 5
- endloop
- endfacet
- facet normal 0 0 1
- outer loop
- vertex 12.0834 0.454804 5
- vertex 8.33333 5 5
- vertex 8.33333 0.126715 5
- endloop
- endfacet
- facet normal 0 0 1
- outer loop
- vertex 8.33333 -5 5
- vertex 9.08511 -0.0220356 5
- vertex 8.33333 -0.372597 5
- endloop
- endfacet
- facet normal 0 0 1
- outer loop
- vertex 9.08511 -0.0220356 5
- vertex 8.33333 -5 5
- vertex 13.3113 -9.08511 5
- endloop
- endfacet
- facet normal 0 0 1
- outer loop
- vertex 8.33333 -5 5
- vertex 4.24822 -13.3113 5
- vertex 13.3113 -9.08511 5
- endloop
- endfacet
- facet normal 0 -0 1
- outer loop
- vertex 4.24822 -13.3113 5
- vertex 8.33333 -5 5
- vertex 0.372597 -5 5
- endloop
- endfacet
- facet normal -0.342019 -0.939693 0
- outer loop
- vertex -11.4086 -2.98836 -5
- vertex -2.01164 -6.40856 5
- vertex -11.4086 -2.98836 5
- endloop
- endfacet
- facet normal -0.342019 -0.939693 -0
- outer loop
- vertex -2.01164 -6.40856 5
- vertex -11.4086 -2.98836 -5
- vertex -2.01164 -6.40856 -5
- endloop
- endfacet
- facet normal -0.939691 0.342024 0
- outer loop
- vertex -11.4086 -2.98836 -5
- vertex -7.98836 6.40856 5
- vertex -7.98836 6.40856 -5
- endloop
- endfacet
- facet normal -0.939691 0.342024 0
- outer loop
- vertex -7.98836 6.40856 5
- vertex -11.4086 -2.98836 -5
- vertex -11.4086 -2.98836 5
- endloop
- endfacet
- facet normal 0 0 -1
- outer loop
- vertex -2.01164 -6.40856 -5
- vertex -7.98836 6.40856 -5
- vertex 1.40856 2.98836 -5
- endloop
- endfacet
- facet normal 0 -0 -1
- outer loop
- vertex -7.98836 6.40856 -5
- vertex -2.01164 -6.40856 -5
- vertex -11.4086 -2.98836 -5
- endloop
- endfacet
- facet normal 0.939693 -0.34202 0
- outer loop
- vertex -1.49896 -5 5
- vertex 1.40856 2.98836 -5
- vertex 1.40856 2.98836 5
- endloop
- endfacet
- facet normal 0.939691 -0.342024 0
- outer loop
- vertex -2.01164 -6.40856 -5
- vertex -1.49896 -5 5
- vertex -2.01164 -6.40856 5
- endloop
- endfacet
- facet normal 0.939693 -0.34202 -5.60336e-07
- outer loop
- vertex -1.49896 -5 5
- vertex -2.01164 -6.40856 -5
- vertex 1.40856 2.98836 -5
- endloop
- endfacet
- facet normal 0.34202 0.939693 -0
- outer loop
- vertex 1.40856 2.98836 -5
- vertex -1.66667 4.10765 5
- vertex 1.40856 2.98836 5
- endloop
- endfacet
- facet normal 0.34202 0.939693 2.30592e-07
- outer loop
- vertex -7.98836 6.40856 -5
- vertex -1.66667 4.10765 5
- vertex 1.40856 2.98836 -5
- endloop
- endfacet
- facet normal 0.342021 0.939692 0
- outer loop
- vertex -1.66667 4.10765 5
- vertex -7.98836 6.40856 -5
- vertex -7.98836 6.40856 5
- endloop
- endfacet
- facet normal -0.906307 -0.422619 0
- outer loop
- vertex 0.0220356 -4.24822 -5
- vertex 0.372597 -5 5
- vertex 0.0220356 -4.24822 5
- endloop
- endfacet
- facet normal -0.906308 -0.422618 5.10488e-08
- outer loop
- vertex 4.24822 -13.3113 -5
- vertex 0.372597 -5 5
- vertex 0.0220356 -4.24822 -5
- endloop
- endfacet
- facet normal -0.906308 -0.422618 0
- outer loop
- vertex 0.372597 -5 5
- vertex 4.24822 -13.3113 -5
- vertex 4.24822 -13.3113 5
- endloop
- endfacet
- facet normal -0.422619 0.906307 0
- outer loop
- vertex 9.08511 -0.0220356 -5
- vertex 8.33333 -0.372597 5
- vertex 9.08511 -0.0220356 5
- endloop
- endfacet
- facet normal -0.422619 0.906308 3.14174e-08
- outer loop
- vertex 0.0220356 -4.24822 -5
- vertex 8.33333 -0.372597 5
- vertex 9.08511 -0.0220356 -5
- endloop
- endfacet
- facet normal -0.422619 0.906308 0
- outer loop
- vertex 8.33333 -0.372597 5
- vertex 0.0220356 -4.24822 -5
- vertex 0.0220356 -4.24822 5
- endloop
- endfacet
- facet normal 0 0 -1
- outer loop
- vertex 4.24822 -13.3113 -5
- vertex 9.08511 -0.0220356 -5
- vertex 13.3113 -9.08511 -5
- endloop
- endfacet
- facet normal 0 0 -1
- outer loop
- vertex 9.08511 -0.0220356 -5
- vertex 4.24822 -13.3113 -5
- vertex 0.0220356 -4.24822 -5
- endloop
- endfacet
- facet normal 0.422619 -0.906308 0
- outer loop
- vertex 4.24822 -13.3113 -5
- vertex 13.3113 -9.08511 5
- vertex 4.24822 -13.3113 5
- endloop
- endfacet
- facet normal 0.422619 -0.906308 0
- outer loop
- vertex 13.3113 -9.08511 5
- vertex 4.24822 -13.3113 -5
- vertex 13.3113 -9.08511 -5
- endloop
- endfacet
- facet normal 0.906307 0.422619 0
- outer loop
- vertex 13.3113 -9.08511 5
- vertex 9.08511 -0.0220356 -5
- vertex 9.08511 -0.0220356 5
- endloop
- endfacet
- facet normal 0.906307 0.422619 0
- outer loop
- vertex 9.08511 -0.0220356 -5
- vertex 13.3113 -9.08511 5
- vertex 13.3113 -9.08511 -5
- endloop
- endfacet
- facet normal -0.996195 -0.0871574 0
- outer loop
- vertex 1.24991 9.54519 -5
- vertex 1.64757 5 5
- vertex 1.24991 9.54519 5
- endloop
- endfacet
- facet normal -0.996195 -0.087156 6.00593e-07
- outer loop
- vertex 2.12147 -0.416752 -5
- vertex 1.64757 5 5
- vertex 1.24991 9.54519 -5
- endloop
- endfacet
- facet normal -0.996195 -0.0871549 0
- outer loop
- vertex 1.64757 5 5
- vertex 2.12147 -0.416752 -5
- vertex 2.12147 -0.416752 5
- endloop
- endfacet
- facet normal -0.0871606 0.996194 0
- outer loop
- vertex 11.2119 10.4168 -5
- vertex 1.24991 9.54519 5
- vertex 11.2119 10.4168 5
- endloop
- endfacet
- facet normal -0.0871606 0.996194 0
- outer loop
- vertex 1.24991 9.54519 5
- vertex 11.2119 10.4168 -5
- vertex 1.24991 9.54519 -5
- endloop
- endfacet
- facet normal 0 0 -1
- outer loop
- vertex 2.12147 -0.416752 -5
- vertex 11.2119 10.4168 -5
- vertex 12.0834 0.454804 -5
- endloop
- endfacet
- facet normal 0 0 -1
- outer loop
- vertex 11.2119 10.4168 -5
- vertex 2.12147 -0.416752 -5
- vertex 1.24991 9.54519 -5
- endloop
- endfacet
- facet normal 0.0871557 -0.996195 0
- outer loop
- vertex 2.12147 -0.416752 -5
- vertex 8.33333 0.126715 5
- vertex 2.12147 -0.416752 5
- endloop
- endfacet
- facet normal 0.0871557 -0.996195 -3.64286e-08
- outer loop
- vertex 12.0834 0.454804 -5
- vertex 8.33333 0.126715 5
- vertex 2.12147 -0.416752 -5
- endloop
- endfacet
- facet normal 0.0871558 -0.996195 0
- outer loop
- vertex 8.33333 0.126715 5
- vertex 12.0834 0.454804 -5
- vertex 12.0834 0.454804 5
- endloop
- endfacet
- facet normal 0.996195 0.0871496 0
- outer loop
- vertex 12.0834 0.454804 5
- vertex 11.2119 10.4168 -5
- vertex 11.2119 10.4168 5
- endloop
- endfacet
- facet normal 0.996195 0.0871496 0
- outer loop
- vertex 11.2119 10.4168 -5
- vertex 12.0834 0.454804 5
- vertex 12.0834 0.454804 -5
- endloop
- endfacet
- facet normal 1 0 0
- outer loop
- vertex 8.33333 5 15
- vertex 8.33333 0.126715 5
- vertex 8.33333 5 5
- endloop
- endfacet
- facet normal 1 -0 0
- outer loop
- vertex 8.33333 -5 15
- vertex 8.33333 0.126715 5
- vertex 8.33333 5 15
- endloop
- endfacet
- facet normal 1 0 0
- outer loop
- vertex 8.33333 0.126715 5
- vertex 8.33333 -5 15
- vertex 8.33333 -0.372597 5
- endloop
- endfacet
- facet normal 1 0 0
- outer loop
- vertex 8.33333 -0.372597 5
- vertex 8.33333 -5 15
- vertex 8.33333 -5 5
- endloop
- endfacet
- facet normal -0 0 1
- outer loop
- vertex -1.66667 5 15
- vertex 8.33333 -5 15
- vertex 8.33333 5 15
- endloop
- endfacet
- facet normal 0 0 1
- outer loop
- vertex 8.33333 -5 15
- vertex -1.66667 5 15
- vertex -1.66667 -5 15
- endloop
- endfacet
- facet normal -1 0 0
- outer loop
- vertex -1.66667 4.10765 5
- vertex -1.66667 5 15
- vertex -1.66667 5 5
- endloop
- endfacet
- facet normal -1 0 0
- outer loop
- vertex -1.66667 -5 15
- vertex -1.66667 4.10765 5
- vertex -1.66667 -5 5
- endloop
- endfacet
- facet normal -1 0 0
- outer loop
- vertex -1.66667 4.10765 5
- vertex -1.66667 -5 15
- vertex -1.66667 5 15
- endloop
- endfacet
- facet normal 0 1 0
- outer loop
- vertex 1.64757 5 5
- vertex 8.33333 5 15
- vertex 8.33333 5 5
- endloop
- endfacet
- facet normal 0 1 0
- outer loop
- vertex 8.33333 5 15
- vertex 1.64757 5 5
- vertex -1.66667 5 15
- endloop
- endfacet
- facet normal 0 1 0
- outer loop
- vertex -1.66667 5 15
- vertex 1.64757 5 5
- vertex -1.66667 5 5
- endloop
- endfacet
- facet normal 0 -1 0
- outer loop
- vertex -1.49896 -5 5
- vertex -1.66667 -5 15
- vertex -1.66667 -5 5
- endloop
- endfacet
- facet normal 0 -1 0
- outer loop
- vertex 0.372597 -5 5
- vertex -1.66667 -5 15
- vertex -1.49896 -5 5
- endloop
- endfacet
- facet normal 0 -1 0
- outer loop
- vertex -1.66667 -5 15
- vertex 0.372597 -5 5
- vertex 8.33333 -5 15
- endloop
- endfacet
- facet normal 0 -1 -0
- outer loop
- vertex 8.33333 -5 15
- vertex 0.372597 -5 5
- vertex 8.33333 -5 5
- endloop
- endfacet
-endsolid OpenSCAD_Model
diff --git a/checker/src/models/flag.stl b/checker/src/models/flag.stl
@@ -1,282 +0,0 @@
-solid OpenSCAD_Model
- facet normal -0.309018 -0.951056 0
- outer loop
- vertex -0.404508 -0.293892 30
- vertex 0 -0.425325 25
- vertex 0 -0.425325 30
- endloop
- endfacet
- facet normal -0.309018 -0.951056 0
- outer loop
- vertex -0.404508 -0.293892 0
- vertex 0 -0.425325 25
- vertex -0.404508 -0.293892 30
- endloop
- endfacet
- facet normal -0.309018 -0.951056 4.43428e-09
- outer loop
- vertex 0.154508 -0.475528 0
- vertex 0 -0.425325 25
- vertex -0.404508 -0.293892 0
- endloop
- endfacet
- facet normal -0.309019 -0.951056 0
- outer loop
- vertex 0 -0.425325 25
- vertex 0.154508 -0.475528 0
- vertex 0.154508 -0.475528 25
- endloop
- endfacet
- facet normal -0.309019 0.951056 0
- outer loop
- vertex 0.154508 0.475528 25
- vertex 0.154508 0.475528 0
- vertex 0 0.425325 25
- endloop
- endfacet
- facet normal -0.309018 0.951056 0
- outer loop
- vertex 0 0.425325 25
- vertex -0.404508 0.293892 30
- vertex 0 0.425325 30
- endloop
- endfacet
- facet normal -0.309018 0.951056 4.43428e-09
- outer loop
- vertex -0.404508 0.293892 0
- vertex 0 0.425325 25
- vertex 0.154508 0.475528 0
- endloop
- endfacet
- facet normal -0.309018 0.951056 0
- outer loop
- vertex 0 0.425325 25
- vertex -0.404508 0.293892 0
- vertex -0.404508 0.293892 30
- endloop
- endfacet
- facet normal 0.809016 0.587786 0
- outer loop
- vertex 0.5 0 25
- vertex 0.154508 0.475528 0
- vertex 0.154508 0.475528 25
- endloop
- endfacet
- facet normal 0.809016 0.587786 0
- outer loop
- vertex 0.154508 0.475528 0
- vertex 0.5 0 25
- vertex 0.5 0 0
- endloop
- endfacet
- facet normal -1 0 0
- outer loop
- vertex -0.404508 -0.293892 0
- vertex -0.404508 0.293892 30
- vertex -0.404508 0.293892 0
- endloop
- endfacet
- facet normal -1 -0 0
- outer loop
- vertex -0.404508 0.293892 30
- vertex -0.404508 -0.293892 0
- vertex -0.404508 -0.293892 30
- endloop
- endfacet
- facet normal -0 0 1
- outer loop
- vertex -0.404508 0.293892 30
- vertex 0 -0.425325 30
- vertex 0 0.425325 30
- endloop
- endfacet
- facet normal 0 0 1
- outer loop
- vertex 0 -0.425325 30
- vertex -0.404508 0.293892 30
- vertex -0.404508 -0.293892 30
- endloop
- endfacet
- facet normal 0 0 1
- outer loop
- vertex 0 0.425325 30
- vertex 10 0.5 30
- vertex 0 0.5 30
- endloop
- endfacet
- facet normal 0 0 1
- outer loop
- vertex 10 0.5 30
- vertex 0 0.425325 30
- vertex 10 -0.5 30
- endloop
- endfacet
- facet normal -0 0 1
- outer loop
- vertex 0 -0.425325 30
- vertex 10 -0.5 30
- vertex 0 0.425325 30
- endloop
- endfacet
- facet normal 0 0 1
- outer loop
- vertex 10 -0.5 30
- vertex 0 -0.425325 30
- vertex 0 -0.5 30
- endloop
- endfacet
- facet normal 0.809016 -0.587786 0
- outer loop
- vertex 0.154508 -0.475528 25
- vertex 0.5 0 0
- vertex 0.5 0 25
- endloop
- endfacet
- facet normal 0.809016 -0.587786 0
- outer loop
- vertex 0.5 0 0
- vertex 0.154508 -0.475528 25
- vertex 0.154508 -0.475528 0
- endloop
- endfacet
- facet normal 0 0 -1
- outer loop
- vertex 0.154508 -0.475528 0
- vertex 0.154508 0.475528 0
- vertex 0.5 0 0
- endloop
- endfacet
- facet normal 0 0 -1
- outer loop
- vertex -0.404508 -0.293892 0
- vertex 0.154508 0.475528 0
- vertex 0.154508 -0.475528 0
- endloop
- endfacet
- facet normal 0 0 -1
- outer loop
- vertex 0.154508 0.475528 0
- vertex -0.404508 -0.293892 0
- vertex -0.404508 0.293892 0
- endloop
- endfacet
- facet normal 1 -0 0
- outer loop
- vertex 10 -0.5 30
- vertex 10 0.5 25
- vertex 10 0.5 30
- endloop
- endfacet
- facet normal 1 0 0
- outer loop
- vertex 10 0.5 25
- vertex 10 -0.5 30
- vertex 10 -0.5 25
- endloop
- endfacet
- facet normal 0 0 -1
- outer loop
- vertex 10 -0.5 25
- vertex 0.5 0 25
- vertex 10 0.5 25
- endloop
- endfacet
- facet normal 0 0 -1
- outer loop
- vertex 10 -0.5 25
- vertex 0.154508 -0.475528 25
- vertex 0.5 0 25
- endloop
- endfacet
- facet normal 0 0 -1
- outer loop
- vertex 0 -0.5 25
- vertex 0.154508 -0.475528 25
- vertex 10 -0.5 25
- endloop
- endfacet
- facet normal -0 0 -1
- outer loop
- vertex 0.154508 -0.475528 25
- vertex 0 -0.5 25
- vertex 0 -0.425325 25
- endloop
- endfacet
- facet normal 0 0 -1
- outer loop
- vertex 0.154508 0.475528 25
- vertex 10 0.5 25
- vertex 0.5 0 25
- endloop
- endfacet
- facet normal 0 0 -1
- outer loop
- vertex 0.154508 0.475528 25
- vertex 0 0.5 25
- vertex 10 0.5 25
- endloop
- endfacet
- facet normal 0 0 -1
- outer loop
- vertex 0 0.5 25
- vertex 0.154508 0.475528 25
- vertex 0 0.425325 25
- endloop
- endfacet
- facet normal -1 0 0
- outer loop
- vertex 0 0.425325 25
- vertex 0 0.5 30
- vertex 0 0.5 25
- endloop
- endfacet
- facet normal -1 -0 0
- outer loop
- vertex 0 0.5 30
- vertex 0 0.425325 25
- vertex 0 0.425325 30
- endloop
- endfacet
- facet normal -1 0 0
- outer loop
- vertex 0 -0.5 25
- vertex 0 -0.425325 30
- vertex 0 -0.425325 25
- endloop
- endfacet
- facet normal -1 -0 0
- outer loop
- vertex 0 -0.425325 30
- vertex 0 -0.5 25
- vertex 0 -0.5 30
- endloop
- endfacet
- facet normal 0 1 -0
- outer loop
- vertex 10 0.5 25
- vertex 0 0.5 30
- vertex 10 0.5 30
- endloop
- endfacet
- facet normal 0 1 0
- outer loop
- vertex 0 0.5 30
- vertex 10 0.5 25
- vertex 0 0.5 25
- endloop
- endfacet
- facet normal 0 -1 0
- outer loop
- vertex 0 -0.5 25
- vertex 10 -0.5 30
- vertex 0 -0.5 30
- endloop
- endfacet
- facet normal 0 -1 -0
- outer loop
- vertex 10 -0.5 30
- vertex 0 -0.5 25
- vertex 10 -0.5 25
- endloop
- endfacet
-endsolid OpenSCAD_Model
diff --git a/checker/src/models/syringe-ascii.stl b/checker/src/models/syringe-ascii.stl
@@ -1119,20 +1119,6 @@ solid OpenSCAD_Model
vertex -2 0 11
endloop
endfacet
- facet normal 0.453991 0.891006 -0
- outer loop
- vertex 1.17557 1.61803 1
- vertex 0.618033 1.90211 11
- vertex 1.17557 1.61803 11
- endloop
- endfacet
- facet normal 0.453991 0.891006 0
- outer loop
- vertex 0.618033 1.90211 11
- vertex 1.17557 1.61803 1
- vertex 0.618033 1.90211 1
- endloop
- endfacet
facet normal -0.156439 -0.987688 0
outer loop
vertex -0.618033 -1.90211 1
@@ -1161,6 +1147,20 @@ solid OpenSCAD_Model
vertex 0 2 1
endloop
endfacet
+ facet normal 0.453991 0.891006 -0
+ outer loop
+ vertex 1.17557 1.61803 1
+ vertex 0.618033 1.90211 11
+ vertex 1.17557 1.61803 11
+ endloop
+ endfacet
+ facet normal 0.453991 0.891006 0
+ outer loop
+ vertex 0.618033 1.90211 11
+ vertex 1.17557 1.61803 1
+ vertex 0.618033 1.90211 1
+ endloop
+ endfacet
facet normal -0.891006 -0.453991 0
outer loop
vertex -1.61803 -1.17557 1
@@ -1525,6 +1525,20 @@ solid OpenSCAD_Model
vertex -1.61803 1.17557 11
endloop
endfacet
+ facet normal 0.891007 0.45399 0
+ outer loop
+ vertex 9.51056 3.09017 1
+ vertex 8.09017 5.87785 0
+ vertex 8.09017 5.87785 1
+ endloop
+ endfacet
+ facet normal 0.891007 0.45399 0
+ outer loop
+ vertex 8.09017 5.87785 0
+ vertex 9.51056 3.09017 1
+ vertex 9.51056 3.09017 0
+ endloop
+ endfacet
facet normal 0.987688 0.156436 0
outer loop
vertex 10 0 1
@@ -1539,32 +1553,32 @@ solid OpenSCAD_Model
vertex 10 0 0
endloop
endfacet
- facet normal -0.45399 -0.891007 0
+ facet normal 0.707107 0.707107 0
outer loop
- vertex -5.87785 -8.09017 0
- vertex -3.09017 -9.51056 1
- vertex -5.87785 -8.09017 1
+ vertex 8.09017 5.87785 1
+ vertex 5.87785 8.09017 0
+ vertex 5.87785 8.09017 1
endloop
endfacet
- facet normal -0.45399 -0.891007 -0
+ facet normal 0.707107 0.707107 0
outer loop
- vertex -3.09017 -9.51056 1
- vertex -5.87785 -8.09017 0
- vertex -3.09017 -9.51056 0
+ vertex 5.87785 8.09017 0
+ vertex 8.09017 5.87785 1
+ vertex 8.09017 5.87785 0
endloop
endfacet
- facet normal -0.707107 0.707107 0
+ facet normal 0.156436 0.987688 -0
outer loop
- vertex -8.09017 5.87785 0
- vertex -5.87785 8.09017 1
- vertex -5.87785 8.09017 0
+ vertex 3.09017 9.51056 0
+ vertex 0 10 1
+ vertex 3.09017 9.51056 1
endloop
endfacet
- facet normal -0.707107 0.707107 0
+ facet normal 0.156436 0.987688 0
outer loop
- vertex -5.87785 8.09017 1
- vertex -8.09017 5.87785 0
- vertex -8.09017 5.87785 1
+ vertex 0 10 1
+ vertex 3.09017 9.51056 0
+ vertex 0 10 0
endloop
endfacet
facet normal 0 0 -1
@@ -1693,116 +1707,88 @@ solid OpenSCAD_Model
vertex -10 0 0
endloop
endfacet
- facet normal 0.891007 0.45399 0
- outer loop
- vertex 9.51056 3.09017 1
- vertex 8.09017 5.87785 0
- vertex 8.09017 5.87785 1
- endloop
- endfacet
- facet normal 0.891007 0.45399 0
- outer loop
- vertex 8.09017 5.87785 0
- vertex 9.51056 3.09017 1
- vertex 9.51056 3.09017 0
- endloop
- endfacet
- facet normal 0.707107 -0.707107 0
+ facet normal 0.891007 -0.45399 0
outer loop
- vertex 5.87785 -8.09017 1
- vertex 8.09017 -5.87785 0
vertex 8.09017 -5.87785 1
+ vertex 9.51056 -3.09017 0
+ vertex 9.51056 -3.09017 1
endloop
endfacet
- facet normal 0.707107 -0.707107 0
+ facet normal 0.891007 -0.45399 0
outer loop
+ vertex 9.51056 -3.09017 0
+ vertex 8.09017 -5.87785 1
vertex 8.09017 -5.87785 0
- vertex 5.87785 -8.09017 1
- vertex 5.87785 -8.09017 0
endloop
endfacet
- facet normal 0.156436 -0.987688 0
- outer loop
- vertex 0 -10 0
- vertex 3.09017 -9.51056 1
- vertex 0 -10 1
- endloop
- endfacet
- facet normal 0.156436 -0.987688 0
- outer loop
- vertex 3.09017 -9.51056 1
- vertex 0 -10 0
- vertex 3.09017 -9.51056 0
- endloop
- endfacet
- facet normal 0.707107 0.707107 0
+ facet normal 0.45399 0.891007 -0
outer loop
- vertex 8.09017 5.87785 1
vertex 5.87785 8.09017 0
+ vertex 3.09017 9.51056 1
vertex 5.87785 8.09017 1
endloop
endfacet
- facet normal 0.707107 0.707107 0
+ facet normal 0.45399 0.891007 0
outer loop
+ vertex 3.09017 9.51056 1
vertex 5.87785 8.09017 0
- vertex 8.09017 5.87785 1
- vertex 8.09017 5.87785 0
+ vertex 3.09017 9.51056 0
endloop
endfacet
- facet normal -0.987688 -0.156436 0
+ facet normal -0.45399 0.891007 0
outer loop
- vertex -9.51056 -3.09017 0
- vertex -10 0 1
- vertex -10 0 0
+ vertex -3.09017 9.51056 0
+ vertex -5.87785 8.09017 1
+ vertex -3.09017 9.51056 1
endloop
endfacet
- facet normal -0.987688 -0.156436 0
+ facet normal -0.45399 0.891007 0
outer loop
- vertex -10 0 1
- vertex -9.51056 -3.09017 0
- vertex -9.51056 -3.09017 1
+ vertex -5.87785 8.09017 1
+ vertex -3.09017 9.51056 0
+ vertex -5.87785 8.09017 0
endloop
endfacet
- facet normal -0.707107 -0.707107 0
+ facet normal -0.156436 -0.987688 0
outer loop
- vertex -5.87785 -8.09017 0
- vertex -8.09017 -5.87785 1
- vertex -8.09017 -5.87785 0
+ vertex -3.09017 -9.51056 0
+ vertex 0 -10 1
+ vertex -3.09017 -9.51056 1
endloop
endfacet
- facet normal -0.707107 -0.707107 0
+ facet normal -0.156436 -0.987688 -0
outer loop
- vertex -8.09017 -5.87785 1
- vertex -5.87785 -8.09017 0
- vertex -5.87785 -8.09017 1
+ vertex 0 -10 1
+ vertex -3.09017 -9.51056 0
+ vertex 0 -10 0
endloop
endfacet
- facet normal 0.45399 -0.891007 0
+ facet normal 0.707107 -0.707107 0
outer loop
- vertex 3.09017 -9.51056 0
vertex 5.87785 -8.09017 1
- vertex 3.09017 -9.51056 1
+ vertex 8.09017 -5.87785 0
+ vertex 8.09017 -5.87785 1
endloop
endfacet
- facet normal 0.45399 -0.891007 0
+ facet normal 0.707107 -0.707107 0
outer loop
+ vertex 8.09017 -5.87785 0
vertex 5.87785 -8.09017 1
- vertex 3.09017 -9.51056 0
vertex 5.87785 -8.09017 0
endloop
endfacet
- facet normal 0.45399 0.891007 -0
+ facet normal -0.891007 -0.45399 0
outer loop
- vertex 5.87785 8.09017 0
- vertex 3.09017 9.51056 1
- vertex 5.87785 8.09017 1
+ vertex -8.09017 -5.87785 0
+ vertex -9.51056 -3.09017 1
+ vertex -9.51056 -3.09017 0
endloop
endfacet
- facet normal 0.45399 0.891007 0
+ facet normal -0.891007 -0.45399 0
outer loop
- vertex 3.09017 9.51056 1
- vertex 5.87785 8.09017 0
- vertex 3.09017 9.51056 0
+ vertex -9.51056 -3.09017 1
+ vertex -8.09017 -5.87785 0
+ vertex -8.09017 -5.87785 1
endloop
endfacet
facet normal -0.156436 0.987688 0
@@ -1819,74 +1805,46 @@ solid OpenSCAD_Model
vertex -3.09017 9.51056 0
endloop
endfacet
- facet normal 0.156436 0.987688 -0
+ facet normal 0.45399 -0.891007 0
outer loop
- vertex 3.09017 9.51056 0
- vertex 0 10 1
- vertex 3.09017 9.51056 1
+ vertex 3.09017 -9.51056 0
+ vertex 5.87785 -8.09017 1
+ vertex 3.09017 -9.51056 1
endloop
endfacet
- facet normal 0.156436 0.987688 0
+ facet normal 0.45399 -0.891007 0
outer loop
- vertex 0 10 1
- vertex 3.09017 9.51056 0
- vertex 0 10 0
+ vertex 5.87785 -8.09017 1
+ vertex 3.09017 -9.51056 0
+ vertex 5.87785 -8.09017 0
endloop
endfacet
- facet normal -0.156436 -0.987688 0
+ facet normal 0.156436 -0.987688 0
outer loop
- vertex -3.09017 -9.51056 0
+ vertex 0 -10 0
+ vertex 3.09017 -9.51056 1
vertex 0 -10 1
- vertex -3.09017 -9.51056 1
endloop
endfacet
- facet normal -0.156436 -0.987688 -0
+ facet normal 0.156436 -0.987688 0
outer loop
- vertex 0 -10 1
- vertex -3.09017 -9.51056 0
+ vertex 3.09017 -9.51056 1
vertex 0 -10 0
+ vertex 3.09017 -9.51056 0
endloop
endfacet
- facet normal -0.45399 0.891007 0
- outer loop
- vertex -3.09017 9.51056 0
- vertex -5.87785 8.09017 1
- vertex -3.09017 9.51056 1
- endloop
- endfacet
- facet normal -0.45399 0.891007 0
- outer loop
- vertex -5.87785 8.09017 1
- vertex -3.09017 9.51056 0
- vertex -5.87785 8.09017 0
- endloop
- endfacet
- facet normal -0.891007 -0.45399 0
+ facet normal -0.987688 -0.156436 0
outer loop
- vertex -8.09017 -5.87785 0
- vertex -9.51056 -3.09017 1
vertex -9.51056 -3.09017 0
- endloop
- endfacet
- facet normal -0.891007 -0.45399 0
- outer loop
- vertex -9.51056 -3.09017 1
- vertex -8.09017 -5.87785 0
- vertex -8.09017 -5.87785 1
- endloop
- endfacet
- facet normal -0.987688 0.156436 0
- outer loop
+ vertex -10 0 1
vertex -10 0 0
- vertex -9.51056 3.09017 1
- vertex -9.51056 3.09017 0
endloop
endfacet
- facet normal -0.987688 0.156436 0
+ facet normal -0.987688 -0.156436 0
outer loop
- vertex -9.51056 3.09017 1
- vertex -10 0 0
vertex -10 0 1
+ vertex -9.51056 -3.09017 0
+ vertex -9.51056 -3.09017 1
endloop
endfacet
facet normal -0.891007 0.45399 0
@@ -1903,18 +1861,18 @@ solid OpenSCAD_Model
vertex -9.51056 3.09017 1
endloop
endfacet
- facet normal 0.891007 -0.45399 0
+ facet normal -0.707107 0.707107 0
outer loop
- vertex 8.09017 -5.87785 1
- vertex 9.51056 -3.09017 0
- vertex 9.51056 -3.09017 1
+ vertex -8.09017 5.87785 0
+ vertex -5.87785 8.09017 1
+ vertex -5.87785 8.09017 0
endloop
endfacet
- facet normal 0.891007 -0.45399 0
+ facet normal -0.707107 0.707107 0
outer loop
- vertex 9.51056 -3.09017 0
- vertex 8.09017 -5.87785 1
- vertex 8.09017 -5.87785 0
+ vertex -5.87785 8.09017 1
+ vertex -8.09017 5.87785 0
+ vertex -8.09017 5.87785 1
endloop
endfacet
facet normal 0.987688 -0.156436 0
@@ -1931,4 +1889,46 @@ solid OpenSCAD_Model
vertex 9.51056 -3.09017 0
endloop
endfacet
+ facet normal -0.707107 -0.707107 0
+ outer loop
+ vertex -5.87785 -8.09017 0
+ vertex -8.09017 -5.87785 1
+ vertex -8.09017 -5.87785 0
+ endloop
+ endfacet
+ facet normal -0.707107 -0.707107 0
+ outer loop
+ vertex -8.09017 -5.87785 1
+ vertex -5.87785 -8.09017 0
+ vertex -5.87785 -8.09017 1
+ endloop
+ endfacet
+ facet normal -0.987688 0.156436 0
+ outer loop
+ vertex -10 0 0
+ vertex -9.51056 3.09017 1
+ vertex -9.51056 3.09017 0
+ endloop
+ endfacet
+ facet normal -0.987688 0.156436 0
+ outer loop
+ vertex -9.51056 3.09017 1
+ vertex -10 0 0
+ vertex -10 0 1
+ endloop
+ endfacet
+ facet normal -0.45399 -0.891007 0
+ outer loop
+ vertex -5.87785 -8.09017 0
+ vertex -3.09017 -9.51056 1
+ vertex -5.87785 -8.09017 1
+ endloop
+ endfacet
+ facet normal -0.45399 -0.891007 -0
+ outer loop
+ vertex -3.09017 -9.51056 1
+ vertex -5.87785 -8.09017 0
+ vertex -3.09017 -9.51056 0
+ endloop
+ endfacet
endsolid OpenSCAD_Model
diff --git a/checker/src/models/syringe-bin.stl b/checker/src/models/syringe-bin.stl
Binary files differ.
diff --git a/checker/src/models/syringe.stl b/checker/src/models/syringe.stl
Binary files differ.
diff --git a/checker/src/requirements.txt b/checker/src/requirements.txt
@@ -1,4 +1,4 @@
-enochecker3==0.4.0
+enochecker3==0.5.0
uvicorn==0.14.0
gunicorn==20.1.0
numpy==1.20.1
