Commit graph

1842 commits

Author SHA1 Message Date
Sascha Willems
8c8c4966bc Add clang format setting 2020-06-06 14:43:11 +02:00
Sascha Willems
3b345005e5 Add example header files to project (if present) 2020-06-06 14:42:53 +02:00
Sascha Willems
b0b299ee9c Removed last traces of old skeletal animation sample 2020-06-06 14:32:28 +02:00
Sascha Willems
2589566364
Merge pull request #732 from SaschaWillems/gltfskinning
Gltfskinning
2020-06-06 14:11:22 +02:00
Sascha Willems
fb022f3e05 Removed no-longer used model 2020-06-06 13:58:01 +02:00
Sascha Willems
4850536922 Replaced old skinning sample with new glTF one 2020-06-06 13:57:31 +02:00
Sascha Willems
cb0633550f Adnroid build 2020-06-06 13:52:45 +02:00
Sascha Willems
aa1768b315 Finished glTF skinning readme/tutorial 2020-06-06 13:31:04 +02:00
Sascha Willems
d03595ab5b Code cleanup 2020-06-06 13:02:40 +02:00
Sascha Willems
1158cb2232 Code cleanup and simplification 2020-06-06 12:44:55 +02:00
Sascha Willems
b13ed52213 Comments 2020-06-06 12:01:07 +02:00
Sascha Willems
05a9c23220 Android build files 2020-06-06 11:28:50 +02:00
Sascha Willems
ffc3068c9d Resource cleanup 2020-06-06 11:21:55 +02:00
Sascha Willems
9e96aeaa5f clang format 2020-06-06 11:05:56 +02:00
Sascha Willems
a1afaf3de5 Code cleanup 2020-06-06 11:00:38 +02:00
Sascha Willems
6eb0273c76 Code cleanup 2020-06-06 10:20:30 +02:00
Sascha Willems
225106860a Moved glsl shaders 2020-06-05 21:28:47 +02:00
Sascha Willems
df8f3b18f9 Moved glsl shaders 2020-06-05 21:27:17 +02:00
Sascha Willems
ff63db5947 Merge branch 'master' into gltfskinning 2020-06-05 21:24:01 +02:00
Sascha Willems
79f7b28846 Remove unused image sampler
Fixes #713
2020-06-05 21:23:02 +02:00
Sascha Willems
ec8d9698e9 Add HLSL shaders to project file
GLSL and HLSL shaders get their own folders per sample in the project structure
2020-06-05 21:11:28 +02:00
Sascha Willems
d4f7b3cc86 Merge branch 'master' into gltfskinning 2020-06-05 20:58:10 +02:00
Sascha Willems
020a7186f7
Merge pull request #725 from ben-clayton/shader-dirs
Make glsl and hlsl shader directories sit side-by-side
2020-06-05 19:21:46 +02:00
Sascha Willems
4818f85916 Take Recipients for Travis build notifications from environment 2020-06-03 06:04:21 +02:00
Ben Clayton
3d49863bc7 Rename multisampling shaders: scene -> mesh
Possibly went unnoticed use to the rebase of the HLSL shaders and 10a1ecaf7.
2020-06-01 12:22:28 +01:00
Ben Clayton
301e8abf12 Add command flag for picking between shaders
The new `-s`, `--shaders` command line flag allows you to specify whether you want to load the glsl or hlsl shaders.
Defaults to glsl.

Issue: #723
2020-06-01 12:22:28 +01:00
Ben Clayton
8c35694de9 Add pre-built HLSL shaders
Mirrors those found in `data/shaders/glsl/`

Issue: #723
2020-06-01 12:22:28 +01:00
Ben Clayton
a4bbe18399 Have dxc generate hlsl shaders into hlsl directory
Instead of overwriting the glsl binaries.

Issue: #723
2020-06-01 12:22:28 +01:00
Ben Clayton
ca884587a4 Move shaders into glsl and hlsl directories
Move `data/shaders` to `data/shaders/glsl`
Move `data/hlsl` to `data/shaders/hlsl`

Fix up shader paths in the cpp files to point to the new glsl location.

`data/shaders/hlsl/compile.py` still overwrites the glsl .spv files (for
now).

Issue: #723
2020-06-01 12:22:28 +01:00
Sascha Willems
ec023cf581 Started working on small glTF skinning example tutorial/readme 2020-05-26 08:13:47 +02:00
Sascha Willems
cac1d2e850 Moved ktx submodule to tag 3.0.1 2020-05-24 21:27:33 +02:00
Sascha Willems
5fcb480187 Moved ktx submodule to tag v3.0.1 2020-05-24 21:24:52 +02:00
Sascha Willems
b5e0c562ff Added Android build files for glTF skinning sample 2020-05-24 13:42:52 +02:00
Sascha Willems
7e8e667fb3 Code cleanup, shader renaming 2020-05-23 20:38:40 +02:00
Sascha Willems
3e59ce8d57 Code cleanup, shader renaming 2020-05-23 20:38:28 +02:00
Sascha Willems
85106a6bb2 Merge branch 'master' into gltfskinning 2020-05-23 19:54:58 +02:00
Sascha Willems
2973aad014 Added note on HLSL shaders 2020-05-23 11:26:07 +02:00
Sascha Willems
37d58e371a
Merge pull request #718 from ben-clayton/hlsl
Add shaders re-implemented in HLSL
2020-05-23 10:58:02 +02:00
Ben Clayton
8af406090e Remove the HLSL status table, everything now works 2020-05-21 16:29:48 +01:00
Ben Clayton
0da96cfc63 Add missing push constant to fix HLSL computeparticles 2020-05-21 16:29:48 +01:00
Ben Clayton
e3234db041 Add inverseModelView UBO to fix texturecubemap sample 2020-05-21 16:29:47 +01:00
Ben Clayton
13c081664e Add missing inverseModelView UBO to fix hdr sample 2020-05-21 16:29:19 +01:00
Ben Clayton
b6f2577174 Update HLSL skeletalanimation shaders with latest changes 2020-05-21 16:19:27 +01:00
Ben Clayton
7b12f89deb Apply ab38f8b1's changes to offscreen HLSL shaders 2020-05-21 16:19:27 +01:00
Ben Clayton
8cacf0b4e9 Add HLSL shaders for multisampling sample 2020-05-21 16:19:27 +01:00
Ben Clayton
e9ab033b5e Add HLSL shaders for glftscene sample 2020-05-21 16:07:54 +01:00
Ben Clayton
9c06c4eea7 Fix data/hlsl/README.md table header
The right most column header SHA was wrong.
2020-05-21 16:07:13 +01:00
Ben Clayton
cce75f1859 Add shaders re-implemented in HLSL
These were written against the shaders at revision eddd724e7.
There have been changes made since then, which will need to be mirrored.

See `data/hlsl/README.md` for the current status of each sample.
2020-05-21 12:58:13 +01:00
Sascha Willems
451c895525 Code cleanup 2020-05-15 07:22:01 +02:00
Sascha Willems
149ff8f94e Split sample into header and source files due to complexity 2020-05-15 07:13:51 +02:00