diff options
| author | Kartik Agaram <vc@akkartik.com> | 2020-10-04 21:24:46 -0700 |
|---|---|---|
| committer | Kartik Agaram <vc@akkartik.com> | 2020-10-04 21:24:46 -0700 |
| commit | 00af72ccb0d342feda053191793678e41548ee72 (patch) | |
| tree | 08fa95922e6052f87c8af7f5a4351af61cd1a56f | |
| parent | fbe6797c2ccb1e782ee3e0dd37c0310b8bb937e1 (diff) | |
| download | mu-00af72ccb0d342feda053191793678e41548ee72.tar.gz | |
6951 - 4 colors for Mu as well
| -rw-r--r-- | html/apps/raytracing/3.mu.html | 168 | ||||
| -rw-r--r-- | mu.vim | 5 |
2 files changed, 89 insertions, 84 deletions
diff --git a/html/apps/raytracing/3.mu.html b/html/apps/raytracing/3.mu.html index b4049787..66bb7958 100644 --- a/html/apps/raytracing/3.mu.html +++ b/html/apps/raytracing/3.mu.html @@ -14,13 +14,15 @@ pre { white-space: pre-wrap; font-family: monospace; color: #000000; background- body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; } a { color:inherit; } * { font-size:12pt; font-size: 1em; } +.muComment { color: #005faf; } +.muS1Comment { color: #0000af; } .LineNr { } -.muFunction { color: #af5f00; text-decoration: underline; } .SpecialChar { color: #d70000; } -.Comment { color: #005faf; } .Delimiter { color: #c000c0; } +.muFunction { color: #af5f00; text-decoration: underline; } .Constant { color: #008787; } .PreProc { color: #c000c0; } +.muS2Comment { color: #8a8a8a; } --> </style> @@ -56,20 +58,20 @@ if ('onhashchange' in window) { <body onload='JumpToLine();'> <a href='https://github.com/akkartik/mu/blob/master/apps/raytracing/3.mu'>https://github.com/akkartik/mu/blob/master/apps/raytracing/3.mu</a> <pre id='vimCodeElement'> -<span id="L1" class="LineNr"> 1 </span><span class="Comment"># Listing 9 of <a href="https://raytracing.github.io/books/RayTracingInOneWeekend.html">https://raytracing.github.io/books/RayTracingInOneWeekend.html</a></span> -<span id="L2" class="LineNr"> 2 </span><span class="Comment">#</span> -<span id="L3" class="LineNr"> 3 </span><span class="Comment"># To run (on Linux):</span> -<span id="L4" class="LineNr"> 4 </span><span class="Comment"># $ git clone <a href="https://github.com/akkartik/mu">https://github.com/akkartik/mu</a></span> -<span id="L5" class="LineNr"> 5 </span><span class="Comment"># $ cd mu</span> -<span id="L6" class="LineNr"> 6 </span><span class="Comment"># $ ./translate_mu apps/raytracing/3.mu</span> -<span id="L7" class="LineNr"> 7 </span><span class="Comment"># $ ./a.elf > 3.ppm</span> +<span id="L1" class="LineNr"> 1 </span><span class="muComment"># Listing 9 of <a href="https://raytracing.github.io/books/RayTracingInOneWeekend.html">https://raytracing.github.io/books/RayTracingInOneWeekend.html</a></span> +<span id="L2" class="LineNr"> 2 </span><span class="muComment">#</span> +<span id="L3" class="LineNr"> 3 </span><span class="muComment"># To run (on Linux):</span> +<span id="L4" class="LineNr"> 4 </span><span class="muComment"># $ git clone <a href="https://github.com/akkartik/mu">https://github.com/akkartik/mu</a></span> +<span id="L5" class="LineNr"> 5 </span><span class="muComment"># $ cd mu</span> +<span id="L6" class="LineNr"> 6 </span><span class="muComment"># $ ./translate_mu apps/raytracing/3.mu</span> +<span id="L7" class="LineNr"> 7 </span><span class="muComment"># $ ./a.elf > 3.ppm</span> <span id="L8" class="LineNr"> 8 </span> <span id="L9" class="LineNr"> 9 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='3.mu.html#L9'>ray-color</a></span> _in: (addr <a href='3.mu.html#L169'>ray</a>), _out: (addr <a href='3.mu.html#L194'>rgb</a>) <span class="Delimiter">{</span> <span id="L10" class="LineNr"> 10 </span> <span class="PreProc">var</span> in/<span class="Constant">esi</span>: (addr <a href='3.mu.html#L169'>ray</a>) <span class="SpecialChar"><-</span> copy _in <span id="L11" class="LineNr"> 11 </span> <span class="PreProc">var</span> out/<span class="Constant">edi</span>: (addr <a href='3.mu.html#L194'>rgb</a>) <span class="SpecialChar"><-</span> copy _out <span id="L12" class="LineNr"> 12 </span> <span class="PreProc">var</span> dir/<span class="Constant">eax</span>: (addr <a href='3.mu.html#L283'>vec3</a>) <span class="SpecialChar"><-</span> <a href='../../131table.subx.html#L26'>get</a> in, dir <span id="L13" class="LineNr"> 13 </span> <span class="PreProc">var</span> y-addr/<span class="Constant">eax</span>: (addr float) <span class="SpecialChar"><-</span> <a href='../../131table.subx.html#L26'>get</a> dir, y -<span id="L14" class="LineNr"> 14 </span> <span class="Comment"># t = (dir.y + 1.0) / 2.0</span> +<span id="L14" class="LineNr"> 14 </span> <span class="muComment"># t = (dir.y + 1.0) / 2.0</span> <span id="L15" class="LineNr"> 15 </span> <span class="PreProc">var</span> t/<span class="Constant">xmm0</span>: float <span class="SpecialChar"><-</span> copy *y-addr <span id="L16" class="LineNr"> 16 </span> <span class="PreProc">var</span> one/<span class="Constant">eax</span>: int <span class="SpecialChar"><-</span> copy <span class="Constant">1</span> <span id="L17" class="LineNr"> 17 </span> <span class="PreProc">var</span> one-f/<span class="Constant">xmm1</span>: float <span class="SpecialChar"><-</span> convert one @@ -77,142 +79,142 @@ if ('onhashchange' in window) { <span id="L19" class="LineNr"> 19 </span> <span class="PreProc">var</span> two/<span class="Constant">eax</span>: int <span class="SpecialChar"><-</span> copy <span class="Constant">2</span> <span id="L20" class="LineNr"> 20 </span> <span class="PreProc">var</span> two-f/<span class="Constant">xmm2</span>: float <span class="SpecialChar"><-</span> convert two <span id="L21" class="LineNr"> 21 </span> t <span class="SpecialChar"><-</span> divide two-f -<span id="L22" class="LineNr"> 22 </span> <span class="Comment"># whitening = (1.0 - t) * white</span> +<span id="L22" class="LineNr"> 22 </span> <span class="muComment"># whitening = (1.0 - t) * white</span> <span id="L23" class="LineNr"> 23 </span> <span class="PreProc">var</span> whitening-storage: <a href='3.mu.html#L194'>rgb</a> <span id="L24" class="LineNr"> 24 </span> <span class="PreProc">var</span> whitening/<span class="Constant">ecx</span>: (addr <a href='3.mu.html#L194'>rgb</a>) <span class="SpecialChar"><-</span> address whitening-storage <span id="L25" class="LineNr"> 25 </span> <a href='3.mu.html#L229'>rgb-white</a> whitening <span id="L26" class="LineNr"> 26 </span> <span class="PreProc">var</span> one-minus-t/<span class="Constant">xmm3</span>: float <span class="SpecialChar"><-</span> copy one-f <span id="L27" class="LineNr"> 27 </span> one-minus-t <span class="SpecialChar"><-</span> subtract t <span id="L28" class="LineNr"> 28 </span> <a href='3.mu.html#L264'>rgb-scale-up</a> whitening, one-minus-t -<span id="L29" class="LineNr"> 29 </span> <span class="Comment"># out = t * (0.5, 0.7, 1.0)</span> +<span id="L29" class="LineNr"> 29 </span> <span class="muComment"># out = t * (0.5, 0.7, 1.0)</span> <span id="L30" class="LineNr"> 30 </span> <span class="PreProc">var</span> dest/<span class="Constant">eax</span>: (addr float) <span class="SpecialChar"><-</span> <a href='../../131table.subx.html#L26'>get</a> out, r <span id="L31" class="LineNr"> 31 </span> <a href='../../409float.mu.html#L3'>fill-in-rational</a> dest, <span class="Constant">5</span>, <span class="Constant">0xa</span> <span id="L32" class="LineNr"> 32 </span> dest <span class="SpecialChar"><-</span> <a href='../../131table.subx.html#L26'>get</a> out, g <span id="L33" class="LineNr"> 33 </span> <a href='../../409float.mu.html#L3'>fill-in-rational</a> dest, <span class="Constant">7</span>, <span class="Constant">0xa</span> <span id="L34" class="LineNr"> 34 </span> dest <span class="SpecialChar"><-</span> <a href='../../131table.subx.html#L26'>get</a> out, b <span id="L35" class="LineNr"> 35 </span> copy-to *dest, one-f -<span id="L36" class="LineNr"> 36 </span> <span class="Comment"># blend with whitening</span> +<span id="L36" class="LineNr"> 36 </span> <span class="muComment"># blend with whitening</span> <span id="L37" class="LineNr"> 37 </span> <a href='3.mu.html#L241'>rgb-add-to</a> out, whitening <span id="L38" class="LineNr"> 38 </span><span class="Delimiter">}</span> <span id="L39" class="LineNr"> 39 </span> <span id="L40" class="LineNr"> 40 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='3.mu.html#L40'>main</a></span><span class="PreProc"> -> </span>exit-status/<span class="Constant">ebx</span>: int <span class="Delimiter">{</span> <span id="L41" class="LineNr"> 41 </span> -<span id="L42" class="LineNr"> 42 </span> <span class="Comment"># image</span> -<span id="L43" class="LineNr"> 43 </span> <span class="Comment"># width = 400</span> -<span id="L44" class="LineNr"> 44 </span> <span class="Comment"># height = 400 * 9/16 = 225</span> +<span id="L42" class="LineNr"> 42 </span> <span class="muComment"># image</span> +<span id="L43" class="LineNr"> 43 </span> <span class="muComment"># width = 400</span> +<span id="L44" class="LineNr"> 44 </span> <span class="muComment"># height = 400 * 9/16 = 225</span> <span id="L45" class="LineNr"> 45 </span> <span class="PreProc">var</span> aspect: float <span id="L46" class="LineNr"> 46 </span> <span class="PreProc">var</span> aspect-addr/<span class="Constant">eax</span>: (addr float) <span class="SpecialChar"><-</span> address aspect -<span id="L47" class="LineNr"> 47 </span> <a href='../../409float.mu.html#L3'>fill-in-rational</a> aspect-addr, <span class="Constant">0x10</span>, <span class="Constant">9</span> <span class="Comment"># 16/9</span> +<span id="L47" class="LineNr"> 47 </span> <a href='../../409float.mu.html#L3'>fill-in-rational</a> aspect-addr, <span class="Constant">0x10</span>, <span class="Constant">9</span> <span class="muComment"># 16/9</span> <span id="L48" class="LineNr"> 48 </span> -<span id="L49" class="LineNr"> 49 </span> <span class="Comment"># camera</span> +<span id="L49" class="LineNr"> 49 </span> <span class="muComment"># camera</span> <span id="L50" class="LineNr"> 50 </span> -<span id="L51" class="LineNr"> 51 </span> <span class="Comment"># viewport-height = 2.0</span> +<span id="L51" class="LineNr"> 51 </span> <span class="muComment"># viewport-height = 2.0</span> <span id="L52" class="LineNr"> 52 </span> <span class="PreProc">var</span> tmp/<span class="Constant">eax</span>: int <span class="SpecialChar"><-</span> copy <span class="Constant">2</span> <span id="L53" class="LineNr"> 53 </span> <span class="PreProc">var</span> two-f/<span class="Constant">xmm4</span>: float <span class="SpecialChar"><-</span> convert tmp <span id="L54" class="LineNr"> 54 </span> <span class="PreProc">var</span> viewport-height/<span class="Constant">xmm7</span>: float <span class="SpecialChar"><-</span> copy two-f -<span id="L55" class="LineNr"> 55 </span> <span class="Comment"># viewport-width = aspect * viewport-height</span> +<span id="L55" class="LineNr"> 55 </span> <span class="muComment"># viewport-width = aspect * viewport-height</span> <span id="L56" class="LineNr"> 56 </span> <span class="PreProc">var</span> viewport-width/<span class="Constant">xmm6</span>: float <span class="SpecialChar"><-</span> convert tmp <span id="L57" class="LineNr"> 57 </span> viewport-width <span class="SpecialChar"><-</span> multiply aspect -<span id="L58" class="LineNr"> 58 </span> <span class="Comment"># focal-length = 1.0</span> +<span id="L58" class="LineNr"> 58 </span> <span class="muComment"># focal-length = 1.0</span> <span id="L59" class="LineNr"> 59 </span> tmp <span class="SpecialChar"><-</span> copy <span class="Constant">1</span> <span id="L60" class="LineNr"> 60 </span> <span class="PreProc">var</span> focal-length/<span class="Constant">xmm5</span>: float <span class="SpecialChar"><-</span> convert tmp <span id="L61" class="LineNr"> 61 </span> -<span id="L62" class="LineNr"> 62 </span> <span class="Comment"># origin = point3(0, 0, 0)</span> +<span id="L62" class="LineNr"> 62 </span> <span class="muComment"># origin = point3(0, 0, 0)</span> <span id="L63" class="LineNr"> 63 </span> <span class="PreProc">var</span> origin-storage: <a href='3.mu.html#L283'>vec3</a> <span id="L64" class="LineNr"> 64 </span> <span class="PreProc">var</span> origin/<span class="Constant">edi</span>: (addr <a href='3.mu.html#L283'>vec3</a>) <span class="SpecialChar"><-</span> address origin-storage -<span id="L65" class="LineNr"> 65 </span> <span class="Comment"># horizontal = vec3(viewport-width, 0, 0)</span> +<span id="L65" class="LineNr"> 65 </span> <span class="muComment"># horizontal = vec3(viewport-width, 0, 0)</span> <span id="L66" class="LineNr"> 66 </span> <span class="PreProc">var</span> horizontal-storage: <a href='3.mu.html#L283'>vec3</a> <span id="L67" class="LineNr"> 67 </span> <span class="PreProc">var</span> dest/<span class="Constant">eax</span>: (addr float) <span class="SpecialChar"><-</span> <a href='../../131table.subx.html#L26'>get</a> horizontal-storage, x <span id="L68" class="LineNr"> 68 </span> copy-to *dest, viewport-width <span id="L69" class="LineNr"> 69 </span> <span class="PreProc">var</span> horizontal/<span class="Constant">ebx</span>: (addr <a href='3.mu.html#L283'>vec3</a>) <span class="SpecialChar"><-</span> address horizontal-storage -<span id="L70" class="LineNr"> 70 </span> <span class="Comment"># vertical = vec3(0, viewport-height, 0)</span> +<span id="L70" class="LineNr"> 70 </span> <span class="muComment"># vertical = vec3(0, viewport-height, 0)</span> <span id="L71" class="LineNr"> 71 </span> <span class="PreProc">var</span> vertical-storage: <a href='3.mu.html#L283'>vec3</a> <span id="L72" class="LineNr"> 72 </span> dest <span class="SpecialChar"><-</span> <a href='../../131table.subx.html#L26'>get</a> vertical-storage, y <span id="L73" class="LineNr"> 73 </span> copy-to *dest, viewport-height <span id="L74" class="LineNr"> 74 </span> <span class="PreProc">var</span> vertical/<span class="Constant">edx</span>: (addr <a href='3.mu.html#L283'>vec3</a>) <span class="SpecialChar"><-</span> address vertical-storage -<span id="L75" class="LineNr"> 75 </span> <span class="Comment"># lower-left-corner = origin - horizontal/2 - vertical/2 - vec3(0, 0, focal-length)</span> -<span id="L76" class="LineNr"> 76 </span> <span class="Comment"># . lower-left-corner = origin</span> +<span id="L75" class="LineNr"> 75 </span> <span class="muComment"># lower-left-corner = origin - horizontal/2 - vertical/2 - vec3(0, 0, focal-length)</span> +<span id="L76" class="LineNr"> 76 </span> <span class="muS1Comment"># . lower-left-corner = origin</span> <span id="L77" class="LineNr"> 77 </span> <span class="PreProc">var</span> lower-left-corner-storage: <a href='3.mu.html#L283'>vec3</a> <span id="L78" class="LineNr"> 78 </span> <span class="PreProc">var</span> lower-left-corner/<span class="Constant">esi</span>: (addr <a href='3.mu.html#L283'>vec3</a>) <span class="SpecialChar"><-</span> address lower-left-corner-storage <span id="L79" class="LineNr"> 79 </span> copy-object origin, lower-left-corner -<span id="L80" class="LineNr"> 80 </span> <span class="Comment"># . lower-left-corner -= horizontal/2</span> +<span id="L80" class="LineNr"> 80 </span> <span class="muS1Comment"># . lower-left-corner -= horizontal/2</span> <span id="L81" class="LineNr"> 81 </span> <span class="PreProc">var</span> tmp2: <a href='3.mu.html#L283'>vec3</a> <span id="L82" class="LineNr"> 82 </span> <span class="PreProc">var</span> tmp2-addr/<span class="Constant">eax</span>: (addr <a href='3.mu.html#L283'>vec3</a>) <span class="SpecialChar"><-</span> address tmp2 <span id="L83" class="LineNr"> 83 </span> copy-object horizontal, tmp2-addr <span id="L84" class="LineNr"> 84 </span> <a href='3.mu.html#L359'>vec3-scale-down</a> tmp2-addr, two-f <span id="L85" class="LineNr"> 85 </span> <a href='3.mu.html#L326'>vec3-subtract-from</a> lower-left-corner, tmp2-addr -<span id="L86" class="LineNr"> 86 </span> <span class="Comment"># . lower-left-corner -= vertical/2</span> +<span id="L86" class="LineNr"> 86 </span> <span class="muS1Comment"># . lower-left-corner -= vertical/2</span> <span id="L87" class="LineNr"> 87 </span> copy-object vertical, tmp2-addr <span id="L88" class="LineNr"> 88 </span> <a href='3.mu.html#L359'>vec3-scale-down</a> tmp2-addr, two-f <span id="L89" class="LineNr"> 89 </span> <a href='3.mu.html#L326'>vec3-subtract-from</a> lower-left-corner, tmp2-addr -<span id="L90" class="LineNr"> 90 </span> <span class="Comment"># . lower-left-corner -= vec3(0, 0, focal-length)</span> +<span id="L90" class="LineNr"> 90 </span> <span class="muS1Comment"># . lower-left-corner -= vec3(0, 0, focal-length)</span> <span id="L91" class="LineNr"> 91 </span> <span class="PreProc">var</span> dest2/<span class="Constant">ecx</span>: (addr float) <span class="SpecialChar"><-</span> <a href='../../131table.subx.html#L26'>get</a> lower-left-corner, z <span id="L92" class="LineNr"> 92 </span> <span class="PreProc">var</span> tmp3/<span class="Constant">xmm0</span>: float <span class="SpecialChar"><-</span> copy *dest2 <span id="L93" class="LineNr"> 93 </span> tmp3 <span class="SpecialChar"><-</span> subtract focal-length <span id="L94" class="LineNr"> 94 </span> copy-to *dest2, tmp3 -<span id="L95" class="LineNr"> 95 </span> <span class="Comment"># phew!</span> +<span id="L95" class="LineNr"> 95 </span> <span class="muComment"># phew!</span> <span id="L96" class="LineNr"> 96 </span> -<span id="L97" class="LineNr"> 97 </span> <span class="Comment"># render</span> +<span id="L97" class="LineNr"> 97 </span> <span class="muComment"># render</span> <span id="L98" class="LineNr"> 98 </span> -<span id="L99" class="LineNr"> 99 </span> <span class="Comment"># live variables at this point:</span> -<span id="L100" class="LineNr">100 </span> <span class="Comment"># origin (edi)</span> -<span id="L101" class="LineNr">101 </span> <span class="Comment"># lower-left-corner (esi)</span> -<span id="L102" class="LineNr">102 </span> <span class="Comment"># horizontal (ebx)</span> -<span id="L103" class="LineNr">103 </span> <span class="Comment"># vertical (edx)</span> -<span id="L104" class="LineNr">104 </span> <span class="Comment"># floating-point registers are all free</span> -<span id="L105" class="LineNr">105 </span> <a href='../../405screen.mu.html#L179'>print-string</a> <span class="Constant">0</span>, <span class="Constant">"P3\n400 225\n255\n"</span> <span class="Comment"># 225 = image height</span> -<span id="L106" class="LineNr">106 </span> <span class="PreProc">var</span> tmp/<span class="Constant">eax</span>: int <span class="SpecialChar"><-</span> copy <span class="Constant">0x18f</span> <span class="Comment"># image width - 1</span> +<span id="L99" class="LineNr"> 99 </span> <span class="muComment"># live variables at this point:</span> +<span id="L100" class="LineNr">100 </span> <span class="muComment"># origin (edi)</span> +<span id="L101" class="LineNr">101 </span> <span class="muComment"># lower-left-corner (esi)</span> +<span id="L102" class="LineNr">102 </span> <span class="muComment"># horizontal (ebx)</span> +<span id="L103" class="LineNr">103 </span> <span class="muComment"># vertical (edx)</span> +<span id="L104" class="LineNr">104 </span> <span class="muComment"># floating-point registers are all free</span> +<span id="L105" class="LineNr">105 </span> <a href='../../405screen.mu.html#L179'>print-string</a> <span class="Constant">0</span>, <span class="Constant">"P3\n400 225\n255\n"</span> <span class="muComment"># 225 = image height</span> +<span id="L106" class="LineNr">106 </span> <span class="PreProc">var</span> tmp/<span class="Constant">eax</span>: int <span class="SpecialChar"><-</span> copy <span class="Constant">0x18f</span> <span class="muComment"># image width - 1</span> <span id="L107" class="LineNr">107 </span> <span class="PreProc">var</span> image-width-1/<span class="Constant">xmm7</span>: float <span class="SpecialChar"><-</span> convert tmp -<span id="L108" class="LineNr">108 </span> tmp <span class="SpecialChar"><-</span> copy <span class="Constant">0xe0</span> <span class="Comment"># image height - 1</span> +<span id="L108" class="LineNr">108 </span> tmp <span class="SpecialChar"><-</span> copy <span class="Constant">0xe0</span> <span class="muComment"># image height - 1</span> <span id="L109" class="LineNr">109 </span> <span class="PreProc">var</span> image-height-1/<span class="Constant">xmm6</span>: float <span class="SpecialChar"><-</span> convert tmp -<span id="L110" class="LineNr">110 </span> <span class="Comment">#</span> -<span id="L111" class="LineNr">111 </span> <span class="PreProc">var</span> j/<span class="Constant">ecx</span>: int <span class="SpecialChar"><-</span> copy <span class="Constant">0xe0</span> <span class="Comment"># 224</span> +<span id="L110" class="LineNr">110 </span> <span class="muComment">#</span> +<span id="L111" class="LineNr">111 </span> <span class="PreProc">var</span> j/<span class="Constant">ecx</span>: int <span class="SpecialChar"><-</span> copy <span class="Constant">0xe0</span> <span class="muComment"># 224</span> <span id="L112" class="LineNr">112 </span> <span class="Delimiter">{</span> <span id="L113" class="LineNr">113 </span> compare j, <span class="Constant">0</span> <span id="L114" class="LineNr">114 </span> <span class="PreProc">break-if-<</span> <span id="L115" class="LineNr">115 </span> <span class="PreProc">var</span> i/<span class="Constant">eax</span>: int <span class="SpecialChar"><-</span> copy <span class="Constant">0</span> <span id="L116" class="LineNr">116 </span> <span class="Delimiter">{</span> -<span id="L117" class="LineNr">117 </span> compare i, <span class="Constant">0x190</span> <span class="Comment"># 400 = image width</span> +<span id="L117" class="LineNr">117 </span> compare i, <span class="Constant">0x190</span> <span class="muComment"># 400 = image width</span> <span id="L118" class="LineNr">118 </span> <span class="PreProc">break-if->=</span> -<span id="L119" class="LineNr">119 </span> <span class="Comment"># u = i / (image-width - 1)</span> +<span id="L119" class="LineNr">119 </span> <span class="muComment"># u = i / (image-width - 1)</span> <span id="L120" class="LineNr">120 </span> <span class="PreProc">var</span> u/<span class="Constant">xmm0</span>: float <span class="SpecialChar"><-</span> convert i <span id="L121" class="LineNr">121 </span> u <span class="SpecialChar"><-</span> divide image-width-1 -<span id="L122" class="LineNr">122 </span> <span class="Comment"># v = j / (image-height - 1)</span> +<span id="L122" class="LineNr">122 </span> <span class="muComment"># v = j / (image-height - 1)</span> <span id="L123" class="LineNr">123 </span> <span class="PreProc">var</span> v/<span class="Constant">xmm1</span>: float <span class="SpecialChar"><-</span> convert j <span id="L124" class="LineNr">124 </span> v <span class="SpecialChar"><-</span> divide image-height-1 -<span id="L125" class="LineNr">125 </span> <span class="Comment"># r = ray(origin, lower-left-corner + u*horizontal + v*vertical - origin)</span> +<span id="L125" class="LineNr">125 </span> <span class="muComment"># r = ray(origin, lower-left-corner + u*horizontal + v*vertical - origin)</span> <span id="L126" class="LineNr">126 </span> <span class="PreProc">var</span> r-storage: <a href='3.mu.html#L169'>ray</a> -<span id="L127" class="LineNr">127 </span> <span class="Comment"># . . we're running out of int registers now,</span> -<span id="L128" class="LineNr">128 </span> <span class="Comment"># . . but luckily we don't need i and j in the rest of this loop iteration,</span> -<span id="L129" class="LineNr">129 </span> <span class="Comment"># . . so we'll just spill them in a block</span> +<span id="L127" class="LineNr">127 </span> <span class="muS2Comment"># . . we're running out of int registers now,</span> +<span id="L128" class="LineNr">128 </span> <span class="muS2Comment"># . . but luckily we don't need i and j in the rest of this loop iteration,</span> +<span id="L129" class="LineNr">129 </span> <span class="muS2Comment"># . . so we'll just spill them in a block</span> <span id="L130" class="LineNr">130 </span> <span class="Delimiter">{</span> -<span id="L131" class="LineNr">131 </span> <span class="Comment"># . r.orig = origin</span> +<span id="L131" class="LineNr">131 </span> <span class="muS1Comment"># . r.orig = origin</span> <span id="L132" class="LineNr">132 </span> <span class="PreProc">var</span> r/<span class="Constant">eax</span>: (addr <a href='3.mu.html#L169'>ray</a>) <span class="SpecialChar"><-</span> address r-storage <span id="L133" class="LineNr">133 </span> <span class="PreProc">var</span> dest/<span class="Constant">ecx</span>: (addr <a href='3.mu.html#L283'>vec3</a>) <span class="SpecialChar"><-</span> <a href='../../131table.subx.html#L26'>get</a> r, orig <span id="L134" class="LineNr">134 </span> copy-object origin, dest -<span id="L135" class="LineNr">135 </span> <span class="Comment"># . r.dir = lower-left-corner</span> +<span id="L135" class="LineNr">135 </span> <span class="muS1Comment"># . r.dir = lower-left-corner</span> <span id="L136" class="LineNr">136 </span> dest <span class="SpecialChar"><-</span> <a href='../../131table.subx.html#L26'>get</a> r, dir <span id="L137" class="LineNr">137 </span> copy-object lower-left-corner, dest -<span id="L138" class="LineNr">138 </span> <span class="Comment"># . r.dir += horizontal*u</span> +<span id="L138" class="LineNr">138 </span> <span class="muS1Comment"># . r.dir += horizontal*u</span> <span id="L139" class="LineNr">139 </span> <span class="PreProc">var</span> tmp-vec3: <a href='3.mu.html#L283'>vec3</a> <span id="L140" class="LineNr">140 </span> <span class="PreProc">var</span> tmp/<span class="Constant">eax</span>: (addr <a href='3.mu.html#L283'>vec3</a>) <span class="SpecialChar"><-</span> address tmp-vec3 <span id="L141" class="LineNr">141 </span> copy-object horizontal, tmp <span id="L142" class="LineNr">142 </span> <a href='3.mu.html#L340'>vec3-scale-up</a> tmp, u <span id="L143" class="LineNr">143 </span> <a href='3.mu.html#L303'>vec3-add-to</a> dest, tmp -<span id="L144" class="LineNr">144 </span> <span class="Comment"># . r.dir += vertical*v</span> +<span id="L144" class="LineNr">144 </span> <span class="muS1Comment"># . r.dir += vertical*v</span> <span id="L145" class="LineNr">145 </span> copy-object vertical, tmp <span id="L146" class="LineNr">146 </span> <a href='3.mu.html#L340'>vec3-scale-up</a> tmp, v <span id="L147" class="LineNr">147 </span> <a href='3.mu.html#L303'>vec3-add-to</a> dest, tmp -<span id="L148" class="LineNr">148 </span> <span class="Comment"># . r.dir -= origin</span> +<span id="L148" class="LineNr">148 </span> <span class="muS1Comment"># . r.dir -= origin</span> <span id="L149" class="LineNr">149 </span> <a href='3.mu.html#L326'>vec3-subtract-from</a> dest, origin <span id="L150" class="LineNr">150 </span> <span class="Delimiter">}</span> -<span id="L151" class="LineNr">151 </span> <span class="Comment"># pixel-color = ray-color(r)</span> +<span id="L151" class="LineNr">151 </span> <span class="muComment"># pixel-color = ray-color(r)</span> <span id="L152" class="LineNr">152 </span> <span class="PreProc">var</span> c-storage: <a href='3.mu.html#L194'>rgb</a> <span id="L153" class="LineNr">153 </span> <span class="PreProc">var</span> c/<span class="Constant">ecx</span>: (addr <a href='3.mu.html#L194'>rgb</a>) <span class="SpecialChar"><-</span> address c-storage <span id="L154" class="LineNr">154 </span> <span class="Delimiter">{</span> <span id="L155" class="LineNr">155 </span> <span class="PreProc">var</span> r/<span class="Constant">eax</span>: (addr <a href='3.mu.html#L169'>ray</a>) <span class="SpecialChar"><-</span> address r-storage <span id="L156" class="LineNr">156 </span> <a href='3.mu.html#L9'>ray-color</a> r, c -<span id="L157" class="LineNr">157 </span> <span class="Comment"># write color</span> +<span id="L157" class="LineNr">157 </span> <span class="muComment"># write color</span> <span id="L158" class="LineNr">158 </span> <a href='3.mu.html#L202'>print-rgb</a> <span class="Constant">0</span>, c <span id="L159" class="LineNr">159 </span> <span class="Delimiter">}</span> <span id="L160" class="LineNr">160 </span> i <span class="SpecialChar"><-</span> increment @@ -225,13 +227,13 @@ if ('onhashchange' in window) { <span id="L167" class="LineNr">167 </span><span class="Delimiter">}</span> <span id="L168" class="LineNr">168 </span> <span id="L169" class="LineNr">169 </span><span class="PreProc">type</span> <a href='3.mu.html#L169'>ray</a> <span class="Delimiter">{</span> -<span id="L170" class="LineNr">170 </span> orig: <a href='3.mu.html#L283'>vec3</a> <span class="Comment"># point</span> +<span id="L170" class="LineNr">170 </span> orig: <a href='3.mu.html#L283'>vec3</a> <span class="muComment"># point</span> <span id="L171" class="LineNr">171 </span> dir: <a href='3.mu.html#L283'>vec3</a> <span id="L172" class="LineNr">172 </span><span class="Delimiter">}</span> <span id="L173" class="LineNr">173 </span> -<span id="L174" class="LineNr">174 </span><span class="Comment"># A little different from the constructor at <a href="https://raytracing.github.io/books/RayTracingInOneWeekend.html">https://raytracing.github.io/books/RayTracingInOneWeekend.html</a></span> -<span id="L175" class="LineNr">175 </span><span class="Comment"># We immediately normalize the direction vector so we don't have to keep doing</span> -<span id="L176" class="LineNr">176 </span><span class="Comment"># so.</span> +<span id="L174" class="LineNr">174 </span><span class="muComment"># A little different from the constructor at <a href="https://raytracing.github.io/books/RayTracingInOneWeekend.html">https://raytracing.github.io/books/RayTracingInOneWeekend.html</a></span> +<span id="L175" class="LineNr">175 </span><span class="muComment"># We immediately normalize the direction vector so we don't have to keep doing</span> +<span id="L176" class="LineNr">176 </span><span class="muComment"># so.</span> <span id="L177" class="LineNr">177 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='3.mu.html#L177'>initialize-ray</a></span> _self: (addr <a href='3.mu.html#L169'>ray</a>), o: (addr <a href='3.mu.html#L283'>vec3</a>), d: (addr <a href='3.mu.html#L283'>vec3</a>) <span class="Delimiter">{</span> <span id="L178" class="LineNr">178 </span> <span class="PreProc">var</span> self/<span class="Constant">esi</span>: (addr <a href='3.mu.html#L169'>ray</a>) <span class="SpecialChar"><-</span> copy _self <span id="L179" class="LineNr">179 </span> <span class="PreProc">var</span> dest/<span class="Constant">eax</span>: (addr <a href='3.mu.html#L283'>vec3</a>) <span class="SpecialChar"><-</span> <a href='../../131table.subx.html#L26'>get</a> self, orig @@ -250,32 +252,32 @@ if ('onhashchange' in window) { <span id="L192" class="LineNr">192 </span><span class="Delimiter">}</span> <span id="L193" class="LineNr">193 </span> <span id="L194" class="LineNr">194 </span><span class="PreProc">type</span> <a href='3.mu.html#L194'>rgb</a> <span class="Delimiter">{</span> -<span id="L195" class="LineNr">195 </span> <span class="Comment"># components normalized to within [0.0, 1.0]</span> +<span id="L195" class="LineNr">195 </span> <span class="muComment"># components normalized to within [0.0, 1.0]</span> <span id="L196" class="LineNr">196 </span> r: float <span id="L197" class="LineNr">197 </span> g: float <span id="L198" class="LineNr">198 </span> b: float <span id="L199" class="LineNr">199 </span><span class="Delimiter">}</span> <span id="L200" class="LineNr">200 </span> -<span id="L201" class="LineNr">201 </span><span class="Comment"># print translating to [0, 256)</span> +<span id="L201" class="LineNr">201 </span><span class="muComment"># print translating to [0, 256)</span> <span id="L202" class="LineNr">202 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='3.mu.html#L202'>print-rgb</a></span> <a href='../../405screen.mu.html#L9'>screen</a>: (addr <a href='../../405screen.mu.html#L9'>screen</a>), _c: (addr <a href='3.mu.html#L194'>rgb</a>) <span class="Delimiter">{</span> <span id="L203" class="LineNr">203 </span> <span class="PreProc">var</span> c/<span class="Constant">esi</span>: (addr <a href='3.mu.html#L194'>rgb</a>) <span class="SpecialChar"><-</span> copy _c -<span id="L204" class="LineNr">204 </span> <span class="PreProc">var</span> n/<span class="Constant">ecx</span>: int <span class="SpecialChar"><-</span> copy <span class="Constant">0xff</span> <span class="Comment"># turns out 255 works just as well as 255.999, which is lucky because we don't have floating-point literals</span> +<span id="L204" class="LineNr">204 </span> <span class="PreProc">var</span> n/<span class="Constant">ecx</span>: int <span class="SpecialChar"><-</span> copy <span class="Constant">0xff</span> <span class="muComment"># turns out 255 works just as well as 255.999, which is lucky because we don't have floating-point literals</span> <span id="L205" class="LineNr">205 </span> <span class="PreProc">var</span> xn/<span class="Constant">xmm1</span>: float <span class="SpecialChar"><-</span> convert n -<span id="L206" class="LineNr">206 </span> <span class="Comment"># print 255 * c->r</span> +<span id="L206" class="LineNr">206 </span> <span class="muComment"># print 255 * c->r</span> <span id="L207" class="LineNr">207 </span> <span class="PreProc">var</span> result/<span class="Constant">xmm0</span>: float <span class="SpecialChar"><-</span> copy xn <span id="L208" class="LineNr">208 </span> <span class="PreProc">var</span> src-addr/<span class="Constant">eax</span>: (addr float) <span class="SpecialChar"><-</span> <a href='../../131table.subx.html#L26'>get</a> c, r <span id="L209" class="LineNr">209 </span> result <span class="SpecialChar"><-</span> multiply *src-addr <span id="L210" class="LineNr">210 </span> <span class="PreProc">var</span> result-int/<span class="Constant">edx</span>: int <span class="SpecialChar"><-</span> convert result <span id="L211" class="LineNr">211 </span> <a href='../../405screen.mu.html#L481'>print-int32-decimal</a> <a href='../../405screen.mu.html#L9'>screen</a>, result-int <span id="L212" class="LineNr">212 </span> <a href='../../405screen.mu.html#L179'>print-string</a> <a href='../../405screen.mu.html#L9'>screen</a>, <span class="Constant">" "</span> -<span id="L213" class="LineNr">213 </span> <span class="Comment"># print 255 * c->g</span> +<span id="L213" class="LineNr">213 </span> <span class="muComment"># print 255 * c->g</span> <span id="L214" class="LineNr">214 </span> src-addr <span class="SpecialChar"><-</span> <a href='../../131table.subx.html#L26'>get</a> c, g <span id="L215" class="LineNr">215 </span> result <span class="SpecialChar"><-</span> copy xn <span id="L216" class="LineNr">216 </span> result <span class="SpecialChar"><-</span> multiply *src-addr <span id="L217" class="LineNr">217 </span> result-int <span class="SpecialChar"><-</span> convert result <span id="L218" class="LineNr">218 </span> <a href='../../405screen.mu.html#L481'>print-int32-decimal</a> <a href='../../405screen.mu.html#L9'>screen</a>, result-int <span id="L219" class="LineNr">219 </span> <a href='../../405screen.mu.html#L179'>print-string</a> <a href='../../405screen.mu.html#L9'>screen</a>, <span class="Constant">" "</span> -<span id="L220" class="LineNr">220 </span> <span class="Comment"># print 255 * c->b</span> +<span id="L220" class="LineNr">220 </span> <span class="muComment"># print 255 * c->b</span> <span id="L221" class="LineNr">221 </span> src-addr <span class="SpecialChar"><-</span> <a href='../../131table.subx.html#L26'>get</a> c, b <span id="L222" class="LineNr">222 </span> result <span class="SpecialChar"><-</span> copy xn <span id="L223" class="LineNr">223 </span> result <span class="SpecialChar"><-</span> multiply *src-addr @@ -299,19 +301,19 @@ if ('onhashchange' in window) { <span id="L241" class="LineNr">241 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='3.mu.html#L241'>rgb-add-to</a></span> _c1: (addr <a href='3.mu.html#L194'>rgb</a>), _c2: (addr <a href='3.mu.html#L194'>rgb</a>) <span class="Delimiter">{</span> <span id="L242" class="LineNr">242 </span> <span class="PreProc">var</span> c1/<span class="Constant">edi</span>: (addr <a href='3.mu.html#L194'>rgb</a>) <span class="SpecialChar"><-</span> copy _c1 <span id="L243" class="LineNr">243 </span> <span class="PreProc">var</span> c2/<span class="Constant">esi</span>: (addr <a href='3.mu.html#L194'>rgb</a>) <span class="SpecialChar"><-</span> copy _c2 -<span id="L244" class="LineNr">244 </span> <span class="Comment"># c1.r += c2.r</span> +<span id="L244" class="LineNr">244 </span> <span class="muComment"># c1.r += c2.r</span> <span id="L245" class="LineNr">245 </span> <span class="PreProc">var</span> arg1/<span class="Constant">eax</span>: (addr float) <span class="SpecialChar"><-</span> <a href='../../131table.subx.html#L26'>get</a> c1, r <span id="L246" class="LineNr">246 </span> <span class="PreProc">var</span> arg2/<span class="Constant">ecx</span>: (addr float) <span class="SpecialChar"><-</span> <a href='../../131table.subx.html#L26'>get</a> c2, r <span id="L247" class="LineNr">247 </span> <span class="PreProc">var</span> result/<span class="Constant">xmm0</span>: float <span class="SpecialChar"><-</span> copy *arg1 <span id="L248" class="LineNr">248 </span> result <span class="SpecialChar"><-</span> add *arg2 <span id="L249" class="LineNr">249 </span> copy-to *arg1, result -<span id="L250" class="LineNr">250 </span> <span class="Comment"># c1.g += c2.g</span> +<span id="L250" class="LineNr">250 </span> <span class="muComment"># c1.g += c2.g</span> <span id="L251" class="LineNr">251 </span> arg1 <span class="SpecialChar"><-</span> <a href='../../131table.subx.html#L26'>get</a> c1, g <span id="L252" class="LineNr">252 </span> arg2 <span class="SpecialChar"><-</span> <a href='../../131table.subx.html#L26'>get</a> c2, g <span id="L253" class="LineNr">253 </span> result <span class="SpecialChar"><-</span> copy *arg1 <span id="L254" class="LineNr">254 </span> result <span class="SpecialChar"><-</span> add *arg2 <span id="L255" class="LineNr">255 </span> copy-to *arg1, result -<span id="L256" class="LineNr">256 </span> <span class="Comment"># c1.b += c2.b</span> +<span id="L256" class="LineNr">256 </span> <span class="muComment"># c1.b += c2.b</span> <span id="L257" class="LineNr">257 </span> arg1 <span class="SpecialChar"><-</span> <a href='../../131table.subx.html#L26'>get</a> c1, b <span id="L258" class="LineNr">258 </span> arg2 <span class="SpecialChar"><-</span> <a href='../../131table.subx.html#L26'>get</a> c2, b <span id="L259" class="LineNr">259 </span> result <span class="SpecialChar"><-</span> copy *arg1 @@ -321,17 +323,17 @@ if ('onhashchange' in window) { <span id="L263" class="LineNr">263 </span> <span id="L264" class="LineNr">264 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='3.mu.html#L264'>rgb-scale-up</a></span> _c1: (addr <a href='3.mu.html#L194'>rgb</a>), f: float <span class="Delimiter">{</span> <span id="L265" class="LineNr">265 </span> <span class="PreProc">var</span> c1/<span class="Constant">edi</span>: (addr <a href='3.mu.html#L194'>rgb</a>) <span class="SpecialChar"><-</span> copy _c1 -<span id="L266" class="LineNr">266 </span> <span class="Comment"># c1.r *= f</span> +<span id="L266" class="LineNr">266 </span> <span class="muComment"># c1.r *= f</span> <span id="L267" class="LineNr">267 </span> <span class="PreProc">var</span> dest/<span class="Constant">eax</span>: (addr float) <span class="SpecialChar"><-</span> <a href='../../131table.subx.html#L26'>get</a> c1, r <span id="L268" class="LineNr">268 </span> <span class="PreProc">var</span> result/<span class="Constant">xmm0</span>: float <span class="SpecialChar"><-</span> copy *dest <span id="L269" class="LineNr">269 </span> result <span class="SpecialChar"><-</span> multiply f <span id="L270" class="LineNr">270 </span> copy-to *dest, result -<span id="L271" class="LineNr">271 </span> <span class="Comment"># c1.g *= f</span> +<span id="L271" class="LineNr">271 </span> <span class="muComment"># c1.g *= f</span> <span id="L272" class="LineNr">272 </span> dest <span class="SpecialChar"><-</span> <a href='../../131table.subx.html#L26'>get</a> c1, g <span id="L273" class="LineNr">273 </span> result <span class="SpecialChar"><-</span> copy *dest <span id="L274" class="LineNr">274 </span> result <span class="SpecialChar"><-</span> multiply f <span id="L275" class="LineNr">275 </span> copy-to *dest, result -<span id="L276" class="LineNr">276 </span> <span class="Comment"># c1.b *= f</span> +<span id="L276" class="LineNr">276 </span> <span class="muComment"># c1.b *= f</span> <span id="L277" class="LineNr">277 </span> dest <span class="SpecialChar"><-</span> <a href='../../131table.subx.html#L26'>get</a> c1, b <span id="L278" class="LineNr">278 </span> result <span class="SpecialChar"><-</span> copy *dest <span id="L279" class="LineNr">279 </span> result <span class="SpecialChar"><-</span> multiply f @@ -361,19 +363,19 @@ if ('onhashchange' in window) { <span id="L303" class="LineNr">303 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='3.mu.html#L303'>vec3-add-to</a></span> _v1: (addr <a href='3.mu.html#L283'>vec3</a>), _v2: (addr <a href='3.mu.html#L283'>vec3</a>) <span class="Delimiter">{</span> <span id="L304" class="LineNr">304 </span> <span class="PreProc">var</span> v1/<span class="Constant">edi</span>: (addr <a href='3.mu.html#L283'>vec3</a>) <span class="SpecialChar"><-</span> copy _v1 <span id="L305" class="LineNr">305 </span> <span class="PreProc">var</span> v2/<span class="Constant">esi</span>: (addr <a href='3.mu.html#L283'>vec3</a>) <span class="SpecialChar"><-</span> copy _v2 -<span id="L306" class="LineNr">306 </span> <span class="Comment"># v1.x += v2.x</span> +<span id="L306" class="LineNr">306 </span> <span class="muComment"># v1.x += v2.x</span> <span id="L307" class="LineNr">307 </span> <span class="PreProc">var</span> arg1/<span class="Constant">eax</span>: (addr float) <span class="SpecialChar"><-</span> <a href='../../131table.subx.html#L26'>get</a> v1, x <span id="L308" class="LineNr">308 </span> <span class="PreProc">var</span> arg2/<span class="Constant">ecx</span>: (addr float) <span class="SpecialChar"><-</span> <a href='../../131table.subx.html#L26'>get</a> v2, x <span id="L309" class="LineNr">309 </span> <span class="PreProc">var</span> result/<span class="Constant">xmm0</span>: float <span class="SpecialChar"><-</span> copy *arg1 <span id="L310" class="LineNr">310 </span> result <span class="SpecialChar"><-</span> add *arg2 <span id="L311" class="LineNr">311 </span> copy-to *arg1, result -<span id="L312" class="LineNr">312 </span> <span class="Comment"># v1.y += v2.y</span> +<span id="L312" class="LineNr">312 </span> <span class="muComment"># v1.y += v2.y</span> <span id="L313" class="LineNr">313 </span> arg1 <span class="SpecialChar"><-</span> <a href='../../131table.subx.html#L26'>get</a> v1, y <span id="L314" class="LineNr">314 </span> arg2 <span class="SpecialChar"><-</span> <a href='../../131table.subx.html#L26'>get</a> v2, y <span id="L315" class="LineNr">315 </span> result <span class="SpecialChar"><-</span> copy *arg1 <span id="L316" class="LineNr">316 </span> result <span class="SpecialChar"><-</span> add *arg2 <span id="L317" class="LineNr">317 </span> copy-to *arg1, result -<span id="L318" class="LineNr">318 </span> <span class="Comment"># v1.z += v2.z</span> +<span id="L318" class="LineNr">318 </span> <span class="muComment"># v1.z += v2.z</span> <span id="L319" class="LineNr">319 </span> arg1 <span class="SpecialChar"><-</span> <a href='../../131table.subx.html#L26'>get</a> v1, z <span id="L320" class="LineNr">320 </span> arg2 <span class="SpecialChar"><-</span> <a href='../../131table.subx.html#L26'>get</a> v2, z <span id="L321" class="LineNr">321 </span> result <span class="SpecialChar"><-</span> copy *arg1 @@ -397,17 +399,17 @@ if ('onhashchange' in window) { <span id="L339" class="LineNr">339 </span> <span id="L340" class="LineNr">340 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='3.mu.html#L340'>vec3-scale-up</a></span> _v1: (addr <a href='3.mu.html#L283'>vec3</a>), f: float <span class="Delimiter">{</span> <span id="L341" class="LineNr">341 </span> <span class="PreProc">var</span> v1/<span class="Constant">edi</span>: (addr <a href='3.mu.html#L283'>vec3</a>) <span class="SpecialChar"><-</span> copy _v1 -<span id="L342" class="LineNr">342 </span> <span class="Comment"># v1.x *= f</span> +<span id="L342" class="LineNr">342 </span> <span class="muComment"># v1.x *= f</span> <span id="L343" class="LineNr">343 </span> <span class="PreProc">var</span> dest/<span class="Constant">eax</span>: (addr float) <span class="SpecialChar"><-</span> <a href='../../131table.subx.html#L26'>get</a> v1, x <span id="L344" class="LineNr">344 </span> <span class="PreProc">var</span> result/<span class="Constant">xmm0</span>: float <span class="SpecialChar"><-</span> copy *dest <span id="L345" class="LineNr">345 </span> result <span class="SpecialChar"><-</span> multiply f <span id="L346" class="LineNr">346 </span> copy-to *dest, result -<span id="L347" class="LineNr">347 </span> <span class="Comment"># v1.y *= f</span> +<span id="L347" class="LineNr">347 </span> <span class="muComment"># v1.y *= f</span> <span id="L348" class="LineNr">348 </span> dest <span class="SpecialChar"><-</span> <a href='../../131table.subx.html#L26'>get</a> v1, y <span id="L349" class="LineNr">349 </span> result <span class="SpecialChar"><-</span> copy *dest <span id="L350" class="LineNr">350 </span> result <span class="SpecialChar"><-</span> multiply f <span id="L351" class="LineNr">351 </span> copy-to *dest, result -<span id="L352" class="LineNr">352 </span> <span class="Comment"># v1.z *= f</span> +<span id="L352" class="LineNr">352 </span> <span class="muComment"># v1.z *= f</span> <span id="L353" class="LineNr">353 </span> dest <span class="SpecialChar"><-</span> <a href='../../131table.subx.html#L26'>get</a> v1, z <span id="L354" class="LineNr">354 </span> result <span class="SpecialChar"><-</span> copy *dest <span id="L355" class="LineNr">355 </span> result <span class="SpecialChar"><-</span> multiply f @@ -416,17 +418,17 @@ if ('onhashchange' in window) { <span id="L358" class="LineNr">358 </span> <span id="L359" class="LineNr">359 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='3.mu.html#L359'>vec3-scale-down</a></span> _v1: (addr <a href='3.mu.html#L283'>vec3</a>), f: float <span class="Delimiter">{</span> <span id="L360" class="LineNr">360 </span> <span class="PreProc">var</span> v1/<span class="Constant">edi</span>: (addr <a href='3.mu.html#L283'>vec3</a>) <span class="SpecialChar"><-</span> copy _v1 -<span id="L361" class="LineNr">361 </span> <span class="Comment"># v1.x /= f</span> +<span id="L361" class="LineNr">361 </span> <span class="muComment"># v1.x /= f</span> <span id="L362" class="LineNr">362 </span> <span class="PreProc">var</span> dest/<span class="Constant">eax</span>: (addr float) <span class="SpecialChar"><-</span> <a href='../../131table.subx.html#L26'>get</a> v1, x <span id="L363" class="LineNr">363 </span> <span class="PreProc">var</span> result/<span class="Constant">xmm0</span>: float <span class="SpecialChar"><-</span> copy *dest <span id="L364" class="LineNr">364 </span> result <span class="SpecialChar"><-</span> divide f <span id="L365" class="LineNr">365 </span> copy-to *dest, result -<span id="L366" class="LineNr">366 </span> <span class="Comment"># v1.y /= f</span> +<span id="L366" class="LineNr">366 </span> <span class="muComment"># v1.y /= f</span> <span id="L367" class="LineNr">367 </span> dest <span class="SpecialChar"><-</span> <a href='../../131table.subx.html#L26'>get</a> v1, y <span id="L368" class="LineNr">368 </span> result <span class="SpecialChar"><-</span> copy *dest <span id="L369" class="LineNr">369 </span> result <span class="SpecialChar"><-</span> divide f <span id="L370" class="LineNr">370 </span> copy-to *dest, result -<span id="L371" class="LineNr">371 </span> <span class="Comment"># v1.z /= f</span> +<span id="L371" class="LineNr">371 </span> <span class="muComment"># v1.z /= f</span> <span id="L372" class="LineNr">372 </span> dest <span class="SpecialChar"><-</span> <a href='../../131table.subx.html#L26'>get</a> v1, z <span id="L373" class="LineNr">373 </span> result <span class="SpecialChar"><-</span> copy *dest <span id="L374" class="LineNr">374 </span> result <span class="SpecialChar"><-</span> divide f @@ -446,12 +448,12 @@ if ('onhashchange' in window) { <span id="L388" class="LineNr">388 </span> <span id="L389" class="LineNr">389 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='3.mu.html#L389'>vec3-length-squared</a></span> _v: (addr <a href='3.mu.html#L283'>vec3</a>)<span class="PreProc"> -> </span>result/<span class="Constant">xmm0</span>: float <span class="Delimiter">{</span> <span id="L390" class="LineNr">390 </span> <span class="PreProc">var</span> v/<span class="Constant">esi</span>: (addr <a href='3.mu.html#L283'>vec3</a>) <span class="SpecialChar"><-</span> copy _v -<span id="L391" class="LineNr">391 </span> <span class="Comment"># result = v.x * v.x</span> +<span id="L391" class="LineNr">391 </span> <span class="muComment"># result = v.x * v.x</span> <span id="L392" class="LineNr">392 </span> <span class="PreProc">var</span> src/<span class="Constant">eax</span>: (addr float) <span class="SpecialChar"><-</span> <a href='../../131table.subx.html#L26'>get</a> v, x <span id="L393" class="LineNr">393 </span> <span class="PreProc">var</span> tmp/<span class="Constant">xmm1</span>: float <span class="SpecialChar"><-</span> copy *src <span id="L394" class="LineNr">394 </span> tmp <span class="SpecialChar"><-</span> multiply tmp <span id="L395" class="LineNr">395 </span> result <span class="SpecialChar"><-</span> copy tmp -<span id="L396" class="LineNr">396 </span> <span class="Comment"># </span> +<span id="L396" class="LineNr">396 </span> <span class="muComment"># </span> <span id="L397" class="LineNr">397 </span><span class="Delimiter">}</span> </pre> </body> diff --git a/mu.vim b/mu.vim index d0c2574b..674c0712 100644 --- a/mu.vim +++ b/mu.vim @@ -27,8 +27,11 @@ setlocal iskeyword=@,48-57,?,!,_,$,- setlocal formatoptions-=t " Mu programs have long lines setlocal formatoptions+=c " but comments should still wrap -syntax match muComment /#.*$/ | highlight link muComment Comment syntax match muSalientComment /##.*$/ | highlight link muSalientComment SalientComment +syntax match muComment /#\( \.\| - \|? \)\@!.*/ | highlight link muComment Comment +syntax match muS1Comment /# \..*/ | highlight link muS1Comment Comment +syntax match muS2Comment /# \. \..*/ | highlight link muS2Comment Comment + set comments+=n:# syntax match muCommentedCode "#? .*" | highlight link muCommentedCode CommentedCode let b:cmt_head = "#? " |