bring docs up to date
This commit is contained in:
@@ -246,6 +246,10 @@
|
||||
<span id="246">246</span>
|
||||
<span id="247">247</span>
|
||||
<span id="248">248</span>
|
||||
<span id="249">249</span>
|
||||
<span id="250">250</span>
|
||||
<span id="251">251</span>
|
||||
<span id="252">252</span>
|
||||
</pre><div class="example-wrap"><pre class="rust ">
|
||||
<span class="attribute">#![<span class="ident">allow</span>(<span class="ident">dead_code</span>)]</span>
|
||||
<span class="attribute">#![<span class="ident">allow</span>(<span class="ident">unused_variables</span>)]</span>
|
||||
@@ -273,11 +277,12 @@
|
||||
|
||||
<span class="kw">use</span> <span class="ident">vulkano</span>::<span class="ident">instance</span>::<span class="ident">debug</span>::<span class="ident">DebugCallback</span>;
|
||||
<span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">compute</span>::<span class="ident">compu_frame</span>::<span class="ident">CompuFrame</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="ident">DrawableTest</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="ident">Drawable</span>};
|
||||
<span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">compute</span>::<span class="ident">managed</span>::<span class="ident">compu_sprite</span>::<span class="ident">CompuSprite</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="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">Handle</span>};
|
||||
<span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">util</span>::<span class="ident">vertex</span>::{<span class="ident">VertexTypes</span>, <span class="ident">TextureVertex2D</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">Handle</span>, <span class="ident">CanvasFontHandle</span>};
|
||||
<span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">util</span>::<span class="ident">vertex</span>::{<span class="ident">VertexTypes</span>, <span class="ident">TextureVertex3D</span>};
|
||||
<span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">compute</span>::<span class="ident">managed</span>::<span class="ident">handles</span>::{<span class="ident">CompuBufferHandle</span>, <span class="ident">CompuKernelHandle</span>};
|
||||
|
||||
|
||||
<span class="kw">pub</span> <span class="kw">mod</span> <span class="ident">util</span>;
|
||||
@@ -338,13 +343,11 @@
|
||||
<span class="ident">processor</span>.<span class="ident">preload_fonts</span>();
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
<span class="kw">let</span> <span class="ident">q2</span> <span class="op">=</span> <span class="ident">hprof</span>::<span class="ident">enter</span>(<span class="string">"Game Objects"</span>);
|
||||
|
||||
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">timer</span> <span class="op">=</span> <span class="ident">Timer</span>::<span class="ident">new</span>();
|
||||
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">frame_future</span> <span class="op">=</span> <span class="ident">Box</span>::<span class="ident">new</span>(<span class="ident">sync</span>::<span class="ident">now</span>(<span class="ident">processor</span>.<span class="ident">device</span>.<span class="ident">clone</span>())) <span class="kw">as</span> <span class="ident">Box</span><span class="op"><</span><span class="kw">dyn</span> <span class="ident">GpuFuture</span><span class="op">></span>;
|
||||
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">frame_future</span> : <span class="ident">Box</span><span class="op"><</span><span class="kw">dyn</span> <span class="ident">GpuFuture</span><span class="op">></span> <span class="op">=</span>
|
||||
<span class="ident">Box</span>::<span class="ident">new</span>(<span class="ident">sync</span>::<span class="ident">now</span>(<span class="ident">processor</span>.<span class="ident">device</span>.<span class="ident">clone</span>())) <span class="kw">as</span> <span class="ident">Box</span><span class="op"><</span><span class="kw">dyn</span> <span class="ident">GpuFuture</span><span class="op">></span>;
|
||||
|
||||
<span class="kw">let</span> <span class="ident">step_size</span>: <span class="ident">f32</span> <span class="op">=</span> <span class="number">0.005</span>;
|
||||
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">elapsed_time</span>: <span class="ident">f32</span>;
|
||||
@@ -353,26 +356,31 @@
|
||||
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">current_time</span>: <span class="ident">f32</span> <span class="op">=</span> <span class="ident">timer</span>.<span class="ident">elap_time</span>();
|
||||
|
||||
<span class="kw">let</span> <span class="ident">image_data</span> <span class="op">=</span> <span class="ident">load_raw</span>(<span class="ident">String</span>::<span class="ident">from</span>(<span class="string">"funky-bird.jpg"</span>));
|
||||
<span class="kw">let</span> <span class="ident">image_dimensions_f</span> <span class="op">=</span> ((<span class="ident">image_data</span>.<span class="number">1</span>).<span class="number">0</span> <span class="kw">as</span> <span class="ident">f32</span>, (<span class="ident">image_data</span>.<span class="number">1</span>).<span class="number">1</span> <span class="kw">as</span> <span class="ident">f32</span>);
|
||||
<span class="kw">let</span> <span class="ident">image_dimensions_u</span> <span class="op">=</span> <span class="ident">image_data</span>.<span class="number">1</span>;
|
||||
<span class="kw">let</span> <span class="ident">compu_sprite1</span> <span class="op">=</span> <span class="ident">CompuSprite</span>::<span class="ident">new</span>((<span class="number">0.0</span>, <span class="op">-</span><span class="number">0.5</span>), (<span class="number">0.4</span>, <span class="number">0.4</span>), <span class="number">0</span>, <span class="ident">image_dimensions_f</span>,
|
||||
<span class="comment">// This swap image needs to match the size of the compute</span>
|
||||
<span class="ident">processor</span>.<span class="ident">new_swap_image</span>(<span class="ident">image_dimensions_u</span>));
|
||||
<span class="kw">let</span> <span class="ident">image_dimensions_f</span> : (<span class="ident">f32</span>, <span class="ident">f32</span>) <span class="op">=</span> ((<span class="ident">image_data</span>.<span class="number">1</span>).<span class="number">0</span> <span class="kw">as</span> <span class="ident">f32</span>, (<span class="ident">image_data</span>.<span class="number">1</span>).<span class="number">1</span> <span class="kw">as</span> <span class="ident">f32</span>);
|
||||
<span class="kw">let</span> <span class="ident">image_dimensions_u</span> : (<span class="ident">u32</span>, <span class="ident">u32</span>) <span class="op">=</span> <span class="ident">image_data</span>.<span class="number">1</span>;
|
||||
<span class="kw">let</span> <span class="ident">compu_sprite1</span> : <span class="ident">CompuSprite</span> <span class="op">=</span>
|
||||
<span class="ident">CompuSprite</span>::<span class="ident">new</span>((<span class="number">0.0</span>, <span class="op">-</span><span class="number">0.5</span>), (<span class="number">0.4</span>, <span class="number">0.4</span>), <span class="number">0</span>, <span class="ident">image_dimensions_f</span>,
|
||||
<span class="comment">// Swap image to render the result to. Must match dimensions</span>
|
||||
<span class="ident">processor</span>.<span class="ident">new_swap_image</span>(<span class="ident">image_dimensions_u</span>));
|
||||
|
||||
<span class="kw">let</span> <span class="ident">compute_buffer</span> <span class="op">=</span> <span class="ident">processor</span>.<span class="ident">new_compute_buffer</span>(<span class="ident">image_data</span>.<span class="number">0</span>, <span class="ident">image_data</span>.<span class="number">1</span>, <span class="number">4</span>);
|
||||
<span class="kw">let</span> <span class="ident">compute_buffer</span> : <span class="ident">Arc</span><span class="op"><</span><span class="ident">CompuBufferHandle</span><span class="op">></span> <span class="op">=</span>
|
||||
<span class="ident">processor</span>.<span class="ident">new_compute_buffer</span>(<span class="ident">image_data</span>.<span class="number">0</span>, <span class="ident">image_data</span>.<span class="number">1</span>, <span class="number">4</span>);
|
||||
|
||||
<span class="kw">let</span> <span class="ident">compute_kernel</span> <span class="op">=</span> <span class="ident">processor</span>.<span class="ident">get_kernel_handle</span>(<span class="ident">String</span>::<span class="ident">from</span>(<span class="string">"simple-edge.compute"</span>))
|
||||
<span class="kw">let</span> <span class="ident">compute_kernel</span> : <span class="ident">Arc</span><span class="op"><</span><span class="ident">CompuKernelHandle</span><span class="op">></span> <span class="op">=</span>
|
||||
<span class="ident">processor</span>.<span class="ident">get_kernel_handle</span>(<span class="ident">String</span>::<span class="ident">from</span>(<span class="string">"simple-edge.compute"</span>))
|
||||
.<span class="ident">expect</span>(<span class="string">"Can't find that kernel"</span>);
|
||||
|
||||
<span class="kw">let</span> <span class="ident">funky_handle</span> <span class="op">=</span> <span class="ident">processor</span>.<span class="ident">get_texture_handle</span>(<span class="ident">String</span>::<span class="ident">from</span>(<span class="string">"funky-bird.jpg"</span>)).<span class="ident">unwrap</span>();
|
||||
<span class="kw">let</span> <span class="ident">sfml_handle</span> <span class="op">=</span> <span class="ident">processor</span>.<span class="ident">get_texture_handle</span>(<span class="ident">String</span>::<span class="ident">from</span>(<span class="string">"sfml.png"</span>)).<span class="ident">unwrap</span>();
|
||||
<span class="kw">let</span> <span class="ident">font_handle</span> <span class="op">=</span> <span class="ident">processor</span>.<span class="ident">get_font_handle</span>(<span class="ident">String</span>::<span class="ident">from</span>(<span class="string">"sansation.ttf"</span>)).<span class="ident">unwrap</span>();
|
||||
<span class="comment">// Get the handles for the assets</span>
|
||||
<span class="kw">let</span> <span class="ident">funky_handle</span> : <span class="ident">Arc</span><span class="op"><</span><span class="ident">CanvasTextureHandle</span><span class="op">></span> <span class="op">=</span>
|
||||
<span class="ident">processor</span>.<span class="ident">get_texture_handle</span>(<span class="ident">String</span>::<span class="ident">from</span>(<span class="string">"funky-bird.jpg"</span>)).<span class="ident">unwrap</span>();
|
||||
<span class="kw">let</span> <span class="ident">sfml_handle</span> : <span class="ident">Arc</span><span class="op"><</span><span class="ident">CanvasTextureHandle</span><span class="op">></span> <span class="op">=</span>
|
||||
<span class="ident">processor</span>.<span class="ident">get_texture_handle</span>(<span class="ident">String</span>::<span class="ident">from</span>(<span class="string">"sfml.png"</span>)).<span class="ident">unwrap</span>();
|
||||
<span class="kw">let</span> <span class="ident">font_handle</span> : <span class="ident">Arc</span><span class="op"><</span><span class="ident">CanvasFontHandle</span><span class="op">></span> <span class="op">=</span>
|
||||
<span class="ident">processor</span>.<span class="ident">get_font_handle</span>(<span class="ident">String</span>::<span class="ident">from</span>(<span class="string">"sansation.ttf"</span>)).<span class="ident">unwrap</span>();
|
||||
|
||||
<span class="kw">let</span> <span class="ident">funky_sprite</span> <span class="op">=</span> <span class="ident">Sprite</span>::<span class="ident">new</span>((<span class="number">0.0</span>, <span class="op">-</span><span class="number">0.5</span>), (<span class="number">0.5</span>, <span class="number">0.5</span>), <span class="number">0</span>, <span class="ident">funky_handle</span>.<span class="ident">clone</span>());
|
||||
<span class="kw">let</span> <span class="ident">sfml_sprite</span> <span class="op">=</span> <span class="ident">Sprite</span>::<span class="ident">new</span>((<span class="number">0.0</span>, <span class="op">-</span><span class="number">0.5</span>), (<span class="number">0.5</span>, <span class="number">0.5</span>), <span class="number">1</span>, <span class="ident">sfml_handle</span>.<span class="ident">clone</span>());
|
||||
<span class="comment">//let text_sprite = Text::new((-0.1,-0.1), (10.0, 10.0), font_handle.clone());</span>
|
||||
|
||||
|
||||
<span class="comment">//let test_polygon = Poly::new_with_color((-0.5, -0.5), (0.5, 0.5), 1, (1.0,0.0,0.0,0.0));</span>
|
||||
|
||||
<span class="ident">drop</span>(<span class="ident">q2</span>);
|
||||
@@ -435,7 +443,7 @@
|
||||
|
||||
<span class="kw">let</span> <span class="ident">funky_sprite</span> <span class="op">=</span> <span class="ident">Sprite</span>::<span class="ident">new</span>((<span class="number">0.0</span>, <span class="op">-</span><span class="number">0.5</span>), (<span class="number">0.5</span>, <span class="number">0.5</span>), <span class="number">0</span>, <span class="ident">funky_handle</span>.<span class="ident">clone</span>());
|
||||
|
||||
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">canvas_frame</span> <span class="op">=</span> <span class="ident">CanvasFrameTest</span>::<span class="ident">default</span>();
|
||||
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">canvas_frame</span> <span class="op">=</span> <span class="ident">CanvasFrame</span>::<span class="ident">default</span>();
|
||||
<span class="ident">canvas_frame</span>.<span class="ident">draw</span>(<span class="kw-2">&</span><span class="ident">funky_sprite</span>);
|
||||
<span class="ident">canvas_frame</span>.<span class="ident">draw</span>(<span class="kw-2">&</span><span class="ident">sfml_sprite</span>);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user