Commit Graph

906 Commits

Author SHA1 Message Date
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
sotrh
1fda21eb6a
Merge pull request #134 from fisherdarling/patch-1
Fixed small typo in beginner/tutorial8-depth
2021-01-21 17:02:46 -07:00
Fisher Darling
5547528cf0
Fixed small typo in beginner/tutorial8-depth 2021-01-21 19:14:01 +00:00
sotrh
6416357063
Merge pull request #133 from rmsc/master
Fix typo in beginner tutorial 4
2021-01-18 00:33:49 -07: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
Ben Hansen
a6883b59f9 Added patrons to the intro page 2021-01-14 23:50:55 -07:00
sotrh
7bde566bb9
Merge pull request #132 from paq/patch-1
Fix syntax error in tutorial 6
2021-01-03 14:38:15 -07:00
paq
6302a2372c
Fix syntax error in tutorial 6 2021-01-03 15:58:12 +09:00
sotrh
63af8ac3d5
Merge pull request #131 from DevJac/cargo-book-link
Link to Cargo Book for more info about build scripts
2021-01-01 02:06:18 -07: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
Ben Hansen
7b1ff3dd36 travis now installs libasound2-dev 2020-12-20 00:49:02 -07:00
Ben Hansen
da7f57faf5 still debugging travis 2020-12-20 00:21:30 -07:00
Ben Hansen
bebef5be3c debugging travis 2020-12-17 15:44:57 -07:00
Ben Hansen
a6a1d929ae fixing .travis.yml 2020-12-12 19:57:54 -07:00
Ben Hansen
8e09f6de43 Merge branch 'master' of github.com:sotrh/learn-wgpu 2020-12-12 15:54:04 -07:00
Ben Hansen
8608460977 fixed #129 2020-12-12 15:53:42 -07:00
sotrh
75bc5cdb77
Merge pull request #130 from sotrh/dependabot/npm_and_yarn/ini-1.3.8
Bump ini from 1.3.5 to 1.3.8
2020-12-12 15:26:33 -07:00
dependabot[bot]
907d50aaea
Bump ini from 1.3.5 to 1.3.8
Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.8.
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.8)

Signed-off-by: dependabot[bot] <support@github.com>
2020-12-12 14:30:32 +00:00
sotrh
2c331ea773
Merge pull request #128 from kanerogers/patch-7
Run all tasks asynchronously
2020-11-30 21:30:39 -07:00
Kane Rogers
344cecc1e4
Remove unnecessary comment 2020-11-30 14:55:41 +11:00
Kane Rogers
633a129403
Run all tasks asynchronously
This should run all the tasks at the same time. If there are any updates to be done, cargo *may* block, but beyond that everything else should work fine.

Shebang also added for Multiplatform support.
2020-11-30 14:54:57 +11:00
sotrh
12569be5de
Merge pull request #127 from sotrh/device-events
modified camera tutorial to use `DeviceEvent`
2020-11-25 16:52:46 -07:00
Ben Hansen
c92d2a528e modified camera tutorial to use DeviceEvent 2020-11-25 16:51:22 -07:00
Ben Hansen
dd93e19fbb added wgpu-subscriber to framework 2020-11-25 15:22:45 -07:00
Ben Hansen
5e68c8385a Merge branch 'master' of github.com:sotrh/learn-wgpu 2020-11-23 23:44:12 -07:00
Ben Hansen
1b1a24b265 updated deploy.sh to cleanup dist git repo 2020-11-23 23:43:35 -07:00
sotrh
7b1a81ccfe
Merge pull request #123 from kanerogers/patch-4
Clarify changes to State struct
2020-11-23 23:37:16 -07:00
sotrh
68e06ea4a4
Merge pull request #125 from dannyfritz/patch-1
Texture: BufferInitDescriptor fields.
2020-11-23 23:36:09 -07:00
sotrh
91f556bb4e
Merge pull request #126 from sotrh/cleanup-nov2020
Cleanup nov2020
2020-11-23 23:30:37 -07:00
Ben Hansen
f1d35b6b38 finished cleanup 2020-11-23 23:29:52 -07:00
Ben Hansen
7e9f305f7b basic imgui example 2020-11-23 22:16:25 -07:00
Ben Hansen
8b08d73fef Merge branch 'cleanup-nov2020' of github.com:sotrh/learn-wgpu into cleanup-nov2020 2020-11-23 19:17:46 -07:00
Ben Hansen
4fa1e1a504 building blocks for future showcases 2020-11-23 19:17:34 -07:00
sotrh
039d840698
Merge pull request #124 from kanerogers/patch-6
Cleanup Textures tutorial
2020-11-23 16:06:01 -07:00
Danny Fritz
4cd5491921
Texture: BufferInitDescriptor fields. 2020-11-22 08:43:15 -07:00
Kane Rogers
21e455c668
Update to reflect sorth's suggestions
- Add `diffuse_texture` to `texture::Texture` in `State` at the end of the tutorial.
2020-11-22 21:08:34 +11:00
Ben Hansen
28c8637d73 finished compute exampute example 2020-11-21 13:16:07 -07:00
Ben Hansen
52b1ae0ac6 code for compute example 2020-11-20 12:23:48 -07:00
Kane Rogers
58618be013
Additional changes to Texture
1. The fields ` diffuse_texture`, `diffuse_texture_view` and `diffuse_sampler` are not used on `State` in this tutorial and should therefore not be added, so as not to unnecessarily confuse the reader.
2. The `anyhow` crate must be added to `Cargo.toml` in order for `texture.rs` to work.
2020-11-20 19:44:17 +11:00
Kane Rogers
6b2a8c8dcc
Additional changes to Texture
1. The fields ` diffuse_texture`, `diffuse_texture_view` and `diffuse_sampler` are not used on `State` in this tutorial and should therefore not be added, so as not to unnecessarily confuse the reader.
2. The `anyhow` crate must be added to `Cargo.toml` in order for `texture.rs` to work.
2020-11-20 19:44:10 +11:00
Kane Rogers
fbe39fc0e4
Cleanup Textures tutorial
I have broadly made two sets of changes:

1. General prose cleanup (eg. correcting minor syntax errors, rewriting some sentences to make them more clear)
2. Code consistency (eg. not making use of the `texture` wrapper until it is defined at the end of the page.
2020-11-20 19:14:27 +11:00
Ben Hansen
aa773303df cargo fmt 2020-11-18 11:48:37 -07:00
Ben Hansen
e462670b72 migrated docs for tutorial7 2020-11-18 11:47:13 -07:00
Ben Hansen
c770e1860f fixed code for #116 2020-11-18 10:48:28 -07:00
Kane Rogers
b93a57d9b3
Clarify changes to State struct
Not a big one, just being explicit where the fields need to be updated on the struct.
2020-11-18 00:04:10 +11:00