Commit Graph

373 Commits

Author SHA1 Message Date
Rokonio
7bbbae06dd
Fixing #200 2021-08-09 00:39:03 +02:00
Rokonio
6f4b540330
Fixing #200 2021-08-09 00:38:09 +02:00
Rokonio
975c6b3502
Fixing #200 2021-08-09 00:36:49 +02:00
Rokonio
2914e54824
Fixing #200 2021-08-09 00:34:31 +02:00
Rokonio
7f5dbe7245
Fixing #200 2021-08-09 00:32:21 +02:00
Rokonio
0a403411bf
Fixing #200 2021-08-09 00:31:11 +02:00
Rokonio
848758a792
Fixing #200 2021-08-09 00:30:15 +02:00
Rokonio
40590e35f4
Fixing #200 2021-08-09 00:28:27 +02:00
Rokonio
747b399d13
Fixing #200 2021-08-09 00:27:31 +02:00
Rokonio
5a5ec13d7c
Fixing #200 2021-08-09 00:26:35 +02:00
Rokonio
7467a11b5b
Fixing #200 2021-08-09 00:25:48 +02:00
Rokonio
a0e39bf097
Fixing #200 2021-08-09 00:21:54 +02:00
Rokonio
0c1bbb686b
Fixing #200 2021-08-09 00:21:00 +02: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
ed34bbfbce Removed unnecessary mut 2021-08-04 15:15:50 +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
f46b2f6d74 fixed #142 2021-07-20 17:40:06 -06:00
Joshua Barretto
12ba9bed0c Switched to pollster 2021-07-14 13:26:05 +01:00
Ben Hansen
b5ce220c2b upgraded to 0.9 2021-06-19 16:31:49 -06:00
Ben Hansen
72cd5e9eb4 fixed broken demos 2021-06-06 11:13:38 -06:00
Hugo Woodiwiss
3a4b2d56dc
Update tutorial 13 to tobj 3.0.x 2021-06-01 14:30:36 +01:00
Hugo Woodiwiss
fd7b232e6f
Update tutorial 12 to tobj 3.0.x 2021-06-01 14:29:04 +01:00
Hugo Woodiwiss
08fc3e41d0
Update tutorial 11 to tobj 3.0.x 2021-06-01 14:27:13 +01:00
Hugo Woodiwiss
72ea816735
Update tobj in lighting tutorial 2021-06-01 13:57:56 +01:00
Hugo Woodiwiss
8a01d0e519
Update model loading tutorial to tobj 3.0.x 2021-06-01 13:53:03 +01:00
nyx
5e52c7dc07 Removed shaderc from Cargo.toml dependencies 2021-05-25 13:54:54 +02:00
Ben Hansen
9baae51fe3 finishing up 0.8 2021-05-24 13:14:17 -06:00
Ben Hansen
63e0d9c6b8 intermediate tutorials migrated 2021-05-24 11:44:10 -06:00
Ben Hansen
4e6c061914 fixing warnings 2021-05-18 19:20:29 -06:00
Ben Hansen
2f8bf02710 finished migrating challenge shaders and cargo fmt 2021-05-18 19:16:36 -06:00
Ben Hansen
f9ee77844d removed shaderc from build.rs 2021-05-17 21:28:12 -06:00
Ben Hansen
8e6e6e7092 fixed #174 2021-05-17 21:15:25 -06:00
Ben Hansen
c21c7bd889 tutorials 12 and 13 now use wgsl 2021-05-17 21:09:39 -06:00
Ben Hansen
d2db4fa575 migrated tutorial11-normals code 2021-05-15 16:58:02 -06:00
Ben Hansen
d6d268bd44 tutorial10 lighting now uses wgsl 2021-05-12 22:08:07 -06:00
Ben Hansen
d2889cd50a beginner tutorial code now uses wgsl 2021-05-08 14:09:28 -06:00
Ben Hansen
8a72178353 tutorial9 wgsl attempt 2021-05-04 15:31:58 -06:00
Ben Hansen
601273ec2b debugging tutorials 9 and 10 2021-05-01 20:26:28 -06:00
Ben Hansen
add4ba7328 fixed panics in tutorials 5-8 2021-05-01 19:02:38 -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
Hiroaki Yutani
24f565ee58 Update winit to 0.24 2021-04-16 00:28:55 +09:00
Hiroaki Yutani
ecf8076b75 showcase 2021-04-11 17:09:00 +09:00
Hiroaki Yutani
58ff4bb438 tutorial13 2021-04-11 17:01:07 +09:00
Hiroaki Yutani
e26605ebb7 tutorial12 2021-04-11 16:59:05 +09:00
Hiroaki Yutani
a81a844bd6 tutorial11 2021-04-11 16:56:01 +09:00
Hiroaki Yutani
316f191cf7 tutorial10 2021-04-11 16:54:50 +09:00
Hiroaki Yutani
9c07ba5388 tutorial9 2021-04-11 16:52:38 +09:00
Hiroaki Yutani
3bf2c0f9ed tutorial8 2021-04-11 16:48:54 +09:00
Hiroaki Yutani
156a61b459 tutorial7 2021-04-11 16:46:59 +09:00
Hiroaki Yutani
6b5d3eee87 tutorial6 2021-04-11 16:45:02 +09:00
Hiroaki Yutani
7293547212 Bump cgmath version 2021-04-11 16:38:53 +09:00
Ben Hansen
4fa3ab7b6d migrated tutorial3 challenge 2021-03-03 02:12:42 -07:00
Ben Hansen
9d68020e87 removed research folder 2021-03-03 01:40:45 -07:00
Ben Hansen
c121682bd3 migrated pong 2021-03-03 01:14:52 -07:00
Ben Hansen
d56c73009b migrated compute showcase 2021-03-02 23:13:39 -07:00
Ben Hansen
5029aa196d migrated gifs showcase 2021-02-23 21:04:42 -07:00
Ben Hansen
fb73851e5d migrated imgui showcase 2021-02-22 10:20:00 -07: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
361bee3c58 migrated windowless docs 2021-02-18 20:13:23 -07:00
Ben Hansen
eff8418d37 cargo fmt 2021-02-18 20:04:09 -07:00
Ben Hansen
7094e5dd91 migrated windowless 2021-02-18 19:59:00 -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
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
Renato Caldas
d44f216b14 Fix inconsistent position of the 'size' field in the beginner tutorials 2021-01-15 19:31:51 +00: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
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
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
4fa1e1a504 building blocks for future showcases 2020-11-23 19:17:34 -07: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
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
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
Benedikt Mandelkow
f5ba33713a add code example 2020-11-05 18:09:27 +01:00
Alex Komissarov
d38731e472
Migration to winit 0.23 2020-10-21 01:10:16 +05:00
Ben Hansen
6f29ba738b fixes #108 2020-10-17 14:51:41 -06:00
Ben Hansen
73aed6c6bd rustfmt 2020-09-27 23:24:43 -06:00
Ben Hansen
ad5cd8e12f fixed #93 2020-09-27 22:52:35 -06:00
Ben Hansen
041a230d0d finished threading 2020-09-27 22:52:11 -06:00
Ben Hansen
9b02850917 started threading 2020-09-25 21:27:38 -06:00
Ben Hansen
09fe8b9f91 added link to gifs showcase in tutorial5 2020-09-25 15:57:57 -06:00
Ben Hansen
9d15abf7ee fixing issues in tutorial3 for #92 2020-09-23 15:38:01 -06:00
Ben Hansen
5409e8ea1e rogue copy paste 2020-09-22 16:02:23 -06:00
Ben Hansen
2ab37aa9b7 some fixes 2020-09-22 16:00:46 -06:00
lberrymage
fa418b2c60
Use std::iter::once for encoder queue submission
`std::iter::once` is more idiomatic for passing single-value iterators
than Some(value), and it's even intended for this case according to the
docs.
2020-09-19 22:17:36 -08:00
Ben Hansen
cb5cfd074f fixed #86 2020-09-19 15:49:05 -06:00
Ben Hansen
18bbd52f0e migrated pong code 2020-09-19 15:31:54 -06:00
Ben Hansen
801ee97038 migrated gifs 2020-09-16 00:25:40 -06:00
Ben Hansen
b4a51e66a4 migrated framework 2020-09-15 22:06:05 -06:00
Ben Hansen
4186d5af45 migrated tutorial12 code 2020-09-14 13:28:50 -06:00
Ben Hansen
8d5de2d87c migrated tutorial11 2020-09-14 12:53:22 -06:00
Ben Hansen
03b1b64e55 migrated tutorial10 2020-09-11 16:19:26 -06:00
Ben Hansen
02921f7ffa migrated tutorial9 2020-09-11 16:05:09 -06:00
Ben Hansen
cfd36577bb migrated tutorial10 code 2020-09-11 15:03:19 -06:00
Ben Hansen
3dbb6570b7 migrated tutorial9 code 2020-09-10 22:45:32 -06:00
Ben Hansen
7274f37019 migrated tutorial8 2020-09-10 20:50:51 -06:00
Ben Hansen
f1d43b9829 env_logger::init() 2020-09-09 20:48:08 -06:00
Ben Hansen
5e4324d0ce env_logger 2020-09-08 00:42:52 -06:00
Ben Hansen
92285689ac migrated tutorial8 code 2020-09-06 23:21:40 -06:00
Ben Hansen
1e8a6ba0a5 migrated tutorial7 2020-09-05 16:45:52 -06:00
Ben Hansen
75d92c523c migrated tutorial6 2020-09-05 15:54:07 -06:00
Ben Hansen
bc6277e0f0 squashing warnings 2020-09-05 13:47:53 -06:00
Ben Hansen
6827fb5572 migrated tutorial5 2020-09-05 13:46:15 -06:00
Ben Hansen
e9e325459d using anyhow instead of failure 2020-08-29 15:22:06 -06:00
Ben Hansen
0fbb71efb6 migrated tutorial4 2020-08-28 19:47:16 -06:00
Ben Hansen
b3a6d3163d migrated tutorial4 code 2020-08-27 12:21:53 -06:00
Ben Hansen
08fa40dccc changed tutorial3 to use build script and migrated doc to 0.6 2020-08-24 13:34:37 -06:00
Ben Hansen
2abc38c769 migrated tutorial3 code 2020-08-22 18:35:12 -06:00
Ben Hansen
50a6a7d7e6 migrated tutorial2 2020-08-22 14:53:07 -06:00
Ben Hansen
3ef4df6fd9 migrated tutorial1 and removed instancing examples 2020-08-20 13:26:44 -06:00
Ben Hansen
3c4f8f9134 Merge branch 'master' into rework-instancing 2020-08-12 16:10:01 -06:00
Ben Hansen
540b03aded Merge branch 'master' of github.com:sotrh/learn-wgpu 2020-08-12 16:09:04 -06:00
Ben Hansen
ae1564117f fixed #75 2020-08-12 16:06:14 -06:00
Ben Hansen
a5c6b5ad48 finished instancing rewrite 2020-08-12 16:04:50 -06:00
Ben Hansen
b543c16492 started instancing rework 2020-08-11 15:28:50 -06:00
Ben Hansen
0cd250d5fe started instancing examples 2020-08-11 13:17:14 -06:00
Alex Butler
a03a57bb60
Fix some easy-win lints 2020-08-03 11:44:46 +01:00
Ben Hansen
252ca8b909 forgot github link, etc 2020-07-24 15:47:04 -06:00
Ben Hansen
0ae192f440 fixed missing screenshot 2020-07-24 15:36:50 -06:00
Ben Hansen
d6d6995066 finished camera changes 2020-07-24 13:24:45 -06:00
Ben Hansen
d14c3a4aef fixed camera issues 2020-07-22 15:21:37 -06:00
Ben Hansen
69ec7ba20b Merge branch 'master' of github.com:sotrh/learn-wgpu 2020-07-21 19:35:21 -06:00
Ben Hansen
1a6194556e working on fps camera 2020-07-21 19:35:10 -06:00
Dzmitry Malyshau
e9ea5854ca
Fix a mismatch in light VS versus FS varying of v_color 2020-07-09 16:37:40 -04:00
Ben Hansen
a1e5f474eb fixed #67 2020-07-01 18:17:31 -06:00
Ben Hansen
622a73fd72 fixed mip flipping 2020-06-23 14:59:22 -06:00
Ben Hansen
4ee7343f7d added env_logger 2020-06-23 13:02:10 -06:00
Ben Hansen
b9778a4f74 switch back to mipmapping normal map 2020-06-22 16:33:58 -06:00
Ben Hansen
8eee289c41 res folder now copied to OUT_DIR 2020-06-22 16:03:11 -06:00
Ben Hansen
1a850cc1b1 started performance research 2020-06-21 00:49:43 -06:00
Ben Hansen
4063cc49de fixed #46 2020-06-09 21:18:45 -06:00
Ben Hansen
6ffa5c044c fixed #40 2020-05-28 13:57:07 -06:00
Ben Hansen
2be19f2070 updating to shaderc 2020-05-28 13:47:05 -06:00
Ben Hansen
6e369e99ee Merge branch 'master' into pong 2020-05-28 13:24:15 -06:00
Ben Hansen
c6229a7ca6 finished pong 2020-05-28 13:22:06 -06:00
Ebrahim Byagowi
3555c713cb Use shaderc instead the deprecated glsl-to-spirv
I was getting lots of these errors,

