weird old canvas version hanging around

doc/src/sfml_rust/canvas/canvas.rs.html

@@ -462,25 +462,6 @@
 <span id="462">462</span>
 <span id="463">463</span>
 <span id="464">464</span>
-<span id="465">465</span>
-<span id="466">466</span>
-<span id="467">467</span>
-<span id="468">468</span>
-<span id="469">469</span>
-<span id="470">470</span>
-<span id="471">471</span>
-<span id="472">472</span>
-<span id="473">473</span>
-<span id="474">474</span>
-<span id="475">475</span>
-<span id="476">476</span>
-<span id="477">477</span>
-<span id="478">478</span>
-<span id="479">479</span>
-<span id="480">480</span>
-<span id="481">481</span>
-<span id="482">482</span>
-<span id="483">483</span>
 </pre><div class="example-wrap"><pre class="rust ">
 <span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">util</span>::<span class="ident">vertex_2d</span>::{<span class="ident">Vertex2D</span>};
 <span class="kw">use</span> <span class="ident">vulkano</span>::<span class="ident">command_buffer</span>::{<span class="ident">AutoCommandBufferBuilder</span>, <span class="ident">DynamicState</span>};
@@ -510,6 +491,7 @@
 <span class="kw">use</span> <span class="ident">shade_runner</span>::<span class="ident">CompiledShader</span>;
 <span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">canvas</span>::{<span class="ident">CanvasTextureHandle</span>, <span class="ident">CanvasImageHandle</span>};
 <span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">canvas</span>::<span class="ident">shader</span>::<span class="ident">dynamic_vertex</span>::<span class="ident">RuntimeVertexDef</span>;
+<span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">canvas</span>::<span class="ident">canvas_buffer</span>::<span class="ident">CanvasImage</span>;
 
 <span class="comment">// Canvas is the accumulator of Sprites for drawing</span>
 
@@ -591,26 +573,6 @@ it appears that renderpass is tied to the individual shader
     }
 }
 
-<span class="attribute">#[<span class="ident">derive</span>(<span class="ident">Clone</span>)]</span>
-<span class="kw">pub</span> <span class="kw">struct</span> <span class="ident">CanvasImage</span> {
-    <span class="ident">handle</span>: <span class="ident">Arc</span><span class="op">&lt;</span><span class="ident">CanvasImageHandle</span><span class="op">&gt;</span>,
-    <span class="ident">buffer</span>: <span class="ident">Arc</span><span class="op">&lt;</span><span class="ident">AttachmentImage</span><span class="op">&gt;</span>,
-    <span class="ident">size</span>: (<span class="ident">u32</span>, <span class="ident">u32</span>),
-}
-
-<span class="kw">impl</span> <span class="ident">CanvasImage</span> {
-    <span class="kw">fn</span> <span class="ident">get_descriptor_set</span>(<span class="kw-2">&amp;</span><span class="kw-2">mut</span> <span class="self">self</span>, <span class="ident">shader</span>: <span class="ident">Arc</span><span class="op">&lt;</span><span class="ident">CompiledGraphicsPipeline</span><span class="op">&gt;</span>)
-                          <span class="op">-</span><span class="op">&gt;</span> <span class="ident">Box</span><span class="op">&lt;</span><span class="kw">dyn</span> <span class="ident">DescriptorSet</span> <span class="op">+</span> <span class="ident">Send</span> <span class="op">+</span> <span class="ident">Sync</span><span class="op">&gt;</span> {
-        <span class="kw">let</span> <span class="ident">o</span>: <span class="ident">Box</span><span class="op">&lt;</span><span class="kw">dyn</span> <span class="ident">DescriptorSet</span> <span class="op">+</span> <span class="ident">Send</span> <span class="op">+</span> <span class="ident">Sync</span><span class="op">&gt;</span> <span class="op">=</span> <span class="ident">Box</span>::<span class="ident">new</span>(
-            <span class="ident">PersistentDescriptorSet</span>::<span class="ident">start</span>(
-                <span class="ident">shader</span>.<span class="ident">clone</span>().<span class="ident">get_pipeline</span>().<span class="ident">clone</span>(), <span class="number">0</span>,
-            )
-                .<span class="ident">add_image</span>(<span class="self">self</span>.<span class="ident">buffer</span>.<span class="ident">clone</span>()).<span class="ident">unwrap</span>()
-                .<span class="ident">build</span>().<span class="ident">unwrap</span>());
-        <span class="ident">o</span>
-    }
-}
-
 <span class="attribute">#[<span class="ident">derive</span>(<span class="ident">Clone</span>)]</span>
 <span class="kw">pub</span> <span class="kw">struct</span> <span class="ident">CanvasState</span> {
     <span class="ident">dynamic_state</span>: <span class="ident">DynamicState</span>,

doc/src/sfml_rust/canvas/canvas_buffer.rs.html

@@ -74,6 +74,7 @@
 <span id="74">74</span>
 <span id="75">75</span>
 <span id="76">76</span>
+<span id="77">77</span>
 </pre><div class="example-wrap"><pre class="rust ">
 <span class="kw">use</span> <span class="ident">vulkano</span>::<span class="ident">image</span>::{<span class="ident">ImmutableImage</span>, <span class="ident">AttachmentImage</span>};
 <span class="kw">use</span> <span class="ident">std</span>::<span class="ident">sync</span>::<span class="ident">Arc</span>;
@@ -131,6 +132,7 @@
     }
 }
 
