#3: Massive changes, superstructure now kind-of works
More unit tests now, and they all pass. More work needed, but this is very promising.
This commit is contained in:
parent
f49a7495db
commit
f616992191
|
|
@ -16,18 +16,14 @@
|
||||||
</tr></thead>
|
</tr></thead>
|
||||||
<tr>
|
<tr>
|
||||||
<td><a href="walkmap/core.clj.html">walkmap.core</a></td><td class="with-bar"><div class="covered"
|
<td><a href="walkmap/core.clj.html">walkmap.core</a></td><td class="with-bar"><div class="covered"
|
||||||
style="width:12.244897959183673%;
|
style="width:100.0%;
|
||||||
float:left;"> 6 </div><div class="not-covered"
|
float:left;"> 1 </div></td>
|
||||||
style="width:87.75510204081633%;
|
<td class="with-number">100.00 %</td>
|
||||||
float:left;"> 43 </div></td>
|
|
||||||
<td class="with-number">12.24 %</td>
|
|
||||||
<td class="with-bar"><div class="covered"
|
<td class="with-bar"><div class="covered"
|
||||||
style="width:38.46153846153846%;
|
style="width:100.0%;
|
||||||
float:left;"> 5 </div><div class="not-covered"
|
float:left;"> 1 </div></td>
|
||||||
style="width:61.53846153846154%;
|
<td class="with-number">100.00 %</td>
|
||||||
float:left;"> 8 </div></td>
|
<td class="with-number">9</td><td class="with-number">1</td><td class="with-number">1</td>
|
||||||
<td class="with-number">38.46 %</td>
|
|
||||||
<td class="with-number">44</td><td class="with-number">6</td><td class="with-number">13</td>
|
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><a href="walkmap/edge.clj.html">walkmap.edge</a></td><td class="with-bar"><div class="covered"
|
<td><a href="walkmap/edge.clj.html">walkmap.edge</a></td><td class="with-bar"><div class="covered"
|
||||||
|
|
@ -62,87 +58,138 @@
|
||||||
<td class="with-number">24</td><td class="with-number">3</td><td class="with-number">13</td>
|
<td class="with-number">24</td><td class="with-number">3</td><td class="with-number">13</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><a href="walkmap/path.clj.html">walkmap.path</a></td><td class="with-bar"><div class="covered"
|
<td><a href="walkmap/ocean.clj.html">walkmap.ocean</a></td><td class="with-bar"><div class="covered"
|
||||||
style="width:5.555555555555555%;
|
style="width:17.857142857142858%;
|
||||||
float:left;"> 3 </div><div class="not-covered"
|
float:left;"> 5 </div><div class="not-covered"
|
||||||
style="width:94.44444444444444%;
|
style="width:82.14285714285714%;
|
||||||
float:left;"> 51 </div></td>
|
float:left;"> 23 </div></td>
|
||||||
<td class="with-number">5.56 %</td>
|
<td class="with-number">17.86 %</td>
|
||||||
<td class="with-bar"><div class="covered"
|
<td class="with-bar"><div class="covered"
|
||||||
style="width:23.076923076923077%;
|
style="width:50.0%;
|
||||||
float:left;"> 3 </div><div class="not-covered"
|
float:left;"> 4 </div><div class="not-covered"
|
||||||
style="width:76.92307692307692%;
|
style="width:50.0%;
|
||||||
float:left;"> 10 </div></td>
|
float:left;"> 4 </div></td>
|
||||||
<td class="with-number">23.08 %</td>
|
<td class="with-number">50.00 %</td>
|
||||||
<td class="with-number">30</td><td class="with-number">4</td><td class="with-number">13</td>
|
<td class="with-number">24</td><td class="with-number">4</td><td class="with-number">8</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td><a href="walkmap/path.clj.html">walkmap.path</a></td><td class="with-bar"><div class="covered"
|
||||||
|
style="width:4.2105263157894735%;
|
||||||
|
float:left;"> 4 </div><div class="not-covered"
|
||||||
|
style="width:95.78947368421052%;
|
||||||
|
float:left;"> 91 </div></td>
|
||||||
|
<td class="with-number">4.21 %</td>
|
||||||
|
<td class="with-bar"><div class="covered"
|
||||||
|
style="width:21.05263157894737%;
|
||||||
|
float:left;"> 4 </div><div class="not-covered"
|
||||||
|
style="width:78.94736842105263%;
|
||||||
|
float:left;"> 15 </div></td>
|
||||||
|
<td class="with-number">21.05 %</td>
|
||||||
|
<td class="with-number">38</td><td class="with-number">5</td><td class="with-number">19</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><a href="walkmap/polygon.clj.html">walkmap.polygon</a></td><td class="with-bar"><div class="covered"
|
<td><a href="walkmap/polygon.clj.html">walkmap.polygon</a></td><td class="with-bar"><div class="covered"
|
||||||
style="width:7.407407407407407%;
|
style="width:91.30434782608695%;
|
||||||
float:left;"> 2 </div><div class="not-covered"
|
float:left;"> 42 </div><div class="not-covered"
|
||||||
style="width:92.5925925925926%;
|
style="width:8.695652173913043%;
|
||||||
float:left;"> 25 </div></td>
|
float:left;"> 4 </div></td>
|
||||||
<td class="with-number">7.41 %</td>
|
<td class="with-number">91.30 %</td>
|
||||||
<td class="with-bar"><div class="covered"
|
<td class="with-bar"><div class="covered"
|
||||||
style="width:25.0%;
|
style="width:88.88888888888889%;
|
||||||
float:left;"> 2 </div><div class="not-covered"
|
float:left;"> 8 </div><div class="partial"
|
||||||
style="width:75.0%;
|
style="width:11.11111111111111%;
|
||||||
float:left;"> 6 </div></td>
|
float:left;"> 1 </div></td>
|
||||||
<td class="with-number">25.00 %</td>
|
<td class="with-number">100.00 %</td>
|
||||||
<td class="with-number">17</td><td class="with-number">3</td><td class="with-number">8</td>
|
<td class="with-number">18</td><td class="with-number">3</td><td class="with-number">9</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><a href="walkmap/stl.clj.html">walkmap.stl</a></td><td class="with-bar"><div class="covered"
|
<td><a href="walkmap/stl.clj.html">walkmap.stl</a></td><td class="with-bar"><div class="covered"
|
||||||
style="width:17.228464419475657%;
|
style="width:55.989583333333336%;
|
||||||
float:left;"> 46 </div><div class="not-covered"
|
float:left;"> 215 </div><div class="not-covered"
|
||||||
style="width:82.77153558052434%;
|
style="width:44.010416666666664%;
|
||||||
float:left;"> 221 </div></td>
|
float:left;"> 169 </div></td>
|
||||||
<td class="with-number">17.23 %</td>
|
<td class="with-number">55.99 %</td>
|
||||||
<td class="with-bar"><div class="covered"
|
<td class="with-bar"><div class="covered"
|
||||||
style="width:28.125%;
|
style="width:38.1578947368421%;
|
||||||
float:left;"> 18 </div><div class="not-covered"
|
float:left;"> 29 </div><div class="partial"
|
||||||
style="width:71.875%;
|
style="width:13.157894736842104%;
|
||||||
float:left;"> 46 </div></td>
|
float:left;"> 10 </div><div class="not-covered"
|
||||||
<td class="with-number">28.13 %</td>
|
style="width:48.68421052631579%;
|
||||||
<td class="with-number">126</td><td class="with-number">12</td><td class="with-number">64</td>
|
float:left;"> 37 </div></td>
|
||||||
|
<td class="with-number">51.32 %</td>
|
||||||
|
<td class="with-number">148</td><td class="with-number">13</td><td class="with-number">76</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td><a href="walkmap/superstructure.clj.html">walkmap.superstructure</a></td><td class="with-bar"><div class="covered"
|
||||||
|
style="width:71.6867469879518%;
|
||||||
|
float:left;"> 119 </div><div class="not-covered"
|
||||||
|
style="width:28.313253012048193%;
|
||||||
|
float:left;"> 47 </div></td>
|
||||||
|
<td class="with-number">71.69 %</td>
|
||||||
|
<td class="with-bar"><div class="covered"
|
||||||
|
style="width:68.96551724137932%;
|
||||||
|
float:left;"> 20 </div><div class="partial"
|
||||||
|
style="width:13.793103448275861%;
|
||||||
|
float:left;"> 4 </div><div class="not-covered"
|
||||||
|
style="width:17.24137931034483%;
|
||||||
|
float:left;"> 5 </div></td>
|
||||||
|
<td class="with-number">82.76 %</td>
|
||||||
|
<td class="with-number">76</td><td class="with-number">8</td><td class="with-number">29</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><a href="walkmap/svg.clj.html">walkmap.svg</a></td><td class="with-bar"><div class="covered"
|
<td><a href="walkmap/svg.clj.html">walkmap.svg</a></td><td class="with-bar"><div class="covered"
|
||||||
style="width:2.8776978417266186%;
|
style="width:3.7542662116040955%;
|
||||||
float:left;"> 4 </div><div class="not-covered"
|
float:left;"> 11 </div><div class="not-covered"
|
||||||
style="width:97.12230215827338%;
|
style="width:96.24573378839591%;
|
||||||
float:left;"> 135 </div></td>
|
float:left;"> 282 </div></td>
|
||||||
<td class="with-number">2.88 %</td>
|
<td class="with-number">3.75 %</td>
|
||||||
<td class="with-bar"><div class="covered"
|
<td class="with-bar"><div class="covered"
|
||||||
style="width:8.571428571428571%;
|
style="width:12.121212121212121%;
|
||||||
float:left;"> 3 </div><div class="not-covered"
|
float:left;"> 8 </div><div class="not-covered"
|
||||||
style="width:91.42857142857143%;
|
style="width:87.87878787878788%;
|
||||||
float:left;"> 32 </div></td>
|
float:left;"> 58 </div></td>
|
||||||
<td class="with-number">8.57 %</td>
|
<td class="with-number">12.12 %</td>
|
||||||
<td class="with-number">50</td><td class="with-number">2</td><td class="with-number">35</td>
|
<td class="with-number">108</td><td class="with-number">7</td><td class="with-number">66</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td><a href="walkmap/utils.clj.html">walkmap.utils</a></td><td class="with-bar"><div class="covered"
|
||||||
|
style="width:63.1578947368421%;
|
||||||
|
float:left;"> 24 </div><div class="not-covered"
|
||||||
|
style="width:36.8421052631579%;
|
||||||
|
float:left;"> 14 </div></td>
|
||||||
|
<td class="with-number">63.16 %</td>
|
||||||
|
<td class="with-bar"><div class="covered"
|
||||||
|
style="width:60.0%;
|
||||||
|
float:left;"> 6 </div><div class="partial"
|
||||||
|
style="width:20.0%;
|
||||||
|
float:left;"> 2 </div><div class="not-covered"
|
||||||
|
style="width:20.0%;
|
||||||
|
float:left;"> 2 </div></td>
|
||||||
|
<td class="with-number">80.00 %</td>
|
||||||
|
<td class="with-number">26</td><td class="with-number">2</td><td class="with-number">10</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><a href="walkmap/vertex.clj.html">walkmap.vertex</a></td><td class="with-bar"><div class="covered"
|
<td><a href="walkmap/vertex.clj.html">walkmap.vertex</a></td><td class="with-bar"><div class="covered"
|
||||||
style="width:72.94117647058823%;
|
style="width:83.91959798994975%;
|
||||||
float:left;"> 62 </div><div class="not-covered"
|
float:left;"> 167 </div><div class="not-covered"
|
||||||
style="width:27.058823529411764%;
|
style="width:16.08040201005025%;
|
||||||
float:left;"> 23 </div></td>
|
float:left;"> 32 </div></td>
|
||||||
<td class="with-number">72.94 %</td>
|
<td class="with-number">83.92 %</td>
|
||||||
<td class="with-bar"><div class="covered"
|
<td class="with-bar"><div class="covered"
|
||||||
style="width:63.63636363636363%;
|
style="width:60.60606060606061%;
|
||||||
float:left;"> 14 </div><div class="partial"
|
float:left;"> 20 </div><div class="partial"
|
||||||
style="width:13.636363636363637%;
|
style="width:21.21212121212121%;
|
||||||
float:left;"> 3 </div><div class="not-covered"
|
float:left;"> 7 </div><div class="not-covered"
|
||||||
style="width:22.727272727272727%;
|
style="width:18.181818181818183%;
|
||||||
float:left;"> 5 </div></td>
|
float:left;"> 6 </div></td>
|
||||||
<td class="with-number">77.27 %</td>
|
<td class="with-number">81.82 %</td>
|
||||||
<td class="with-number">43</td><td class="with-number">5</td><td class="with-number">22</td>
|
<td class="with-number">66</td><td class="with-number">7</td><td class="with-number">33</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr><td>Totals:</td>
|
<tr><td>Totals:</td>
|
||||||
<td class="with-bar"></td>
|
<td class="with-bar"></td>
|
||||||
<td class="with-number">27.77 %</td>
|
<td class="with-number">46.27 %</td>
|
||||||
<td class="with-bar"></td>
|
<td class="with-bar"></td>
|
||||||
<td class="with-number">39.45 %</td>
|
<td class="with-number">51.59 %</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
</body>
|
</body>
|
||||||
|
|
|
||||||
|
|
@ -8,10 +8,10 @@
|
||||||
001 (ns walkmap.core
|
001 (ns walkmap.core
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
002 "At this stage, primarily utility functions dealing with stereolithography
|
002 "This namespace mostly gets used as a scratchpad for ideas which haven't yet
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
003 (STL) files. Not a stable API yet!"
|
003 solidified."
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
004 (:require [clojure.java.io :as io :refer [file output-stream input-stream]]
|
004 (:require [clojure.java.io :as io :refer [file output-stream input-stream]]
|
||||||
|
|
@ -26,115 +26,10 @@
|
||||||
007 [me.raynes.fs :as fs]
|
007 [me.raynes.fs :as fs]
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
008 [taoensso.timbre :as l :refer [info error spy]]
|
008 [taoensso.timbre :as l :refer [info error spy]]))
|
||||||
</span><br/>
|
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
|
||||||
009 [walkmap.stl :refer [decode-binary-stl]]
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
|
||||||
010 [walkmap.svg :refer [stl->svg]]))
|
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="blank" title="0 out of 0 forms covered">
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
011
|
009
|
||||||
</span><br/>
|
|
||||||
<span class="covered" title="2 out of 2 forms covered">
|
|
||||||
012 (def ^:dynamic *sea-level*
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
|
||||||
013 "The sea level on heightmaps we're currently handling. If characters are to
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
|
||||||
014 be able to swin in the sea, we must model the sea bottom, so we need
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
|
||||||
015 heightmaps which cover at least the continental shelf. However, the sea
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
|
||||||
016 bottom is not walkable territory and can be culled from walkmaps.
|
|
||||||
</span><br/>
|
|
||||||
<span class="blank" title="0 out of 0 forms covered">
|
|
||||||
017
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
|
||||||
018 **Note** must be a floating point number. `(= 0 0.0)` returns `false`!"
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
|
||||||
019 0.0)
|
|
||||||
</span><br/>
|
|
||||||
<span class="blank" title="0 out of 0 forms covered">
|
|
||||||
020
|
|
||||||
</span><br/>
|
|
||||||
<span class="covered" title="1 out of 1 forms covered">
|
|
||||||
021 (defn ocean?
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
|
||||||
022 "Of a `facet`, is the altitude of every vertice equal to `*sea-level*`?"
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
|
||||||
023 [facet]
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-covered" title="0 out of 3 forms covered">
|
|
||||||
024 (every?
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-covered" title="0 out of 4 forms covered">
|
|
||||||
025 #(= % *sea-level*)
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-covered" title="0 out of 6 forms covered">
|
|
||||||
026 (map :z (:vertices facet))))
|
|
||||||
</span><br/>
|
|
||||||
<span class="blank" title="0 out of 0 forms covered">
|
|
||||||
027
|
|
||||||
</span><br/>
|
|
||||||
<span class="covered" title="1 out of 1 forms covered">
|
|
||||||
028 (defn cull-ocean-facets
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
|
||||||
029 "Ye cannae walk on water. Remove all facets from this `stl` structure which
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
|
||||||
030 are at sea level."
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
|
||||||
031 [stl]
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-covered" title="0 out of 10 forms covered">
|
|
||||||
032 (assoc stl :facets (remove ocean? (:facets stl))))
|
|
||||||
</span><br/>
|
|
||||||
<span class="blank" title="0 out of 0 forms covered">
|
|
||||||
033
|
|
||||||
</span><br/>
|
|
||||||
<span class="covered" title="1 out of 1 forms covered">
|
|
||||||
034 (defn binary-stl-file->svg
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
|
||||||
035 "Given only an `in-filename`, parse the indicated file, expected to be
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
|
||||||
036 binary STL, and return an equivalent SVG structure. Given both `in-filename`
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
|
||||||
037 and `out-filename`, as side-effect write the SVG to the indicated output file."
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
|
||||||
038 ([in-filename]
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-covered" title="0 out of 7 forms covered">
|
|
||||||
039 (stl->svg (cull-ocean-facets (decode-binary-stl in-filename))))
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
|
||||||
040 ([in-filename out-filename]
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-covered" title="0 out of 4 forms covered">
|
|
||||||
041 (let [s (binary-stl-file->svg in-filename)]
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-covered" title="0 out of 8 forms covered">
|
|
||||||
042 (spit out-filename (html s))
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-covered" title="0 out of 1 forms covered">
|
|
||||||
043 s)))
|
|
||||||
</span><br/>
|
|
||||||
<span class="blank" title="0 out of 0 forms covered">
|
|
||||||
044
|
|
||||||
</span><br/>
|
</span><br/>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
||||||
80
docs/cloverage/walkmap/ocean.clj.html
Normal file
80
docs/cloverage/walkmap/ocean.clj.html
Normal file
|
|
@ -0,0 +1,80 @@
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
|
||||||
|
<link rel="stylesheet" href="../coverage.css"/> <title> walkmap/ocean.clj </title>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<span class="covered" title="1 out of 1 forms covered">
|
||||||
|
001 (ns walkmap.ocean
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
002 "Deal with (specifically, at this stage, cull) ocean areas")
|
||||||
|
</span><br/>
|
||||||
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
|
003
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="2 out of 2 forms covered">
|
||||||
|
004 (def ^:dynamic *sea-level*
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
005 "The sea level on heightmaps we're currently handling. If characters are to
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
006 be able to swin in the sea, we must model the sea bottom, so we need
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
007 heightmaps which cover at least the continental shelf. However, the sea
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
008 bottom is not walkable territory and can be culled from walkmaps.
|
||||||
|
</span><br/>
|
||||||
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
|
009
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
010 **Note** must be a floating point number. `(= 0 0.0)` returns `false`!"
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
011 0.0)
|
||||||
|
</span><br/>
|
||||||
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
|
012
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="1 out of 1 forms covered">
|
||||||
|
013 (defn ocean?
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
014 "Of a `facet`, is the altitude of every vertice equal to `*sea-level*`?"
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
015 [facet]
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 3 forms covered">
|
||||||
|
016 (every?
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 4 forms covered">
|
||||||
|
017 #(= % *sea-level*)
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 6 forms covered">
|
||||||
|
018 (map :z (:vertices facet))))
|
||||||
|
</span><br/>
|
||||||
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
|
019
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="1 out of 1 forms covered">
|
||||||
|
020 (defn cull-ocean-facets
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
021 "Ye cannae walk on water. Remove all facets from this `stl` structure which
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
022 are at sea level."
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
023 [stl]
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 10 forms covered">
|
||||||
|
024 (assoc stl :facets (remove ocean? (:facets stl))))
|
||||||
|
</span><br/>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
|
@ -40,7 +40,7 @@
|
||||||
<span class="not-covered" title="0 out of 3 forms covered">
|
<span class="not-covered" title="0 out of 3 forms covered">
|
||||||
012 [v (:nodes o)]
|
012 [v (:nodes o)]
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 9 forms covered">
|
<span class="not-covered" title="0 out of 18 forms covered">
|
||||||
013 (and
|
013 (and
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 3 forms covered">
|
<span class="not-covered" title="0 out of 3 forms covered">
|
||||||
|
|
@ -49,50 +49,74 @@
|
||||||
<span class="not-covered" title="0 out of 6 forms covered">
|
<span class="not-covered" title="0 out of 6 forms covered">
|
||||||
015 (> (count v) 2)
|
015 (> (count v) 2)
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 3 forms covered">
|
<span class="not-covered" title="0 out of 4 forms covered">
|
||||||
016 (every? vertex? v))))
|
016 (every? vertex? v)
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 9 forms covered">
|
||||||
|
017 (or (nil? (:kind o)) (= (:kind o) :path)))))
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="blank" title="0 out of 0 forms covered">
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
017
|
018
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="covered" title="1 out of 1 forms covered">
|
<span class="covered" title="1 out of 1 forms covered">
|
||||||
018 (defn polygon->path
|
019 (defn make-path
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
019 "If `o` is a polygon, return an equivalent path. What's different about
|
020 [nodes]
|
||||||
</span><br/>
|
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
|
||||||
020 a path is that in polygons there is an implicit edge between the first
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
|
||||||
021 vertex and the last. In paths, there isn't, so we need to add that
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
|
||||||
022 edge explicitly.
|
|
||||||
</span><br/>
|
|
||||||
<span class="blank" title="0 out of 0 forms covered">
|
|
||||||
023
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
|
||||||
024 If `o` is not a polygon, will throw an exception."
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
|
||||||
025 [o]
|
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 1 forms covered">
|
<span class="not-covered" title="0 out of 1 forms covered">
|
||||||
026 (if
|
021 (if
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 4 forms covered">
|
||||||
|
022 (every? vertex? nodes)
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 11 forms covered">
|
||||||
|
023 {:nodes nodes :id (keyword (gensym "path")) :kind :path}
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 3 forms covered">
|
<span class="not-covered" title="0 out of 3 forms covered">
|
||||||
027 (polygon? o)
|
024 (throw (Exception. "Each item on path must be a vertex."))))
|
||||||
</span><br/>
|
|
||||||
<span class="not-covered" title="0 out of 19 forms covered">
|
|
||||||
028 (assoc (dissoc o :vertices) :nodes (concat (:vertices o) (list (first (:vertices o)))))
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-covered" title="0 out of 3 forms covered">
|
|
||||||
029 (throw (Exception. "Not a polygon!"))))
|
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="blank" title="0 out of 0 forms covered">
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
030
|
025
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="1 out of 1 forms covered">
|
||||||
|
026 (defn polygon->path
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
027 "If `o` is a polygon, return an equivalent path. What's different about
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
028 a path is that in polygons there is an implicit edge between the first
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
029 vertex and the last. In paths, there isn't, so we need to add that
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
030 edge explicitly.
|
||||||
|
</span><br/>
|
||||||
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
|
031
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
032 If `o` is not a polygon, will throw an exception."
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
033 [o]
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 1 forms covered">
|
||||||
|
034 (if
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 3 forms covered">
|
||||||
|
035 (polygon? o)
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 21 forms covered">
|
||||||
|
036 (assoc (dissoc o :vertices) :kind :path :nodes (concat (:vertices o) (list (first (:vertices o)))))
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 3 forms covered">
|
||||||
|
037 (throw (Exception. "Not a polygon!"))))
|
||||||
|
</span><br/>
|
||||||
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
|
038
|
||||||
</span><br/>
|
</span><br/>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
||||||
|
|
@ -31,29 +31,32 @@
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
009 [o]
|
009 [o]
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 1 forms covered">
|
<span class="covered" title="1 out of 1 forms covered">
|
||||||
010 (let
|
010 (let
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 3 forms covered">
|
<span class="covered" title="3 out of 3 forms covered">
|
||||||
011 [v (:vertices o)]
|
011 [v (:vertices o)]
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 9 forms covered">
|
<span class="partial" title="14 out of 18 forms covered">
|
||||||
012 (and
|
012 (and
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 3 forms covered">
|
<span class="covered" title="3 out of 3 forms covered">
|
||||||
013 (seq? v)
|
013 (coll? v)
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 6 forms covered">
|
<span class="covered" title="6 out of 6 forms covered">
|
||||||
014 (> (count v) 2)
|
014 (> (count v) 2)
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 3 forms covered">
|
<span class="covered" title="4 out of 4 forms covered">
|
||||||
015 (every? vertex? v))))
|
015 (every? vertex? v)
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="blank" title="0 out of 0 forms covered">
|
<span class="covered" title="9 out of 9 forms covered">
|
||||||
016
|
016 (or (nil? (:kind o)) (= (:kind o) :polygon)))))
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="blank" title="0 out of 0 forms covered">
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
017
|
017
|
||||||
</span><br/>
|
</span><br/>
|
||||||
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
|
018
|
||||||
|
</span><br/>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
||||||
|
|
@ -26,361 +26,427 @@
|
||||||
007 [taoensso.timbre :as l :refer [info error spy]]
|
007 [taoensso.timbre :as l :refer [info error spy]]
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
008 [walkmap.polygon :refer [polygon?]])
|
008 [walkmap.polygon :refer [polygon?]]
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
009 (:import org.clojars.smee.binary.core.BinaryIO
|
009 [walkmap.vertex :refer [vertex-key]])
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
010 java.io.DataInput))
|
010 (:import org.clojars.smee.binary.core.BinaryIO
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
011 java.io.DataInput))
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="blank" title="0 out of 0 forms covered">
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
011
|
012
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="covered" title="1 out of 1 forms covered">
|
<span class="covered" title="1 out of 1 forms covered">
|
||||||
012 (defn stl?
|
013 (defn stl?
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
013 "True if `o` is recogniseable as an STL structure. An STL structure must
|
014 "True if `o` is recogniseable as an STL structure. An STL structure must
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
014 have a key `:facets`, whose value must be a sequence of polygons; and
|
015 have a key `:facets`, whose value must be a sequence of polygons; and
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
015 may have a key `:header` whose value should be a string, and/or a key
|
016 may have a key `:header` whose value should be a string, and/or a key
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
016 `:count`, whose value should be a positive integer.
|
017 `:count`, whose value should be a positive integer.
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="blank" title="0 out of 0 forms covered">
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
017
|
018
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
018 If `verify-count?` is passed and is not `false`, verify that the value of
|
019 If `verify-count?` is passed and is not `false`, verify that the value of
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
019 the `:count` header is equal to the number of facets."
|
020 the `:count` header is equal to the number of facets."
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
020 ([o]
|
021 ([o]
|
||||||
</span><br/>
|
|
||||||
<span class="not-covered" title="0 out of 4 forms covered">
|
|
||||||
021 (stl? o false))
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
|
||||||
022 ([o verify-count?]
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-covered" title="0 out of 22 forms covered">
|
|
||||||
023 (and
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-covered" title="0 out of 3 forms covered">
|
|
||||||
024 (map? o)
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-covered" title="0 out of 3 forms covered">
|
|
||||||
025 (:facets o)
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-covered" title="0 out of 6 forms covered">
|
|
||||||
026 (every? polygon? (:facets o))
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-covered" title="0 out of 10 forms covered">
|
|
||||||
027 (if (:header o) (string? (:header o)) true)
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-covered" title="0 out of 10 forms covered">
|
|
||||||
028 (if (:count o) (integer? (:count o)) true)
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-covered" title="0 out of 11 forms covered">
|
|
||||||
029 (if verify-count? (= (:count o) (count (:facets o))) true))))
|
|
||||||
</span><br/>
|
|
||||||
<span class="blank" title="0 out of 0 forms covered">
|
|
||||||
030
|
|
||||||
</span><br/>
|
|
||||||
<span class="covered" title="1 out of 1 forms covered">
|
|
||||||
031 (def vect
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
|
||||||
032 "A codec for vectors within a binary STL file."
|
|
||||||
</span><br/>
|
|
||||||
<span class="covered" title="8 out of 8 forms covered">
|
|
||||||
033 (b/ordered-map
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
|
||||||
034 :x :float-le
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
|
||||||
035 :y :float-le
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
|
||||||
036 :z :float-le))
|
|
||||||
</span><br/>
|
|
||||||
<span class="blank" title="0 out of 0 forms covered">
|
|
||||||
037
|
|
||||||
</span><br/>
|
|
||||||
<span class="covered" title="1 out of 1 forms covered">
|
|
||||||
038 (def facet
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
|
||||||
039 "A codec for a facet (triangle) within a binary STL file."
|
|
||||||
</span><br/>
|
|
||||||
<span class="covered" title="6 out of 6 forms covered">
|
|
||||||
040 (b/ordered-map
|
|
||||||
</span><br/>
|
|
||||||
<span class="covered" title="1 out of 1 forms covered">
|
|
||||||
041 :normal vect
|
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="covered" title="4 out of 4 forms covered">
|
<span class="covered" title="4 out of 4 forms covered">
|
||||||
042 :vertices [vect vect vect]
|
022 (stl? o false))
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
043 :abc :ushort-le))
|
023 ([o verify-count?]
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="blank" title="0 out of 0 forms covered">
|
<span class="partial" title="20 out of 26 forms covered">
|
||||||
044
|
024 (and
|
||||||
</span><br/>
|
|
||||||
<span class="covered" title="1 out of 1 forms covered">
|
|
||||||
045 (def binary-stl
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
|
||||||
046 "A codec for binary STL files"
|
|
||||||
</span><br/>
|
|
||||||
<span class="covered" title="6 out of 6 forms covered">
|
|
||||||
047 (b/ordered-map
|
|
||||||
</span><br/>
|
|
||||||
<span class="covered" title="5 out of 5 forms covered">
|
|
||||||
048 :header (b/string "ISO-8859-1" :length 80) ;; for the time being we neither know nor care what's in this.
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
|
||||||
049 :count :uint-le
|
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="covered" title="3 out of 3 forms covered">
|
<span class="covered" title="3 out of 3 forms covered">
|
||||||
050 :facets (b/repeated facet)))
|
025 (map? o)
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="3 out of 3 forms covered">
|
||||||
|
026 (:facets o)
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="6 out of 6 forms covered">
|
||||||
|
027 (every? polygon? (:facets o))
|
||||||
|
</span><br/>
|
||||||
|
<span class="partial" title="9 out of 10 forms covered">
|
||||||
|
028 (if (:header o) (string? (:header o)) true)
|
||||||
|
</span><br/>
|
||||||
|
<span class="partial" title="9 out of 10 forms covered">
|
||||||
|
029 (if (:count o) (integer? (:count o)) true)
|
||||||
|
</span><br/>
|
||||||
|
<span class="partial" title="14 out of 15 forms covered">
|
||||||
|
030 (or (nil? (:kind o)) (= (:kind o) :stl))
|
||||||
|
</span><br/>
|
||||||
|
<span class="partial" title="1 out of 11 forms covered">
|
||||||
|
031 (if verify-count? (= (:count o) (count (:facets o))) true))))
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="blank" title="0 out of 0 forms covered">
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
051
|
032
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="covered" title="1 out of 1 forms covered">
|
<span class="covered" title="1 out of 1 forms covered">
|
||||||
052 (defn decode-binary-stl
|
033 (def vect
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
053 "Parse a binary STL file from this `filename` and return an STL structure
|
034 "A codec for vectors within a binary STL file."
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="8 out of 8 forms covered">
|
||||||
|
035 (b/ordered-map
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
054 representing its contents.
|
036 :x :float-le
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
037 :y :float-le
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
038 :z :float-le))
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="blank" title="0 out of 0 forms covered">
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
055
|
039
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="1 out of 1 forms covered">
|
||||||
|
040 (def facet
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
056 **NOTE** that we've no way of verifying that the input file is binary STL
|
041 "A codec for a facet (triangle) within a binary STL file."
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="6 out of 6 forms covered">
|
||||||
|
042 (b/ordered-map
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="1 out of 1 forms covered">
|
||||||
|
043 :normal vect
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="4 out of 4 forms covered">
|
||||||
|
044 :vertices [vect vect vect]
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
057 data, if it is not this will run but will return garbage."
|
045 :abc :ushort-le))
|
||||||
</span><br/>
|
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
|
||||||
058 [filename]
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-covered" title="0 out of 4 forms covered">
|
|
||||||
059 (let [in (io/input-stream filename)]
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-covered" title="0 out of 4 forms covered">
|
|
||||||
060 (b/decode binary-stl in)))
|
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="blank" title="0 out of 0 forms covered">
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
061
|
046
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="1 out of 1 forms covered">
|
||||||
|
047 (def binary-stl
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
048 "A codec for binary STL files"
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="6 out of 6 forms covered">
|
||||||
|
049 (b/ordered-map
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="5 out of 5 forms covered">
|
||||||
|
050 :header (b/string "ISO-8859-1" :length 80) ;; for the time being we neither know nor care what's in this.
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
051 :count :uint-le
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="3 out of 3 forms covered">
|
||||||
|
052 :facets (b/repeated facet)))
|
||||||
|
</span><br/>
|
||||||
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
|
053
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="1 out of 1 forms covered">
|
||||||
|
054 (defn canonicalise
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
055 "Objects read in from STL won't have all the keys/values we need them to have."
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
056 [o]
|
||||||
|
</span><br/>
|
||||||
|
<span class="partial" title="4 out of 5 forms covered">
|
||||||
|
057 (cond
|
||||||
|
</span><br/>
|
||||||
|
<span class="partial" title="15 out of 16 forms covered">
|
||||||
|
058 (and (coll? o) (not (map? o))) (map canonicalise o)
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
059 ;; if it has :facets it's an STL structure, but it doesn't yet conform to `stl?`
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="10 out of 10 forms covered">
|
||||||
|
060 (:facets o) (assoc o
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
061 :kind :stl
|
||||||
|
</span><br/>
|
||||||
|
<span class="partial" title="11 out of 12 forms covered">
|
||||||
|
062 :id (or (:id o) (keyword (gensym "stl")))
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="5 out of 5 forms covered">
|
||||||
|
063 :facets (canonicalise (:facets o)))
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
064 ;; if it has :vertices it's a polygon, but it doesn't yet conform to `polygon?`
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="10 out of 10 forms covered">
|
||||||
|
065 (:vertices o) (assoc o
|
||||||
|
</span><br/>
|
||||||
|
<span class="partial" title="11 out of 12 forms covered">
|
||||||
|
066 :id (or (:id o) (keyword (gensym "poly")))
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
067 :kind :polygon
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="5 out of 5 forms covered">
|
||||||
|
068 :vertices (canonicalise (:vertices o)))
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
069 ;; if it has a value for :x it's a vertex, but it doesn't yet conform to `vertex?`
|
||||||
|
</span><br/>
|
||||||
|
<span class="partial" title="18 out of 19 forms covered">
|
||||||
|
070 (:x o) (assoc o :kind :vertex :id (or (:id o) (vertex-key o)))
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
071 ;; shouldn't happen
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 1 forms covered">
|
||||||
|
072 :else o))
|
||||||
|
</span><br/>
|
||||||
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
|
073
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="1 out of 1 forms covered">
|
||||||
|
074 (defn decode-binary-stl
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
075 "Parse a binary STL file from this `filename` and return an STL structure
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
076 representing its contents.
|
||||||
|
</span><br/>
|
||||||
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
|
077
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
078 **NOTE** that we've no way of verifying that the input file is binary STL
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
079 data, if it is not this will run but will return garbage."
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
080 [filename]
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="4 out of 4 forms covered">
|
||||||
|
081 (let [in (io/input-stream filename)]
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="6 out of 6 forms covered">
|
||||||
|
082 (canonicalise (b/decode binary-stl in))))
|
||||||
|
</span><br/>
|
||||||
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
|
083
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="covered" title="2 out of 2 forms covered">
|
<span class="covered" title="2 out of 2 forms covered">
|
||||||
062 (defn- vect->str [prefix v]
|
084 (defn- vect->str [prefix v]
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 16 forms covered">
|
<span class="not-covered" title="0 out of 16 forms covered">
|
||||||
063 (str prefix " " (:x v) " " (:y v) " " (:z v) "\n"))
|
085 (str prefix " " (:x v) " " (:y v) " " (:z v) "\n"))
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="blank" title="0 out of 0 forms covered">
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
064
|
086
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="covered" title="2 out of 2 forms covered">
|
<span class="covered" title="2 out of 2 forms covered">
|
||||||
065 (defn- facet2str [tri]
|
087 (defn- facet2str [tri]
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 4 forms covered">
|
<span class="not-covered" title="0 out of 4 forms covered">
|
||||||
066 (str
|
088 (str
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 6 forms covered">
|
<span class="not-covered" title="0 out of 6 forms covered">
|
||||||
067 (vect->str "facet normal" (:normal tri))
|
089 (vect->str "facet normal" (:normal tri))
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
068 "outer loop\n"
|
090 "outer loop\n"
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 3 forms covered">
|
<span class="not-covered" title="0 out of 3 forms covered">
|
||||||
069 (apply str
|
091 (apply str
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 3 forms covered">
|
<span class="not-covered" title="0 out of 3 forms covered">
|
||||||
070 (map
|
092 (map
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 4 forms covered">
|
<span class="not-covered" title="0 out of 4 forms covered">
|
||||||
071 #(vect->str "vertex" %)
|
093 #(vect->str "vertex" %)
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 3 forms covered">
|
<span class="not-covered" title="0 out of 3 forms covered">
|
||||||
072 (:vertices tri)))
|
094 (:vertices tri)))
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
073 "endloop\nendfacet\n"))
|
095 "endloop\nendfacet\n"))
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="blank" title="0 out of 0 forms covered">
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
074
|
096
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="covered" title="1 out of 1 forms covered">
|
<span class="covered" title="1 out of 1 forms covered">
|
||||||
075 (defn stl->ascii
|
097 (defn stl->ascii
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
076 "Return as a string an ASCII rendering of the `stl` structure."
|
098 "Return as a string an ASCII rendering of the `stl` structure."
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
077 ([stl]
|
099 ([stl]
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 4 forms covered">
|
<span class="not-covered" title="0 out of 4 forms covered">
|
||||||
078 (stl->ascii stl "unknown"))
|
100 (stl->ascii stl "unknown"))
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
079 ([stl solidname]
|
101 ([stl solidname]
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 6 forms covered">
|
<span class="not-covered" title="0 out of 6 forms covered">
|
||||||
080 (str
|
102 (str
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
081 "solid "
|
103 "solid "
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 1 forms covered">
|
<span class="not-covered" title="0 out of 1 forms covered">
|
||||||
082 solidname
|
104 solidname
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 5 forms covered">
|
<span class="not-covered" title="0 out of 5 forms covered">
|
||||||
083 (s/trim (:header stl))
|
105 (s/trim (:header stl))
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
084 "\n"
|
106 "\n"
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 2 forms covered">
|
<span class="not-covered" title="0 out of 2 forms covered">
|
||||||
085 (apply
|
107 (apply
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 1 forms covered">
|
<span class="not-covered" title="0 out of 1 forms covered">
|
||||||
086 str
|
108 str
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 2 forms covered">
|
<span class="not-covered" title="0 out of 2 forms covered">
|
||||||
087 (map
|
109 (map
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 1 forms covered">
|
<span class="not-covered" title="0 out of 1 forms covered">
|
||||||
088 facet2str
|
110 facet2str
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 3 forms covered">
|
<span class="not-covered" title="0 out of 3 forms covered">
|
||||||
089 (:facets stl)))
|
111 (:facets stl)))
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
090 "endsolid "
|
112 "endsolid "
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 1 forms covered">
|
<span class="not-covered" title="0 out of 1 forms covered">
|
||||||
091 solidname
|
113 solidname
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
092 "\n")))
|
114 "\n")))
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="blank" title="0 out of 0 forms covered">
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
093
|
115
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="covered" title="1 out of 1 forms covered">
|
<span class="covered" title="1 out of 1 forms covered">
|
||||||
094 (defn write-ascii-stl
|
116 (defn write-ascii-stl
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
095 "Write an `stl` structure as read by `decode-binary-stl` to this
|
117 "Write an `stl` structure as read by `decode-binary-stl` to this
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
096 `filename` as ASCII encoded STL."
|
118 `filename` as ASCII encoded STL."
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
097 ([filename stl]
|
119 ([filename stl]
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 5 forms covered">
|
<span class="not-covered" title="0 out of 5 forms covered">
|
||||||
098 (let [b (fs/base-name filename true)]
|
120 (let [b (fs/base-name filename true)]
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 2 forms covered">
|
<span class="not-covered" title="0 out of 2 forms covered">
|
||||||
099 (write-ascii-stl
|
121 (write-ascii-stl
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 2 forms covered">
|
<span class="not-covered" title="0 out of 2 forms covered">
|
||||||
100 filename stl
|
122 filename stl
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 15 forms covered">
|
<span class="not-covered" title="0 out of 15 forms covered">
|
||||||
101 (subs b 0 (or (s/index-of b ".") (count b))))))
|
123 (subs b 0 (or (s/index-of b ".") (count b))))))
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
102 ([filename stl solidname]
|
124 ([filename stl solidname]
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 16 forms covered">
|
<span class="not-covered" title="0 out of 16 forms covered">
|
||||||
103 (l/debug "Solid name is " solidname)
|
125 (l/debug "Solid name is " solidname)
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 2 forms covered">
|
<span class="not-covered" title="0 out of 2 forms covered">
|
||||||
104 (spit
|
126 (spit
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 1 forms covered">
|
<span class="not-covered" title="0 out of 1 forms covered">
|
||||||
105 filename
|
127 filename
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 4 forms covered">
|
<span class="not-covered" title="0 out of 4 forms covered">
|
||||||
106 (stl->ascii stl solidname))))
|
128 (stl->ascii stl solidname))))
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="blank" title="0 out of 0 forms covered">
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
107
|
129
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="covered" title="1 out of 1 forms covered">
|
<span class="covered" title="1 out of 1 forms covered">
|
||||||
108 (defn binary-stl-to-ascii
|
130 (defn binary-stl-to-ascii
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
109 "Convert the binary STL file indicated by `in-filename`, and write it to
|
131 "Convert the binary STL file indicated by `in-filename`, and write it to
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
110 `out-filename`, if specified; otherwise, to a file with the same basename
|
132 `out-filename`, if specified; otherwise, to a file with the same basename
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
111 as `in-filename` but the extension `.ascii.stl`."
|
133 as `in-filename` but the extension `.ascii.stl`."
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
112 ([in-filename]
|
134 ([in-filename]
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 4 forms covered">
|
<span class="not-covered" title="0 out of 4 forms covered">
|
||||||
113 (let [[_ ext] (fs/split-ext in-filename)]
|
135 (let [[_ ext] (fs/split-ext in-filename)]
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 2 forms covered">
|
<span class="not-covered" title="0 out of 2 forms covered">
|
||||||
114 (binary-stl-to-ascii
|
136 (binary-stl-to-ascii
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 1 forms covered">
|
<span class="not-covered" title="0 out of 1 forms covered">
|
||||||
115 in-filename
|
137 in-filename
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 3 forms covered">
|
<span class="not-covered" title="0 out of 3 forms covered">
|
||||||
116 (str
|
138 (str
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 3 forms covered">
|
<span class="not-covered" title="0 out of 3 forms covered">
|
||||||
117 (subs
|
139 (subs
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 1 forms covered">
|
<span class="not-covered" title="0 out of 1 forms covered">
|
||||||
118 in-filename
|
140 in-filename
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
119 0
|
141 0
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 5 forms covered">
|
<span class="not-covered" title="0 out of 5 forms covered">
|
||||||
120 (or
|
142 (or
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 4 forms covered">
|
<span class="not-covered" title="0 out of 4 forms covered">
|
||||||
121 (s/last-index-of in-filename ".")
|
143 (s/last-index-of in-filename ".")
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 2 forms covered">
|
<span class="not-covered" title="0 out of 2 forms covered">
|
||||||
122 (count in-filename)))
|
144 (count in-filename)))
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
123 ".ascii"
|
145 ".ascii"
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 1 forms covered">
|
<span class="not-covered" title="0 out of 1 forms covered">
|
||||||
124 ext))))
|
146 ext))))
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
125 ([in-filename out-filename]
|
147 ([in-filename out-filename]
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 6 forms covered">
|
<span class="not-covered" title="0 out of 6 forms covered">
|
||||||
126 (write-ascii-stl out-filename (decode-binary-stl in-filename))))
|
148 (write-ascii-stl out-filename (decode-binary-stl in-filename))))
|
||||||
</span><br/>
|
</span><br/>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
||||||
236
docs/cloverage/walkmap/superstructure.clj.html
Normal file
236
docs/cloverage/walkmap/superstructure.clj.html
Normal file
|
|
@ -0,0 +1,236 @@
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
|
||||||
|
<link rel="stylesheet" href="../coverage.css"/> <title> walkmap/superstructure.clj </title>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<span class="covered" title="1 out of 1 forms covered">
|
||||||
|
001 (ns walkmap.superstructure
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
002 "single indexing structure for walkmap objects"
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
003 (:require [walkmap.path :as p]
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
004 [walkmap.polygon :as q]
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
005 [walkmap.stl :as s]
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
006 [walkmap.utils :as u]
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
007 [walkmap.vertex :as v]))
|
||||||
|
</span><br/>
|
||||||
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
|
008
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="1 out of 1 forms covered">
|
||||||
|
009 (defn index-vertex
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
010 "Return a superstructure like `s` in which object `o` is indexed by vertex
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
011 `v`. It is an error (and an exception may be thrown) if
|
||||||
|
</span><br/>
|
||||||
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
|
012
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
013 1. `s` is not a map;
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
014 2. `o` is not a map;
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
015 3. `o` does not have a value for the key `:id`;
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
016 4. `v` is not a vertex."
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
017 ;; two copies of the same vertex are not identical enough to one another
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
018 ;; to be used as keys in a map. So our vertices need to have ids, and we need
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
019 ;; to key the vertex-index by vertex ids.
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
020 ;; TODO: BUT WE CANNOT USE GENSYMED ids, because two vertices with the same
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
021 ;; vertices must have the same id!
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
022 [s o v]
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="6 out of 6 forms covered">
|
||||||
|
023 (if-not (v/vertex? o)
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="4 out of 4 forms covered">
|
||||||
|
024 (if (:id o)
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="4 out of 4 forms covered">
|
||||||
|
025 (if (v/vertex? v)
|
||||||
|
</span><br/>
|
||||||
|
<span class="partial" title="8 out of 9 forms covered">
|
||||||
|
026 (let [vi (or (:vertex-index s) {})
|
||||||
|
</span><br/>
|
||||||
|
<span class="partial" title="9 out of 10 forms covered">
|
||||||
|
027 current (or (vi (:id v)) {})]
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
028 ;; deep-merge doesn't merge sets, only maps; so at this
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
029 ;; stage we need to build a map.
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="15 out of 15 forms covered">
|
||||||
|
030 (assoc vi (:id v) (assoc current (:id o) (:id v))))
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 4 forms covered">
|
||||||
|
031 (throw (Exception. "Not a vertex: " v)))
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 10 forms covered">
|
||||||
|
032 (throw (Exception. (subs (str "No `:id` value: " o) 0 80))))
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
033 ;; it shouldn't actually be an error to try to index a vertex, but it
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
034 ;; also isn't useful to do so, so I'd be inclined to ignore it.
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 3 forms covered">
|
||||||
|
035 (:vertex-index s)))
|
||||||
|
</span><br/>
|
||||||
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
|
036
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="1 out of 1 forms covered">
|
||||||
|
037 (defn index-vertices
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
038 "Return a superstructure like `s` in which object `o` is indexed by its
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
039 vertices. It is an error (and an exception may be thrown) if
|
||||||
|
</span><br/>
|
||||||
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
|
040
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
041 1. `s` is not a map;
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
042 2. `o` is not a map;
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
043 3. `o` does not have a value for the key `:id`."
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
044 [s o]
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="3 out of 3 forms covered">
|
||||||
|
045 (assoc
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="1 out of 1 forms covered">
|
||||||
|
046 s
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
047 :vertex-index
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="2 out of 2 forms covered">
|
||||||
|
048 (reduce
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="1 out of 1 forms covered">
|
||||||
|
049 u/deep-merge
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="3 out of 3 forms covered">
|
||||||
|
050 (map
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="5 out of 5 forms covered">
|
||||||
|
051 #(index-vertex s o %)
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="3 out of 3 forms covered">
|
||||||
|
052 (u/vertices o)))))
|
||||||
|
</span><br/>
|
||||||
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
|
053
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="1 out of 1 forms covered">
|
||||||
|
054 (defn add-to-superstructure
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
055 "Return a superstructure like `s` with object `o` added. If `o` is a collection,
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
056 return a superstructure like `s` with each element of `o` added. If only one
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
057 argument is supplied it will be assumed to represent `o` and a new
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
058 superstructure will be returned.
|
||||||
|
</span><br/>
|
||||||
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
|
059
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
060 It is an error (and an exception may be thrown) if
|
||||||
|
</span><br/>
|
||||||
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
|
061
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
062 1. `s` is not a map;
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
063 2. `o` is not a map, or a sequence of maps."
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
064 ([o]
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="4 out of 4 forms covered">
|
||||||
|
065 (add-to-superstructure {} o))
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
066 ([s o]
|
||||||
|
</span><br/>
|
||||||
|
<span class="partial" title="2 out of 4 forms covered">
|
||||||
|
067 (cond
|
||||||
|
</span><br/>
|
||||||
|
<span class="partial" title="9 out of 18 forms covered">
|
||||||
|
068 (map? o) (let [o' (if (:id o) o (assoc o :id (keyword (gensym "obj"))))]
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="10 out of 10 forms covered">
|
||||||
|
069 (index-vertices (assoc s (:id o') o') o'))
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="14 out of 14 forms covered">
|
||||||
|
070 (coll? o) (reduce u/deep-merge (map #(add-to-superstructure s %) o))
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 4 forms covered">
|
||||||
|
071 (nil? o) o
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
072 :else
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 13 forms covered">
|
||||||
|
073 (throw (Exception. (str "Don't know how to index " (or (type o) "nil")))))))
|
||||||
|
</span><br/>
|
||||||
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
|
074
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="9 out of 9 forms covered">
|
||||||
|
075 (:vertex-index (add-to-superstructure (:facets (s/decode-binary-stl "resources/isle_of_man.stl"))))
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="3 out of 3 forms covered">
|
||||||
|
076 (s/decode-binary-stl "resources/isle_of_man.stl")
|
||||||
|
</span><br/>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
|
@ -20,139 +20,313 @@
|
||||||
005 (:require [clojure.string :as s]
|
005 (:require [clojure.string :as s]
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
006 [taoensso.timbre :as l :refer [info error spy]]
|
006 [dali.io :as neatly-folded-clock]
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
007 [walkmap.polygon :refer [polygon?]]
|
007 [hiccup.core :refer [html]]
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
008 [walkmap.vertex :refer [vertex?]]))
|
008 [taoensso.timbre :as l :refer [info error spy]]
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
009 [walkmap.ocean :refer [cull-ocean-facets]]
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
010 [walkmap.polygon :refer [polygon?]]
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
011 [walkmap.stl :refer [decode-binary-stl]]
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
012 [walkmap.vertex :refer [vertex?]]))
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="blank" title="0 out of 0 forms covered">
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
009
|
013
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="covered" title="2 out of 2 forms covered">
|
<span class="covered" title="2 out of 2 forms covered">
|
||||||
010 (defn- facet->svg-poly
|
014 (def ^:dynamic *preferred-svg-render*
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
011 [facet]
|
015 "Mainly for debugging dali; switch SVG renderer to use. Expected values:
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 2 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
012 [:polygon
|
016 `:dali`, `:hiccup`."
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 20 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
013 {:points (s/join " " (map #(str (:x %) "," (:y %)) (:vertices facet)))}])
|
017 :dali)
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="blank" title="0 out of 0 forms covered">
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
014
|
018
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="2 out of 2 forms covered">
|
||||||
|
019 (defn- facet->svg-poly
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
020 [facet]
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 2 forms covered">
|
||||||
|
021 [:polygon
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 20 forms covered">
|
||||||
|
022 {:points (s/join " " (map #(str (:x %) "," (:y %)) (:vertices facet)))}])
|
||||||
|
</span><br/>
|
||||||
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
|
023
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="2 out of 2 forms covered">
|
||||||
|
024 (defn- dali-facet->svg-poly
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
025 [facet]
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 2 forms covered">
|
||||||
|
026 (vec
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 3 forms covered">
|
||||||
|
027 (cons
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
028 :polygon
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 16 forms covered">
|
||||||
|
029 (map #(vec (list (:x %) (:y %))) (:vertices facet)))))
|
||||||
|
</span><br/>
|
||||||
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
|
030
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="covered" title="1 out of 1 forms covered">
|
<span class="covered" title="1 out of 1 forms covered">
|
||||||
015 (defn stl->svg
|
031 (defn dali-stl->svg
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
016 "Convert this in-memory `stl` structure, as read by `decode-binary-stl`, into
|
032 "Format this `stl` as SVG for the `dali` renderer on a page with these
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
017 an in-memory hiccup representation of SVG structure, and return it."
|
033 bounds."
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
018 [stl]
|
034 [stl minx maxx miny maxy]
|
||||||
</span><br/>
|
|
||||||
<span class="not-covered" title="0 out of 3 forms covered">
|
|
||||||
019 (let [minx (reduce
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-covered" title="0 out of 1 forms covered">
|
|
||||||
020 min
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-covered" title="0 out of 3 forms covered">
|
|
||||||
021 (map
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-covered" title="0 out of 9 forms covered">
|
|
||||||
022 #(reduce min (map :x (:vertices %)))
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-covered" title="0 out of 3 forms covered">
|
|
||||||
023 (:facets stl)))
|
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 2 forms covered">
|
<span class="not-covered" title="0 out of 2 forms covered">
|
||||||
024 maxx (reduce
|
035 [:dali/page
|
||||||
</span><br/>
|
|
||||||
<span class="not-covered" title="0 out of 1 forms covered">
|
|
||||||
025 max
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-covered" title="0 out of 3 forms covered">
|
|
||||||
026 (map
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-covered" title="0 out of 9 forms covered">
|
|
||||||
027 #(reduce max (map :x (:vertices %)))
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-covered" title="0 out of 3 forms covered">
|
|
||||||
028 (:facets stl)))
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-covered" title="0 out of 2 forms covered">
|
|
||||||
029 miny (reduce
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-covered" title="0 out of 1 forms covered">
|
|
||||||
030 min
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-covered" title="0 out of 3 forms covered">
|
|
||||||
031 (map
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-covered" title="0 out of 9 forms covered">
|
|
||||||
032 #(reduce min (map :y (:vertices %)))
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-covered" title="0 out of 3 forms covered">
|
|
||||||
033 (:facets stl)))
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-covered" title="0 out of 2 forms covered">
|
|
||||||
034 maxy (reduce
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-covered" title="0 out of 1 forms covered">
|
|
||||||
035 max
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-covered" title="0 out of 3 forms covered">
|
|
||||||
036 (map
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-covered" title="0 out of 9 forms covered">
|
|
||||||
037 #(reduce max (map :y (:vertices %)))
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-covered" title="0 out of 3 forms covered">
|
|
||||||
038 (:facets stl)))]
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-covered" title="0 out of 2 forms covered">
|
|
||||||
039 [:svg
|
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 8 forms covered">
|
<span class="not-covered" title="0 out of 8 forms covered">
|
||||||
040 {:xmlns "http://www.w3.org/2000/svg"
|
036 {:xmlns "http://www.w3.org/2000/svg"
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
041 :version "1.2"
|
037 :version "1.2"
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 4 forms covered">
|
<span class="not-covered" title="0 out of 4 forms covered">
|
||||||
042 :width (- maxx minx)
|
038 :width (- maxx minx)
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 4 forms covered">
|
<span class="not-covered" title="0 out of 4 forms covered">
|
||||||
043 :height (- maxy miny)
|
039 :height (- maxy miny)
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 11 forms covered">
|
<span class="not-covered" title="0 out of 11 forms covered">
|
||||||
044 :viewBox (s/join " " (map str [minx miny maxx maxy]))}
|
040 :viewBox (s/join " " (map str [minx miny maxx maxy]))}
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 2 forms covered">
|
<span class="not-covered" title="0 out of 2 forms covered">
|
||||||
045 (vec
|
041 (vec
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 3 forms covered">
|
<span class="not-covered" title="0 out of 3 forms covered">
|
||||||
046 (cons
|
042 (cons
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
047 :g
|
043 :g
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 2 forms covered">
|
<span class="not-covered" title="0 out of 2 forms covered">
|
||||||
048 (map
|
044 (map
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 1 forms covered">
|
<span class="not-covered" title="0 out of 1 forms covered">
|
||||||
049 facet->svg-poly
|
045 dali-facet->svg-poly
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 3 forms covered">
|
<span class="not-covered" title="0 out of 3 forms covered">
|
||||||
050 (:facets stl))))]))
|
046 (:facets stl))))])
|
||||||
|
</span><br/>
|
||||||
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
|
047
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="1 out of 1 forms covered">
|
||||||
|
048 (defn hiccup-stl->svg
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
049 "Format this `stl` as SVG for the `hiccup` renderer on a page with these
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
050 bounds."
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
051 [stl minx maxx miny maxy]
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 2 forms covered">
|
||||||
|
052 [:svg
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 8 forms covered">
|
||||||
|
053 {:xmlns "http://www.w3.org/2000/svg"
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
054 :version "1.2"
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 4 forms covered">
|
||||||
|
055 :width (- maxx minx)
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 4 forms covered">
|
||||||
|
056 :height (- maxy miny)
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 11 forms covered">
|
||||||
|
057 :viewBox (s/join " " (map str [minx miny maxx maxy]))}
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 2 forms covered">
|
||||||
|
058 (vec
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 3 forms covered">
|
||||||
|
059 (cons
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
060 :g
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 2 forms covered">
|
||||||
|
061 (map
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 1 forms covered">
|
||||||
|
062 facet->svg-poly
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 3 forms covered">
|
||||||
|
063 (:facets stl))))])
|
||||||
|
</span><br/>
|
||||||
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
|
064
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="1 out of 1 forms covered">
|
||||||
|
065 (defn stl->svg
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
066 "Convert this in-memory `stl` structure, as read by `decode-binary-stl`, into
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
067 an in-memory hiccup representation of SVG structure, and return it."
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
068 [stl]
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 3 forms covered">
|
||||||
|
069 (let [minx (reduce
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 1 forms covered">
|
||||||
|
070 min
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 3 forms covered">
|
||||||
|
071 (map
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 9 forms covered">
|
||||||
|
072 #(reduce min (map :x (:vertices %)))
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 3 forms covered">
|
||||||
|
073 (:facets stl)))
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 2 forms covered">
|
||||||
|
074 maxx (reduce
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 1 forms covered">
|
||||||
|
075 max
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 3 forms covered">
|
||||||
|
076 (map
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 9 forms covered">
|
||||||
|
077 #(reduce max (map :x (:vertices %)))
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 3 forms covered">
|
||||||
|
078 (:facets stl)))
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 2 forms covered">
|
||||||
|
079 miny (reduce
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 1 forms covered">
|
||||||
|
080 min
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 3 forms covered">
|
||||||
|
081 (map
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 9 forms covered">
|
||||||
|
082 #(reduce min (map :y (:vertices %)))
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 3 forms covered">
|
||||||
|
083 (:facets stl)))
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 2 forms covered">
|
||||||
|
084 maxy (reduce
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 1 forms covered">
|
||||||
|
085 max
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 3 forms covered">
|
||||||
|
086 (map
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 9 forms covered">
|
||||||
|
087 #(reduce max (map :y (:vertices %)))
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 3 forms covered">
|
||||||
|
088 (:facets stl)))]
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 17 forms covered">
|
||||||
|
089 (l/info "Generating SVG for " *preferred-svg-render* " renderer")
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 3 forms covered">
|
||||||
|
090 (case *preferred-svg-render*
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 7 forms covered">
|
||||||
|
091 :hiccup (hiccup-stl->svg stl minx maxx miny maxy)
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 7 forms covered">
|
||||||
|
092 :dali (dali-stl->svg stl minx maxx miny maxy)
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 4 forms covered">
|
||||||
|
093 (throw (Exception. "Unexpected renderer value: " *preferred-svg-render*)))))
|
||||||
|
</span><br/>
|
||||||
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
|
094
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="1 out of 1 forms covered">
|
||||||
|
095 (defn binary-stl-file->svg
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
096 "Given only an `in-filename`, parse the indicated file, expected to be
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
097 binary STL, and return an equivalent SVG structure. Given both `in-filename`
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
098 and `out-filename`, as side-effect write the SVG to the indicated output file."
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
099 ([in-filename]
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 7 forms covered">
|
||||||
|
100 (stl->svg (cull-ocean-facets (decode-binary-stl in-filename))))
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
101 ([in-filename out-filename]
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 4 forms covered">
|
||||||
|
102 (let [s (binary-stl-file->svg in-filename)]
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 17 forms covered">
|
||||||
|
103 (l/info "Emitting SVG with " *preferred-svg-render* " renderer")
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 3 forms covered">
|
||||||
|
104 (case *preferred-svg-render*
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 4 forms covered">
|
||||||
|
105 :dali (neatly-folded-clock/render-svg s out-filename)
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 8 forms covered">
|
||||||
|
106 :hiccup (spit out-filename (html s))
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 4 forms covered">
|
||||||
|
107 (throw (Exception. "Unexpected renderer value: " *preferred-svg-render*)))
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 1 forms covered">
|
||||||
|
108 s)))
|
||||||
</span><br/>
|
</span><br/>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
||||||
86
docs/cloverage/walkmap/utils.clj.html
Normal file
86
docs/cloverage/walkmap/utils.clj.html
Normal file
|
|
@ -0,0 +1,86 @@
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
|
||||||
|
<link rel="stylesheet" href="../coverage.css"/> <title> walkmap/utils.clj </title>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<span class="covered" title="1 out of 1 forms covered">
|
||||||
|
001 (ns walkmap.utils
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
002 "Miscellaneous utility functions."
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
003 (:require [walkmap.path :as p]
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
004 [walkmap.polygon :as q]
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
005 [walkmap.vertex :as v]))
|
||||||
|
</span><br/>
|
||||||
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
|
006
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="1 out of 1 forms covered">
|
||||||
|
007 (defn deep-merge
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
008 "Recursively merges maps. If vals are not maps, the last value wins."
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
009 ;; TODO: not my implementation, not sure I entirely trust it.
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
010 [& vals]
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="5 out of 5 forms covered">
|
||||||
|
011 (if (every? map? vals)
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="5 out of 5 forms covered">
|
||||||
|
012 (apply merge-with deep-merge vals)
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 3 forms covered">
|
||||||
|
013 (last vals)))
|
||||||
|
</span><br/>
|
||||||
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
|
014
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="1 out of 1 forms covered">
|
||||||
|
015 (defn vertices
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
016 "If `o` is an object with vertices, return those vertices, else nil."
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
017 ;; TODO: it's possibly a design mistake that I'm currently distinguishing
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
018 ;; between polygons and paths on the basis that one has `:vertices` and
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
019 ;; the other has `:nodes`. Possibly it would be better to have a key
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
020 ;; `:closed` which was `true` for polygons, `false` (or missing) for
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
021 ;; paths.
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
022 [o]
|
||||||
|
</span><br/>
|
||||||
|
<span class="partial" title="2 out of 4 forms covered">
|
||||||
|
023 (cond
|
||||||
|
</span><br/>
|
||||||
|
<span class="partial" title="3 out of 6 forms covered">
|
||||||
|
024 (v/vertex? o) (list o)
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="6 out of 6 forms covered">
|
||||||
|
025 (q/polygon? o) (:vertices o)
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 6 forms covered">
|
||||||
|
026 (p/path? o) (:nodes o)))
|
||||||
|
</span><br/>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
|
@ -14,124 +14,193 @@
|
||||||
003
|
003
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="covered" title="1 out of 1 forms covered">
|
<span class="covered" title="1 out of 1 forms covered">
|
||||||
004 (defn vertex?
|
004 (defn vertex-key
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
005 "True if `o` satisfies the conditions for a vertex. That is, essentially,
|
005 "Making sure we get the same key everytime we key a vertex with the same
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
006 that it must rerpresent a two- or three- dimensional vector. A vertex is
|
006 coordinates. `o` must have numeric values for `:x`, `:y`, and optionally
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
007 shall be a map having at least the keys `:x` and `:y`, where the value of
|
007 `:z`."
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
008 those keys is a number. If the key `:z` is also present, its value must also
|
008 [o]
|
||||||
</span><br/>
|
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
|
||||||
009 be a number.
|
|
||||||
</span><br/>
|
|
||||||
<span class="blank" title="0 out of 0 forms covered">
|
|
||||||
010
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
|
||||||
011 The name `vector?` was not used as that would clash with a function of that
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
|
||||||
012 name in `clojure.core` whose semantics are entirely different."
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
|
||||||
013 [o]
|
|
||||||
</span><br/>
|
|
||||||
<span class="partial" title="15 out of 17 forms covered">
|
|
||||||
014 (and
|
|
||||||
</span><br/>
|
|
||||||
<span class="covered" title="3 out of 3 forms covered">
|
|
||||||
015 (map? o)
|
|
||||||
</span><br/>
|
|
||||||
<span class="covered" title="5 out of 5 forms covered">
|
|
||||||
016 (number? (:x o))
|
|
||||||
</span><br/>
|
|
||||||
<span class="covered" title="5 out of 5 forms covered">
|
|
||||||
017 (number? (:y o))
|
|
||||||
</span><br/>
|
|
||||||
<span class="covered" title="9 out of 9 forms covered">
|
|
||||||
018 (or (nil? (:z o)) (number? (:z o)))))
|
|
||||||
</span><br/>
|
|
||||||
<span class="blank" title="0 out of 0 forms covered">
|
|
||||||
019
|
|
||||||
</span><br/>
|
|
||||||
<span class="covered" title="1 out of 1 forms covered">
|
|
||||||
020 (def ensure3d
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
|
||||||
021 "Given a vertex `o`, if `o` has a `:z` value, just return `o`; otherwise
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
|
||||||
022 return a vertex like `o` but having thie `dflt` value as the value of its
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
|
||||||
023 `:z` key, or zero as the value of its `:z` key if `dflt` is not specified.
|
|
||||||
</span><br/>
|
|
||||||
<span class="blank" title="0 out of 0 forms covered">
|
|
||||||
024
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
|
||||||
025 If `o` is not a vertex, throws an exception."
|
|
||||||
</span><br/>
|
|
||||||
<span class="covered" title="2 out of 2 forms covered">
|
|
||||||
026 (memoize
|
|
||||||
</span><br/>
|
|
||||||
<span class="covered" title="1 out of 1 forms covered">
|
|
||||||
027 (fn
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
|
||||||
028 ([o]
|
|
||||||
</span><br/>
|
|
||||||
<span class="covered" title="4 out of 4 forms covered">
|
|
||||||
029 (ensure3d o 0.0))
|
|
||||||
</span><br/>
|
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
|
||||||
030 ([o dflt]
|
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="partial" title="2 out of 3 forms covered">
|
<span class="partial" title="2 out of 3 forms covered">
|
||||||
031 (cond
|
009 (cond
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="partial" title="5 out of 8 forms covered">
|
<span class="partial" title="32 out of 34 forms covered">
|
||||||
032 (not (vertex? o)) (throw (Exception. "Not a vertex!"))
|
010 (and (:x o) (:y o) (:z o)) (keyword (str "vert{" (:x o) "|" (:y o) "|" (:z o) "}"))
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="covered" title="4 out of 4 forms covered">
|
<span class="partial" title="22 out of 23 forms covered">
|
||||||
033 (:z o) o
|
011 (and (:x o) (:y o)) (keyword (str "vert{" (:x o) "|" (:y o) "}"))
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 5 forms covered">
|
<span class="not-covered" title="0 out of 3 forms covered">
|
||||||
034 :else (assoc o :z dflt))))))
|
012 :else (throw (Exception. "Not a vertex."))))
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="blank" title="0 out of 0 forms covered">
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
035
|
013
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="covered" title="1 out of 1 forms covered">
|
<span class="covered" title="1 out of 1 forms covered">
|
||||||
036 (def ensure2d
|
014 (defn vertex?
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-tracked" title="0 out of 0 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
037 "If `o` is a vertex, set its `:z` value to zero; else throw an exception."
|
015 "True if `o` satisfies the conditions for a vertex. That is, essentially,
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="covered" title="2 out of 2 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
038 (memoize
|
016 that it must rerpresent a two- or three- dimensional vector. A vertex is
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
017 shall be a map having at least the keys `:x` and `:y`, where the value of
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
018 those keys is a number. If the key `:z` is also present, its value must also
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
019 be a number.
|
||||||
|
</span><br/>
|
||||||
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
|
020
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
021 The name `vector?` was not used as that would clash with a function of that
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
022 name in `clojure.core` whose semantics are entirely different."
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
023 [o]
|
||||||
|
</span><br/>
|
||||||
|
<span class="partial" title="23 out of 26 forms covered">
|
||||||
|
024 (and
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="3 out of 3 forms covered">
|
||||||
|
025 (map? o)
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="3 out of 3 forms covered">
|
||||||
|
026 (:id o)
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="5 out of 5 forms covered">
|
||||||
|
027 (number? (:x o))
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="5 out of 5 forms covered">
|
||||||
|
028 (number? (:y o))
|
||||||
|
</span><br/>
|
||||||
|
<span class="partial" title="13 out of 14 forms covered">
|
||||||
|
029 (or (nil? (:z o)) (number? (:z o)))
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="9 out of 9 forms covered">
|
||||||
|
030 (or (nil? (:kind o)) (= (:kind o) :vertex))))
|
||||||
|
</span><br/>
|
||||||
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
|
031
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="covered" title="1 out of 1 forms covered">
|
<span class="covered" title="1 out of 1 forms covered">
|
||||||
039 (fn [o]
|
032 (defn make-vertex
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 1 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
040 (if
|
033 "Make a vertex with this `x`, `y` and (if provided) `z` values. Returns a map
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 3 forms covered">
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
041 (vertex? o)
|
034 with those values, plus a unique `:id` value, and `:kind` set to `:vertex`.
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
035 It's not necessary to use this function to create a vertex, but the `:id`
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
036 must be present and must be unique."
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
037 ([x y]
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="8 out of 8 forms covered">
|
||||||
|
038 (let [v {:x x :y y :kind :vertex}]
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="7 out of 7 forms covered">
|
||||||
|
039 (assoc v :id (vertex-key v))))
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
040 ([x y z]
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="8 out of 8 forms covered">
|
||||||
|
041 (assoc (make-vertex x y) :z z)))
|
||||||
|
</span><br/>
|
||||||
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
|
042
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="1 out of 1 forms covered">
|
||||||
|
043 (def ensure3d
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
044 "Given a vertex `o`, if `o` has a `:z` value, just return `o`; otherwise
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
045 return a vertex like `o` but having thie `dflt` value as the value of its
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
046 `:z` key, or zero as the value of its `:z` key if `dflt` is not specified.
|
||||||
|
</span><br/>
|
||||||
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
|
047
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
048 If `o` is not a vertex, throws an exception."
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="2 out of 2 forms covered">
|
||||||
|
049 (memoize
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="1 out of 1 forms covered">
|
||||||
|
050 (fn
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
051 ([o]
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="4 out of 4 forms covered">
|
||||||
|
052 (ensure3d o 0.0))
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
053 ([o dflt]
|
||||||
|
</span><br/>
|
||||||
|
<span class="partial" title="2 out of 3 forms covered">
|
||||||
|
054 (cond
|
||||||
|
</span><br/>
|
||||||
|
<span class="partial" title="5 out of 8 forms covered">
|
||||||
|
055 (not (vertex? o)) (throw (Exception. "Not a vertex!"))
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="4 out of 4 forms covered">
|
||||||
|
056 (:z o) o
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 5 forms covered">
|
<span class="not-covered" title="0 out of 5 forms covered">
|
||||||
042 (assoc o :z 0.0)
|
057 :else (assoc o :z dflt))))))
|
||||||
|
</span><br/>
|
||||||
|
<span class="blank" title="0 out of 0 forms covered">
|
||||||
|
058
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="1 out of 1 forms covered">
|
||||||
|
059 (def ensure2d
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-tracked" title="0 out of 0 forms covered">
|
||||||
|
060 "If `o` is a vertex, set its `:z` value to zero; else throw an exception."
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="2 out of 2 forms covered">
|
||||||
|
061 (memoize
|
||||||
|
</span><br/>
|
||||||
|
<span class="covered" title="1 out of 1 forms covered">
|
||||||
|
062 (fn [o]
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 1 forms covered">
|
||||||
|
063 (if
|
||||||
</span><br/>
|
</span><br/>
|
||||||
<span class="not-covered" title="0 out of 3 forms covered">
|
<span class="not-covered" title="0 out of 3 forms covered">
|
||||||
043 (throw (Exception. "Not a vertex!"))))))
|
064 (vertex? o)
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 5 forms covered">
|
||||||
|
065 (assoc o :z 0.0)
|
||||||
|
</span><br/>
|
||||||
|
<span class="not-covered" title="0 out of 3 forms covered">
|
||||||
|
066 (throw (Exception. "Not a vertex!"))))))
|
||||||
</span><br/>
|
</span><br/>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
||||||
171
docs/codox/dali-performance.html
Normal file
171
docs/codox/dali-performance.html
Normal file
|
|
@ -0,0 +1,171 @@
|
||||||
|
<!DOCTYPE html PUBLIC ""
|
||||||
|
"">
|
||||||
|
<html><head><meta charset="UTF-8" /><title>Dali performance</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="css/highlight.css" /><script type="text/javascript" src="js/highlight.min.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a></h2><h1><a href="index.html"><span class="project-title"><span class="project-name">Walkmap</span> <span class="project-version">0.1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 current"><a href="dali-performance.html"><div class="inner"><span>Dali performance</span></div></a></li><li class="depth-1 "><a href="intro.html"><div class="inner"><span>Introduction to walkmap</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>walkmap</span></div></div></li><li class="depth-2 branch"><a href="walkmap.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="walkmap.edge.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>edge</span></div></a></li><li class="depth-2 branch"><a href="walkmap.geometry.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>geometry</span></div></a></li><li class="depth-2 branch"><a href="walkmap.ocean.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>ocean</span></div></a></li><li class="depth-2 branch"><a href="walkmap.path.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>path</span></div></a></li><li class="depth-2 branch"><a href="walkmap.polygon.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>polygon</span></div></a></li><li class="depth-2 branch"><a href="walkmap.stl.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>stl</span></div></a></li><li class="depth-2 branch"><a href="walkmap.superstructure.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>superstructure</span></div></a></li><li class="depth-2 branch"><a href="walkmap.svg.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>svg</span></div></a></li><li class="depth-2 branch"><a href="walkmap.utils.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>utils</span></div></a></li><li class="depth-2"><a href="walkmap.vertex.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>vertex</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#dali-performance" name="dali-performance"></a>Dali performance</h1>
|
||||||
|
<p>Notes written while trying to characterise the performance problem in Dali.</p>
|
||||||
|
<h2><a href="#hypothesis-one-its-the-way-i-format-the-polygons-thats-the-issue" name="hypothesis-one-its-the-way-i-format-the-polygons-thats-the-issue"></a>Hypothesis one: it’s the way I format the polygons that’s the issue</h2>
|
||||||
|
<p>Firstly, with both versions of <code>stl->svg</code> using the same version of <code>facet->svg-poly</code>, i.e. this one:</p>
|
||||||
|
<pre><code>(defn- facet->svg-poly
|
||||||
|
[facet]
|
||||||
|
[:polygon
|
||||||
|
{:points (s/join " " (map #(str (:x %) "," (:y %)) (:vertices facet)))}])
|
||||||
|
</code></pre>
|
||||||
|
<p>we get this performance using the smaller <code>isle_of_man</code> map:</p>
|
||||||
|
<pre><code>walkmap.svg=> (def ^:dynamic *preferred-svg-render* :hiccup)
|
||||||
|
#'walkmap.svg/*preferred-svg-render*
|
||||||
|
walkmap.svg=> (time (def hiccup (binary-stl-file->svg "resources/isle_of_man.stl" "resources/isle_of_man.svg")))
|
||||||
|
20-05-25 09:21:43 mason INFO [walkmap.svg:82] - Generating SVG for :hiccup renderer
|
||||||
|
20-05-25 09:21:43 mason INFO [walkmap.svg:96] - Emitting SVG with :hiccup renderer
|
||||||
|
"Elapsed time: 86.904891 msecs"
|
||||||
|
#'walkmap.svg/hiccup
|
||||||
|
walkmap.svg=> (def ^:dynamic *preferred-svg-render* :dali)
|
||||||
|
#'walkmap.svg/*preferred-svg-render*
|
||||||
|
walkmap.svg=> (time (def dali (binary-stl-file->svg "resources/isle_of_man.stl" "resources/isle_of_man.svg")))
|
||||||
|
20-05-25 09:22:17 mason INFO [walkmap.svg:82] - Generating SVG for :dali renderer
|
||||||
|
20-05-25 09:22:17 mason INFO [walkmap.svg:96] - Emitting SVG with :dali renderer
|
||||||
|
"Elapsed time: 890.863814 msecs"
|
||||||
|
#'walkmap.svg/dali
|
||||||
|
</code></pre>
|
||||||
|
<p>If we switch the Dali render to use my original version of <code>facet->svg-poly</code>, i.e. this one:</p>
|
||||||
|
<pre><code>(defn- dali-facet->svg-poly
|
||||||
|
[facet]
|
||||||
|
(vec
|
||||||
|
(cons
|
||||||
|
:polygon
|
||||||
|
(map #(vec (list (:x %) (:y %))) (:vertices facet)))))
|
||||||
|
</code></pre>
|
||||||
|
<p>we get this performance:</p>
|
||||||
|
<pre><code>walkmap.svg=> (def ^:dynamic *preferred-svg-render* :hiccup)
|
||||||
|
#'walkmap.svg/*preferred-svg-render*
|
||||||
|
walkmap.svg=> (time (def hiccup (binary-stl-file->svg "resources/isle_of_man.stl" "resources/isle_of_man.svg")))
|
||||||
|
20-05-25 09:35:33 mason INFO [walkmap.svg:82] - Generating SVG for :hiccup renderer
|
||||||
|
20-05-25 09:35:33 mason INFO [walkmap.svg:96] - Emitting SVG with :hiccup renderer
|
||||||
|
"Elapsed time: 84.09972 msecs"
|
||||||
|
#'walkmap.svg/hiccup
|
||||||
|
walkmap.svg=> (def ^:dynamic *preferred-svg-render* :dali)
|
||||||
|
#'walkmap.svg/*preferred-svg-render*
|
||||||
|
walkmap.svg=> (time (def dali (binary-stl-file->svg "resources/isle_of_man.stl" "resources/isle_of_man.svg")))
|
||||||
|
20-05-25 09:35:41 mason INFO [walkmap.svg:82] - Generating SVG for :dali renderer
|
||||||
|
20-05-25 09:35:41 mason INFO [walkmap.svg:96] - Emitting SVG with :dali renderer
|
||||||
|
"Elapsed time: 874.292007 msecs"
|
||||||
|
#'walkmap.svg/dali
|
||||||
|
</code></pre>
|
||||||
|
<p>No significant difference in performance.</p>
|
||||||
|
<p>If we generate but don’t render, we get this:</p>
|
||||||
|
<pre><code>walkmap.svg=> (def ^:dynamic *preferred-svg-render* :hiccup)
|
||||||
|
#'walkmap.svg/*preferred-svg-render*
|
||||||
|
walkmap.svg=> (time (def hiccup (binary-stl-file->svg "resources/isle_of_man.stl")))
|
||||||
|
20-05-25 09:37:44 mason INFO [walkmap.svg:82] - Generating SVG for :hiccup renderer
|
||||||
|
"Elapsed time: 52.614707 msecs"
|
||||||
|
#'walkmap.svg/hiccup
|
||||||
|
walkmap.svg=> (def ^:dynamic *preferred-svg-render* :dali)
|
||||||
|
#'walkmap.svg/*preferred-svg-render*
|
||||||
|
walkmap.svg=> (time (def dali (binary-stl-file->svg "resources/isle_of_man.stl")))
|
||||||
|
20-05-25 09:38:07 mason INFO [walkmap.svg:82] - Generating SVG for :dali renderer
|
||||||
|
"Elapsed time: 49.891043 msecs"
|
||||||
|
#'walkmap.svg/dali
|
||||||
|
</code></pre>
|
||||||
|
<p>This implies that the problem is not in the way polygons are formatted.</p>
|
||||||
|
<p>The difference between the two versions of <code>facet->svg-poly</code> is as follows:</p>
|
||||||
|
<h3><a href="#new-version-works-with-both-hiccup-and-dali-" name="new-version-works-with-both-hiccup-and-dali-"></a>New version, works with both Hiccup and Dali:</h3>
|
||||||
|
<pre><code>walkmap.svg=> (def stl (decode-binary-stl "resources/isle_of_man.stl"))
|
||||||
|
#'walkmap.svg/stl
|
||||||
|
walkmap.svg=> (def facet (first (:facets stl)))
|
||||||
|
#'walkmap.svg/facet
|
||||||
|
walkmap.svg=> (pprint facet)
|
||||||
|
{:normal {:x -0.0, :y 0.0, :z 1.0},
|
||||||
|
:vertices
|
||||||
|
[{:x 3.0, :y 1.0, :z 1.0}
|
||||||
|
{:x 2.0, :y 3.0, :z 1.0}
|
||||||
|
{:x 0.0, :y 0.0, :z 1.0}],
|
||||||
|
:abc 0}
|
||||||
|
nil
|
||||||
|
walkmap.svg=> (pprint (facet->svg-poly facet))
|
||||||
|
[:polygon {:points "3.0,1.0 2.0,3.0 0.0,0.0"}]
|
||||||
|
nil
|
||||||
|
</code></pre>
|
||||||
|
<p>In other words, the new version constructs the <code>:points</code> attribute of the <code>:polygon</code> tag by string concatenation, and the renderer just needs to output it.</p>
|
||||||
|
<h3><a href="#older-version-works-with-dali-only-" name="older-version-works-with-dali-only-"></a>Older version, works with Dali only:</h3>
|
||||||
|
<pre><code>walkmap.svg=> (pprint (dali-facet->svg-poly facet))
|
||||||
|
[:polygon [3.0 1.0] [2.0 3.0] [0.0 0.0]]
|
||||||
|
nil
|
||||||
|
</code></pre>
|
||||||
|
<p>This means that the renderer is actually doing more work, since it has to compose the <code>:points</code> attribute itself; nevertheless there doesn’t seem to be an increased time penalty.</p>
|
||||||
|
<h3><a href="#conclusion" name="conclusion"></a>Conclusion</h3>
|
||||||
|
<p>It doesn’t seem that formatting the polygons is the issue.</p>
|
||||||
|
<h2><a href="#hypothesis-two-dali-renderer-scales-non-linearly-with-number-of-objects-drawn" name="hypothesis-two-dali-renderer-scales-non-linearly-with-number-of-objects-drawn"></a>Hypothesis two: Dali renderer scales non-linearly with number of objects drawn</h2>
|
||||||
|
<p>To test this, we need some otherwise-similar test files with different numbers of objects:</p>
|
||||||
|
<pre><code>walkmap.svg=> (count (:facets stl))
|
||||||
|
4416
|
||||||
|
walkmap.svg=> (def small-stl (assoc stl :facets (take 400 (:facets stl))))
|
||||||
|
#'walkmap.svg/small-stl
|
||||||
|
walkmap.svg=> (count (:facets small-stl))
|
||||||
|
400
|
||||||
|
walkmap.svg=> (def large-stl (decode-binary-stl "../the-great-game/resources/maps/heightmap.stl"))
|
||||||
|
#'walkmap.svg/large-stl
|
||||||
|
walkmap.svg=> (count (:facets large-stl))
|
||||||
|
746585
|
||||||
|
walkmap.svg=> (def ^:dynamic *preferred-svg-render* :dali)
|
||||||
|
#'walkmap.svg/*preferred-svg-render*
|
||||||
|
walkmap.svg=> (time (dali.io/render-svg (stl->svg small-stl) "dali-small.svg"))
|
||||||
|
20-05-25 10:12:25 mason INFO [walkmap.svg:92] - Generating SVG for :dali renderer
|
||||||
|
"Elapsed time: 32.55506 msecs"
|
||||||
|
nil
|
||||||
|
walkmap.svg=> (def ^:dynamic *preferred-svg-render* :hiccup)
|
||||||
|
#'walkmap.svg/*preferred-svg-render*
|
||||||
|
walkmap.svg=> (time (spit "hiccup-small.svg" (hiccup.core/html (stl->svg small-stl))))
|
||||||
|
20-05-25 10:14:07 mason INFO [walkmap.svg:92] - Generating SVG for :hiccup renderer
|
||||||
|
"Elapsed time: 10.026369 msecs"
|
||||||
|
</code></pre>
|
||||||
|
<p>So we have</p>
|
||||||
|
<table>
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th> </th>
|
||||||
|
<th>Dali </th>
|
||||||
|
<th> </th>
|
||||||
|
<th>Hiccup </th>
|
||||||
|
<th> </th>
|
||||||
|
<th> </th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td># of facets </td>
|
||||||
|
<td>time (msecs) </td>
|
||||||
|
<td>objets/msec </td>
|
||||||
|
<td>time (msecs) </td>
|
||||||
|
<td>objets/msec </td>
|
||||||
|
<td>ratio (Dali/Hiccup) </td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<table>
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td>400 </td>
|
||||||
|
<td>32.55506 </td>
|
||||||
|
<td>12.29 </td>
|
||||||
|
<td>10.026369 </td>
|
||||||
|
<td>39.89 </td>
|
||||||
|
<td>3.35 </td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>4416 </td>
|
||||||
|
<td>874.292007 </td>
|
||||||
|
<td>5.05 </td>
|
||||||
|
<td>84.09972 </td>
|
||||||
|
<td>52.51 </td>
|
||||||
|
<td>10.40 </td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>746585 </td>
|
||||||
|
<td>29,695,695.61 </td>
|
||||||
|
<td>0.03 </td>
|
||||||
|
<td>16724.848222 </td>
|
||||||
|
<td>44.64 </td>
|
||||||
|
<td>1775.54 </td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<h3><a href="#conclusion" name="conclusion"></a>Conclusion</h3>
|
||||||
|
<p>What we’re seeing is that Hiccup renders more or less linearly by the number of objects (bear in mind that all of these objects are triangles, so essentially equally complex to render), whereas trhe performance of Dali degrades significantly as the number of objects increases.</p></div></div></div></body></html>
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -1,6 +1,6 @@
|
||||||
<!DOCTYPE html PUBLIC ""
|
<!DOCTYPE html PUBLIC ""
|
||||||
"">
|
"">
|
||||||
<html><head><meta charset="UTF-8" /><title>Introduction to walkmap</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="css/highlight.css" /><script type="text/javascript" src="js/highlight.min.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a></h2><h1><a href="index.html"><span class="project-title"><span class="project-name">Walkmap</span> <span class="project-version">0.1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 current"><a href="intro.html"><div class="inner"><span>Introduction to walkmap</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>walkmap</span></div></div></li><li class="depth-2 branch"><a href="walkmap.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="walkmap.edge.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>edge</span></div></a></li><li class="depth-2 branch"><a href="walkmap.geometry.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>geometry</span></div></a></li><li class="depth-2 branch"><a href="walkmap.path.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>path</span></div></a></li><li class="depth-2 branch"><a href="walkmap.polygon.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>polygon</span></div></a></li><li class="depth-2 branch"><a href="walkmap.stl.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>stl</span></div></a></li><li class="depth-2 branch"><a href="walkmap.svg.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>svg</span></div></a></li><li class="depth-2"><a href="walkmap.vertex.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>vertex</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#introduction-to-walkmap" name="introduction-to-walkmap"></a>Introduction to walkmap</h1>
|
<html><head><meta charset="UTF-8" /><title>Introduction to walkmap</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="css/highlight.css" /><script type="text/javascript" src="js/highlight.min.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a></h2><h1><a href="index.html"><span class="project-title"><span class="project-name">Walkmap</span> <span class="project-version">0.1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="dali-performance.html"><div class="inner"><span>Dali performance</span></div></a></li><li class="depth-1 current"><a href="intro.html"><div class="inner"><span>Introduction to walkmap</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>walkmap</span></div></div></li><li class="depth-2 branch"><a href="walkmap.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="walkmap.edge.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>edge</span></div></a></li><li class="depth-2 branch"><a href="walkmap.geometry.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>geometry</span></div></a></li><li class="depth-2 branch"><a href="walkmap.ocean.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>ocean</span></div></a></li><li class="depth-2 branch"><a href="walkmap.path.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>path</span></div></a></li><li class="depth-2 branch"><a href="walkmap.polygon.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>polygon</span></div></a></li><li class="depth-2 branch"><a href="walkmap.stl.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>stl</span></div></a></li><li class="depth-2 branch"><a href="walkmap.superstructure.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>superstructure</span></div></a></li><li class="depth-2 branch"><a href="walkmap.svg.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>svg</span></div></a></li><li class="depth-2 branch"><a href="walkmap.utils.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>utils</span></div></a></li><li class="depth-2"><a href="walkmap.vertex.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>vertex</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#introduction-to-walkmap" name="introduction-to-walkmap"></a>Introduction to walkmap</h1>
|
||||||
<p>This library is written in support of work on <a href="https://simon-brooke.github.io/the-great-game/codox/Pathmaking.html">The Great Game</a>, but is separate because it may be of some use in other settings.</p>
|
<p>This library is written in support of work on <a href="https://simon-brooke.github.io/the-great-game/codox/Pathmaking.html">The Great Game</a>, but is separate because it may be of some use in other settings.</p>
|
||||||
<h2><a href="#usage" name="usage"></a>Usage</h2>
|
<h2><a href="#usage" name="usage"></a>Usage</h2>
|
||||||
<p>What works:</p>
|
<p>What works:</p>
|
||||||
|
|
@ -10,6 +10,10 @@
|
||||||
<p>Lein dependency:</p>
|
<p>Lein dependency:</p>
|
||||||
<pre><code>[walkmap "0.1.0-SNAPSHOT"]
|
<pre><code>[walkmap "0.1.0-SNAPSHOT"]
|
||||||
</code></pre>
|
</code></pre>
|
||||||
|
<ul>
|
||||||
|
<li><a href="https://simon-brooke.github.io/walkmap/codox/index.html">API documentation</a></li>
|
||||||
|
<li><a href="https://simon-brooke.github.io/walkmap/cloverage/index.html">Test coverage</a></li>
|
||||||
|
</ul>
|
||||||
<h3><a href="#converting-heightmaps-to-stl" name="converting-heightmaps-to-stl"></a>Converting heightmaps to STL</h3>
|
<h3><a href="#converting-heightmaps-to-stl" name="converting-heightmaps-to-stl"></a>Converting heightmaps to STL</h3>
|
||||||
<p>Doesn’t work yet, and is not a priority. Use <a href="https://github.com/fogleman/hmm">hmm</a> instead.</p>
|
<p>Doesn’t work yet, and is not a priority. Use <a href="https://github.com/fogleman/hmm">hmm</a> instead.</p>
|
||||||
<h3><a href="#reading-binary-stl-files" name="reading-binary-stl-files"></a>Reading binary STL files</h3>
|
<h3><a href="#reading-binary-stl-files" name="reading-binary-stl-files"></a>Reading binary STL files</h3>
|
||||||
|
|
@ -36,10 +40,19 @@
|
||||||
<pre><code>(require '[walkmap.core :refer [binary-stl-file->svg]])
|
<pre><code>(require '[walkmap.core :refer [binary-stl-file->svg]])
|
||||||
(binary-stl-file->svg "path/to/input-file.stl" "path-to-output-file.svg")
|
(binary-stl-file->svg "path/to/input-file.stl" "path-to-output-file.svg")
|
||||||
</code></pre>
|
</code></pre>
|
||||||
<p>As above, but, as a side effect, writes the SVG to the specified output file. Works for smaller test files, as above.</p>
|
<p>As above, but, as a side effect, writes the SVG to the specified output file.</p>
|
||||||
<h3><a href="#merging-exclusion-maps-and-reserved-area-maps" name="merging-exclusion-maps-and-reserved-area-maps"></a>Merging exclusion maps and reserved area maps</h3>
|
<h3><a href="#merging-exclusion-maps-and-reserved-area-maps" name="merging-exclusion-maps-and-reserved-area-maps"></a>Merging exclusion maps and reserved area maps</h3>
|
||||||
<p>It is intended that it should be possible to merge exclusion maps (maps of areas which should be excluded from the traversable area) with maps derived from height maps. These exclusion maps will probably be represented as SVG.</p>
|
<p>It is intended that it should be possible to merge exclusion maps (maps of areas which should be excluded from the traversable area) with maps derived from height maps. These exclusion maps will probably be represented as SVG.</p>
|
||||||
<p>This is not yet implemented.</p>
|
<p>This is not yet implemented.</p>
|
||||||
|
<p>Culling facets in ocean areas is implemented and works:</p>
|
||||||
|
<pre><code>(require '[walkmap.core :refer [cull-ocean-facets *sea-level*]])
|
||||||
|
(cull-ocean-facets stl)
|
||||||
|
</code></pre>
|
||||||
|
<p>If sea level in your heightmaps is not zero, e.g. is 5, set it thus:</p>
|
||||||
|
<pre><code>(def ^:dynamic *sea-level* 5.0)
|
||||||
|
(cull-ocean-facets stl)
|
||||||
|
</code></pre>
|
||||||
|
<p>It is <strong>strongly recomended</strong> that you set <code>*sea-level*</code> to a floating point number, not an integer, because numbers are specified in the STL file as floating point, and in Clojure, <code>(= 5 5.0)</code> returns <code>false</code>.</p>
|
||||||
<h3><a href="#merging-road-maps-and-river-system-maps" name="merging-road-maps-and-river-system-maps"></a>Merging road maps and river system maps</h3>
|
<h3><a href="#merging-road-maps-and-river-system-maps" name="merging-road-maps-and-river-system-maps"></a>Merging road maps and river system maps</h3>
|
||||||
<p>It is intended that it should be possible to merge road maps (maps of already computed routes) with maps derived from height maps. These exclusion maps will probably be represented as SVG. This is not yet implemented.</p>
|
<p>It is intended that it should be possible to merge road maps (maps of already computed routes) with maps derived from height maps. These exclusion maps will probably be represented as SVG. This is not yet implemented.</p>
|
||||||
<p>River system maps are conceptually similar to road maps; this too is not yet implemented.</p>
|
<p>River system maps are conceptually similar to road maps; this too is not yet implemented.</p>
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
<!DOCTYPE html PUBLIC ""
|
<!DOCTYPE html PUBLIC ""
|
||||||
"">
|
"">
|
||||||
<html><head><meta charset="UTF-8" /><title>walkmap.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="css/highlight.css" /><script type="text/javascript" src="js/highlight.min.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a></h2><h1><a href="index.html"><span class="project-title"><span class="project-name">Walkmap</span> <span class="project-version">0.1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="intro.html"><div class="inner"><span>Introduction to walkmap</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>walkmap</span></div></div></li><li class="depth-2 branch current"><a href="walkmap.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="walkmap.edge.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>edge</span></div></a></li><li class="depth-2 branch"><a href="walkmap.geometry.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>geometry</span></div></a></li><li class="depth-2 branch"><a href="walkmap.path.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>path</span></div></a></li><li class="depth-2 branch"><a href="walkmap.polygon.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>polygon</span></div></a></li><li class="depth-2 branch"><a href="walkmap.stl.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>stl</span></div></a></li><li class="depth-2 branch"><a href="walkmap.svg.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>svg</span></div></a></li><li class="depth-2"><a href="walkmap.vertex.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>vertex</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="walkmap.core.html#var-*sea-level*"><div class="inner"><span>*sea-level*</span></div></a></li><li class="depth-1"><a href="walkmap.core.html#var-binary-stl-file-.3Esvg"><div class="inner"><span>binary-stl-file->svg</span></div></a></li><li class="depth-1"><a href="walkmap.core.html#var-cull-ocean-facets"><div class="inner"><span>cull-ocean-facets</span></div></a></li><li class="depth-1"><a href="walkmap.core.html#var-ocean.3F"><div class="inner"><span>ocean?</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">walkmap.core</h1><div class="doc"><div class="markdown"><p>At this stage, primarily utility functions dealing with stereolithography (STL) files. Not a stable API yet!</p></div></div><div class="public anchor" id="var-*sea-level*"><h3>*sea-level*</h3><h4 class="dynamic">dynamic</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>The sea level on heightmaps we’re currently handling. If characters are to be able to swin in the sea, we must model the sea bottom, so we need heightmaps which cover at least the continental shelf. However, the sea bottom is not walkable territory and can be culled from walkmaps.</p>
|
<html><head><meta charset="UTF-8" /><title>walkmap.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="css/highlight.css" /><script type="text/javascript" src="js/highlight.min.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a></h2><h1><a href="index.html"><span class="project-title"><span class="project-name">Walkmap</span> <span class="project-version">0.1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="dali-performance.html"><div class="inner"><span>Dali performance</span></div></a></li><li class="depth-1 "><a href="intro.html"><div class="inner"><span>Introduction to walkmap</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>walkmap</span></div></div></li><li class="depth-2 branch current"><a href="walkmap.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="walkmap.edge.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>edge</span></div></a></li><li class="depth-2 branch"><a href="walkmap.geometry.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>geometry</span></div></a></li><li class="depth-2 branch"><a href="walkmap.ocean.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>ocean</span></div></a></li><li class="depth-2 branch"><a href="walkmap.path.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>path</span></div></a></li><li class="depth-2 branch"><a href="walkmap.polygon.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>polygon</span></div></a></li><li class="depth-2 branch"><a href="walkmap.stl.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>stl</span></div></a></li><li class="depth-2 branch"><a href="walkmap.superstructure.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>superstructure</span></div></a></li><li class="depth-2 branch"><a href="walkmap.svg.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>svg</span></div></a></li><li class="depth-2 branch"><a href="walkmap.utils.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>utils</span></div></a></li><li class="depth-2"><a href="walkmap.vertex.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>vertex</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">walkmap.core</h1><div class="doc"><div class="markdown"><p>This namespace mostly gets used as a scratchpad for ideas which haven’t yet solidified.</p></div></div></div></body></html>
|
||||||
<p><strong>Note</strong> must be a floating point number. <code>(= 0 0.0)</code> returns <code>false</code>!</p></div></div><div class="src-link"><a href="https://github.com/simon-brooke/walkmap/blob/master/src/walkmap/core.clj#L12">view source</a></div></div><div class="public anchor" id="var-binary-stl-file-.3Esvg"><h3>binary-stl-file->svg</h3><div class="usage"><code>(binary-stl-file->svg in-filename)</code><code>(binary-stl-file->svg in-filename out-filename)</code></div><div class="doc"><div class="markdown"><p>Given only an <code>in-filename</code>, parse the indicated file, expected to be binary STL, and return an equivalent SVG structure. Given both <code>in-filename</code> and <code>out-filename</code>, as side-effect write the SVG to the indicated output file.</p></div></div><div class="src-link"><a href="https://github.com/simon-brooke/walkmap/blob/master/src/walkmap/core.clj#L34">view source</a></div></div><div class="public anchor" id="var-cull-ocean-facets"><h3>cull-ocean-facets</h3><div class="usage"><code>(cull-ocean-facets stl)</code></div><div class="doc"><div class="markdown"><p>Ye cannae walk on water. Remove all facets from this <code>stl</code> structure which are at sea level.</p></div></div><div class="src-link"><a href="https://github.com/simon-brooke/walkmap/blob/master/src/walkmap/core.clj#L28">view source</a></div></div><div class="public anchor" id="var-ocean.3F"><h3>ocean?</h3><div class="usage"><code>(ocean? facet)</code></div><div class="doc"><div class="markdown"><p>Of a <code>facet</code>, is the altitude of every vertice equal to <code>*sea-level*</code>?</p></div></div><div class="src-link"><a href="https://github.com/simon-brooke/walkmap/blob/master/src/walkmap/core.clj#L21">view source</a></div></div></div></body></html>
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -1,3 +1,3 @@
|
||||||
<!DOCTYPE html PUBLIC ""
|
<!DOCTYPE html PUBLIC ""
|
||||||
"">
|
"">
|
||||||
<html><head><meta charset="UTF-8" /><title>walkmap.geometry documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="css/highlight.css" /><script type="text/javascript" src="js/highlight.min.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a></h2><h1><a href="index.html"><span class="project-title"><span class="project-name">Walkmap</span> <span class="project-version">0.1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="intro.html"><div class="inner"><span>Introduction to walkmap</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>walkmap</span></div></div></li><li class="depth-2 branch"><a href="walkmap.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="walkmap.edge.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>edge</span></div></a></li><li class="depth-2 branch current"><a href="walkmap.geometry.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>geometry</span></div></a></li><li class="depth-2 branch"><a href="walkmap.path.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>path</span></div></a></li><li class="depth-2 branch"><a href="walkmap.polygon.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>polygon</span></div></a></li><li class="depth-2 branch"><a href="walkmap.stl.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>stl</span></div></a></li><li class="depth-2 branch"><a href="walkmap.svg.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>svg</span></div></a></li><li class="depth-2"><a href="walkmap.vertex.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>vertex</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="walkmap.geometry.html#var-collinear.3F"><div class="inner"><span>collinear?</span></div></a></li><li class="depth-1"><a href="walkmap.geometry.html#var-on.3F"><div class="inner"><span>on?</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">walkmap.geometry</h1><div class="doc"><div class="markdown"><p><strong>TODO</strong>: write docs</p></div></div><div class="public anchor" id="var-collinear.3F"><h3>collinear?</h3><div class="usage"><code>(collinear? v1 v2 v3)</code></div><div class="doc"><div class="markdown"><p>True if these vertices <code>v1</code>, <code>v2</code>, <code>v3</code> are colinear; false otherwise.</p></div></div><div class="src-link"><a href="https://github.com/simon-brooke/walkmap/blob/master/src/walkmap/geometry.clj#L9">view source</a></div></div><div class="public anchor" id="var-on.3F"><h3>on?</h3><div class="usage"><code>(on? e v)</code></div><div class="doc"><div class="markdown"><p>True if the vertex <code>v</code> is on the edge <code>e</code>.</p></div></div><div class="src-link"><a href="https://github.com/simon-brooke/walkmap/blob/master/src/walkmap/geometry.clj#L42">view source</a></div></div></div></body></html>
|
<html><head><meta charset="UTF-8" /><title>walkmap.geometry documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="css/highlight.css" /><script type="text/javascript" src="js/highlight.min.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a></h2><h1><a href="index.html"><span class="project-title"><span class="project-name">Walkmap</span> <span class="project-version">0.1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="dali-performance.html"><div class="inner"><span>Dali performance</span></div></a></li><li class="depth-1 "><a href="intro.html"><div class="inner"><span>Introduction to walkmap</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>walkmap</span></div></div></li><li class="depth-2 branch"><a href="walkmap.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="walkmap.edge.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>edge</span></div></a></li><li class="depth-2 branch current"><a href="walkmap.geometry.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>geometry</span></div></a></li><li class="depth-2 branch"><a href="walkmap.ocean.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>ocean</span></div></a></li><li class="depth-2 branch"><a href="walkmap.path.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>path</span></div></a></li><li class="depth-2 branch"><a href="walkmap.polygon.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>polygon</span></div></a></li><li class="depth-2 branch"><a href="walkmap.stl.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>stl</span></div></a></li><li class="depth-2 branch"><a href="walkmap.superstructure.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>superstructure</span></div></a></li><li class="depth-2 branch"><a href="walkmap.svg.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>svg</span></div></a></li><li class="depth-2 branch"><a href="walkmap.utils.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>utils</span></div></a></li><li class="depth-2"><a href="walkmap.vertex.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>vertex</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="walkmap.geometry.html#var-on.3F"><div class="inner"><span>on?</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">walkmap.geometry</h1><div class="doc"><div class="markdown"><p><strong>TODO</strong>: write docs</p></div></div><div class="public anchor" id="var-on.3F"><h3>on?</h3><div class="usage"><code>(on? e v)</code></div><div class="doc"><div class="markdown"><p>True if the vertex <code>v</code> is on the edge <code>e</code>.</p></div></div><div class="src-link"><a href="https://github.com/simon-brooke/walkmap/blob/master/src/walkmap/geometry.clj#L9">view source</a></div></div></div></body></html>
|
||||||
4
docs/codox/walkmap.ocean.html
Normal file
4
docs/codox/walkmap.ocean.html
Normal file
|
|
@ -0,0 +1,4 @@
|
||||||
|
<!DOCTYPE html PUBLIC ""
|
||||||
|
"">
|
||||||
|
<html><head><meta charset="UTF-8" /><title>walkmap.ocean documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="css/highlight.css" /><script type="text/javascript" src="js/highlight.min.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a></h2><h1><a href="index.html"><span class="project-title"><span class="project-name">Walkmap</span> <span class="project-version">0.1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="dali-performance.html"><div class="inner"><span>Dali performance</span></div></a></li><li class="depth-1 "><a href="intro.html"><div class="inner"><span>Introduction to walkmap</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>walkmap</span></div></div></li><li class="depth-2 branch"><a href="walkmap.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="walkmap.edge.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>edge</span></div></a></li><li class="depth-2 branch"><a href="walkmap.geometry.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>geometry</span></div></a></li><li class="depth-2 branch current"><a href="walkmap.ocean.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>ocean</span></div></a></li><li class="depth-2 branch"><a href="walkmap.path.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>path</span></div></a></li><li class="depth-2 branch"><a href="walkmap.polygon.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>polygon</span></div></a></li><li class="depth-2 branch"><a href="walkmap.stl.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>stl</span></div></a></li><li class="depth-2 branch"><a href="walkmap.superstructure.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>superstructure</span></div></a></li><li class="depth-2 branch"><a href="walkmap.svg.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>svg</span></div></a></li><li class="depth-2 branch"><a href="walkmap.utils.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>utils</span></div></a></li><li class="depth-2"><a href="walkmap.vertex.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>vertex</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="walkmap.ocean.html#var-*sea-level*"><div class="inner"><span>*sea-level*</span></div></a></li><li class="depth-1"><a href="walkmap.ocean.html#var-cull-ocean-facets"><div class="inner"><span>cull-ocean-facets</span></div></a></li><li class="depth-1"><a href="walkmap.ocean.html#var-ocean.3F"><div class="inner"><span>ocean?</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">walkmap.ocean</h1><div class="doc"><div class="markdown"><p>Deal with (specifically, at this stage, cull) ocean areas</p></div></div><div class="public anchor" id="var-*sea-level*"><h3>*sea-level*</h3><h4 class="dynamic">dynamic</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>The sea level on heightmaps we’re currently handling. If characters are to be able to swin in the sea, we must model the sea bottom, so we need heightmaps which cover at least the continental shelf. However, the sea bottom is not walkable territory and can be culled from walkmaps.</p>
|
||||||
|
<p><strong>Note</strong> must be a floating point number. <code>(= 0 0.0)</code> returns <code>false</code>!</p></div></div><div class="src-link"><a href="https://github.com/simon-brooke/walkmap/blob/master/src/walkmap/ocean.clj#L4">view source</a></div></div><div class="public anchor" id="var-cull-ocean-facets"><h3>cull-ocean-facets</h3><div class="usage"><code>(cull-ocean-facets stl)</code></div><div class="doc"><div class="markdown"><p>Ye cannae walk on water. Remove all facets from this <code>stl</code> structure which are at sea level.</p></div></div><div class="src-link"><a href="https://github.com/simon-brooke/walkmap/blob/master/src/walkmap/ocean.clj#L20">view source</a></div></div><div class="public anchor" id="var-ocean.3F"><h3>ocean?</h3><div class="usage"><code>(ocean? facet)</code></div><div class="doc"><div class="markdown"><p>Of a <code>facet</code>, is the altitude of every vertice equal to <code>*sea-level*</code>?</p></div></div><div class="src-link"><a href="https://github.com/simon-brooke/walkmap/blob/master/src/walkmap/ocean.clj#L13">view source</a></div></div></div></body></html>
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -1,3 +1,3 @@
|
||||||
<!DOCTYPE html PUBLIC ""
|
<!DOCTYPE html PUBLIC ""
|
||||||
"">
|
"">
|
||||||
<html><head><meta charset="UTF-8" /><title>walkmap.polygon documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="css/highlight.css" /><script type="text/javascript" src="js/highlight.min.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a></h2><h1><a href="index.html"><span class="project-title"><span class="project-name">Walkmap</span> <span class="project-version">0.1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="intro.html"><div class="inner"><span>Introduction to walkmap</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>walkmap</span></div></div></li><li class="depth-2 branch"><a href="walkmap.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="walkmap.edge.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>edge</span></div></a></li><li class="depth-2 branch"><a href="walkmap.geometry.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>geometry</span></div></a></li><li class="depth-2 branch"><a href="walkmap.path.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>path</span></div></a></li><li class="depth-2 branch current"><a href="walkmap.polygon.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>polygon</span></div></a></li><li class="depth-2 branch"><a href="walkmap.stl.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>stl</span></div></a></li><li class="depth-2 branch"><a href="walkmap.svg.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>svg</span></div></a></li><li class="depth-2"><a href="walkmap.vertex.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>vertex</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="walkmap.polygon.html#var-polygon.3F"><div class="inner"><span>polygon?</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">walkmap.polygon</h1><div class="doc"><div class="markdown"><p>Essentially the specification for things we shall consider to be polygons.</p></div></div><div class="public anchor" id="var-polygon.3F"><h3>polygon?</h3><div class="usage"><code>(polygon? o)</code></div><div class="doc"><div class="markdown"><p>True if <code>o</code> satisfies the conditions for a polygon. A polygon shall be a map which has a value for the key <code>:vertices</code>, where that value is a sequence of vertices.</p></div></div><div class="src-link"><a href="https://github.com/simon-brooke/walkmap/blob/master/src/walkmap/polygon.clj#L5">view source</a></div></div></div></body></html>
|
<html><head><meta charset="UTF-8" /><title>walkmap.polygon documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="css/highlight.css" /><script type="text/javascript" src="js/highlight.min.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a></h2><h1><a href="index.html"><span class="project-title"><span class="project-name">Walkmap</span> <span class="project-version">0.1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="dali-performance.html"><div class="inner"><span>Dali performance</span></div></a></li><li class="depth-1 "><a href="intro.html"><div class="inner"><span>Introduction to walkmap</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>walkmap</span></div></div></li><li class="depth-2 branch"><a href="walkmap.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="walkmap.edge.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>edge</span></div></a></li><li class="depth-2 branch"><a href="walkmap.geometry.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>geometry</span></div></a></li><li class="depth-2 branch"><a href="walkmap.ocean.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>ocean</span></div></a></li><li class="depth-2 branch"><a href="walkmap.path.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>path</span></div></a></li><li class="depth-2 branch current"><a href="walkmap.polygon.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>polygon</span></div></a></li><li class="depth-2 branch"><a href="walkmap.stl.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>stl</span></div></a></li><li class="depth-2 branch"><a href="walkmap.superstructure.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>superstructure</span></div></a></li><li class="depth-2 branch"><a href="walkmap.svg.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>svg</span></div></a></li><li class="depth-2 branch"><a href="walkmap.utils.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>utils</span></div></a></li><li class="depth-2"><a href="walkmap.vertex.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>vertex</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="walkmap.polygon.html#var-polygon.3F"><div class="inner"><span>polygon?</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">walkmap.polygon</h1><div class="doc"><div class="markdown"><p>Essentially the specification for things we shall consider to be polygons.</p></div></div><div class="public anchor" id="var-polygon.3F"><h3>polygon?</h3><div class="usage"><code>(polygon? o)</code></div><div class="doc"><div class="markdown"><p>True if <code>o</code> satisfies the conditions for a polygon. A polygon shall be a map which has a value for the key <code>:vertices</code>, where that value is a sequence of vertices.</p></div></div><div class="src-link"><a href="https://github.com/simon-brooke/walkmap/blob/master/src/walkmap/polygon.clj#L5">view source</a></div></div></div></body></html>
|
||||||
File diff suppressed because one or more lines are too long
19
docs/codox/walkmap.superstructure.html
Normal file
19
docs/codox/walkmap.superstructure.html
Normal file
|
|
@ -0,0 +1,19 @@
|
||||||
|
<!DOCTYPE html PUBLIC ""
|
||||||
|
"">
|
||||||
|
<html><head><meta charset="UTF-8" /><title>walkmap.superstructure documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="css/highlight.css" /><script type="text/javascript" src="js/highlight.min.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a></h2><h1><a href="index.html"><span class="project-title"><span class="project-name">Walkmap</span> <span class="project-version">0.1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="dali-performance.html"><div class="inner"><span>Dali performance</span></div></a></li><li class="depth-1 "><a href="intro.html"><div class="inner"><span>Introduction to walkmap</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>walkmap</span></div></div></li><li class="depth-2 branch"><a href="walkmap.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="walkmap.edge.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>edge</span></div></a></li><li class="depth-2 branch"><a href="walkmap.geometry.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>geometry</span></div></a></li><li class="depth-2 branch"><a href="walkmap.ocean.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>ocean</span></div></a></li><li class="depth-2 branch"><a href="walkmap.path.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>path</span></div></a></li><li class="depth-2 branch"><a href="walkmap.polygon.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>polygon</span></div></a></li><li class="depth-2 branch"><a href="walkmap.stl.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>stl</span></div></a></li><li class="depth-2 branch current"><a href="walkmap.superstructure.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>superstructure</span></div></a></li><li class="depth-2 branch"><a href="walkmap.svg.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>svg</span></div></a></li><li class="depth-2 branch"><a href="walkmap.utils.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>utils</span></div></a></li><li class="depth-2"><a href="walkmap.vertex.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>vertex</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="walkmap.superstructure.html#var-add-to-superstructure"><div class="inner"><span>add-to-superstructure</span></div></a></li><li class="depth-1"><a href="walkmap.superstructure.html#var-index-vertex"><div class="inner"><span>index-vertex</span></div></a></li><li class="depth-1"><a href="walkmap.superstructure.html#var-index-vertices"><div class="inner"><span>index-vertices</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">walkmap.superstructure</h1><div class="doc"><div class="markdown"><p>single indexing structure for walkmap objects</p></div></div><div class="public anchor" id="var-add-to-superstructure"><h3>add-to-superstructure</h3><div class="usage"><code>(add-to-superstructure o)</code><code>(add-to-superstructure s o)</code></div><div class="doc"><div class="markdown"><p>Return a superstructure like <code>s</code> with object <code>o</code> added. If <code>o</code> is a collection, return a superstructure like <code>s</code> with each element of <code>o</code> added. If only one argument is supplied it will be assumed to represent <code>o</code> and a new superstructure will be returned.</p>
|
||||||
|
<p>It is an error (and an exception may be thrown) if</p>
|
||||||
|
<ol>
|
||||||
|
<li><code>s</code> is not a map;</li>
|
||||||
|
<li><code>o</code> is not a map, or a sequence of maps.</li>
|
||||||
|
</ol></div></div><div class="src-link"><a href="https://github.com/simon-brooke/walkmap/blob/master/src/walkmap/superstructure.clj#L54">view source</a></div></div><div class="public anchor" id="var-index-vertex"><h3>index-vertex</h3><div class="usage"><code>(index-vertex s o v)</code></div><div class="doc"><div class="markdown"><p>Return a superstructure like <code>s</code> in which object <code>o</code> is indexed by vertex <code>v</code>. It is an error (and an exception may be thrown) if</p>
|
||||||
|
<ol>
|
||||||
|
<li><code>s</code> is not a map;</li>
|
||||||
|
<li><code>o</code> is not a map;</li>
|
||||||
|
<li><code>o</code> does not have a value for the key <code>:id</code>;</li>
|
||||||
|
<li><code>v</code> is not a vertex.</li>
|
||||||
|
</ol></div></div><div class="src-link"><a href="https://github.com/simon-brooke/walkmap/blob/master/src/walkmap/superstructure.clj#L9">view source</a></div></div><div class="public anchor" id="var-index-vertices"><h3>index-vertices</h3><div class="usage"><code>(index-vertices s o)</code></div><div class="doc"><div class="markdown"><p>Return a superstructure like <code>s</code> in which object <code>o</code> is indexed by its vertices. It is an error (and an exception may be thrown) if</p>
|
||||||
|
<ol>
|
||||||
|
<li><code>s</code> is not a map;</li>
|
||||||
|
<li><code>o</code> is not a map;</li>
|
||||||
|
<li><code>o</code> does not have a value for the key <code>:id</code>.</li>
|
||||||
|
</ol></div></div><div class="src-link"><a href="https://github.com/simon-brooke/walkmap/blob/master/src/walkmap/superstructure.clj#L37">view source</a></div></div></div></body></html>
|
||||||
File diff suppressed because one or more lines are too long
3
docs/codox/walkmap.utils.html
Normal file
3
docs/codox/walkmap.utils.html
Normal file
|
|
@ -0,0 +1,3 @@
|
||||||
|
<!DOCTYPE html PUBLIC ""
|
||||||
|
"">
|
||||||
|
<html><head><meta charset="UTF-8" /><title>walkmap.utils documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="css/highlight.css" /><script type="text/javascript" src="js/highlight.min.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a></h2><h1><a href="index.html"><span class="project-title"><span class="project-name">Walkmap</span> <span class="project-version">0.1.0-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="dali-performance.html"><div class="inner"><span>Dali performance</span></div></a></li><li class="depth-1 "><a href="intro.html"><div class="inner"><span>Introduction to walkmap</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><div class="no-link"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>walkmap</span></div></div></li><li class="depth-2 branch"><a href="walkmap.core.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>core</span></div></a></li><li class="depth-2 branch"><a href="walkmap.edge.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>edge</span></div></a></li><li class="depth-2 branch"><a href="walkmap.geometry.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>geometry</span></div></a></li><li class="depth-2 branch"><a href="walkmap.ocean.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>ocean</span></div></a></li><li class="depth-2 branch"><a href="walkmap.path.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>path</span></div></a></li><li class="depth-2 branch"><a href="walkmap.polygon.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>polygon</span></div></a></li><li class="depth-2 branch"><a href="walkmap.stl.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>stl</span></div></a></li><li class="depth-2 branch"><a href="walkmap.superstructure.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>superstructure</span></div></a></li><li class="depth-2 branch"><a href="walkmap.svg.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>svg</span></div></a></li><li class="depth-2 branch current"><a href="walkmap.utils.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>utils</span></div></a></li><li class="depth-2"><a href="walkmap.vertex.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>vertex</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="walkmap.utils.html#var-deep-merge"><div class="inner"><span>deep-merge</span></div></a></li><li class="depth-1"><a href="walkmap.utils.html#var-vertices"><div class="inner"><span>vertices</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">walkmap.utils</h1><div class="doc"><div class="markdown"><p>Miscellaneous utility functions.</p></div></div><div class="public anchor" id="var-deep-merge"><h3>deep-merge</h3><div class="usage"><code>(deep-merge & vals)</code></div><div class="doc"><div class="markdown"><p>Recursively merges maps. If vals are not maps, the last value wins.</p></div></div><div class="src-link"><a href="https://github.com/simon-brooke/walkmap/blob/master/src/walkmap/utils.clj#L7">view source</a></div></div><div class="public anchor" id="var-vertices"><h3>vertices</h3><div class="usage"><code>(vertices o)</code></div><div class="doc"><div class="markdown"><p>If <code>o</code> is an object with vertices, return those vertices, else nil.</p></div></div><div class="src-link"><a href="https://github.com/simon-brooke/walkmap/blob/master/src/walkmap/utils.clj#L15">view source</a></div></div></div></body></html>
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -1,52 +0,0 @@
|
||||||
# -*- encoding: utf-8 -*-
|
|
||||||
# From https://github.com/IsseiMori/binary-stl-toASCII/blob/master/BinaryToASCII.py
|
|
||||||
# Included here to sanity check.
|
|
||||||
import struct
|
|
||||||
|
|
||||||
infile = open('../the-great-game/resources/maps/heightmap.stl') #import file
|
|
||||||
out = open('ASCII.stl', 'w') #export file
|
|
||||||
|
|
||||||
data = infile.read()
|
|
||||||
|
|
||||||
|
|
||||||
out.write("solid ")
|
|
||||||
|
|
||||||
for x in xrange(0,80):
|
|
||||||
if not ord(data[x]) == 0:
|
|
||||||
out.write(struct.unpack('c', data[x])[0])
|
|
||||||
else:
|
|
||||||
pass
|
|
||||||
out.write("\n")
|
|
||||||
|
|
||||||
number = data[80] + data[81] + data[82] + data[83]
|
|
||||||
faces = struct.unpack('I',number)[0]
|
|
||||||
|
|
||||||
for x in range(0,faces):
|
|
||||||
out.write("facet normal ")
|
|
||||||
|
|
||||||
xc = data[84+x*50] + data[85+x*50] + data[86+x*50] + data[87+x*50]
|
|
||||||
yc = data[88+x*50] + data[89+x*50] + data[90+x*50] + data[91+x*50]
|
|
||||||
zc = data[92+x*50] + data[93+x*50] + data[94+x*50] + data[95+x*50]
|
|
||||||
|
|
||||||
out.write(str(struct.unpack('f',xc)[0]) + " ")
|
|
||||||
out.write(str(struct.unpack('f',yc)[0]) + " ")
|
|
||||||
out.write(str(struct.unpack('f',zc)[0]) + "\n")
|
|
||||||
|
|
||||||
out.write("outer loop\n")
|
|
||||||
|
|
||||||
for y in range(1,4):
|
|
||||||
out.write("vertex ")
|
|
||||||
|
|
||||||
xc = data[84+y*12+x*50] + data[85+y*12+x*50] + data[86+y*12+x*50] + data[87+y*12+x*50]
|
|
||||||
yc = data[88+y*12+x*50] + data[89+y*12+x*50] + data[90+y*12+x*50] + data[91+y*12+x*50]
|
|
||||||
zc = data[92+y*12+x*50] + data[93+y*12+x*50] + data[94+y*12+x*50] + data[95+y*12+x*50]
|
|
||||||
|
|
||||||
out.write(str(struct.unpack('f',xc)[0]) + " ")
|
|
||||||
out.write(str(struct.unpack('f',yc)[0]) + " ")
|
|
||||||
out.write(str(struct.unpack('f',zc)[0]) + "\n")
|
|
||||||
|
|
||||||
out.write("endloop\n")
|
|
||||||
out.write("endfacet\n")
|
|
||||||
|
|
||||||
out.close()
|
|
||||||
print "end"
|
|
||||||
|
|
@ -13,7 +13,15 @@
|
||||||
(and
|
(and
|
||||||
(seq? v)
|
(seq? v)
|
||||||
(> (count v) 2)
|
(> (count v) 2)
|
||||||
(every? vertex? v))))
|
(every? vertex? v)
|
||||||
|
(or (nil? (:kind o)) (= (:kind o) :path)))))
|
||||||
|
|
||||||
|
(defn make-path
|
||||||
|
[nodes]
|
||||||
|
(if
|
||||||
|
(every? vertex? nodes)
|
||||||
|
{:nodes nodes :id (keyword (gensym "path")) :kind :path}
|
||||||
|
(throw (Exception. "Each item on path must be a vertex."))))
|
||||||
|
|
||||||
(defn polygon->path
|
(defn polygon->path
|
||||||
"If `o` is a polygon, return an equivalent path. What's different about
|
"If `o` is a polygon, return an equivalent path. What's different about
|
||||||
|
|
@ -25,6 +33,6 @@
|
||||||
[o]
|
[o]
|
||||||
(if
|
(if
|
||||||
(polygon? o)
|
(polygon? o)
|
||||||
(assoc (dissoc o :vertices) :nodes (concat (:vertices o) (list (first (:vertices o)))))
|
(assoc (dissoc o :vertices) :kind :path :nodes (concat (:vertices o) (list (first (:vertices o)))))
|
||||||
(throw (Exception. "Not a polygon!"))))
|
(throw (Exception. "Not a polygon!"))))
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -10,8 +10,9 @@
|
||||||
(let
|
(let
|
||||||
[v (:vertices o)]
|
[v (:vertices o)]
|
||||||
(and
|
(and
|
||||||
(seq? v)
|
(coll? v)
|
||||||
(> (count v) 2)
|
(> (count v) 2)
|
||||||
(every? vertex? v))))
|
(every? vertex? v)
|
||||||
|
(or (nil? (:kind o)) (= (:kind o) :polygon)))))
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,8 @@
|
||||||
[me.raynes.fs :as fs]
|
[me.raynes.fs :as fs]
|
||||||
[org.clojars.smee.binary.core :as b]
|
[org.clojars.smee.binary.core :as b]
|
||||||
[taoensso.timbre :as l :refer [info error spy]]
|
[taoensso.timbre :as l :refer [info error spy]]
|
||||||
[walkmap.polygon :refer [polygon?]])
|
[walkmap.polygon :refer [polygon?]]
|
||||||
|
[walkmap.vertex :refer [vertex-key]])
|
||||||
(:import org.clojars.smee.binary.core.BinaryIO
|
(:import org.clojars.smee.binary.core.BinaryIO
|
||||||
java.io.DataInput))
|
java.io.DataInput))
|
||||||
|
|
||||||
|
|
@ -26,6 +27,7 @@
|
||||||
(every? polygon? (:facets o))
|
(every? polygon? (:facets o))
|
||||||
(if (:header o) (string? (:header o)) true)
|
(if (:header o) (string? (:header o)) true)
|
||||||
(if (:count o) (integer? (:count o)) true)
|
(if (:count o) (integer? (:count o)) true)
|
||||||
|
(or (nil? (:kind o)) (= (:kind o) :stl))
|
||||||
(if verify-count? (= (:count o) (count (:facets o))) true))))
|
(if verify-count? (= (:count o) (count (:facets o))) true))))
|
||||||
|
|
||||||
(def vect
|
(def vect
|
||||||
|
|
@ -49,6 +51,26 @@
|
||||||
:count :uint-le
|
:count :uint-le
|
||||||
:facets (b/repeated facet)))
|
:facets (b/repeated facet)))
|
||||||
|
|
||||||
|
(defn canonicalise
|
||||||
|
"Objects read in from STL won't have all the keys/values we need them to have."
|
||||||
|
[o]
|
||||||
|
(cond
|
||||||
|
(and (coll? o) (not (map? o))) (map canonicalise o)
|
||||||
|
;; if it has :facets it's an STL structure, but it doesn't yet conform to `stl?`
|
||||||
|
(:facets o) (assoc o
|
||||||
|
:kind :stl
|
||||||
|
:id (or (:id o) (keyword (gensym "stl")))
|
||||||
|
:facets (canonicalise (:facets o)))
|
||||||
|
;; if it has :vertices it's a polygon, but it doesn't yet conform to `polygon?`
|
||||||
|
(:vertices o) (assoc o
|
||||||
|
:id (or (:id o) (keyword (gensym "poly")))
|
||||||
|
:kind :polygon
|
||||||
|
:vertices (canonicalise (:vertices o)))
|
||||||
|
;; if it has a value for :x it's a vertex, but it doesn't yet conform to `vertex?`
|
||||||
|
(:x o) (assoc o :kind :vertex :id (or (:id o) (vertex-key o)))
|
||||||
|
;; shouldn't happen
|
||||||
|
:else o))
|
||||||
|
|
||||||
(defn decode-binary-stl
|
(defn decode-binary-stl
|
||||||
"Parse a binary STL file from this `filename` and return an STL structure
|
"Parse a binary STL file from this `filename` and return an STL structure
|
||||||
representing its contents.
|
representing its contents.
|
||||||
|
|
@ -57,7 +79,7 @@
|
||||||
data, if it is not this will run but will return garbage."
|
data, if it is not this will run but will return garbage."
|
||||||
[filename]
|
[filename]
|
||||||
(let [in (io/input-stream filename)]
|
(let [in (io/input-stream filename)]
|
||||||
(b/decode binary-stl in)))
|
(canonicalise (b/decode binary-stl in))))
|
||||||
|
|
||||||
(defn- vect->str [prefix v]
|
(defn- vect->str [prefix v]
|
||||||
(str prefix " " (:x v) " " (:y v) " " (:z v) "\n"))
|
(str prefix " " (:x v) " " (:y v) " " (:z v) "\n"))
|
||||||
|
|
|
||||||
76
src/walkmap/superstructure.clj
Normal file
76
src/walkmap/superstructure.clj
Normal file
|
|
@ -0,0 +1,76 @@
|
||||||
|
(ns walkmap.superstructure
|
||||||
|
"single indexing structure for walkmap objects"
|
||||||
|
(:require [walkmap.path :as p]
|
||||||
|
[walkmap.polygon :as q]
|
||||||
|
[walkmap.stl :as s]
|
||||||
|
[walkmap.utils :as u]
|
||||||
|
[walkmap.vertex :as v]))
|
||||||
|
|
||||||
|
(defn index-vertex
|
||||||
|
"Return a superstructure like `s` in which object `o` is indexed by vertex
|
||||||
|
`v`. It is an error (and an exception may be thrown) if
|
||||||
|
|
||||||
|
1. `s` is not a map;
|
||||||
|
2. `o` is not a map;
|
||||||
|
3. `o` does not have a value for the key `:id`;
|
||||||
|
4. `v` is not a vertex."
|
||||||
|
;; two copies of the same vertex are not identical enough to one another
|
||||||
|
;; to be used as keys in a map. So our vertices need to have ids, and we need
|
||||||
|
;; to key the vertex-index by vertex ids.
|
||||||
|
;; TODO: BUT WE CANNOT USE GENSYMED ids, because two vertices with the same
|
||||||
|
;; vertices must have the same id!
|
||||||
|
[s o v]
|
||||||
|
(if-not (v/vertex? o)
|
||||||
|
(if (:id o)
|
||||||
|
(if (v/vertex? v)
|
||||||
|
(let [vi (or (:vertex-index s) {})
|
||||||
|
current (or (vi (:id v)) {})]
|
||||||
|
;; deep-merge doesn't merge sets, only maps; so at this
|
||||||
|
;; stage we need to build a map.
|
||||||
|
(assoc vi (:id v) (assoc current (:id o) (:id v))))
|
||||||
|
(throw (Exception. "Not a vertex: " v)))
|
||||||
|
(throw (Exception. (subs (str "No `:id` value: " o) 0 80))))
|
||||||
|
;; it shouldn't actually be an error to try to index a vertex, but it
|
||||||
|
;; also isn't useful to do so, so I'd be inclined to ignore it.
|
||||||
|
(:vertex-index s)))
|
||||||
|
|
||||||
|
(defn index-vertices
|
||||||
|
"Return a superstructure like `s` in which object `o` is indexed by its
|
||||||
|
vertices. It is an error (and an exception may be thrown) if
|
||||||
|
|
||||||
|
1. `s` is not a map;
|
||||||
|
2. `o` is not a map;
|
||||||
|
3. `o` does not have a value for the key `:id`."
|
||||||
|
[s o]
|
||||||
|
(assoc
|
||||||
|
s
|
||||||
|
:vertex-index
|
||||||
|
(reduce
|
||||||
|
u/deep-merge
|
||||||
|
(map
|
||||||
|
#(index-vertex s o %)
|
||||||
|
(u/vertices o)))))
|
||||||
|
|
||||||
|
(defn add-to-superstructure
|
||||||
|
"Return a superstructure like `s` with object `o` added. If `o` is a collection,
|
||||||
|
return a superstructure like `s` with each element of `o` added. If only one
|
||||||
|
argument is supplied it will be assumed to represent `o` and a new
|
||||||
|
superstructure will be returned.
|
||||||
|
|
||||||
|
It is an error (and an exception may be thrown) if
|
||||||
|
|
||||||
|
1. `s` is not a map;
|
||||||
|
2. `o` is not a map, or a sequence of maps."
|
||||||
|
([o]
|
||||||
|
(add-to-superstructure {} o))
|
||||||
|
([s o]
|
||||||
|
(cond
|
||||||
|
(map? o) (let [o' (if (:id o) o (assoc o :id (keyword (gensym "obj"))))]
|
||||||
|
(index-vertices (assoc s (:id o') o') o'))
|
||||||
|
(coll? o) (reduce u/deep-merge (map #(add-to-superstructure s %) o))
|
||||||
|
(nil? o) o
|
||||||
|
:else
|
||||||
|
(throw (Exception. (str "Don't know how to index " (or (type o) "nil")))))))
|
||||||
|
|
||||||
|
(:vertex-index (add-to-superstructure (:facets (s/decode-binary-stl "resources/isle_of_man.stl"))))
|
||||||
|
(s/decode-binary-stl "resources/isle_of_man.stl")
|
||||||
26
src/walkmap/utils.clj
Normal file
26
src/walkmap/utils.clj
Normal file
|
|
@ -0,0 +1,26 @@
|
||||||
|
(ns walkmap.utils
|
||||||
|
"Miscellaneous utility functions."
|
||||||
|
(:require [walkmap.path :as p]
|
||||||
|
[walkmap.polygon :as q]
|
||||||
|
[walkmap.vertex :as v]))
|
||||||
|
|
||||||
|
(defn deep-merge
|
||||||
|
"Recursively merges maps. If vals are not maps, the last value wins."
|
||||||
|
;; TODO: not my implementation, not sure I entirely trust it.
|
||||||
|
[& vals]
|
||||||
|
(if (every? map? vals)
|
||||||
|
(apply merge-with deep-merge vals)
|
||||||
|
(last vals)))
|
||||||
|
|
||||||
|
(defn vertices
|
||||||
|
"If `o` is an object with vertices, return those vertices, else nil."
|
||||||
|
;; TODO: it's possibly a design mistake that I'm currently distinguishing
|
||||||
|
;; between polygons and paths on the basis that one has `:vertices` and
|
||||||
|
;; the other has `:nodes`. Possibly it would be better to have a key
|
||||||
|
;; `:closed` which was `true` for polygons, `false` (or missing) for
|
||||||
|
;; paths.
|
||||||
|
[o]
|
||||||
|
(cond
|
||||||
|
(v/vertex? o) (list o)
|
||||||
|
(q/polygon? o) (:vertices o)
|
||||||
|
(p/path? o) (:nodes o)))
|
||||||
|
|
@ -1,6 +1,16 @@
|
||||||
(ns walkmap.vertex
|
(ns walkmap.vertex
|
||||||
"Essentially the specification for things we shall consider to be vertices.")
|
"Essentially the specification for things we shall consider to be vertices.")
|
||||||
|
|
||||||
|
(defn vertex-key
|
||||||
|
"Making sure we get the same key everytime we key a vertex with the same
|
||||||
|
coordinates. `o` must have numeric values for `:x`, `:y`, and optionally
|
||||||
|
`:z`."
|
||||||
|
[o]
|
||||||
|
(cond
|
||||||
|
(and (:x o) (:y o) (:z o)) (keyword (str "vert{" (:x o) "|" (:y o) "|" (:z o) "}"))
|
||||||
|
(and (:x o) (:y o)) (keyword (str "vert{" (:x o) "|" (:y o) "}"))
|
||||||
|
:else (throw (Exception. "Not a vertex."))))
|
||||||
|
|
||||||
(defn vertex?
|
(defn vertex?
|
||||||
"True if `o` satisfies the conditions for a vertex. That is, essentially,
|
"True if `o` satisfies the conditions for a vertex. That is, essentially,
|
||||||
that it must rerpresent a two- or three- dimensional vector. A vertex is
|
that it must rerpresent a two- or three- dimensional vector. A vertex is
|
||||||
|
|
@ -13,9 +23,22 @@
|
||||||
[o]
|
[o]
|
||||||
(and
|
(and
|
||||||
(map? o)
|
(map? o)
|
||||||
|
(:id o)
|
||||||
(number? (:x o))
|
(number? (:x o))
|
||||||
(number? (:y o))
|
(number? (:y o))
|
||||||
(or (nil? (:z o)) (number? (:z o)))))
|
(or (nil? (:z o)) (number? (:z o)))
|
||||||
|
(or (nil? (:kind o)) (= (:kind o) :vertex))))
|
||||||
|
|
||||||
|
(defn make-vertex
|
||||||
|
"Make a vertex with this `x`, `y` and (if provided) `z` values. Returns a map
|
||||||
|
with those values, plus a unique `:id` value, and `:kind` set to `:vertex`.
|
||||||
|
It's not necessary to use this function to create a vertex, but the `:id`
|
||||||
|
must be present and must be unique."
|
||||||
|
([x y]
|
||||||
|
(let [v {:x x :y y :kind :vertex}]
|
||||||
|
(assoc v :id (vertex-key v))))
|
||||||
|
([x y z]
|
||||||
|
(assoc (make-vertex x y) :z z)))
|
||||||
|
|
||||||
(def ensure3d
|
(def ensure3d
|
||||||
"Given a vertex `o`, if `o` has a `:z` value, just return `o`; otherwise
|
"Given a vertex `o`, if `o` has a `:z` value, just return `o`; otherwise
|
||||||
|
|
|
||||||
|
|
@ -1,46 +1,53 @@
|
||||||
(ns walkmap.edge-test
|
(ns walkmap.edge-test
|
||||||
(:require [clojure.test :refer :all]
|
(:require [clojure.test :refer :all]
|
||||||
[walkmap.edge :refer :all]))
|
[walkmap.edge :refer :all]
|
||||||
|
[walkmap.vertex :refer [make-vertex]]))
|
||||||
|
|
||||||
(deftest edge-test
|
(deftest edge-test
|
||||||
(testing "identification of edges."
|
(testing "identification of edges."
|
||||||
(is (edge? {:start {:x 0.0 :y 0.0 :z 0.0} :end {:x 3 :y 4 :z 0.0}}) "It is.")
|
(is (edge? {:start (make-vertex 0.0 0.0 0.0)
|
||||||
(is (not (edge? {:start {:y 0.0 :z 0.0} :end {:x 3 :y 4 :z 0.0}})) "Start lacks :x key")
|
:end (make-vertex 3 4 0.0)}) "It is.")
|
||||||
(is (not (edge? {:start {:x nil :y 0.0 :z 0.0} :end {:x 3 :y 4 :z 0.0}})) "Start lacks :x value")
|
(is (not (edge? {:start {:y 0.0 :z 0.0 :id 'foo}
|
||||||
(is (not (edge? {:begin {:x nil :y 0.0 :z 0.0} :end {:x 3 :y 4 :z 0.0}})) "Lacks start key")
|
:end {:x 3 :y 4 :z 0.0 :id 'bar}})) "Start lacks :x key")
|
||||||
(is (not (edge? {:start {:x nil :y 0.0 :z 0.0} :finish {:x 3 :y 4 :z 0.0}})) "Lacks end key")
|
(is (not (edge? {:start {:x nil :y 0.0 :z 0.0 :id 'foo}
|
||||||
(is (not (edge? {:start {:x "zero" :y 0.0 :z 0.0} :end {:x 3 :y 4 :z 0.0}})) "Value of x in start is not a number")
|
:end {:x 3 :y 4 :z 0.0 :id 'bar}})) "Start lacks :x value")
|
||||||
|
(is (not (edge? {:begin {:x nil :y 0.0 :z 0.0 :id 'foo}
|
||||||
|
:end {:x 3 :y 4 :z 0.0 :id 'bar}})) "Lacks start key")
|
||||||
|
(is (not (edge? {:start {:x nil :y 0.0 :z 0.0 :id 'foo}
|
||||||
|
:finish {:x 3 :y 4 :z 0.0 :id 'bar}})) "Lacks end key")
|
||||||
|
(is (not (edge? {:start {:x "zero" :y 0.0 :z 0.0 :id 'foo}
|
||||||
|
:end {:x 3 :y 4 :z 0.0 :id 'bar}})) "Value of x in start is not a number")
|
||||||
))
|
))
|
||||||
|
|
||||||
(deftest length-test
|
(deftest length-test
|
||||||
(testing "length of an edge"
|
(testing "length of an edge"
|
||||||
(is (= (length {:start {:x 0.0 :y 0.0 :z 0.0} :end {:x 3.0 :y 4.0 :z 0.0}}) 5.0))))
|
(is (= (length {:start {:x 0.0 :y 0.0 :z 0.0 :id 'foo} :end {:x 3.0 :y 4.0 :z 0.0 :id 'bar}}) 5.0))))
|
||||||
|
|
||||||
(deftest unit-vector-test
|
(deftest unit-vector-test
|
||||||
(testing "deriving the unit vector"
|
(testing "deriving the unit vector"
|
||||||
(is (=
|
(is (=
|
||||||
(unit-vector {:start {:x 0.0 :y 0.0 :z 0.0} :end {:x 3 :y 4 :z 0.0}})
|
(unit-vector {:start {:x 0.0 :y 0.0 :z 0.0 :id 'foo} :end {:x 3 :y 4 :z 0.0 :id 'bar}})
|
||||||
{:x 0.6, :y 0.8, :z 0.0}))
|
{:x 0.6, :y 0.8, :z 0.0}))
|
||||||
(is (=
|
(is (=
|
||||||
(unit-vector {:start {:x 1.0 :y 2.0 :z 3.5} :end {:x 4.0 :y 6.0 :z 3.5}})
|
(unit-vector {:start {:x 1.0 :y 2.0 :z 3.5 :id 'foo} :end {:x 4.0 :y 6.0 :z 3.5 :id 'bar}})
|
||||||
{:x 0.6, :y 0.8, :z 0.0}))))
|
{:x 0.6, :y 0.8, :z 0.0}))))
|
||||||
|
|
||||||
(deftest parallel-test
|
(deftest parallel-test
|
||||||
(testing "parallelism"
|
(testing "parallelism"
|
||||||
(is (parallel? {:start {:x 0.0 :y 0.0 :z 0.0} :end {:x 3 :y 4 :z 0.0}}
|
(is (parallel? {:start {:x 0.0 :y 0.0 :z 0.0 :id 'foo} :end {:x 3 :y 4 :z 0.0 :id 'bar}}
|
||||||
{:start {:x 1.0 :y 2.0 :z 3.5} :end {:x 4.0 :y 6.0 :z 3.5}})
|
{:start {:x 1.0 :y 2.0 :z 3.5 :id 'foo} :end {:x 4.0 :y 6.0 :z 3.5 :id 'bar}})
|
||||||
"Should be")
|
"Should be")
|
||||||
(is (not
|
(is (not
|
||||||
(parallel? {:start {:x 0.0 :y 0.0 :z 0.0} :end {:x 3 :y 4 :z 0.0}}
|
(parallel? {:start {:x 0.0 :y 0.0 :z 0.0 :id 'foo} :end {:x 3 :y 4 :z 0.0 :id 'bar}}
|
||||||
{:start {:x 1.0 :y 2.0 :z 3.5} :end {:x 4.0 :y 6.0 :z 3.49}}))
|
{:start {:x 1.0 :y 2.0 :z 3.5 :id 'foo} :end {:x 4.0 :y 6.0 :z 3.49 :id 'bar}}))
|
||||||
"Should not be!")))
|
"Should not be!")))
|
||||||
|
|
||||||
(deftest collinear-test
|
(deftest collinear-test
|
||||||
(testing "collinearity"
|
(testing "collinearity"
|
||||||
(is (collinear? {:start {:x 0.0 :y 0.0 :z 0.0} :end {:x 3.0 :y 4.0 :z 0.0}}
|
(is (collinear? {:start {:x 0.0 :y 0.0 :z 0.0 :id 'foo} :end {:x 3.0 :y 4.0 :z 0.0 :id 'bar}}
|
||||||
{:start {:x 3.0 :y 4.0 :z 0.0} :end {:x 9.0 :y 12.0 :z 0.0}})
|
{:start {:x 3.0 :y 4.0 :z 0.0 :id 'foo} :end {:x 9.0 :y 12.0 :z 0.0 :id 'bar}})
|
||||||
"Should be")
|
"Should be")
|
||||||
(is (not
|
(is (not
|
||||||
(collinear? {:start {:x 0.0 :y 0.0 :z 0.0} :end {:x 3 :y 4 :z 0.0}}
|
(collinear? {:start {:x 0.0 :y 0.0 :z 0.0 :id 'foo} :end {:x 3 :y 4 :z 0.0 :id 'bar}}
|
||||||
{:start {:x 1.0 :y 2.0 :z 3.5} :end {:x 4.0 :y 6.0 :z 3.5}}))
|
{:start {:x 1.0 :y 2.0 :z 3.5 :id 'foo} :end {:x 4.0 :y 6.0 :z 3.5 :id 'bar}}))
|
||||||
"Should not be!")))
|
"Should not be!")))
|
||||||
|
|
|
||||||
96
test/walkmap/stl_test.clj
Normal file
96
test/walkmap/stl_test.clj
Normal file
|
|
@ -0,0 +1,96 @@
|
||||||
|
(ns walkmap.stl-test
|
||||||
|
(:require [clojure.test :refer :all]
|
||||||
|
[walkmap.stl :refer :all]
|
||||||
|
[walkmap.polygon :refer [polygon?]]
|
||||||
|
[walkmap.vertex :refer [vertex?]]))
|
||||||
|
|
||||||
|
(deftest canonicalise-test
|
||||||
|
(testing "Canonicalisation of objects read from STL: vertices."
|
||||||
|
(is (vertex? (canonicalise {:x 3.0, :y 1.0, :z 1.0}))
|
||||||
|
"Vertex: should have an `:id` and `:kind` = `:vertex`.")
|
||||||
|
(is (= (:x (canonicalise {:x 3.0, :y 1.0, :z 1.0})) 3.0)
|
||||||
|
"`:x` value should be unchanged.")
|
||||||
|
(is (= (:y (canonicalise {:x 3.0, :y 1.0, :z 1.0})) 1.0)
|
||||||
|
"`:y` value should be unchanged.")
|
||||||
|
(is (= (:z (canonicalise {:x 3.0, :y 1.0, :z 1.0})) 1.0)
|
||||||
|
"`:z` value should be unchanged.")
|
||||||
|
(is (every?
|
||||||
|
vertex?
|
||||||
|
(canonicalise [{:x 3.0, :y 1.0, :z 1.0}
|
||||||
|
{:x 2.0, :y 3.0, :z 1.0}
|
||||||
|
{:x 0.0, :y 0.0, :z 1.0}]))
|
||||||
|
"Vertices: should recurse."))
|
||||||
|
(testing "Canonicalisation of objects read from STL: facets/polygons."
|
||||||
|
(let [p {:normal {:x -0.0, :y 0.0, :z 1.0},
|
||||||
|
:vertices [{:x 3.0, :y 1.0, :z 1.0}
|
||||||
|
{:x 2.0, :y 3.0, :z 1.0}
|
||||||
|
{:x 0.0, :y 0.0, :z 1.0}],
|
||||||
|
:abc 0}
|
||||||
|
p' (canonicalise p)]
|
||||||
|
(is (polygon? p')
|
||||||
|
"Polygon: should have an `:id` and `:kind` = `:polygon`.")
|
||||||
|
(is (= (count (:vertices p)) (count (:vertices p')))
|
||||||
|
"Number of vertices should not change")
|
||||||
|
(map
|
||||||
|
#(is (= (map % (:vertices p))(map % (:vertices p')))
|
||||||
|
(str "Order of vertices should not change: " %))
|
||||||
|
[:x :y :z]))
|
||||||
|
(is (every?
|
||||||
|
polygon?
|
||||||
|
(canonicalise
|
||||||
|
[{:normal {:x -0.0, :y 0.0, :z 1.0},
|
||||||
|
:vertices [{:x 3.0, :y 1.0, :z 1.0}
|
||||||
|
{:x 2.0, :y 3.0, :z 1.0}
|
||||||
|
{:x 0.0, :y 0.0, :z 1.0}],
|
||||||
|
:abc 0}
|
||||||
|
{:normal {:x 0.0, :y 0.0, :z 1.0},
|
||||||
|
:vertices [{:x 10.0, :y 4.0, :z 1.0}
|
||||||
|
{:x 22.0, :y 3.0, :z 1.0}
|
||||||
|
{:x 13.0, :y 5.0, :z 1.0}],
|
||||||
|
:abc 0}
|
||||||
|
{:normal {:x 0.0, :y 0.0, :z 1.0},
|
||||||
|
:vertices [{:x 26.0, :y 46.0, :z 1.0}
|
||||||
|
{:x 29.0, :y 49.0, :z 1.0}
|
||||||
|
{:x 31.0, :y 61.0, :z 1.0}],
|
||||||
|
:abc 0}
|
||||||
|
{:normal {:x -0.0, :y 0.0, :z 1.0},
|
||||||
|
:vertices [{:x 16.0, :y 33.0, :z 1.0}
|
||||||
|
{:x 15.0, :y 35.0, :z 1.0}
|
||||||
|
{:x 13.0, :y 32.0, :z 1.0}],
|
||||||
|
:abc 0}
|
||||||
|
{:normal {:x 0.0, :y 0.0, :z 1.0},
|
||||||
|
:vertices [{:x 81.0, :y 0.0, :z 1.0}
|
||||||
|
{:x 54.0, :y 27.0, :z 1.0}
|
||||||
|
{:x 51.0, :y 20.0, :z 1.0}],
|
||||||
|
:abc 0}]))
|
||||||
|
"Facets/polygons: should recurse."))
|
||||||
|
(testing "Canonicalisation of entire STL structure."
|
||||||
|
(let [stl {:header "Dummy test STL",
|
||||||
|
:count 5,
|
||||||
|
:facets [{:normal {:x -0.0, :y 0.0, :z 1.0},
|
||||||
|
:vertices [{:x 3.0, :y 1.0, :z 1.0}
|
||||||
|
{:x 2.0, :y 3.0, :z 1.0}
|
||||||
|
{:x 0.0, :y 0.0, :z 1.0}],
|
||||||
|
:abc 0}
|
||||||
|
{:normal {:x 0.0, :y 0.0, :z 1.0},
|
||||||
|
:vertices [{:x 10.0, :y 4.0, :z 1.0}
|
||||||
|
{:x 22.0, :y 3.0, :z 1.0}
|
||||||
|
{:x 13.0, :y 5.0, :z 1.0}],
|
||||||
|
:abc 0}
|
||||||
|
{:normal {:x 0.0, :y 0.0, :z 1.0},
|
||||||
|
:vertices [{:x 26.0, :y 46.0, :z 1.0}
|
||||||
|
{:x 29.0, :y 49.0, :z 1.0}
|
||||||
|
{:x 31.0, :y 61.0, :z 1.0}],
|
||||||
|
:abc 0}
|
||||||
|
{:normal {:x -0.0, :y 0.0, :z 1.0},
|
||||||
|
:vertices [{:x 16.0, :y 33.0, :z 1.0}
|
||||||
|
{:x 15.0, :y 35.0, :z 1.0}
|
||||||
|
{:x 13.0, :y 32.0, :z 1.0}],
|
||||||
|
:abc 0}
|
||||||
|
{:normal {:x 0.0, :y 0.0, :z 1.0},
|
||||||
|
:vertices [{:x 81.0, :y 0.0, :z 1.0}
|
||||||
|
{:x 54.0, :y 27.0, :z 1.0}
|
||||||
|
{:x 51.0, :y 20.0, :z 1.0}],
|
||||||
|
:abc 0}]}
|
||||||
|
stl' (canonicalise stl)]
|
||||||
|
(is (stl? stl') "Stl: should have an `:id` and `:kind` = `:stl`."))))
|
||||||
Loading…
Reference in a new issue