glsl-to-spirv-0.1.7/glslang/hlsl/../glslang/MachineIndependent/../Public/../Include/../Include/Common.h:99:
.../registry/src/github.com-1ecc6299db9ec823/glsl-to-spirv-0.1.7/glslang/hlsl/../glslang/MachineIndependent/../Public/../Include/PoolAlloc.h:314:54: error: 'operator=' is a private member of 'glslang::TPoolAllocator'
    void setAllocator(TPoolAllocator* a) { allocator = *a; }
                                           ~~~~~~~~~ ^ ~~
.../registry/src/github.com-1ecc6299db9ec823/glsl-to-spirv-0.1.7/glslang/hlsl/../glslang/MachineIndependent/../Public/../Include/PoolAlloc.h:244:21: note: declared private here
    TPoolAllocator& operator=(const TPoolAllocator&);  // don't allow assignment operator
                    ^

And had to replace the apparently now deprecated glsl-to-spirv with shaderc-rs in order to
see the tutorial and thought would be useful for others also.
2020-05-27 00:05:41 +04:30
Ben Hansen
32e5989dc1 some tweaks 2020-05-25 18:33:53 -06:00
Ben Hansen
0c3249e7f9 fixed centering and added bloops 2020-05-21 14:07:02 -06:00
sotrh
dea850863e
Merge pull request #39 from CleanCut/tutorial1-2-improvements
Fixed some things I noticed while doing tutorial 1 and tutorial 2.
2020-05-19 15:01:59 -06:00
Ben Hansen
67f163aaec fixed crash in later example code 2020-05-19 11:46:04 -06:00
Ben Hansen
7c595d344a navigation done 2020-05-19 11:42:01 -06:00
Ben Hansen
87f065acdd got basic game working 2020-05-14 15:03:58 -06:00
Nathan Stocks
e247decf46 Fixed some things I noticed while doing tutorial 1 and tutorial 2. 2020-05-12 22:45:23 -06:00
Ben Hansen
752533a706 finish normal mapping 2020-05-04 13:03:39 -06:00
Ben Hansen
387e17ba5f finished normal mapping tutorial 2020-05-03 22:45:42 -06:00
Ben Hansen
a118435ba7 debugging the normal mapping 2020-05-01 14:14:10 -06:00
Ben Hansen
ec5339bd3b started normals tutorial 2020-04-29 12:31:35 -06:00
Ben Hansen
2fb06b49fb finishing up 2020-04-25 18:36:50 -06:00
Ben Hansen
bbeacfa923 migrated windowless 2020-04-25 17:22:26 -06:00
Ben Hansen
4a772f7ee0 migrated gifs 2020-04-25 16:51:23 -06:00
Ben Hansen
032253fea9 cleaning up for 0.5 2020-04-25 16:32:17 -06:00
Ben Hansen
d8a2657878 adjusted migration to tutorial10 2020-04-25 15:27:56 -06:00
Ben Hansen
368021047a adjusted migration to tutorial9 2020-04-25 14:10:14 -06:00
sotrh
a5bdad14ab
Merge pull request #28 from Pointime/0.5
fix async style
2020-04-25 12:24:44 -06:00
Ben Hansen
2b8e97b6fa migrated tutorial8 2020-04-25 12:21:51 -06:00
Pointu
13cbe0ca68
Update main.rs 2020-04-24 12:09:50 +08:00
Pointu
a1059d5ccc
Update main.rs 2020-04-24 12:09:16 +08:00
Ben Hansen
baf4377930 forgot to add examples 2020-04-23 21:18:03 -06:00
Ben Hansen
a7833f3c16 migrated tutorial7 2020-04-23 21:17:41 -06:00
Ben Hansen
66eeae019c migrated tutorial6 2020-04-22 16:21:31 -06:00
downtime
311fd9000d fix my Commit error 2020-04-22 17:48:58 +08:00
downtime
764f5405db updata wgpu 0.5 2020-04-22 17:39:40 +08:00
downtime
6d2d839411 Updated dependencies 2020-04-22 12:12:29 +08:00
Ben Hansen
1205f18443 migrated tutorial5 2020-04-21 13:05:48 -06:00
Ben Hansen
82048bcc31 migrated tutorial4 2020-04-19 13:57:01 -06:00
Ben Hansen
baa9e2656a tutorial3 migrated 2020-04-18 18:34:30 -06:00
Ben Hansen
f8738e4850 migrated tutorial2 2020-04-18 17:57:16 -06:00
Ben Hansen
4fb7d39bcf tutorial1 updated 2020-04-18 16:48:18 -06:00
Ben Hansen
ab0513146d cleanup for lighting deploy 2020-04-17 21:26:17 -06:00
Ben Hansen
3b22ab9da9 finished lighting rewrite 2020-04-17 21:23:19 -06:00
Ben Hansen
be23faee06 finished gif showcase 2020-03-29 19:51:50 -06:00
Ben Hansen
f9f34459cc started gifs showcase 2020-03-18 14:19:06 -06:00
Ben Hansen
a7f08a1562 fixed missing res folder in lighting 2020-03-18 13:54:02 -06:00
Ben Hansen
e0d88871a5 finished lighting 2020-03-17 20:20:05 -06:00
Ben Hansen
a805bd8fa3 updated lighting tutorial to use model.rs 2020-03-12 16:57:09 -06:00
Ben Hansen
3d5740c6b1 Merge branch 'master' into lighting 2020-03-12 16:28:48 -06:00
Ben Hansen
426e78dc9d fixed missing parts of model tutorial 2020-03-12 15:56:43 -06:00
Ben Hansen
994870fed1 finished model tutorial 2020-03-11 22:14:56 -06:00