+<span class="doccomment">/// Canvas Font which represents an allocated image and dimension</span>
 <span class="attribute">#[<span class="ident">derive</span>(<span class="ident">Clone</span>)]</span>
 <span class="kw">pub</span> <span class="kw">struct</span> <span class="ident">CanvasFont</span> {
     <span class="kw">pub</span>(<span class="kw">crate</span>) <span class="ident">handle</span>: <span class="ident">Arc</span><span class="op">&lt;</span><span class="ident">CanvasFontHandle</span><span class="op">&gt;</span>,

doc/src/sfml_rust/canvas/canvas_frame.rs.html

@@ -138,6 +138,8 @@
 <span id="138">138</span>
 <span id="139">139</span>
 <span id="140">140</span>
+<span id="141">141</span>
+<span id="142">142</span>
 </pre><div class="example-wrap"><pre class="rust ">
 <span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">util</span>::<span class="ident">vertex_3d</span>::{<span class="ident">Vertex3D</span>};
 <span class="kw">use</span> <span class="ident">std</span>::<span class="ident">sync</span>::<span class="ident">Arc</span>;
@@ -148,7 +150,8 @@
 <span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">canvas</span>::<span class="kw-2">*</span>;
 <span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">canvas</span>::<span class="ident">shader</span>::<span class="ident">dynamic_vertex</span>::<span class="ident">RuntimeVertexDef</span>;
 
-<span class="doccomment">///</span>
+<span class="doccomment">/// I dont know why this isnt working</span>
+<span class="doccomment">/// fqowiejf</span>
 <span class="kw">pub</span> <span class="kw">struct</span> <span class="ident">CanvasFrame</span> {
     <span class="kw">pub</span> <span class="ident">colored_drawables</span>: <span class="ident">Vec</span><span class="op">&lt;</span><span class="ident">RuntimeVertexDef</span><span class="op">&gt;</span>,
     <span class="kw">pub</span> <span class="ident">textured_drawables</span>: <span class="ident">HashMap</span><span class="op">&lt;</span><span class="ident">Arc</span><span class="op">&lt;</span><span class="ident">CanvasTextureHandle</span><span class="op">&gt;</span>, <span class="ident">Vec</span><span class="op">&lt;</span><span class="ident">Vec</span><span class="op">&lt;</span><span class="ident">RuntimeVertexDef</span><span class="op">&gt;</span><span class="op">&gt;</span><span class="op">&gt;</span>,
@@ -219,9 +222,10 @@ frame.draw(text);
 vkprocessor.run(frame);
 
 */</span>
+
 <span class="kw">impl</span> <span class="ident">CanvasFrame</span> {
 
-    <span class="doccomment">/// Creates a bare canvas frame with empty accumulators</span>
+    <span class="doccomment">/// Creates a bare canvas frame with empty accumulators a</span>
     <span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">new</span>() <span class="op">-</span><span class="op">&gt;</span> <span class="ident">CanvasFrame</span> {
         <span class="ident">CanvasFrame</span> {
             <span class="ident">colored_drawables</span>: <span class="macro">vec</span><span class="macro">!</span>[],