Commit Graph

411 Commits

Author SHA1 Message Date
Marek Fajkus
7cb3cc9ddc
improve wording in beginner/tutorial2-surface 2021-12-05 23:41:45 +01:00
Josh015
110743247f Whoops 2021-11-25 20:03:08 -05:00
Josh015
a90a168280 Fixed flipped tex_coords in tutorial5-textures 2021-11-25 20:01:47 -05:00
sotrh
aa204f2178
Merge pull request #266 from nxsy/cgmath-prelude-import
Add cgmath prelude import in tutorial 7
2021-11-24 16:00:36 -07:00
sotrh
be7aa893d6
Merge pull request #267 from nxsy/tutorial9-rgba-as-reference
Provide explanation why rgba is no longer a reference
2021-11-24 15:58:49 -07:00
sotrh
fc9d31f87c
Merge pull request #268 from nxsy/tutorial9-import-trait
Explain why model::Vertex needs to be imported in tutorial 9
2021-11-24 15:56:00 -07:00
Neil Blakey-Milner
85fa2ccea9 Simplify the bind_group flow in tutorial 9 2021-11-22 18:52:49 -08:00
Neil Blakey-Milner
0821b6fd9a Explain why model::Vertex needs to be imported in tutorial 9 2021-11-22 18:22:19 -08:00
Neil Blakey-Milner
02e99b66ab Provide explanation why rgba is no longer a reference 2021-11-22 17:52:17 -08:00
Neil Blakey-Milner
f9cfd79d95 Add cgmath prelude import in tutorial 7 2021-11-22 16:44:30 -08:00
sotrh
b0d9ac3245
Merge pull request #261 from Paulo-21/patch-1
Update docs.rs link to 0.11.0
2021-11-20 13:24:54 -07:00
Arif Driessen
f0035b6b9b
Remove redundant 'NEW' comment from label
PipelineLayoutDescriptor already has its label set when we get to this point in the tutorial.

