mitchellhansen/Trac3r-rust
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bringing docs up to date

Browse Source
This commit is contained in:
mitchellhansen
2020-02-13 17:14:29 -08:00
parent 659cd98a1f
commit fcfa40e335
112 changed files with 869 additions and 1837 deletions
Download Patch File Download Diff File Expand all files Collapse all files

316
doc/src/sfml_rust/canvas/canvas_state.rs.html
View File

@@ -584,79 +584,12 @@
<span id="584">584</span>
<span id="585">585</span>
<span id="586">586</span>
<span id="587">587</span>
<span id="588">588</span>
<span id="589">589</span>
<span id="590">590</span>
<span id="591">591</span>
<span id="592">592</span>
<span id="593">593</span>
<span id="594">594</span>
<span id="595">595</span>
<span id="596">596</span>
<span id="597">597</span>
<span id="598">598</span>
<span id="599">599</span>
<span id="600">600</span>
<span id="601">601</span>
<span id="602">602</span>
<span id="603">603</span>
<span id="604">604</span>
<span id="605">605</span>
<span id="606">606</span>
<span id="607">607</span>
<span id="608">608</span>
<span id="609">609</span>
<span id="610">610</span>
<span id="611">611</span>
<span id="612">612</span>
<span id="613">613</span>
<span id="614">614</span>
<span id="615">615</span>
<span id="616">616</span>
<span id="617">617</span>
<span id="618">618</span>
<span id="619">619</span>
<span id="620">620</span>
<span id="621">621</span>
<span id="622">622</span>
<span id="623">623</span>
<span id="624">624</span>
<span id="625">625</span>
<span id="626">626</span>
<span id="627">627</span>
<span id="628">628</span>
<span id="629">629</span>
<span id="630">630</span>
<span id="631">631</span>
<span id="632">632</span>
<span id="633">633</span>
<span id="634">634</span>
<span id="635">635</span>
<span id="636">636</span>
<span id="637">637</span>
<span id="638">638</span>
<span id="639">639</span>
<span id="640">640</span>
<span id="641">641</span>
<span id="642">642</span>
<span id="643">643</span>
<span id="644">644</span>
<span id="645">645</span>
<span id="646">646</span>
<span id="647">647</span>
<span id="648">648</span>
<span id="649">649</span>
<span id="650">650</span>
<span id="651">651</span>
<span id="652">652</span>
<span id="653">653</span>
</pre><div class="example-wrap"><pre class="rust ">
<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>};
<span class="kw">use</span> <span class="ident">std</span>::<span class="ident">collections</span>::{<span class="ident">HashMap</span>, <span class="ident">HashSet</span>};
<span class="kw">use</span> <span class="ident">vulkano</span>::<span class="ident">buffer</span>::{<span class="ident">BufferAccess</span>, <span class="ident">BufferUsage</span>, <span class="ident">ImmutableBuffer</span>, <span class="ident">CpuAccessibleBuffer</span>};
<span class="kw">use</span> <span class="ident">std</span>::<span class="ident">sync</span>::<span class="ident">Arc</span>;
<span class="kw">use</span> <span class="ident">vulkano</span>::<span class="ident">format</span>::{<span class="ident">ClearValue</span>, <span class="ident">Format</span>, <span class="ident">R8Unorm</span>};
<span class="kw">use</span> <span class="ident">vulkano</span>::<span class="ident">format</span>::{<span class="ident">ClearValue</span>, <span class="ident">Format</span>, <span class="ident">R8Unorm</span>, <span class="ident">ClearValuesTuple</span>};
<span class="kw">use</span> <span class="ident">vulkano</span>::<span class="ident">framebuffer</span>::{<span class="ident">FramebufferAbstract</span>, <span class="ident">Framebuffer</span>, <span class="ident">RenderPass</span>, <span class="ident">RenderPassAbstract</span>};
<span class="kw">use</span> <span class="ident">vulkano</span>::<span class="ident">device</span>::{<span class="ident">Device</span>, <span class="ident">Queue</span>};
<span class="kw">use</span> <span class="ident">vulkano</span>::<span class="ident">instance</span>::<span class="ident">PhysicalDevice</span>;
@@ -672,59 +605,24 @@
<span class="kw">use</span> <span class="ident">winit</span>::<span class="ident">Window</span>;
<span class="kw">use</span> <span class="ident">vulkano</span>::<span class="ident">pipeline</span>::<span class="ident">viewport</span>::<span class="ident">Viewport</span>;
<span class="kw">use</span> <span class="ident">vulkano</span>::<span class="ident">descriptor</span>::<span class="ident">descriptor</span>::<span class="ident">DescriptorDescTy</span>::<span class="ident">TexelBuffer</span>;
<span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">canvas</span>::<span class="ident">canvas_frame</span>::<span class="ident">CanvasFrame</span>;
<span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">canvas</span>::<span class="ident">canvas_frame</span>::{<span class="ident">CanvasFrameTest</span>};
<span class="kw">use</span> <span class="ident">std</span>::<span class="ident">hash</span>::<span class="ident">Hash</span>;
<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="ident">TextVertex3D</span>};
<span class="kw">use</span> <span class="ident">vulkano</span>::<span class="ident">pipeline</span>::<span class="ident">depth_stencil</span>::{<span class="ident">StencilFaceFlags</span>, <span class="ident">DynamicStencilValue</span>};
<span class="kw">use</span> <span class="ident">vulkano</span>::<span class="ident">memory</span>::<span class="ident">pool</span>::<span class="ident">PotentialDedicatedAllocation</span>::<span class="ident">Generic</span>;
<span class="kw">use</span> <span class="ident">std</span>::<span class="ident">borrow</span>::<span class="ident">Borrow</span>;
<span class="kw">use</span> <span class="ident">std</span>::<span class="ident">fs</span>::<span class="ident">File</span>;
<span class="kw">use</span> <span class="ident">std</span>::<span class="ident">io</span>::<span class="ident">Read</span>;
<span class="kw">use</span> <span class="ident">rusttype</span>::{<span class="ident">Font</span>, <span class="ident">PositionedGlyph</span>, <span class="ident">Scale</span>, <span class="ident">Rect</span>, <span class="ident">point</span>, <span class="ident">GlyphId</span>};
<span class="kw">use</span> <span class="ident">rusttype</span>::{<span class="ident">Font</span>, <span class="ident">PositionedGlyph</span>, <span class="ident">Scale</span>, <span class="ident">Rect</span>, <span class="ident">point</span>, <span class="ident">GlyphId</span>, <span class="ident">Line</span>, <span class="ident">Curve</span>, <span class="ident">Segment</span>};
<span class="kw">use</span> <span class="ident">vulkano</span>::<span class="ident">pipeline</span>::<span class="ident">vertex</span>::<span class="ident">VertexDefinition</span>;
<span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">canvas</span>::<span class="ident">managed</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">managed</span>::<span class="ident">handles</span>::{<span class="ident">CanvasTextureHandle</span>, <span class="ident">CanvasImageHandle</span>, <span class="ident">CanvasFontHandle</span>, <span class="ident">CompiledGraphicsPipelineHandle</span>, <span class="ident">Handle</span>};
<span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">canvas</span>::<span class="ident">managed</span>::<span class="ident">handles</span>::{<span class="ident">CanvasTextureHandle</span>, <span class="ident">CanvasImageHandle</span>, <span class="ident">CanvasFontHandle</span>, <span class="ident">CompiledShaderHandle</span>, <span class="ident">Handle</span>, <span class="ident">DrawableHandle</span>};
<span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">canvas</span>::<span class="ident">managed</span>::<span class="ident">gpu_buffers</span>::{<span class="ident">CanvasImage</span>, <span class="ident">CanvasTexture</span>, <span class="ident">CanvasFont</span>};
<span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">canvas</span>::<span class="ident">managed</span>::<span class="ident">shader</span>::<span class="ident">shader_common</span>::<span class="ident">CompiledGraphicsPipeline</span>;
<span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">canvas</span>::<span class="ident">managed</span>::<span class="ident">shader</span>::<span class="ident">generic_shader</span>::<span class="ident">GenericShader</span>;
<span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">VertexTypes</span>;
<span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">util</span>::<span class="ident">vertex</span>::{<span class="ident">TextVertex3D</span>, <span class="ident">TextureVertex2D</span>, <span class="ident">ImageVertex2D</span>, <span class="ident">ColorVertex2D</span>, <span class="ident">CanvasFrameAllocation</span>};
<span class="comment">// I don&#39;t think this is going to work without getting into Box&#39;ing</span>
<span class="kw">pub</span> <span class="kw">trait</span> <span class="ident">DrawableTest</span><span class="op">&lt;</span><span class="ident">V</span>, <span class="ident">H</span>, <span class="ident">In</span><span class="op">&gt;</span> {
<span class="kw">fn</span> <span class="ident">get_vertices</span>(<span class="kw-2">&amp;</span><span class="self">self</span>) <span class="op">-</span><span class="op">&gt;</span> <span class="ident">Vec</span><span class="op">&lt;</span><span class="ident">V</span><span class="op">&gt;</span>;
<span class="kw">fn</span> <span class="ident">get_instances</span>(<span class="kw-2">&amp;</span><span class="self">self</span>) <span class="op">-</span><span class="op">&gt;</span> <span class="ident">Vec</span><span class="op">&lt;</span><span class="ident">In</span><span class="op">&gt;</span>;
<span class="kw">fn</span> <span class="ident">get_handle</span>(<span class="kw-2">&amp;</span><span class="self">self</span>) <span class="op">-</span><span class="op">&gt;</span> <span class="ident">H</span>;
}
<span class="doccomment">/// A drawable object can be passed into a CanvasFrame to be rendered</span>
<span class="doccomment">/// Very generic implementation. (N % 2 == 0) vertices, ditto for texture coords, and rgba color</span>
<span class="doccomment">/// Provides Image and Texture handles for drawing</span>
<span class="kw">pub</span> <span class="kw">trait</span> <span class="ident">Drawable</span> {
<span class="kw">fn</span> <span class="ident">get_vertices</span>(<span class="kw-2">&amp;</span><span class="self">self</span>) <span class="op">-</span><span class="op">&gt;</span> <span class="ident">Vec</span><span class="op">&lt;</span>(<span class="ident">f32</span>, <span class="ident">f32</span>, <span class="ident">f32</span>)<span class="op">&gt;</span>;
<span class="kw">fn</span> <span class="ident">get_color</span>(<span class="kw-2">&amp;</span><span class="self">self</span>) <span class="op">-</span><span class="op">&gt;</span> (<span class="ident">f32</span>, <span class="ident">f32</span>, <span class="ident">f32</span>, <span class="ident">f32</span>);
<span class="kw">fn</span> <span class="ident">get_ti_coords</span>(<span class="kw-2">&amp;</span><span class="self">self</span>) <span class="op">-</span><span class="op">&gt;</span> <span class="ident">Vec</span><span class="op">&lt;</span>(<span class="ident">f32</span>, <span class="ident">f32</span>)<span class="op">&gt;</span>;
<span class="kw">fn</span> <span class="ident">get_texture_handle</span>(<span class="kw-2">&amp;</span><span class="self">self</span>) <span class="op">-</span><span class="op">&gt;</span> <span class="prelude-ty">Option</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="op">&gt;</span>;
<span class="kw">fn</span> <span class="ident">get_image_handle</span>(<span class="kw-2">&amp;</span><span class="self">self</span>) <span class="op">-</span><span class="op">&gt;</span> <span class="prelude-ty">Option</span><span class="op">&lt;</span><span class="ident">Arc</span><span class="op">&lt;</span><span class="ident">CanvasImageHandle</span><span class="op">&gt;</span><span class="op">&gt;</span>;
<span class="comment">// fn get_text_handle(&amp;self) -&gt; Option&lt;Arc&lt;CanvasTextHandle&gt;&gt;;</span>
<span class="kw">fn</span> <span class="ident">collect</span>(<span class="kw-2">&amp;</span><span class="self">self</span>) <span class="op">-</span><span class="op">&gt;</span> <span class="ident">Vec</span><span class="op">&lt;</span><span class="ident">RuntimeVertexDef</span><span class="op">&gt;</span> {
<span class="kw">let</span> <span class="ident">color</span> <span class="op">=</span> <span class="self">self</span>.<span class="ident">get_color</span>();
<span class="comment">// self.get_vertices().iter().zip(self.get_ti_coords().iter()).map(|(a, b)|</span>
<span class="comment">// Vertex3D {</span>
<span class="comment">// v_position: [a.0, a.1, a.2],</span>
<span class="comment">// color: [color.0, color.1, color.2, color.3],</span>
<span class="comment">// ti_position: [b.0, b.1],</span>
<span class="comment">// }).collect()</span>
<span class="comment">// TODO</span>
<span class="macro">vec</span><span class="macro">!</span>[<span class="ident">RuntimeVertexDef</span>::<span class="ident">from_primitive</span>(<span class="number">0</span>)]
}
}
<span class="doccomment">/// Canvas state is used for storage of texture and image buffers in addition to vertex buffers</span>
<span class="doccomment">/// Canvas state also contains logic for writing the stored buffers to the command_buffer</span>
<span class="attribute">#[<span class="ident">derive</span>(<span class="ident">Clone</span>)]</span>
@@ -742,16 +640,6 @@
<span class="comment">// Compiled Graphics pipelines have a handle which self describe their position in this vector</span>
<span class="ident">shader_buffers</span>: <span class="ident">Vec</span><span class="op">&lt;</span><span class="ident">Arc</span><span class="op">&lt;</span><span class="ident">Box</span><span class="op">&lt;</span><span class="kw">dyn</span> <span class="ident">CompiledGraphicsPipeline</span><span class="op">&gt;</span><span class="op">&gt;</span><span class="op">&gt;</span>,
<span class="comment">// Hold onto the vertices we get from the Compu and Canvas Frames</span>
<span class="comment">// When the run comes around, push the vertices to the GPU</span>
<span class="ident">colored_vertex_buffer</span>: <span class="ident">Vec</span><span class="op">&lt;</span><span class="ident">Arc</span><span class="op">&lt;</span>(<span class="kw">dyn</span> <span class="ident">BufferAccess</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">&gt;</span>,
<span class="ident">textured_vertex_buffer</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">Arc</span><span class="op">&lt;</span>(<span class="kw">dyn</span> <span class="ident">BufferAccess</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">&gt;</span>,
<span class="ident">image_vertex_buffer</span>: <span class="ident">HashMap</span><span class="op">&lt;</span><span class="ident">Arc</span><span class="op">&lt;</span><span class="ident">CanvasImageHandle</span><span class="op">&gt;</span>, <span class="ident">Arc</span><span class="op">&lt;</span>(<span class="kw">dyn</span> <span class="ident">BufferAccess</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">&gt;</span>,
<span class="ident">text_instances</span>: <span class="ident">HashMap</span><span class="op">&lt;</span><span class="ident">Arc</span><span class="op">&lt;</span><span class="ident">CanvasFontHandle</span><span class="op">&gt;</span>, <span class="ident">Arc</span><span class="op">&lt;</span>(<span class="kw">dyn</span> <span class="ident">BufferAccess</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">&gt;</span>,
<span class="comment">// Looks like we gotta hold onto the queue for managing textures</span>
<span class="ident">queue</span>: <span class="ident">Arc</span><span class="op">&lt;</span><span class="ident">Queue</span><span class="op">&gt;</span>,
<span class="ident">device</span>: <span class="ident">Arc</span><span class="op">&lt;</span><span class="ident">Device</span><span class="op">&gt;</span>,
@@ -859,11 +747,6 @@
<span class="ident">shader_buffers</span>: <span class="macro">vec</span><span class="macro">!</span>[],
<span class="ident">font_buffers</span>: <span class="macro">vec</span><span class="macro">!</span>[],
<span class="ident">colored_vertex_buffer</span>: <span class="macro">vec</span><span class="macro">!</span>[],
<span class="ident">textured_vertex_buffer</span>: <span class="ident">Default</span>::<span class="ident">default</span>(),
<span class="ident">image_vertex_buffer</span>: <span class="ident">Default</span>::<span class="ident">default</span>(),
<span class="ident">text_instances</span>: <span class="ident">HashMap</span>::<span class="ident">default</span>(),
<span class="ident">queue</span>: <span class="ident">queue</span>.<span class="ident">clone</span>(),
<span class="ident">device</span>: <span class="ident">device</span>.<span class="ident">clone</span>(),
<span class="ident">render_pass</span>: <span class="ident">render_pass</span>.<span class="ident">clone</span>(),
@@ -962,10 +845,9 @@
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">load_shader</span><span class="op">&lt;</span><span class="ident">T</span>: <span class="lifetime">&#39;static</span><span class="op">&gt;</span>(<span class="kw-2">&amp;</span><span class="kw-2">mut</span> <span class="self">self</span>,
<span class="ident">filename</span>: <span class="ident">String</span>,
<span class="ident">physical</span>: <span class="ident">PhysicalDevice</span>,
<span class="ident">capabilities</span>: <span class="ident">Capabilities</span>) <span class="op">-</span><span class="op">&gt;</span> <span class="prelude-ty">Option</span><span class="op">&lt;</span><span class="ident">Arc</span><span class="op">&lt;</span><span class="ident">CompiledGraphicsPipelineHandle</span><span class="op">&gt;</span><span class="op">&gt;</span>
<span class="ident">capabilities</span>: <span class="ident">Capabilities</span>) <span class="op">-</span><span class="op">&gt;</span> <span class="prelude-ty">Option</span><span class="op">&lt;</span><span class="ident">Arc</span><span class="op">&lt;</span><span class="ident">CompiledShaderHandle</span><span class="op">&gt;</span><span class="op">&gt;</span>
<span class="kw">where</span> <span class="ident">T</span>: <span class="ident">CompiledGraphicsPipeline</span> {
<span class="kw">let</span> <span class="ident">handle</span> <span class="op">=</span> <span class="ident">Arc</span>::<span class="ident">new</span>(<span class="ident">CompiledGraphicsPipelineHandle</span> {
<span class="kw">let</span> <span class="ident">handle</span> <span class="op">=</span> <span class="ident">Arc</span>::<span class="ident">new</span>(<span class="ident">CompiledShaderHandle</span> {
<span class="ident">handle</span>: <span class="self">self</span>.<span class="ident">shader_buffers</span>.<span class="ident">len</span>() <span class="kw">as</span> <span class="ident">u32</span>
});
@@ -998,15 +880,29 @@
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">accumulator</span> <span class="op">=</span> <span class="ident">Vec</span>::<span class="ident">new</span>();
<span class="kw">for</span> <span class="ident">i</span> <span class="kw">in</span> (<span class="number">0</span>..<span class="number">255</span>) {
<span class="kw">let</span> <span class="ident">glyph</span> <span class="op">=</span> <span class="ident">font</span>.<span class="ident">glyph</span>(<span class="ident">GlyphId</span> { <span class="number">0</span>: <span class="number">40</span> });
<span class="kw">let</span> <span class="ident">glyph</span> <span class="op">=</span> <span class="ident">font</span>.<span class="ident">glyph</span>(<span class="string">&#39;d&#39;</span>);
<span class="kw">let</span> <span class="ident">glyph_data</span> <span class="op">=</span> <span class="ident">glyph</span>.<span class="ident">get_data</span>().<span class="ident">unwrap</span>();
<span class="kw">let</span> <span class="ident">s</span> <span class="op">=</span> <span class="ident">glyph</span>.<span class="ident">scaled</span>(<span class="ident">Scale</span> { <span class="ident">x</span>: <span class="number">1.0</span>, <span class="ident">y</span>: <span class="number">1.0</span> });
<span class="kw">for</span> <span class="ident">vertex</span> <span class="kw">in</span> <span class="ident">glyph_data</span>.<span class="ident">clone</span>().<span class="ident">shape</span>.<span class="ident">clone</span>().<span class="ident">unwrap</span>() {
<span class="ident">accumulator</span>.<span class="ident">push</span>(<span class="ident">TextVertex3D</span> {
<span class="ident">position</span>: [<span class="ident">vertex</span>.<span class="ident">x</span> <span class="kw">as</span> <span class="ident">f32</span>, <span class="ident">vertex</span>.<span class="ident">y</span> <span class="kw">as</span> <span class="ident">f32</span>, <span class="number">0.0</span>],
});
<span class="kw">let</span> <span class="ident">shape</span> <span class="op">=</span> <span class="ident">s</span>.<span class="ident">shape</span>().<span class="ident">unwrap</span>();
<span class="kw">for</span> <span class="ident">contour</span> <span class="kw">in</span> <span class="ident">shape</span> {
<span class="kw">for</span> <span class="ident">segment</span> <span class="kw">in</span> <span class="ident">contour</span>.<span class="ident">segments</span> {
<span class="kw">match</span> <span class="ident">segment</span> {
<span class="ident">Segment</span>::<span class="ident">Line</span>(<span class="ident">l</span>) <span class="op">=</span><span class="op">&gt;</span> {
<span class="ident">accumulator</span>.<span class="ident">push</span>(<span class="ident">TextVertex3D</span> {
<span class="ident">position</span>: [<span class="ident">l</span>.<span class="ident">p</span>[<span class="number">0</span>].<span class="ident">x</span> <span class="kw">as</span> <span class="ident">f32</span>, <span class="ident">l</span>.<span class="ident">p</span>[<span class="number">0</span>].<span class="ident">y</span> <span class="kw">as</span> <span class="ident">f32</span>, <span class="number">0.0</span>],
});
}
<span class="ident">Segment</span>::<span class="ident">Curve</span>(<span class="ident">c</span>) <span class="op">=</span><span class="op">&gt;</span> {
<span class="ident">accumulator</span>.<span class="ident">push</span>(<span class="ident">TextVertex3D</span> {
<span class="ident">position</span>: [<span class="ident">c</span>.<span class="ident">p</span>[<span class="number">0</span>].<span class="ident">x</span> <span class="kw">as</span> <span class="ident">f32</span>, <span class="ident">c</span>.<span class="ident">p</span>[<span class="number">0</span>].<span class="ident">y</span> <span class="kw">as</span> <span class="ident">f32</span>, <span class="number">0.0</span>],
});
}
}
}
}
}
@@ -1036,7 +932,7 @@
<span class="doccomment">/// Using the shader name, iterates through the stored shaders and matches by the name</span>
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">get_shader_handle</span>(<span class="kw-2">&amp;</span><span class="self">self</span>, <span class="ident">shader_name</span>: <span class="ident">String</span>)
<span class="op">-</span><span class="op">&gt;</span> <span class="prelude-ty">Option</span><span class="op">&lt;</span><span class="ident">Arc</span><span class="op">&lt;</span><span class="ident">CompiledGraphicsPipelineHandle</span><span class="op">&gt;</span><span class="op">&gt;</span> {
<span class="op">-</span><span class="op">&gt;</span> <span class="prelude-ty">Option</span><span class="op">&lt;</span><span class="ident">Arc</span><span class="op">&lt;</span><span class="ident">CompiledShaderHandle</span><span class="op">&gt;</span><span class="op">&gt;</span> {
<span class="kw">for</span> <span class="ident">shader</span> <span class="kw">in</span> <span class="self">self</span>.<span class="ident">shader_buffers</span>.<span class="ident">clone</span>() {
<span class="kw">if</span> <span class="ident">shader</span>.<span class="ident">get_name</span>() <span class="op">=</span><span class="op">=</span> <span class="ident">shader_name</span> {
<span class="kw">return</span> <span class="prelude-val">Some</span>(<span class="ident">shader</span>.<span class="ident">get_handle</span>().<span class="ident">clone</span>());
@@ -1067,91 +963,6 @@
}
}
<span class="doccomment">/// Scrape all the values from the CanvasFrame and then allocate the vertex buffers</span>
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">draw</span>(<span class="kw-2">&amp;</span><span class="kw-2">mut</span> <span class="self">self</span>, <span class="ident">canvas_frame</span>: <span class="ident">CanvasFrame</span>) {
<span class="comment">// Consume the canvas frame</span>
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">textured_drawables</span> <span class="op">=</span> <span class="ident">canvas_frame</span>.<span class="ident">textured_drawables</span>;
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">colored_drawables</span> <span class="op">=</span> <span class="ident">canvas_frame</span>.<span class="ident">colored_drawables</span>;
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">image_drawables</span> <span class="op">=</span> <span class="ident">canvas_frame</span>.<span class="ident">image_drawables</span>;
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">text_drawables</span> <span class="op">=</span> <span class="ident">canvas_frame</span>.<span class="ident">text_drawables</span>;
<span class="comment">// Walk through the consumed items and allocate them to GPU buffers</span>
<span class="self">self</span>.<span class="ident">colored_vertex_buffer</span>.<span class="ident">clear</span>();
{
<span class="kw">let</span> <span class="ident">g</span> <span class="op">=</span> <span class="ident">hprof</span>::<span class="ident">enter</span>(<span class="string">&quot;Colored Vertex Buffer&quot;</span>);
<span class="self">self</span>.<span class="ident">colored_vertex_buffer</span>.<span class="ident">push</span>(
<span class="ident">ImmutableBuffer</span>::<span class="ident">from_iter</span>(
<span class="ident">colored_drawables</span>.<span class="ident">iter</span>().<span class="ident">cloned</span>(),
<span class="ident">BufferUsage</span>::<span class="ident">vertex_buffer</span>(),
<span class="self">self</span>.<span class="ident">queue</span>.<span class="ident">clone</span>(),
).<span class="ident">unwrap</span>().<span class="number">0</span>
);
}
<span class="self">self</span>.<span class="ident">textured_vertex_buffer</span>.<span class="ident">clear</span>();
{
<span class="kw">let</span> <span class="ident">g</span> <span class="op">=</span> <span class="ident">hprof</span>::<span class="ident">enter</span>(<span class="string">&quot;Textured Vertex Buffer&quot;</span>);
<span class="kw">for</span> (<span class="ident">k</span>, <span class="ident">v</span>) <span class="kw">in</span> <span class="ident">textured_drawables</span>.<span class="ident">drain</span>() {
<span class="kw">let</span> <span class="ident">vertex_buffer</span> <span class="op">=</span> <span class="ident">v</span>.<span class="ident">clone</span>().<span class="ident">get</span>(<span class="number">0</span>).<span class="ident">unwrap</span>().<span class="ident">clone</span>();
<span class="comment">// TODO</span>
<span class="comment">// v.clone().iter()</span>
<span class="comment">// .fold(Vec::new(), |mut a: Vec&lt;RuntimeVertexDef&gt;, b| {</span>
<span class="comment">// a.extend(b);</span>
<span class="comment">// a</span>
<span class="comment">// });</span>
<span class="self">self</span>.<span class="ident">textured_vertex_buffer</span>.<span class="ident">insert</span>(
<span class="ident">k</span>.<span class="ident">clone</span>(),
<span class="ident">ImmutableBuffer</span>::<span class="ident">from_iter</span>(
<span class="ident">vertex_buffer</span>.<span class="ident">iter</span>().<span class="ident">cloned</span>(),
<span class="ident">BufferUsage</span>::<span class="ident">vertex_buffer</span>(),
<span class="self">self</span>.<span class="ident">queue</span>.<span class="ident">clone</span>(),
).<span class="ident">unwrap</span>().<span class="number">0</span>,
);
}
}
<span class="self">self</span>.<span class="ident">image_vertex_buffer</span>.<span class="ident">clear</span>();
{
<span class="kw">let</span> <span class="ident">g</span> <span class="op">=</span> <span class="ident">hprof</span>::<span class="ident">enter</span>(<span class="string">&quot;Image Vertex Buffer&quot;</span>);
<span class="kw">for</span> (<span class="ident">k</span>, <span class="ident">v</span>) <span class="kw">in</span> <span class="ident">image_drawables</span>.<span class="ident">drain</span>() {
<span class="kw">let</span> <span class="ident">vertex_buffer</span> <span class="op">=</span> <span class="ident">v</span>.<span class="ident">clone</span>().<span class="ident">get</span>(<span class="number">0</span>).<span class="ident">unwrap</span>().<span class="ident">clone</span>();
<span class="comment">// TODO</span>
<span class="comment">// v.clone().iter()</span>
<span class="comment">// .fold(Vec::new(), |mut a: Vec&lt;&amp;RuntimeVertexDef&gt;, b| {</span>
<span class="comment">// a.extend(b);</span>
<span class="comment">// a</span>
<span class="comment">// });</span>
<span class="self">self</span>.<span class="ident">image_vertex_buffer</span>.<span class="ident">insert</span>(
<span class="ident">k</span>.<span class="ident">clone</span>(),
<span class="ident">ImmutableBuffer</span>::<span class="ident">from_iter</span>(
<span class="ident">vertex_buffer</span>.<span class="ident">iter</span>().<span class="ident">cloned</span>(),
<span class="ident">BufferUsage</span>::<span class="ident">vertex_buffer</span>(),
<span class="self">self</span>.<span class="ident">queue</span>.<span class="ident">clone</span>(),
).<span class="ident">unwrap</span>().<span class="number">0</span>,
);
}
}
<span class="self">self</span>.<span class="ident">text_instances</span>.<span class="ident">clear</span>();
{
<span class="kw">let</span> <span class="ident">g</span> <span class="op">=</span> <span class="ident">hprof</span>::<span class="ident">enter</span>(<span class="string">&quot;Text Instance Vertex Buffer&quot;</span>);
<span class="kw">for</span> (<span class="ident">k</span>, <span class="ident">v</span>) <span class="kw">in</span> <span class="ident">text_drawables</span>.<span class="ident">drain</span>() {
<span class="self">self</span>.<span class="ident">text_instances</span>.<span class="ident">insert</span>(
<span class="ident">k</span>.<span class="ident">clone</span>(),
<span class="ident">ImmutableBuffer</span>::<span class="ident">from_iter</span>(
<span class="ident">v</span>.<span class="ident">iter</span>().<span class="ident">cloned</span>(),
<span class="ident">BufferUsage</span>::<span class="ident">all</span>(),
<span class="self">self</span>.<span class="ident">queue</span>.<span class="ident">clone</span>(),
).<span class="ident">unwrap</span>().<span class="number">0</span>,
);
}
}
}
<span class="doccomment">/// Builds the descriptor set for solid colors using the input kernel (needs to support solid colors)</span>
<span class="kw">fn</span> <span class="ident">get_solid_color_descriptor_set</span>(<span class="kw-2">&amp;</span><span class="self">self</span>, <span class="ident">kernel</span>: <span class="ident">Arc</span><span class="op">&lt;</span><span class="ident">GenericShader</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>(
@@ -1161,12 +972,67 @@
<span class="ident">o</span>
}
<span class="doccomment">/// Consume and allocated the canvas frame data to the GPU</span>
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">allocate</span>(<span class="kw-2">&amp;</span><span class="kw-2">mut</span> <span class="self">self</span>, <span class="ident">canvas_frame</span>: <span class="ident">CanvasFrameTest</span>) <span class="op">-</span><span class="op">&gt;</span> <span class="ident">CanvasFrameAllocation</span> {
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">colored_vertex_buffer</span>: <span class="ident">Vec</span><span class="op">&lt;</span><span class="ident">ColorVertex2D</span><span class="op">&gt;</span> <span class="op">=</span> <span class="ident">Vec</span>::<span class="ident">default</span>();
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">textured_vertex_buffer</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">TextureVertex2D</span><span class="op">&gt;</span><span class="op">&gt;</span> <span class="op">=</span> <span class="ident">HashMap</span>::<span class="ident">new</span>();
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">image_vertex_buffer</span>: <span class="ident">HashMap</span><span class="op">&lt;</span><span class="ident">Arc</span><span class="op">&lt;</span><span class="ident">CanvasImageHandle</span><span class="op">&gt;</span>, <span class="ident">Vec</span><span class="op">&lt;</span><span class="ident">ImageVertex2D</span><span class="op">&gt;</span><span class="op">&gt;</span> <span class="op">=</span> <span class="ident">HashMap</span>::<span class="ident">new</span>();
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">text_instances</span>: <span class="ident">HashMap</span><span class="op">&lt;</span><span class="ident">Arc</span><span class="op">&lt;</span><span class="ident">CanvasFontHandle</span><span class="op">&gt;</span>, <span class="ident">Vec</span><span class="op">&lt;</span><span class="ident">TextVertex3D</span><span class="op">&gt;</span><span class="op">&gt;</span> <span class="op">=</span> <span class="ident">HashMap</span>::<span class="ident">new</span>();
<span class="kw">for</span> <span class="ident">value</span> <span class="kw">in</span> <span class="ident">canvas_frame</span>.<span class="ident">map</span> {
<span class="kw">match</span> <span class="ident">value</span> {
<span class="ident">VertexTypes</span>::<span class="ident">TextureType</span>(<span class="ident">vertices</span>, <span class="ident">handle</span>) <span class="op">=</span><span class="op">&gt;</span> {
<span class="ident">textured_vertex_buffer</span>.<span class="ident">entry</span>(<span class="ident">handle</span>).<span class="ident">or_insert</span>(<span class="ident">vertices</span>.<span class="ident">clone</span>()).<span class="ident">extend</span>(<span class="ident">vertices</span>);
}
<span class="ident">VertexTypes</span>::<span class="ident">ImageType</span>(<span class="ident">vertices</span>, <span class="ident">handle</span>) <span class="op">=</span><span class="op">&gt;</span> {
<span class="ident">image_vertex_buffer</span>.<span class="ident">entry</span>(<span class="ident">handle</span>).<span class="ident">or_insert</span>(<span class="ident">vertices</span>.<span class="ident">clone</span>()).<span class="ident">extend</span>(<span class="ident">vertices</span>);
}
<span class="ident">VertexTypes</span>::<span class="ident">ColorType</span>(<span class="ident">vertices</span>) <span class="op">=</span><span class="op">&gt;</span> {
<span class="ident">colored_vertex_buffer</span>.<span class="ident">extend</span>(<span class="ident">vertices</span>);
}
<span class="ident">VertexTypes</span>::<span class="ident">ThreeDType</span>(<span class="ident">vertices</span>) <span class="op">=</span><span class="op">&gt;</span> {}
};
};
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">allocated_colored_buffer</span>: <span class="ident">Vec</span><span class="op">&lt;</span><span class="ident">Arc</span><span class="op">&lt;</span>(<span class="kw">dyn</span> <span class="ident">BufferAccess</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">&gt;</span> <span class="op">=</span> <span class="ident">Vec</span>::<span class="ident">new</span>();
<span class="kw">if</span> <span class="op">!</span><span class="ident">colored_vertex_buffer</span>.<span class="ident">is_empty</span>() {
<span class="ident">allocated_colored_buffer</span>.<span class="ident">push</span>(<span class="ident">ImmutableBuffer</span>::<span class="ident">from_iter</span>(
<span class="ident">colored_vertex_buffer</span>.<span class="ident">iter</span>().<span class="ident">cloned</span>(),
<span class="ident">BufferUsage</span>::<span class="ident">vertex_buffer</span>(),
<span class="self">self</span>.<span class="ident">queue</span>.<span class="ident">clone</span>(),
).<span class="ident">unwrap</span>().<span class="number">0</span>);
}
<span class="ident">CanvasFrameAllocation</span> {
<span class="ident">colored_vertex_buffer</span>: <span class="ident">allocated_colored_buffer</span>,
<span class="ident">textured_vertex_buffer</span>: <span class="ident">textured_vertex_buffer</span>.<span class="ident">into_iter</span>().<span class="ident">map</span>(<span class="op">|</span>(<span class="ident">k</span>, <span class="ident">v</span>)<span class="op">|</span> {
(<span class="ident">k</span>,
<span class="ident">ImmutableBuffer</span>::<span class="ident">from_iter</span>(
<span class="ident">v</span>.<span class="ident">iter</span>().<span class="ident">cloned</span>(),
<span class="ident">BufferUsage</span>::<span class="ident">vertex_buffer</span>(),
<span class="self">self</span>.<span class="ident">queue</span>.<span class="ident">clone</span>(),
).<span class="ident">unwrap</span>().<span class="number">0</span> <span class="kw">as</span> <span class="ident">Arc</span><span class="op">&lt;</span>(<span class="kw">dyn</span> <span class="ident">BufferAccess</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="ident">collect</span>(),
<span class="ident">image_vertex_buffer</span>: <span class="ident">image_vertex_buffer</span>.<span class="ident">into_iter</span>().<span class="ident">map</span>(<span class="op">|</span>(<span class="ident">k</span>, <span class="ident">v</span>)<span class="op">|</span> {
(<span class="ident">k</span>,
<span class="ident">ImmutableBuffer</span>::<span class="ident">from_iter</span>(
<span class="ident">v</span>.<span class="ident">iter</span>().<span class="ident">cloned</span>(),
<span class="ident">BufferUsage</span>::<span class="ident">vertex_buffer</span>(),
<span class="self">self</span>.<span class="ident">queue</span>.<span class="ident">clone</span>(),
).<span class="ident">unwrap</span>().<span class="number">0</span> <span class="kw">as</span> <span class="ident">Arc</span><span class="op">&lt;</span>(<span class="kw">dyn</span> <span class="ident">BufferAccess</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="ident">collect</span>(),
<span class="ident">text_instances</span>: <span class="ident">Default</span>::<span class="ident">default</span>(),
}
}
<span class="doccomment">/// Pushes the draw commands to the command buffer. Requires the framebuffers and</span>
<span class="doccomment">/// image number to be passed in as they are taken care of by the vkprocessor</span>
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">draw_commands</span>(<span class="kw-2">&amp;</span><span class="kw-2">mut</span> <span class="self">self</span>,
<span class="kw-2">mut</span> <span class="ident">command_buffer</span>: <span class="ident">AutoCommandBufferBuilder</span>,
<span class="ident">framebuffers</span>: <span class="ident">Vec</span><span class="op">&lt;</span><span class="ident">Arc</span><span class="op">&lt;</span><span class="kw">dyn</span> <span class="ident">FramebufferAbstract</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">&gt;</span>,
<span class="ident">image_num</span>: <span class="ident">usize</span>) <span class="op">-</span><span class="op">&gt;</span> <span class="ident">AutoCommandBufferBuilder</span> {
<span class="ident">image_num</span>: <span class="ident">usize</span>,
<span class="ident">allocated_buffers</span>: <span class="ident">CanvasFrameAllocation</span>) <span class="op">-</span><span class="op">&gt;</span> <span class="ident">AutoCommandBufferBuilder</span> {
<span class="comment">// Specify the color to clear the framebuffer with i.e. blue</span>
<span class="kw">let</span> <span class="ident">clear_values</span> <span class="op">=</span> <span class="macro">vec</span><span class="macro">!</span>(
@@ -1196,11 +1062,11 @@
<span class="comment">// This looks a little weird as colored_vertex_buffer is a vec of GPU allocated vecs.</span>
<span class="comment">// But we can pass in multiple vertex buffers</span>
<span class="kw">if</span> <span class="op">!</span><span class="self">self</span>.<span class="ident">colored_vertex_buffer</span>.<span class="ident">is_empty</span>() {
<span class="kw">if</span> <span class="ident">allocated_buffers</span>.<span class="ident">colored_vertex_buffer</span>.<span class="ident">is_empty</span>() {
<span class="ident">command_buffer</span> <span class="op">=</span> <span class="ident">command_buffer</span>.<span class="ident">draw</span>(
<span class="ident">shader</span>.<span class="ident">get_pipeline</span>().<span class="ident">clone</span>(),
<span class="kw-2">&amp;</span><span class="self">self</span>.<span class="ident">dynamic_state</span>.<span class="ident">clone</span>(),
<span class="self">self</span>.<span class="ident">colored_vertex_buffer</span>.<span class="ident">clone</span>(),
<span class="ident">allocated_buffers</span>.<span class="ident">colored_vertex_buffer</span>.<span class="ident">clone</span>(),
(), (),
).<span class="ident">unwrap</span>();
}
@@ -1211,8 +1077,8 @@
.<span class="ident">unwrap</span>().<span class="ident">clone</span>().<span class="ident">get_handle</span>() <span class="kw">as</span> <span class="ident">usize</span>
).<span class="ident">unwrap</span>();
<span class="kw">if</span> <span class="op">!</span><span class="self">self</span>.<span class="ident">image_vertex_buffer</span>.<span class="ident">is_empty</span>() {
<span class="kw">for</span> (<span class="ident">image_handle</span>, <span class="ident">vertex_buffer</span>) <span class="kw">in</span> <span class="self">self</span>.<span class="ident">image_vertex_buffer</span>.<span class="ident">clone</span>() {
<span class="kw">if</span> <span class="op">!</span><span class="ident">allocated_buffers</span>.<span class="ident">image_vertex_buffer</span>.<span class="ident">is_empty</span>() {
<span class="kw">for</span> (<span class="ident">image_handle</span>, <span class="ident">vertex_buffer</span>) <span class="kw">in</span> <span class="ident">allocated_buffers</span>.<span class="ident">image_vertex_buffer</span>.<span class="ident">clone</span>() {
<span class="kw">let</span> <span class="ident">handle</span> <span class="op">=</span> <span class="ident">image_handle</span>.<span class="ident">clone</span>().<span class="ident">get_handle</span>() <span class="kw">as</span> <span class="ident">usize</span>;
<span class="kw">let</span> <span class="ident">descriptor_set</span> <span class="op">=</span> <span class="self">self</span>.<span class="ident">image_buffers</span>.<span class="ident">get</span>(<span class="ident">handle</span>).<span class="ident">clone</span>().<span class="ident">unwrap</span>().<span class="ident">clone</span>()
.<span class="ident">get_descriptor_set</span>(<span class="ident">shader</span>.<span class="ident">get_pipeline</span>().<span class="ident">clone</span>());
@@ -1232,8 +1098,8 @@
.<span class="ident">unwrap</span>().<span class="ident">clone</span>().<span class="ident">get_handle</span>() <span class="kw">as</span> <span class="ident">usize</span>
).<span class="ident">unwrap</span>();
<span class="kw">if</span> <span class="op">!</span><span class="self">self</span>.<span class="ident">textured_vertex_buffer</span>.<span class="ident">is_empty</span>() {
<span class="kw">for</span> (<span class="ident">texture_handle</span>, <span class="ident">vertex_buffer</span>) <span class="kw">in</span> <span class="self">self</span>.<span class="ident">textured_vertex_buffer</span>.<span class="ident">clone</span>() {
<span class="kw">if</span> <span class="op">!</span><span class="ident">allocated_buffers</span>.<span class="ident">textured_vertex_buffer</span>.<span class="ident">is_empty</span>() {
<span class="kw">for</span> (<span class="ident">texture_handle</span>, <span class="ident">vertex_buffer</span>) <span class="kw">in</span> <span class="ident">allocated_buffers</span>.<span class="ident">textured_vertex_buffer</span>.<span class="ident">clone</span>() {
<span class="kw">let</span> <span class="ident">handle</span> <span class="op">=</span> <span class="ident">texture_handle</span>.<span class="ident">clone</span>().<span class="ident">get_handle</span>() <span class="kw">as</span> <span class="ident">usize</span>;
<span class="kw">let</span> <span class="ident">descriptor_set</span> <span class="op">=</span> <span class="self">self</span>.<span class="ident">texture_buffers</span>.<span class="ident">get</span>(<span class="ident">handle</span>).<span class="ident">clone</span>().<span class="ident">unwrap</span>().<span class="ident">clone</span>()
.<span class="ident">get_descriptor_set</span>(<span class="ident">shader</span>.<span class="ident">get_pipeline</span>(), <span class="self">self</span>.<span class="ident">sampler</span>.<span class="ident">clone</span>());