Commit Graph

338 Commits

Author SHA1 Message Date
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
Ben Hansen
aa8f9f269d fixed #119 2020-11-14 20:07:40 -07:00
Ben Hansen
0620f0b05d migrated ModelVertex to use bytemuck derive 2020-11-14 14:57:39 -07:00
Ben Hansen
9a221fb2c4 migrated Light struct to use bytemuck derive 2020-11-14 14:43:29 -07:00
Ben Hansen
0ccb80e7e3 updated Uniforms struct to use bytemuck derive 2020-11-12 19:28:53 -07:00
Ben Hansen
5abaa16ac1 updated bytemuck to use derive as per #109 2020-11-11 16:06:53 -07:00
Ben Hansen
8ad575f750 finished #121 2020-11-11 15:41:06 -07:00
Ben Hansen
df1d2c412f applied change to main tutorials 2020-11-10 16:52:55 -07:00
Ben Hansen
eee5c32f8f started #121 2020-11-10 16:38:04 -07:00
sotrh
fd8c3e169d
Merge pull request #107 from benmkw/master
add info about alignment
2020-11-09 15:06:49 -07:00
Benedikt Mandelkow
f5ba33713a add code example 2020-11-05 18:09:27 +01:00
sotrh
38adad1421
Merge pull request #118 from IcanDivideBy0/minor_changes
Minor changes
2020-10-31 16:07:25 -06:00
Samuel Hurel
936082fafc Minor changes 2020-10-31 12:34:24 +01:00
sotrh
31a6262d75 Rename Readme.md to README.md 2020-10-30 13:18:18 +01:00
Benedikt Mandelkow
14dec8ba59 add info about alignment 2020-10-30 13:18:18 +01:00
sotrh
8f5215963a
Merge pull request #113 from pudnax/link_typo
Fixed the link to zip file
2020-10-21 17:09:21 -06:00
sotrh
3e83cf5a17
Merge pull request #112 from pudnax/winit_0.23
Migration to winit 0.23
2020-10-21 17:08:44 -06:00
sotrh
06e7818e7a
Merge pull request #115 from pudnax/light_layout_typo
Light layout typo
2020-10-21 17:06:54 -06:00
sotrh
ce3c64aea7
Merge pull request #114 from pudnax/depth_typo
Clean probably missed stuff from '0.5 -> 0.6'
2020-10-21 17:06:21 -06:00