Snowram
76ca99ece4
Derive str from Material, better deserialization
2021-06-07 11:03:50 +02:00
jshipsey
4deeb42155
cave adjustments
2021-06-07 11:02:34 +02:00
jshipsey
9034d0f25d
comment addressing, cave tweaks
2021-06-07 11:01:46 +02:00
jshipsey
7a573efab7
proper recipes, tanning racks, various fixes
2021-06-07 11:00:14 +02:00
jshipsey
754b60d810
crafting stations
2021-06-07 10:59:35 +02:00
Marcel
521e1eacf3
Merge branch 'aweinstock/add-models-20210603' into 'master'
...
Add Basilisk and Cyclops models by Gemu, and AirBalloon model by SarraKitty.
See merge request veloren/veloren!2371
2021-06-06 16:56:21 +00:00
Snowram
864f230a3c
Yeti combat anims
2021-06-06 00:17:23 +02:00
Sam
93f90d514c
Particles for ice spikes
2021-06-04 18:17:15 -05:00
Sam
81f7e690fd
Snowball attack.
2021-06-04 18:17:15 -05:00
Sam
a82984b925
Added base ability set
2021-06-04 18:17:14 -05:00
jshipsey
ca43a0058a
some animation
2021-06-03 21:39:17 -05:00
Sam
5bf99eac11
Added totem ability, totem ai, totem ability set, particles for totem abilities, and totem voxel model.
2021-06-03 21:39:15 -05:00
Sam
c81e1534f7
First 3 abilities for tidal warrior functional. Added bubble particles.
2021-06-03 21:39:13 -05:00
Avi Weinstock
05c699878f
Add Basilisk and Cyclops models by Gemu, and AirBalloon model by SarraKitty.
2021-06-03 19:24:34 -04:00
Imbris
2b8eaae572
Update wgpu, cleanup a bit of commented shader code, improve sprite LOD selection code
2021-06-03 00:10:06 -04:00
Imbris
8db11cce37
Use expect to document potential panic when starting a new frame recording, fix clippy warning
2021-06-03 00:10:06 -04:00
Imbris
01aa6af1fd
Address various TODOs introduced in wgpu transition
2021-06-03 00:10:06 -04:00
Imbris
8403e4c483
address/remove TODOs, fix comment typos, enable wgpu/trace feature by default (So no recompile is needed to collect an API trace)
2021-06-03 00:10:06 -04:00
Joshua Yanovski
38d2d46165
Fix shadows for wgpu.
...
In the process, we also fix our n_e / f_e calculation to actually
compute plane intersections properly.
2021-06-03 00:10:06 -04:00
Avi Weinstock
a1326d0734
Address MR 2253 review comments.
2021-06-03 00:10:06 -04:00
Avi Weinstock
cf6717ac90
Show hitbox cylinders based on actual ECS data, and add a settings toggle in voxygen for it.
2021-06-03 00:10:06 -04:00
Avi Weinstock
7b04599a3b
Implement a Debug pipeline for hitboxes and pathfinding lines.
...
- Implements mesh generation for cylinders and lines.
- Implements an Id-allocator so that clients can mutate positions efficiently.
- Is split into pipeline and scene modules.
- Contains simple shaders that just pass through a position and color.
2021-06-03 00:10:06 -04:00
Imbris
2da58029b9
Make models require a non-zero amount of vertices
2021-06-03 00:10:06 -04:00
Imbris
9ec4fd5b4b
Remove commented out sprite code, including the code for getting verts for sprites with a texture rather than a storage buffer
2021-06-03 00:10:06 -04:00
Imbris
d5f4a4443a
Fix all clippy warnings
2021-06-03 00:10:05 -04:00
Imbris
9be424de53
Remove unused waves texture
2021-06-03 00:10:05 -04:00
Imbris
93ad05d237
Fix most of the cargo check warnings
2021-06-03 00:10:05 -04:00
Imbris
1830a591f6
Make Drawer work with background pipeline creation
2021-06-02 23:59:51 -04:00
Imbris
77689d1420
Comment out lod depth tweaks not designed for reverse depth, convert waves image to rgba before constructing a texture, misc fix after rebase
2021-06-02 23:59:50 -04:00
Imbris
ceaa20c668
Update wgpu
2021-06-02 23:59:50 -04:00
Imbris
0e0c8fbfc8
wgpu branch rebase fixes
2021-06-02 23:59:50 -04:00
Imbris
64398f6c0a
Try out using storage buffer for sprite vertices
2021-06-02 23:59:50 -04:00
Imbris
b9931588e4
Fix bugs with sprite rendering
2021-06-02 23:59:50 -04:00
Imbris
a90373604e
Fix sprite vertex lookup, normalize sprite
...
normals in vert shader
2021-06-02 23:59:50 -04:00
Imbris
8d63446300
Almost implement instance merging for sprites (validation error), rebase
...
fix
2021-06-02 23:59:50 -04:00
João Capucho
f5dc871c59
Update to the most recent wgpu
2021-06-02 23:59:49 -04:00
Imbris
7a67ce87e7
Implement toggleable gpu profiling that saves the timings from a recent frame with the screenshot key, rebase fixes
2021-06-02 23:59:49 -04:00
Imbris
8c21023500
WIP gpu timer thing (not for squashing!)
2021-06-02 23:59:49 -04:00
Imbris
843529c7bb
Update to latest wgpu git (around 0.7), temporarily disable shader validation due to naga bug, rebase fixes!!
2021-06-02 23:59:49 -04:00
Imbris
c532f50e64
Remove wgpu patch/update wgpu, rebase fixes, remove use of deprecated
...
vek functions for left, right, up, down, forward_rh, forward_lh
2021-06-02 23:59:49 -04:00
Imbris
fce14fbaa9
Avoid extra set_pipeline calls
2021-06-02 23:59:48 -04:00
Joshua Yanovski
93568754a0
Inverse depth planes.
...
Also added a function that has extensive details about what the
projection options mean, and set our near plane much closer (0.25 to
0.0625) and far plane much farther (100000.25 to 524288.0625). In the
future we may completely remove the far plane (opting for an infinite
one) and may possibly improve accuracy elsewhere using analysis of other
floating point values.
2021-06-02 23:59:48 -04:00
Joshua Yanovski
adf3f83b4b
Fix point shadows.
2021-06-02 23:59:48 -04:00
Joshua Yanovski
363c55c521
Fix directed shadows, mostly.
2021-06-02 23:59:48 -04:00
Joshua Yanovski
c97a42fdb7
Various fixes for shadows.
2021-06-02 23:59:48 -04:00
Capucho
23f1144fe2
Fix the shadow drawing code
...
Very poorly optimized
2021-06-02 23:59:48 -04:00
Capucho
7389f8893d
Re enable the skybox rendering in char select
2021-06-02 23:59:48 -04:00
Capucho
b6c37be299
Re enable sprite rendering
2021-06-02 23:59:48 -04:00
Capucho
c22dc6697c
Reenable non-player figure drawing
2021-06-02 23:59:48 -04:00
Imbris
fe6cf0396f
Draw water
2021-06-02 23:59:48 -04:00