(It's set at docs/beginner/tutorial3-pipeline/README.md, line 154)
2021-11-07 20:00:29 +01:00
Arif Driessen
87c380517d
small typo 2021-11-06 22:26:47 +01:00
Pmimo
d9ef1e241e
Update docs.rs link to 0.11.0 2021-11-05 21:28:06 +01:00
sotrh
75948417e7
Merge pull request #257 from FrankenApps/shader-entrypoints
Name shader entry points differently.
2021-11-05 11:22:03 -06:00
sotrh
667d7c16d9
Merge pull request #259 from arifd/master
Rust resolver 2 default in 2021 edition
2021-11-01 13:59:35 -06:00
sotrh
d4f5429bbb
Merge pull request #256 from PhilipK/fix-typo-tutorial2
Fix typo in tutorial2-surface README.md
2021-11-01 13:59:04 -06:00
Arif Driessen
6042b6e821
Update README.md 2021-10-31 16:31:58 +01:00
Ferdinand Schäffler
bd46bdb243 Converted docs. 2021-10-27 13:17:40 +02:00
Philip Kristoffersen
f31af2d2cb
Fix typo in tutorial2-surface README.md
Add a missing "to"
2021-10-27 06:41:05 +02:00
Pmimo
d26d61e4be
Update link to 0.11 docs.rs 2021-10-26 00:53:11 +02:00
laalsaas
297923e578
fix typo kronos to khronos 2021-10-18 13:18:53 +02:00
Ben Hansen
e0e52584a6 fixed pong for 0.11 2021-10-15 12:05:03 -06:00
Ben Hansen
7cc67f5678 migrated to 0.11 2021-10-08 18:40:29 -06:00
sotrh
e15fc946ac
Merge pull request #242 from PAUL-BERNARD/master
Fix some typos
2021-10-01 15:14:00 -06:00
sotrh
b40fbb6121
Merge pull request #243 from chrisboyce/chrisboyce-tut2-fix
No "first()" method on Iterator
2021-10-01 15:12:03 -06:00
sotrh
ff43b83a89
Merge pull request #244 from SuperSamus/master
model.rs: added "_bind_group" where appropriate
2021-10-01 15:11:33 -06:00
Spencer Imbleau
172a65ad72
Fixed typo: BackendBit::Primary is from a previous version 2021-09-28 07:09:41 -04:00
Martino Fontana
11b24cebc5 model.rs: added "_bind_group" where appropriate 2021-09-25 21:52:42 +02:00
Chris Boyce
bb32dbdb52
No "first()" method on Iterator
As far as I can tell looking at the docs, there is no "first" method for the Iterator trait, but I believe "next" accomplishes getting the first item in this instance.
2021-09-25 11:45:31 -07:00
Paul BERNARD
1dad054540 typos 2021-09-22 20:24:20 +02:00
Fabian Kloiber
6546507acf Fix wording
Remove duplicate "the" and shuffle some words around
2021-09-19 22:35:17 +02:00
Fabian Kloiber
85857948bf Update field name attachment
In the section on `RenderPassColorAttachment` the text uses the old name `attachment` for the field which now is called `view`.
2021-09-19 22:35:17 +02:00
Fabian Kloiber
da913a90af Update link to wgpu docs
Link to `wgpu::Limits` pointed to old version 0.7
2021-09-19 22:35:17 +02:00
Ben Hansen
778a7d907b fixed #239 2021-09-19 13:48:01 -06:00
Kuroki Keiichiro
29a084b1b1 Update an explaining comment for its code
The code has been updated for wgpu-0.10 (`wgpu::TextureUsage::SAMPLED`
-> `wgpu::TextureUsages::TEXTURE_BINDING`), but its comment was not
updated at the same time.
2021-09-19 15:19:15 +09:00
sotrh
bba4376e34
Merge pull request #233 from rukai/env_logger
Add section on why env_logger is needed
2021-09-17 10:56:05 -06:00
sotrh
c013b28f59
Merge pull request #234 from chrisboyce/master
Fixed mask field name in text
2021-09-17 10:34:57 -06:00
sotrh
d63ab6f8d5
Merge pull request #237 from TheBlueFireFox/master
Fixed issue with code example was not ported to 0.10.x
2021-09-17 10:32:21 -06:00
sotrh
432077c7d0
Merge pull request #236 from schnippl0r/master
Fixed code snippet.
2021-09-17 10:31:08 -06:00
Adrian Hornung
6654cae15b Fixed issue with code example was not ported to 0.10.x 2021-09-17 18:27:32 +02:00
Mario Kilies
e281746334 Fixed code example.
'instance' and 'adapter' are not defined (and not needed) in State.
2021-09-17 02:52:42 +02:00
Onirik79
651da2ff23
Updated a link to wgpu docs 2021-09-16 20:07:49 +02:00
Chris Boyce
1ab24facf2
Fixed mask field name in text 2021-09-15 16:59:20 -07:00
Lucas Kent
f2c0f2aa3c Add section on why env_logger is needed 2021-09-16 09:51:21 +10:00
Ben Hansen
a2285094c2 fixed #231 2021-09-15 09:52:19 -06:00
Ben Hansen
6d600965f4 some typos 2021-09-13 08:58:14 -06:00
sotrh
316c429d2f
Merge pull request #228 from VillSnow/patch-1
fix type name Camera to CameraUniform
2021-09-12 11:35:44 -06:00
Ben Hansen
5ddd876d4f Merge branch '0.10' 2021-09-11 15:35:21 -06:00
Ben Hansen
7c90669f89 migrated beginner tutorials 2021-09-11 11:11:30 -06:00
Ben Hansen
358ecb55af migrate tutorial5 docs 2021-09-11 10:42:13 -06:00
Ben Hansen
c0754f9dd3 migrated tutorial5 2021-09-11 10:37:05 -06:00
Ben Hansen
57d7eb763f migrated tutorial4 2021-09-11 10:19:15 -06:00
Ben Hansen
0f618a2ff8 migrated tutorial3 2021-09-11 10:10:18 -06:00
Ben Hansen
012dff0de0 renamed tutorial2 2021-09-11 09:40:47 -06:00
Ben Hansen
b322b8f6b8 reworked swapchain tutorial to use surface 2021-09-11 09:34:13 -06:00
VillSnow
d13ba88020 fix type name Camera to CameraUniform 2021-09-09 18:46:43 +09:00
Ben Hansen
30c5693fb9 no more validation errors 2021-09-07 17:17:08 -06:00
Ben Hansen
822f2d6191 started 0.10 2021-08-28 16:11:33 -06:00
Onirik79
cd5c440cc1
minor typo 2021-08-28 17:05:46 +02:00
Martino Fontana
372082ae90 Rename "Uniform" to "Camera" in labels too 2021-08-27 00:07:50 +02:00
Martino Fontana
b2b77294f6 Change "uniform" naming to "camera" 2021-08-26 21:09:51 +02:00
Norbert Pozar
f467e54f7a Fix location syntax (GLSL -> WGSL)
Also outdated `VertexFormat` variants.
2021-08-26 08:44:19 +09:00
sotrh
ed186bf229
Merge pull request #215 from rokonio/patch-3
Another tiny fix
2021-08-16 09:40:36 -06:00
sotrh
0b1adb463f
Merge pull request #217 from rokonio/patch-4
Fix on vert_attr_array
2021-08-16 09:40:03 -06:00
sotrh
59bc306c32
Merge pull request #214 from rokonio/patch-2
Found a typo
2021-08-16 09:39:39 -06:00
Sitong Peng
4211abcc12
your -> you'll 2021-08-12 16:50:52 -07:00
Rokonio
aa5856fa91
Fix on vert_attr_array 2021-08-11 22:20:30 +02:00
Rokonio
aadd2e67b6
Another tiny fix 2021-08-10 22:00:07 +02:00
Rokonio
ab78dcf7a7
Found a typo 2021-08-10 21:57:07 +02:00
sotrh
1030f47529
Merge pull request #212 from rokonio/master
Fixing #200
2021-08-09 16:20:36 -06:00
sotrh
5a51bf47f9
Merge pull request #210 from SuperSamus/master
Miscellaneous improvements
2021-08-09 14:58:23 -06:00
Ben Hansen
58eca592c1 fixed #202 2021-08-09 14:51:54 -06:00
Rokonio
1c26da1757
Fixing #200 2021-08-09 00:24:18 +02:00
Epacnoss
d9e6c4a326
Change Float3 to Float32 2021-08-07 22:29:18 +01:00
Martino Fontana
2941cf7cd9 Updated dependencies where I can just change the number (not "tobj" and "gif") ("compute" can't start a trace) (didn't touch "pong" and "imgui-demo") 2021-08-04 16:25:23 +02:00
Martino Fontana
c55ea96d0d Removed unnecessary .clone() 2021-08-04 15:13:08 +02:00
Martino Fontana
467cec5367 Removed unnecessary borrows 2021-08-04 15:06:53 +02:00
Martino Fontana
2c811f43a4 Truncated excessive float precision 2021-08-04 14:58:23 +02:00
Martino Fontana
c80b5a9ae2 Collapsed event_loop match 2021-08-04 14:17:21 +02:00
Martino Fontana
b5af53b272 Simplify DrawModel and DrawLight lifetimes 2021-08-04 13:20:15 +02:00
Ben Hansen
12c7ba6de8 fixed #182 2021-07-20 17:48:23 -06:00
Ben Hansen
87c6fa9971 fixed #158 2021-07-20 17:25:47 -06:00
Joshua Barretto
12ba9bed0c Switched to pollster 2021-07-14 13:26:05 +01:00
Ben Hansen
0813fd03a4 Merge branch 'master' into 0.9 2021-06-28 09:24:39 -06:00
Rokonio
0f63cee02e
Update README.md
When the vertex class is updated, the `bytemuck`s trait were missing
2021-06-26 14:47:59 +02:00
Ben Hansen
b5ce220c2b upgraded to 0.9 2021-06-19 16:31:49 -06:00
Ben Hansen
c22808f17a fixed #162 2021-06-19 15:27:55 -06:00
Gwenhwyfar Hartshaw
55c9a7f44c
Add missing fields in PrimitiveState
The render pipeline page was missing the `clamp_depth` and `conservative` fields of the `wgpu::PrimitiveState` struct, added with wgpu 0.8.  These were correct in the full code, but not the snippets in the doc.
2021-06-18 13:59:09 -04:00
Ben Hansen
5f77f40ec1 fixes #191 2021-06-16 19:14:00 -06:00
Aevyrie
2eeffbb84a
Rename RenderPassDepthStencilAttachmentDescriptor
Rename RenderPassDepthStencilAttachmentDescriptor -> RenderPassDepthStencilAttachment

See: https://docs.rs/wgpu/0.8.1/wgpu/struct.RenderPassDepthStencilAttachment.html
2021-06-08 00:19:51 -07:00
Aevyrie
e16efae327
Remove clamp_depth from DepthStencilState
clamp_depth no longer exists on DepthStencilState, and is instead only on PrimitiveState.
2021-06-08 00:01:59 -07:00
sotrh
0585ca5ca5
Merge pull request #188 from aevyrie/patch-2
wgpu 0.8 corrections
2021-06-07 17:24:47 -06:00
Aevyrie
5cd42e231c
Missing qualifier 2021-06-06 10:32:38 -07:00
Aevyrie
adc729747b
Fix grammatical error 2021-06-06 10:30:46 -07:00
Aevyrie
c9003caa9f
ImageDataLayout change 2021-06-06 01:40:12 -07:00
Aevyrie
b8853689fe
wgpu 0.8 BlendState change 2021-06-05 23:52:02 -07:00
Aevyrie
382f12383e
Update README.md
Small typo.
2021-06-05 21:09:10 -07:00
sotrh
dd7d48929f
Merge pull request #181 from al-tameemi/e6029cb
Updated the use of RenderPassColorAttachmentDescriptor to RenderPassColorAttachment
2021-06-01 11:57:27 -06:00
Hugo Woodiwiss
67c9246b2f
Updated tutorial to work with tobj 3.0.x 2021-06-01 14:19:32 +01:00
Mohammed Al-Tameemi
17ca6e5a3e Updated to the new color attachment method 2021-05-25 20:21:56 -04:00
nyx
7755e16a4b Changed wgpu version in example
Removed shaderc from example
2021-05-25 13:56:38 +02:00
Ben Hansen
2dd8d7bf82 fixes #176 2021-05-24 14:45:15 -06:00
Ben Hansen
de57cdf4ea fixes #173 2021-05-24 14:23:53 -06:00
Ben Hansen
b160f28d48 tutorials 6-9 migrated 2021-05-20 17:53:47 -06:00
Ben Hansen
f1c7536668 migrated tutorial 4 and 5 2021-05-18 20:38:15 -06:00
Ben Hansen
68b563b8e6 updated tutorial3-pipeline docs 2021-05-18 20:28:08 -06:00
Ben Hansen
8e6e6e7092 fixed #174 2021-05-17 21:15:25 -06:00
Ben Hansen
f3ebc0e666 fixed panic in tutorials 3 and 4 2021-05-01 18:10:01 -06:00
Ben Hansen
46eb5eb139 code now builds on 0.8 2021-05-01 15:55:26 -06:00
sotrh
d8a861b515
Merge branch 'master' into cgmath-0.18 2021-04-18 19:36:12 -06:00
sotrh
c5c3e907c7
Merge pull request #163 from segalll/master
Fix typos in beginner window tutorial
2021-04-18 19:33:45 -06:00
Hiroaki Yutani
24f565ee58 Update winit to 0.24 2021-04-16 00:28:55 +09:00
Henry Segal
18dff8f171
Fix typos 2021-04-14 20:56:28 -05:00
Hiroaki Yutani
1bb374c89e docs 2021-04-11 17:09:10 +09:00
Hiroaki Yutani
7293547212 Bump cgmath version 2021-04-11 16:38:53 +09:00
Sergii Penner
597c37b8b1
Fix typo
Fixed typo 'upc close' -> 'up close'.
2021-04-02 20:10:18 -06:00
sotrh
674312d3b2
Merge pull request #147 from yutannihilation/tutorial1-use
use winit:🪟:Window
2021-03-29 09:02:09 -06:00
sotrh
d5ab40ade1
Merge pull request #151 from vigdail/patch-1
Tutorial 9. Texture::load() return type fix
2021-03-29 09:00:36 -06:00
sotrh
220366adcc
Merge pull request #152 from pop/edits/misc-typos
Misc typo and code fixes.
2021-03-29 08:59:30 -06:00
Chris
0926c253e5
Rename OUTPUT_ATTACHMENT to RENDER_ATTACHMENT 2021-03-27 11:59:08 +01:00
Elijah C. Voigt
bcc79b5e41 Misc typo and code fixes.
009: impl Vertex for ModelVertex was using the vertex_attr_array! macro.
009: RenderPipelineDescriptor has a `vertex` member not  `vertex_state`.
009: to_rgba() should be to_rgba8(), to_rgba is set to be deprecated.

010: BindGroupDescriptor has a `entries` member not `bindings`.
010: Remove re-declaration of mat4 model_matrix;
010: Prefer hard-coded [#.#; #] instead of `Foo::fn().into()`.
010: Clarify which shader frag/vert file changes are in.

011: Change Model::load return type to Result<Self>.
011: TextureDescriptor does not have a array_layer_count member.

012: Add .into() to calls in Uniforms::update_view_proj().
012: Dereference delta variable in State::input().

013: Add more changed lines to Model::load to avoid compiler yelling.
2021-03-26 09:46:37 -07:00
vigdail
9f254cc794
Tutorial 9. Texture::load() return type fix 2021-03-24 16:07:31 +00:00
Hiroaki Yutani
f0f1ec0e12 Fix module path 2021-03-22 08:19:24 +09:00
Hiroaki Yutani
e5bea6e29f Move comment 2021-03-22 08:17:21 +09:00
sotrh
195945083b
Merge pull request #149 from yutannihilation/patch-7
Minor fixes on tutorial 6
2021-03-21 16:26:16 -06:00
Hiroaki Yutani
b09302f23e Remove & from set_vertex_buffer() 2021-03-21 23:01:00 +09:00
Hiroaki Yutani
0da538190a
Minor fixes on tutorial 6 2021-03-21 19:06:48 +09:00
Hiroaki Yutani
a13c43f6b2 use winit::Window; 2021-03-20 22:45:14 +09:00
Raphael Van Hoffelen
1699be127d
Fixed spelling mistake 2021-03-15 23:29:14 -04:00
Linden Krouse
f6f6fa29c4
Fixed some spelling and grammar errors 2021-03-08 17:28:27 -05:00
sotrh
a86a0cc7dc
Merge pull request #138 from dakizu/patch-1
Fix a broken link
2021-03-03 10:21:47 -07:00
[redacted]
3bd1534016
Fix a broken link
Existing link wasn't pointing to normals page.
2021-02-27 20:49:24 -08:00
Ben Hansen
e3592e2809 migrated docs for tutorials 4-9 2021-02-18 21:30:18 -07:00
Ben Hansen
e7318530d4 migrated docs for tutorials 1-3 and cargo fmt 2021-02-18 20:56:47 -07:00
Ben Hansen
b4dd4654e4 intermediate tutorial code migrated 2021-02-13 01:30:42 -07:00
Ben Hansen
3901419a58 beginner tutorial code done 2021-02-12 00:18:27 -07:00
Ben Hansen
91879d405b code up to 7 migrated 2021-02-11 23:29:40 -07:00
Ben Hansen
47fd27669e migrated tutorials 1 and 2 2021-02-07 12:17:22 -07:00
Aleksey Halahan
ad0515bdfb
Fix a type in the code example
Was missing the `slice` method
2021-01-29 00:02:16 +01:00
Ben Hansen
19c99e28d0 Merge branch 'master' of https://github.com/sotrh/learn-wgpu 2021-01-26 02:03:31 -07:00
Ben Hansen
1f9024691c shaderc 1.6 -> 0.7 2021-01-26 02:02:50 -07:00
Fisher Darling
5547528cf0
Fixed small typo in beginner/tutorial8-depth 2021-01-21 19:14:01 +00:00
Renato Caldas
d44f216b14 Fix inconsistent position of the 'size' field in the beginner tutorials 2021-01-15 19:31:51 +00:00
Renato Caldas
e61b939889 Remove stray field 'colour' from State 2021-01-15 19:12:44 +00:00
Renato Caldas
67635a5fad Fix typos in beginner tutorial 4 2021-01-15 18:42:34 +00:00
paq
6302a2372c
Fix syntax error in tutorial 6 2021-01-03 15:58:12 +09:00
DevJac
468807e8a3 Link to Cargo Book for more info about build scripts 2020-12-31 19:22:54 -07:00
Ben Hansen
733683cf6f removed camera research 2020-12-21 13:33:42 -07:00
Ben Hansen
99fd6523d7 travis build failing 2020-12-20 21:05:18 -07:00