bringing docs up to date
This commit is contained in:
@@ -1,288 +1,63 @@
|
||||
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta name="generator" content="rustdoc"><meta name="description" content="Source to the Rust file `src/canvas/canvas_frame.rs`."><meta name="keywords" content="rust, rustlang, rust-lang"><title>canvas_frame.rs.html -- source</title><link rel="stylesheet" type="text/css" href="../../../normalize.css"><link rel="stylesheet" type="text/css" href="../../../rustdoc.css" id="mainThemeStyle"><link rel="stylesheet" type="text/css" href="../../../dark.css"><link rel="stylesheet" type="text/css" href="../../../light.css" id="themeStyle"><script src="../../../storage.js"></script><noscript><link rel="stylesheet" href="../../../noscript.css"></noscript><link rel="shortcut icon" href="../../../favicon.ico"><style type="text/css">#crate-search{background-image:url("../../../down-arrow.svg");}</style></head><body class="rustdoc source"><!--[if lte IE 8]><div class="warning">This old browser is unsupported and will most likely display funky things.</div><![endif]--><nav class="sidebar"><div class="sidebar-menu">☰</div><a href='../../../sfml_rust/index.html'><div class='logo-container'><img src='../../../rust-logo.png' alt='logo'></div></a></nav><div class="theme-picker"><button id="theme-picker" aria-label="Pick another theme!"><img src="../../../brush.svg" width="18" alt="Pick another theme!"></button><div id="theme-choices"></div></div><script src="../../../theme.js"></script><nav class="sub"><form class="search-form js-only"><div class="search-container"><div><select id="crate-search"><option value="All crates">All crates</option></select><input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press ‘S’ to search, ‘?’ for more options…" type="search"></div><a id="settings-menu" href="../../../settings.html"><img src="../../../wheel.svg" width="18" alt="Change settings"></a></div></form></nav><section id="main" class="content"><pre class="line-numbers"><span id="1"> 1</span>
|
||||
<span id="2"> 2</span>
|
||||
<span id="3"> 3</span>
|
||||
<span id="4"> 4</span>
|
||||
<span id="5"> 5</span>
|
||||
<span id="6"> 6</span>
|
||||
<span id="7"> 7</span>
|
||||
<span id="8"> 8</span>
|
||||
<span id="9"> 9</span>
|
||||
<span id="10"> 10</span>
|
||||
<span id="11"> 11</span>
|
||||
<span id="12"> 12</span>
|
||||
<span id="13"> 13</span>
|
||||
<span id="14"> 14</span>
|
||||
<span id="15"> 15</span>
|
||||
<span id="16"> 16</span>
|
||||
<span id="17"> 17</span>
|
||||
<span id="18"> 18</span>
|
||||
<span id="19"> 19</span>
|
||||
<span id="20"> 20</span>
|
||||
<span id="21"> 21</span>
|
||||
<span id="22"> 22</span>
|
||||
<span id="23"> 23</span>
|
||||
<span id="24"> 24</span>
|
||||
<span id="25"> 25</span>
|
||||
<span id="26"> 26</span>
|
||||
<span id="27"> 27</span>
|
||||
<span id="28"> 28</span>
|
||||
<span id="29"> 29</span>
|
||||
<span id="30"> 30</span>
|
||||
<span id="31"> 31</span>
|
||||
<span id="32"> 32</span>
|
||||
<span id="33"> 33</span>
|
||||
<span id="34"> 34</span>
|
||||
<span id="35"> 35</span>
|
||||
<span id="36"> 36</span>
|
||||
<span id="37"> 37</span>
|
||||
<span id="38"> 38</span>
|
||||
<span id="39"> 39</span>
|
||||
<span id="40"> 40</span>
|
||||
<span id="41"> 41</span>
|
||||
<span id="42"> 42</span>
|
||||
<span id="43"> 43</span>
|
||||
<span id="44"> 44</span>
|
||||
<span id="45"> 45</span>
|
||||
<span id="46"> 46</span>
|
||||
<span id="47"> 47</span>
|
||||
<span id="48"> 48</span>
|
||||
<span id="49"> 49</span>
|
||||
<span id="50"> 50</span>
|
||||
<span id="51"> 51</span>
|
||||
<span id="52"> 52</span>
|
||||
<span id="53"> 53</span>
|
||||
<span id="54"> 54</span>
|
||||
<span id="55"> 55</span>
|
||||
<span id="56"> 56</span>
|
||||
<span id="57"> 57</span>
|
||||
<span id="58"> 58</span>
|
||||
<span id="59"> 59</span>
|
||||
<span id="60"> 60</span>
|
||||
<span id="61"> 61</span>
|
||||
<span id="62"> 62</span>
|
||||
<span id="63"> 63</span>
|
||||
<span id="64"> 64</span>
|
||||
<span id="65"> 65</span>
|
||||
<span id="66"> 66</span>
|
||||
<span id="67"> 67</span>
|
||||
<span id="68"> 68</span>
|
||||
<span id="69"> 69</span>
|
||||
<span id="70"> 70</span>
|
||||
<span id="71"> 71</span>
|
||||
<span id="72"> 72</span>
|
||||
<span id="73"> 73</span>
|
||||
<span id="74"> 74</span>
|
||||
<span id="75"> 75</span>
|
||||
<span id="76"> 76</span>
|
||||
<span id="77"> 77</span>
|
||||
<span id="78"> 78</span>
|
||||
<span id="79"> 79</span>
|
||||
<span id="80"> 80</span>
|
||||
<span id="81"> 81</span>
|
||||
<span id="82"> 82</span>
|
||||
<span id="83"> 83</span>
|
||||
<span id="84"> 84</span>
|
||||
<span id="85"> 85</span>
|
||||
<span id="86"> 86</span>
|
||||
<span id="87"> 87</span>
|
||||
<span id="88"> 88</span>
|
||||
<span id="89"> 89</span>
|
||||
<span id="90"> 90</span>
|
||||
<span id="91"> 91</span>
|
||||
<span id="92"> 92</span>
|
||||
<span id="93"> 93</span>
|
||||
<span id="94"> 94</span>
|
||||
<span id="95"> 95</span>
|
||||
<span id="96"> 96</span>
|
||||
<span id="97"> 97</span>
|
||||
<span id="98"> 98</span>
|
||||
<span id="99"> 99</span>
|
||||
<span id="100">100</span>
|
||||
<span id="101">101</span>
|
||||
<span id="102">102</span>
|
||||
<span id="103">103</span>
|
||||
<span id="104">104</span>
|
||||
<span id="105">105</span>
|
||||
<span id="106">106</span>
|
||||
<span id="107">107</span>
|
||||
<span id="108">108</span>
|
||||
<span id="109">109</span>
|
||||
<span id="110">110</span>
|
||||
<span id="111">111</span>
|
||||
<span id="112">112</span>
|
||||
<span id="113">113</span>
|
||||
<span id="114">114</span>
|
||||
<span id="115">115</span>
|
||||
<span id="116">116</span>
|
||||
<span id="117">117</span>
|
||||
<span id="118">118</span>
|
||||
<span id="119">119</span>
|
||||
<span id="120">120</span>
|
||||
<span id="121">121</span>
|
||||
<span id="122">122</span>
|
||||
<span id="123">123</span>
|
||||
<span id="124">124</span>
|
||||
<span id="125">125</span>
|
||||
<span id="126">126</span>
|
||||
<span id="127">127</span>
|
||||
<span id="128">128</span>
|
||||
<span id="129">129</span>
|
||||
<span id="130">130</span>
|
||||
<span id="131">131</span>
|
||||
<span id="132">132</span>
|
||||
<span id="133">133</span>
|
||||
<span id="134">134</span>
|
||||
<span id="135">135</span>
|
||||
<span id="136">136</span>
|
||||
<span id="137">137</span>
|
||||
<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>
|
||||
<span id="143">143</span>
|
||||
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta name="generator" content="rustdoc"><meta name="description" content="Source to the Rust file `src/canvas/canvas_frame.rs`."><meta name="keywords" content="rust, rustlang, rust-lang"><title>canvas_frame.rs.html -- source</title><link rel="stylesheet" type="text/css" href="../../../normalize.css"><link rel="stylesheet" type="text/css" href="../../../rustdoc.css" id="mainThemeStyle"><link rel="stylesheet" type="text/css" href="../../../dark.css"><link rel="stylesheet" type="text/css" href="../../../light.css" id="themeStyle"><script src="../../../storage.js"></script><noscript><link rel="stylesheet" href="../../../noscript.css"></noscript><link rel="shortcut icon" href="../../../favicon.ico"><style type="text/css">#crate-search{background-image:url("../../../down-arrow.svg");}</style></head><body class="rustdoc source"><!--[if lte IE 8]><div class="warning">This old browser is unsupported and will most likely display funky things.</div><![endif]--><nav class="sidebar"><div class="sidebar-menu">☰</div><a href='../../../sfml_rust/index.html'><div class='logo-container'><img src='../../../rust-logo.png' alt='logo'></div></a></nav><div class="theme-picker"><button id="theme-picker" aria-label="Pick another theme!"><img src="../../../brush.svg" width="18" alt="Pick another theme!"></button><div id="theme-choices"></div></div><script src="../../../theme.js"></script><nav class="sub"><form class="search-form js-only"><div class="search-container"><div><select id="crate-search"><option value="All crates">All crates</option></select><input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press ‘S’ to search, ‘?’ for more options…" type="search"></div><a id="settings-menu" href="../../../settings.html"><img src="../../../wheel.svg" width="18" alt="Change settings"></a></div></form></nav><section id="main" class="content"><pre class="line-numbers"><span id="1"> 1</span>
|
||||
<span id="2"> 2</span>
|
||||
<span id="3"> 3</span>
|
||||
<span id="4"> 4</span>
|
||||
<span id="5"> 5</span>
|
||||
<span id="6"> 6</span>
|
||||
<span id="7"> 7</span>
|
||||
<span id="8"> 8</span>
|
||||
<span id="9"> 9</span>
|
||||
<span id="10">10</span>
|
||||
<span id="11">11</span>
|
||||
<span id="12">12</span>
|
||||
<span id="13">13</span>
|
||||
<span id="14">14</span>
|
||||
<span id="15">15</span>
|
||||
<span id="16">16</span>
|
||||
<span id="17">17</span>
|
||||
<span id="18">18</span>
|
||||
<span id="19">19</span>
|
||||
<span id="20">20</span>
|
||||
<span id="21">21</span>
|
||||
<span id="22">22</span>
|
||||
<span id="23">23</span>
|
||||
<span id="24">24</span>
|
||||
<span id="25">25</span>
|
||||
<span id="26">26</span>
|
||||
<span id="27">27</span>
|
||||
<span id="28">28</span>
|
||||
<span id="29">29</span>
|
||||
<span id="30">30</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>;
|
||||
<span class="kw">use</span> <span class="ident">std</span>::<span class="ident">collections</span>::<span class="ident">HashMap</span>;
|
||||
<span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">canvas</span>::<span class="ident">canvas_state</span>::{<span class="ident">Drawable</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">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">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="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">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">shader</span>::<span class="ident">text_shader</span>::<span class="ident">GlyphInstance</span>;
|
||||
<span class="kw">use</span> <span class="ident">vulkano</span>::<span class="ident">pipeline</span>::<span class="ident">vertex</span>::<span class="ident">Vertex</span>;
|
||||
<span class="kw">use</span> <span class="ident">std</span>::<span class="ident">any</span>::<span class="ident">Any</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"><</span><span class="ident">RuntimeVertexDef</span><span class="op">></span>,
|
||||
<span class="kw">pub</span> <span class="ident">textured_drawables</span>: <span class="ident">HashMap</span><span class="op"><</span><span class="ident">Arc</span><span class="op"><</span><span class="ident">CanvasTextureHandle</span><span class="op">></span>, <span class="ident">Vec</span><span class="op"><</span><span class="ident">Vec</span><span class="op"><</span><span class="ident">RuntimeVertexDef</span><span class="op">></span><span class="op">></span><span class="op">></span>,
|
||||
<span class="kw">pub</span> <span class="ident">image_drawables</span>: <span class="ident">HashMap</span><span class="op"><</span><span class="ident">Arc</span><span class="op"><</span><span class="ident">CanvasImageHandle</span><span class="op">></span>, <span class="ident">Vec</span><span class="op"><</span><span class="ident">Vec</span><span class="op"><</span><span class="ident">RuntimeVertexDef</span><span class="op">></span><span class="op">></span><span class="op">></span>,
|
||||
<span class="kw">pub</span> <span class="ident">text_drawables</span>: <span class="ident">HashMap</span><span class="op"><</span><span class="ident">Arc</span><span class="op"><</span><span class="ident">CanvasFontHandle</span><span class="op">></span>, <span class="ident">Vec</span><span class="op"><</span><span class="ident">GlyphInstance</span><span class="op">></span><span class="op">></span>
|
||||
|
||||
|
||||
|
||||
<span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">VertexTypes</span>;
|
||||
|
||||
|
||||
<span class="kw">pub</span> <span class="kw">trait</span> <span class="ident">DrawableTest</span> {
|
||||
<span class="kw">fn</span> <span class="ident">get</span>(<span class="kw-2">&</span><span class="self">self</span>) <span class="op">-</span><span class="op">></span> <span class="ident">VertexTypes</span>;
|
||||
}
|
||||
|
||||
|
||||
<span class="comment">/*
|
||||
This is sort of the beginning of our interface with the user definable sprites.
|
||||
Will be taking in multiple type of items
|
||||
|
||||
TEXT
|
||||
FontHandle
|
||||
VertexDefintion
|
||||
color
|
||||
position
|
||||
instances (string)
|
||||
Textured
|
||||
TextureHandle
|
||||
VertexDefintion
|
||||
position
|
||||
coords
|
||||
size
|
||||
|
||||
Vertex definition is directly correlated to the compiled code. How do I bucket these
|
||||
|
||||
I guess I could store them and set handles like I do textures
|
||||
|
||||
The only ent that can create these vertex handles is the vkprocessor.
|
||||
So Text can only get a vertex definition by going like shader.get_definition()
|
||||
|
||||
|
||||
Text
|
||||
FontHandle
|
||||
VertexHandle
|
||||
|
||||
|
||||
Drawable must include
|
||||
shader_handle (but how to I get this to the text? this is runtime)
|
||||
|
||||
Okay, no. Maybe a default shader type of setup. With a shader handle override????
|
||||
|
||||
Type: Text
|
||||
Textured
|
||||
Img
|
||||
Color
|
||||
|
||||
frame.draw(text) {
|
||||
|
||||
text.type == TEXT { // When it matches to default text shader
|
||||
text_shader.get_definition()
|
||||
text_shader.get_pipeline()
|
||||
}
|
||||
...
|
||||
else { // When the user passes in a shader
|
||||
text.shader_handle.get_definition()
|
||||
text.shader_handle.get_pipeline()
|
||||
}
|
||||
<span class="attribute">#[<span class="ident">derive</span>(<span class="ident">Default</span>)]</span>
|
||||
<span class="kw">pub</span> <span class="kw">struct</span> <span class="ident">CanvasFrameTest</span> {
|
||||
<span class="kw">pub</span> <span class="ident">map</span>: <span class="ident">Vec</span><span class="op"><</span><span class="ident">VertexTypes</span><span class="op">></span>,
|
||||
}
|
||||
|
||||
// Has default shader
|
||||
let text = Text::new("asdoif");
|
||||
|
||||
let frame = CanvasFrame::new();
|
||||
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 a</span>
|
||||
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">new</span>() <span class="op">-</span><span class="op">></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>[],
|
||||
<span class="ident">textured_drawables</span>: <span class="ident">Default</span>::<span class="ident">default</span>(),
|
||||
<span class="ident">image_drawables</span>: <span class="ident">Default</span>::<span class="ident">default</span>(),
|
||||
<span class="ident">text_drawables</span>: <span class="ident">Default</span>::<span class="ident">default</span>()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
<span class="comment">// TODO: Fix this for text and fonts</span>
|
||||
<span class="doccomment">/// Accumulates the drawables collected Vertex2D's</span>
|
||||
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">draw</span>(<span class="kw-2">&</span><span class="kw-2">mut</span> <span class="self">self</span>, <span class="ident">drawable</span>: <span class="kw-2">&</span><span class="kw">dyn</span> <span class="ident">Drawable</span>) {
|
||||
<span class="kw">match</span> <span class="ident">drawable</span>.<span class="ident">get_texture_handle</span>() {
|
||||
<span class="prelude-val">Some</span>(<span class="ident">handle</span>) <span class="op">=</span><span class="op">></span> {
|
||||
<span class="self">self</span>.<span class="ident">textured_drawables</span>
|
||||
.<span class="ident">entry</span>(<span class="ident">handle</span>.<span class="ident">clone</span>())
|
||||
.<span class="ident">or_insert</span>(<span class="ident">Vec</span>::<span class="ident">new</span>())
|
||||
.<span class="ident">push</span>(<span class="ident">drawable</span>.<span class="ident">collect</span>());
|
||||
}
|
||||
<span class="prelude-val">None</span> <span class="op">=</span><span class="op">></span> {
|
||||
<span class="kw">match</span> <span class="ident">drawable</span>.<span class="ident">get_image_handle</span>() {
|
||||
<span class="prelude-val">Some</span>(<span class="ident">handle</span>) <span class="op">=</span><span class="op">></span> {
|
||||
<span class="self">self</span>.<span class="ident">image_drawables</span>
|
||||
.<span class="ident">entry</span>(<span class="ident">handle</span>.<span class="ident">clone</span>())
|
||||
.<span class="ident">or_insert</span>(<span class="ident">Vec</span>::<span class="ident">new</span>())
|
||||
.<span class="ident">push</span>(<span class="ident">drawable</span>.<span class="ident">collect</span>());
|
||||
}
|
||||
<span class="prelude-val">None</span> <span class="op">=</span><span class="op">></span> {
|
||||
<span class="self">self</span>.<span class="ident">colored_drawables</span>.<span class="ident">extend</span>(<span class="ident">drawable</span>.<span class="ident">collect</span>());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
<span class="kw">impl</span> <span class="ident">CanvasFrameTest</span> {
|
||||
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">draw</span>(<span class="kw-2">&</span><span class="kw-2">mut</span> <span class="self">self</span>, <span class="ident">drawable</span>: <span class="kw-2">&</span><span class="kw">dyn</span> <span class="ident">DrawableTest</span>) {
|
||||
<span class="self">self</span>.<span class="ident">map</span>.<span class="ident">push</span>(<span class="ident">drawable</span>.<span class="ident">get</span>());
|
||||
}
|
||||
}
|
||||
|
||||
<span class="kw">pub</span> <span class="kw">struct</span> <span class="ident">GenericCanvasFrame</span><span class="op"><</span><span class="ident">H</span>, <span class="ident">V</span>, <span class="ident">In</span><span class="op">></span> {
|
||||
<span class="ident">frame_data</span>: <span class="ident">HashMap</span><span class="op"><</span><span class="ident">H</span>, <span class="ident">Vec</span><span class="op"><</span>(<span class="ident">Vec</span><span class="op"><</span><span class="ident">V</span><span class="op">></span>, <span class="ident">Vec</span><span class="op"><</span><span class="ident">In</span><span class="op">></span>)<span class="op">></span><span class="op">></span>
|
||||
}
|
||||
<span class="comment">//</span>
|
||||
<span class="comment">//impl<V, In> GenericCanvasFrame<Vertex3D, V, In> {</span>
|
||||
<span class="comment">//</span>
|
||||
<span class="comment">// /// Creates a bare canvas frame with empty accumulators</span>
|
||||
<span class="comment">// pub fn new() -> GenericCanvasFrame<Vertex3D, V, In> {</span>
|
||||
<span class="comment">// GenericCanvasFrame {</span>
|
||||
<span class="comment">// frame_data: Default::default()</span>
|
||||
<span class="comment">// }</span>
|
||||
<span class="comment">// }</span>
|
||||
<span class="comment">//</span>
|
||||
<span class="comment">// pub fn draw(&mut self, drawable: &dyn DrawableTest<V, Vertex3D, In>) {</span>
|
||||
<span class="comment">// self.frame_data</span>
|
||||
<span class="comment">// .entry(drawable.get_handle().clone())</span>
|
||||
<span class="comment">// .or_insert(Vec::new())</span>
|
||||
<span class="comment">// .push((drawable.get_vertices(), drawable.get_instances()));</span>
|
||||
<span class="comment">// }</span>
|
||||
<span class="comment">//}</span></pre></div>
|
||||
</pre></div>
|
||||
</section><section id="search" class="content hidden"></section><section class="footer"></section><aside id="help" class="hidden"><div><h1 class="hidden">Help</h1><div class="shortcuts"><h2>Keyboard Shortcuts</h2><dl><dt><kbd>?</kbd></dt><dd>Show this help dialog</dd><dt><kbd>S</kbd></dt><dd>Focus the search field</dd><dt><kbd>↑</kbd></dt><dd>Move up in search results</dd><dt><kbd>↓</kbd></dt><dd>Move down in search results</dd><dt><kbd>↹</kbd></dt><dd>Switch tab</dd><dt><kbd>⏎</kbd></dt><dd>Go to active search result</dd><dt><kbd>+</kbd></dt><dd>Expand all sections</dd><dt><kbd>-</kbd></dt><dd>Collapse all sections</dd></dl></div><div class="infos"><h2>Search Tricks</h2><p>Prefix searches with a type followed by a colon (e.g., <code>fn:</code>) to restrict the search to a given type.</p><p>Accepted types are: <code>fn</code>, <code>mod</code>, <code>struct</code>, <code>enum</code>, <code>trait</code>, <code>type</code>, <code>macro</code>, and <code>const</code>.</p><p>Search functions by type signature (e.g., <code>vec -> usize</code> or <code>* -> vec</code>)</p><p>Search multiple things at once by splitting your query with comma (e.g., <code>str,u8</code> or <code>String,struct:Vec,test</code>)</p></div></div></aside><script>window.rootPath = "../../../";window.currentCrate = "sfml_rust";</script><script src="../../../aliases.js"></script><script src="../../../main.js"></script><script src="../../../source-script.js"></script><script src="../../../source-files.js"></script><script defer src="../../../search-index.js"></script></body></html>
|
||||
@@ -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't think this is going to work without getting into Box'ing</span>
|
||||
<span class="kw">pub</span> <span class="kw">trait</span> <span class="ident">DrawableTest</span><span class="op"><</span><span class="ident">V</span>, <span class="ident">H</span>, <span class="ident">In</span><span class="op">></span> {
|
||||
<span class="kw">fn</span> <span class="ident">get_vertices</span>(<span class="kw-2">&</span><span class="self">self</span>) <span class="op">-</span><span class="op">></span> <span class="ident">Vec</span><span class="op"><</span><span class="ident">V</span><span class="op">></span>;
|
||||
<span class="kw">fn</span> <span class="ident">get_instances</span>(<span class="kw-2">&</span><span class="self">self</span>) <span class="op">-</span><span class="op">></span> <span class="ident">Vec</span><span class="op"><</span><span class="ident">In</span><span class="op">></span>;
|
||||
<span class="kw">fn</span> <span class="ident">get_handle</span>(<span class="kw-2">&</span><span class="self">self</span>) <span class="op">-</span><span class="op">></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">&</span><span class="self">self</span>) <span class="op">-</span><span class="op">></span> <span class="ident">Vec</span><span class="op"><</span>(<span class="ident">f32</span>, <span class="ident">f32</span>, <span class="ident">f32</span>)<span class="op">></span>;
|
||||
<span class="kw">fn</span> <span class="ident">get_color</span>(<span class="kw-2">&</span><span class="self">self</span>) <span class="op">-</span><span class="op">></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">&</span><span class="self">self</span>) <span class="op">-</span><span class="op">></span> <span class="ident">Vec</span><span class="op"><</span>(<span class="ident">f32</span>, <span class="ident">f32</span>)<span class="op">></span>;
|
||||
|
||||
<span class="kw">fn</span> <span class="ident">get_texture_handle</span>(<span class="kw-2">&</span><span class="self">self</span>) <span class="op">-</span><span class="op">></span> <span class="prelude-ty">Option</span><span class="op"><</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="kw">fn</span> <span class="ident">get_image_handle</span>(<span class="kw-2">&</span><span class="self">self</span>) <span class="op">-</span><span class="op">></span> <span class="prelude-ty">Option</span><span class="op"><</span><span class="ident">Arc</span><span class="op"><</span><span class="ident">CanvasImageHandle</span><span class="op">></span><span class="op">></span>;
|
||||
<span class="comment">// fn get_text_handle(&self) -> Option<Arc<CanvasTextHandle>>;</span>
|
||||
|
||||
<span class="kw">fn</span> <span class="ident">collect</span>(<span class="kw-2">&</span><span class="self">self</span>) <span class="op">-</span><span class="op">></span> <span class="ident">Vec</span><span class="op"><</span><span class="ident">RuntimeVertexDef</span><span class="op">></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"><</span><span class="ident">Arc</span><span class="op"><</span><span class="ident">Box</span><span class="op"><</span><span class="kw">dyn</span> <span class="ident">CompiledGraphicsPipeline</span><span class="op">></span><span class="op">></span><span class="op">></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"><</span><span class="ident">Arc</span><span class="op"><</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">></span><span class="op">></span>,
|
||||
|
||||
<span class="ident">textured_vertex_buffer</span>: <span class="ident">HashMap</span><span class="op"><</span><span class="ident">Arc</span><span class="op"><</span><span class="ident">CanvasTextureHandle</span><span class="op">></span>, <span class="ident">Arc</span><span class="op"><</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">></span><span class="op">></span>,
|
||||
|
||||
<span class="ident">image_vertex_buffer</span>: <span class="ident">HashMap</span><span class="op"><</span><span class="ident">Arc</span><span class="op"><</span><span class="ident">CanvasImageHandle</span><span class="op">></span>, <span class="ident">Arc</span><span class="op"><</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">></span><span class="op">></span>,
|
||||
|
||||
<span class="ident">text_instances</span>: <span class="ident">HashMap</span><span class="op"><</span><span class="ident">Arc</span><span class="op"><</span><span class="ident">CanvasFontHandle</span><span class="op">></span>, <span class="ident">Arc</span><span class="op"><</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">></span><span class="op">></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"><</span><span class="ident">Queue</span><span class="op">></span>,
|
||||
<span class="ident">device</span>: <span class="ident">Arc</span><span class="op"><</span><span class="ident">Device</span><span class="op">></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"><</span><span class="ident">T</span>: <span class="lifetime">'static</span><span class="op">></span>(<span class="kw-2">&</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">></span> <span class="prelude-ty">Option</span><span class="op"><</span><span class="ident">Arc</span><span class="op"><</span><span class="ident">CompiledGraphicsPipelineHandle</span><span class="op">></span><span class="op">></span>
|
||||
<span class="ident">capabilities</span>: <span class="ident">Capabilities</span>) <span class="op">-</span><span class="op">></span> <span class="prelude-ty">Option</span><span class="op"><</span><span class="ident">Arc</span><span class="op"><</span><span class="ident">CompiledShaderHandle</span><span class="op">></span><span class="op">></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">'d'</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">></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">></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">&</span><span class="self">self</span>, <span class="ident">shader_name</span>: <span class="ident">String</span>)
|
||||
<span class="op">-</span><span class="op">></span> <span class="prelude-ty">Option</span><span class="op"><</span><span class="ident">Arc</span><span class="op"><</span><span class="ident">CompiledGraphicsPipelineHandle</span><span class="op">></span><span class="op">></span> {
|
||||
<span class="op">-</span><span class="op">></span> <span class="prelude-ty">Option</span><span class="op"><</span><span class="ident">Arc</span><span class="op"><</span><span class="ident">CompiledShaderHandle</span><span class="op">></span><span class="op">></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">&</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">"Colored Vertex Buffer"</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">"Textured Vertex Buffer"</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<RuntimeVertexDef>, 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">"Image Vertex Buffer"</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<&RuntimeVertexDef>, 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">"Text Instance Vertex Buffer"</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">&</span><span class="self">self</span>, <span class="ident">kernel</span>: <span class="ident">Arc</span><span class="op"><</span><span class="ident">GenericShader</span><span class="op">></span>) <span class="op">-</span><span class="op">></span> <span class="ident">Box</span><span class="op"><</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">></span> {
|
||||
<span class="kw">let</span> <span class="ident">o</span>: <span class="ident">Box</span><span class="op"><</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">></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">&</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">></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"><</span><span class="ident">ColorVertex2D</span><span class="op">></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"><</span><span class="ident">Arc</span><span class="op"><</span><span class="ident">CanvasTextureHandle</span><span class="op">></span>, <span class="ident">Vec</span><span class="op"><</span><span class="ident">TextureVertex2D</span><span class="op">></span><span class="op">></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"><</span><span class="ident">Arc</span><span class="op"><</span><span class="ident">CanvasImageHandle</span><span class="op">></span>, <span class="ident">Vec</span><span class="op"><</span><span class="ident">ImageVertex2D</span><span class="op">></span><span class="op">></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"><</span><span class="ident">Arc</span><span class="op"><</span><span class="ident">CanvasFontHandle</span><span class="op">></span>, <span class="ident">Vec</span><span class="op"><</span><span class="ident">TextVertex3D</span><span class="op">></span><span class="op">></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">></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">></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">></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">></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"><</span><span class="ident">Arc</span><span class="op"><</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">></span><span class="op">></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"><</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">></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"><</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">></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">&</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"><</span><span class="ident">Arc</span><span class="op"><</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">></span><span class="op">></span>,
|
||||
<span class="ident">image_num</span>: <span class="ident">usize</span>) <span class="op">-</span><span class="op">></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">></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">&</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>());
|
||||
|
||||
@@ -71,7 +71,6 @@
|
||||
<span id="71">71</span>
|
||||
<span id="72">72</span>
|
||||
<span id="73">73</span>
|
||||
<span id="74">74</span>
|
||||
</pre><div class="example-wrap"><pre class="rust ">
|
||||
<span class="kw">use</span> <span class="ident">vulkano</span>::<span class="ident">descriptor</span>::<span class="ident">descriptor_set</span>::<span class="ident">PersistentDescriptorSet</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>};
|
||||
@@ -85,7 +84,6 @@
|
||||
<span class="kw">use</span> <span class="ident">vulkano</span>::<span class="ident">format</span>::<span class="ident">Format</span>::<span class="ident">R8Unorm</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="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="comment">//pub struct Glyph {}</span>
|
||||
|
||||
@@ -61,15 +61,21 @@
|
||||
<span id="61">61</span>
|
||||
<span id="62">62</span>
|
||||
<span id="63">63</span>
|
||||
<span id="64">64</span>
|
||||
<span id="65">65</span>
|
||||
<span id="66">66</span>
|
||||
</pre><div class="example-wrap"><pre class="rust ">
|
||||
|
||||
<span class="kw">pub</span> <span class="kw">trait</span> <span class="ident">Handle</span> {
|
||||
<span class="kw">fn</span> <span class="ident">get_handle</span>(<span class="kw-2">&</span><span class="self">self</span>) <span class="op">-</span><span class="op">></span> <span class="ident">u32</span>;
|
||||
}
|
||||
|
||||
|
||||
<span class="kw">pub</span> <span class="kw">enum</span> <span class="ident">DrawableHandle</span> {
|
||||
<span class="ident">Texture</span>(<span class="ident">CanvasTextureHandle</span>),
|
||||
<span class="ident">Image</span>(<span class="ident">CanvasImageHandle</span>),
|
||||
<span class="ident">Font</span>(<span class="ident">CanvasFontHandle</span>),
|
||||
}
|
||||
|
||||
|
||||
|
||||
<span class="doccomment">/// Typed wrapper for a u32 handle</span>
|
||||
<span class="attribute">#[<span class="ident">derive</span>(<span class="ident">Clone</span>, <span class="ident">Debug</span>, <span class="ident">Default</span>, <span class="ident">PartialEq</span>, <span class="ident">Eq</span>, <span class="ident">Hash</span>)]</span>
|
||||
<span class="kw">pub</span> <span class="kw">struct</span> <span class="ident">CanvasFontHandle</span> {
|
||||
@@ -85,7 +91,7 @@
|
||||
<span class="doccomment">/// Typed wrapper for a u32 handle</span>
|
||||
<span class="attribute">#[<span class="ident">derive</span>(<span class="ident">Clone</span>, <span class="ident">Debug</span>, <span class="ident">Default</span>, <span class="ident">PartialEq</span>, <span class="ident">Eq</span>, <span class="ident">Hash</span>)]</span>
|
||||
<span class="kw">pub</span> <span class="kw">struct</span> <span class="ident">CanvasTextureHandle</span> {
|
||||
<span class="kw">pub</span>(<span class="kw">in</span> <span class="kw">crate</span>::<span class="ident">canvas</span>) <span class="ident">handle</span>: <span class="ident">u32</span>
|
||||
<span class="kw">pub</span><span class="comment">/*(in crate::canvas)*/</span> <span class="ident">handle</span>: <span class="ident">u32</span>
|
||||
}
|
||||
|
||||
<span class="kw">impl</span> <span class="ident">Handle</span> <span class="kw">for</span> <span class="ident">CanvasTextureHandle</span> {
|
||||
@@ -108,23 +114,11 @@
|
||||
|
||||
<span class="doccomment">/// Typed wrapper for a u32 handle</span>
|
||||
<span class="attribute">#[<span class="ident">derive</span>(<span class="ident">Clone</span>, <span class="ident">Debug</span>, <span class="ident">Default</span>, <span class="ident">PartialEq</span>, <span class="ident">Eq</span>, <span class="ident">Hash</span>)]</span>
|
||||
<span class="kw">pub</span> <span class="kw">struct</span> <span class="ident">CanvasShaderHandle</span> {
|
||||
<span class="kw">pub</span> <span class="kw">struct</span> <span class="ident">CompiledShaderHandle</span> {
|
||||
<span class="kw">pub</span>(<span class="kw">in</span> <span class="kw">crate</span>::<span class="ident">canvas</span>) <span class="ident">handle</span>: <span class="ident">u32</span>
|
||||
}
|
||||
|
||||
<span class="kw">impl</span> <span class="ident">Handle</span> <span class="kw">for</span> <span class="ident">CanvasShaderHandle</span> {
|
||||
<span class="kw">fn</span> <span class="ident">get_handle</span>(<span class="kw-2">&</span><span class="self">self</span>) <span class="op">-</span><span class="op">></span> <span class="ident">u32</span> {
|
||||
<span class="self">self</span>.<span class="ident">handle</span>
|
||||
}
|
||||
}
|
||||
|
||||
<span class="doccomment">/// Typed wrapper for a u32 handle</span>
|
||||
<span class="attribute">#[<span class="ident">derive</span>(<span class="ident">Clone</span>, <span class="ident">Debug</span>, <span class="ident">Default</span>, <span class="ident">PartialEq</span>, <span class="ident">Eq</span>, <span class="ident">Hash</span>)]</span>
|
||||
<span class="kw">pub</span> <span class="kw">struct</span> <span class="ident">CompiledGraphicsPipelineHandle</span> {
|
||||
<span class="kw">pub</span>(<span class="kw">in</span> <span class="kw">crate</span>::<span class="ident">canvas</span>) <span class="ident">handle</span>: <span class="ident">u32</span>
|
||||
}
|
||||
|
||||
<span class="kw">impl</span> <span class="ident">Handle</span> <span class="kw">for</span> <span class="ident">CompiledGraphicsPipelineHandle</span> {
|
||||
<span class="kw">impl</span> <span class="ident">Handle</span> <span class="kw">for</span> <span class="ident">CompiledShaderHandle</span> {
|
||||
<span class="kw">fn</span> <span class="ident">get_handle</span>(<span class="kw-2">&</span><span class="self">self</span>) <span class="op">-</span><span class="op">></span> <span class="ident">u32</span> {
|
||||
<span class="self">self</span>.<span class="ident">handle</span>
|
||||
}
|
||||
|
||||
@@ -141,7 +141,6 @@
|
||||
<span id="141">141</span>
|
||||
<span id="142">142</span>
|
||||
<span id="143">143</span>
|
||||
<span id="144">144</span>
|
||||
</pre><div class="example-wrap"><pre class="rust ">
|
||||
|
||||
<span class="kw">use</span> <span class="ident">vulkano</span>::<span class="ident">pipeline</span>::<span class="ident">GraphicsPipelineAbstract</span>;
|
||||
@@ -156,12 +155,11 @@
|
||||
<span class="kw">use</span> <span class="ident">std</span>::<span class="ident">marker</span>::<span class="ident">PhantomData</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">DepthStencil</span>, <span class="ident">Compare</span>, <span class="ident">DepthBounds</span>, <span class="ident">Stencil</span>, <span class="ident">StencilOp</span>};
|
||||
<span class="kw">use</span> <span class="ident">vulkano</span>::<span class="ident">pipeline</span>::<span class="ident">vertex</span>::{<span class="ident">SingleBufferDefinition</span>, <span class="ident">VertexDefinition</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="kw">use</span> <span class="ident">shade_runner</span> <span class="kw">as</span> <span class="ident">sr</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">vulkano</span>::<span class="ident">SafeDeref</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">ShaderType</span>, <span class="ident">CompiledGraphicsPipelineResources</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">handles</span>::<span class="ident">CompiledGraphicsPipelineHandle</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">CompiledShaderHandle</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">ShaderSpecializationConstants</span>;
|
||||
|
||||
@@ -170,7 +168,7 @@
|
||||
<span class="kw">pub</span> <span class="kw">struct</span> <span class="ident">GenericShader</span> {
|
||||
<span class="ident">graphics_pipeline</span>: <span class="prelude-ty">Option</span><span class="op"><</span><span class="ident">Arc</span><span class="op"><</span><span class="kw">dyn</span> <span class="ident">GraphicsPipelineAbstract</span> <span class="op">+</span> <span class="ident">Sync</span> <span class="op">+</span> <span class="ident">Send</span><span class="op">></span><span class="op">></span>,
|
||||
|
||||
<span class="ident">handle</span>: <span class="ident">Arc</span><span class="op"><</span><span class="ident">CompiledGraphicsPipelineHandle</span><span class="op">></span>,
|
||||
<span class="ident">handle</span>: <span class="ident">Arc</span><span class="op"><</span><span class="ident">CompiledShaderHandle</span><span class="op">></span>,
|
||||
<span class="ident">name</span>: <span class="ident">String</span>,
|
||||
|
||||
<span class="ident">device</span>: <span class="ident">Arc</span><span class="op"><</span><span class="ident">Device</span><span class="op">></span>,
|
||||
@@ -188,9 +186,9 @@
|
||||
|
||||
<span class="doccomment">/// This will explode when the shader does not want to compile</span>
|
||||
<span class="kw">fn</span> <span class="ident">new</span>(<span class="ident">filename</span>: <span class="ident">String</span>,
|
||||
<span class="ident">device</span>: <span class="ident">Arc</span><span class="op"><</span><span class="ident">Device</span><span class="op">></span>,
|
||||
<span class="ident">handle</span>: <span class="ident">Arc</span><span class="op"><</span><span class="ident">CompiledGraphicsPipelineHandle</span><span class="op">></span>,
|
||||
<span class="ident">render_pass</span>: <span class="ident">Arc</span><span class="op"><</span><span class="kw">dyn</span> <span class="ident">RenderPassAbstract</span> <span class="op">+</span> <span class="ident">Send</span> <span class="op">+</span> <span class="ident">Sync</span><span class="op">></span>) <span class="op">-</span><span class="op">></span> <span class="ident">GenericShader</span> {
|
||||
<span class="ident">device</span>: <span class="ident">Arc</span><span class="op"><</span><span class="ident">Device</span><span class="op">></span>,
|
||||
<span class="ident">handle</span>: <span class="ident">Arc</span><span class="op"><</span><span class="ident">CompiledShaderHandle</span><span class="op">></span>,
|
||||
<span class="ident">render_pass</span>: <span class="ident">Arc</span><span class="op"><</span><span class="kw">dyn</span> <span class="ident">RenderPassAbstract</span> <span class="op">+</span> <span class="ident">Send</span> <span class="op">+</span> <span class="ident">Sync</span><span class="op">></span>) <span class="op">-</span><span class="op">></span> <span class="ident">GenericShader</span> {
|
||||
|
||||
<span class="kw">let</span> <span class="ident">compiled_vertex</span> <span class="op">=</span> <span class="ident">GenericShader</span>::<span class="ident">compile</span>(
|
||||
<span class="ident">GenericShader</span>::<span class="ident">get_path</span>(<span class="ident">filename</span>.<span class="ident">clone</span>(), <span class="ident">ShaderType</span>::<span class="ident">VERTEX</span>),
|
||||
@@ -267,7 +265,7 @@
|
||||
<span class="self">self</span>.<span class="ident">name</span>.<span class="ident">clone</span>()
|
||||
}
|
||||
|
||||
<span class="kw">fn</span> <span class="ident">get_handle</span>(<span class="kw-2">&</span><span class="self">self</span>) <span class="op">-</span><span class="op">></span> <span class="ident">Arc</span><span class="op"><</span><span class="ident">CompiledGraphicsPipelineHandle</span><span class="op">></span> {
|
||||
<span class="kw">fn</span> <span class="ident">get_handle</span>(<span class="kw-2">&</span><span class="self">self</span>) <span class="op">-</span><span class="op">></span> <span class="ident">Arc</span><span class="op"><</span><span class="ident">CompiledShaderHandle</span><span class="op">></span> {
|
||||
<span class="self">self</span>.<span class="ident">handle</span>.<span class="ident">clone</span>()
|
||||
}
|
||||
|
||||
|
||||
@@ -132,7 +132,7 @@
|
||||
<span class="kw">use</span> <span class="ident">vulkano</span>::<span class="ident">device</span>::<span class="ident">Device</span>;
|
||||
<span class="kw">use</span> <span class="ident">shade_runner</span>::<span class="ident">Entry</span>;
|
||||
<span class="kw">use</span> <span class="ident">shaderc</span>::<span class="ident">ShaderKind</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">CompiledGraphicsPipelineHandle</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">CompiledShaderHandle</span>;
|
||||
|
||||
<span class="comment">/*
|
||||
|
||||
@@ -226,10 +226,10 @@ This best works I think if I allow users to
|
||||
<span class="kw">pub</span> <span class="kw">trait</span> <span class="ident">CompiledGraphicsPipeline</span> {
|
||||
<span class="kw">fn</span> <span class="ident">new</span>(<span class="ident">filename</span>: <span class="ident">String</span>,
|
||||
<span class="ident">device</span>: <span class="ident">Arc</span><span class="op"><</span><span class="ident">Device</span><span class="op">></span>,
|
||||
<span class="ident">handle</span>: <span class="ident">Arc</span><span class="op"><</span><span class="ident">CompiledGraphicsPipelineHandle</span><span class="op">></span>,
|
||||
<span class="ident">handle</span>: <span class="ident">Arc</span><span class="op"><</span><span class="ident">CompiledShaderHandle</span><span class="op">></span>,
|
||||
<span class="ident">render_pass</span>: <span class="ident">Arc</span><span class="op"><</span><span class="kw">dyn</span> <span class="ident">RenderPassAbstract</span> <span class="op">+</span> <span class="ident">Send</span> <span class="op">+</span> <span class="ident">Sync</span><span class="op">></span>) <span class="op">-</span><span class="op">></span> <span class="self">Self</span> <span class="kw">where</span> <span class="self">Self</span>: <span class="ident">Sized</span>;
|
||||
<span class="kw">fn</span> <span class="ident">get_name</span>(<span class="kw-2">&</span><span class="self">self</span>) <span class="op">-</span><span class="op">></span> <span class="ident">String</span>;
|
||||
<span class="kw">fn</span> <span class="ident">get_handle</span>(<span class="kw-2">&</span><span class="self">self</span>) <span class="op">-</span><span class="op">></span> <span class="ident">Arc</span><span class="op"><</span><span class="ident">CompiledGraphicsPipelineHandle</span><span class="op">></span>;
|
||||
<span class="kw">fn</span> <span class="ident">get_handle</span>(<span class="kw-2">&</span><span class="self">self</span>) <span class="op">-</span><span class="op">></span> <span class="ident">Arc</span><span class="op"><</span><span class="ident">CompiledShaderHandle</span><span class="op">></span>;
|
||||
<span class="kw">fn</span> <span class="ident">get_pipeline</span>(<span class="kw-2">&</span><span class="self">self</span>) <span class="op">-</span><span class="op">></span> <span class="ident">Arc</span><span class="op"><</span><span class="kw">dyn</span> <span class="ident">GraphicsPipelineAbstract</span> <span class="op">+</span> <span class="ident">Sync</span> <span class="op">+</span> <span class="ident">Send</span><span class="op">></span>;
|
||||
<span class="kw">fn</span> <span class="ident">get_renderpass</span>(<span class="kw-2">&</span><span class="self">self</span>) <span class="op">-</span><span class="op">></span> <span class="ident">Arc</span><span class="op"><</span><span class="kw">dyn</span> <span class="ident">RenderPassAbstract</span> <span class="op">+</span> <span class="ident">Send</span> <span class="op">+</span> <span class="ident">Sync</span><span class="op">></span>;
|
||||
<span class="kw">fn</span> <span class="ident">recompile</span>(<span class="self">self</span>, <span class="ident">render_pass</span>: <span class="ident">Arc</span><span class="op"><</span><span class="kw">dyn</span> <span class="ident">RenderPassAbstract</span> <span class="op">+</span> <span class="ident">Send</span> <span class="op">+</span> <span class="ident">Sync</span><span class="op">></span>)
|
||||
|
||||
@@ -179,7 +179,6 @@
|
||||
<span id="179">179</span>
|
||||
<span id="180">180</span>
|
||||
<span id="181">181</span>
|
||||
<span id="182">182</span>
|
||||
</pre><div class="example-wrap"><pre class="rust ">
|
||||
<span class="kw">use</span> <span class="ident">vulkano</span>::<span class="ident">pipeline</span>::<span class="ident">GraphicsPipelineAbstract</span>;
|
||||
<span class="kw">use</span> <span class="ident">std</span>::<span class="ident">sync</span>::<span class="ident">Arc</span>;
|
||||
@@ -193,10 +192,9 @@
|
||||
<span class="kw">use</span> <span class="ident">std</span>::<span class="ident">marker</span>::<span class="ident">PhantomData</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">DepthStencil</span>, <span class="ident">Compare</span>, <span class="ident">DepthBounds</span>, <span class="ident">Stencil</span>, <span class="ident">StencilOp</span>};
|
||||
<span class="kw">use</span> <span class="ident">vulkano</span>::<span class="ident">pipeline</span>::<span class="ident">vertex</span>::{<span class="ident">SingleBufferDefinition</span>, <span class="ident">OneVertexOneInstanceDefinition</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="kw">use</span> <span class="ident">shade_runner</span> <span class="kw">as</span> <span class="ident">sr</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">ShaderType</span>, <span class="ident">CompiledGraphicsPipelineResources</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">handles</span>::<span class="ident">CompiledGraphicsPipelineHandle</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">CompiledShaderHandle</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">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">ShaderSpecializationConstants</span>;
|
||||
@@ -215,7 +213,7 @@
|
||||
<span class="kw">pub</span> <span class="kw">struct</span> <span class="ident">TextShader</span> {
|
||||
<span class="ident">graphics_pipeline</span>: <span class="prelude-ty">Option</span><span class="op"><</span><span class="ident">Arc</span><span class="op"><</span><span class="kw">dyn</span> <span class="ident">GraphicsPipelineAbstract</span> <span class="op">+</span> <span class="ident">Sync</span> <span class="op">+</span> <span class="ident">Send</span><span class="op">></span><span class="op">></span>,
|
||||
|
||||
<span class="ident">handle</span>: <span class="ident">Arc</span><span class="op"><</span><span class="ident">CompiledGraphicsPipelineHandle</span><span class="op">></span>,
|
||||
<span class="ident">handle</span>: <span class="ident">Arc</span><span class="op"><</span><span class="ident">CompiledShaderHandle</span><span class="op">></span>,
|
||||
<span class="ident">name</span>: <span class="ident">String</span>,
|
||||
|
||||
<span class="ident">device</span>: <span class="ident">Arc</span><span class="op"><</span><span class="ident">Device</span><span class="op">></span>,
|
||||
@@ -233,7 +231,7 @@
|
||||
<span class="doccomment">/// This will explode when the shader does not want to compile</span>
|
||||
<span class="kw">fn</span> <span class="ident">new</span>(<span class="ident">filename</span>: <span class="ident">String</span>,
|
||||
<span class="ident">device</span>: <span class="ident">Arc</span><span class="op"><</span><span class="ident">Device</span><span class="op">></span>,
|
||||
<span class="ident">handle</span>: <span class="ident">Arc</span><span class="op"><</span><span class="ident">CompiledGraphicsPipelineHandle</span><span class="op">></span>,
|
||||
<span class="ident">handle</span>: <span class="ident">Arc</span><span class="op"><</span><span class="ident">CompiledShaderHandle</span><span class="op">></span>,
|
||||
<span class="ident">render_pass</span>: <span class="ident">Arc</span><span class="op"><</span><span class="kw">dyn</span> <span class="ident">RenderPassAbstract</span> <span class="op">+</span> <span class="ident">Send</span> <span class="op">+</span> <span class="ident">Sync</span><span class="op">></span>) <span class="op">-</span><span class="op">></span> <span class="ident">TextShader</span> {
|
||||
|
||||
<span class="kw">let</span> <span class="ident">compiled_vertex</span> <span class="op">=</span> <span class="ident">GenericShader</span>::<span class="ident">compile</span>(
|
||||
@@ -334,7 +332,7 @@
|
||||
<span class="self">self</span>.<span class="ident">name</span>.<span class="ident">clone</span>()
|
||||
}
|
||||
|
||||
<span class="kw">fn</span> <span class="ident">get_handle</span>(<span class="kw-2">&</span><span class="self">self</span>) <span class="op">-</span><span class="op">></span> <span class="ident">Arc</span><span class="op"><</span><span class="ident">CompiledGraphicsPipelineHandle</span><span class="op">></span> {
|
||||
<span class="kw">fn</span> <span class="ident">get_handle</span>(<span class="kw-2">&</span><span class="self">self</span>) <span class="op">-</span><span class="op">></span> <span class="ident">Arc</span><span class="op"><</span><span class="ident">CompiledShaderHandle</span><span class="op">></span> {
|
||||
<span class="self">self</span>.<span class="ident">handle</span>.<span class="ident">clone</span>()
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user