Ben Wallis
6fff845ae9
Upgraded egui_winit_platform to 0.8
2021-06-17 22:02:09 +01:00
Ben Wallis
71707f3ada
Merge branch 'master' of https://gitlab.com/veloren/veloren into xvar/wgpu-egui
2021-06-17 21:36:38 +01:00
Imbris
b7162ac15c
Upgrade to winit 0.25
2021-06-15 22:59:54 -04:00
Imbris
3e79972061
Merge branch 'capucho/wgpu-format-fixes' into 'master'
...
Update wgpu and check for best swap chain format
See merge request veloren/veloren!2454
2021-06-16 01:24:05 +00:00
Ben Wallis
82baa409bb
merge from master
2021-06-14 21:31:28 +01:00
asumface
8568dfb38e
Bump rodio to 0.14
2021-06-14 22:04:23 +02:00
Ben Wallis
0db5d965a6
Updated egui to 0.12, fixed window closing
2021-06-13 14:10:06 +01:00
Marcel Märtens
4167621f5d
Change the version number to 0.10
2021-06-12 10:14:07 +02:00
João Capucho
cc566abe5c
Update wgpu and check for best swap chain format
2021-06-09 21:15:37 +01:00
Avi Weinstock
b5b7de9532
Add graphviz diagram generator for crafting recipes.
2021-06-08 14:42:51 -04:00
juliancoffee
3c34301947
More tests, support only assets/tweak
directory
...
- Use `serial_test` because tests can't run in parallel as both of them
are accessing fs.
- Take only filename, use hardcoded `assets/tweak` to keep it simple and
support .gitignore
2021-06-08 13:31:27 +03:00
juliancoffee
8a157b8410
New tweak_expect
fn to tweak values from .ron
...
- Function to tweak values via temporary hot-reloaded .ron files
2021-06-08 13:31:27 +03:00
Marcel Märtens
7185dcee68
switch to hashbrown 0.11 and specs 0.16.2
2021-06-07 13:01:01 +02:00
Sam
fa0fe38699
Fixed csv tools
2021-06-07 10:58:47 +02:00
Ben Wallis
24134af4a7
Pulled library hot-reloading code into a separate crate and removed duplicated code from anim and egui crates
2021-06-04 20:19:49 +01:00
Ben Wallis
6163ddbb68
Pulled library hot-reloading code into a separate crate and removed duplicated code from anim and egui crates
2021-06-04 20:19:25 +01:00
Ben Wallis
e6eaba038e
fixup after rebase
2021-06-04 20:18:22 +01:00
Ben Wallis
0654d78260
Implemented hot reloading for EGUI (needs duplicated code from anim crate refactoring out)
2021-06-04 20:16:15 +01:00
Ben Wallis
63b8fe1a5f
changed runner tags
2021-06-04 20:15:52 +01:00
Ben Wallis
4d1da112c1
wip
2021-06-04 20:06:27 +01:00
Marcel Märtens
1015af13d4
update dependencies
2021-06-04 09:44:30 +02:00
Imbris
6ffdad173d
Switch to using block_on directly from futures-executor instead of the umbrella crate
2021-06-03 14:28:28 -04:00
Imbris
538677263b
Enable since naga currently has issues translating our SPIRV -> metal
2021-06-03 00:10:07 -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
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
Imbris
99998b9870
Use profling to get spans from wgpu, update wpgu & its deps for various
...
fixes
2021-06-03 00:10:06 -04:00
Imbris
ffdf7012bc
Update wgpu to fix dx11 issue
2021-06-03 00:10:06 -04:00
Imbris
1647c9d607
Update wgpu to latest version and improve error formating
2021-06-03 00:10:06 -04:00
Imbris
76c7161364
Update wgpu to get gfx-hal update that fixes the dx12 depth cube view construction issue
2021-06-02 23:59:50 -04:00
Imbris
ceaa20c668
Update wgpu
2021-06-02 23:59:50 -04:00
Imbris
7723ce265e
Update wgpu-profiler, smol rebase fix
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
22d67d4cc1
Update to the latest wgpu git
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
Capucho
8c3995298b
More fixes
2021-06-02 23:56:43 -04:00
Capucho
9ee71d6369
Finished porting all pipelines
2021-06-02 23:55:59 -04:00
Capucho
806f240eb5
Started the report of wgpu
2021-06-02 23:55:59 -04:00
Marcel
f988584337
Merge branch 'revert-c6e200a3' into 'master'
...
Add a configuration Option to opt-in Quic backend
See merge request veloren/veloren!2318
2021-06-02 14:27:13 +00:00
Avi Weinstock
5aa98d18e3
Depend on crossbeam-utils
and crossbeam-channel
instead of crossbeam
in voxygen.
2021-06-02 00:39:58 -04:00
Avi Weinstock
523bf2be58
Fix memory leak in KeyedJobs
threadpool helper.
2021-06-02 00:39:58 -04:00
Avi Weinstock
1214715c21
Use a threadpool to speed up minimap chunk rendering. Also fix ceiling height calculations and color water blue.
2021-06-02 00:39:04 -04:00
Avi Weinstock
6df2e96d25
Improve the efficiency of the voxel minimap by only updating it when crossing a chunk boundary or changing z-level. Allows making the 9 chunks nearest to the player fancier by compositing multiple z levels.
2021-06-02 00:39:04 -04:00
Avi Weinstock
937815d8c3
Make all the offsets for voxel minimap work properly for arbitrary sizes, and fix the memory leak.
2021-06-02 00:39:04 -04:00
Avi Weinstock
7980230b7f
Add a minimap overlay based on voxel data.
2021-06-02 00:39:04 -04:00
Imbris
48ebb10d50
Update toolchain
2021-05-31 20:44:57 -04:00
Avi Weinstock
3684cf0454
Fix economy data not properly being used to price trades, resulting in default prices being applied at most towns.
...
Also add an exporter from econsim results to sqlite to aid in debugging the economy (which revealed this bug).
2021-05-28 15:09:29 -04:00
Monty
d5883e76a9
update conrod core commit to enhance highlight colors
2021-05-22 23:22:12 +02:00
Marcel
99304ffddd
Revert "Merge branch 'sharp/revert-quinn' into 'master'"
...
This reverts merge request !2315
2021-05-21 10:41:16 +02:00