Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
r0.12
veloren/Cargo.lock

7562 lines
176 KiB
Plaintext
Raw Permalink Normal View History

Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
update toolchain to `nightly-2021-03-22`
2021-03-12 11:10:42 +00:00
version = 3
Add support for TextInput widget, rename widgets module to widget, update to glyph_brush 0.7.0
2020-05-29 04:40:22 +00:00
[[package]]
name = "ab_glyph"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.2.12"
Add support for TextInput widget, rename widgets module to widget, update to glyph_brush 0.7.0
2020-05-29 04:40:22 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "20b228f2c198f98d4337ceb560333fb12cbb2f4948a953bf8c57d09deb219603"
Add support for TextInput widget, rename widgets module to widget, update to glyph_brush 0.7.0
2020-05-29 04:40:22 +00:00
dependencies = [
"ab_glyph_rasterizer",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"owned_ttf_parser 0.13.2",
Add support for TextInput widget, rename widgets module to widget, update to glyph_brush 0.7.0
2020-05-29 04:40:22 +00:00
]
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
[[package]]
name = "ab_glyph_rasterizer"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.1.5"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "a13739d7177fbd22bb0ed28badfff9f372f8bef46c863db4e1c6248f6b223b6e"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
fix workspaces and Cargo dependencies
2020-05-27 16:20:16 +00:00
[[package]]
name = "addr2line"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.17.0"
fix workspaces and Cargo dependencies
2020-05-27 16:20:16 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b"
fix workspaces and Cargo dependencies
2020-05-27 16:20:16 +00:00
dependencies = [
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"gimli 0.26.1",
fix workspaces and Cargo dependencies
2020-05-27 16:20:16 +00:00
]
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
[[package]]
name = "adler"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
version = "1.0.2"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "adler32"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
version = "1.2.0"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
update specs
2020-12-16 13:17:28 +00:00
[[package]]
name = "ahash"
version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e"
Use assets_manager to load assets
2020-12-12 22:14:24 +00:00
[[package]]
name = "ahash"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.7.6"
Use assets_manager to load assets
2020-12-12 22:14:24 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
Use assets_manager to load assets
2020-12-12 22:14:24 +00:00
dependencies = [
update dependencies
2021-06-04 07:44:30 +00:00
"getrandom 0.2.3",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"once_cell",
update dependencies
2021-03-21 21:53:44 +00:00
"version_check 0.9.3",
Use assets_manager to load assets
2020-12-12 22:14:24 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "aho-corasick"
update dependencies
2021-06-04 07:44:30 +00:00
version = "0.7.18"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies
2021-06-04 07:44:30 +00:00
checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"memchr",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
[[package]]
name = "alsa"
update dependencies
2021-03-21 21:53:44 +00:00
version = "0.5.0"
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies
2021-03-21 21:53:44 +00:00
checksum = "75c4da790adcb2ce5e758c064b4f3ec17a30349f9961d3e5e6c9688b052a9e18"
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
dependencies = [
"alsa-sys",
"bitflags",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"nix 0.20.0",
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
]
Play random music whenever a track ends To support this, a global_state.maintain() method was added that calls audio.maintain(). Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a
2019-05-18 19:28:12 +00:00
[[package]]
name = "alsa-sys"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
version = "0.3.1"
Use latest version of Rodio instead of custom branch
2019-08-30 23:58:38 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527"
Play random music whenever a track ends To support this, a global_state.maintain() method was added that calls audio.maintain(). Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a
2019-05-18 19:28:12 +00:00
dependencies = [
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"pkg-config",
Play random music whenever a track ends To support this, a global_state.maintain() method was added that calls audio.maintain(). Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a
2019-05-18 19:28:12 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "andrew"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
version = "0.3.1"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "8c4afb09dd642feec8408e33f92f3ffc4052946f6b20f32fb99c1f58cd4fa7cf"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"bitflags",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"rusttype 0.9.2",
update dependencies and fix audio issues fixed #1027 fixed #1033 fixed #1020 fixed #1017 fixed #1029 fixed #1025 fixed #807 fixed #816 fixed #1004 fixed #1005
2021-03-29 07:45:00 +00:00
"walkdir 2.3.2",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"xdg",
"xml-rs",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
Escape ansi sequences
2020-07-27 21:09:33 +00:00
[[package]]
name = "ansi-parser"
update depednencies
2021-07-08 10:21:02 +00:00
version = "0.8.0"
Escape ansi sequences
2020-07-27 21:09:33 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update depednencies
2021-07-08 10:21:02 +00:00
checksum = "bcb2392079bf27198570d6af79ecbd9ec7d8f16d3ec6b60933922fdb66287127"
Escape ansi sequences
2020-07-27 21:09:33 +00:00
dependencies = [
Add benchmark for color quantization using the rtree crate.
2021-07-01 17:41:37 +00:00
"heapless 0.5.6",
Escape ansi sequences
2020-07-27 21:09:33 +00:00
"nom 4.2.3",
]
first implementation of connect and tcp using a mio worker protocol and: - introduce a loadtest, for tcp messages - cleanup api - added a unittest - prepared a handshake message, which will in next commits get removed again - experimental mio worker merges - using uuid for participant id
2020-01-13 16:53:28 +00:00
[[package]]
name = "ansi_term"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
dependencies = [
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"winapi 0.3.9",
]
[[package]]
name = "ansi_term"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
dependencies = [
"winapi 0.3.9",
first implementation of connect and tcp using a mio worker protocol and: - introduce a loadtest, for tcp messages - cleanup api - added a unittest - prepared a handshake message, which will in next commits get removed again - experimental mio worker merges - using uuid for participant id
2020-01-13 16:53:28 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "approx"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "f0e60b75072ecd4168020818c0107f2857bb6c4e64252d8d3983f6263b40a5c3"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"num-traits",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
Add support for TextInput widget, rename widgets module to widget, update to glyph_brush 0.7.0
2020-05-29 04:40:22 +00:00
[[package]]
name = "approx"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f2a05fd1bd10b2527e20a2cd32d8873d115b8b39fe219ee25f42a8aca6ba278"
dependencies = [
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"num-traits",
Add support for TextInput widget, rename widgets module to widget, update to glyph_brush 0.7.0
2020-05-29 04:40:22 +00:00
]
update dependencies
2021-06-04 07:44:30 +00:00
[[package]]
name = "approx"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "072df7202e63b127ab55acfe16ce97013d5b97bf160489336d3f1840fd78e99e"
dependencies = [
"num-traits",
]
Small cache experiments
2019-09-23 02:18:09 +00:00
[[package]]
name = "arr_macro"
change(log): switch to fern
2019-10-08 15:42:13 +00:00
version = "0.1.3"
Small cache experiments
2019-09-23 02:18:09 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "6a105bfda48707cf19220129e78fca01e9639433ffaef4163546ed8fb04120a5"
Small cache experiments
2019-09-23 02:18:09 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"arr_macro_impl",
"proc-macro-hack",
Small cache experiments
2019-09-23 02:18:09 +00:00
]
[[package]]
name = "arr_macro_impl"
change(log): switch to fern
2019-10-08 15:42:13 +00:00
version = "0.1.3"
Small cache experiments
2019-09-23 02:18:09 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "0609c78bd572f4edc74310dfb63a01f5609d53fa8b4dd7c4d98aef3b3e8d72d1"
Small cache experiments
2019-09-23 02:18:09 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"proc-macro-hack",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"quote 1.0.10",
"syn 1.0.81",
Small cache experiments
2019-09-23 02:18:09 +00:00
]
Added user-friendly error output for Voxygen Former-commit-id: 55952f32019e826863849f07a71695de3e0c4c3c
2019-04-25 11:49:36 +00:00
[[package]]
Move shaders, start asset reloading system
2019-08-03 05:42:33 +00:00
name = "arrayref"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
version = "0.3.6"
Added user-friendly error output for Voxygen Former-commit-id: 55952f32019e826863849f07a71695de3e0c4c3c
2019-04-25 11:49:36 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
Added user-friendly error output for Voxygen Former-commit-id: 55952f32019e826863849f07a71695de3e0c4c3c
2019-04-25 11:49:36 +00:00
Updated toolchain version and a bunch of deps.
2019-09-06 05:16:11 +00:00
[[package]]
name = "arrayvec"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
version = "0.5.2"
Updated toolchain version and a bunch of deps.
2019-09-06 05:16:11 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
address/remove TODOs, fix comment typos, enable wgpu/trace feature by default (So no recompile is needed to collect an API trace)
2021-05-13 03:59:51 +00:00
dependencies = [
"serde",
]
Updated toolchain version and a bunch of deps.
2019-09-06 05:16:11 +00:00
update further crates
2020-12-16 00:07:39 +00:00
[[package]]
name = "as-slice"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
version = "0.1.5"
update further crates
2020-12-16 00:07:39 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
checksum = "45403b49e3954a4b8428a0ac21a4b7afadccf92bfd96273f1a58cd4812496ae0"
update further crates
2020-12-16 00:07:39 +00:00
dependencies = [
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
"generic-array 0.12.4",
"generic-array 0.13.3",
update further crates
2020-12-16 00:07:39 +00:00
"generic-array 0.14.4",
"stable_deref_trait",
]
Started the report of wgpu
2020-08-21 19:10:56 +00:00
[[package]]
name = "ash"
Almost implement instance merging for sprites (validation error), rebase fix
2021-01-31 03:50:03 +00:00
version = "0.32.1"
Started the report of wgpu
2020-08-21 19:10:56 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Almost implement instance merging for sprites (validation error), rebase fix
2021-01-31 03:50:03 +00:00
checksum = "06063a002a77d2734631db74e8f4ce7148b77fe522e6bca46f2ae7774fd48112"
Started the report of wgpu
2020-08-21 19:10:56 +00:00
dependencies = [
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"libloading 0.7.2",
Started the report of wgpu
2020-08-21 19:10:56 +00:00
]
Use assets_manager to load assets
2020-12-12 22:14:24 +00:00
[[package]]
name = "assets_manager"
Update `assets_manager` to 0.7
2021-12-12 19:01:52 +00:00
version = "0.7.0"
Use assets_manager to load assets
2020-12-12 22:14:24 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Update `assets_manager` to 0.7
2021-12-12 19:01:52 +00:00
checksum = "912acc83cc5bf31b0d9685e8d11a9d7c36b949e850ca2db1a3203b3b656a5e4a"
Use assets_manager to load assets
2020-12-12 22:14:24 +00:00
dependencies = [
Update `assets_manager` to 0.7
2021-12-12 19:01:52 +00:00
"ab_glyph",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"ahash 0.7.6",
Use assets_manager to load assets
2020-12-12 22:14:24 +00:00
"bincode",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"crossbeam-channel",
Use assets_manager to load assets
2020-12-12 22:14:24 +00:00
"log",
update dependencies
2021-06-04 07:44:30 +00:00
"notify 4.0.17",
update crates
2021-09-20 10:05:41 +00:00
"parking_lot 0.11.2",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"ron 0.7.0",
Use assets_manager to load assets
2020-12-12 22:14:24 +00:00
"serde",
"serde_json",
]
get rid of `async_std::channel` switch to `tokio` and `async_channel` crate. I wanted to do tokio first, but it doesnt feature Sender::close(), thus i included async_channel Got rid of `futures` and only need `futures_core` and `futures_util`. Tokio does not support `Stream` and `StreamExt` so for now i need to use `tokio-stream`, i think this will go in `std` in the future Created `b2b_close_stream_opened_sender_r` as the shutdown procedure does not need a copy of a Sender, it just need to stop it. Various adjustments, e.g. for `select!` which now requieres a `&mut` for oneshots. Future things to do: - Use some better signalling than oneshot<()> in some cases. - Use a Watch for the Prio propergation (impl. it ofc) - Use Bounded Channels in order to improve performance - adjust tests coding bring tests to work
2021-01-15 13:04:32 +00:00
[[package]]
fmt
2021-03-05 01:23:11 +00:00
name = "async-channel"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
version = "1.6.1"
get rid of `async_std::channel` switch to `tokio` and `async_channel` crate. I wanted to do tokio first, but it doesnt feature Sender::close(), thus i included async_channel Got rid of `futures` and only need `futures_core` and `futures_util`. Tokio does not support `Stream` and `StreamExt` so for now i need to use `tokio-stream`, i think this will go in `std` in the future Created `b2b_close_stream_opened_sender_r` as the shutdown procedure does not need a copy of a Sender, it just need to stop it. Various adjustments, e.g. for `select!` which now requieres a `&mut` for oneshots. Future things to do: - Use some better signalling than oneshot<()> in some cases. - Use a Watch for the Prio propergation (impl. it ofc) - Use Bounded Channels in order to improve performance - adjust tests coding bring tests to work
2021-01-15 13:04:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
checksum = "2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319"
get rid of `async_std::channel` switch to `tokio` and `async_channel` crate. I wanted to do tokio first, but it doesnt feature Sender::close(), thus i included async_channel Got rid of `futures` and only need `futures_core` and `futures_util`. Tokio does not support `Stream` and `StreamExt` so for now i need to use `tokio-stream`, i think this will go in `std` in the future Created `b2b_close_stream_opened_sender_r` as the shutdown procedure does not need a copy of a Sender, it just need to stop it. Various adjustments, e.g. for `select!` which now requieres a `&mut` for oneshots. Future things to do: - Use some better signalling than oneshot<()> in some cases. - Use a Watch for the Prio propergation (impl. it ofc) - Use Bounded Channels in order to improve performance - adjust tests coding bring tests to work
2021-01-15 13:04:32 +00:00
dependencies = [
fmt
2021-03-05 01:23:11 +00:00
"concurrent-queue",
"event-listener",
get rid of `async_std::channel` switch to `tokio` and `async_channel` crate. I wanted to do tokio first, but it doesnt feature Sender::close(), thus i included async_channel Got rid of `futures` and only need `futures_core` and `futures_util`. Tokio does not support `Stream` and `StreamExt` so for now i need to use `tokio-stream`, i think this will go in `std` in the future Created `b2b_close_stream_opened_sender_r` as the shutdown procedure does not need a copy of a Sender, it just need to stop it. Various adjustments, e.g. for `select!` which now requieres a `&mut` for oneshots. Future things to do: - Use some better signalling than oneshot<()> in some cases. - Use a Watch for the Prio propergation (impl. it ofc) - Use Bounded Channels in order to improve performance - adjust tests coding bring tests to work
2021-01-15 13:04:32 +00:00
"futures-core",
]
COMPLETE REDESIGN of network crate - Implementing a async non-io protocol crate a) no tokio / no channels b) I/O is based on abstraction Sink/Drain c) different Protocols can have a different Drain Type This allow MPSC to send its content without splitting up messages at all! It allows UDP to have internal extra frames to care for security It allows better abstraction for tests Allows benchmarks on the mpsc variant Custom Handshakes to allow sth like Quic protocol easily - reduce the participant managers to 4: channel creations, send, recv and shutdown. keeping the `mut data` in one manager removes the need for all RwLocks. reducing complexity and parallel access problems - more strategic participant shutdown. first send. then wait for remote side to notice recv stop, then remote side will stop send, then local side can stop recv. - metrics are internally abstracted to fit protocol and network layer - in this commit network/protocol tests work and network tests work someway, veloren compiles but does not work - handshake compatible to async_std
2021-01-22 16:09:20 +00:00
[[package]]
fmt
2021-03-05 01:23:11 +00:00
name = "async-trait"
update crates
2021-09-20 10:05:41 +00:00
version = "0.1.51"
COMPLETE REDESIGN of network crate - Implementing a async non-io protocol crate a) no tokio / no channels b) I/O is based on abstraction Sink/Drain c) different Protocols can have a different Drain Type This allow MPSC to send its content without splitting up messages at all! It allows UDP to have internal extra frames to care for security It allows better abstraction for tests Allows benchmarks on the mpsc variant Custom Handshakes to allow sth like Quic protocol easily - reduce the participant managers to 4: channel creations, send, recv and shutdown. keeping the `mut data` in one manager removes the need for all RwLocks. reducing complexity and parallel access problems - more strategic participant shutdown. first send. then wait for remote side to notice recv stop, then remote side will stop send, then local side can stop recv. - metrics are internally abstracted to fit protocol and network layer - in this commit network/protocol tests work and network tests work someway, veloren compiles but does not work - handshake compatible to async_std
2021-01-22 16:09:20 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "44318e776df68115a881de9a8fd1b9e53368d7a4a5ce4cc48517da3393233a5e"
COMPLETE REDESIGN of network crate - Implementing a async non-io protocol crate a) no tokio / no channels b) I/O is based on abstraction Sink/Drain c) different Protocols can have a different Drain Type This allow MPSC to send its content without splitting up messages at all! It allows UDP to have internal extra frames to care for security It allows better abstraction for tests Allows benchmarks on the mpsc variant Custom Handshakes to allow sth like Quic protocol easily - reduce the participant managers to 4: channel creations, send, recv and shutdown. keeping the `mut data` in one manager removes the need for all RwLocks. reducing complexity and parallel access problems - more strategic participant shutdown. first send. then wait for remote side to notice recv stop, then remote side will stop send, then local side can stop recv. - metrics are internally abstracted to fit protocol and network layer - in this commit network/protocol tests work and network tests work someway, veloren compiles but does not work - handshake compatible to async_std
2021-01-22 16:09:20 +00:00
dependencies = [
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"proc-macro2 1.0.32",
"quote 1.0.10",
"syn 1.0.81",
COMPLETE REDESIGN of network crate - Implementing a async non-io protocol crate a) no tokio / no channels b) I/O is based on abstraction Sink/Drain c) different Protocols can have a different Drain Type This allow MPSC to send its content without splitting up messages at all! It allows UDP to have internal extra frames to care for security It allows better abstraction for tests Allows benchmarks on the mpsc variant Custom Handshakes to allow sth like Quic protocol easily - reduce the participant managers to 4: channel creations, send, recv and shutdown. keeping the `mut data` in one manager removes the need for all RwLocks. reducing complexity and parallel access problems - more strategic participant shutdown. first send. then wait for remote side to notice recv stop, then remote side will stop send, then local side can stop recv. - metrics are internally abstracted to fit protocol and network layer - in this commit network/protocol tests work and network tests work someway, veloren compiles but does not work - handshake compatible to async_std
2021-01-22 16:09:20 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "atom"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
version = "0.3.6"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "c9ff149ed9780025acfdb36862d35b28856bb693ceb451259a7164442f22fdc3"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
Added egui debug UI - a 100% rust UI framework (similar to imgui) allowing for rapid development of debug interfaces to aid development. This is feature-gated behind the `egui-ui` feature which is enabled by default but removed for airshipper builds. Included in the initial implementation is an entity browser which lists all entities in the client ECS, an entity component viewer which shows select components belonging to the selected entity including character state information, and a simple frame time graph. This MR also includes an extraction of the animation hot reloading code which has been reused for egui to allow for hot-reloading of the egui interface to allow rapid development of the UI with realtime feedback upon save as is the case with aninmations. This is feature-gated behind the `hot-egui` feature which is not enabled by default due to the extra startup time that it adds.
2021-07-04 09:47:18 +00:00
[[package]]
name = "atomic_refcell"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.1.8"
Added egui debug UI - a 100% rust UI framework (similar to imgui) allowing for rapid development of debug interfaces to aid development. This is feature-gated behind the `egui-ui` feature which is enabled by default but removed for airshipper builds. Included in the initial implementation is an entity browser which lists all entities in the client ECS, an entity component viewer which shows select components belonging to the selected entity including character state information, and a simple frame time graph. This MR also includes an extraction of the animation hot reloading code which has been reused for egui to allow for hot-reloading of the egui interface to allow rapid development of the UI with realtime feedback upon save as is the case with aninmations. This is feature-gated behind the `hot-egui` feature which is not enabled by default due to the extra startup time that it adds.
2021-07-04 09:47:18 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "73b5e5f48b927f04e952dedc932f31995a65a0bf65ec971c74436e51bf6e970d"
Added egui debug UI - a 100% rust UI framework (similar to imgui) allowing for rapid development of debug interfaces to aid development. This is feature-gated behind the `egui-ui` feature which is enabled by default but removed for airshipper builds. Included in the initial implementation is an entity browser which lists all entities in the client ECS, an entity component viewer which shows select components belonging to the selected entity including character state information, and a simple frame time graph. This MR also includes an extraction of the animation hot reloading code which has been reused for egui to allow for hot-reloading of the egui interface to allow rapid development of the UI with realtime feedback upon save as is the case with aninmations. This is feature-gated behind the `hot-egui` feature which is not enabled by default due to the extra startup time that it adds.
2021-07-04 09:47:18 +00:00
Added non-admin moderators and timed bans. The security model has been updated to reflect this change (for example, moderators cannot revert a ban by an administrator). Ban history is also now recorded in the ban file, and much more information about the ban is stored (whitelists and administrators also have extra information). To support the new information without losing important information, this commit also introduces a new migration path for editable settings (both from legacy to the new format, and between versions). Examples of how to do this correctly, and migrate to new versions of a settings file, are in the settings/ subdirectory. As part of this effort, editable settings have been revamped to guarantee atomic saves (due to the increased amount of information in each file), some latent bugs in networking were fixed, and server-cli has been updated to go through StructOpt for both calls through TUI and argv, greatly simplifying parsing logic.
2021-05-08 18:22:21 +00:00
[[package]]
name = "atomicwrites"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d4830ac690261d0b47f06e86d18c47eaa65d0184e576cf9b62c3a49b28cb876b"
dependencies = [
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"nix 0.20.0",
Added non-admin moderators and timed bans. The security model has been updated to reflect this change (for example, moderators cannot revert a ban by an administrator). Ban history is also now recorded in the ban file, and much more information about the ban is stored (whitelists and administrators also have extra information). To support the new information without losing important information, this commit also introduces a new migration path for editable settings (both from legacy to the new format, and between versions). Examples of how to do this correctly, and migrate to new versions of a settings file, are in the settings/ subdirectory. As part of this effort, editable settings have been revamped to guarantee atomic saves (due to the increased amount of information in each file), some latent bugs in networking were fixed, and server-cli has been updated to go through StructOpt for both calls through TUI and argv, greatly simplifying parsing logic.
2021-05-08 18:22:21 +00:00
"tempfile",
"winapi 0.3.9",
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "atty"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
version = "0.2.14"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"hermit-abi",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"winapi 0.3.9",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
[[package]]
name = "auth-common"
version = "0.1.0"
Allow HTTP auth servers again. only `localhost` are allowed in a release build. when debug assertions are on, others are also allowed. This change undoes the changes to the settings, so compared to master, there is no effect
2021-03-11 15:57:50 +00:00
source = "git+https://gitlab.com/veloren/auth.git?rev=fb3dcbc4962b367253f8f2f92760ef44d2679c9a#fb3dcbc4962b367253f8f2f92760ef44d2679c9a"
Add warning prompt for untrusted auth servers, move some auth code into
2020-01-02 08:43:45 +00:00
dependencies = [
update depednencies
2021-07-08 10:21:02 +00:00
"rand 0.8.4",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"serde",
dependency reduction: - authc no longer uses reqwest - image only supports PNG - replace routille with tiny_http - several other dependencies - cargo upgrade - following improvement was measured on R7 1700X: before: - cargo build: 3076.73s user / 4:45 total / 589 dependencies - cargo test: 6118.38s user / 7:30 total / 959 dependencies after: - cargo build: 2680.54s user / 4:05 total / 480 dependencies - cargo test: 5351.81s user / 7:04 total / 791 dependencies - added xMAC94x to CODEOWNERS for Cargo.toml, he will protect them from now on and hit people with evil looks ;)
2020-06-01 00:13:35 +00:00
"uuid",
Add warning prompt for untrusted auth servers, move some auth code into
2020-01-02 08:43:45 +00:00
]
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
[[package]]
name = "authc"
version = "1.0.0"
Allow HTTP auth servers again. only `localhost` are allowed in a release build. when debug assertions are on, others are also allowed. This change undoes the changes to the settings, so compared to master, there is no effect
2021-03-11 15:57:50 +00:00
source = "git+https://gitlab.com/veloren/auth.git?rev=fb3dcbc4962b367253f8f2f92760ef44d2679c9a#fb3dcbc4962b367253f8f2f92760ef44d2679c9a"
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
dependencies = [
Add timeout's to group invites, and configurable limit to group size Fix a few group bugs, enable invite timeout and group limits in ui
2020-08-07 01:59:28 +00:00
"auth-common",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"fxhash",
Update lock
2021-01-08 15:57:29 +00:00
"hex",
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
"http",
"hyper",
"hyper-rustls",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"rust-argon2",
update authc
2020-12-28 15:17:43 +00:00
"serde",
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
"serde_json",
dependency reduction: - authc no longer uses reqwest - image only supports PNG - replace routille with tiny_http - several other dependencies - cargo upgrade - following improvement was measured on R7 1700X: before: - cargo build: 3076.73s user / 4:45 total / 589 dependencies - cargo test: 6118.38s user / 7:30 total / 959 dependencies after: - cargo build: 2680.54s user / 4:05 total / 480 dependencies - cargo test: 5351.81s user / 7:04 total / 791 dependencies - added xMAC94x to CODEOWNERS for Cargo.toml, he will protect them from now on and hit people with evil looks ;)
2020-06-01 00:13:35 +00:00
"uuid",
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
]
[i18n] Configurable fonts - Add font configuration in internationalization files - Scale font size using a configurable ratio - Add a script to identify translation item statuses using Git metadata - Execute the i18n script in a new gitlab-ci step (delayed) - Clone haxrcorp_4089_cyrillic_altgr font (haxrcorp_4089_cyrillic_altgr_extended) to add some additional latin characters (mainly for French)
2020-01-26 19:29:46 +00:00
[[package]]
name = "autocfg"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
version = "1.0.1"
[i18n] Configurable fonts - Add font configuration in internationalization files - Scale font size using a configurable ratio - Add a script to identify translation item statuses using Git metadata - Execute the i18n script in a new gitlab-ci step (delayed) - Clone haxrcorp_4089_cyrillic_altgr font (haxrcorp_4089_cyrillic_altgr_extended) to add some additional latin characters (mainly for French)
2020-01-26 19:29:46 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
[i18n] Configurable fonts - Add font configuration in internationalization files - Scale font size using a configurable ratio - Add a script to identify translation item statuses using Git metadata - Execute the i18n script in a new gitlab-ci step (delayed) - Clone haxrcorp_4089_cyrillic_altgr font (haxrcorp_4089_cyrillic_altgr_extended) to add some additional latin characters (mainly for French)
2020-01-26 19:29:46 +00:00
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "backtrace"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.3.63"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "321629d8ba6513061f26707241fa9bc89524ff1cd7a915a97ef0c62c666ce1b6"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
fix workspaces and Cargo dependencies
2020-05-27 16:20:16 +00:00
"addr2line",
update dependencies
2021-06-04 07:44:30 +00:00
"cc",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"cfg-if 1.0.0",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
"miniz_oxide 0.4.4",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"object 0.27.1",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"rustc-demangle",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
Added Controller support
2020-03-10 21:00:13 +00:00
[[package]]
name = "base-x"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
version = "0.2.8"
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b"
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
Began integrating procgen trees
2021-01-03 20:43:07 +00:00
[[package]]
name = "base64"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
version = "0.13.0"
Make Failed to tick go back to the main screen and move to ron Former-commit-id: 14d4ab3cb9d964805a2f275b932e93cef9b72d38
2019-05-26 09:21:51 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
Update chat-cli to work properly. Update reqwest to 0.10.0
2020-01-02 09:49:48 +00:00
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "bincode"
update deps
2021-04-10 13:53:00 +00:00
version = "1.3.3"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update deps
2021-04-10 13:53:00 +00:00
checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"serde",
Add Linux support
2019-06-19 19:25:08 +00:00
]
Play random music whenever a track ends To support this, a global_state.maintain() method was added that calls audio.maintain(). Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a
2019-05-18 19:28:12 +00:00
[[package]]
name = "bindgen"
update Cargo.lock
2021-06-28 13:02:31 +00:00
version = "0.56.0"
Play random music whenever a track ends To support this, a global_state.maintain() method was added that calls audio.maintain(). Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a
2019-05-18 19:28:12 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update Cargo.lock
2021-06-28 13:02:31 +00:00
checksum = "2da379dbebc0b76ef63ca68d8fc6e71c0f13e59432e0987e508c1820e6ab5239"
Play random music whenever a track ends To support this, a global_state.maintain() method was added that calls audio.maintain(). Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a
2019-05-18 19:28:12 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"bitflags",
"cexpr",
"clang-sys",
update depednencies
2021-07-08 10:21:02 +00:00
"clap",
"env_logger",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"lazy_static",
Added Controller support
2020-03-10 21:00:13 +00:00
"lazycell",
update depednencies
2021-07-08 10:21:02 +00:00
"log",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"peeking_take_while",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"proc-macro2 1.0.32",
"quote 1.0.10",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"regex",
"rustc-hash",
"shlex",
update depednencies
2021-07-08 10:21:02 +00:00
"which 3.1.1",
Play random music whenever a track ends To support this, a global_state.maintain() method was added that calls audio.maintain(). Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a
2019-05-18 19:28:12 +00:00
]
Started the report of wgpu
2020-08-21 19:10:56 +00:00
[[package]]
name = "bit-set"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e11e16035ea35e4e5997b393eacbf6f63983188f7a2ad25bfb13465f5ad59de"
dependencies = [
"bit-vec",
]
[[package]]
name = "bit-vec"
version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
Add Linux support
2019-06-19 19:25:08 +00:00
[[package]]
name = "bitflags"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "1.3.2"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
Allow canceling chunk generation. Currently we only do this when no players are in range of the chunk. We also send the first client who posted the chunk a message indicating that it's canceled, the hope being that this will be a performance win in single player mode since you don't have to wait three seconds to realize that the server won't generate the chunk for you. We now check an atomic flag for every column sample in a chunk. We could probably do this less frequently, but since it's a relaxed load it has essentially no performance impact on Intel architectures.
2019-10-16 11:39:41 +00:00
[[package]]
name = "bitvec"
update dependencies
2021-06-04 07:44:30 +00:00
version = "0.22.3"
Allow canceling chunk generation. Currently we only do this when no players are in range of the chunk. We also send the first client who posted the chunk a message indicating that it's canceled, the hope being that this will be a performance win in single player mode since you don't have to wait three seconds to realize that the server won't generate the chunk for you. We now check an atomic flag for every column sample in a chunk. We could probably do this less frequently, but since it's a relaxed load it has essentially no performance impact on Intel architectures.
2019-10-16 11:39:41 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies
2021-06-04 07:44:30 +00:00
checksum = "5237f00a8c86130a0cc317830e558b966dd7850d48a953d998c813f01a41b527"
Fix security
2020-04-02 00:03:15 +00:00
dependencies = [
update further crates
2020-12-16 00:07:39 +00:00
"funty",
Fix security
2020-04-02 00:03:15 +00:00
"radium",
update further crates
2020-12-16 00:07:39 +00:00
"tap",
"wyz",
Fix security
2020-04-02 00:03:15 +00:00
]
Allow canceling chunk generation. Currently we only do this when no players are in range of the chunk. We also send the first client who posted the chunk a message indicating that it's canceled, the hope being that this will be a performance win in single player mode since you don't have to wait three seconds to realize that the server won't generate the chunk for you. We now check an atomic flag for every column sample in a chunk. We could probably do this less frequently, but since it's a relaxed load it has essentially no performance impact on Intel architectures.
2019-10-16 11:39:41 +00:00
Added user-friendly error output for Voxygen Former-commit-id: 55952f32019e826863849f07a71695de3e0c4c3c
2019-04-25 11:49:36 +00:00
[[package]]
Move shaders, start asset reloading system
2019-08-03 05:42:33 +00:00
name = "blake2b_simd"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
version = "0.5.11"
Added user-friendly error output for Voxygen Former-commit-id: 55952f32019e826863849f07a71695de3e0c4c3c
2019-04-25 11:49:36 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587"
Added user-friendly error output for Voxygen Former-commit-id: 55952f32019e826863849f07a71695de3e0c4c3c
2019-04-25 11:49:36 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"arrayref",
update chrossbeam, tracy, prometheus (and reduce server deps to crossbeam-channel)
2020-12-15 23:51:07 +00:00
"arrayvec",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"constant_time_eq",
Added user-friendly error output for Voxygen Former-commit-id: 55952f32019e826863849f07a71695de3e0c4c3c
2019-04-25 11:49:36 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "block"
version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
Added hash value to decide if we should invalidate persited skills and allow a respec.
2021-11-14 18:32:37 +00:00
[[package]]
name = "block-buffer"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
dependencies = [
"generic-array 0.14.4",
]
common: Add benchmark for `Chonk`
2019-09-03 23:00:50 +00:00
[[package]]
name = "bstr"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.2.17"
common: Add benchmark for `Chonk`
2019-09-03 23:00:50 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
common: Add benchmark for `Chonk`
2019-09-03 23:00:50 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"lazy_static",
"memchr",
"regex-automata",
"serde",
common: Add benchmark for `Chonk`
2019-09-03 23:00:50 +00:00
]
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
[[package]]
name = "bumpalo"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "3.8.0"
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "8f1e260c3a9040a7c19a12468758f4c16f31a81a1fe087482be9570ec864bb6c"
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
(See sharp/lod-history) LOD, shadows, greedy meshing, new lighting, perf --- Pretty much a Veloren fork at this point. Here's a high level overview of the changes (will be added to CHANGELOG just before merge). At a high level this MR incorporates roughly two groups of changes. The first group consists of new game features: more flexible map sizes, level of detail terrain, shadow maps, and a new lighting engine. This is "feature work" that (mostly) only adds new things to Veloren, and mostly shouldn't affect old stuff. The second big group of changes are those addressing the fallout from all the new features. These include performance fixes of various sorts: the addition of multiple graphics options and optimization of the cheap ones to avoid work, switching all voxel models to use some variant of greedy meshing, switching over much of our CPU-side vector math to exploit SIMD instructions (coinciding with a fork of `vek`), and a rewrite of how the UI handles text rendering (coinciding with updates to our fork of `conrod`). Making Veloren's hardcoded colors appear correct under the new lighting engine also required considerably changes (TODO: Fill in this section when it's complete). The second category of changes often heavily touches code owned by other people, including frequently modified code "owned" by a handful of people, so I recommend that this code be reviewed particularly carefully. --- At a high level (each will be described in more detail below): - The world map has been refactored. - The world size is no longer hardcoded (@zesterer). - The map generation code was made generic to allow using it outside of the `world` crate (@zesterer). - On world creation, we now compute *horizon maps* (@zesterer). - The way we pass the world from the server to the client has been updated (@xMAC94x). - Artifacts related to image rotation were fixed (@imbris). - Multiflow rivers were enabled (@zesterer). - In the process of making changes related to the world map, various incidental fixes and optimizations were required. - The new *level of detail* feature was added (@zesterer wrote part of this and has checked out the rest). - A new LOD terrain rendering step was added to the pipeline. - The LOD terrain quality was made configurable via a graphics setting. - Horizon maps were used to cast shadows from LOD chunks on both LOD and non-LOD terrain. - A "voxelization" effect was incorporated into rendered LOD terrain to make it blend better into the world. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Veloren's lighting has been completely overhauled (@zesterer has already checked most of this out). - A semi-accurate index of refraction was assigned to our materials. - A new, more realistic, physically based approach to lighting was used using the *Ashikhmin Shirley* BRDF. - We emulate *atmospheric scattering* using equations designed for measuring solar panel light exposure. - We attempt to compute *realistic light attenuation* in water using its real material properties. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Point and directional lights now cast realistic shadows, using *shadow mapping.* (@imbris, @zesterer, @Treeco, @YuriMomo) - Point light shadow maps were added to the rendering pipeline, using geometry shaders and *seamless cube maps*. - Directional light shadows were added to the rendering pipeline, using LISPSM together with disabling *depth clamping*. - "Shadow-only" chunks and NPCs were added to prevent shadows from models behind you from disappearing. - In the process of making changes related to shadow maps, various incidental fixes and optimizations were required. The addition of shadow maps, LOD terrain, and the new lighting all led to significant performance degradation, on top of other changes happening in master. Therefore, a large number of performance improvements were also needed: - The graphics options were made much more flexible and configurable, and shaders were optimize. - New options were provided for how to render lights and shadows (@Pfauenauge, @zesterer). - Graphic setting storage and configuration were overhauled to make adding new features easier (@Pfauenauge, @imbris). - Shaders were rewritten to utilize GLSL's preprocessor to avoid overhead (@zesterer, @YuriMomo). - In the process of making changes related to providing additional rendering options, various incidental fixes and optimizations were required. - Voxel model creation was switched to use *greedy meshing.* - A new voxel meshing method, greedy meshing, was added (@imbris). - Uses of the older meshing methods were migrated to use greedy meshing (@imbris, @jshipsey, @Pfauenauge). - New restrictions were added to terrain, figure, and sprites to future proof them for further optimizations (@jshipsey, @Pfauenauge, @zesterer). - Most positions are now relative to either chunk or player position for better precision (@imbris, @zesterer, @scottc). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - Animation and terrain math were switched to use SIMD where possible. - Fixes were made to vek to make its SIMD feature usable for us (@zesterer, @imbris). - The interface and types used in bone animation were changed in various ways (@jshipsey, @Snowram, @Pfauenauge). - Redundant code generation for body animation is now partly taken care of by a macro (@jshipsey, @Snowram, @Pfauenauge). - Animation code was modified to to use vek's SIMD representation where possible (@jshipsey, @Snowram, @Pfauenauge). - Terrain meshing code and shadow map math were also modified to use vek's SIMD representation (@imbris). - SIMD instruction generation was enabled (@YuriMomo, @jshipsey, @Snowram, @imbris, @Angelonfira, @xMAC94x). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - The way we cache glyphs was completely refactored, fixed, and optimized. - Our fork of `conrod` was optimized in various ways (@imbris). - Our fork of `conrod` now exposes whether a widget was updated during the current frame (@imbris). - Our use of the glyph cache was rewritten for correctness (@imbris). - A *text cache* was introduced that lets us skip remeshing glyphs that have not changed (@imbris). - Various changes were made to reduce pressure on the glyph cache, with more planned (@imbris, @Pfauenauge). - In the process of making changes related to the glyph cache, various incidental fixes and optimizations were required. - Colors were changed to keep Veloren's look consistent with master. - Some older tree models were brought back (@Pfauenauge). - TODO(@Sharp): All hardcoded colors were extracted and made hotloadable. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Hardcoded colors were fixed to conform to Veloren's style. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Color models were fixed to conform to Veloren's style. A detailed description of the involved changes follows. --- - The world size is no longer hardcoded. All functions dependent on world size now take a `WorldSizeLg`, which holds the base 2 logarithm of each actual world dimension and is guaranteed to maintain certain properties (outlined in `common/src/terrain/map.rs`). Additionally, many utility functions that utilize the world size were moved into `common` as well (mostly `common/src/terrain/mod.rs`). Finally, the world map format was updated in order to store its size explicitly, with a migration path from the old format that should work whenever the old formatted map was a square (practically always). See `world/src/sim/mod.rs` for these changes. - The map generation code was made generic to allow using it outside of the `world` crate. The parts of the map generating code that do not need to query the world were moved over to `common/src/terrain/map.rs`, allowing them to be used from the client without creating a dependency on `world`. The rest of it was turned into helper functions in `world/src/sim/map.rs`, which can be passed as closures to the generic map generation code to complete its construction. This also means that colors are now passed in separately to the map generation function. See <https://veloren.net/devblog-78/> for more details. - On world creation, we now compute *horizon maps*. See the function in `world/src/sim/util.rs`. Given a height map and a plane intersecting that height map, our horizon maps allow us to encode enough information to reconstruct shadows for each point on the height map using only the *horizon angle* (the angle at which the sun starts to become visible). As Veloren's sun only covers one plane, this is sufficient for encoding sun shadows for LOD terrain, by encoding two angles per chunk (one for each 90 degrees the sun covers). We can also use this for the moon, if we want, since the moon follows the same path. Additionally, we store the *height* of the furthest occluder, to try to make the shadows volumetric; so this means 4 bytes in total for each chunk. Support for horizon maps has been merged into the map functionality in common as well. - The way we pass the world from the server to the client has been updated. Rather than passing the prerendered map, we instead pass three maps with values for each chunk; one with the color information, a second with altitude information, and a third with horizon map information. We then reconstruct the map on the client, together with some additional information we send from the server (like the sea level and maximum height). See `common/src/msg/server.rs` for a detailed description of the format of `WorldMapMsg`, and `server/src/libr.rs` and `client/src/lib.rs` for details of the map construction and parsing. - Artifacts related to image rotation were fixed. See the commit message for commit SHA `cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e` for a detailed explanation. This involved changes to shaders, the addition of a new type of graphic (also reflected in the graphic cache) that allows specifying a border color (which automatically makes the associated texture immutable), and some related fixes. I reproduce the first two paragraphs of the MR description as well: ``` Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). ``` - Multiflow rivers were enabled. This does not really need to be part of this MR, and would be easy to revert, but since it seemed to provide a nice improvement it's currently packaged with it. We already computed multiple outflows from each chunk for erosion purposes long before this MR. However, we never modified river rendering to be able to handle this case (just a single downhill river flow is complex enough!) so this was not exposed when deciding which chunks were rivers. Now that - In the process of making changes related to the world map, various incidental fixes and optimizations were required. Some examples of fixes include making sure terrain is never lowered to below sea level (to make the shadow maps report correct values), fixing map altitudes and colors to understand things like cliffs and "block level" coloring (that doesn'te xist on the column level), and fixing a crashbug when rendering images for the UI where source pixels are strongly rectangular. Some examples of related performance fixes include avoiding allocating a fresh vector for all the maps (i.e. copying it over to change the format from `[u32; n]` to `DynamicImage` and then copying again to convert to `RgbaImage`), and instead using the `gfx::memory::slice` function to accomplish the same thing. These sorts of changes are spread all arond the code. This includes the additon of a new scene, `voxygen/src/scene/lod.rs`, a new pipeline `voxygen/src/render/pipeline/lod_terrain.rs`, and new shaders `assets/vxygen/shaders/lod-terrain-vert.glsl` and `assets/vxygen/shaders/lod-terrain-frag.glsl`, as well as associated changes to the renderer in `voxygen/src/render/renderer.rs`. The main idea behind our initial approach to LOD was to take the world data we now get from the server (altitude, color, and horizon mapping). - Some previously computed values were turned into shader uniforms for better prediction on weak processors. (@zesterer) - Calls to power or trig functions were removed or replaced with multiplications, where possible. - After some deliberation - To properly handle sprite "waving" for nearby sprites, We explicitly designed the greedy meshing system with figures and sprites in mind. In both cases, we want to be able to *efficiently* pack many different models into the same texture, especially in cases where we know we will either not be removing any of the grouped-together from the models from the texture, or will remove all of them at once (so they can be packed into some specific subtexture). For sprites, since we know every model in advance and never intend to deallocate them, we currently pack them all as efficiently as possible into one giant tetxure atlas. However, in the future we might opt to pack them slightly less efficiently in exchange for shrinking the sprite vertex size. For figures, we pack all the textures for each *model* into the same atlas. is a global texture atlas used for every sprite, and for figures which is why we have the ability to mesh multiple models to the same texture area (using the simple texture atlas allocator) without requiring intermediate vector allocations. This is accomplished by delaying the time when we actually write the color and light data to the texture until *after* all the model vertices have been meshed; then, we can just allocate the whole color/light array at once, making the atlas we use an exact fit. In computer science-y terms, we accomplish this delay by, after we perform the initial greedy meshing (without texture information), not continuing to create the texture data, but instead constructing a *continuation*--that is, a function that, when called, will execute the rest of the computation. We push this continuation (which in Rust terms is a `FnOnce` closure that takes the `ColLightsInfo` that it is supposed to write to as context) onto a onto a vector resizing. To allow for suspended writes to texture data, Rust pointed out to me that the continuation that would eventually write the color and light data to the texture atlas (the one that is shared by all models sharing the same greedy mesher) would have to *own* whatever data it mshed. Because we often generate the model data to mesh as a temporary in `voxygen/src/load.rs`, the - Matrix multiplications in the shader were reduced for figure data (@zesterer). - Vertex "waves" for fluid data were removed. - Terrain "bending" near edges was removed. - Scaling was fixed to make sure empty space was not introduced in a space previously occupied by a block. It was also changed to take ownership of its voxel data, rather than sharing it, to let it be used with meshing. - Rust's nightly version was bumped in order to use the `array_map` function, which lets us reuse more code between the simple map and `FigureModelCache`. - PositionedGlyph::standalone. --- I tried to cite sources in many cases[^realtime],[^lloyd],[^lispsm],[^pbrt],[^greedy],[^tjunctions] where I needed features from elsewhere but I am particularly grateful for the following resources, esepcially where they have accompanying source code. I linked all of them that are accessible to the public (those that are not were obtained through legal means). [^realtime]: Eisemann, Elmar, Michael Schwarz, Ulf Assarsson, Michael Wimmer. Real-Time Shadows. A K Peters/CRC Press (T&F), 20160419. [^lloyd]: Lloyd,B. 2007. [Logarithmic perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). PhD thesis, University of North Carolina. [^lispsm]: Wimmer, M., Scherzer, D., and Purgathofer, W. 2004. [Light space perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). In Proceedings of Eurographics Symposium on Rendering 2004, pp. 143– 152. [^pbrt]: Pharr, Matt, et al. [http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf](Physically Based Rendering: From Theory to Implementation). Third edition, Morgan Kaufmann Publishers/Elsevier, 2017. [^greedy]: mikolalysenko. “Meshing in a Minecraft Game.” 0 FPS, 30 June 2012, <https://0fps.net/2012/06/30/meshing-in-a-minecraft-game/>. [^tjunctions]: blackflux. “Meshing in Voxel Engines – Part 1.” Blackflux.Com, 23 Feb. 2014, <https://blackflux.wordpress.com/2014/02/23/meshing-in-voxel-engines-part-1/>. I am also especially grateful to Khronos, Wikiepdia, and stackoverflow for answering many of my specific questions while writing the MR. --- Squashed commit of the following: commit 300505e7305a2fdac722a808ee8538323f215f39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 18:46:25 2020 +0200 Fixing cargo doc and typo in CHANGELOG. commit ec0aeb18e8499d7d84ef818331b4b65c3d76cea6 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 15:38:50 2020 +0200 Hopefully final commit for the LOD branch. commit 5e8ea0b1eaac02903a02feb2eb038d195de4872f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 10:14:26 2020 +0200 Falling back to power as stopgap. commit e44a1cbf46504ee9931a01bdc9033e145500d557 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 09:25:41 2020 +0200 Address imbris feedback. Temporarily disables shiny water, lowers max VD. These restrictions will be lifted soon after merging. commit 561e25778a108ac3712f5ec2ce3a51234c4430d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 08:31:13 2020 +0200 Tweaking shaders a bit. commit 7d19259078ce0dd7b3742ad7d0cb3fab3ece3fdc Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:59:43 2020 +0200 Fix view example as well. commit 051cd4934e0fad2c0b15db4380a4189fa318679f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:29:06 2020 +0200 Fix meshing benchmark. commit c95e07db3b4dcca285678985e65e31b927cb1c61 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 05:46:22 2020 +0200 Address MR feedback, fix scene clouds. commit 1bfb816cabdb3ffc1e507a009c2d98696b4b573a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:39:36 2020 +0200 Incorporating Pfau's figure color changes. New eyes and new humanoid colors. commit 3f9b89a3ac7b3356b1dba0d1a8f6541357f81469 Merge: e2f5162e4 62c53963a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:29:41 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit e2f5162e4f96f4124aa43488f7245d341b3dcfd4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:28:38 2020 +0200 World colors are all hotloadable. They live in assets/world/style/colors.ron. Only a small handful of hardcoed colors remain in World; they are either part of the map, or difficult to disentangle from the rest of the computation. Comments are made where appropriate. commit 62c53963abe1975009d34a8f9515a355bef24f31 Author: Marcel Märtens <marcel.cochem@googlemail.com> Date: Wed Aug 19 15:59:00 2020 +0200 replace pretty_env_logger with tracing commit 5b1625f99d9586fe80e2232f583ec5af9f953099 Merge: d71003acd 4942b5b39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:15:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit d71003acdabeff970b3928e97c26af6847b5b78e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:14:34 2020 +0200 Hotloading colors, part 1: colors in common. Currently, this just entails humanoid colors. There are only three colors not handled; the light emitter colors in common/src/comp/inventory/item/tool.rs. These don't seem important enough to me to warrant making hotloadable, at least not right now, but if it's needed later we can always add them to the file. commit 63b5e0e553eb2ea49276f192a6fc7dd65254270d Merge: c32b337a4 6d2c4b9c1 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 13:05:37 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c32b337a46e10d9de473d178a94a3ccd61c39bb3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:52:04 2020 +0200 Fixing LOD grid, for real. commit a166ae0360395387e09fb35a1f84210c2ce5ec24 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:28:05 2020 +0200 Addressing imbris's initial feedback. Fixes two minor bugs: explosion particles were no longer spawning randomly, and LOD grids were not perfectly even. commit 4cbad004f44060994252dd3d38647a14a589712f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:27:58 2020 +0200 Bumping nightly per request. commit 548680276aac77c25d43d16b5622f847d474dbef Merge: acc098604 8f8b20c91 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:26:06 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit acc0986040589a3492f88a740bc3c3fc693b26d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:28:32 2020 +0200 Lower resolution due to lying drivers. commit d3b878de2a52c358d2944a6bbd0555dad7fbdb10 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:15:38 2020 +0200 Fix issues msh encountered with Intel 4600. commit 10245e0c1b0cb6fae10d86409435364edc6102ef Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 21:15:02 2020 +0200 Merge more models into one mesh than we did previously. commit 3155c31e663c52ae5c3a53d5fb5665892a1a498a Merge: 7204cc8a7 3c199280e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:35:22 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7204cc8a7a4f74a30306bd205d9834fee4bb944f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:34:43 2020 +0200 Fix not yet done NPC animations. This forces them all to be the idle animation if not specified. This fixes issues where you'd have giant NPCs in water. commit bc83360f2a08918f19d417b5f772e1ff554dba08 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 19:36:37 2020 +0200 Try to fix some bugs: - Z fighting with LOD terrain and water. - Audio SFX not playing. commit 1fd104aa603bf3781b6526a5cada46aeca3049dd Merge: 862df3c99 7c2c392a3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 12:02:31 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 862df3c9976c4da9bd7cfd784f1a85973127968a Merge: 0a4218ed9 75c1d4401 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 05:52:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0a4218ed9d541a2b34c133351bea38a99ddf4ea7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 22:27:14 2020 +0200 Fix particle depth. commit f51dfdeb442d0dd5243dd2f344fa4be295bd0875 Merge: c6251a956 5e6dc0471 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:19:04 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit c6251a956ad376400dca5c23420cf8d213dc8fdf Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:15:46 2020 +0200 Cache figures more intelligently. Cache figures for longer, and don't cache character states for the player except where they actually affect the rendered model. commit 0ed801d5404982c6fb63b1eaa4567d908b294c9d Merge: c11b9bdf0 eea64f78f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 16:32:24 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c11b9bdf0a53bf9884d2f5a48fec9b01d582df1a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 11:47:15 2020 +0200 Remove unneeded Clippy annotation. commit 16aa9ef40af56d69289d00aafb3deadfb8bd4f35 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 8 00:53:02 2020 +0200 Fix hotloading and Clippy. commit 3dc973e0be5b758da1e9805eb764ad401374cd0c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 23:50:27 2020 +0200 Major speedups with SIMD. commit fba64a7d93d5a96077ce87287bbce6ab9b7fbcae Merge: 76429d00e d1e10b178 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:19 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 76429d00eea00d212fbd672a84ee91e75b19b938 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:10 2020 +0200 Add clippy.toml. commit c79f512f84dbb83cb82b7954db68ff241dfd8e41 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 11:55:20 2020 +0200 Fix all clippy issues, clean up Rust code. commit 6f90e010b3fbefb53b0d632e819931350015b6b8 Merge: 77a8c7c26 5929cfa5c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:30 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 77a8c7c267d3f44a1a62bd6b2274359973c5e4d4 Merge: b44e44232 44febaabd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:10 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 5929cfa5c713aa392110bbb62407f76caf53c3df Author: jshipsey <jshipsey18@gmail.com> Date: Thu Aug 6 20:47:27 2020 -0400 fixed in-hand arrow bug commit b44e442325d828f1cd564d66908f89d09e80474b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 6 13:40:35 2020 +0200 Miscellaneous performance improvements. commit be37acf287c1360d8085862526ac3365ffd1d768 Merge: 125d7fc6c c11876547 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 05:49:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 125d7fc6c4dcd8c8c5f27b8268a4d64f409f3644 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 04:55:31 2020 +0200 Abstract over simd vs. repr_c vectors. Also some minor improvements to Event size. commit d4d4956e9252e1241ce110b2aa85076c6b1e2a23 Merge: 5f3b7294a aced5f979 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:56:54 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 5f3b7294af1f8533edc2620b58863c248e2b07af Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:43:52 2020 +0200 Fix formatting issues I missed before. commit a428a3ebba70dcab63dd0f8cd983120c90617271 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:41:51 2020 +0200 Fix clippy warnings, part 1. There aer still a bunch of type too complex and function takes too many arguments warnings that I'll fix later (or ignore, since in the one case I did fix a function takes too many arguments warning I think it made the code *less* readable). commit ba54307540ed8a937ac08209730284fc653af85b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 30 13:22:42 2020 +0200 Fix light animations so they are removed when the light turns off. commit 7e0f4bcbf0f4717145d8beac40d52e3acebbe2aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 21:10:20 2020 +0200 Fix crash in edge case for pixel art. commit 56da06f7a351e2b949e9b014a90b974d511a0924 Merge: cf74d55f2 9f53a4a19 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:56:52 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:29:52 2020 +0200 Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). The first concern was addressed by fixing the dimensions of the map images drawn from the UI (so that we always use a square source rectangle, rather than a rectangular one according to the dimensions of the map). We also fixed the way rotation was done in the fragment shader for north-facing sources to make it properly handle aspect ratio (this was already done for north-facing targets). Together, these fix rendering issues peculiar to rectangular maps. The second and third concerns were jointly addressed by adding an optional border color to every 2D image drawn by the UI. This turns out not to waste extra space even though we hold a full f32 color (to avoid an extra dependency on gfx's PackedColor), since voxel images already take up more space than Optiion<[f32; 4]> requires. This is then implemented automatically using the "border color" wrapping method in the attached sampler. Since this is implemented in graphics hardware, it only works (at least naively) if the actual image bounds match the texture bounds. Therefore, we altered the way the graphics cache stores images with a border color to guarantee that they are always in their own texture, whose size exactly matches their extent. Since the easiest currently exposed way to set a border color is to do so for an immutable texture, we went a bit further and added a new "immutable" texture storage type used for these cases; currently, it is always and automatically used only when there is a specified border color, but in theory there's no reason we couldn't provide immutable-only images that use the default wrapping mdoe (though clamp to border is admittedly not a great default). To fix the maps case specifically, we set the border color to a translucent version of the ocean border color. This may need tweaking going forward, which shouldn't be hard. As part of this process, we had to modify graphics replacement to make sure immutable images are *removed* when invalidated, rather than just having a validity flag unset (this is normally done by the UI to try to reuse allocations in place if images are updated in benign ways, since the texture atlases used for Ui do not support deallocation; currently this is only used for item images, so there should be no overlap with immutable image replacement, so this was purely precautionary). Since we were already touching the relevant code, we also updated the image dependency to a newer version that provides more ways to avoid allocations, and made a few other changes that should hopefully eliminate redundant most of the intermediate buffer allocations we were performing for what should be zero-cost conversions. This may slightly improve performance in some cases. commit ad18ce939940a8c697270f6e9b94db9942fd8295 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 13:21:09 2020 +0200 Fix continent scale hack. commit 36b1cb074f5b195aebd7dbbc3da7f0246a1a18ec Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 12:11:40 2020 +0200 Enable loading different sized maps without a recompile. We may want to tweak the effects of the continent_scale_hack. commit 13b6d4d534cc4814b7cb3294ca41bbfea0a6b186 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 10:55:48 2020 +0200 Removing WORLD_SIZE, part 1. Erased almost every instance of WORLD_SIZE and replaced it with a local power of two, map_size_lg (which respects certain invariants; see common/src/terrain/map.rs for more details about MapSizeLg). This also means we can avoid a dependency on the world crate from client, as desired. Now that the rest of the code is not expecting a fixed WORLD_SIZE, the next step is to arrange for maps to store their world size, and to use that world size as a basis prior to loading the map (as well, probably, as prior to configuring some of the noise functions). commit 30b1d2c6428230a9eaa0d749cdcbbd6f1cbccd78 Merge: 7d56ba31b 1377b369f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:58 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 7d56ba31b445441461b28a07fc495d7d4f047c17 Merge: 2101113b4 598f14b25 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 1377b369f6db2258e910d467a5740f31789e3ded Author: Monty Marz <m.marzouq@gmx.de> Date: Sun Jul 19 23:25:38 2020 +0200 more saturated pumpkins commit ae8d50527f93bb0616c2ad46ce4dacb63bc37c6d Author: Monty Marz <m.marzouq@gmx.de> Date: Sat Jul 18 20:29:56 2020 +0200 acacia models commit 2101113b467e691de787392d7f20f1745f5637bd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 18 18:55:25 2020 +0200 Higher detail LOD. commit add2cfae04b4385fa5590e11e2bd5229d9dee0aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 16 01:57:39 2020 +0200 Revert some irrelevant stuff. commit 2e2ab3dc1eaa59a4aef7f8d34a53d8aae4c8553a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 15 13:30:49 2020 +0200 Fixing various things about shadows. * Correcting optimal LISPSM parameter. * Figure shadows are cast when they're not visible. * Chunk shadows stay cast until you look away. * Seamless cubemaps for point lights. * Etc. commit 6c31e6b56217274285b597af297036691ea5d897 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 19:50:26 2020 +0200 Fix shadow creation. commit 6332cbe006115ae205597529cd8bbccd146c2cca Merge: be438657c 930e0028b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:47:00 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit be438657c33d7b5bfb0a9582c3ed3fd366637323 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:28:08 2020 +0200 Tweaks to shadows. Added shadow map resolution configuration, added seamless cubemaps, documented all existing rendering options, and fixed a few Clippy errors. commit 23b4058906013c7d2a40c286e20e32c5fbd897ed Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 10:11:19 2020 +0200 Fix moon, use nonlinear noise for terrain. Note that the latter has a bit of performance cost. commit 7fbe5cbfbb9dc29607957b8e62f432a4deed193d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:23:02 2020 +0200 Address lies about max texture size. commit bcfc62b5e13a1cdd83f57535fde4694720bebfd9 Merge: 75e3626a7 18a08e8fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:22:08 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 75e3626a785919f43fdcf2127c2b10e3e4df2f9f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:21:52 2020 +0200 OpenGL 3.3 minimum. commit 18a08e8fe2739f02af99a5d2cb4e7c38c49e858b Author: Monty Marz <m.marzouq@gmx.de> Date: Tue Jul 7 23:57:52 2020 +0200 settings localization commit 90c5d1ca3620092bc3ae10b2211489eb1cf6f5e8 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 21:11:48 2020 +0200 Lower near distance. commit 0e66f02b25aaddaa2dfddbbc89cd67de54a9a7b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 20:09:01 2020 +0200 All sprites sway in the wind now. commit db1401a6910bf42dcf502462c90038752ff5fbdb Merge: 69e508d8c e8b4b29d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 19:34:17 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 69e508d8c94d8973033817ca86f357e466fc7c4d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 18:41:37 2020 +0200 Make it easy to switch to SIMD for math. commit ffe0f5928c7a7e87d00cb5426b3b1d831d7e02fd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 21:21:12 2020 +0200 Fix some issues with underwater rendering. commit bfda6da42f38fd02c31ee92c81ab785a3e50c2a0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 19:17:59 2020 +0200 Fix some minor display issues. commit 0ed752e087968cf901301884aaeae698e32ef8a5 Merge: ccc6a06a8 518edcb85 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:14:21 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit ccc6a06a8d4504d6b9f7af7905a414d2ee06ab76 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:04:34 2020 +0200 Some minor changes. commit 4e020246702889269efe1a191788992164c508d6 Merge: 50a64d927 e05c9267a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 16:17:40 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 50a64d927e6c4f4b0e4688e4cbfca694bc3f922a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 13:07:03 2020 +0200 Fix far plane. commit 7dd06da34cae8f9ea3b6c889fe965181f3fd3949 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:25:35 2020 +0200 Add shadows.glsl. commit 618a18c998778bf871b905a74657440fcc384c80 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:10:22 2020 +0200 Adding shadows, greedy meshing, and more. commit eaea83fe6a5cb1cb0ba8beef888183c718258496 Merge: 267018495 2f89b863e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 22:47:07 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 2670184954a13e4a9e7a4e35ba79aac0c5fac2f7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 21:20:01 2020 +0200 Make civsim and sites deterministic. For anything in worldgen where you use a HashMap, *please* think carefully about which hasher you are going to use! This is especially true if (for some reason) you are depending on hashmap iteration order remaining stable for some aspect of worldgen. commit f8376fd5dc72b4a9c2f51a6b4570d59c8b8e9343 Merge: 654f7e049 cdee191dd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 17:53:57 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 654f7e049258d9da27c09608bbe6a46ffa8787e5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed May 20 21:22:30 2020 +0200 Correct backface culling. commit 560501df05ca725409b0f2e4eb31bdfdc15fd0c7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue May 19 17:22:06 2020 +0200 Greedy messhing for shadows. commit a4d87e1875ca543436e6bbbeb20348facc5a52d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun May 17 05:59:00 2020 +0200 Shadow maps work for lantern. commit 243d0837b8a3b08172c9a3c348d964d7ddc2a0a8 Merge: 04382dc28 71dd520cd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:53:13 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 04382dc28632b6c66e8821f6870c0daaa1c1901a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:22:17 2020 +0200 WIP: better graphics config, better LOD, shadow maps. commit 22ddbad3eb32bfa70f0932176022208fe67ded81 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 18:54:09 2020 +0200 Minor shader fixes. commit 746a10e8d01ac235f994b0cde78fa48998602a1f Merge: 0f4a0e763 40ab94673 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 04:02:09 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0f4a0e763db3afbdc4fb0558611f38326ca87151 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 23:03:24 2020 +0200 Switch back to pop-in terrain. commit dd74fa7e4a53667b38811d7aec58d7f6a68889bb Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 22:58:55 2020 +0200 LOD shading closer to voxel shading. commit ef67bd58ba0bdaf622b078892d768263b6cba268 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 28 20:49:03 2020 +0200 Experimental underwater lighting. commit 2c5ad9d07605e80d5fd5679dd3a5d70c605b86a9 Merge: 748279835 303967a6f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 22:35:24 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7482798354eda18c8207950080fc24d443a369de Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 21:59:55 2020 +0200 Replace discard in figure-frag. commit d83b4ae69be4912f69bf7835f509c68a1c7770a4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:45:57 2020 +0200 Fix sprite lighting, HDR from focus_pos. commit 0594238004f116274905fa0ed7c2b6c417ed1d29 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:14:10 2020 +0200 Proper HDR from point lights. commit 48c93d2b41ce5743103d18e76cc228f5ac766492 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 14:01:43 2020 +0200 Brighter ambiance, darker LOD shadows. commit e0452e895ccfa8a43f368cae3b8b8aedc24dad93 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 13:13:23 2020 +0200 More proper HDR. commit 4c6da3ed16cfeebb455e40da5f557b4af9a499d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 00:13:10 2020 +0200 Trying LOD noise. commit 682a3d74c85df5503ffe1fc1cc891bce789df1ad Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 23:11:08 2020 +0200 Fix LOD heights in towns. commit cc39e5734e8b18f9077bf42e66337c1319dd6b6e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 21:01:23 2020 +0200 More LOD fixes. commit 8116b21c2e51c836e77894e309ac273caf2917b3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:54:43 2020 +0200 I like this coloring. commit bc2560ea90b36f4b46190005344232d993043ac3 Merge: 14effdd5d e690efe71 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:48:33 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 14effdd5db8747fcf3eb34f03b46b7792e92d1c5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:24:35 2020 +0200 Re-saturate. commit 48a643955d4435b78179acba0beb4a979905cc31 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:23:57 2020 +0200 Various fixes. commit f7b497a0c25f4ad4682c71dd1ed6f608052feb9b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 03:22:49 2020 +0200 Render figures again. commit 44e4aad48deba8266b9f8bdfd3db096b381f5327 Merge: e6f0a5a98 9ec319a18 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 02:01:04 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit e6f0a5a981a82533ba188fff0a54ce98577bb152 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 24 16:12:20 2020 +0200 Add atmospheric scattering. commit f2953087f691a8edbc001cb98ebf5059fc6f8ac0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 23 00:01:20 2020 +0200 Fix shadowing for specular reflections. commit ddd4a67a9799b8d08c7dc0c2bec90621c2bed0e3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Apr 22 22:56:12 2020 +0200 HDR fixes. commit 1015e60deef3c447381996277df7496707a63bd0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 21 18:25:19 2020 +0200 More lighting changes. commit 80c264abd111fb237e57843efcb5c071d4f84613 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 13 00:29:59 2020 +0200 Lighting experiments. commit 8414987e589dd5102bad89762a3adaccc0bfe957 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 9 02:38:40 2020 +0200 WIP -- lighting changes and soft shadows. commit 9cd2b3fb0d6b49776c6dfe463e4169637250b11a Merge: c7ea687eb 8b149ad11 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:29 2020 +0200 Merge branch 'sharp/new-lighting' into sharp/small-fixes commit c7ea687ebbc5aace1b455f134a5bf49ce2c7434a Merge: 476441531 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:02 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 8b149ad11ad4bb75018fcf9519baec27d1c95951 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:32:39 2020 +0200 Trying out a new lighting model. commit b0ac9f36f755dd06f7c17c46150568064790864f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 07:56:11 2020 +0200 Use bicubic interpolation for terrain. commit f6fc9307a121514b614bc50ef8eb055953e7da8a Merge: 33140a295 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 05:01:41 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 4764415312aae6e9ac2d00e86e84577cb958f1ab Merge: ed2d0111d 13388ee6a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 04:54:48 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 13388ee6a42943f3f79a9cb488346cef18e272fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 20:30:08 2020 +0200 Various fixes (to coloring and to soft shadows). commit fbd084a94a067082a87cd6d28b82054709bc9265 Merge: 5a089863b 4fdf6896a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 18:50:38 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/map-colors commit ed2d0111d994262ae836d84d1fe5a45e4de72a0b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 06:49:27 2020 +0200 Combining colors and LOD. commit 88342640c6b835114d01c797b89fdede3b0a2108 Merge: 33140a295 5a089863b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:49:20 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 33140a2951b8212725f42c758b277aaec4d888f7 Merge: 4c65a5aed f34d4b379 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:36:21 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 5a089863beb01d4794bbe3580ada47b278715ea2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 03:17:49 2020 +0200 Making maps brighter. This is probably not the right way to do it, but oh well! commit 32b2c99109dd486aa922886081068f9c550c83f2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 02:46:36 2020 +0200 Horizon mapping and "layered" map generation. Horizon mapping is a method of shadow mapping specific to height maps. It can handle any angle between 0 and 90 degrees from the ground, as long as know the horizontal direction in advance, by remembering only a single angle (the "horizon angle" of the shadow map). More is explained in common/src/msg/server.rs. We also remember the approximate height of the largest occluder, to try to be able to generate soft shadows and create a vertical position where the shadows can't go higher. Additionally, map generation has been reworked. Instead of computing everything from explicit samples, we pass in sampling functions that return exactly what the map generator needs. This allows us to cleanly separate the way we sample things like altitudes and colors from the map generation process. We exploit this to generate maps *partially* on the server (with colors and rivers, but not shading). We can then send the partially completed map to the client, which can combine it with shadow information to generate the final map. This is useful for two reasons: first, it makes sure the client can apply shadow information by itself, and second, it lets us pass the unshaded map for use with level of detail functionality. For similar reasons, river generation is split out into its own layer, but for now we opt to still generate rivers on the server (since the river wire format is more complicated to compress and may require some extra work to make sure we have enough precision to draw rivers well enough for LoD). Finally, the mostly ad-hoc lighting we were performing has been (mostly) replaced with explicit Phong reflection shading (including specular highlights). Regularizing this seems useful and helps clarify the "meaning" of the various light intensities, and helps us keep a more physically plausible basis. However, its interaction with soft shadows is still imperfect, and it's not yet clear to me what we need to do to turn this into something useful for LoD. commit f8926a5737ddc51f3d585c651a64c43677aae0f4 Merge: a1aee931e 875ae6ced Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Mar 13 13:32:42 2020 +0100 Merge remote-tracking branch 'origin/master' into sharp/map-colors commit 4c65a5aed353b119aea65a2aaeb94549b67beb42 Author: Treeco <5021038-Treeco@users.noreply.gitlab.com> Date: Mon Feb 24 16:48:05 2020 +0000 Made LOD setting slider exponential commit 2fa7b2d20d7233dc8bfd64f9f7f54617575248f1 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 17:49:53 2020 +0000 Added mist to LoD commit aab059a450b5f635777129ff82cc15b662965c3c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 15:14:06 2020 +0000 Added LoD slider commit 779c36b538121c5ade3633ae5cb67bb14c8c3877 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:54:55 2020 +0000 Reduced cost of vertex pushing commit 9fea150473906b166365b738ebcea07c697daf3d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:38:53 2020 +0000 Fixed maths, improved LoD resolution commit 5481df38fea5bf183ff376a3337179cfaa5233dc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 11:22:50 2020 +0000 Dynamically relocate LoD vertices to enhance details commit a3e36a50ababd615da7db1b26158c7906a5def01 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 18:13:51 2020 +0000 Simpler terrain spiral rendering commit 255f450ae9ac8763db4bede075fb409161ed57cc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:53:17 2020 +0000 Better LoD precision commit 3d027aebe812a5b8658a4eb8123dc9f61b3776d2 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:04:03 2020 +0000 Better falloff commit be775c9484b457b2c0b1a494aec03392d0c70e76 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 15:30:45 2020 +0000 Applied good ideas from experimental branch commit 58587b68545a23c5c04ab4574a4b94b3bc982246 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 16:15:13 2020 +0000 Minor fixes to LoD merging commit 7b42aebd709c14df2db766aad61d9280ad24d84d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 15:04:44 2020 +0000 Capped LoD dragging commit 8aafc559f87124e1ea5ca6e3ddc2aa0c242d793c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:54:37 2020 +0000 Better blending between LoD and terrain border commit edd3455d5161792d87ddc8eadc0ecbad5532b284 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:40:19 2020 +0000 Fixed LoD z depth, added sea level offset commit b9b06744620114dd5556e73f64fa93c145503a7c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:27:43 2020 +0000 Better LoD smoothing commit a1aee931e790431560cd2d953ad61d9497072afd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Feb 21 14:52:17 2020 +0100 Adding shadows. commit 2400786c13dd891c131ed86d48d05df516a8a778 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 13:48:40 2020 +0000 Use world map as LoD source commit dbf650f504a4c25fbbc2096ac3616c736bf52d23 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Jan 20 00:48:14 2020 +0000 Better clouds at distance commit 5e6f81b86cdb9730b9b056877b19257075fd5fa8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Jan 19 23:59:02 2020 +0000 sync commit 745e7540ddb000cc645f612767b337c2ddc3f7c0 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 12:40:48 2019 +0000 Improved cloud falloff mist, faster noise sampling commit f6a200d0cb866196ba57697466755f9e0c7ea5d8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 10:09:00 2019 +0000 Improved long-range depth precision, removed unnecessary LoD polygons commit 63d1b2bb2292898d59fb4f4e502201103dfeb86f Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 20:57:46 2019 +0000 Working LoD shader commit f13d98ee3e58f881e8b978861a67663b59ed91ec Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 11:03:40 2019 +0000 LoD first attempt (stack overflow issue)
2020-08-20 18:34:59 +00:00
[[package]]
name = "bytemuck"
update crates
2021-09-20 10:05:41 +00:00
version = "1.7.2"
(See sharp/lod-history) LOD, shadows, greedy meshing, new lighting, perf --- Pretty much a Veloren fork at this point. Here's a high level overview of the changes (will be added to CHANGELOG just before merge). At a high level this MR incorporates roughly two groups of changes. The first group consists of new game features: more flexible map sizes, level of detail terrain, shadow maps, and a new lighting engine. This is "feature work" that (mostly) only adds new things to Veloren, and mostly shouldn't affect old stuff. The second big group of changes are those addressing the fallout from all the new features. These include performance fixes of various sorts: the addition of multiple graphics options and optimization of the cheap ones to avoid work, switching all voxel models to use some variant of greedy meshing, switching over much of our CPU-side vector math to exploit SIMD instructions (coinciding with a fork of `vek`), and a rewrite of how the UI handles text rendering (coinciding with updates to our fork of `conrod`). Making Veloren's hardcoded colors appear correct under the new lighting engine also required considerably changes (TODO: Fill in this section when it's complete). The second category of changes often heavily touches code owned by other people, including frequently modified code "owned" by a handful of people, so I recommend that this code be reviewed particularly carefully. --- At a high level (each will be described in more detail below): - The world map has been refactored. - The world size is no longer hardcoded (@zesterer). - The map generation code was made generic to allow using it outside of the `world` crate (@zesterer). - On world creation, we now compute *horizon maps* (@zesterer). - The way we pass the world from the server to the client has been updated (@xMAC94x). - Artifacts related to image rotation were fixed (@imbris). - Multiflow rivers were enabled (@zesterer). - In the process of making changes related to the world map, various incidental fixes and optimizations were required. - The new *level of detail* feature was added (@zesterer wrote part of this and has checked out the rest). - A new LOD terrain rendering step was added to the pipeline. - The LOD terrain quality was made configurable via a graphics setting. - Horizon maps were used to cast shadows from LOD chunks on both LOD and non-LOD terrain. - A "voxelization" effect was incorporated into rendered LOD terrain to make it blend better into the world. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Veloren's lighting has been completely overhauled (@zesterer has already checked most of this out). - A semi-accurate index of refraction was assigned to our materials. - A new, more realistic, physically based approach to lighting was used using the *Ashikhmin Shirley* BRDF. - We emulate *atmospheric scattering* using equations designed for measuring solar panel light exposure. - We attempt to compute *realistic light attenuation* in water using its real material properties. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Point and directional lights now cast realistic shadows, using *shadow mapping.* (@imbris, @zesterer, @Treeco, @YuriMomo) - Point light shadow maps were added to the rendering pipeline, using geometry shaders and *seamless cube maps*. - Directional light shadows were added to the rendering pipeline, using LISPSM together with disabling *depth clamping*. - "Shadow-only" chunks and NPCs were added to prevent shadows from models behind you from disappearing. - In the process of making changes related to shadow maps, various incidental fixes and optimizations were required. The addition of shadow maps, LOD terrain, and the new lighting all led to significant performance degradation, on top of other changes happening in master. Therefore, a large number of performance improvements were also needed: - The graphics options were made much more flexible and configurable, and shaders were optimize. - New options were provided for how to render lights and shadows (@Pfauenauge, @zesterer). - Graphic setting storage and configuration were overhauled to make adding new features easier (@Pfauenauge, @imbris). - Shaders were rewritten to utilize GLSL's preprocessor to avoid overhead (@zesterer, @YuriMomo). - In the process of making changes related to providing additional rendering options, various incidental fixes and optimizations were required. - Voxel model creation was switched to use *greedy meshing.* - A new voxel meshing method, greedy meshing, was added (@imbris). - Uses of the older meshing methods were migrated to use greedy meshing (@imbris, @jshipsey, @Pfauenauge). - New restrictions were added to terrain, figure, and sprites to future proof them for further optimizations (@jshipsey, @Pfauenauge, @zesterer). - Most positions are now relative to either chunk or player position for better precision (@imbris, @zesterer, @scottc). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - Animation and terrain math were switched to use SIMD where possible. - Fixes were made to vek to make its SIMD feature usable for us (@zesterer, @imbris). - The interface and types used in bone animation were changed in various ways (@jshipsey, @Snowram, @Pfauenauge). - Redundant code generation for body animation is now partly taken care of by a macro (@jshipsey, @Snowram, @Pfauenauge). - Animation code was modified to to use vek's SIMD representation where possible (@jshipsey, @Snowram, @Pfauenauge). - Terrain meshing code and shadow map math were also modified to use vek's SIMD representation (@imbris). - SIMD instruction generation was enabled (@YuriMomo, @jshipsey, @Snowram, @imbris, @Angelonfira, @xMAC94x). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - The way we cache glyphs was completely refactored, fixed, and optimized. - Our fork of `conrod` was optimized in various ways (@imbris). - Our fork of `conrod` now exposes whether a widget was updated during the current frame (@imbris). - Our use of the glyph cache was rewritten for correctness (@imbris). - A *text cache* was introduced that lets us skip remeshing glyphs that have not changed (@imbris). - Various changes were made to reduce pressure on the glyph cache, with more planned (@imbris, @Pfauenauge). - In the process of making changes related to the glyph cache, various incidental fixes and optimizations were required. - Colors were changed to keep Veloren's look consistent with master. - Some older tree models were brought back (@Pfauenauge). - TODO(@Sharp): All hardcoded colors were extracted and made hotloadable. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Hardcoded colors were fixed to conform to Veloren's style. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Color models were fixed to conform to Veloren's style. A detailed description of the involved changes follows. --- - The world size is no longer hardcoded. All functions dependent on world size now take a `WorldSizeLg`, which holds the base 2 logarithm of each actual world dimension and is guaranteed to maintain certain properties (outlined in `common/src/terrain/map.rs`). Additionally, many utility functions that utilize the world size were moved into `common` as well (mostly `common/src/terrain/mod.rs`). Finally, the world map format was updated in order to store its size explicitly, with a migration path from the old format that should work whenever the old formatted map was a square (practically always). See `world/src/sim/mod.rs` for these changes. - The map generation code was made generic to allow using it outside of the `world` crate. The parts of the map generating code that do not need to query the world were moved over to `common/src/terrain/map.rs`, allowing them to be used from the client without creating a dependency on `world`. The rest of it was turned into helper functions in `world/src/sim/map.rs`, which can be passed as closures to the generic map generation code to complete its construction. This also means that colors are now passed in separately to the map generation function. See <https://veloren.net/devblog-78/> for more details. - On world creation, we now compute *horizon maps*. See the function in `world/src/sim/util.rs`. Given a height map and a plane intersecting that height map, our horizon maps allow us to encode enough information to reconstruct shadows for each point on the height map using only the *horizon angle* (the angle at which the sun starts to become visible). As Veloren's sun only covers one plane, this is sufficient for encoding sun shadows for LOD terrain, by encoding two angles per chunk (one for each 90 degrees the sun covers). We can also use this for the moon, if we want, since the moon follows the same path. Additionally, we store the *height* of the furthest occluder, to try to make the shadows volumetric; so this means 4 bytes in total for each chunk. Support for horizon maps has been merged into the map functionality in common as well. - The way we pass the world from the server to the client has been updated. Rather than passing the prerendered map, we instead pass three maps with values for each chunk; one with the color information, a second with altitude information, and a third with horizon map information. We then reconstruct the map on the client, together with some additional information we send from the server (like the sea level and maximum height). See `common/src/msg/server.rs` for a detailed description of the format of `WorldMapMsg`, and `server/src/libr.rs` and `client/src/lib.rs` for details of the map construction and parsing. - Artifacts related to image rotation were fixed. See the commit message for commit SHA `cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e` for a detailed explanation. This involved changes to shaders, the addition of a new type of graphic (also reflected in the graphic cache) that allows specifying a border color (which automatically makes the associated texture immutable), and some related fixes. I reproduce the first two paragraphs of the MR description as well: ``` Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). ``` - Multiflow rivers were enabled. This does not really need to be part of this MR, and would be easy to revert, but since it seemed to provide a nice improvement it's currently packaged with it. We already computed multiple outflows from each chunk for erosion purposes long before this MR. However, we never modified river rendering to be able to handle this case (just a single downhill river flow is complex enough!) so this was not exposed when deciding which chunks were rivers. Now that - In the process of making changes related to the world map, various incidental fixes and optimizations were required. Some examples of fixes include making sure terrain is never lowered to below sea level (to make the shadow maps report correct values), fixing map altitudes and colors to understand things like cliffs and "block level" coloring (that doesn'te xist on the column level), and fixing a crashbug when rendering images for the UI where source pixels are strongly rectangular. Some examples of related performance fixes include avoiding allocating a fresh vector for all the maps (i.e. copying it over to change the format from `[u32; n]` to `DynamicImage` and then copying again to convert to `RgbaImage`), and instead using the `gfx::memory::slice` function to accomplish the same thing. These sorts of changes are spread all arond the code. This includes the additon of a new scene, `voxygen/src/scene/lod.rs`, a new pipeline `voxygen/src/render/pipeline/lod_terrain.rs`, and new shaders `assets/vxygen/shaders/lod-terrain-vert.glsl` and `assets/vxygen/shaders/lod-terrain-frag.glsl`, as well as associated changes to the renderer in `voxygen/src/render/renderer.rs`. The main idea behind our initial approach to LOD was to take the world data we now get from the server (altitude, color, and horizon mapping). - Some previously computed values were turned into shader uniforms for better prediction on weak processors. (@zesterer) - Calls to power or trig functions were removed or replaced with multiplications, where possible. - After some deliberation - To properly handle sprite "waving" for nearby sprites, We explicitly designed the greedy meshing system with figures and sprites in mind. In both cases, we want to be able to *efficiently* pack many different models into the same texture, especially in cases where we know we will either not be removing any of the grouped-together from the models from the texture, or will remove all of them at once (so they can be packed into some specific subtexture). For sprites, since we know every model in advance and never intend to deallocate them, we currently pack them all as efficiently as possible into one giant tetxure atlas. However, in the future we might opt to pack them slightly less efficiently in exchange for shrinking the sprite vertex size. For figures, we pack all the textures for each *model* into the same atlas. is a global texture atlas used for every sprite, and for figures which is why we have the ability to mesh multiple models to the same texture area (using the simple texture atlas allocator) without requiring intermediate vector allocations. This is accomplished by delaying the time when we actually write the color and light data to the texture until *after* all the model vertices have been meshed; then, we can just allocate the whole color/light array at once, making the atlas we use an exact fit. In computer science-y terms, we accomplish this delay by, after we perform the initial greedy meshing (without texture information), not continuing to create the texture data, but instead constructing a *continuation*--that is, a function that, when called, will execute the rest of the computation. We push this continuation (which in Rust terms is a `FnOnce` closure that takes the `ColLightsInfo` that it is supposed to write to as context) onto a onto a vector resizing. To allow for suspended writes to texture data, Rust pointed out to me that the continuation that would eventually write the color and light data to the texture atlas (the one that is shared by all models sharing the same greedy mesher) would have to *own* whatever data it mshed. Because we often generate the model data to mesh as a temporary in `voxygen/src/load.rs`, the - Matrix multiplications in the shader were reduced for figure data (@zesterer). - Vertex "waves" for fluid data were removed. - Terrain "bending" near edges was removed. - Scaling was fixed to make sure empty space was not introduced in a space previously occupied by a block. It was also changed to take ownership of its voxel data, rather than sharing it, to let it be used with meshing. - Rust's nightly version was bumped in order to use the `array_map` function, which lets us reuse more code between the simple map and `FigureModelCache`. - PositionedGlyph::standalone. --- I tried to cite sources in many cases[^realtime],[^lloyd],[^lispsm],[^pbrt],[^greedy],[^tjunctions] where I needed features from elsewhere but I am particularly grateful for the following resources, esepcially where they have accompanying source code. I linked all of them that are accessible to the public (those that are not were obtained through legal means). [^realtime]: Eisemann, Elmar, Michael Schwarz, Ulf Assarsson, Michael Wimmer. Real-Time Shadows. A K Peters/CRC Press (T&F), 20160419. [^lloyd]: Lloyd,B. 2007. [Logarithmic perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). PhD thesis, University of North Carolina. [^lispsm]: Wimmer, M., Scherzer, D., and Purgathofer, W. 2004. [Light space perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). In Proceedings of Eurographics Symposium on Rendering 2004, pp. 143– 152. [^pbrt]: Pharr, Matt, et al. [http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf](Physically Based Rendering: From Theory to Implementation). Third edition, Morgan Kaufmann Publishers/Elsevier, 2017. [^greedy]: mikolalysenko. “Meshing in a Minecraft Game.” 0 FPS, 30 June 2012, <https://0fps.net/2012/06/30/meshing-in-a-minecraft-game/>. [^tjunctions]: blackflux. “Meshing in Voxel Engines – Part 1.” Blackflux.Com, 23 Feb. 2014, <https://blackflux.wordpress.com/2014/02/23/meshing-in-voxel-engines-part-1/>. I am also especially grateful to Khronos, Wikiepdia, and stackoverflow for answering many of my specific questions while writing the MR. --- Squashed commit of the following: commit 300505e7305a2fdac722a808ee8538323f215f39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 18:46:25 2020 +0200 Fixing cargo doc and typo in CHANGELOG. commit ec0aeb18e8499d7d84ef818331b4b65c3d76cea6 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 15:38:50 2020 +0200 Hopefully final commit for the LOD branch. commit 5e8ea0b1eaac02903a02feb2eb038d195de4872f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 10:14:26 2020 +0200 Falling back to power as stopgap. commit e44a1cbf46504ee9931a01bdc9033e145500d557 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 09:25:41 2020 +0200 Address imbris feedback. Temporarily disables shiny water, lowers max VD. These restrictions will be lifted soon after merging. commit 561e25778a108ac3712f5ec2ce3a51234c4430d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 08:31:13 2020 +0200 Tweaking shaders a bit. commit 7d19259078ce0dd7b3742ad7d0cb3fab3ece3fdc Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:59:43 2020 +0200 Fix view example as well. commit 051cd4934e0fad2c0b15db4380a4189fa318679f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:29:06 2020 +0200 Fix meshing benchmark. commit c95e07db3b4dcca285678985e65e31b927cb1c61 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 05:46:22 2020 +0200 Address MR feedback, fix scene clouds. commit 1bfb816cabdb3ffc1e507a009c2d98696b4b573a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:39:36 2020 +0200 Incorporating Pfau's figure color changes. New eyes and new humanoid colors. commit 3f9b89a3ac7b3356b1dba0d1a8f6541357f81469 Merge: e2f5162e4 62c53963a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:29:41 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit e2f5162e4f96f4124aa43488f7245d341b3dcfd4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:28:38 2020 +0200 World colors are all hotloadable. They live in assets/world/style/colors.ron. Only a small handful of hardcoed colors remain in World; they are either part of the map, or difficult to disentangle from the rest of the computation. Comments are made where appropriate. commit 62c53963abe1975009d34a8f9515a355bef24f31 Author: Marcel Märtens <marcel.cochem@googlemail.com> Date: Wed Aug 19 15:59:00 2020 +0200 replace pretty_env_logger with tracing commit 5b1625f99d9586fe80e2232f583ec5af9f953099 Merge: d71003acd 4942b5b39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:15:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit d71003acdabeff970b3928e97c26af6847b5b78e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:14:34 2020 +0200 Hotloading colors, part 1: colors in common. Currently, this just entails humanoid colors. There are only three colors not handled; the light emitter colors in common/src/comp/inventory/item/tool.rs. These don't seem important enough to me to warrant making hotloadable, at least not right now, but if it's needed later we can always add them to the file. commit 63b5e0e553eb2ea49276f192a6fc7dd65254270d Merge: c32b337a4 6d2c4b9c1 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 13:05:37 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c32b337a46e10d9de473d178a94a3ccd61c39bb3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:52:04 2020 +0200 Fixing LOD grid, for real. commit a166ae0360395387e09fb35a1f84210c2ce5ec24 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:28:05 2020 +0200 Addressing imbris's initial feedback. Fixes two minor bugs: explosion particles were no longer spawning randomly, and LOD grids were not perfectly even. commit 4cbad004f44060994252dd3d38647a14a589712f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:27:58 2020 +0200 Bumping nightly per request. commit 548680276aac77c25d43d16b5622f847d474dbef Merge: acc098604 8f8b20c91 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:26:06 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit acc0986040589a3492f88a740bc3c3fc693b26d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:28:32 2020 +0200 Lower resolution due to lying drivers. commit d3b878de2a52c358d2944a6bbd0555dad7fbdb10 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:15:38 2020 +0200 Fix issues msh encountered with Intel 4600. commit 10245e0c1b0cb6fae10d86409435364edc6102ef Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 21:15:02 2020 +0200 Merge more models into one mesh than we did previously. commit 3155c31e663c52ae5c3a53d5fb5665892a1a498a Merge: 7204cc8a7 3c199280e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:35:22 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7204cc8a7a4f74a30306bd205d9834fee4bb944f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:34:43 2020 +0200 Fix not yet done NPC animations. This forces them all to be the idle animation if not specified. This fixes issues where you'd have giant NPCs in water. commit bc83360f2a08918f19d417b5f772e1ff554dba08 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 19:36:37 2020 +0200 Try to fix some bugs: - Z fighting with LOD terrain and water. - Audio SFX not playing. commit 1fd104aa603bf3781b6526a5cada46aeca3049dd Merge: 862df3c99 7c2c392a3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 12:02:31 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 862df3c9976c4da9bd7cfd784f1a85973127968a Merge: 0a4218ed9 75c1d4401 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 05:52:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0a4218ed9d541a2b34c133351bea38a99ddf4ea7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 22:27:14 2020 +0200 Fix particle depth. commit f51dfdeb442d0dd5243dd2f344fa4be295bd0875 Merge: c6251a956 5e6dc0471 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:19:04 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit c6251a956ad376400dca5c23420cf8d213dc8fdf Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:15:46 2020 +0200 Cache figures more intelligently. Cache figures for longer, and don't cache character states for the player except where they actually affect the rendered model. commit 0ed801d5404982c6fb63b1eaa4567d908b294c9d Merge: c11b9bdf0 eea64f78f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 16:32:24 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c11b9bdf0a53bf9884d2f5a48fec9b01d582df1a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 11:47:15 2020 +0200 Remove unneeded Clippy annotation. commit 16aa9ef40af56d69289d00aafb3deadfb8bd4f35 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 8 00:53:02 2020 +0200 Fix hotloading and Clippy. commit 3dc973e0be5b758da1e9805eb764ad401374cd0c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 23:50:27 2020 +0200 Major speedups with SIMD. commit fba64a7d93d5a96077ce87287bbce6ab9b7fbcae Merge: 76429d00e d1e10b178 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:19 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 76429d00eea00d212fbd672a84ee91e75b19b938 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:10 2020 +0200 Add clippy.toml. commit c79f512f84dbb83cb82b7954db68ff241dfd8e41 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 11:55:20 2020 +0200 Fix all clippy issues, clean up Rust code. commit 6f90e010b3fbefb53b0d632e819931350015b6b8 Merge: 77a8c7c26 5929cfa5c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:30 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 77a8c7c267d3f44a1a62bd6b2274359973c5e4d4 Merge: b44e44232 44febaabd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:10 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 5929cfa5c713aa392110bbb62407f76caf53c3df Author: jshipsey <jshipsey18@gmail.com> Date: Thu Aug 6 20:47:27 2020 -0400 fixed in-hand arrow bug commit b44e442325d828f1cd564d66908f89d09e80474b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 6 13:40:35 2020 +0200 Miscellaneous performance improvements. commit be37acf287c1360d8085862526ac3365ffd1d768 Merge: 125d7fc6c c11876547 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 05:49:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 125d7fc6c4dcd8c8c5f27b8268a4d64f409f3644 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 04:55:31 2020 +0200 Abstract over simd vs. repr_c vectors. Also some minor improvements to Event size. commit d4d4956e9252e1241ce110b2aa85076c6b1e2a23 Merge: 5f3b7294a aced5f979 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:56:54 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 5f3b7294af1f8533edc2620b58863c248e2b07af Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:43:52 2020 +0200 Fix formatting issues I missed before. commit a428a3ebba70dcab63dd0f8cd983120c90617271 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:41:51 2020 +0200 Fix clippy warnings, part 1. There aer still a bunch of type too complex and function takes too many arguments warnings that I'll fix later (or ignore, since in the one case I did fix a function takes too many arguments warning I think it made the code *less* readable). commit ba54307540ed8a937ac08209730284fc653af85b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 30 13:22:42 2020 +0200 Fix light animations so they are removed when the light turns off. commit 7e0f4bcbf0f4717145d8beac40d52e3acebbe2aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 21:10:20 2020 +0200 Fix crash in edge case for pixel art. commit 56da06f7a351e2b949e9b014a90b974d511a0924 Merge: cf74d55f2 9f53a4a19 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:56:52 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:29:52 2020 +0200 Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). The first concern was addressed by fixing the dimensions of the map images drawn from the UI (so that we always use a square source rectangle, rather than a rectangular one according to the dimensions of the map). We also fixed the way rotation was done in the fragment shader for north-facing sources to make it properly handle aspect ratio (this was already done for north-facing targets). Together, these fix rendering issues peculiar to rectangular maps. The second and third concerns were jointly addressed by adding an optional border color to every 2D image drawn by the UI. This turns out not to waste extra space even though we hold a full f32 color (to avoid an extra dependency on gfx's PackedColor), since voxel images already take up more space than Optiion<[f32; 4]> requires. This is then implemented automatically using the "border color" wrapping method in the attached sampler. Since this is implemented in graphics hardware, it only works (at least naively) if the actual image bounds match the texture bounds. Therefore, we altered the way the graphics cache stores images with a border color to guarantee that they are always in their own texture, whose size exactly matches their extent. Since the easiest currently exposed way to set a border color is to do so for an immutable texture, we went a bit further and added a new "immutable" texture storage type used for these cases; currently, it is always and automatically used only when there is a specified border color, but in theory there's no reason we couldn't provide immutable-only images that use the default wrapping mdoe (though clamp to border is admittedly not a great default). To fix the maps case specifically, we set the border color to a translucent version of the ocean border color. This may need tweaking going forward, which shouldn't be hard. As part of this process, we had to modify graphics replacement to make sure immutable images are *removed* when invalidated, rather than just having a validity flag unset (this is normally done by the UI to try to reuse allocations in place if images are updated in benign ways, since the texture atlases used for Ui do not support deallocation; currently this is only used for item images, so there should be no overlap with immutable image replacement, so this was purely precautionary). Since we were already touching the relevant code, we also updated the image dependency to a newer version that provides more ways to avoid allocations, and made a few other changes that should hopefully eliminate redundant most of the intermediate buffer allocations we were performing for what should be zero-cost conversions. This may slightly improve performance in some cases. commit ad18ce939940a8c697270f6e9b94db9942fd8295 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 13:21:09 2020 +0200 Fix continent scale hack. commit 36b1cb074f5b195aebd7dbbc3da7f0246a1a18ec Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 12:11:40 2020 +0200 Enable loading different sized maps without a recompile. We may want to tweak the effects of the continent_scale_hack. commit 13b6d4d534cc4814b7cb3294ca41bbfea0a6b186 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 10:55:48 2020 +0200 Removing WORLD_SIZE, part 1. Erased almost every instance of WORLD_SIZE and replaced it with a local power of two, map_size_lg (which respects certain invariants; see common/src/terrain/map.rs for more details about MapSizeLg). This also means we can avoid a dependency on the world crate from client, as desired. Now that the rest of the code is not expecting a fixed WORLD_SIZE, the next step is to arrange for maps to store their world size, and to use that world size as a basis prior to loading the map (as well, probably, as prior to configuring some of the noise functions). commit 30b1d2c6428230a9eaa0d749cdcbbd6f1cbccd78 Merge: 7d56ba31b 1377b369f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:58 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 7d56ba31b445441461b28a07fc495d7d4f047c17 Merge: 2101113b4 598f14b25 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 1377b369f6db2258e910d467a5740f31789e3ded Author: Monty Marz <m.marzouq@gmx.de> Date: Sun Jul 19 23:25:38 2020 +0200 more saturated pumpkins commit ae8d50527f93bb0616c2ad46ce4dacb63bc37c6d Author: Monty Marz <m.marzouq@gmx.de> Date: Sat Jul 18 20:29:56 2020 +0200 acacia models commit 2101113b467e691de787392d7f20f1745f5637bd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 18 18:55:25 2020 +0200 Higher detail LOD. commit add2cfae04b4385fa5590e11e2bd5229d9dee0aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 16 01:57:39 2020 +0200 Revert some irrelevant stuff. commit 2e2ab3dc1eaa59a4aef7f8d34a53d8aae4c8553a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 15 13:30:49 2020 +0200 Fixing various things about shadows. * Correcting optimal LISPSM parameter. * Figure shadows are cast when they're not visible. * Chunk shadows stay cast until you look away. * Seamless cubemaps for point lights. * Etc. commit 6c31e6b56217274285b597af297036691ea5d897 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 19:50:26 2020 +0200 Fix shadow creation. commit 6332cbe006115ae205597529cd8bbccd146c2cca Merge: be438657c 930e0028b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:47:00 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit be438657c33d7b5bfb0a9582c3ed3fd366637323 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:28:08 2020 +0200 Tweaks to shadows. Added shadow map resolution configuration, added seamless cubemaps, documented all existing rendering options, and fixed a few Clippy errors. commit 23b4058906013c7d2a40c286e20e32c5fbd897ed Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 10:11:19 2020 +0200 Fix moon, use nonlinear noise for terrain. Note that the latter has a bit of performance cost. commit 7fbe5cbfbb9dc29607957b8e62f432a4deed193d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:23:02 2020 +0200 Address lies about max texture size. commit bcfc62b5e13a1cdd83f57535fde4694720bebfd9 Merge: 75e3626a7 18a08e8fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:22:08 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 75e3626a785919f43fdcf2127c2b10e3e4df2f9f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:21:52 2020 +0200 OpenGL 3.3 minimum. commit 18a08e8fe2739f02af99a5d2cb4e7c38c49e858b Author: Monty Marz <m.marzouq@gmx.de> Date: Tue Jul 7 23:57:52 2020 +0200 settings localization commit 90c5d1ca3620092bc3ae10b2211489eb1cf6f5e8 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 21:11:48 2020 +0200 Lower near distance. commit 0e66f02b25aaddaa2dfddbbc89cd67de54a9a7b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 20:09:01 2020 +0200 All sprites sway in the wind now. commit db1401a6910bf42dcf502462c90038752ff5fbdb Merge: 69e508d8c e8b4b29d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 19:34:17 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 69e508d8c94d8973033817ca86f357e466fc7c4d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 18:41:37 2020 +0200 Make it easy to switch to SIMD for math. commit ffe0f5928c7a7e87d00cb5426b3b1d831d7e02fd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 21:21:12 2020 +0200 Fix some issues with underwater rendering. commit bfda6da42f38fd02c31ee92c81ab785a3e50c2a0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 19:17:59 2020 +0200 Fix some minor display issues. commit 0ed752e087968cf901301884aaeae698e32ef8a5 Merge: ccc6a06a8 518edcb85 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:14:21 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit ccc6a06a8d4504d6b9f7af7905a414d2ee06ab76 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:04:34 2020 +0200 Some minor changes. commit 4e020246702889269efe1a191788992164c508d6 Merge: 50a64d927 e05c9267a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 16:17:40 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 50a64d927e6c4f4b0e4688e4cbfca694bc3f922a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 13:07:03 2020 +0200 Fix far plane. commit 7dd06da34cae8f9ea3b6c889fe965181f3fd3949 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:25:35 2020 +0200 Add shadows.glsl. commit 618a18c998778bf871b905a74657440fcc384c80 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:10:22 2020 +0200 Adding shadows, greedy meshing, and more. commit eaea83fe6a5cb1cb0ba8beef888183c718258496 Merge: 267018495 2f89b863e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 22:47:07 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 2670184954a13e4a9e7a4e35ba79aac0c5fac2f7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 21:20:01 2020 +0200 Make civsim and sites deterministic. For anything in worldgen where you use a HashMap, *please* think carefully about which hasher you are going to use! This is especially true if (for some reason) you are depending on hashmap iteration order remaining stable for some aspect of worldgen. commit f8376fd5dc72b4a9c2f51a6b4570d59c8b8e9343 Merge: 654f7e049 cdee191dd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 17:53:57 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 654f7e049258d9da27c09608bbe6a46ffa8787e5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed May 20 21:22:30 2020 +0200 Correct backface culling. commit 560501df05ca725409b0f2e4eb31bdfdc15fd0c7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue May 19 17:22:06 2020 +0200 Greedy messhing for shadows. commit a4d87e1875ca543436e6bbbeb20348facc5a52d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun May 17 05:59:00 2020 +0200 Shadow maps work for lantern. commit 243d0837b8a3b08172c9a3c348d964d7ddc2a0a8 Merge: 04382dc28 71dd520cd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:53:13 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 04382dc28632b6c66e8821f6870c0daaa1c1901a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:22:17 2020 +0200 WIP: better graphics config, better LOD, shadow maps. commit 22ddbad3eb32bfa70f0932176022208fe67ded81 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 18:54:09 2020 +0200 Minor shader fixes. commit 746a10e8d01ac235f994b0cde78fa48998602a1f Merge: 0f4a0e763 40ab94673 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 04:02:09 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0f4a0e763db3afbdc4fb0558611f38326ca87151 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 23:03:24 2020 +0200 Switch back to pop-in terrain. commit dd74fa7e4a53667b38811d7aec58d7f6a68889bb Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 22:58:55 2020 +0200 LOD shading closer to voxel shading. commit ef67bd58ba0bdaf622b078892d768263b6cba268 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 28 20:49:03 2020 +0200 Experimental underwater lighting. commit 2c5ad9d07605e80d5fd5679dd3a5d70c605b86a9 Merge: 748279835 303967a6f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 22:35:24 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7482798354eda18c8207950080fc24d443a369de Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 21:59:55 2020 +0200 Replace discard in figure-frag. commit d83b4ae69be4912f69bf7835f509c68a1c7770a4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:45:57 2020 +0200 Fix sprite lighting, HDR from focus_pos. commit 0594238004f116274905fa0ed7c2b6c417ed1d29 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:14:10 2020 +0200 Proper HDR from point lights. commit 48c93d2b41ce5743103d18e76cc228f5ac766492 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 14:01:43 2020 +0200 Brighter ambiance, darker LOD shadows. commit e0452e895ccfa8a43f368cae3b8b8aedc24dad93 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 13:13:23 2020 +0200 More proper HDR. commit 4c6da3ed16cfeebb455e40da5f557b4af9a499d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 00:13:10 2020 +0200 Trying LOD noise. commit 682a3d74c85df5503ffe1fc1cc891bce789df1ad Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 23:11:08 2020 +0200 Fix LOD heights in towns. commit cc39e5734e8b18f9077bf42e66337c1319dd6b6e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 21:01:23 2020 +0200 More LOD fixes. commit 8116b21c2e51c836e77894e309ac273caf2917b3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:54:43 2020 +0200 I like this coloring. commit bc2560ea90b36f4b46190005344232d993043ac3 Merge: 14effdd5d e690efe71 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:48:33 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 14effdd5db8747fcf3eb34f03b46b7792e92d1c5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:24:35 2020 +0200 Re-saturate. commit 48a643955d4435b78179acba0beb4a979905cc31 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:23:57 2020 +0200 Various fixes. commit f7b497a0c25f4ad4682c71dd1ed6f608052feb9b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 03:22:49 2020 +0200 Render figures again. commit 44e4aad48deba8266b9f8bdfd3db096b381f5327 Merge: e6f0a5a98 9ec319a18 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 02:01:04 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit e6f0a5a981a82533ba188fff0a54ce98577bb152 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 24 16:12:20 2020 +0200 Add atmospheric scattering. commit f2953087f691a8edbc001cb98ebf5059fc6f8ac0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 23 00:01:20 2020 +0200 Fix shadowing for specular reflections. commit ddd4a67a9799b8d08c7dc0c2bec90621c2bed0e3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Apr 22 22:56:12 2020 +0200 HDR fixes. commit 1015e60deef3c447381996277df7496707a63bd0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 21 18:25:19 2020 +0200 More lighting changes. commit 80c264abd111fb237e57843efcb5c071d4f84613 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 13 00:29:59 2020 +0200 Lighting experiments. commit 8414987e589dd5102bad89762a3adaccc0bfe957 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 9 02:38:40 2020 +0200 WIP -- lighting changes and soft shadows. commit 9cd2b3fb0d6b49776c6dfe463e4169637250b11a Merge: c7ea687eb 8b149ad11 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:29 2020 +0200 Merge branch 'sharp/new-lighting' into sharp/small-fixes commit c7ea687ebbc5aace1b455f134a5bf49ce2c7434a Merge: 476441531 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:02 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 8b149ad11ad4bb75018fcf9519baec27d1c95951 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:32:39 2020 +0200 Trying out a new lighting model. commit b0ac9f36f755dd06f7c17c46150568064790864f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 07:56:11 2020 +0200 Use bicubic interpolation for terrain. commit f6fc9307a121514b614bc50ef8eb055953e7da8a Merge: 33140a295 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 05:01:41 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 4764415312aae6e9ac2d00e86e84577cb958f1ab Merge: ed2d0111d 13388ee6a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 04:54:48 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 13388ee6a42943f3f79a9cb488346cef18e272fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 20:30:08 2020 +0200 Various fixes (to coloring and to soft shadows). commit fbd084a94a067082a87cd6d28b82054709bc9265 Merge: 5a089863b 4fdf6896a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 18:50:38 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/map-colors commit ed2d0111d994262ae836d84d1fe5a45e4de72a0b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 06:49:27 2020 +0200 Combining colors and LOD. commit 88342640c6b835114d01c797b89fdede3b0a2108 Merge: 33140a295 5a089863b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:49:20 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 33140a2951b8212725f42c758b277aaec4d888f7 Merge: 4c65a5aed f34d4b379 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:36:21 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 5a089863beb01d4794bbe3580ada47b278715ea2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 03:17:49 2020 +0200 Making maps brighter. This is probably not the right way to do it, but oh well! commit 32b2c99109dd486aa922886081068f9c550c83f2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 02:46:36 2020 +0200 Horizon mapping and "layered" map generation. Horizon mapping is a method of shadow mapping specific to height maps. It can handle any angle between 0 and 90 degrees from the ground, as long as know the horizontal direction in advance, by remembering only a single angle (the "horizon angle" of the shadow map). More is explained in common/src/msg/server.rs. We also remember the approximate height of the largest occluder, to try to be able to generate soft shadows and create a vertical position where the shadows can't go higher. Additionally, map generation has been reworked. Instead of computing everything from explicit samples, we pass in sampling functions that return exactly what the map generator needs. This allows us to cleanly separate the way we sample things like altitudes and colors from the map generation process. We exploit this to generate maps *partially* on the server (with colors and rivers, but not shading). We can then send the partially completed map to the client, which can combine it with shadow information to generate the final map. This is useful for two reasons: first, it makes sure the client can apply shadow information by itself, and second, it lets us pass the unshaded map for use with level of detail functionality. For similar reasons, river generation is split out into its own layer, but for now we opt to still generate rivers on the server (since the river wire format is more complicated to compress and may require some extra work to make sure we have enough precision to draw rivers well enough for LoD). Finally, the mostly ad-hoc lighting we were performing has been (mostly) replaced with explicit Phong reflection shading (including specular highlights). Regularizing this seems useful and helps clarify the "meaning" of the various light intensities, and helps us keep a more physically plausible basis. However, its interaction with soft shadows is still imperfect, and it's not yet clear to me what we need to do to turn this into something useful for LoD. commit f8926a5737ddc51f3d585c651a64c43677aae0f4 Merge: a1aee931e 875ae6ced Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Mar 13 13:32:42 2020 +0100 Merge remote-tracking branch 'origin/master' into sharp/map-colors commit 4c65a5aed353b119aea65a2aaeb94549b67beb42 Author: Treeco <5021038-Treeco@users.noreply.gitlab.com> Date: Mon Feb 24 16:48:05 2020 +0000 Made LOD setting slider exponential commit 2fa7b2d20d7233dc8bfd64f9f7f54617575248f1 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 17:49:53 2020 +0000 Added mist to LoD commit aab059a450b5f635777129ff82cc15b662965c3c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 15:14:06 2020 +0000 Added LoD slider commit 779c36b538121c5ade3633ae5cb67bb14c8c3877 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:54:55 2020 +0000 Reduced cost of vertex pushing commit 9fea150473906b166365b738ebcea07c697daf3d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:38:53 2020 +0000 Fixed maths, improved LoD resolution commit 5481df38fea5bf183ff376a3337179cfaa5233dc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 11:22:50 2020 +0000 Dynamically relocate LoD vertices to enhance details commit a3e36a50ababd615da7db1b26158c7906a5def01 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 18:13:51 2020 +0000 Simpler terrain spiral rendering commit 255f450ae9ac8763db4bede075fb409161ed57cc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:53:17 2020 +0000 Better LoD precision commit 3d027aebe812a5b8658a4eb8123dc9f61b3776d2 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:04:03 2020 +0000 Better falloff commit be775c9484b457b2c0b1a494aec03392d0c70e76 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 15:30:45 2020 +0000 Applied good ideas from experimental branch commit 58587b68545a23c5c04ab4574a4b94b3bc982246 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 16:15:13 2020 +0000 Minor fixes to LoD merging commit 7b42aebd709c14df2db766aad61d9280ad24d84d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 15:04:44 2020 +0000 Capped LoD dragging commit 8aafc559f87124e1ea5ca6e3ddc2aa0c242d793c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:54:37 2020 +0000 Better blending between LoD and terrain border commit edd3455d5161792d87ddc8eadc0ecbad5532b284 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:40:19 2020 +0000 Fixed LoD z depth, added sea level offset commit b9b06744620114dd5556e73f64fa93c145503a7c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:27:43 2020 +0000 Better LoD smoothing commit a1aee931e790431560cd2d953ad61d9497072afd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Feb 21 14:52:17 2020 +0100 Adding shadows. commit 2400786c13dd891c131ed86d48d05df516a8a778 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 13:48:40 2020 +0000 Use world map as LoD source commit dbf650f504a4c25fbbc2096ac3616c736bf52d23 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Jan 20 00:48:14 2020 +0000 Better clouds at distance commit 5e6f81b86cdb9730b9b056877b19257075fd5fa8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Jan 19 23:59:02 2020 +0000 sync commit 745e7540ddb000cc645f612767b337c2ddc3f7c0 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 12:40:48 2019 +0000 Improved cloud falloff mist, faster noise sampling commit f6a200d0cb866196ba57697466755f9e0c7ea5d8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 10:09:00 2019 +0000 Improved long-range depth precision, removed unnecessary LoD polygons commit 63d1b2bb2292898d59fb4f4e502201103dfeb86f Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 20:57:46 2019 +0000 Working LoD shader commit f13d98ee3e58f881e8b978861a67663b59ed91ec Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 11:03:40 2019 +0000 LoD first attempt (stack overflow issue)
2020-08-20 18:34:59 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "72957246c41db82b8ef88a5486143830adeb8227ef9837740bdec67724cf2c5b"
Update winit and iced
2021-01-23 06:06:15 +00:00
dependencies = [
"bytemuck_derive",
]
[[package]]
name = "bytemuck_derive"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e215f8c2f9f79cb53c8335e687ffd07d5bfcb6fe5fc80723762d0be46e7cc54"
dependencies = [
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"proc-macro2 1.0.32",
"quote 1.0.10",
"syn 1.0.81",
Update winit and iced
2021-01-23 06:06:15 +00:00
]
(See sharp/lod-history) LOD, shadows, greedy meshing, new lighting, perf --- Pretty much a Veloren fork at this point. Here's a high level overview of the changes (will be added to CHANGELOG just before merge). At a high level this MR incorporates roughly two groups of changes. The first group consists of new game features: more flexible map sizes, level of detail terrain, shadow maps, and a new lighting engine. This is "feature work" that (mostly) only adds new things to Veloren, and mostly shouldn't affect old stuff. The second big group of changes are those addressing the fallout from all the new features. These include performance fixes of various sorts: the addition of multiple graphics options and optimization of the cheap ones to avoid work, switching all voxel models to use some variant of greedy meshing, switching over much of our CPU-side vector math to exploit SIMD instructions (coinciding with a fork of `vek`), and a rewrite of how the UI handles text rendering (coinciding with updates to our fork of `conrod`). Making Veloren's hardcoded colors appear correct under the new lighting engine also required considerably changes (TODO: Fill in this section when it's complete). The second category of changes often heavily touches code owned by other people, including frequently modified code "owned" by a handful of people, so I recommend that this code be reviewed particularly carefully. --- At a high level (each will be described in more detail below): - The world map has been refactored. - The world size is no longer hardcoded (@zesterer). - The map generation code was made generic to allow using it outside of the `world` crate (@zesterer). - On world creation, we now compute *horizon maps* (@zesterer). - The way we pass the world from the server to the client has been updated (@xMAC94x). - Artifacts related to image rotation were fixed (@imbris). - Multiflow rivers were enabled (@zesterer). - In the process of making changes related to the world map, various incidental fixes and optimizations were required. - The new *level of detail* feature was added (@zesterer wrote part of this and has checked out the rest). - A new LOD terrain rendering step was added to the pipeline. - The LOD terrain quality was made configurable via a graphics setting. - Horizon maps were used to cast shadows from LOD chunks on both LOD and non-LOD terrain. - A "voxelization" effect was incorporated into rendered LOD terrain to make it blend better into the world. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Veloren's lighting has been completely overhauled (@zesterer has already checked most of this out). - A semi-accurate index of refraction was assigned to our materials. - A new, more realistic, physically based approach to lighting was used using the *Ashikhmin Shirley* BRDF. - We emulate *atmospheric scattering* using equations designed for measuring solar panel light exposure. - We attempt to compute *realistic light attenuation* in water using its real material properties. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Point and directional lights now cast realistic shadows, using *shadow mapping.* (@imbris, @zesterer, @Treeco, @YuriMomo) - Point light shadow maps were added to the rendering pipeline, using geometry shaders and *seamless cube maps*. - Directional light shadows were added to the rendering pipeline, using LISPSM together with disabling *depth clamping*. - "Shadow-only" chunks and NPCs were added to prevent shadows from models behind you from disappearing. - In the process of making changes related to shadow maps, various incidental fixes and optimizations were required. The addition of shadow maps, LOD terrain, and the new lighting all led to significant performance degradation, on top of other changes happening in master. Therefore, a large number of performance improvements were also needed: - The graphics options were made much more flexible and configurable, and shaders were optimize. - New options were provided for how to render lights and shadows (@Pfauenauge, @zesterer). - Graphic setting storage and configuration were overhauled to make adding new features easier (@Pfauenauge, @imbris). - Shaders were rewritten to utilize GLSL's preprocessor to avoid overhead (@zesterer, @YuriMomo). - In the process of making changes related to providing additional rendering options, various incidental fixes and optimizations were required. - Voxel model creation was switched to use *greedy meshing.* - A new voxel meshing method, greedy meshing, was added (@imbris). - Uses of the older meshing methods were migrated to use greedy meshing (@imbris, @jshipsey, @Pfauenauge). - New restrictions were added to terrain, figure, and sprites to future proof them for further optimizations (@jshipsey, @Pfauenauge, @zesterer). - Most positions are now relative to either chunk or player position for better precision (@imbris, @zesterer, @scottc). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - Animation and terrain math were switched to use SIMD where possible. - Fixes were made to vek to make its SIMD feature usable for us (@zesterer, @imbris). - The interface and types used in bone animation were changed in various ways (@jshipsey, @Snowram, @Pfauenauge). - Redundant code generation for body animation is now partly taken care of by a macro (@jshipsey, @Snowram, @Pfauenauge). - Animation code was modified to to use vek's SIMD representation where possible (@jshipsey, @Snowram, @Pfauenauge). - Terrain meshing code and shadow map math were also modified to use vek's SIMD representation (@imbris). - SIMD instruction generation was enabled (@YuriMomo, @jshipsey, @Snowram, @imbris, @Angelonfira, @xMAC94x). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - The way we cache glyphs was completely refactored, fixed, and optimized. - Our fork of `conrod` was optimized in various ways (@imbris). - Our fork of `conrod` now exposes whether a widget was updated during the current frame (@imbris). - Our use of the glyph cache was rewritten for correctness (@imbris). - A *text cache* was introduced that lets us skip remeshing glyphs that have not changed (@imbris). - Various changes were made to reduce pressure on the glyph cache, with more planned (@imbris, @Pfauenauge). - In the process of making changes related to the glyph cache, various incidental fixes and optimizations were required. - Colors were changed to keep Veloren's look consistent with master. - Some older tree models were brought back (@Pfauenauge). - TODO(@Sharp): All hardcoded colors were extracted and made hotloadable. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Hardcoded colors were fixed to conform to Veloren's style. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Color models were fixed to conform to Veloren's style. A detailed description of the involved changes follows. --- - The world size is no longer hardcoded. All functions dependent on world size now take a `WorldSizeLg`, which holds the base 2 logarithm of each actual world dimension and is guaranteed to maintain certain properties (outlined in `common/src/terrain/map.rs`). Additionally, many utility functions that utilize the world size were moved into `common` as well (mostly `common/src/terrain/mod.rs`). Finally, the world map format was updated in order to store its size explicitly, with a migration path from the old format that should work whenever the old formatted map was a square (practically always). See `world/src/sim/mod.rs` for these changes. - The map generation code was made generic to allow using it outside of the `world` crate. The parts of the map generating code that do not need to query the world were moved over to `common/src/terrain/map.rs`, allowing them to be used from the client without creating a dependency on `world`. The rest of it was turned into helper functions in `world/src/sim/map.rs`, which can be passed as closures to the generic map generation code to complete its construction. This also means that colors are now passed in separately to the map generation function. See <https://veloren.net/devblog-78/> for more details. - On world creation, we now compute *horizon maps*. See the function in `world/src/sim/util.rs`. Given a height map and a plane intersecting that height map, our horizon maps allow us to encode enough information to reconstruct shadows for each point on the height map using only the *horizon angle* (the angle at which the sun starts to become visible). As Veloren's sun only covers one plane, this is sufficient for encoding sun shadows for LOD terrain, by encoding two angles per chunk (one for each 90 degrees the sun covers). We can also use this for the moon, if we want, since the moon follows the same path. Additionally, we store the *height* of the furthest occluder, to try to make the shadows volumetric; so this means 4 bytes in total for each chunk. Support for horizon maps has been merged into the map functionality in common as well. - The way we pass the world from the server to the client has been updated. Rather than passing the prerendered map, we instead pass three maps with values for each chunk; one with the color information, a second with altitude information, and a third with horizon map information. We then reconstruct the map on the client, together with some additional information we send from the server (like the sea level and maximum height). See `common/src/msg/server.rs` for a detailed description of the format of `WorldMapMsg`, and `server/src/libr.rs` and `client/src/lib.rs` for details of the map construction and parsing. - Artifacts related to image rotation were fixed. See the commit message for commit SHA `cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e` for a detailed explanation. This involved changes to shaders, the addition of a new type of graphic (also reflected in the graphic cache) that allows specifying a border color (which automatically makes the associated texture immutable), and some related fixes. I reproduce the first two paragraphs of the MR description as well: ``` Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). ``` - Multiflow rivers were enabled. This does not really need to be part of this MR, and would be easy to revert, but since it seemed to provide a nice improvement it's currently packaged with it. We already computed multiple outflows from each chunk for erosion purposes long before this MR. However, we never modified river rendering to be able to handle this case (just a single downhill river flow is complex enough!) so this was not exposed when deciding which chunks were rivers. Now that - In the process of making changes related to the world map, various incidental fixes and optimizations were required. Some examples of fixes include making sure terrain is never lowered to below sea level (to make the shadow maps report correct values), fixing map altitudes and colors to understand things like cliffs and "block level" coloring (that doesn'te xist on the column level), and fixing a crashbug when rendering images for the UI where source pixels are strongly rectangular. Some examples of related performance fixes include avoiding allocating a fresh vector for all the maps (i.e. copying it over to change the format from `[u32; n]` to `DynamicImage` and then copying again to convert to `RgbaImage`), and instead using the `gfx::memory::slice` function to accomplish the same thing. These sorts of changes are spread all arond the code. This includes the additon of a new scene, `voxygen/src/scene/lod.rs`, a new pipeline `voxygen/src/render/pipeline/lod_terrain.rs`, and new shaders `assets/vxygen/shaders/lod-terrain-vert.glsl` and `assets/vxygen/shaders/lod-terrain-frag.glsl`, as well as associated changes to the renderer in `voxygen/src/render/renderer.rs`. The main idea behind our initial approach to LOD was to take the world data we now get from the server (altitude, color, and horizon mapping). - Some previously computed values were turned into shader uniforms for better prediction on weak processors. (@zesterer) - Calls to power or trig functions were removed or replaced with multiplications, where possible. - After some deliberation - To properly handle sprite "waving" for nearby sprites, We explicitly designed the greedy meshing system with figures and sprites in mind. In both cases, we want to be able to *efficiently* pack many different models into the same texture, especially in cases where we know we will either not be removing any of the grouped-together from the models from the texture, or will remove all of them at once (so they can be packed into some specific subtexture). For sprites, since we know every model in advance and never intend to deallocate them, we currently pack them all as efficiently as possible into one giant tetxure atlas. However, in the future we might opt to pack them slightly less efficiently in exchange for shrinking the sprite vertex size. For figures, we pack all the textures for each *model* into the same atlas. is a global texture atlas used for every sprite, and for figures which is why we have the ability to mesh multiple models to the same texture area (using the simple texture atlas allocator) without requiring intermediate vector allocations. This is accomplished by delaying the time when we actually write the color and light data to the texture until *after* all the model vertices have been meshed; then, we can just allocate the whole color/light array at once, making the atlas we use an exact fit. In computer science-y terms, we accomplish this delay by, after we perform the initial greedy meshing (without texture information), not continuing to create the texture data, but instead constructing a *continuation*--that is, a function that, when called, will execute the rest of the computation. We push this continuation (which in Rust terms is a `FnOnce` closure that takes the `ColLightsInfo` that it is supposed to write to as context) onto a onto a vector resizing. To allow for suspended writes to texture data, Rust pointed out to me that the continuation that would eventually write the color and light data to the texture atlas (the one that is shared by all models sharing the same greedy mesher) would have to *own* whatever data it mshed. Because we often generate the model data to mesh as a temporary in `voxygen/src/load.rs`, the - Matrix multiplications in the shader were reduced for figure data (@zesterer). - Vertex "waves" for fluid data were removed. - Terrain "bending" near edges was removed. - Scaling was fixed to make sure empty space was not introduced in a space previously occupied by a block. It was also changed to take ownership of its voxel data, rather than sharing it, to let it be used with meshing. - Rust's nightly version was bumped in order to use the `array_map` function, which lets us reuse more code between the simple map and `FigureModelCache`. - PositionedGlyph::standalone. --- I tried to cite sources in many cases[^realtime],[^lloyd],[^lispsm],[^pbrt],[^greedy],[^tjunctions] where I needed features from elsewhere but I am particularly grateful for the following resources, esepcially where they have accompanying source code. I linked all of them that are accessible to the public (those that are not were obtained through legal means). [^realtime]: Eisemann, Elmar, Michael Schwarz, Ulf Assarsson, Michael Wimmer. Real-Time Shadows. A K Peters/CRC Press (T&F), 20160419. [^lloyd]: Lloyd,B. 2007. [Logarithmic perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). PhD thesis, University of North Carolina. [^lispsm]: Wimmer, M., Scherzer, D., and Purgathofer, W. 2004. [Light space perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). In Proceedings of Eurographics Symposium on Rendering 2004, pp. 143– 152. [^pbrt]: Pharr, Matt, et al. [http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf](Physically Based Rendering: From Theory to Implementation). Third edition, Morgan Kaufmann Publishers/Elsevier, 2017. [^greedy]: mikolalysenko. “Meshing in a Minecraft Game.” 0 FPS, 30 June 2012, <https://0fps.net/2012/06/30/meshing-in-a-minecraft-game/>. [^tjunctions]: blackflux. “Meshing in Voxel Engines – Part 1.” Blackflux.Com, 23 Feb. 2014, <https://blackflux.wordpress.com/2014/02/23/meshing-in-voxel-engines-part-1/>. I am also especially grateful to Khronos, Wikiepdia, and stackoverflow for answering many of my specific questions while writing the MR. --- Squashed commit of the following: commit 300505e7305a2fdac722a808ee8538323f215f39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 18:46:25 2020 +0200 Fixing cargo doc and typo in CHANGELOG. commit ec0aeb18e8499d7d84ef818331b4b65c3d76cea6 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 15:38:50 2020 +0200 Hopefully final commit for the LOD branch. commit 5e8ea0b1eaac02903a02feb2eb038d195de4872f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 10:14:26 2020 +0200 Falling back to power as stopgap. commit e44a1cbf46504ee9931a01bdc9033e145500d557 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 09:25:41 2020 +0200 Address imbris feedback. Temporarily disables shiny water, lowers max VD. These restrictions will be lifted soon after merging. commit 561e25778a108ac3712f5ec2ce3a51234c4430d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 08:31:13 2020 +0200 Tweaking shaders a bit. commit 7d19259078ce0dd7b3742ad7d0cb3fab3ece3fdc Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:59:43 2020 +0200 Fix view example as well. commit 051cd4934e0fad2c0b15db4380a4189fa318679f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:29:06 2020 +0200 Fix meshing benchmark. commit c95e07db3b4dcca285678985e65e31b927cb1c61 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 05:46:22 2020 +0200 Address MR feedback, fix scene clouds. commit 1bfb816cabdb3ffc1e507a009c2d98696b4b573a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:39:36 2020 +0200 Incorporating Pfau's figure color changes. New eyes and new humanoid colors. commit 3f9b89a3ac7b3356b1dba0d1a8f6541357f81469 Merge: e2f5162e4 62c53963a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:29:41 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit e2f5162e4f96f4124aa43488f7245d341b3dcfd4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:28:38 2020 +0200 World colors are all hotloadable. They live in assets/world/style/colors.ron. Only a small handful of hardcoed colors remain in World; they are either part of the map, or difficult to disentangle from the rest of the computation. Comments are made where appropriate. commit 62c53963abe1975009d34a8f9515a355bef24f31 Author: Marcel Märtens <marcel.cochem@googlemail.com> Date: Wed Aug 19 15:59:00 2020 +0200 replace pretty_env_logger with tracing commit 5b1625f99d9586fe80e2232f583ec5af9f953099 Merge: d71003acd 4942b5b39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:15:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit d71003acdabeff970b3928e97c26af6847b5b78e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:14:34 2020 +0200 Hotloading colors, part 1: colors in common. Currently, this just entails humanoid colors. There are only three colors not handled; the light emitter colors in common/src/comp/inventory/item/tool.rs. These don't seem important enough to me to warrant making hotloadable, at least not right now, but if it's needed later we can always add them to the file. commit 63b5e0e553eb2ea49276f192a6fc7dd65254270d Merge: c32b337a4 6d2c4b9c1 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 13:05:37 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c32b337a46e10d9de473d178a94a3ccd61c39bb3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:52:04 2020 +0200 Fixing LOD grid, for real. commit a166ae0360395387e09fb35a1f84210c2ce5ec24 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:28:05 2020 +0200 Addressing imbris's initial feedback. Fixes two minor bugs: explosion particles were no longer spawning randomly, and LOD grids were not perfectly even. commit 4cbad004f44060994252dd3d38647a14a589712f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:27:58 2020 +0200 Bumping nightly per request. commit 548680276aac77c25d43d16b5622f847d474dbef Merge: acc098604 8f8b20c91 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:26:06 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit acc0986040589a3492f88a740bc3c3fc693b26d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:28:32 2020 +0200 Lower resolution due to lying drivers. commit d3b878de2a52c358d2944a6bbd0555dad7fbdb10 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:15:38 2020 +0200 Fix issues msh encountered with Intel 4600. commit 10245e0c1b0cb6fae10d86409435364edc6102ef Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 21:15:02 2020 +0200 Merge more models into one mesh than we did previously. commit 3155c31e663c52ae5c3a53d5fb5665892a1a498a Merge: 7204cc8a7 3c199280e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:35:22 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7204cc8a7a4f74a30306bd205d9834fee4bb944f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:34:43 2020 +0200 Fix not yet done NPC animations. This forces them all to be the idle animation if not specified. This fixes issues where you'd have giant NPCs in water. commit bc83360f2a08918f19d417b5f772e1ff554dba08 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 19:36:37 2020 +0200 Try to fix some bugs: - Z fighting with LOD terrain and water. - Audio SFX not playing. commit 1fd104aa603bf3781b6526a5cada46aeca3049dd Merge: 862df3c99 7c2c392a3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 12:02:31 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 862df3c9976c4da9bd7cfd784f1a85973127968a Merge: 0a4218ed9 75c1d4401 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 05:52:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0a4218ed9d541a2b34c133351bea38a99ddf4ea7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 22:27:14 2020 +0200 Fix particle depth. commit f51dfdeb442d0dd5243dd2f344fa4be295bd0875 Merge: c6251a956 5e6dc0471 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:19:04 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit c6251a956ad376400dca5c23420cf8d213dc8fdf Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:15:46 2020 +0200 Cache figures more intelligently. Cache figures for longer, and don't cache character states for the player except where they actually affect the rendered model. commit 0ed801d5404982c6fb63b1eaa4567d908b294c9d Merge: c11b9bdf0 eea64f78f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 16:32:24 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c11b9bdf0a53bf9884d2f5a48fec9b01d582df1a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 11:47:15 2020 +0200 Remove unneeded Clippy annotation. commit 16aa9ef40af56d69289d00aafb3deadfb8bd4f35 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 8 00:53:02 2020 +0200 Fix hotloading and Clippy. commit 3dc973e0be5b758da1e9805eb764ad401374cd0c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 23:50:27 2020 +0200 Major speedups with SIMD. commit fba64a7d93d5a96077ce87287bbce6ab9b7fbcae Merge: 76429d00e d1e10b178 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:19 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 76429d00eea00d212fbd672a84ee91e75b19b938 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:10 2020 +0200 Add clippy.toml. commit c79f512f84dbb83cb82b7954db68ff241dfd8e41 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 11:55:20 2020 +0200 Fix all clippy issues, clean up Rust code. commit 6f90e010b3fbefb53b0d632e819931350015b6b8 Merge: 77a8c7c26 5929cfa5c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:30 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 77a8c7c267d3f44a1a62bd6b2274359973c5e4d4 Merge: b44e44232 44febaabd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:10 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 5929cfa5c713aa392110bbb62407f76caf53c3df Author: jshipsey <jshipsey18@gmail.com> Date: Thu Aug 6 20:47:27 2020 -0400 fixed in-hand arrow bug commit b44e442325d828f1cd564d66908f89d09e80474b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 6 13:40:35 2020 +0200 Miscellaneous performance improvements. commit be37acf287c1360d8085862526ac3365ffd1d768 Merge: 125d7fc6c c11876547 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 05:49:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 125d7fc6c4dcd8c8c5f27b8268a4d64f409f3644 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 04:55:31 2020 +0200 Abstract over simd vs. repr_c vectors. Also some minor improvements to Event size. commit d4d4956e9252e1241ce110b2aa85076c6b1e2a23 Merge: 5f3b7294a aced5f979 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:56:54 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 5f3b7294af1f8533edc2620b58863c248e2b07af Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:43:52 2020 +0200 Fix formatting issues I missed before. commit a428a3ebba70dcab63dd0f8cd983120c90617271 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:41:51 2020 +0200 Fix clippy warnings, part 1. There aer still a bunch of type too complex and function takes too many arguments warnings that I'll fix later (or ignore, since in the one case I did fix a function takes too many arguments warning I think it made the code *less* readable). commit ba54307540ed8a937ac08209730284fc653af85b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 30 13:22:42 2020 +0200 Fix light animations so they are removed when the light turns off. commit 7e0f4bcbf0f4717145d8beac40d52e3acebbe2aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 21:10:20 2020 +0200 Fix crash in edge case for pixel art. commit 56da06f7a351e2b949e9b014a90b974d511a0924 Merge: cf74d55f2 9f53a4a19 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:56:52 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:29:52 2020 +0200 Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). The first concern was addressed by fixing the dimensions of the map images drawn from the UI (so that we always use a square source rectangle, rather than a rectangular one according to the dimensions of the map). We also fixed the way rotation was done in the fragment shader for north-facing sources to make it properly handle aspect ratio (this was already done for north-facing targets). Together, these fix rendering issues peculiar to rectangular maps. The second and third concerns were jointly addressed by adding an optional border color to every 2D image drawn by the UI. This turns out not to waste extra space even though we hold a full f32 color (to avoid an extra dependency on gfx's PackedColor), since voxel images already take up more space than Optiion<[f32; 4]> requires. This is then implemented automatically using the "border color" wrapping method in the attached sampler. Since this is implemented in graphics hardware, it only works (at least naively) if the actual image bounds match the texture bounds. Therefore, we altered the way the graphics cache stores images with a border color to guarantee that they are always in their own texture, whose size exactly matches their extent. Since the easiest currently exposed way to set a border color is to do so for an immutable texture, we went a bit further and added a new "immutable" texture storage type used for these cases; currently, it is always and automatically used only when there is a specified border color, but in theory there's no reason we couldn't provide immutable-only images that use the default wrapping mdoe (though clamp to border is admittedly not a great default). To fix the maps case specifically, we set the border color to a translucent version of the ocean border color. This may need tweaking going forward, which shouldn't be hard. As part of this process, we had to modify graphics replacement to make sure immutable images are *removed* when invalidated, rather than just having a validity flag unset (this is normally done by the UI to try to reuse allocations in place if images are updated in benign ways, since the texture atlases used for Ui do not support deallocation; currently this is only used for item images, so there should be no overlap with immutable image replacement, so this was purely precautionary). Since we were already touching the relevant code, we also updated the image dependency to a newer version that provides more ways to avoid allocations, and made a few other changes that should hopefully eliminate redundant most of the intermediate buffer allocations we were performing for what should be zero-cost conversions. This may slightly improve performance in some cases. commit ad18ce939940a8c697270f6e9b94db9942fd8295 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 13:21:09 2020 +0200 Fix continent scale hack. commit 36b1cb074f5b195aebd7dbbc3da7f0246a1a18ec Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 12:11:40 2020 +0200 Enable loading different sized maps without a recompile. We may want to tweak the effects of the continent_scale_hack. commit 13b6d4d534cc4814b7cb3294ca41bbfea0a6b186 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 10:55:48 2020 +0200 Removing WORLD_SIZE, part 1. Erased almost every instance of WORLD_SIZE and replaced it with a local power of two, map_size_lg (which respects certain invariants; see common/src/terrain/map.rs for more details about MapSizeLg). This also means we can avoid a dependency on the world crate from client, as desired. Now that the rest of the code is not expecting a fixed WORLD_SIZE, the next step is to arrange for maps to store their world size, and to use that world size as a basis prior to loading the map (as well, probably, as prior to configuring some of the noise functions). commit 30b1d2c6428230a9eaa0d749cdcbbd6f1cbccd78 Merge: 7d56ba31b 1377b369f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:58 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 7d56ba31b445441461b28a07fc495d7d4f047c17 Merge: 2101113b4 598f14b25 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 1377b369f6db2258e910d467a5740f31789e3ded Author: Monty Marz <m.marzouq@gmx.de> Date: Sun Jul 19 23:25:38 2020 +0200 more saturated pumpkins commit ae8d50527f93bb0616c2ad46ce4dacb63bc37c6d Author: Monty Marz <m.marzouq@gmx.de> Date: Sat Jul 18 20:29:56 2020 +0200 acacia models commit 2101113b467e691de787392d7f20f1745f5637bd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 18 18:55:25 2020 +0200 Higher detail LOD. commit add2cfae04b4385fa5590e11e2bd5229d9dee0aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 16 01:57:39 2020 +0200 Revert some irrelevant stuff. commit 2e2ab3dc1eaa59a4aef7f8d34a53d8aae4c8553a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 15 13:30:49 2020 +0200 Fixing various things about shadows. * Correcting optimal LISPSM parameter. * Figure shadows are cast when they're not visible. * Chunk shadows stay cast until you look away. * Seamless cubemaps for point lights. * Etc. commit 6c31e6b56217274285b597af297036691ea5d897 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 19:50:26 2020 +0200 Fix shadow creation. commit 6332cbe006115ae205597529cd8bbccd146c2cca Merge: be438657c 930e0028b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:47:00 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit be438657c33d7b5bfb0a9582c3ed3fd366637323 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:28:08 2020 +0200 Tweaks to shadows. Added shadow map resolution configuration, added seamless cubemaps, documented all existing rendering options, and fixed a few Clippy errors. commit 23b4058906013c7d2a40c286e20e32c5fbd897ed Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 10:11:19 2020 +0200 Fix moon, use nonlinear noise for terrain. Note that the latter has a bit of performance cost. commit 7fbe5cbfbb9dc29607957b8e62f432a4deed193d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:23:02 2020 +0200 Address lies about max texture size. commit bcfc62b5e13a1cdd83f57535fde4694720bebfd9 Merge: 75e3626a7 18a08e8fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:22:08 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 75e3626a785919f43fdcf2127c2b10e3e4df2f9f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:21:52 2020 +0200 OpenGL 3.3 minimum. commit 18a08e8fe2739f02af99a5d2cb4e7c38c49e858b Author: Monty Marz <m.marzouq@gmx.de> Date: Tue Jul 7 23:57:52 2020 +0200 settings localization commit 90c5d1ca3620092bc3ae10b2211489eb1cf6f5e8 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 21:11:48 2020 +0200 Lower near distance. commit 0e66f02b25aaddaa2dfddbbc89cd67de54a9a7b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 20:09:01 2020 +0200 All sprites sway in the wind now. commit db1401a6910bf42dcf502462c90038752ff5fbdb Merge: 69e508d8c e8b4b29d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 19:34:17 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 69e508d8c94d8973033817ca86f357e466fc7c4d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 18:41:37 2020 +0200 Make it easy to switch to SIMD for math. commit ffe0f5928c7a7e87d00cb5426b3b1d831d7e02fd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 21:21:12 2020 +0200 Fix some issues with underwater rendering. commit bfda6da42f38fd02c31ee92c81ab785a3e50c2a0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 19:17:59 2020 +0200 Fix some minor display issues. commit 0ed752e087968cf901301884aaeae698e32ef8a5 Merge: ccc6a06a8 518edcb85 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:14:21 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit ccc6a06a8d4504d6b9f7af7905a414d2ee06ab76 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:04:34 2020 +0200 Some minor changes. commit 4e020246702889269efe1a191788992164c508d6 Merge: 50a64d927 e05c9267a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 16:17:40 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 50a64d927e6c4f4b0e4688e4cbfca694bc3f922a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 13:07:03 2020 +0200 Fix far plane. commit 7dd06da34cae8f9ea3b6c889fe965181f3fd3949 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:25:35 2020 +0200 Add shadows.glsl. commit 618a18c998778bf871b905a74657440fcc384c80 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:10:22 2020 +0200 Adding shadows, greedy meshing, and more. commit eaea83fe6a5cb1cb0ba8beef888183c718258496 Merge: 267018495 2f89b863e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 22:47:07 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 2670184954a13e4a9e7a4e35ba79aac0c5fac2f7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 21:20:01 2020 +0200 Make civsim and sites deterministic. For anything in worldgen where you use a HashMap, *please* think carefully about which hasher you are going to use! This is especially true if (for some reason) you are depending on hashmap iteration order remaining stable for some aspect of worldgen. commit f8376fd5dc72b4a9c2f51a6b4570d59c8b8e9343 Merge: 654f7e049 cdee191dd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 17:53:57 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 654f7e049258d9da27c09608bbe6a46ffa8787e5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed May 20 21:22:30 2020 +0200 Correct backface culling. commit 560501df05ca725409b0f2e4eb31bdfdc15fd0c7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue May 19 17:22:06 2020 +0200 Greedy messhing for shadows. commit a4d87e1875ca543436e6bbbeb20348facc5a52d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun May 17 05:59:00 2020 +0200 Shadow maps work for lantern. commit 243d0837b8a3b08172c9a3c348d964d7ddc2a0a8 Merge: 04382dc28 71dd520cd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:53:13 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 04382dc28632b6c66e8821f6870c0daaa1c1901a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:22:17 2020 +0200 WIP: better graphics config, better LOD, shadow maps. commit 22ddbad3eb32bfa70f0932176022208fe67ded81 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 18:54:09 2020 +0200 Minor shader fixes. commit 746a10e8d01ac235f994b0cde78fa48998602a1f Merge: 0f4a0e763 40ab94673 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 04:02:09 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0f4a0e763db3afbdc4fb0558611f38326ca87151 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 23:03:24 2020 +0200 Switch back to pop-in terrain. commit dd74fa7e4a53667b38811d7aec58d7f6a68889bb Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 22:58:55 2020 +0200 LOD shading closer to voxel shading. commit ef67bd58ba0bdaf622b078892d768263b6cba268 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 28 20:49:03 2020 +0200 Experimental underwater lighting. commit 2c5ad9d07605e80d5fd5679dd3a5d70c605b86a9 Merge: 748279835 303967a6f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 22:35:24 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7482798354eda18c8207950080fc24d443a369de Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 21:59:55 2020 +0200 Replace discard in figure-frag. commit d83b4ae69be4912f69bf7835f509c68a1c7770a4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:45:57 2020 +0200 Fix sprite lighting, HDR from focus_pos. commit 0594238004f116274905fa0ed7c2b6c417ed1d29 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:14:10 2020 +0200 Proper HDR from point lights. commit 48c93d2b41ce5743103d18e76cc228f5ac766492 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 14:01:43 2020 +0200 Brighter ambiance, darker LOD shadows. commit e0452e895ccfa8a43f368cae3b8b8aedc24dad93 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 13:13:23 2020 +0200 More proper HDR. commit 4c6da3ed16cfeebb455e40da5f557b4af9a499d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 00:13:10 2020 +0200 Trying LOD noise. commit 682a3d74c85df5503ffe1fc1cc891bce789df1ad Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 23:11:08 2020 +0200 Fix LOD heights in towns. commit cc39e5734e8b18f9077bf42e66337c1319dd6b6e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 21:01:23 2020 +0200 More LOD fixes. commit 8116b21c2e51c836e77894e309ac273caf2917b3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:54:43 2020 +0200 I like this coloring. commit bc2560ea90b36f4b46190005344232d993043ac3 Merge: 14effdd5d e690efe71 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:48:33 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 14effdd5db8747fcf3eb34f03b46b7792e92d1c5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:24:35 2020 +0200 Re-saturate. commit 48a643955d4435b78179acba0beb4a979905cc31 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:23:57 2020 +0200 Various fixes. commit f7b497a0c25f4ad4682c71dd1ed6f608052feb9b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 03:22:49 2020 +0200 Render figures again. commit 44e4aad48deba8266b9f8bdfd3db096b381f5327 Merge: e6f0a5a98 9ec319a18 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 02:01:04 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit e6f0a5a981a82533ba188fff0a54ce98577bb152 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 24 16:12:20 2020 +0200 Add atmospheric scattering. commit f2953087f691a8edbc001cb98ebf5059fc6f8ac0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 23 00:01:20 2020 +0200 Fix shadowing for specular reflections. commit ddd4a67a9799b8d08c7dc0c2bec90621c2bed0e3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Apr 22 22:56:12 2020 +0200 HDR fixes. commit 1015e60deef3c447381996277df7496707a63bd0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 21 18:25:19 2020 +0200 More lighting changes. commit 80c264abd111fb237e57843efcb5c071d4f84613 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 13 00:29:59 2020 +0200 Lighting experiments. commit 8414987e589dd5102bad89762a3adaccc0bfe957 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 9 02:38:40 2020 +0200 WIP -- lighting changes and soft shadows. commit 9cd2b3fb0d6b49776c6dfe463e4169637250b11a Merge: c7ea687eb 8b149ad11 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:29 2020 +0200 Merge branch 'sharp/new-lighting' into sharp/small-fixes commit c7ea687ebbc5aace1b455f134a5bf49ce2c7434a Merge: 476441531 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:02 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 8b149ad11ad4bb75018fcf9519baec27d1c95951 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:32:39 2020 +0200 Trying out a new lighting model. commit b0ac9f36f755dd06f7c17c46150568064790864f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 07:56:11 2020 +0200 Use bicubic interpolation for terrain. commit f6fc9307a121514b614bc50ef8eb055953e7da8a Merge: 33140a295 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 05:01:41 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 4764415312aae6e9ac2d00e86e84577cb958f1ab Merge: ed2d0111d 13388ee6a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 04:54:48 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 13388ee6a42943f3f79a9cb488346cef18e272fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 20:30:08 2020 +0200 Various fixes (to coloring and to soft shadows). commit fbd084a94a067082a87cd6d28b82054709bc9265 Merge: 5a089863b 4fdf6896a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 18:50:38 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/map-colors commit ed2d0111d994262ae836d84d1fe5a45e4de72a0b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 06:49:27 2020 +0200 Combining colors and LOD. commit 88342640c6b835114d01c797b89fdede3b0a2108 Merge: 33140a295 5a089863b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:49:20 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 33140a2951b8212725f42c758b277aaec4d888f7 Merge: 4c65a5aed f34d4b379 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:36:21 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 5a089863beb01d4794bbe3580ada47b278715ea2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 03:17:49 2020 +0200 Making maps brighter. This is probably not the right way to do it, but oh well! commit 32b2c99109dd486aa922886081068f9c550c83f2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 02:46:36 2020 +0200 Horizon mapping and "layered" map generation. Horizon mapping is a method of shadow mapping specific to height maps. It can handle any angle between 0 and 90 degrees from the ground, as long as know the horizontal direction in advance, by remembering only a single angle (the "horizon angle" of the shadow map). More is explained in common/src/msg/server.rs. We also remember the approximate height of the largest occluder, to try to be able to generate soft shadows and create a vertical position where the shadows can't go higher. Additionally, map generation has been reworked. Instead of computing everything from explicit samples, we pass in sampling functions that return exactly what the map generator needs. This allows us to cleanly separate the way we sample things like altitudes and colors from the map generation process. We exploit this to generate maps *partially* on the server (with colors and rivers, but not shading). We can then send the partially completed map to the client, which can combine it with shadow information to generate the final map. This is useful for two reasons: first, it makes sure the client can apply shadow information by itself, and second, it lets us pass the unshaded map for use with level of detail functionality. For similar reasons, river generation is split out into its own layer, but for now we opt to still generate rivers on the server (since the river wire format is more complicated to compress and may require some extra work to make sure we have enough precision to draw rivers well enough for LoD). Finally, the mostly ad-hoc lighting we were performing has been (mostly) replaced with explicit Phong reflection shading (including specular highlights). Regularizing this seems useful and helps clarify the "meaning" of the various light intensities, and helps us keep a more physically plausible basis. However, its interaction with soft shadows is still imperfect, and it's not yet clear to me what we need to do to turn this into something useful for LoD. commit f8926a5737ddc51f3d585c651a64c43677aae0f4 Merge: a1aee931e 875ae6ced Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Mar 13 13:32:42 2020 +0100 Merge remote-tracking branch 'origin/master' into sharp/map-colors commit 4c65a5aed353b119aea65a2aaeb94549b67beb42 Author: Treeco <5021038-Treeco@users.noreply.gitlab.com> Date: Mon Feb 24 16:48:05 2020 +0000 Made LOD setting slider exponential commit 2fa7b2d20d7233dc8bfd64f9f7f54617575248f1 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 17:49:53 2020 +0000 Added mist to LoD commit aab059a450b5f635777129ff82cc15b662965c3c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 15:14:06 2020 +0000 Added LoD slider commit 779c36b538121c5ade3633ae5cb67bb14c8c3877 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:54:55 2020 +0000 Reduced cost of vertex pushing commit 9fea150473906b166365b738ebcea07c697daf3d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:38:53 2020 +0000 Fixed maths, improved LoD resolution commit 5481df38fea5bf183ff376a3337179cfaa5233dc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 11:22:50 2020 +0000 Dynamically relocate LoD vertices to enhance details commit a3e36a50ababd615da7db1b26158c7906a5def01 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 18:13:51 2020 +0000 Simpler terrain spiral rendering commit 255f450ae9ac8763db4bede075fb409161ed57cc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:53:17 2020 +0000 Better LoD precision commit 3d027aebe812a5b8658a4eb8123dc9f61b3776d2 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:04:03 2020 +0000 Better falloff commit be775c9484b457b2c0b1a494aec03392d0c70e76 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 15:30:45 2020 +0000 Applied good ideas from experimental branch commit 58587b68545a23c5c04ab4574a4b94b3bc982246 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 16:15:13 2020 +0000 Minor fixes to LoD merging commit 7b42aebd709c14df2db766aad61d9280ad24d84d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 15:04:44 2020 +0000 Capped LoD dragging commit 8aafc559f87124e1ea5ca6e3ddc2aa0c242d793c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:54:37 2020 +0000 Better blending between LoD and terrain border commit edd3455d5161792d87ddc8eadc0ecbad5532b284 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:40:19 2020 +0000 Fixed LoD z depth, added sea level offset commit b9b06744620114dd5556e73f64fa93c145503a7c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:27:43 2020 +0000 Better LoD smoothing commit a1aee931e790431560cd2d953ad61d9497072afd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Feb 21 14:52:17 2020 +0100 Adding shadows. commit 2400786c13dd891c131ed86d48d05df516a8a778 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 13:48:40 2020 +0000 Use world map as LoD source commit dbf650f504a4c25fbbc2096ac3616c736bf52d23 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Jan 20 00:48:14 2020 +0000 Better clouds at distance commit 5e6f81b86cdb9730b9b056877b19257075fd5fa8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Jan 19 23:59:02 2020 +0000 sync commit 745e7540ddb000cc645f612767b337c2ddc3f7c0 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 12:40:48 2019 +0000 Improved cloud falloff mist, faster noise sampling commit f6a200d0cb866196ba57697466755f9e0c7ea5d8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 10:09:00 2019 +0000 Improved long-range depth precision, removed unnecessary LoD polygons commit 63d1b2bb2292898d59fb4f4e502201103dfeb86f Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 20:57:46 2019 +0000 Working LoD shader commit f13d98ee3e58f881e8b978861a67663b59ed91ec Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 11:03:40 2019 +0000 LoD first attempt (stack overflow issue)
2020-08-20 18:34:59 +00:00
first implementation of prometheus in veloren for git hash, tick times, chunks loaded, player online, entity count and light count
2019-09-06 14:21:09 +00:00
[[package]]
switch from hyper http to rouille for http server
2019-09-08 23:59:19 +00:00
name = "byteorder"
update deps
2021-04-10 13:53:00 +00:00
version = "1.4.3"
first implementation of prometheus in veloren for git hash, tick times, chunks loaded, player online, entity count and light count
2019-09-06 14:21:09 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update deps
2021-04-10 13:53:00 +00:00
checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
first implementation of prometheus in veloren for git hash, tick times, chunks loaded, player online, entity count and light count
2019-09-06 14:21:09 +00:00
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
[[package]]
name = "bytes"
update crates
2021-09-20 10:05:41 +00:00
version = "1.1.0"
get rid of `async_std::channel` switch to `tokio` and `async_channel` crate. I wanted to do tokio first, but it doesnt feature Sender::close(), thus i included async_channel Got rid of `futures` and only need `futures_core` and `futures_util`. Tokio does not support `Stream` and `StreamExt` so for now i need to use `tokio-stream`, i think this will go in `std` in the future Created `b2b_close_stream_opened_sender_r` as the shutdown procedure does not need a copy of a Sender, it just need to stop it. Various adjustments, e.g. for `select!` which now requieres a `&mut` for oneshots. Future things to do: - Use some better signalling than oneshot<()> in some cases. - Use a Watch for the Prio propergation (impl. it ofc) - Use Bounded Channels in order to improve performance - adjust tests coding bring tests to work
2021-01-15 13:04:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
fmt
2021-03-05 01:23:11 +00:00
[[package]]
name = "cache-padded"
version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba"
get rid of `async_std::channel` switch to `tokio` and `async_channel` crate. I wanted to do tokio first, but it doesnt feature Sender::close(), thus i included async_channel Got rid of `futures` and only need `futures_core` and `futures_util`. Tokio does not support `Stream` and `StreamExt` so for now i need to use `tokio-stream`, i think this will go in `std` in the future Created `b2b_close_stream_opened_sender_r` as the shutdown procedure does not need a copy of a Sender, it just need to stop it. Various adjustments, e.g. for `select!` which now requieres a `&mut` for oneshots. Future things to do: - Use some better signalling than oneshot<()> in some cases. - Use a Watch for the Prio propergation (impl. it ofc) - Use Bounded Channels in order to improve performance - adjust tests coding bring tests to work
2021-01-15 13:04:32 +00:00
Updated to winit 20
2019-10-26 14:50:01 +00:00
[[package]]
name = "calloop"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
version = "0.6.5"
Updated to winit 20
2019-10-26 14:50:01 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "0b036167e76041694579972c28cf4877b4f92da222560ddb49008937b6a6727c"
Updated to winit 20
2019-10-26 14:50:01 +00:00
dependencies = [
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"log",
"nix 0.18.0",
Updated to winit 20
2019-10-26 14:50:01 +00:00
]
Made the server cli great
2020-07-27 16:26:34 +00:00
[[package]]
name = "cassowary"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
Restarted worldgen Former-commit-id: e1526ec5f865904f11ab6a1507ecdc1a52acb28d
2019-05-21 00:57:16 +00:00
[[package]]
name = "cast"
update depednencies
2021-07-08 10:21:02 +00:00
version = "0.2.7"
Restarted worldgen Former-commit-id: e1526ec5f865904f11ab6a1507ecdc1a52acb28d
2019-05-21 00:57:16 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update depednencies
2021-07-08 10:21:02 +00:00
checksum = "4c24dab4283a142afa2fdca129b80ad2c6284e073930f964c3a1293c225ee39a"
Stop global syncing of entity creation
2019-11-04 00:57:36 +00:00
dependencies = [
update depednencies
2021-07-08 10:21:02 +00:00
"rustc_version 0.4.0",
Stop global syncing of entity creation
2019-11-04 00:57:36 +00:00
]
Restarted worldgen Former-commit-id: e1526ec5f865904f11ab6a1507ecdc1a52acb28d
2019-05-21 00:57:16 +00:00
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "cc"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "1.0.72"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee"
[i18n] Configurable fonts - Add font configuration in internationalization files - Scale font size using a configurable ratio - Add a script to identify translation item statuses using Git metadata - Execute the i18n script in a new gitlab-ci step (delayed) - Clone haxrcorp_4089_cyrillic_altgr font (haxrcorp_4089_cyrillic_altgr_extended) to add some additional latin characters (mainly for French)
2020-01-26 19:29:46 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"jobserver",
[i18n] Configurable fonts - Add font configuration in internationalization files - Scale font size using a configurable ratio - Add a script to identify translation item statuses using Git metadata - Execute the i18n script in a new gitlab-ci step (delayed) - Clone haxrcorp_4089_cyrillic_altgr font (haxrcorp_4089_cyrillic_altgr_extended) to add some additional latin characters (mainly for French)
2020-01-26 19:29:46 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
[[package]]
name = "cesu8"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
Updated toolchain version and a bunch of deps.
2019-09-06 05:16:11 +00:00
[[package]]
name = "cexpr"
Added Controller support
2020-03-10 21:00:13 +00:00
version = "0.4.0"
Updated toolchain version and a bunch of deps.
2019-09-06 05:16:11 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Added Controller support
2020-03-10 21:00:13 +00:00
checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27"
Updated toolchain version and a bunch of deps.
2019-09-06 05:16:11 +00:00
dependencies = [
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"nom 5.1.2",
Updated toolchain version and a bunch of deps.
2019-09-06 05:16:11 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "cfg-if"
Resolving spurious Cargo.lock differences.
2020-01-22 16:17:25 +00:00
version = "0.1.10"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
ci cleanup, dependency update
2020-11-06 13:14:54 +00:00
[[package]]
name = "cfg-if"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
Update to winit 0.21.0
2020-02-08 02:09:56 +00:00
[[package]]
Finished porting all pipelines
2020-09-13 10:03:42 +00:00
name = "cfg_aliases"
version = "0.1.1"
Update to winit 0.21.0
2020-02-08 02:09:56 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Finished porting all pipelines
2020-09-13 10:03:42 +00:00
checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
Update to winit 0.21.0
2020-02-08 02:09:56 +00:00
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "chrono"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
version = "0.4.19"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"num-integer",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"num-traits",
Added non-admin moderators and timed bans. The security model has been updated to reflect this change (for example, moderators cannot revert a ban by an administrator). Ban history is also now recorded in the ban file, and much more information about the ban is stored (whitelists and administrators also have extra information). To support the new information without losing important information, this commit also introduces a new migration path for editable settings (both from legacy to the new format, and between versions). Examples of how to do this correctly, and migrate to new versions of a settings file, are in the settings/ subdirectory. As part of this effort, editable settings have been revamped to guarantee atomic saves (due to the increased amount of information in each file), some latent bugs in networking were fixed, and server-cli has been updated to go through StructOpt for both calls through TUI and argv, greatly simplifying parsing logic.
2021-05-08 18:22:21 +00:00
"serde",
Bump tracing-subscriber to 0.3.2 We were pulling two versions of it. Causing some compilation errors
2021-11-26 17:41:51 +00:00
"time 0.1.44",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"winapi 0.3.9",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
- add Polaris Lantern, created by Gemu and Uncomfy for Christmas
2021-12-11 23:42:15 +00:00
[[package]]
name = "chrono-tz"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "58549f1842da3080ce63002102d5bc954c7bc843d4f47818e642abdc36253552"
dependencies = [
"chrono",
"chrono-tz-build",
"phf",
"serde",
]
[[package]]
name = "chrono-tz-build"
version = "0.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db058d493fb2f65f41861bfed7e3fe6335264a9f0f92710cab5bdf01fef09069"
dependencies = [
"parse-zoneinfo",
"phf",
"phf_codegen",
]
Properly fixed command parsing
2021-07-23 16:33:31 +00:00
[[package]]
name = "chumsky"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d6144914dd4928dc86677ef8824a77cf1a5df915590af7befa0ac8d9815cd740"
Add Linux support
2019-06-19 19:25:08 +00:00
[[package]]
name = "clang-sys"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "1.3.0"
Play random music whenever a track ends To support this, a global_state.maintain() method was added that calls audio.maintain(). Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a
2019-05-18 19:28:12 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "fa66045b9cb23c2e9c1520732030608b02ee07e5cfaa5a521ec15ded7fa24c90"
Play random music whenever a track ends To support this, a global_state.maintain() method was added that calls audio.maintain(). Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a
2019-05-18 19:28:12 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"glob",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"libloading 0.7.2",
Play random music whenever a track ends To support this, a global_state.maintain() method was added that calls audio.maintain(). Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a
2019-05-18 19:28:12 +00:00
]
[[package]]
name = "clap"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
version = "2.33.3"
Play random music whenever a track ends To support this, a global_state.maintain() method was added that calls audio.maintain(). Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a
2019-05-18 19:28:12 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
Play random music whenever a track ends To support this, a global_state.maintain() method was added that calls audio.maintain(). Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a
2019-05-18 19:28:12 +00:00
dependencies = [
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"ansi_term 0.11.0",
Dis some distance and attack arc tweaking
2020-07-03 00:45:30 +00:00
"atty",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"bitflags",
Dis some distance and attack arc tweaking
2020-07-03 00:45:30 +00:00
"strsim 0.8.0",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"textwrap",
"unicode-width",
Dis some distance and attack arc tweaking
2020-07-03 00:45:30 +00:00
"vec_map",
Play random music whenever a track ends To support this, a global_state.maintain() method was added that calls audio.maintain(). Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a
2019-05-18 19:28:12 +00:00
]
WIP (testing) Update conrod_core This is a `cargo update -p conrod_core` to bring in updates to `veloren/conrod/conrod_core` to add support for copy and paste. Ref: veloren/conrod!2 Fixes #171
2019-10-19 06:12:37 +00:00
[[package]]
name = "clipboard-win"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
version = "3.1.1"
WIP (testing) Update conrod_core This is a `cargo update -p conrod_core` to bring in updates to `veloren/conrod/conrod_core` to add support for copy and paste. Ref: veloren/conrod!2 Fixes #171
2019-10-19 06:12:37 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
checksum = "9fdf5e01086b6be750428ba4a40619f847eb2e95756eee84b18e06e5f0b50342"
WIP (testing) Update conrod_core This is a `cargo update -p conrod_core` to bring in updates to `veloren/conrod/conrod_core` to add support for copy and paste. Ref: veloren/conrod!2 Fixes #171
2019-10-19 06:12:37 +00:00
dependencies = [
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"lazy-bytes-cast",
"winapi 0.3.9",
Made boulders avoid rivers
2020-08-29 07:53:42 +00:00
]
Initial setup to use iced
2019-12-15 17:13:52 +00:00
[[package]]
name = "clipboard-win"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "4.2.2"
Initial setup to use iced
2019-12-15 17:13:52 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "3db8340083d28acb43451166543b98c838299b7e0863621be53a338adceea0ed"
Initial setup to use iced
2019-12-15 17:13:52 +00:00
dependencies = [
"error-code",
"str-buf",
"winapi 0.3.9",
]
[[package]]
name = "clipboard_macos"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "145a7f9e9b89453bc0a5e32d166456405d389cea5b578f57f1274b1397588a95"
dependencies = [
"objc",
"objc-foundation",
"objc_id",
]
update deps
2021-04-10 13:53:00 +00:00
[[package]]
name = "clipboard_wayland"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f6364a9f7a66f2ac1a1a098aa1c7f6b686f2496c6ac5e5c0d773445df912747"
dependencies = [
"smithay-clipboard",
]
[[package]]
name = "clipboard_x11"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "64240d63f1883d87e5637bfcaf9d77e5c8bd24e30fd440ea2dff5c48c0bf0b7a"
dependencies = [
"thiserror",
"x11rb",
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "cloudabi"
version = "0.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"bitflags",
Add Linux support
2019-06-19 19:25:08 +00:00
]
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
[[package]]
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
name = "cmake"
Pin cmake crate to 0.1.45, since the newer version uses the --parallel argument which is not available on our CI's cmake version
2021-11-21 14:51:39 +00:00
version = "0.1.45"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Pin cmake crate to 0.1.45, since the newer version uses the --parallel argument which is not available on our CI's cmake version
2021-11-21 14:51:39 +00:00
checksum = "eb6210b637171dfba4cda12e579ac6dc73f5165ad56133e5d72ef3131f320855"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
dependencies = [
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"cc",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
]
Update winit and iced
2021-01-23 06:06:15 +00:00
[[package]]
name = "cocoa"
version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f63902e9223530efb4e26ccd0cf55ec30d592d3b42e21a28defc42a9586e832"
dependencies = [
"bitflags",
"block",
"cocoa-foundation",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"core-foundation 0.9.2",
"core-graphics 0.22.3",
Update winit and iced
2021-01-23 06:06:15 +00:00
"foreign-types",
"libc",
"objc",
]
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
[[package]]
name = "cocoa-foundation"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318"
dependencies = [
"bitflags",
"block",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"core-foundation 0.9.2",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"core-graphics-types",
Winit 0.22 released
2020-03-13 04:05:06 +00:00
"foreign-types",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
Winit 0.22 released
2020-03-13 04:05:06 +00:00
"objc",
]
Almost implement instance merging for sprites (validation error), rebase fix
2021-01-31 03:50:03 +00:00
[[package]]
name = "codespan-reporting"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
dependencies = [
"termcolor",
"unicode-width",
]
get rid of some insecure dependencies
2020-12-16 09:42:36 +00:00
[[package]]
name = "color_quant"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
[[package]]
name = "combine"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "4.6.2"
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "b2b2f5d0ee456f3928812dfc8c6d9a1d592b98678f6d56db9b0cd2b7bc6c8db5"
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
dependencies = [
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
"bytes",
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
"memchr",
fmt
2021-03-05 01:23:11 +00:00
]
[[package]]
name = "concurrent-queue"
version = "1.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3"
dependencies = [
"cache-padded",
get rid of `async_std::channel` switch to `tokio` and `async_channel` crate. I wanted to do tokio first, but it doesnt feature Sender::close(), thus i included async_channel Got rid of `futures` and only need `futures_core` and `futures_util`. Tokio does not support `Stream` and `StreamExt` so for now i need to use `tokio-stream`, i think this will go in `std` in the future Created `b2b_close_stream_opened_sender_r` as the shutdown procedure does not need a copy of a Sender, it just need to stop it. Various adjustments, e.g. for `select!` which now requieres a `&mut` for oneshots. Future things to do: - Use some better signalling than oneshot<()> in some cases. - Use a Watch for the Prio propergation (impl. it ofc) - Use Bounded Channels in order to improve performance - adjust tests coding bring tests to work
2021-01-15 13:04:32 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "conrod_core"
version = "0.63.0"
update conrod core commit to enhance highlight colors
2021-05-22 21:22:12 +00:00
source = "git+https://gitlab.com/veloren/conrod.git?branch=copypasta_0.7#ca9fd429ca7db854e018acc6dcb2cd8abd9e070d"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"conrod_derive",
"copypasta",
"daggy",
"fnv",
"instant",
"num 0.2.1",
"pistoncore-input",
"rusttype 0.7.9",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
[[package]]
name = "conrod_derive"
version = "0.63.0"
update conrod core commit to enhance highlight colors
2021-05-22 21:22:12 +00:00
source = "git+https://gitlab.com/veloren/conrod.git?branch=copypasta_0.7#ca9fd429ca7db854e018acc6dcb2cd8abd9e070d"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"proc-macro2 0.4.30",
"quote 0.6.13",
"syn 0.15.44",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
[[package]]
name = "conrod_winit"
version = "0.63.0"
update conrod core commit to enhance highlight colors
2021-05-22 21:22:12 +00:00
source = "git+https://gitlab.com/veloren/conrod.git?branch=copypasta_0.7#ca9fd429ca7db854e018acc6dcb2cd8abd9e070d"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
Began integrating procgen trees
2021-01-03 20:43:07 +00:00
[[package]]
name = "constant_time_eq"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
Migrate singleplayer save folders to the new location if they have not already been generated
2020-10-10 23:23:41 +00:00
[[package]]
name = "copy_dir"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e4281031634644843bd2f5aa9c48cf98fc48d6b083bd90bb11becf10deaf8b0"
dependencies = [
"walkdir 0.1.8",
]
Started the report of wgpu
2020-08-21 19:10:56 +00:00
[[package]]
name = "copyless"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2df960f5d869b2dd8532793fde43eb5427cceb126c929747a26823ab0eeb536"
WIP (testing) Update conrod_core This is a `cargo update -p conrod_core` to bring in updates to `veloren/conrod/conrod_core` to add support for copy and paste. Ref: veloren/conrod!2 Fixes #171
2019-10-19 06:12:37 +00:00
[[package]]
name = "copypasta"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
version = "0.7.1"
WIP (testing) Update conrod_core This is a `cargo update -p conrod_core` to bring in updates to `veloren/conrod/conrod_core` to add support for copy and paste. Ref: veloren/conrod!2 Fixes #171
2019-10-19 06:12:37 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
checksum = "4423d79fed83ebd9ab81ec21fa97144300a961782158287dc9bf7eddac37ff0b"
WIP (testing) Update conrod_core This is a `cargo update -p conrod_core` to bring in updates to `veloren/conrod/conrod_core` to add support for copy and paste. Ref: veloren/conrod!2 Fixes #171
2019-10-19 06:12:37 +00:00
dependencies = [
Initial setup to use iced
2019-12-15 17:13:52 +00:00
"clipboard-win 3.1.1",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"objc",
"objc-foundation",
"objc_id",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"smithay-clipboard",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"x11-clipboard",
WIP (testing) Update conrod_core This is a `cargo update -p conrod_core` to bring in updates to `veloren/conrod/conrod_core` to add support for copy and paste. Ref: veloren/conrod!2 Fixes #171
2019-10-19 06:12:37 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "core-foundation"
version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
Updated to winit 20
2019-10-26 14:50:01 +00:00
"core-foundation-sys 0.6.2",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
Updated to winit 20
2019-10-26 14:50:01 +00:00
]
[[package]]
name = "core-foundation"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171"
dependencies = [
"core-foundation-sys 0.7.0",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
Update chat-cli to work properly. Update reqwest to 0.10.0
2020-01-02 09:49:48 +00:00
]
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
[[package]]
name = "core-foundation"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.9.2"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "6888e10551bb93e424d8df1d07f1a8b4fceb0001a3a4b048bfc47554946f47b3"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
dependencies = [
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"core-foundation-sys 0.8.3",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "core-foundation-sys"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
Updated to winit 20
2019-10-26 14:50:01 +00:00
[[package]]
name = "core-foundation-sys"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
[[package]]
name = "core-foundation-sys"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.8.3"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
Updated to winit 20
2019-10-26 14:50:01 +00:00
[[package]]
name = "core-graphics"
version = "0.19.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b3889374e6ea6ab25dba90bb5d96202f61108058361f6dc72e8b03e6f8bbe923"
dependencies = [
"bitflags",
"core-foundation 0.7.0",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"foreign-types",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
[[package]]
name = "core-graphics"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.22.3"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
dependencies = [
"bitflags",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"core-foundation 0.9.2",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"core-graphics-types",
"foreign-types",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
]
[[package]]
name = "core-graphics-types"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b"
dependencies = [
"bitflags",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"core-foundation 0.9.2",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"foreign-types",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
]
Updated to winit 20
2019-10-26 14:50:01 +00:00
[[package]]
name = "core-video-sys"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34ecad23610ad9757664d644e369246edde1803fcb43ed72876565098a5d3828"
dependencies = [
ci cleanup, dependency update
2020-11-06 13:14:54 +00:00
"cfg-if 0.1.10",
Updated to winit 20
2019-10-26 14:50:01 +00:00
"core-foundation-sys 0.7.0",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"core-graphics 0.19.2",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
Updated to winit 20
2019-10-26 14:50:01 +00:00
"objc",
]
Play random music whenever a track ends To support this, a global_state.maintain() method was added that calls audio.maintain(). Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a
2019-05-18 19:28:12 +00:00
[[package]]
name = "coreaudio-rs"
update dependencies
2021-03-21 21:53:44 +00:00
version = "0.10.0"
Play random music whenever a track ends To support this, a global_state.maintain() method was added that calls audio.maintain(). Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a
2019-05-18 19:28:12 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies
2021-03-21 21:53:44 +00:00
checksum = "11894b20ebfe1ff903cbdc52259693389eea03b94918a2def2c30c3bf227ad88"
Play random music whenever a track ends To support this, a global_state.maintain() method was added that calls audio.maintain(). Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a
2019-05-18 19:28:12 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"bitflags",
"coreaudio-sys",
Play random music whenever a track ends To support this, a global_state.maintain() method was added that calls audio.maintain(). Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a
2019-05-18 19:28:12 +00:00
]
[[package]]
name = "coreaudio-sys"
update Cargo.lock
2021-06-28 13:02:31 +00:00
version = "0.2.8"
Play random music whenever a track ends To support this, a global_state.maintain() method was added that calls audio.maintain(). Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a
2019-05-18 19:28:12 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update Cargo.lock
2021-06-28 13:02:31 +00:00
checksum = "2b7e3347be6a09b46aba228d6608386739fb70beff4f61e07422da87b0bb31fa"
Play random music whenever a track ends To support this, a global_state.maintain() method was added that calls audio.maintain(). Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a
2019-05-18 19:28:12 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"bindgen",
Play random music whenever a track ends To support this, a global_state.maintain() method was added that calls audio.maintain(). Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a
2019-05-18 19:28:12 +00:00
]
[[package]]
name = "cpal"
update crates
2021-09-20 10:05:41 +00:00
version = "0.13.4"
Use latest version of Rodio instead of custom branch
2019-08-30 23:58:38 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "98f45f0a21f617cd2c788889ef710b63f075c949259593ea09c826f1e47a2418"
Play random music whenever a track ends To support this, a global_state.maintain() method was added that calls audio.maintain(). Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a
2019-05-18 19:28:12 +00:00
dependencies = [
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
"alsa",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"core-foundation-sys 0.8.3",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"coreaudio-rs",
update dependencies
2021-03-21 21:53:44 +00:00
"jni",
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
"js-sys",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"lazy_static",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
"mach 0.3.2",
update crates
2021-09-20 10:05:41 +00:00
"ndk 0.3.0",
"ndk-glue 0.3.0",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"nix 0.20.0",
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
"oboe",
update crates
2021-09-20 10:05:41 +00:00
"parking_lot 0.11.2",
Added Controller support
2020-03-10 21:00:13 +00:00
"stdweb 0.1.3",
updated dependencies and fixed stuff - replace serde_derive by feature of serde incl. source code modifications to compile - reduce futures-timer to "2.0" to be same as async_std - update notify - removed mio, bincode and lz4 compress in common as networking is now in own crate btw there is a better lz4 compress crate, which is newer than 2017 - update prometheus to 0.9 - can't update uvth yet due to usues - hashbrown to 7.2 to only need a single version - libsqlite3 update - image didn't change as there is a problem with `image 0.23` - switch old directories with newer directories-next - no num upgrade as we still depend on num 0.2 anyways - rodio and cpal upgrade - const-tewaker update - dispatch (untested) update - git2 update - iterations update
2020-07-06 14:23:08 +00:00
"thiserror",
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
"web-sys",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"winapi 0.3.9",
Play random music whenever a track ends To support this, a global_state.maintain() method was added that calls audio.maintain(). Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a
2019-05-18 19:28:12 +00:00
]
Added hash value to decide if we should invalidate persited skills and allow a respec.
2021-11-14 18:32:37 +00:00
[[package]]
name = "cpufeatures"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469"
dependencies = [
"libc",
]
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
[[package]]
name = "cranelift-bforest"
Update wasmer
2021-07-10 13:02:20 +00:00
version = "0.74.0"
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Update wasmer
2021-07-10 13:02:20 +00:00
checksum = "c8ca3560686e7c9c7ed7e0fe77469f2410ba5d7781b1acaa9adc8d8deea28e3e"
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
dependencies = [
"cranelift-entity",
]
[[package]]
name = "cranelift-codegen"
Update wasmer
2021-07-10 13:02:20 +00:00
version = "0.74.0"
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Update wasmer
2021-07-10 13:02:20 +00:00
checksum = "baf9bf1ffffb6ce3d2e5ebc83549bd2436426c99b31cc550d521364cbe35d276"
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
dependencies = [
"cranelift-bforest",
"cranelift-codegen-meta",
"cranelift-codegen-shared",
"cranelift-entity",
update crates
2021-09-20 10:05:41 +00:00
"gimli 0.24.0",
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
"log",
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
"regalloc",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"smallvec",
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
"target-lexicon",
]
[[package]]
name = "cranelift-codegen-meta"
Update wasmer
2021-07-10 13:02:20 +00:00
version = "0.74.0"
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Update wasmer
2021-07-10 13:02:20 +00:00
checksum = "4cc21936a5a6d07e23849ffe83e5c1f6f50305c074f4b2970ca50c13bf55b821"
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
dependencies = [
"cranelift-codegen-shared",
"cranelift-entity",
]
[[package]]
name = "cranelift-codegen-shared"
Update wasmer
2021-07-10 13:02:20 +00:00
version = "0.74.0"
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Update wasmer
2021-07-10 13:02:20 +00:00
checksum = "ca5b6ffaa87560bebe69a5446449da18090b126037920b0c1c6d5945f72faf6b"
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
[[package]]
name = "cranelift-entity"
Update wasmer
2021-07-10 13:02:20 +00:00
version = "0.74.0"
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Update wasmer
2021-07-10 13:02:20 +00:00
checksum = "7d6b4a8bef04f82e4296782646f733c641d09497df2fabf791323fefaa44c64c"
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
[[package]]
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
name = "cranelift-frontend"
Update wasmer
2021-07-10 13:02:20 +00:00
version = "0.74.0"
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Update wasmer
2021-07-10 13:02:20 +00:00
checksum = "c31b783b351f966fce33e3c03498cb116d16d97a8f9978164a60920bd0d3a99c"
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
dependencies = [
"cranelift-codegen",
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
"log",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"smallvec",
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
"target-lexicon",
]
Update most dependencies
2019-07-28 15:47:14 +00:00
[[package]]
name = "crc32fast"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
version = "1.2.1"
Update most dependencies
2019-07-28 15:47:14 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a"
Update most dependencies
2019-07-28 15:47:14 +00:00
dependencies = [
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"cfg-if 1.0.0",
Update most dependencies
2019-07-28 15:47:14 +00:00
]
common: Add benchmark for `Chonk`
2019-09-03 23:00:50 +00:00
[[package]]
name = "criterion"
fmt
2021-03-05 01:23:11 +00:00
version = "0.3.4"
common: Add benchmark for `Chonk`
2019-09-03 23:00:50 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
fmt
2021-03-05 01:23:11 +00:00
checksum = "ab327ed7354547cc2ef43cbe20ef68b988e70b4b593cbd66a2a61733123a3d23"
common: Add benchmark for `Chonk`
2019-09-03 23:00:50 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"atty",
"cast",
"clap",
"criterion-plot",
"csv",
fmt
2021-03-05 01:23:11 +00:00
"futures",
update crates
2021-09-20 10:05:41 +00:00
"itertools",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"lazy_static",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"num-traits",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"oorandom",
"plotters",
"rayon",
"regex",
"serde",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"serde_cbor",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"serde_derive",
"serde_json",
"tinytemplate",
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
"tokio",
update dependencies and fix audio issues fixed #1027 fixed #1033 fixed #1020 fixed #1017 fixed #1029 fixed #1025 fixed #807 fixed #816 fixed #1004 fixed #1005
2021-03-29 07:45:00 +00:00
"walkdir 2.3.2",
common: Add benchmark for `Chonk`
2019-09-03 23:00:50 +00:00
]
[[package]]
name = "criterion-plot"
update crates
2021-09-20 10:05:41 +00:00
version = "0.4.4"
common: Add benchmark for `Chonk`
2019-09-03 23:00:50 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "d00996de9f2f7559f7f4dc286073197f83e92256a59ed395f9aac01fe717da57"
common: Add benchmark for `Chonk`
2019-09-03 23:00:50 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"cast",
update crates
2021-09-20 10:05:41 +00:00
"itertools",
common: Add benchmark for `Chonk`
2019-09-03 23:00:50 +00:00
]
Upgrade to winit 0.25
2021-06-15 08:01:57 +00:00
[[package]]
name = "crossbeam"
version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ae5588f6b3c3cb05239e90bd110f257254aecd01e4635400391aeae07497845"
dependencies = [
"cfg-if 1.0.0",
"crossbeam-channel",
update crates
2021-09-20 10:05:41 +00:00
"crossbeam-deque 0.8.1",
Upgrade to winit 0.25
2021-06-15 08:01:57 +00:00
"crossbeam-epoch 0.9.5",
"crossbeam-queue",
"crossbeam-utils 0.8.5",
]
Add support for TextInput widget, rename widgets module to widget, update to glyph_brush 0.7.0
2020-05-29 04:40:22 +00:00
[[package]]
name = "crossbeam-channel"
update dependencies
2021-06-04 07:44:30 +00:00
version = "0.5.1"
Add support for TextInput widget, rename widgets module to widget, update to glyph_brush 0.7.0
2020-05-29 04:40:22 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies
2021-06-04 07:44:30 +00:00
checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"
Add support for TextInput widget, rename widgets module to widget, update to glyph_brush 0.7.0
2020-05-29 04:40:22 +00:00
dependencies = [
"cfg-if 1.0.0",
update dependencies
2021-06-04 07:44:30 +00:00
"crossbeam-utils 0.8.5",
Add support for TextInput widget, rename widgets module to widget, update to glyph_brush 0.7.0
2020-05-29 04:40:22 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
upgrade dependencies
2019-06-29 15:25:58 +00:00
name = "crossbeam-deque"
update crates
2021-09-20 10:05:41 +00:00
version = "0.7.4"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "c20ff29ded3204c5106278a81a38f4b482636ed4fa1e6cfbeef193291beb29ed"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"crossbeam-epoch 0.8.2",
"crossbeam-utils 0.7.2",
"maybe-uninit",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
Add support for TextInput widget, rename widgets module to widget, update to glyph_brush 0.7.0
2020-05-29 04:40:22 +00:00
[[package]]
name = "crossbeam-deque"
update crates
2021-09-20 10:05:41 +00:00
version = "0.8.1"
Add support for TextInput widget, rename widgets module to widget, update to glyph_brush 0.7.0
2020-05-29 04:40:22 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
Add support for TextInput widget, rename widgets module to widget, update to glyph_brush 0.7.0
2020-05-29 04:40:22 +00:00
dependencies = [
"cfg-if 1.0.0",
update dependencies
2021-06-04 07:44:30 +00:00
"crossbeam-epoch 0.9.5",
"crossbeam-utils 0.8.5",
Add support for TextInput widget, rename widgets module to widget, update to glyph_brush 0.7.0
2020-05-29 04:40:22 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
adjust logging level
2019-10-23 17:29:39 +00:00
name = "crossbeam-epoch"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
version = "0.8.2"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"autocfg",
ci cleanup, dependency update
2020-11-06 13:14:54 +00:00
"cfg-if 0.1.10",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"crossbeam-utils 0.7.2",
"lazy_static",
"maybe-uninit",
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
"memoffset 0.5.6",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"scopeguard",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
Add support for TextInput widget, rename widgets module to widget, update to glyph_brush 0.7.0
2020-05-29 04:40:22 +00:00
[[package]]
name = "crossbeam-epoch"
update dependencies
2021-06-04 07:44:30 +00:00
version = "0.9.5"
Add support for TextInput widget, rename widgets module to widget, update to glyph_brush 0.7.0
2020-05-29 04:40:22 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies
2021-06-04 07:44:30 +00:00
checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd"
Add support for TextInput widget, rename widgets module to widget, update to glyph_brush 0.7.0
2020-05-29 04:40:22 +00:00
dependencies = [
"cfg-if 1.0.0",
update dependencies
2021-06-04 07:44:30 +00:00
"crossbeam-utils 0.8.5",
Add support for TextInput widget, rename widgets module to widget, update to glyph_brush 0.7.0
2020-05-29 04:40:22 +00:00
"lazy_static",
update dependencies
2021-06-04 07:44:30 +00:00
"memoffset 0.6.4",
Add support for TextInput widget, rename widgets module to widget, update to glyph_brush 0.7.0
2020-05-29 04:40:22 +00:00
"scopeguard",
]
Stop global syncing of entity creation
2019-11-04 00:57:36 +00:00
[[package]]
name = "crossbeam-queue"
update dependencies
2021-06-04 07:44:30 +00:00
version = "0.3.2"
Stop global syncing of entity creation
2019-11-04 00:57:36 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies
2021-06-04 07:44:30 +00:00
checksum = "9b10ddc024425c88c2ad148c1b0fd53f4c6d38db9697c9f1588381212fa657c9"
Stop global syncing of entity creation
2019-11-04 00:57:36 +00:00
dependencies = [
update chrossbeam, tracy, prometheus (and reduce server deps to crossbeam-channel)
2020-12-15 23:51:07 +00:00
"cfg-if 1.0.0",
update dependencies
2021-06-04 07:44:30 +00:00
"crossbeam-utils 0.8.5",
Stop global syncing of entity creation
2019-11-04 00:57:36 +00:00
]
change(log): switch to fern
2019-10-08 15:42:13 +00:00
[[package]]
name = "crossbeam-utils"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
version = "0.7.2"
change(log): switch to fern
2019-10-08 15:42:13 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
change(log): switch to fern
2019-10-08 15:42:13 +00:00
dependencies = [
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"autocfg",
ci cleanup, dependency update
2020-11-06 13:14:54 +00:00
"cfg-if 0.1.10",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"lazy_static",
change(log): switch to fern
2019-10-08 15:42:13 +00:00
]
Add support for TextInput widget, rename widgets module to widget, update to glyph_brush 0.7.0
2020-05-29 04:40:22 +00:00
[[package]]
name = "crossbeam-utils"
update dependencies
2021-06-04 07:44:30 +00:00
version = "0.8.5"
Add support for TextInput widget, rename widgets module to widget, update to glyph_brush 0.7.0
2020-05-29 04:40:22 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies
2021-06-04 07:44:30 +00:00
checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"
Add support for TextInput widget, rename widgets module to widget, update to glyph_brush 0.7.0
2020-05-29 04:40:22 +00:00
dependencies = [
"cfg-if 1.0.0",
"lazy_static",
]
Made the server cli great
2020-07-27 16:26:34 +00:00
[[package]]
name = "crossterm"
version = "0.17.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f4919d60f26ae233e14233cc39746c8c8bb8cd7b05840ace83604917b51b6c7"
dependencies = [
"bitflags",
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
"crossterm_winapi 0.6.2",
Made the server cli great
2020-07-27 16:26:34 +00:00
"lazy_static",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"mio 0.7.14",
Made the server cli great
2020-07-27 16:26:34 +00:00
"parking_lot 0.10.2",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"signal-hook 0.1.17",
update further crates
2020-12-16 00:07:39 +00:00
"winapi 0.3.9",
]
[[package]]
name = "crossterm"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.22.1"
update further crates
2020-12-16 00:07:39 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "c85525306c4291d1b73ce93c8acf9c339f9b213aef6c1d85c3830cbf1c16325c"
update further crates
2020-12-16 00:07:39 +00:00
dependencies = [
"bitflags",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"crossterm_winapi 0.9.0",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"mio 0.7.14",
update crates
2021-09-20 10:05:41 +00:00
"parking_lot 0.11.2",
"signal-hook 0.3.10",
update depednencies
2021-07-08 10:21:02 +00:00
"signal-hook-mio",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"winapi 0.3.9",
Made the server cli great
2020-07-27 16:26:34 +00:00
]
[[package]]
name = "crossterm_winapi"
update further crates
2020-12-16 00:07:39 +00:00
version = "0.6.2"
Made the server cli great
2020-07-27 16:26:34 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update further crates
2020-12-16 00:07:39 +00:00
checksum = "c2265c3f8e080075d9b6417aa72293fc71662f34b4af2612d8d1b074d29510db"
Made the server cli great
2020-07-27 16:26:34 +00:00
dependencies = [
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"winapi 0.3.9",
Made the server cli great
2020-07-27 16:26:34 +00:00
]
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
[[package]]
name = "crossterm_winapi"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.9.0"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
dependencies = [
"winapi 0.3.9",
]
common: Add benchmark for `Chonk`
2019-09-03 23:00:50 +00:00
[[package]]
name = "csv"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
version = "1.1.6"
common: Add benchmark for `Chonk`
2019-09-03 23:00:50 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1"
common: Add benchmark for `Chonk`
2019-09-03 23:00:50 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"bstr",
"csv-core",
"itoa",
"ryu",
"serde",
common: Add benchmark for `Chonk`
2019-09-03 23:00:50 +00:00
]
[[package]]
name = "csv-core"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
version = "0.1.10"
common: Add benchmark for `Chonk`
2019-09-03 23:00:50 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
common: Add benchmark for `Chonk`
2019-09-03 23:00:50 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"memchr",
common: Add benchmark for `Chonk`
2019-09-03 23:00:50 +00:00
]
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
[[package]]
name = "ct-logs"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c1a816186fa68d9e426e3cb4ae4dff1fcd8e4a2c34b781bf7a822574a0d0aac8"
dependencies = [
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"sct 0.6.1",
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
]
Started the report of wgpu
2020-08-21 19:10:56 +00:00
[[package]]
name = "d3d12"
update crates
2021-09-20 10:05:41 +00:00
version = "0.4.1"
Use profling to get spans from wgpu, update wpgu & its deps for various fixes
2021-04-30 02:54:10 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "2daefd788d1e96e0a9d66dee4b828b883509bc3ea9ce30665f04c3246372690c"
Started the report of wgpu
2020-08-21 19:10:56 +00:00
dependencies = [
"bitflags",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"libloading 0.7.2",
Started the report of wgpu
2020-08-21 19:10:56 +00:00
"winapi 0.3.9",
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "daggy"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "9293a0da7d1bc1f30090ece4d9f9de79a07be7302ddb00e5eb1fefb6ee6409e2"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
Finished porting all pipelines
2020-09-13 10:03:42 +00:00
"petgraph 0.4.13",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
added const tweaker
2020-03-19 17:11:45 +00:00
[[package]]
name = "darling"
version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858"
dependencies = [
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
"darling_core 0.10.2",
"darling_macro 0.10.2",
]
[[package]]
name = "darling"
update depednencies
2021-07-08 10:21:02 +00:00
version = "0.13.0"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update depednencies
2021-07-08 10:21:02 +00:00
checksum = "757c0ded2af11d8e739c4daea1ac623dd1624b06c844cf3f5a39f1bdbd99bb12"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
dependencies = [
update depednencies
2021-07-08 10:21:02 +00:00
"darling_core 0.13.0",
"darling_macro 0.13.0",
added const tweaker
2020-03-19 17:11:45 +00:00
]
[[package]]
name = "darling_core"
version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b"
dependencies = [
"fnv",
"ident_case",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"proc-macro2 1.0.32",
"quote 1.0.10",
Dis some distance and attack arc tweaking
2020-07-03 00:45:30 +00:00
"strsim 0.9.3",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"syn 1.0.81",
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
]
[[package]]
name = "darling_core"
update depednencies
2021-07-08 10:21:02 +00:00
version = "0.13.0"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update depednencies
2021-07-08 10:21:02 +00:00
checksum = "2c34d8efb62d0c2d7f60ece80f75e5c63c1588ba68032740494b0b9a996466e3"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
dependencies = [
"fnv",
"ident_case",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"proc-macro2 1.0.32",
"quote 1.0.10",
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
"strsim 0.10.0",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"syn 1.0.81",
added const tweaker
2020-03-19 17:11:45 +00:00
]
[[package]]
name = "darling_macro"
version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72"
dependencies = [
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
"darling_core 0.10.2",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"quote 1.0.10",
"syn 1.0.81",
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
]
[[package]]
name = "darling_macro"
update depednencies
2021-07-08 10:21:02 +00:00
version = "0.13.0"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update depednencies
2021-07-08 10:21:02 +00:00
checksum = "ade7bff147130fe5e6d39f089c6bd49ec0250f35d70b2eebf72afdfc919f15cc"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
dependencies = [
update depednencies
2021-07-08 10:21:02 +00:00
"darling_core 0.13.0",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"quote 1.0.10",
"syn 1.0.81",
added const tweaker
2020-03-19 17:11:45 +00:00
]
Began integrating procgen trees
2021-01-03 20:43:07 +00:00
[[package]]
name = "deflate"
version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73770f8e1fe7d64df17ca66ad28994a0a623ea497fa69486e14984e715c5d174"
dependencies = [
"adler32",
Propper Compression support of network. - Compression is no longer enabled always but can now be enabled per Stream. If a Stream is Compression enabled it will compress and decompress all msg (except for `raw` access) before handling them internally. You need to handle compression yourself for `raw` fn. - added a new feature to the network crate to enable or disable the compression - switched to `lz-fear` instead of `lz4-compression` - use `bitflags` to represent the `Promises` struct
2020-08-25 13:32:42 +00:00
"byteorder",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
Compress terrain chunks with deflate. Includes a benchmark showing that this makes them around 70% smaller, and is the same speed as LZ4.
2021-04-20 21:33:46 +00:00
[[package]]
name = "deflate"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "1.0.0"
Compress terrain chunks with deflate. Includes a benchmark showing that this makes them around 70% smaller, and is the same speed as LZ4.
2021-04-20 21:33:46 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "c86f7e25f518f4b81808a2cf1c50996a61f5c2eb394b2393bd87f2a4780a432f"
Compress terrain chunks with deflate. Includes a benchmark showing that this makes them around 70% smaller, and is the same speed as LZ4.
2021-04-20 21:33:46 +00:00
dependencies = [
"adler32",
]
Winit 0.22 released
2020-03-13 04:05:06 +00:00
[[package]]
name = "derivative"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
version = "2.2.0"
Winit 0.22 released
2020-03-13 04:05:06 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
Winit 0.22 released
2020-03-13 04:05:06 +00:00
dependencies = [
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"proc-macro2 1.0.32",
"quote 1.0.10",
"syn 1.0.81",
Winit 0.22 released
2020-03-13 04:05:06 +00:00
]
Fixing Cargo.lock after rebase.
2020-01-22 11:00:40 +00:00
[[package]]
name = "deunicode"
update crates
2021-09-20 10:05:41 +00:00
version = "1.3.1"
Fixing Cargo.lock after rebase.
2020-01-22 11:00:40 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "f2c9736e15e7df1638a7f6eee92a6511615c738246a052af5ba86f039b65aede"
Fixing Cargo.lock after rebase.
2020-01-22 11:00:40 +00:00
Added hash value to decide if we should invalidate persited skills and allow a respec.
2021-11-14 18:32:37 +00:00
[[package]]
name = "digest"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
dependencies = [
"generic-array 0.14.4",
]
Use the directory defined by the OS to store configuration files Former-commit-id: 7735a27f088a8bd543bf812f1299500844140d4f
2019-04-25 16:24:00 +00:00
[[package]]
updated dependencies and fixed stuff - replace serde_derive by feature of serde incl. source code modifications to compile - reduce futures-timer to "2.0" to be same as async_std - update notify - removed mio, bincode and lz4 compress in common as networking is now in own crate btw there is a better lz4 compress crate, which is newer than 2017 - update prometheus to 0.9 - can't update uvth yet due to usues - hashbrown to 7.2 to only need a single version - libsqlite3 update - image didn't change as there is a problem with `image 0.23` - switch old directories with newer directories-next - no num upgrade as we still depend on num 0.2 anyways - rodio and cpal upgrade - const-tewaker update - dispatch (untested) update - git2 update - iterations update
2020-07-06 14:23:08 +00:00
name = "directories-next"
ci cleanup, dependency update
2020-11-06 13:14:54 +00:00
version = "2.0.0"
Use the directory defined by the OS to store configuration files Former-commit-id: 7735a27f088a8bd543bf812f1299500844140d4f
2019-04-25 16:24:00 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
ci cleanup, dependency update
2020-11-06 13:14:54 +00:00
checksum = "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc"
Use the directory defined by the OS to store configuration files Former-commit-id: 7735a27f088a8bd543bf812f1299500844140d4f
2019-04-25 16:24:00 +00:00
dependencies = [
ci cleanup, dependency update
2020-11-06 13:14:54 +00:00
"cfg-if 1.0.0",
updated dependencies and fixed stuff - replace serde_derive by feature of serde incl. source code modifications to compile - reduce futures-timer to "2.0" to be same as async_std - update notify - removed mio, bincode and lz4 compress in common as networking is now in own crate btw there is a better lz4 compress crate, which is newer than 2017 - update prometheus to 0.9 - can't update uvth yet due to usues - hashbrown to 7.2 to only need a single version - libsqlite3 update - image didn't change as there is a problem with `image 0.23` - switch old directories with newer directories-next - no num upgrade as we still depend on num 0.2 anyways - rodio and cpal upgrade - const-tewaker update - dispatch (untested) update - git2 update - iterations update
2020-07-06 14:23:08 +00:00
"dirs-sys-next",
Use the directory defined by the OS to store configuration files Former-commit-id: 7735a27f088a8bd543bf812f1299500844140d4f
2019-04-25 16:24:00 +00:00
]
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
[[package]]
name = "dirs"
version = "3.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309"
dependencies = [
"dirs-sys",
]
Update native_dialog to 0.5.2
2021-02-07 05:48:57 +00:00
[[package]]
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
name = "dirs-next"
version = "2.0.0"
Update native_dialog to 0.5.2
2021-02-07 05:48:57 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
Update native_dialog to 0.5.2
2021-02-07 05:48:57 +00:00
dependencies = [
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"cfg-if 1.0.0",
"dirs-sys-next",
Update native_dialog to 0.5.2
2021-02-07 05:48:57 +00:00
]
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
[[package]]
name = "dirs-sys"
version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780"
dependencies = [
"libc",
"redox_users",
"winapi 0.3.9",
]
Update most dependencies
2019-07-28 15:47:14 +00:00
[[package]]
updated dependencies and fixed stuff - replace serde_derive by feature of serde incl. source code modifications to compile - reduce futures-timer to "2.0" to be same as async_std - update notify - removed mio, bincode and lz4 compress in common as networking is now in own crate btw there is a better lz4 compress crate, which is newer than 2017 - update prometheus to 0.9 - can't update uvth yet due to usues - hashbrown to 7.2 to only need a single version - libsqlite3 update - image didn't change as there is a problem with `image 0.23` - switch old directories with newer directories-next - no num upgrade as we still depend on num 0.2 anyways - rodio and cpal upgrade - const-tewaker update - dispatch (untested) update - git2 update - iterations update
2020-07-06 14:23:08 +00:00
name = "dirs-sys-next"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
version = "0.1.2"
Update most dependencies
2019-07-28 15:47:14 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
Update most dependencies
2019-07-28 15:47:14 +00:00
dependencies = [
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
"redox_users",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"winapi 0.3.9",
Added user-friendly error output for Voxygen Former-commit-id: 55952f32019e826863849f07a71695de3e0c4c3c
2019-04-25 11:49:36 +00:00
]
Added Controller support
2020-03-10 21:00:13 +00:00
[[package]]
name = "discard"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0"
fix #426: Use new dispatch dependency to ensure proper thread routing of msgbox NSAlert calls ( correct MR workflow )
2020-01-07 05:45:43 +00:00
[[package]]
name = "dispatch"
revert dispatch
2020-07-07 09:16:15 +00:00
version = "0.1.4"
fix #426: Use new dispatch dependency to ensure proper thread routing of msgbox NSAlert calls ( correct MR workflow )
2020-01-07 05:45:43 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
revert dispatch
2020-07-07 09:16:15 +00:00
checksum = "04e93ca78226c51902d7aa8c12c988338aadd9e85ed9c6be8aaac39192ff3605"
fix #426: Use new dispatch dependency to ensure proper thread routing of msgbox NSAlert calls ( correct MR workflow )
2020-01-07 05:45:43 +00:00
Update to winit 0.21.0
2020-02-08 02:09:56 +00:00
[[package]]
name = "dispatch"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
Add Linux support
2019-06-19 19:25:08 +00:00
[[package]]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
name = "dlib"
dependency reduction: - authc no longer uses reqwest - image only supports PNG - replace routille with tiny_http - several other dependencies - cargo upgrade - following improvement was measured on R7 1700X: before: - cargo build: 3076.73s user / 4:45 total / 589 dependencies - cargo test: 6118.38s user / 7:30 total / 959 dependencies after: - cargo build: 2680.54s user / 4:05 total / 480 dependencies - cargo test: 5351.81s user / 7:04 total / 791 dependencies - added xMAC94x to CODEOWNERS for Cargo.toml, he will protect them from now on and hit people with evil looks ;)
2020-06-01 00:13:35 +00:00
version = "0.4.2"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
dependency reduction: - authc no longer uses reqwest - image only supports PNG - replace routille with tiny_http - several other dependencies - cargo upgrade - following improvement was measured on R7 1700X: before: - cargo build: 3076.73s user / 4:45 total / 589 dependencies - cargo test: 6118.38s user / 7:30 total / 959 dependencies after: - cargo build: 2680.54s user / 4:05 total / 480 dependencies - cargo test: 5351.81s user / 7:04 total / 791 dependencies - added xMAC94x to CODEOWNERS for Cargo.toml, he will protect them from now on and hit people with evil looks ;)
2020-06-01 00:13:35 +00:00
checksum = "b11f15d1e3268f140f68d390637d5e76d849782d971ae7063e0da69fe9709a76"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"libloading 0.6.7",
Made boulders avoid rivers
2020-08-29 07:53:42 +00:00
]
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
[[package]]
name = "dlib"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac1b7517328c04c2aa68422fc60a41b92208182142ed04a25879c26c8f878794"
dependencies = [
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"libloading 0.7.2",
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "dot_vox"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
version = "4.1.0"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "83c18405ef54de0398b77a3ec8394d3a1639e7bf060e1385201e8db40c44ab41"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
Propper Compression support of network. - Compression is no longer enabled always but can now be enabled per Stream. If a Stream is Compression enabled it will compress and decompress all msg (except for `raw` access) before handling them internally. You need to handle compression yourself for `raw` fn. - added a new feature to the network crate to enable or disable the compression - switched to `lz-fear` instead of `lz4-compression` - use `bitflags` to represent the `Promises` struct
2020-08-25 13:32:42 +00:00
"byteorder",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"lazy_static",
dependency reduction: - authc no longer uses reqwest - image only supports PNG - replace routille with tiny_http - several other dependencies - cargo upgrade - following improvement was measured on R7 1700X: before: - cargo build: 3076.73s user / 4:45 total / 589 dependencies - cargo test: 6118.38s user / 7:30 total / 959 dependencies after: - cargo build: 2680.54s user / 4:05 total / 480 dependencies - cargo test: 5351.81s user / 7:04 total / 791 dependencies - added xMAC94x to CODEOWNERS for Cargo.toml, he will protect them from now on and hit people with evil looks ;)
2020-06-01 00:13:35 +00:00
"log",
Added Controller support
2020-03-10 21:00:13 +00:00
"nom 4.2.3",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
[[package]]
name = "downcast-rs"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
version = "1.2.0"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
Added egui debug UI - a 100% rust UI framework (similar to imgui) allowing for rapid development of debug interfaces to aid development. This is feature-gated behind the `egui-ui` feature which is enabled by default but removed for airshipper builds. Included in the initial implementation is an entity browser which lists all entities in the client ECS, an entity component viewer which shows select components belonging to the selected entity including character state information, and a simple frame time graph. This MR also includes an extraction of the animation hot reloading code which has been reused for egui to allow for hot-reloading of the egui interface to allow rapid development of the UI with realtime feedback upon save as is the case with aninmations. This is feature-gated behind the `hot-egui` feature which is not enabled by default due to the extra startup time that it adds.
2021-07-04 09:47:18 +00:00
[[package]]
name = "egui"
Revert "Merge branch 'xvar/wgpu-0.9' into 'master'" This reverts merge request !2566
2021-07-07 22:07:00 +00:00
version = "0.12.0"
Added egui debug UI - a 100% rust UI framework (similar to imgui) allowing for rapid development of debug interfaces to aid development. This is feature-gated behind the `egui-ui` feature which is enabled by default but removed for airshipper builds. Included in the initial implementation is an entity browser which lists all entities in the client ECS, an entity component viewer which shows select components belonging to the selected entity including character state information, and a simple frame time graph. This MR also includes an extraction of the animation hot reloading code which has been reused for egui to allow for hot-reloading of the egui interface to allow rapid development of the UI with realtime feedback upon save as is the case with aninmations. This is feature-gated behind the `hot-egui` feature which is not enabled by default due to the extra startup time that it adds.
2021-07-04 09:47:18 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Revert "Merge branch 'xvar/wgpu-0.9' into 'master'" This reverts merge request !2566
2021-07-07 22:07:00 +00:00
checksum = "788148861d80b87d28d64440a3d31cae190e50ccc3ea585597466d38428365d7"
Added egui debug UI - a 100% rust UI framework (similar to imgui) allowing for rapid development of debug interfaces to aid development. This is feature-gated behind the `egui-ui` feature which is enabled by default but removed for airshipper builds. Included in the initial implementation is an entity browser which lists all entities in the client ECS, an entity component viewer which shows select components belonging to the selected entity including character state information, and a simple frame time graph. This MR also includes an extraction of the animation hot reloading code which has been reused for egui to allow for hot-reloading of the egui interface to allow rapid development of the UI with realtime feedback upon save as is the case with aninmations. This is feature-gated behind the `hot-egui` feature which is not enabled by default due to the extra startup time that it adds.
2021-07-04 09:47:18 +00:00
dependencies = [
undo egui upgrade try
2021-11-19 13:19:04 +00:00
"epaint",
Added egui debug UI - a 100% rust UI framework (similar to imgui) allowing for rapid development of debug interfaces to aid development. This is feature-gated behind the `egui-ui` feature which is enabled by default but removed for airshipper builds. Included in the initial implementation is an entity browser which lists all entities in the client ECS, an entity component viewer which shows select components belonging to the selected entity including character state information, and a simple frame time graph. This MR also includes an extraction of the animation hot reloading code which has been reused for egui to allow for hot-reloading of the egui interface to allow rapid development of the UI with realtime feedback upon save as is the case with aninmations. This is feature-gated behind the `hot-egui` feature which is not enabled by default due to the extra startup time that it adds.
2021-07-04 09:47:18 +00:00
]
[[package]]
name = "egui_wgpu_backend"
Revert "Merge branch 'xvar/wgpu-0.9' into 'master'" This reverts merge request !2566
2021-07-07 22:07:00 +00:00
version = "0.8.0"
source = "git+https://github.com/hasenbanck/egui_wgpu_backend.git?rev=63a002c6a9b6c016e45806dd065864431caab621#63a002c6a9b6c016e45806dd065864431caab621"
Added egui debug UI - a 100% rust UI framework (similar to imgui) allowing for rapid development of debug interfaces to aid development. This is feature-gated behind the `egui-ui` feature which is enabled by default but removed for airshipper builds. Included in the initial implementation is an entity browser which lists all entities in the client ECS, an entity component viewer which shows select components belonging to the selected entity including character state information, and a simple frame time graph. This MR also includes an extraction of the animation hot reloading code which has been reused for egui to allow for hot-reloading of the egui interface to allow rapid development of the UI with realtime feedback upon save as is the case with aninmations. This is feature-gated behind the `hot-egui` feature which is not enabled by default due to the extra startup time that it adds.
2021-07-04 09:47:18 +00:00
dependencies = [
"bytemuck",
"epi",
"wgpu",
]
[[package]]
name = "egui_winit_platform"
undo egui upgrade try
2021-11-19 13:19:04 +00:00
version = "0.8.0"
Added egui debug UI - a 100% rust UI framework (similar to imgui) allowing for rapid development of debug interfaces to aid development. This is feature-gated behind the `egui-ui` feature which is enabled by default but removed for airshipper builds. Included in the initial implementation is an entity browser which lists all entities in the client ECS, an entity component viewer which shows select components belonging to the selected entity including character state information, and a simple frame time graph. This MR also includes an extraction of the animation hot reloading code which has been reused for egui to allow for hot-reloading of the egui interface to allow rapid development of the UI with realtime feedback upon save as is the case with aninmations. This is feature-gated behind the `hot-egui` feature which is not enabled by default due to the extra startup time that it adds.
2021-07-04 09:47:18 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
undo egui upgrade try
2021-11-19 13:19:04 +00:00
checksum = "cd4cf17c0cd4dbcf2f8fef55a3592b9b7cfd970576c7302d8ba5c521b8560371"
Added egui debug UI - a 100% rust UI framework (similar to imgui) allowing for rapid development of debug interfaces to aid development. This is feature-gated behind the `egui-ui` feature which is enabled by default but removed for airshipper builds. Included in the initial implementation is an entity browser which lists all entities in the client ECS, an entity component viewer which shows select components belonging to the selected entity including character state information, and a simple frame time graph. This MR also includes an extraction of the animation hot reloading code which has been reused for egui to allow for hot-reloading of the egui interface to allow rapid development of the UI with realtime feedback upon save as is the case with aninmations. This is feature-gated behind the `hot-egui` feature which is not enabled by default due to the extra startup time that it adds.
2021-07-04 09:47:18 +00:00
dependencies = [
undo egui upgrade try
2021-11-19 13:19:04 +00:00
"egui",
Added egui debug UI - a 100% rust UI framework (similar to imgui) allowing for rapid development of debug interfaces to aid development. This is feature-gated behind the `egui-ui` feature which is enabled by default but removed for airshipper builds. Included in the initial implementation is an entity browser which lists all entities in the client ECS, an entity component viewer which shows select components belonging to the selected entity including character state information, and a simple frame time graph. This MR also includes an extraction of the animation hot reloading code which has been reused for egui to allow for hot-reloading of the egui interface to allow rapid development of the UI with realtime feedback upon save as is the case with aninmations. This is feature-gated behind the `hot-egui` feature which is not enabled by default due to the extra startup time that it adds.
2021-07-04 09:47:18 +00:00
"winit",
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "either"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
version = "1.6.1"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
Added egui debug UI - a 100% rust UI framework (similar to imgui) allowing for rapid development of debug interfaces to aid development. This is feature-gated behind the `egui-ui` feature which is enabled by default but removed for airshipper builds. Included in the initial implementation is an entity browser which lists all entities in the client ECS, an entity component viewer which shows select components belonging to the selected entity including character state information, and a simple frame time graph. This MR also includes an extraction of the animation hot reloading code which has been reused for egui to allow for hot-reloading of the egui interface to allow rapid development of the UI with realtime feedback upon save as is the case with aninmations. This is feature-gated behind the `hot-egui` feature which is not enabled by default due to the extra startup time that it adds.
2021-07-04 09:47:18 +00:00
[[package]]
name = "emath"
Revert "Merge branch 'xvar/wgpu-0.9' into 'master'" This reverts merge request !2566
2021-07-07 22:07:00 +00:00
version = "0.12.0"
Added egui debug UI - a 100% rust UI framework (similar to imgui) allowing for rapid development of debug interfaces to aid development. This is feature-gated behind the `egui-ui` feature which is enabled by default but removed for airshipper builds. Included in the initial implementation is an entity browser which lists all entities in the client ECS, an entity component viewer which shows select components belonging to the selected entity including character state information, and a simple frame time graph. This MR also includes an extraction of the animation hot reloading code which has been reused for egui to allow for hot-reloading of the egui interface to allow rapid development of the UI with realtime feedback upon save as is the case with aninmations. This is feature-gated behind the `hot-egui` feature which is not enabled by default due to the extra startup time that it adds.
2021-07-04 09:47:18 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Revert "Merge branch 'xvar/wgpu-0.9' into 'master'" This reverts merge request !2566
2021-07-07 22:07:00 +00:00
checksum = "3e73d6c8c70eadb71756fbbc3c303ab25e163b46b656886dd250de5636efea12"
Added egui debug UI - a 100% rust UI framework (similar to imgui) allowing for rapid development of debug interfaces to aid development. This is feature-gated behind the `egui-ui` feature which is enabled by default but removed for airshipper builds. Included in the initial implementation is an entity browser which lists all entities in the client ECS, an entity component viewer which shows select components belonging to the selected entity including character state information, and a simple frame time graph. This MR also includes an extraction of the animation hot reloading code which has been reused for egui to allow for hot-reloading of the egui interface to allow rapid development of the UI with realtime feedback upon save as is the case with aninmations. This is feature-gated behind the `hot-egui` feature which is not enabled by default due to the extra startup time that it adds.
2021-07-04 09:47:18 +00:00
update authc
2020-12-28 15:17:43 +00:00
[[package]]
name = "encoding_rs"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.8.29"
update authc
2020-12-28 15:17:43 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "a74ea89a0a1b98f6332de42c95baff457ada66d1cb4030f9ff151b2041a1c746"
update authc
2020-12-28 15:17:43 +00:00
dependencies = [
"cfg-if 1.0.0",
]
Draft of botclient.
2021-03-10 18:32:45 +00:00
[[package]]
name = "endian-type"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
Added make_block command
2020-06-27 18:39:16 +00:00
[[package]]
name = "enum-iterator"
update crates
2021-09-20 10:05:41 +00:00
version = "0.7.0"
Added make_block command
2020-06-27 18:39:16 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "4eeac5c5edb79e4e39fe8439ef35207780a11f69c52cbe424ce3dfad4cb78de6"
Added make_block command
2020-06-27 18:39:16 +00:00
dependencies = [
"enum-iterator-derive",
]
[[package]]
name = "enum-iterator-derive"
update crates
2021-09-20 10:05:41 +00:00
version = "0.7.0"
Added make_block command
2020-06-27 18:39:16 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "c134c37760b27a871ba422106eedbb8247da973a09e82558bf26d619c882b159"
Added make_block command
2020-06-27 18:39:16 +00:00
dependencies = [
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"proc-macro2 1.0.32",
"quote 1.0.10",
"syn 1.0.81",
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
]
[[package]]
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
name = "enumset"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "1.0.8"
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "6216d2c19a6fb5f29d1ada1dc7bc4367a8cbf0fa4af5cf12e07b5bbdde6b5b2c"
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
dependencies = [
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
"enumset_derive",
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
]
[[package]]
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
name = "enumset_derive"
update depednencies
2021-07-08 10:21:02 +00:00
version = "0.5.5"
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update depednencies
2021-07-08 10:21:02 +00:00
checksum = "6451128aa6655d880755345d085494cf7561a6bee7c8dc821e5d77e6d267ecd4"
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
dependencies = [
update depednencies
2021-07-08 10:21:02 +00:00
"darling 0.13.0",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"proc-macro2 1.0.32",
"quote 1.0.10",
"syn 1.0.81",
update depednencies
2021-07-08 10:21:02 +00:00
]
[[package]]
name = "env_logger"
version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3"
dependencies = [
"atty",
"humantime",
"log",
"regex",
"termcolor",
added const tweaker
2020-03-19 17:11:45 +00:00
]
Added egui debug UI - a 100% rust UI framework (similar to imgui) allowing for rapid development of debug interfaces to aid development. This is feature-gated behind the `egui-ui` feature which is enabled by default but removed for airshipper builds. Included in the initial implementation is an entity browser which lists all entities in the client ECS, an entity component viewer which shows select components belonging to the selected entity including character state information, and a simple frame time graph. This MR also includes an extraction of the animation hot reloading code which has been reused for egui to allow for hot-reloading of the egui interface to allow rapid development of the UI with realtime feedback upon save as is the case with aninmations. This is feature-gated behind the `hot-egui` feature which is not enabled by default due to the extra startup time that it adds.
2021-07-04 09:47:18 +00:00
[[package]]
name = "epaint"
Revert "Merge branch 'xvar/wgpu-0.9' into 'master'" This reverts merge request !2566
2021-07-07 22:07:00 +00:00
version = "0.12.0"
Added egui debug UI - a 100% rust UI framework (similar to imgui) allowing for rapid development of debug interfaces to aid development. This is feature-gated behind the `egui-ui` feature which is enabled by default but removed for airshipper builds. Included in the initial implementation is an entity browser which lists all entities in the client ECS, an entity component viewer which shows select components belonging to the selected entity including character state information, and a simple frame time graph. This MR also includes an extraction of the animation hot reloading code which has been reused for egui to allow for hot-reloading of the egui interface to allow rapid development of the UI with realtime feedback upon save as is the case with aninmations. This is feature-gated behind the `hot-egui` feature which is not enabled by default due to the extra startup time that it adds.
2021-07-04 09:47:18 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Revert "Merge branch 'xvar/wgpu-0.9' into 'master'" This reverts merge request !2566
2021-07-07 22:07:00 +00:00
checksum = "80e2db640801230bdda80629bc3a063927a462f5eaf38a98da676954e78ccb99"
Added egui debug UI - a 100% rust UI framework (similar to imgui) allowing for rapid development of debug interfaces to aid development. This is feature-gated behind the `egui-ui` feature which is enabled by default but removed for airshipper builds. Included in the initial implementation is an entity browser which lists all entities in the client ECS, an entity component viewer which shows select components belonging to the selected entity including character state information, and a simple frame time graph. This MR also includes an extraction of the animation hot reloading code which has been reused for egui to allow for hot-reloading of the egui interface to allow rapid development of the UI with realtime feedback upon save as is the case with aninmations. This is feature-gated behind the `hot-egui` feature which is not enabled by default due to the extra startup time that it adds.
2021-07-04 09:47:18 +00:00
dependencies = [
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"ahash 0.7.6",
Added egui debug UI - a 100% rust UI framework (similar to imgui) allowing for rapid development of debug interfaces to aid development. This is feature-gated behind the `egui-ui` feature which is enabled by default but removed for airshipper builds. Included in the initial implementation is an entity browser which lists all entities in the client ECS, an entity component viewer which shows select components belonging to the selected entity including character state information, and a simple frame time graph. This MR also includes an extraction of the animation hot reloading code which has been reused for egui to allow for hot-reloading of the egui interface to allow rapid development of the UI with realtime feedback upon save as is the case with aninmations. This is feature-gated behind the `hot-egui` feature which is not enabled by default due to the extra startup time that it adds.
2021-07-04 09:47:18 +00:00
"atomic_refcell",
undo egui upgrade try
2021-11-19 13:19:04 +00:00
"emath",
update crates
2021-09-20 10:05:41 +00:00
"ordered-float 2.8.0",
Revert "Merge branch 'xvar/wgpu-0.9' into 'master'" This reverts merge request !2566
2021-07-07 22:07:00 +00:00
"rusttype 0.9.2",
Added egui debug UI - a 100% rust UI framework (similar to imgui) allowing for rapid development of debug interfaces to aid development. This is feature-gated behind the `egui-ui` feature which is enabled by default but removed for airshipper builds. Included in the initial implementation is an entity browser which lists all entities in the client ECS, an entity component viewer which shows select components belonging to the selected entity including character state information, and a simple frame time graph. This MR also includes an extraction of the animation hot reloading code which has been reused for egui to allow for hot-reloading of the egui interface to allow rapid development of the UI with realtime feedback upon save as is the case with aninmations. This is feature-gated behind the `hot-egui` feature which is not enabled by default due to the extra startup time that it adds.
2021-07-04 09:47:18 +00:00
]
[[package]]
name = "epi"
Revert "Merge branch 'xvar/wgpu-0.9' into 'master'" This reverts merge request !2566
2021-07-07 22:07:00 +00:00
version = "0.12.0"
Added egui debug UI - a 100% rust UI framework (similar to imgui) allowing for rapid development of debug interfaces to aid development. This is feature-gated behind the `egui-ui` feature which is enabled by default but removed for airshipper builds. Included in the initial implementation is an entity browser which lists all entities in the client ECS, an entity component viewer which shows select components belonging to the selected entity including character state information, and a simple frame time graph. This MR also includes an extraction of the animation hot reloading code which has been reused for egui to allow for hot-reloading of the egui interface to allow rapid development of the UI with realtime feedback upon save as is the case with aninmations. This is feature-gated behind the `hot-egui` feature which is not enabled by default due to the extra startup time that it adds.
2021-07-04 09:47:18 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Revert "Merge branch 'xvar/wgpu-0.9' into 'master'" This reverts merge request !2566
2021-07-07 22:07:00 +00:00
checksum = "59c4f6cbede1fc8f836384f85295a59199a4825940abcc3a8a29cfe2e3c37583"
Added egui debug UI - a 100% rust UI framework (similar to imgui) allowing for rapid development of debug interfaces to aid development. This is feature-gated behind the `egui-ui` feature which is enabled by default but removed for airshipper builds. Included in the initial implementation is an entity browser which lists all entities in the client ECS, an entity component viewer which shows select components belonging to the selected entity including character state information, and a simple frame time graph. This MR also includes an extraction of the animation hot reloading code which has been reused for egui to allow for hot-reloading of the egui interface to allow rapid development of the UI with realtime feedback upon save as is the case with aninmations. This is feature-gated behind the `hot-egui` feature which is not enabled by default due to the extra startup time that it adds.
2021-07-04 09:47:18 +00:00
dependencies = [
undo egui upgrade try
2021-11-19 13:19:04 +00:00
"egui",
Added egui debug UI - a 100% rust UI framework (similar to imgui) allowing for rapid development of debug interfaces to aid development. This is feature-gated behind the `egui-ui` feature which is enabled by default but removed for airshipper builds. Included in the initial implementation is an entity browser which lists all entities in the client ECS, an entity component viewer which shows select components belonging to the selected entity including character state information, and a simple frame time graph. This MR also includes an extraction of the animation hot reloading code which has been reused for egui to allow for hot-reloading of the egui interface to allow rapid development of the UI with realtime feedback upon save as is the case with aninmations. This is feature-gated behind the `hot-egui` feature which is not enabled by default due to the extra startup time that it adds.
2021-07-04 09:47:18 +00:00
]
Initial setup to use iced
2019-12-15 17:13:52 +00:00
[[package]]
name = "error-code"
update dependencies
2021-06-04 07:44:30 +00:00
version = "2.3.0"
Initial setup to use iced
2019-12-15 17:13:52 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies
2021-06-04 07:44:30 +00:00
checksum = "b5115567ac25674e0043e472be13d14e537f37ea8aa4bdc4aef0c89add1db1ff"
Initial setup to use iced
2019-12-15 17:13:52 +00:00
dependencies = [
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
Initial setup to use iced
2019-12-15 17:13:52 +00:00
"str-buf",
]
initial setup for .vox rendering Former-commit-id: bc3d2432c41d9dc3e1f57e569f3aecb9be3fe79a
2019-04-15 06:07:56 +00:00
[[package]]
name = "euc"
Stop requiring specfici euc version (was done to hold back vek version) Then ran cargo update
2021-03-09 23:41:56 +00:00
version = "0.5.3"
fmt
2021-03-05 01:23:11 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Stop requiring specfici euc version (was done to hold back vek version) Then ran cargo update
2021-03-09 23:41:56 +00:00
checksum = "0947d06646d28a4ac2862ac5eadc1062704d61ee398b3baba8b4a21e2f1ef5ed"
initial setup for .vox rendering Former-commit-id: bc3d2432c41d9dc3e1f57e569f3aecb9be3fe79a
2019-04-15 06:07:56 +00:00
dependencies = [
update dependencies
2021-03-21 21:53:44 +00:00
"vek",
initial setup for .vox rendering Former-commit-id: bc3d2432c41d9dc3e1f57e569f3aecb9be3fe79a
2019-04-15 06:07:56 +00:00
]
[[package]]
name = "euclid"
update dependencies
2021-06-04 07:44:30 +00:00
version = "0.22.6"
initial setup for .vox rendering Former-commit-id: bc3d2432c41d9dc3e1f57e569f3aecb9be3fe79a
2019-04-15 06:07:56 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies
2021-06-04 07:44:30 +00:00
checksum = "da96828553a086d7b18dcebfc579bd9628b016f86590d7453c115e490fa74b80"
initial setup for .vox rendering Former-commit-id: bc3d2432c41d9dc3e1f57e569f3aecb9be3fe79a
2019-04-15 06:07:56 +00:00
dependencies = [
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"num-traits",
initial setup for .vox rendering Former-commit-id: bc3d2432c41d9dc3e1f57e569f3aecb9be3fe79a
2019-04-15 06:07:56 +00:00
]
fmt
2021-03-05 01:23:11 +00:00
[[package]]
name = "event-listener"
version = "2.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59"
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
[[package]]
name = "fallible-iterator"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
* Replaced `diesel` with `rusqlite` and `refinery` * Added "migration of migrations" to transfer the data from the __diesel_schema_migrations table to the refinery_schema_history table * Removed all down migrations as refinery does not support down migrations * Changed all diesel up migrations to refinery naming format * Added --sql-log-mode parameter to veloren-server-cli to allow SQL tracing and profiling * Added /disconnect_all_players admin command * Added disconnectall CLI command * Fixes for several potential persistence-related race conditions
2021-04-13 22:05:47 +00:00
[[package]]
name = "fallible-streaming-iterator"
version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
update dependencies
2021-06-04 07:44:30 +00:00
[[package]]
name = "fd-lock"
update crates
2021-09-20 10:05:41 +00:00
version = "3.0.0"
update dependencies
2021-06-04 07:44:30 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "b8806dd91a06a7a403a8e596f9bfbfb34e469efbc363fc9c9713e79e26472e36"
update dependencies
2021-06-04 07:44:30 +00:00
dependencies = [
update crates
2021-09-20 10:05:41 +00:00
"cfg-if 1.0.0",
update dependencies
2021-06-04 07:44:30 +00:00
"libc",
"winapi 0.3.9",
]
Propper Compression support of network. - Compression is no longer enabled always but can now be enabled per Stream. If a Stream is Compression enabled it will compress and decompress all msg (except for `raw` access) before handling them internally. You need to handle compression yourself for `raw` fn. - added a new feature to the network crate to enable or disable the compression - switched to `lz-fear` instead of `lz4-compression` - use `bitflags` to represent the `Promises` struct
2020-08-25 13:32:42 +00:00
[[package]]
name = "fehler"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d5729fe49ba028cd550747b6e62cd3d841beccab5390aa398538c31a2d983635"
dependencies = [
"fehler-macros",
]
[[package]]
name = "fehler-macros"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ccb5acb1045ebbfa222e2c50679e392a71dd77030b78fb0189f2d9c5974400f9"
dependencies = [
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"proc-macro2 1.0.32",
"quote 1.0.10",
"syn 1.0.81",
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
]
Move shaders, start asset reloading system
2019-08-03 05:42:33 +00:00
[[package]]
name = "filetime"
update crates
2021-09-20 10:05:41 +00:00
version = "0.2.15"
Move shaders, start asset reloading system
2019-08-03 05:42:33 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "975ccf83d8d9d0d84682850a38c8169027be83368805971cc4f238c2b245bc98"
Move shaders, start asset reloading system
2019-08-03 05:42:33 +00:00
dependencies = [
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"cfg-if 1.0.0",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
update crates
2021-09-20 10:05:41 +00:00
"redox_syscall 0.2.10",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"winapi 0.3.9",
Move shaders, start asset reloading system
2019-08-03 05:42:33 +00:00
]
Revamping the audio system for Voxygen from #163
2019-07-02 04:10:55 +00:00
[[package]]
name = "find_folder"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "9f6d018fb95a0b59f854aed68ecd96ce2b80af7911b92b1fed3c4b1fa516b91b"
Revamping the audio system for Voxygen from #163
2019-07-02 04:10:55 +00:00
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "fixedbitset"
version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
Finished porting all pipelines
2020-09-13 10:03:42 +00:00
[[package]]
name = "fixedbitset"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
[[package]]
name = "flate2"
update crates
2021-09-20 10:05:41 +00:00
version = "1.0.22"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
dependencies = [
"cfg-if 1.0.0",
"crc32fast",
"libc",
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
"miniz_oxide 0.4.4",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
]
Implement a VSystem trait that can be implemented by Systems. It will autodo some things, like track start and time and export those in system metrics Add a origin and implement it for all Systems in Veloren
2021-03-04 14:00:16 +00:00
[[package]]
name = "float-cmp"
update crates
2021-09-20 10:05:41 +00:00
version = "0.9.0"
Implement a VSystem trait that can be implemented by Systems. It will autodo some things, like track start and time and export those in system metrics Add a origin and implement it for all Systems in Veloren
2021-03-04 14:00:16 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4"
Implement a VSystem trait that can be implemented by Systems. It will autodo some things, like track start and time and export those in system metrics Add a origin and implement it for all Systems in Veloren
2021-03-04 14:00:16 +00:00
dependencies = [
"num-traits",
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "fnv"
fix workspaces and Cargo dependencies
2020-05-27 16:20:16 +00:00
version = "1.0.7"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
fix workspaces and Cargo dependencies
2020-05-27 16:20:16 +00:00
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "foreign-types"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"foreign-types-shared",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
[[package]]
name = "foreign-types-shared"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
[[package]]
name = "form_urlencoded"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
version = "1.0.1"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
dependencies = [
"matches",
"percent-encoding",
]
Use assets_manager to load assets
2020-12-12 22:14:24 +00:00
[[package]]
name = "fsevent"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5ab7d1bd1bd33cc98b0889831b72da23c0aa4df9cec7e0702f46ecea04b35db6"
dependencies = [
"bitflags",
"fsevent-sys 2.0.1",
]
[[package]]
name = "fsevent-sys"
version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f41b048a94555da0f42f1d632e2e19510084fb8e303b0daa2816e733fb3644a0"
dependencies = [
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
Move shaders, start asset reloading system
2019-08-03 05:42:33 +00:00
]
[[package]]
name = "fsevent-sys"
update dependencies
2021-06-04 07:44:30 +00:00
version = "4.0.0"
Move shaders, start asset reloading system
2019-08-03 05:42:33 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies
2021-06-04 07:44:30 +00:00
checksum = "5c0e564d24da983c053beff1bb7178e237501206840a3e6bf4e267b9e8ae734a"
Move shaders, start asset reloading system
2019-08-03 05:42:33 +00:00
dependencies = [
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
Move shaders, start asset reloading system
2019-08-03 05:42:33 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "fuchsia-zircon"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"bitflags",
"fuchsia-zircon-sys",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
[[package]]
name = "fuchsia-zircon-sys"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
update further crates
2020-12-16 00:07:39 +00:00
[[package]]
name = "funty"
fmt
2021-03-05 01:23:11 +00:00
version = "1.2.0"
added const tweaker
2020-03-19 17:11:45 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
fmt
2021-03-05 01:23:11 +00:00
checksum = "1847abb9cb65d566acd5942e94aea9c8f547ad02c98e1649326fc0e8910b8b1e"
added const tweaker
2020-03-19 17:11:45 +00:00
[[package]]
name = "futures"
update crates
2021-09-20 10:05:41 +00:00
version = "0.3.17"
added const tweaker
2020-03-19 17:11:45 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "a12aa0eb539080d55c3f2d45a67c3b58b6b0773c1a3ca2dfec66d58c97fd66ca"
added const tweaker
2020-03-19 17:11:45 +00:00
dependencies = [
"futures-channel",
"futures-core",
"futures-executor",
"futures-io",
"futures-sink",
"futures-task",
"futures-util",
]
Update chat-cli to work properly. Update reqwest to 0.10.0
2020-01-02 09:49:48 +00:00
[[package]]
name = "futures-channel"
update crates
2021-09-20 10:05:41 +00:00
version = "0.3.17"
Update chat-cli to work properly. Update reqwest to 0.10.0
2020-01-02 09:49:48 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "5da6ba8c3bb3c165d3c7319fc1cc8304facf1fb8db99c5de877183c08a273888"
Update chat-cli to work properly. Update reqwest to 0.10.0
2020-01-02 09:49:48 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"futures-core",
added const tweaker
2020-03-19 17:11:45 +00:00
"futures-sink",
Update chat-cli to work properly. Update reqwest to 0.10.0
2020-01-02 09:49:48 +00:00
]
[[package]]
name = "futures-core"
update crates
2021-09-20 10:05:41 +00:00
version = "0.3.17"
Began integrating procgen trees
2021-01-03 20:43:07 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "88d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d"
Began integrating procgen trees
2021-01-03 20:43:07 +00:00
added const tweaker
2020-03-19 17:11:45 +00:00
[[package]]
Clean and update dependencies * Remove tweak feature * Remove const-tweaker * Update tiny_http * Update bitvec to 0.21.0 * Downgrade euc to avoid conflict with vek 0.12.0 * Require exactly vek 0.12.0 * Update all other dependencies automatically based on these changes * Update gilrs to latest at the request of Ada Lovegirls * Update meshing benchmarks to new criterion API
2021-02-15 07:47:28 +00:00
name = "futures-executor"
update crates
2021-09-20 10:05:41 +00:00
version = "0.3.17"
added const tweaker
2020-03-19 17:11:45 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "45025be030969d763025784f7f355043dc6bc74093e4ecc5000ca4dc50d8745c"
added const tweaker
2020-03-19 17:11:45 +00:00
dependencies = [
"futures-core",
"futures-task",
"futures-util",
COMPLETE REWRITE - use async_std and implement a async serialisaition - new participant, stream and drop on the participant - sending and receiving on streams
2020-03-22 13:47:21 +00:00
"num_cpus",
added const tweaker
2020-03-19 17:11:45 +00:00
]
Update chat-cli to work properly. Update reqwest to 0.10.0
2020-01-02 09:49:48 +00:00
[[package]]
name = "futures-io"
update crates
2021-09-20 10:05:41 +00:00
version = "0.3.17"
Update chat-cli to work properly. Update reqwest to 0.10.0
2020-01-02 09:49:48 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "522de2a0fe3e380f1bc577ba0474108faf3f6b18321dbf60b3b9c39a75073377"
Update chat-cli to work properly. Update reqwest to 0.10.0
2020-01-02 09:49:48 +00:00
[[package]]
name = "futures-macro"
update crates
2021-09-20 10:05:41 +00:00
version = "0.3.17"
Update chat-cli to work properly. Update reqwest to 0.10.0
2020-01-02 09:49:48 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "18e4a4b95cea4b4ccbcf1c5675ca7c4ee4e9e75eb79944d07defde18068f79bb"
Update chat-cli to work properly. Update reqwest to 0.10.0
2020-01-02 09:49:48 +00:00
dependencies = [
update dependencies
2021-06-04 07:44:30 +00:00
"autocfg",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"proc-macro-hack",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"proc-macro2 1.0.32",
"quote 1.0.10",
"syn 1.0.81",
Update chat-cli to work properly. Update reqwest to 0.10.0
2020-01-02 09:49:48 +00:00
]
[[package]]
name = "futures-sink"
update crates
2021-09-20 10:05:41 +00:00
version = "0.3.17"
Update chat-cli to work properly. Update reqwest to 0.10.0
2020-01-02 09:49:48 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "36ea153c13024fe480590b3e3d4cad89a0cfacecc24577b68f86c6ced9c2bc11"
Update chat-cli to work properly. Update reqwest to 0.10.0
2020-01-02 09:49:48 +00:00
[[package]]
name = "futures-task"
update crates
2021-09-20 10:05:41 +00:00
version = "0.3.17"
Update chat-cli to work properly. Update reqwest to 0.10.0
2020-01-02 09:49:48 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "1d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99"
Update chat-cli to work properly. Update reqwest to 0.10.0
2020-01-02 09:49:48 +00:00
[[package]]
name = "futures-util"
update crates
2021-09-20 10:05:41 +00:00
version = "0.3.17"
Update chat-cli to work properly. Update reqwest to 0.10.0
2020-01-02 09:49:48 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "36568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481"
Update chat-cli to work properly. Update reqwest to 0.10.0
2020-01-02 09:49:48 +00:00
dependencies = [
update dependencies
2021-06-04 07:44:30 +00:00
"autocfg",
added const tweaker
2020-03-19 17:11:45 +00:00
"futures-channel",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"futures-core",
"futures-io",
"futures-macro",
added const tweaker
2020-03-19 17:11:45 +00:00
"futures-sink",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"futures-task",
"memchr",
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
"pin-project-lite",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"pin-utils",
"proc-macro-hack",
"proc-macro-nested",
"slab",
Update chat-cli to work properly. Update reqwest to 0.10.0
2020-01-02 09:49:48 +00:00
]
Update auth to use new hashing scheme.
2020-01-05 22:37:40 +00:00
[[package]]
name = "fxhash"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
Update auth to use new hashing scheme.
2020-01-05 22:37:40 +00:00
dependencies = [
Propper Compression support of network. - Compression is no longer enabled always but can now be enabled per Stream. If a Stream is Compression enabled it will compress and decompress all msg (except for `raw` access) before handling them internally. You need to handle compression yourself for `raw` fn. - added a new feature to the network crate to enable or disable the compression - switched to `lz-fear` instead of `lz4-compression` - use `bitflags` to represent the `Promises` struct
2020-08-25 13:32:42 +00:00
"byteorder",
Update auth to use new hashing scheme.
2020-01-05 22:37:40 +00:00
]
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
[[package]]
name = "generic-array"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
version = "0.12.4"
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd"
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
dependencies = [
"typenum",
]
update further crates
2020-12-16 00:07:39 +00:00
[[package]]
name = "generic-array"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
version = "0.13.3"
update further crates
2020-12-16 00:07:39 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
checksum = "f797e67af32588215eaaab8327027ee8e71b9dd0b2b26996aedf20c030fce309"
update further crates
2020-12-16 00:07:39 +00:00
dependencies = [
"typenum",
]
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
[[package]]
name = "generic-array"
version = "0.14.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817"
dependencies = [
"typenum",
update dependencies
2021-03-21 21:53:44 +00:00
"version_check 0.9.3",
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
]
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
[[package]]
name = "gethostname"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e692e296bfac1d2533ef168d0b60ff5897b8b70a4009276834014dd8924cc028"
dependencies = [
"libc",
"winapi 0.3.9",
]
Update most dependencies
2019-07-28 15:47:14 +00:00
[[package]]
name = "getrandom"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
version = "0.1.16"
Update most dependencies
2019-07-28 15:47:14 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
Update most dependencies
2019-07-28 15:47:14 +00:00
dependencies = [
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"cfg-if 1.0.0",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"wasi 0.9.0+wasi-snapshot-preview1",
Added user-friendly error output for Voxygen Former-commit-id: 55952f32019e826863849f07a71695de3e0c4c3c
2019-04-25 11:49:36 +00:00
]
Use assets_manager to load assets
2020-12-12 22:14:24 +00:00
[[package]]
name = "getrandom"
update dependencies
2021-06-04 07:44:30 +00:00
version = "0.2.3"
Use assets_manager to load assets
2020-12-12 22:14:24 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies
2021-06-04 07:44:30 +00:00
checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
Use assets_manager to load assets
2020-12-12 22:14:24 +00:00
dependencies = [
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"cfg-if 1.0.0",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"wasi 0.10.0+wasi-snapshot-preview1",
Use assets_manager to load assets
2020-12-12 22:14:24 +00:00
]
Implement toggleable gpu profiling that saves the timings from a recent frame with the screenshot key, rebase fixes
2021-02-27 09:21:23 +00:00
[[package]]
name = "gfx-auxil"
Revert "Merge branch 'xvar/wgpu-0.9' into 'master'" This reverts merge request !2566
2021-07-07 22:07:00 +00:00
version = "0.9.0"
source = "git+https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521#27a1dae3796d33d23812f2bb8c7e3b5aea18b521"
Started the report of wgpu
2020-08-21 19:10:56 +00:00
dependencies = [
"fxhash",
Update to the most recent wgpu
2021-03-17 13:56:40 +00:00
"gfx-hal",
Started the report of wgpu
2020-08-21 19:10:56 +00:00
"spirv_cross",
]
Implement toggleable gpu profiling that saves the timings from a recent frame with the screenshot key, rebase fixes
2021-02-27 09:21:23 +00:00
[[package]]
name = "gfx-backend-dx11"
Revert "Merge branch 'xvar/wgpu-0.9' into 'master'" This reverts merge request !2566
2021-07-07 22:07:00 +00:00
version = "0.8.0"
source = "git+https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521#27a1dae3796d33d23812f2bb8c7e3b5aea18b521"
Implement toggleable gpu profiling that saves the timings from a recent frame with the screenshot key, rebase fixes
2021-02-27 09:21:23 +00:00
dependencies = [
"arrayvec",
"bitflags",
Update to the most recent wgpu
2021-03-17 13:56:40 +00:00
"gfx-auxil",
"gfx-hal",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"libloading 0.7.2",
Started the report of wgpu
2020-08-21 19:10:56 +00:00
"log",
update crates
2021-09-20 10:05:41 +00:00
"parking_lot 0.11.2",
Update to the most recent wgpu
2021-03-17 13:56:40 +00:00
"range-alloc",
Started the report of wgpu
2020-08-21 19:10:56 +00:00
"raw-window-handle",
"smallvec",
"spirv_cross",
"thunderdome",
"winapi 0.3.9",
"wio",
]
Implement toggleable gpu profiling that saves the timings from a recent frame with the screenshot key, rebase fixes
2021-02-27 09:21:23 +00:00
[[package]]
name = "gfx-backend-dx12"
Revert "Merge branch 'xvar/wgpu-0.9' into 'master'" This reverts merge request !2566
2021-07-07 22:07:00 +00:00
version = "0.8.0"
source = "git+https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521#27a1dae3796d33d23812f2bb8c7e3b5aea18b521"
Started the report of wgpu
2020-08-21 19:10:56 +00:00
dependencies = [
"arrayvec",
"bit-set",
"bitflags",
Update to the most recent wgpu
2021-03-17 13:56:40 +00:00
"d3d12",
"gfx-auxil",
"gfx-hal",
Started the report of wgpu
2020-08-21 19:10:56 +00:00
"log",
update crates
2021-09-20 10:05:41 +00:00
"parking_lot 0.11.2",
Update to the most recent wgpu
2021-03-17 13:56:40 +00:00
"range-alloc",
Started the report of wgpu
2020-08-21 19:10:56 +00:00
"raw-window-handle",
"smallvec",
"spirv_cross",
Finished porting all pipelines
2020-09-13 10:03:42 +00:00
"thunderdome",
Started the report of wgpu
2020-08-21 19:10:56 +00:00
"winapi 0.3.9",
]
Implement toggleable gpu profiling that saves the timings from a recent frame with the screenshot key, rebase fixes
2021-02-27 09:21:23 +00:00
[[package]]
name = "gfx-backend-empty"
Revert "Merge branch 'xvar/wgpu-0.9' into 'master'" This reverts merge request !2566
2021-07-07 22:07:00 +00:00
version = "0.8.0"
source = "git+https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521#27a1dae3796d33d23812f2bb8c7e3b5aea18b521"
Started the report of wgpu
2020-08-21 19:10:56 +00:00
dependencies = [
Update to the most recent wgpu
2021-03-17 13:56:40 +00:00
"gfx-hal",
Started the report of wgpu
2020-08-21 19:10:56 +00:00
"log",
"raw-window-handle",
]
Implement toggleable gpu profiling that saves the timings from a recent frame with the screenshot key, rebase fixes
2021-02-27 09:21:23 +00:00
[[package]]
name = "gfx-backend-gl"
Revert "Merge branch 'xvar/wgpu-0.9' into 'master'" This reverts merge request !2566
2021-07-07 22:07:00 +00:00
version = "0.8.1"
source = "git+https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521#27a1dae3796d33d23812f2bb8c7e3b5aea18b521"
Implement toggleable gpu profiling that saves the timings from a recent frame with the screenshot key, rebase fixes
2021-02-27 09:21:23 +00:00
dependencies = [
"arrayvec",
"bitflags",
Almost implement instance merging for sprites (validation error), rebase fix
2021-01-31 03:50:03 +00:00
"fxhash",
Enable since naga currently has issues translating our SPIRV -> metal
2021-06-02 03:54:45 +00:00
"gfx-auxil",
Update to the most recent wgpu
2021-03-17 13:56:40 +00:00
"gfx-hal",
Implement toggleable gpu profiling that saves the timings from a recent frame with the screenshot key, rebase fixes
2021-02-27 09:21:23 +00:00
"glow",
"js-sys",
Update to the most recent wgpu
2021-03-17 13:56:40 +00:00
"khronos-egl",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"libloading 0.7.2",
Finished porting all pipelines
2020-09-13 10:03:42 +00:00
"log",
Revert "Replace shaderc with naga" This reverts commit 446d93dda0db486d65ec9374946205cc5bf35a59.
2021-09-04 18:59:18 +00:00
"naga",
update crates
2021-09-20 10:05:41 +00:00
"parking_lot 0.11.2",
Finished porting all pipelines
2020-09-13 10:03:42 +00:00
"raw-window-handle",
Enable since naga currently has issues translating our SPIRV -> metal
2021-06-02 03:54:45 +00:00
"spirv_cross",
Finished porting all pipelines
2020-09-13 10:03:42 +00:00
"wasm-bindgen",
"web-sys",
]
Implement toggleable gpu profiling that saves the timings from a recent frame with the screenshot key, rebase fixes
2021-02-27 09:21:23 +00:00
[[package]]
name = "gfx-backend-metal"
Revert "Merge branch 'xvar/wgpu-0.9' into 'master'" This reverts merge request !2566
2021-07-07 22:07:00 +00:00
version = "0.8.1"
source = "git+https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521#27a1dae3796d33d23812f2bb8c7e3b5aea18b521"
Implement toggleable gpu profiling that saves the timings from a recent frame with the screenshot key, rebase fixes
2021-02-27 09:21:23 +00:00
dependencies = [
"arrayvec",
"bitflags",
"block",
"cocoa-foundation",
"copyless",
"foreign-types",
Almost implement instance merging for sprites (validation error), rebase fix
2021-01-31 03:50:03 +00:00
"fxhash",
Enable since naga currently has issues translating our SPIRV -> metal
2021-06-02 03:54:45 +00:00
"gfx-auxil",
Update to the most recent wgpu
2021-03-17 13:56:40 +00:00
"gfx-hal",
Started the report of wgpu
2020-08-21 19:10:56 +00:00
"log",
Update to the most recent wgpu
2021-03-17 13:56:40 +00:00
"metal",
Revert "Replace shaderc with naga" This reverts commit 446d93dda0db486d65ec9374946205cc5bf35a59.
2021-09-04 18:59:18 +00:00
"naga",
Started the report of wgpu
2020-08-21 19:10:56 +00:00
"objc",
update crates
2021-09-20 10:05:41 +00:00
"parking_lot 0.11.2",
Update wgpu to latest version and improve error formating
2021-04-27 02:13:43 +00:00
"profiling",
Update to the most recent wgpu
2021-03-17 13:56:40 +00:00
"range-alloc",
Started the report of wgpu
2020-08-21 19:10:56 +00:00
"raw-window-handle",
Enable since naga currently has issues translating our SPIRV -> metal
2021-06-02 03:54:45 +00:00
"spirv_cross",
Started the report of wgpu
2020-08-21 19:10:56 +00:00
"storage-map",
]
Implement toggleable gpu profiling that saves the timings from a recent frame with the screenshot key, rebase fixes
2021-02-27 09:21:23 +00:00
[[package]]
name = "gfx-backend-vulkan"
Revert "Merge branch 'xvar/wgpu-0.9' into 'master'" This reverts merge request !2566
2021-07-07 22:07:00 +00:00
version = "0.8.0"
source = "git+https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521#27a1dae3796d33d23812f2bb8c7e3b5aea18b521"
Started the report of wgpu
2020-08-21 19:10:56 +00:00
dependencies = [
"arrayvec",
"ash",
"byteorder",
"core-graphics-types",
Update to the most recent wgpu
2021-03-17 13:56:40 +00:00
"gfx-hal",
Started the report of wgpu
2020-08-21 19:10:56 +00:00
"inplace_it",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"libloading 0.7.2",
Started the report of wgpu
2020-08-21 19:10:56 +00:00
"log",
Revert "Replace shaderc with naga" This reverts commit 446d93dda0db486d65ec9374946205cc5bf35a59.
2021-09-04 18:59:18 +00:00
"naga",
Started the report of wgpu
2020-08-21 19:10:56 +00:00
"objc",
update crates
2021-09-20 10:05:41 +00:00
"parking_lot 0.11.2",
Started the report of wgpu
2020-08-21 19:10:56 +00:00
"raw-window-handle",
Revert "Merge branch 'xvar/wgpu-0.9' into 'master'" This reverts merge request !2566
2021-07-07 22:07:00 +00:00
"renderdoc-sys",
Started the report of wgpu
2020-08-21 19:10:56 +00:00
"smallvec",
"winapi 0.3.9",
]
Implement toggleable gpu profiling that saves the timings from a recent frame with the screenshot key, rebase fixes
2021-02-27 09:21:23 +00:00
[[package]]
name = "gfx-hal"
Revert "Merge branch 'xvar/wgpu-0.9' into 'master'" This reverts merge request !2566
2021-07-07 22:07:00 +00:00
version = "0.8.0"
source = "git+https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521#27a1dae3796d33d23812f2bb8c7e3b5aea18b521"
Started the report of wgpu
2020-08-21 19:10:56 +00:00
dependencies = [
"bitflags",
Revert "Replace shaderc with naga" This reverts commit 446d93dda0db486d65ec9374946205cc5bf35a59.
2021-09-04 18:59:18 +00:00
"naga",
Started the report of wgpu
2020-08-21 19:10:56 +00:00
"raw-window-handle",
Finished porting all pipelines
2020-09-13 10:03:42 +00:00
"thiserror",
Made boulders avoid rivers
2020-08-29 07:53:42 +00:00
]
[[package]]
name = "gilrs"
update deps
2021-04-10 13:53:00 +00:00
version = "0.8.1"
Made boulders avoid rivers
2020-08-29 07:53:42 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update deps
2021-04-10 13:53:00 +00:00
checksum = "0e986f911d937f4395dfc2a39618dcef452773d32dcdbe0828c623f76588f749"
Made boulders avoid rivers
2020-08-29 07:53:42 +00:00
dependencies = [
"fnv",
"gilrs-core",
"log",
"serde",
dependency reduction: - authc no longer uses reqwest - image only supports PNG - replace routille with tiny_http - several other dependencies - cargo upgrade - following improvement was measured on R7 1700X: before: - cargo build: 3076.73s user / 4:45 total / 589 dependencies - cargo test: 6118.38s user / 7:30 total / 959 dependencies after: - cargo build: 2680.54s user / 4:05 total / 480 dependencies - cargo test: 5351.81s user / 7:04 total / 791 dependencies - added xMAC94x to CODEOWNERS for Cargo.toml, he will protect them from now on and hit people with evil looks ;)
2020-06-01 00:13:35 +00:00
"uuid",
Added Controller support
2020-03-10 21:00:13 +00:00
"vec_map",
Made boulders avoid rivers
2020-08-29 07:53:42 +00:00
]
[[package]]
name = "gilrs-core"
update deps
2021-04-10 13:53:00 +00:00
version = "0.3.1"
Made boulders avoid rivers
2020-08-29 07:53:42 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update deps
2021-04-10 13:53:00 +00:00
checksum = "9a5e5bb97bf9a0d9519a28cf38839cf1d6d9bb572b48e3c67202271fec2ed5e7"
Made boulders avoid rivers
2020-08-29 07:53:42 +00:00
dependencies = [
"core-foundation 0.6.4",
"io-kit-sys",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
Made boulders avoid rivers
2020-08-29 07:53:42 +00:00
"libudev-sys",
"log",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"nix 0.20.0",
Made boulders avoid rivers
2020-08-29 07:53:42 +00:00
"rusty-xinput",
fmt
2021-03-05 01:23:11 +00:00
"serde",
Made boulders avoid rivers
2020-08-29 07:53:42 +00:00
"stdweb 0.4.20",
"uuid",
"vec_map",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"winapi 0.3.9",
Added Controller support
2020-03-10 21:00:13 +00:00
]
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
[[package]]
name = "gimli"
Update wasmer
2021-07-10 13:02:20 +00:00
version = "0.24.0"
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Update wasmer
2021-07-10 13:02:20 +00:00
checksum = "0e4075386626662786ddb0ec9081e7c7eeb1ba31951f447ca780ef9f5d568189"
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
dependencies = [
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
"fallible-iterator",
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
"indexmap",
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
"stable_deref_trait",
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
]
update crates
2021-09-20 10:05:41 +00:00
[[package]]
name = "gimli"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.26.1"
update crates
2021-09-20 10:05:41 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4"
update crates
2021-09-20 10:05:41 +00:00
[i18n] Configurable fonts - Add font configuration in internationalization files - Scale font size using a configurable ratio - Add a script to identify translation item statuses using Git metadata - Execute the i18n script in a new gitlab-ci step (delayed) - Clone haxrcorp_4089_cyrillic_altgr font (haxrcorp_4089_cyrillic_altgr_extended) to add some additional latin characters (mainly for French)
2020-01-26 19:29:46 +00:00
[[package]]
name = "git2"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.13.24"
[i18n] Configurable fonts - Add font configuration in internationalization files - Scale font size using a configurable ratio - Add a script to identify translation item statuses using Git metadata - Execute the i18n script in a new gitlab-ci step (delayed) - Clone haxrcorp_4089_cyrillic_altgr font (haxrcorp_4089_cyrillic_altgr_extended) to add some additional latin characters (mainly for French)
2020-01-26 19:29:46 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "845e007a28f1fcac035715988a234e8ec5458fd825b20a20c7dec74237ef341f"
[i18n] Configurable fonts - Add font configuration in internationalization files - Scale font size using a configurable ratio - Add a script to identify translation item statuses using Git metadata - Execute the i18n script in a new gitlab-ci step (delayed) - Clone haxrcorp_4089_cyrillic_altgr font (haxrcorp_4089_cyrillic_altgr_extended) to add some additional latin characters (mainly for French)
2020-01-26 19:29:46 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"bitflags",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"libgit2-sys",
dependency reduction: - authc no longer uses reqwest - image only supports PNG - replace routille with tiny_http - several other dependencies - cargo upgrade - following improvement was measured on R7 1700X: before: - cargo build: 3076.73s user / 4:45 total / 589 dependencies - cargo test: 6118.38s user / 7:30 total / 959 dependencies after: - cargo build: 2680.54s user / 4:05 total / 480 dependencies - cargo test: 5351.81s user / 7:04 total / 791 dependencies - added xMAC94x to CODEOWNERS for Cargo.toml, he will protect them from now on and hit people with evil looks ;)
2020-06-01 00:13:35 +00:00
"log",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"url",
[i18n] Configurable fonts - Add font configuration in internationalization files - Scale font size using a configurable ratio - Add a script to identify translation item statuses using Git metadata - Execute the i18n script in a new gitlab-ci step (delayed) - Clone haxrcorp_4089_cyrillic_altgr font (haxrcorp_4089_cyrillic_altgr_extended) to add some additional latin characters (mainly for French)
2020-01-26 19:29:46 +00:00
]
Update to latest iced git, rebase fixes
2020-06-27 17:44:43 +00:00
[[package]]
name = "glam"
Update winit and iced
2021-01-23 06:06:15 +00:00
version = "0.10.2"
Update to latest iced git, rebase fixes
2020-06-27 17:44:43 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Update winit and iced
2021-01-23 06:06:15 +00:00
checksum = "579160312273c954cc51bd440f059dde741029ac8daf8c84fece76cb77f62c15"
dependencies = [
update dependencies
2021-03-21 21:53:44 +00:00
"version_check 0.9.3",
Update winit and iced
2021-01-23 06:06:15 +00:00
]
Update to latest iced git, rebase fixes
2020-06-27 17:44:43 +00:00
Updated toolchain version and a bunch of deps.
2019-09-06 05:16:11 +00:00
[[package]]
name = "glob"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
Updated toolchain version and a bunch of deps.
2019-09-06 05:16:11 +00:00
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
Finished porting all pipelines
2020-09-13 10:03:42 +00:00
name = "glow"
Use profling to get spans from wgpu, update wpgu & its deps for various fixes
2021-04-30 02:54:10 +00:00
version = "0.9.0"
Update iced
2020-10-31 08:52:38 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Use profling to get spans from wgpu, update wpgu & its deps for various fixes
2021-04-30 02:54:10 +00:00
checksum = "4b80b98efaa8a34fce11d60dd2ce2760d5d83c373cbcc73bb87c2a3a84a54108"
Made boulders avoid rivers
2020-08-29 07:53:42 +00:00
dependencies = [
Finished porting all pipelines
2020-09-13 10:03:42 +00:00
"js-sys",
update crates
2021-09-20 10:05:41 +00:00
"slotmap 0.4.3",
Finished porting all pipelines
2020-09-13 10:03:42 +00:00
"wasm-bindgen",
"web-sys",
Made boulders avoid rivers
2020-08-29 07:53:42 +00:00
]
Implement text renderering with glyph_brush (lifetime error)
2020-04-22 01:29:59 +00:00
[[package]]
name = "glyph_brush"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.7.3"
Implement text renderering with glyph_brush (lifetime error)
2020-04-22 01:29:59 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "21932fbf719272848eec4583740d978203c6e7da4c4e203358f5b95946c97409"
Implement text renderering with glyph_brush (lifetime error)
2020-04-22 01:29:59 +00:00
dependencies = [
Add support for TextInput widget, rename widgets module to widget, update to glyph_brush 0.7.0
2020-05-29 04:40:22 +00:00
"glyph_brush_draw_cache",
Implement text renderering with glyph_brush (lifetime error)
2020-04-22 01:29:59 +00:00
"glyph_brush_layout",
"log",
update crates
2021-09-20 10:05:41 +00:00
"ordered-float 2.8.0",
Implement text renderering with glyph_brush (lifetime error)
2020-04-22 01:29:59 +00:00
"rustc-hash",
"twox-hash",
]
Add support for TextInput widget, rename widgets module to widget, update to glyph_brush 0.7.0
2020-05-29 04:40:22 +00:00
[[package]]
name = "glyph_brush_draw_cache"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.1.5"
Add support for TextInput widget, rename widgets module to widget, update to glyph_brush 0.7.0
2020-05-29 04:40:22 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "6010675390f6889e09a21e2c8b575b3ee25667ea8237a8d59423f73cb8c28610"
Add support for TextInput widget, rename widgets module to widget, update to glyph_brush 0.7.0
2020-05-29 04:40:22 +00:00
dependencies = [
"ab_glyph",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"crossbeam-channel",
update crates
2021-09-20 10:05:41 +00:00
"crossbeam-deque 0.8.1",
Add support for TextInput widget, rename widgets module to widget, update to glyph_brush 0.7.0
2020-05-29 04:40:22 +00:00
"linked-hash-map",
"rayon",
"rustc-hash",
]
Implement text renderering with glyph_brush (lifetime error)
2020-04-22 01:29:59 +00:00
[[package]]
name = "glyph_brush_layout"
update crates
2021-09-20 10:05:41 +00:00
version = "0.2.3"
Implement text renderering with glyph_brush (lifetime error)
2020-04-22 01:29:59 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "cc32c2334f00ca5ac3695c5009ae35da21da8c62d255b5b96d56e2597a637a38"
Implement text renderering with glyph_brush (lifetime error)
2020-04-22 01:29:59 +00:00
dependencies = [
Add support for TextInput widget, rename widgets module to widget, update to glyph_brush 0.7.0
2020-05-29 04:40:22 +00:00
"ab_glyph",
update dependencies
2021-06-04 07:44:30 +00:00
"approx 0.5.0",
Implement text renderering with glyph_brush (lifetime error)
2020-04-22 01:29:59 +00:00
"xi-unicode",
]
Finished porting all pipelines
2020-09-13 10:03:42 +00:00
[[package]]
name = "gpu-alloc"
update dependencies
2021-06-04 07:44:30 +00:00
version = "0.4.7"
Update wgpu to fix dx11 issue
2021-04-29 03:00:37 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies
2021-06-04 07:44:30 +00:00
checksum = "cbc1b6ca374e81862526786d9cb42357ce03706ed1b8761730caafd02ab91f3a"
Finished porting all pipelines
2020-09-13 10:03:42 +00:00
dependencies = [
"bitflags",
"gpu-alloc-types",
]
[[package]]
name = "gpu-alloc-types"
Update wgpu to fix dx11 issue
2021-04-29 03:00:37 +00:00
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5"
Finished porting all pipelines
2020-09-13 10:03:42 +00:00
dependencies = [
"bitflags",
]
[[package]]
name = "gpu-descriptor"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8a70f1e87a3840ed6a3e99e02c2b861e4dbdf26f0d07e38f42ea5aff46cfce2"
dependencies = [
"bitflags",
"gpu-descriptor-types",
update dependencies
2021-06-04 07:44:30 +00:00
"hashbrown 0.9.1",
Finished porting all pipelines
2020-09-13 10:03:42 +00:00
]
[[package]]
name = "gpu-descriptor-types"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "363e3677e55ad168fef68cf9de3a4a310b53124c5e784c53a1d70e92d23f2126"
dependencies = [
"bitflags",
]
initial setup for .vox rendering Former-commit-id: bc3d2432c41d9dc3e1f57e569f3aecb9be3fe79a
2019-04-15 06:07:56 +00:00
[[package]]
name = "guillotiere"
update crates
2021-09-20 10:05:41 +00:00
version = "0.6.2"
(See sharp/lod-history) LOD, shadows, greedy meshing, new lighting, perf --- Pretty much a Veloren fork at this point. Here's a high level overview of the changes (will be added to CHANGELOG just before merge). At a high level this MR incorporates roughly two groups of changes. The first group consists of new game features: more flexible map sizes, level of detail terrain, shadow maps, and a new lighting engine. This is "feature work" that (mostly) only adds new things to Veloren, and mostly shouldn't affect old stuff. The second big group of changes are those addressing the fallout from all the new features. These include performance fixes of various sorts: the addition of multiple graphics options and optimization of the cheap ones to avoid work, switching all voxel models to use some variant of greedy meshing, switching over much of our CPU-side vector math to exploit SIMD instructions (coinciding with a fork of `vek`), and a rewrite of how the UI handles text rendering (coinciding with updates to our fork of `conrod`). Making Veloren's hardcoded colors appear correct under the new lighting engine also required considerably changes (TODO: Fill in this section when it's complete). The second category of changes often heavily touches code owned by other people, including frequently modified code "owned" by a handful of people, so I recommend that this code be reviewed particularly carefully. --- At a high level (each will be described in more detail below): - The world map has been refactored. - The world size is no longer hardcoded (@zesterer). - The map generation code was made generic to allow using it outside of the `world` crate (@zesterer). - On world creation, we now compute *horizon maps* (@zesterer). - The way we pass the world from the server to the client has been updated (@xMAC94x). - Artifacts related to image rotation were fixed (@imbris). - Multiflow rivers were enabled (@zesterer). - In the process of making changes related to the world map, various incidental fixes and optimizations were required. - The new *level of detail* feature was added (@zesterer wrote part of this and has checked out the rest). - A new LOD terrain rendering step was added to the pipeline. - The LOD terrain quality was made configurable via a graphics setting. - Horizon maps were used to cast shadows from LOD chunks on both LOD and non-LOD terrain. - A "voxelization" effect was incorporated into rendered LOD terrain to make it blend better into the world. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Veloren's lighting has been completely overhauled (@zesterer has already checked most of this out). - A semi-accurate index of refraction was assigned to our materials. - A new, more realistic, physically based approach to lighting was used using the *Ashikhmin Shirley* BRDF. - We emulate *atmospheric scattering* using equations designed for measuring solar panel light exposure. - We attempt to compute *realistic light attenuation* in water using its real material properties. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Point and directional lights now cast realistic shadows, using *shadow mapping.* (@imbris, @zesterer, @Treeco, @YuriMomo) - Point light shadow maps were added to the rendering pipeline, using geometry shaders and *seamless cube maps*. - Directional light shadows were added to the rendering pipeline, using LISPSM together with disabling *depth clamping*. - "Shadow-only" chunks and NPCs were added to prevent shadows from models behind you from disappearing. - In the process of making changes related to shadow maps, various incidental fixes and optimizations were required. The addition of shadow maps, LOD terrain, and the new lighting all led to significant performance degradation, on top of other changes happening in master. Therefore, a large number of performance improvements were also needed: - The graphics options were made much more flexible and configurable, and shaders were optimize. - New options were provided for how to render lights and shadows (@Pfauenauge, @zesterer). - Graphic setting storage and configuration were overhauled to make adding new features easier (@Pfauenauge, @imbris). - Shaders were rewritten to utilize GLSL's preprocessor to avoid overhead (@zesterer, @YuriMomo). - In the process of making changes related to providing additional rendering options, various incidental fixes and optimizations were required. - Voxel model creation was switched to use *greedy meshing.* - A new voxel meshing method, greedy meshing, was added (@imbris). - Uses of the older meshing methods were migrated to use greedy meshing (@imbris, @jshipsey, @Pfauenauge). - New restrictions were added to terrain, figure, and sprites to future proof them for further optimizations (@jshipsey, @Pfauenauge, @zesterer). - Most positions are now relative to either chunk or player position for better precision (@imbris, @zesterer, @scottc). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - Animation and terrain math were switched to use SIMD where possible. - Fixes were made to vek to make its SIMD feature usable for us (@zesterer, @imbris). - The interface and types used in bone animation were changed in various ways (@jshipsey, @Snowram, @Pfauenauge). - Redundant code generation for body animation is now partly taken care of by a macro (@jshipsey, @Snowram, @Pfauenauge). - Animation code was modified to to use vek's SIMD representation where possible (@jshipsey, @Snowram, @Pfauenauge). - Terrain meshing code and shadow map math were also modified to use vek's SIMD representation (@imbris). - SIMD instruction generation was enabled (@YuriMomo, @jshipsey, @Snowram, @imbris, @Angelonfira, @xMAC94x). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - The way we cache glyphs was completely refactored, fixed, and optimized. - Our fork of `conrod` was optimized in various ways (@imbris). - Our fork of `conrod` now exposes whether a widget was updated during the current frame (@imbris). - Our use of the glyph cache was rewritten for correctness (@imbris). - A *text cache* was introduced that lets us skip remeshing glyphs that have not changed (@imbris). - Various changes were made to reduce pressure on the glyph cache, with more planned (@imbris, @Pfauenauge). - In the process of making changes related to the glyph cache, various incidental fixes and optimizations were required. - Colors were changed to keep Veloren's look consistent with master. - Some older tree models were brought back (@Pfauenauge). - TODO(@Sharp): All hardcoded colors were extracted and made hotloadable. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Hardcoded colors were fixed to conform to Veloren's style. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Color models were fixed to conform to Veloren's style. A detailed description of the involved changes follows. --- - The world size is no longer hardcoded. All functions dependent on world size now take a `WorldSizeLg`, which holds the base 2 logarithm of each actual world dimension and is guaranteed to maintain certain properties (outlined in `common/src/terrain/map.rs`). Additionally, many utility functions that utilize the world size were moved into `common` as well (mostly `common/src/terrain/mod.rs`). Finally, the world map format was updated in order to store its size explicitly, with a migration path from the old format that should work whenever the old formatted map was a square (practically always). See `world/src/sim/mod.rs` for these changes. - The map generation code was made generic to allow using it outside of the `world` crate. The parts of the map generating code that do not need to query the world were moved over to `common/src/terrain/map.rs`, allowing them to be used from the client without creating a dependency on `world`. The rest of it was turned into helper functions in `world/src/sim/map.rs`, which can be passed as closures to the generic map generation code to complete its construction. This also means that colors are now passed in separately to the map generation function. See <https://veloren.net/devblog-78/> for more details. - On world creation, we now compute *horizon maps*. See the function in `world/src/sim/util.rs`. Given a height map and a plane intersecting that height map, our horizon maps allow us to encode enough information to reconstruct shadows for each point on the height map using only the *horizon angle* (the angle at which the sun starts to become visible). As Veloren's sun only covers one plane, this is sufficient for encoding sun shadows for LOD terrain, by encoding two angles per chunk (one for each 90 degrees the sun covers). We can also use this for the moon, if we want, since the moon follows the same path. Additionally, we store the *height* of the furthest occluder, to try to make the shadows volumetric; so this means 4 bytes in total for each chunk. Support for horizon maps has been merged into the map functionality in common as well. - The way we pass the world from the server to the client has been updated. Rather than passing the prerendered map, we instead pass three maps with values for each chunk; one with the color information, a second with altitude information, and a third with horizon map information. We then reconstruct the map on the client, together with some additional information we send from the server (like the sea level and maximum height). See `common/src/msg/server.rs` for a detailed description of the format of `WorldMapMsg`, and `server/src/libr.rs` and `client/src/lib.rs` for details of the map construction and parsing. - Artifacts related to image rotation were fixed. See the commit message for commit SHA `cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e` for a detailed explanation. This involved changes to shaders, the addition of a new type of graphic (also reflected in the graphic cache) that allows specifying a border color (which automatically makes the associated texture immutable), and some related fixes. I reproduce the first two paragraphs of the MR description as well: ``` Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). ``` - Multiflow rivers were enabled. This does not really need to be part of this MR, and would be easy to revert, but since it seemed to provide a nice improvement it's currently packaged with it. We already computed multiple outflows from each chunk for erosion purposes long before this MR. However, we never modified river rendering to be able to handle this case (just a single downhill river flow is complex enough!) so this was not exposed when deciding which chunks were rivers. Now that - In the process of making changes related to the world map, various incidental fixes and optimizations were required. Some examples of fixes include making sure terrain is never lowered to below sea level (to make the shadow maps report correct values), fixing map altitudes and colors to understand things like cliffs and "block level" coloring (that doesn'te xist on the column level), and fixing a crashbug when rendering images for the UI where source pixels are strongly rectangular. Some examples of related performance fixes include avoiding allocating a fresh vector for all the maps (i.e. copying it over to change the format from `[u32; n]` to `DynamicImage` and then copying again to convert to `RgbaImage`), and instead using the `gfx::memory::slice` function to accomplish the same thing. These sorts of changes are spread all arond the code. This includes the additon of a new scene, `voxygen/src/scene/lod.rs`, a new pipeline `voxygen/src/render/pipeline/lod_terrain.rs`, and new shaders `assets/vxygen/shaders/lod-terrain-vert.glsl` and `assets/vxygen/shaders/lod-terrain-frag.glsl`, as well as associated changes to the renderer in `voxygen/src/render/renderer.rs`. The main idea behind our initial approach to LOD was to take the world data we now get from the server (altitude, color, and horizon mapping). - Some previously computed values were turned into shader uniforms for better prediction on weak processors. (@zesterer) - Calls to power or trig functions were removed or replaced with multiplications, where possible. - After some deliberation - To properly handle sprite "waving" for nearby sprites, We explicitly designed the greedy meshing system with figures and sprites in mind. In both cases, we want to be able to *efficiently* pack many different models into the same texture, especially in cases where we know we will either not be removing any of the grouped-together from the models from the texture, or will remove all of them at once (so they can be packed into some specific subtexture). For sprites, since we know every model in advance and never intend to deallocate them, we currently pack them all as efficiently as possible into one giant tetxure atlas. However, in the future we might opt to pack them slightly less efficiently in exchange for shrinking the sprite vertex size. For figures, we pack all the textures for each *model* into the same atlas. is a global texture atlas used for every sprite, and for figures which is why we have the ability to mesh multiple models to the same texture area (using the simple texture atlas allocator) without requiring intermediate vector allocations. This is accomplished by delaying the time when we actually write the color and light data to the texture until *after* all the model vertices have been meshed; then, we can just allocate the whole color/light array at once, making the atlas we use an exact fit. In computer science-y terms, we accomplish this delay by, after we perform the initial greedy meshing (without texture information), not continuing to create the texture data, but instead constructing a *continuation*--that is, a function that, when called, will execute the rest of the computation. We push this continuation (which in Rust terms is a `FnOnce` closure that takes the `ColLightsInfo` that it is supposed to write to as context) onto a onto a vector resizing. To allow for suspended writes to texture data, Rust pointed out to me that the continuation that would eventually write the color and light data to the texture atlas (the one that is shared by all models sharing the same greedy mesher) would have to *own* whatever data it mshed. Because we often generate the model data to mesh as a temporary in `voxygen/src/load.rs`, the - Matrix multiplications in the shader were reduced for figure data (@zesterer). - Vertex "waves" for fluid data were removed. - Terrain "bending" near edges was removed. - Scaling was fixed to make sure empty space was not introduced in a space previously occupied by a block. It was also changed to take ownership of its voxel data, rather than sharing it, to let it be used with meshing. - Rust's nightly version was bumped in order to use the `array_map` function, which lets us reuse more code between the simple map and `FigureModelCache`. - PositionedGlyph::standalone. --- I tried to cite sources in many cases[^realtime],[^lloyd],[^lispsm],[^pbrt],[^greedy],[^tjunctions] where I needed features from elsewhere but I am particularly grateful for the following resources, esepcially where they have accompanying source code. I linked all of them that are accessible to the public (those that are not were obtained through legal means). [^realtime]: Eisemann, Elmar, Michael Schwarz, Ulf Assarsson, Michael Wimmer. Real-Time Shadows. A K Peters/CRC Press (T&F), 20160419. [^lloyd]: Lloyd,B. 2007. [Logarithmic perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). PhD thesis, University of North Carolina. [^lispsm]: Wimmer, M., Scherzer, D., and Purgathofer, W. 2004. [Light space perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). In Proceedings of Eurographics Symposium on Rendering 2004, pp. 143– 152. [^pbrt]: Pharr, Matt, et al. [http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf](Physically Based Rendering: From Theory to Implementation). Third edition, Morgan Kaufmann Publishers/Elsevier, 2017. [^greedy]: mikolalysenko. “Meshing in a Minecraft Game.” 0 FPS, 30 June 2012, <https://0fps.net/2012/06/30/meshing-in-a-minecraft-game/>. [^tjunctions]: blackflux. “Meshing in Voxel Engines – Part 1.” Blackflux.Com, 23 Feb. 2014, <https://blackflux.wordpress.com/2014/02/23/meshing-in-voxel-engines-part-1/>. I am also especially grateful to Khronos, Wikiepdia, and stackoverflow for answering many of my specific questions while writing the MR. --- Squashed commit of the following: commit 300505e7305a2fdac722a808ee8538323f215f39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 18:46:25 2020 +0200 Fixing cargo doc and typo in CHANGELOG. commit ec0aeb18e8499d7d84ef818331b4b65c3d76cea6 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 15:38:50 2020 +0200 Hopefully final commit for the LOD branch. commit 5e8ea0b1eaac02903a02feb2eb038d195de4872f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 10:14:26 2020 +0200 Falling back to power as stopgap. commit e44a1cbf46504ee9931a01bdc9033e145500d557 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 09:25:41 2020 +0200 Address imbris feedback. Temporarily disables shiny water, lowers max VD. These restrictions will be lifted soon after merging. commit 561e25778a108ac3712f5ec2ce3a51234c4430d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 08:31:13 2020 +0200 Tweaking shaders a bit. commit 7d19259078ce0dd7b3742ad7d0cb3fab3ece3fdc Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:59:43 2020 +0200 Fix view example as well. commit 051cd4934e0fad2c0b15db4380a4189fa318679f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:29:06 2020 +0200 Fix meshing benchmark. commit c95e07db3b4dcca285678985e65e31b927cb1c61 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 05:46:22 2020 +0200 Address MR feedback, fix scene clouds. commit 1bfb816cabdb3ffc1e507a009c2d98696b4b573a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:39:36 2020 +0200 Incorporating Pfau's figure color changes. New eyes and new humanoid colors. commit 3f9b89a3ac7b3356b1dba0d1a8f6541357f81469 Merge: e2f5162e4 62c53963a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:29:41 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit e2f5162e4f96f4124aa43488f7245d341b3dcfd4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:28:38 2020 +0200 World colors are all hotloadable. They live in assets/world/style/colors.ron. Only a small handful of hardcoed colors remain in World; they are either part of the map, or difficult to disentangle from the rest of the computation. Comments are made where appropriate. commit 62c53963abe1975009d34a8f9515a355bef24f31 Author: Marcel Märtens <marcel.cochem@googlemail.com> Date: Wed Aug 19 15:59:00 2020 +0200 replace pretty_env_logger with tracing commit 5b1625f99d9586fe80e2232f583ec5af9f953099 Merge: d71003acd 4942b5b39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:15:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit d71003acdabeff970b3928e97c26af6847b5b78e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:14:34 2020 +0200 Hotloading colors, part 1: colors in common. Currently, this just entails humanoid colors. There are only three colors not handled; the light emitter colors in common/src/comp/inventory/item/tool.rs. These don't seem important enough to me to warrant making hotloadable, at least not right now, but if it's needed later we can always add them to the file. commit 63b5e0e553eb2ea49276f192a6fc7dd65254270d Merge: c32b337a4 6d2c4b9c1 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 13:05:37 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c32b337a46e10d9de473d178a94a3ccd61c39bb3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:52:04 2020 +0200 Fixing LOD grid, for real. commit a166ae0360395387e09fb35a1f84210c2ce5ec24 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:28:05 2020 +0200 Addressing imbris's initial feedback. Fixes two minor bugs: explosion particles were no longer spawning randomly, and LOD grids were not perfectly even. commit 4cbad004f44060994252dd3d38647a14a589712f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:27:58 2020 +0200 Bumping nightly per request. commit 548680276aac77c25d43d16b5622f847d474dbef Merge: acc098604 8f8b20c91 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:26:06 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit acc0986040589a3492f88a740bc3c3fc693b26d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:28:32 2020 +0200 Lower resolution due to lying drivers. commit d3b878de2a52c358d2944a6bbd0555dad7fbdb10 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:15:38 2020 +0200 Fix issues msh encountered with Intel 4600. commit 10245e0c1b0cb6fae10d86409435364edc6102ef Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 21:15:02 2020 +0200 Merge more models into one mesh than we did previously. commit 3155c31e663c52ae5c3a53d5fb5665892a1a498a Merge: 7204cc8a7 3c199280e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:35:22 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7204cc8a7a4f74a30306bd205d9834fee4bb944f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:34:43 2020 +0200 Fix not yet done NPC animations. This forces them all to be the idle animation if not specified. This fixes issues where you'd have giant NPCs in water. commit bc83360f2a08918f19d417b5f772e1ff554dba08 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 19:36:37 2020 +0200 Try to fix some bugs: - Z fighting with LOD terrain and water. - Audio SFX not playing. commit 1fd104aa603bf3781b6526a5cada46aeca3049dd Merge: 862df3c99 7c2c392a3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 12:02:31 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 862df3c9976c4da9bd7cfd784f1a85973127968a Merge: 0a4218ed9 75c1d4401 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 05:52:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0a4218ed9d541a2b34c133351bea38a99ddf4ea7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 22:27:14 2020 +0200 Fix particle depth. commit f51dfdeb442d0dd5243dd2f344fa4be295bd0875 Merge: c6251a956 5e6dc0471 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:19:04 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit c6251a956ad376400dca5c23420cf8d213dc8fdf Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:15:46 2020 +0200 Cache figures more intelligently. Cache figures for longer, and don't cache character states for the player except where they actually affect the rendered model. commit 0ed801d5404982c6fb63b1eaa4567d908b294c9d Merge: c11b9bdf0 eea64f78f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 16:32:24 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c11b9bdf0a53bf9884d2f5a48fec9b01d582df1a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 11:47:15 2020 +0200 Remove unneeded Clippy annotation. commit 16aa9ef40af56d69289d00aafb3deadfb8bd4f35 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 8 00:53:02 2020 +0200 Fix hotloading and Clippy. commit 3dc973e0be5b758da1e9805eb764ad401374cd0c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 23:50:27 2020 +0200 Major speedups with SIMD. commit fba64a7d93d5a96077ce87287bbce6ab9b7fbcae Merge: 76429d00e d1e10b178 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:19 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 76429d00eea00d212fbd672a84ee91e75b19b938 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:10 2020 +0200 Add clippy.toml. commit c79f512f84dbb83cb82b7954db68ff241dfd8e41 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 11:55:20 2020 +0200 Fix all clippy issues, clean up Rust code. commit 6f90e010b3fbefb53b0d632e819931350015b6b8 Merge: 77a8c7c26 5929cfa5c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:30 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 77a8c7c267d3f44a1a62bd6b2274359973c5e4d4 Merge: b44e44232 44febaabd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:10 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 5929cfa5c713aa392110bbb62407f76caf53c3df Author: jshipsey <jshipsey18@gmail.com> Date: Thu Aug 6 20:47:27 2020 -0400 fixed in-hand arrow bug commit b44e442325d828f1cd564d66908f89d09e80474b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 6 13:40:35 2020 +0200 Miscellaneous performance improvements. commit be37acf287c1360d8085862526ac3365ffd1d768 Merge: 125d7fc6c c11876547 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 05:49:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 125d7fc6c4dcd8c8c5f27b8268a4d64f409f3644 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 04:55:31 2020 +0200 Abstract over simd vs. repr_c vectors. Also some minor improvements to Event size. commit d4d4956e9252e1241ce110b2aa85076c6b1e2a23 Merge: 5f3b7294a aced5f979 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:56:54 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 5f3b7294af1f8533edc2620b58863c248e2b07af Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:43:52 2020 +0200 Fix formatting issues I missed before. commit a428a3ebba70dcab63dd0f8cd983120c90617271 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:41:51 2020 +0200 Fix clippy warnings, part 1. There aer still a bunch of type too complex and function takes too many arguments warnings that I'll fix later (or ignore, since in the one case I did fix a function takes too many arguments warning I think it made the code *less* readable). commit ba54307540ed8a937ac08209730284fc653af85b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 30 13:22:42 2020 +0200 Fix light animations so they are removed when the light turns off. commit 7e0f4bcbf0f4717145d8beac40d52e3acebbe2aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 21:10:20 2020 +0200 Fix crash in edge case for pixel art. commit 56da06f7a351e2b949e9b014a90b974d511a0924 Merge: cf74d55f2 9f53a4a19 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:56:52 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:29:52 2020 +0200 Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). The first concern was addressed by fixing the dimensions of the map images drawn from the UI (so that we always use a square source rectangle, rather than a rectangular one according to the dimensions of the map). We also fixed the way rotation was done in the fragment shader for north-facing sources to make it properly handle aspect ratio (this was already done for north-facing targets). Together, these fix rendering issues peculiar to rectangular maps. The second and third concerns were jointly addressed by adding an optional border color to every 2D image drawn by the UI. This turns out not to waste extra space even though we hold a full f32 color (to avoid an extra dependency on gfx's PackedColor), since voxel images already take up more space than Optiion<[f32; 4]> requires. This is then implemented automatically using the "border color" wrapping method in the attached sampler. Since this is implemented in graphics hardware, it only works (at least naively) if the actual image bounds match the texture bounds. Therefore, we altered the way the graphics cache stores images with a border color to guarantee that they are always in their own texture, whose size exactly matches their extent. Since the easiest currently exposed way to set a border color is to do so for an immutable texture, we went a bit further and added a new "immutable" texture storage type used for these cases; currently, it is always and automatically used only when there is a specified border color, but in theory there's no reason we couldn't provide immutable-only images that use the default wrapping mdoe (though clamp to border is admittedly not a great default). To fix the maps case specifically, we set the border color to a translucent version of the ocean border color. This may need tweaking going forward, which shouldn't be hard. As part of this process, we had to modify graphics replacement to make sure immutable images are *removed* when invalidated, rather than just having a validity flag unset (this is normally done by the UI to try to reuse allocations in place if images are updated in benign ways, since the texture atlases used for Ui do not support deallocation; currently this is only used for item images, so there should be no overlap with immutable image replacement, so this was purely precautionary). Since we were already touching the relevant code, we also updated the image dependency to a newer version that provides more ways to avoid allocations, and made a few other changes that should hopefully eliminate redundant most of the intermediate buffer allocations we were performing for what should be zero-cost conversions. This may slightly improve performance in some cases. commit ad18ce939940a8c697270f6e9b94db9942fd8295 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 13:21:09 2020 +0200 Fix continent scale hack. commit 36b1cb074f5b195aebd7dbbc3da7f0246a1a18ec Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 12:11:40 2020 +0200 Enable loading different sized maps without a recompile. We may want to tweak the effects of the continent_scale_hack. commit 13b6d4d534cc4814b7cb3294ca41bbfea0a6b186 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 10:55:48 2020 +0200 Removing WORLD_SIZE, part 1. Erased almost every instance of WORLD_SIZE and replaced it with a local power of two, map_size_lg (which respects certain invariants; see common/src/terrain/map.rs for more details about MapSizeLg). This also means we can avoid a dependency on the world crate from client, as desired. Now that the rest of the code is not expecting a fixed WORLD_SIZE, the next step is to arrange for maps to store their world size, and to use that world size as a basis prior to loading the map (as well, probably, as prior to configuring some of the noise functions). commit 30b1d2c6428230a9eaa0d749cdcbbd6f1cbccd78 Merge: 7d56ba31b 1377b369f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:58 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 7d56ba31b445441461b28a07fc495d7d4f047c17 Merge: 2101113b4 598f14b25 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 1377b369f6db2258e910d467a5740f31789e3ded Author: Monty Marz <m.marzouq@gmx.de> Date: Sun Jul 19 23:25:38 2020 +0200 more saturated pumpkins commit ae8d50527f93bb0616c2ad46ce4dacb63bc37c6d Author: Monty Marz <m.marzouq@gmx.de> Date: Sat Jul 18 20:29:56 2020 +0200 acacia models commit 2101113b467e691de787392d7f20f1745f5637bd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 18 18:55:25 2020 +0200 Higher detail LOD. commit add2cfae04b4385fa5590e11e2bd5229d9dee0aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 16 01:57:39 2020 +0200 Revert some irrelevant stuff. commit 2e2ab3dc1eaa59a4aef7f8d34a53d8aae4c8553a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 15 13:30:49 2020 +0200 Fixing various things about shadows. * Correcting optimal LISPSM parameter. * Figure shadows are cast when they're not visible. * Chunk shadows stay cast until you look away. * Seamless cubemaps for point lights. * Etc. commit 6c31e6b56217274285b597af297036691ea5d897 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 19:50:26 2020 +0200 Fix shadow creation. commit 6332cbe006115ae205597529cd8bbccd146c2cca Merge: be438657c 930e0028b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:47:00 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit be438657c33d7b5bfb0a9582c3ed3fd366637323 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:28:08 2020 +0200 Tweaks to shadows. Added shadow map resolution configuration, added seamless cubemaps, documented all existing rendering options, and fixed a few Clippy errors. commit 23b4058906013c7d2a40c286e20e32c5fbd897ed Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 10:11:19 2020 +0200 Fix moon, use nonlinear noise for terrain. Note that the latter has a bit of performance cost. commit 7fbe5cbfbb9dc29607957b8e62f432a4deed193d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:23:02 2020 +0200 Address lies about max texture size. commit bcfc62b5e13a1cdd83f57535fde4694720bebfd9 Merge: 75e3626a7 18a08e8fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:22:08 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 75e3626a785919f43fdcf2127c2b10e3e4df2f9f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:21:52 2020 +0200 OpenGL 3.3 minimum. commit 18a08e8fe2739f02af99a5d2cb4e7c38c49e858b Author: Monty Marz <m.marzouq@gmx.de> Date: Tue Jul 7 23:57:52 2020 +0200 settings localization commit 90c5d1ca3620092bc3ae10b2211489eb1cf6f5e8 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 21:11:48 2020 +0200 Lower near distance. commit 0e66f02b25aaddaa2dfddbbc89cd67de54a9a7b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 20:09:01 2020 +0200 All sprites sway in the wind now. commit db1401a6910bf42dcf502462c90038752ff5fbdb Merge: 69e508d8c e8b4b29d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 19:34:17 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 69e508d8c94d8973033817ca86f357e466fc7c4d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 18:41:37 2020 +0200 Make it easy to switch to SIMD for math. commit ffe0f5928c7a7e87d00cb5426b3b1d831d7e02fd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 21:21:12 2020 +0200 Fix some issues with underwater rendering. commit bfda6da42f38fd02c31ee92c81ab785a3e50c2a0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 19:17:59 2020 +0200 Fix some minor display issues. commit 0ed752e087968cf901301884aaeae698e32ef8a5 Merge: ccc6a06a8 518edcb85 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:14:21 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit ccc6a06a8d4504d6b9f7af7905a414d2ee06ab76 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:04:34 2020 +0200 Some minor changes. commit 4e020246702889269efe1a191788992164c508d6 Merge: 50a64d927 e05c9267a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 16:17:40 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 50a64d927e6c4f4b0e4688e4cbfca694bc3f922a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 13:07:03 2020 +0200 Fix far plane. commit 7dd06da34cae8f9ea3b6c889fe965181f3fd3949 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:25:35 2020 +0200 Add shadows.glsl. commit 618a18c998778bf871b905a74657440fcc384c80 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:10:22 2020 +0200 Adding shadows, greedy meshing, and more. commit eaea83fe6a5cb1cb0ba8beef888183c718258496 Merge: 267018495 2f89b863e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 22:47:07 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 2670184954a13e4a9e7a4e35ba79aac0c5fac2f7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 21:20:01 2020 +0200 Make civsim and sites deterministic. For anything in worldgen where you use a HashMap, *please* think carefully about which hasher you are going to use! This is especially true if (for some reason) you are depending on hashmap iteration order remaining stable for some aspect of worldgen. commit f8376fd5dc72b4a9c2f51a6b4570d59c8b8e9343 Merge: 654f7e049 cdee191dd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 17:53:57 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 654f7e049258d9da27c09608bbe6a46ffa8787e5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed May 20 21:22:30 2020 +0200 Correct backface culling. commit 560501df05ca725409b0f2e4eb31bdfdc15fd0c7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue May 19 17:22:06 2020 +0200 Greedy messhing for shadows. commit a4d87e1875ca543436e6bbbeb20348facc5a52d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun May 17 05:59:00 2020 +0200 Shadow maps work for lantern. commit 243d0837b8a3b08172c9a3c348d964d7ddc2a0a8 Merge: 04382dc28 71dd520cd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:53:13 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 04382dc28632b6c66e8821f6870c0daaa1c1901a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:22:17 2020 +0200 WIP: better graphics config, better LOD, shadow maps. commit 22ddbad3eb32bfa70f0932176022208fe67ded81 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 18:54:09 2020 +0200 Minor shader fixes. commit 746a10e8d01ac235f994b0cde78fa48998602a1f Merge: 0f4a0e763 40ab94673 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 04:02:09 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0f4a0e763db3afbdc4fb0558611f38326ca87151 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 23:03:24 2020 +0200 Switch back to pop-in terrain. commit dd74fa7e4a53667b38811d7aec58d7f6a68889bb Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 22:58:55 2020 +0200 LOD shading closer to voxel shading. commit ef67bd58ba0bdaf622b078892d768263b6cba268 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 28 20:49:03 2020 +0200 Experimental underwater lighting. commit 2c5ad9d07605e80d5fd5679dd3a5d70c605b86a9 Merge: 748279835 303967a6f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 22:35:24 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7482798354eda18c8207950080fc24d443a369de Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 21:59:55 2020 +0200 Replace discard in figure-frag. commit d83b4ae69be4912f69bf7835f509c68a1c7770a4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:45:57 2020 +0200 Fix sprite lighting, HDR from focus_pos. commit 0594238004f116274905fa0ed7c2b6c417ed1d29 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:14:10 2020 +0200 Proper HDR from point lights. commit 48c93d2b41ce5743103d18e76cc228f5ac766492 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 14:01:43 2020 +0200 Brighter ambiance, darker LOD shadows. commit e0452e895ccfa8a43f368cae3b8b8aedc24dad93 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 13:13:23 2020 +0200 More proper HDR. commit 4c6da3ed16cfeebb455e40da5f557b4af9a499d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 00:13:10 2020 +0200 Trying LOD noise. commit 682a3d74c85df5503ffe1fc1cc891bce789df1ad Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 23:11:08 2020 +0200 Fix LOD heights in towns. commit cc39e5734e8b18f9077bf42e66337c1319dd6b6e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 21:01:23 2020 +0200 More LOD fixes. commit 8116b21c2e51c836e77894e309ac273caf2917b3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:54:43 2020 +0200 I like this coloring. commit bc2560ea90b36f4b46190005344232d993043ac3 Merge: 14effdd5d e690efe71 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:48:33 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 14effdd5db8747fcf3eb34f03b46b7792e92d1c5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:24:35 2020 +0200 Re-saturate. commit 48a643955d4435b78179acba0beb4a979905cc31 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:23:57 2020 +0200 Various fixes. commit f7b497a0c25f4ad4682c71dd1ed6f608052feb9b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 03:22:49 2020 +0200 Render figures again. commit 44e4aad48deba8266b9f8bdfd3db096b381f5327 Merge: e6f0a5a98 9ec319a18 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 02:01:04 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit e6f0a5a981a82533ba188fff0a54ce98577bb152 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 24 16:12:20 2020 +0200 Add atmospheric scattering. commit f2953087f691a8edbc001cb98ebf5059fc6f8ac0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 23 00:01:20 2020 +0200 Fix shadowing for specular reflections. commit ddd4a67a9799b8d08c7dc0c2bec90621c2bed0e3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Apr 22 22:56:12 2020 +0200 HDR fixes. commit 1015e60deef3c447381996277df7496707a63bd0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 21 18:25:19 2020 +0200 More lighting changes. commit 80c264abd111fb237e57843efcb5c071d4f84613 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 13 00:29:59 2020 +0200 Lighting experiments. commit 8414987e589dd5102bad89762a3adaccc0bfe957 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 9 02:38:40 2020 +0200 WIP -- lighting changes and soft shadows. commit 9cd2b3fb0d6b49776c6dfe463e4169637250b11a Merge: c7ea687eb 8b149ad11 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:29 2020 +0200 Merge branch 'sharp/new-lighting' into sharp/small-fixes commit c7ea687ebbc5aace1b455f134a5bf49ce2c7434a Merge: 476441531 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:02 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 8b149ad11ad4bb75018fcf9519baec27d1c95951 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:32:39 2020 +0200 Trying out a new lighting model. commit b0ac9f36f755dd06f7c17c46150568064790864f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 07:56:11 2020 +0200 Use bicubic interpolation for terrain. commit f6fc9307a121514b614bc50ef8eb055953e7da8a Merge: 33140a295 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 05:01:41 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 4764415312aae6e9ac2d00e86e84577cb958f1ab Merge: ed2d0111d 13388ee6a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 04:54:48 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 13388ee6a42943f3f79a9cb488346cef18e272fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 20:30:08 2020 +0200 Various fixes (to coloring and to soft shadows). commit fbd084a94a067082a87cd6d28b82054709bc9265 Merge: 5a089863b 4fdf6896a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 18:50:38 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/map-colors commit ed2d0111d994262ae836d84d1fe5a45e4de72a0b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 06:49:27 2020 +0200 Combining colors and LOD. commit 88342640c6b835114d01c797b89fdede3b0a2108 Merge: 33140a295 5a089863b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:49:20 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 33140a2951b8212725f42c758b277aaec4d888f7 Merge: 4c65a5aed f34d4b379 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:36:21 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 5a089863beb01d4794bbe3580ada47b278715ea2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 03:17:49 2020 +0200 Making maps brighter. This is probably not the right way to do it, but oh well! commit 32b2c99109dd486aa922886081068f9c550c83f2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 02:46:36 2020 +0200 Horizon mapping and "layered" map generation. Horizon mapping is a method of shadow mapping specific to height maps. It can handle any angle between 0 and 90 degrees from the ground, as long as know the horizontal direction in advance, by remembering only a single angle (the "horizon angle" of the shadow map). More is explained in common/src/msg/server.rs. We also remember the approximate height of the largest occluder, to try to be able to generate soft shadows and create a vertical position where the shadows can't go higher. Additionally, map generation has been reworked. Instead of computing everything from explicit samples, we pass in sampling functions that return exactly what the map generator needs. This allows us to cleanly separate the way we sample things like altitudes and colors from the map generation process. We exploit this to generate maps *partially* on the server (with colors and rivers, but not shading). We can then send the partially completed map to the client, which can combine it with shadow information to generate the final map. This is useful for two reasons: first, it makes sure the client can apply shadow information by itself, and second, it lets us pass the unshaded map for use with level of detail functionality. For similar reasons, river generation is split out into its own layer, but for now we opt to still generate rivers on the server (since the river wire format is more complicated to compress and may require some extra work to make sure we have enough precision to draw rivers well enough for LoD). Finally, the mostly ad-hoc lighting we were performing has been (mostly) replaced with explicit Phong reflection shading (including specular highlights). Regularizing this seems useful and helps clarify the "meaning" of the various light intensities, and helps us keep a more physically plausible basis. However, its interaction with soft shadows is still imperfect, and it's not yet clear to me what we need to do to turn this into something useful for LoD. commit f8926a5737ddc51f3d585c651a64c43677aae0f4 Merge: a1aee931e 875ae6ced Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Mar 13 13:32:42 2020 +0100 Merge remote-tracking branch 'origin/master' into sharp/map-colors commit 4c65a5aed353b119aea65a2aaeb94549b67beb42 Author: Treeco <5021038-Treeco@users.noreply.gitlab.com> Date: Mon Feb 24 16:48:05 2020 +0000 Made LOD setting slider exponential commit 2fa7b2d20d7233dc8bfd64f9f7f54617575248f1 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 17:49:53 2020 +0000 Added mist to LoD commit aab059a450b5f635777129ff82cc15b662965c3c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 15:14:06 2020 +0000 Added LoD slider commit 779c36b538121c5ade3633ae5cb67bb14c8c3877 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:54:55 2020 +0000 Reduced cost of vertex pushing commit 9fea150473906b166365b738ebcea07c697daf3d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:38:53 2020 +0000 Fixed maths, improved LoD resolution commit 5481df38fea5bf183ff376a3337179cfaa5233dc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 11:22:50 2020 +0000 Dynamically relocate LoD vertices to enhance details commit a3e36a50ababd615da7db1b26158c7906a5def01 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 18:13:51 2020 +0000 Simpler terrain spiral rendering commit 255f450ae9ac8763db4bede075fb409161ed57cc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:53:17 2020 +0000 Better LoD precision commit 3d027aebe812a5b8658a4eb8123dc9f61b3776d2 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:04:03 2020 +0000 Better falloff commit be775c9484b457b2c0b1a494aec03392d0c70e76 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 15:30:45 2020 +0000 Applied good ideas from experimental branch commit 58587b68545a23c5c04ab4574a4b94b3bc982246 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 16:15:13 2020 +0000 Minor fixes to LoD merging commit 7b42aebd709c14df2db766aad61d9280ad24d84d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 15:04:44 2020 +0000 Capped LoD dragging commit 8aafc559f87124e1ea5ca6e3ddc2aa0c242d793c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:54:37 2020 +0000 Better blending between LoD and terrain border commit edd3455d5161792d87ddc8eadc0ecbad5532b284 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:40:19 2020 +0000 Fixed LoD z depth, added sea level offset commit b9b06744620114dd5556e73f64fa93c145503a7c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:27:43 2020 +0000 Better LoD smoothing commit a1aee931e790431560cd2d953ad61d9497072afd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Feb 21 14:52:17 2020 +0100 Adding shadows. commit 2400786c13dd891c131ed86d48d05df516a8a778 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 13:48:40 2020 +0000 Use world map as LoD source commit dbf650f504a4c25fbbc2096ac3616c736bf52d23 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Jan 20 00:48:14 2020 +0000 Better clouds at distance commit 5e6f81b86cdb9730b9b056877b19257075fd5fa8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Jan 19 23:59:02 2020 +0000 sync commit 745e7540ddb000cc645f612767b337c2ddc3f7c0 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 12:40:48 2019 +0000 Improved cloud falloff mist, faster noise sampling commit f6a200d0cb866196ba57697466755f9e0c7ea5d8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 10:09:00 2019 +0000 Improved long-range depth precision, removed unnecessary LoD polygons commit 63d1b2bb2292898d59fb4f4e502201103dfeb86f Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 20:57:46 2019 +0000 Working LoD shader commit f13d98ee3e58f881e8b978861a67663b59ed91ec Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 11:03:40 2019 +0000 LoD first attempt (stack overflow issue)
2020-08-20 18:34:59 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "b62d5865c036cb1393e23c50693df631d3f5d7bcca4c04fe4cc0fd592e74a782"
initial setup for .vox rendering Former-commit-id: bc3d2432c41d9dc3e1f57e569f3aecb9be3fe79a
2019-04-15 06:07:56 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"euclid",
"svg_fmt",
initial setup for .vox rendering Former-commit-id: bc3d2432c41d9dc3e1f57e569f3aecb9be3fe79a
2019-04-15 06:07:56 +00:00
]
update authc
2020-12-28 15:17:43 +00:00
[[package]]
name = "h2"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.3.7"
update authc
2020-12-28 15:17:43 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "7fd819562fcebdac5afc5c113c3ec36f902840b70fd4fc458799c8ce4607ae55"
update authc
2020-12-28 15:17:43 +00:00
dependencies = [
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
"bytes",
update authc
2020-12-28 15:17:43 +00:00
"fnv",
"futures-core",
"futures-sink",
"futures-util",
fmt
2021-03-05 01:23:11 +00:00
"http",
update authc
2020-12-28 15:17:43 +00:00
"indexmap",
"slab",
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
"tokio",
update authc
2020-12-28 15:17:43 +00:00
"tokio-util",
"tracing",
]
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
[[package]]
name = "half"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "1.8.2"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
update further crates
2020-12-16 00:07:39 +00:00
[[package]]
name = "hash32"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d4041af86e63ac4298ce40e5cca669066e75b6f1aa3390fe2561ffa5e1d9f4cc"
dependencies = [
"byteorder",
]
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
[[package]]
name = "hashbrown"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
update specs
2020-12-16 13:17:28 +00:00
dependencies = [
"ahash 0.4.7",
]
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
update dependencies
2021-06-04 07:44:30 +00:00
[[package]]
name = "hashbrown"
version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
dependencies = [
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"ahash 0.7.6",
switch to hashbrown 0.11 and specs 0.16.2
2021-06-07 11:01:01 +00:00
"rayon",
"serde",
update dependencies
2021-06-04 07:44:30 +00:00
]
* Replaced `diesel` with `rusqlite` and `refinery` * Added "migration of migrations" to transfer the data from the __diesel_schema_migrations table to the refinery_schema_history table * Removed all down migrations as refinery does not support down migrations * Changed all diesel up migrations to refinery naming format * Added --sql-log-mode parameter to veloren-server-cli to allow SQL tracing and profiling * Added /disconnect_all_players admin command * Added disconnectall CLI command * Fixes for several potential persistence-related race conditions
2021-04-13 22:05:47 +00:00
[[package]]
name = "hashlink"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d99cf782f0dc4372d26846bec3de7804ceb5df083c2d4462c0b8d2330e894fa8"
dependencies = [
update dependencies
2021-06-04 07:44:30 +00:00
"hashbrown 0.9.1",
* Replaced `diesel` with `rusqlite` and `refinery` * Added "migration of migrations" to transfer the data from the __diesel_schema_migrations table to the refinery_schema_history table * Removed all down migrations as refinery does not support down migrations * Changed all diesel up migrations to refinery naming format * Added --sql-log-mode parameter to veloren-server-cli to allow SQL tracing and profiling * Added /disconnect_all_players admin command * Added disconnectall CLI command * Fixes for several potential persistence-related race conditions
2021-04-13 22:05:47 +00:00
]
update further crates
2020-12-16 00:07:39 +00:00
[[package]]
name = "heapless"
version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "74911a68a1658cfcfb61bc0ccfbd536e3b6e906f8c2f7883ee50157e3e2184f1"
dependencies = [
"as-slice",
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
"generic-array 0.13.3",
update further crates
2020-12-16 00:07:39 +00:00
"hash32",
"stable_deref_trait",
]
Add benchmark for color quantization using the rtree crate.
2021-07-01 17:41:37 +00:00
[[package]]
name = "heapless"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "634bd4d29cbf24424d0a4bfcbf80c6960129dc24424752a7d1d1390607023422"
dependencies = [
"as-slice",
"generic-array 0.14.4",
"hash32",
"stable_deref_trait",
]
Dis some distance and attack arc tweaking
2020-07-03 00:45:30 +00:00
[[package]]
name = "heck"
update dependencies
2021-06-04 07:44:30 +00:00
version = "0.3.3"
Dis some distance and attack arc tweaking
2020-07-03 00:45:30 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies
2021-06-04 07:44:30 +00:00
checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
Dis some distance and attack arc tweaking
2020-07-03 00:45:30 +00:00
dependencies = [
"unicode-segmentation",
]
change(log): switch to fern
2019-10-08 15:42:13 +00:00
[[package]]
name = "hermit-abi"
update depednencies
2021-07-08 10:21:02 +00:00
version = "0.1.19"
change(log): switch to fern
2019-10-08 15:42:13 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update depednencies
2021-07-08 10:21:02 +00:00
checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
change(log): switch to fern
2019-10-08 15:42:13 +00:00
dependencies = [
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
change(log): switch to fern
2019-10-08 15:42:13 +00:00
]
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
[[package]]
name = "hex"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "hibitset"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
version = "0.6.3"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "93a1bb8316a44459a7d14253c4d28dd7395cbd23cc04a68c46e851b8e46d64b1"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"atom",
"rayon",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
Began integrating procgen trees
2021-01-03 20:43:07 +00:00
[[package]]
name = "http"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.2.5"
update authc
2020-12-28 15:17:43 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "1323096b05d41827dadeaee54c9981958c0f94e670bc94ed80037d1a7b8b186b"
update authc
2020-12-28 15:17:43 +00:00
dependencies = [
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
"bytes",
update authc
2020-12-28 15:17:43 +00:00
"fnv",
"itoa",
]
Great improvements to the codebase: - better logging in network - we now notify the send of what happened in recv in participant. - works with veloren master servers - works in singleplayer, using a actual mid. - add `mpsc` in whole stack incl tests - speed up internal read/write with `Bytes` crate - use `prometheus-hyper` for metrics - use a metrics cache
2021-02-10 10:37:42 +00:00
[[package]]
fmt
2021-03-05 01:23:11 +00:00
name = "http-body"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.4.4"
Great improvements to the codebase: - better logging in network - we now notify the send of what happened in recv in participant. - works with veloren master servers - works in singleplayer, using a actual mid. - add `mpsc` in whole stack incl tests - speed up internal read/write with `Bytes` crate - use `prometheus-hyper` for metrics - use a metrics cache
2021-02-10 10:37:42 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6"
Great improvements to the codebase: - better logging in network - we now notify the send of what happened in recv in participant. - works with veloren master servers - works in singleplayer, using a actual mid. - add `mpsc` in whole stack incl tests - speed up internal read/write with `Bytes` crate - use `prometheus-hyper` for metrics - use a metrics cache
2021-02-10 10:37:42 +00:00
dependencies = [
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
"bytes",
fmt
2021-03-05 01:23:11 +00:00
"http",
update dependencies
2021-03-21 21:53:44 +00:00
"pin-project-lite",
Great improvements to the codebase: - better logging in network - we now notify the send of what happened in recv in participant. - works with veloren master servers - works in singleplayer, using a actual mid. - add `mpsc` in whole stack incl tests - speed up internal read/write with `Bytes` crate - use `prometheus-hyper` for metrics - use a metrics cache
2021-02-10 10:37:42 +00:00
]
first implementation of prometheus in veloren for git hash, tick times, chunks loaded, player online, entity count and light count
2019-09-06 14:21:09 +00:00
[[package]]
name = "httparse"
update crates
2021-09-20 10:05:41 +00:00
version = "1.5.1"
first implementation of prometheus in veloren for git hash, tick times, chunks loaded, player online, entity count and light count
2019-09-06 14:21:09 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503"
first implementation of prometheus in veloren for git hash, tick times, chunks loaded, player online, entity count and light count
2019-09-06 14:21:09 +00:00
update authc
2020-12-28 15:17:43 +00:00
[[package]]
name = "httpdate"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "1.0.2"
update authc
2020-12-28 15:17:43 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
update authc
2020-12-28 15:17:43 +00:00
Added non-admin moderators and timed bans. The security model has been updated to reflect this change (for example, moderators cannot revert a ban by an administrator). Ban history is also now recorded in the ban file, and much more information about the ban is stored (whitelists and administrators also have extra information). To support the new information without losing important information, this commit also introduces a new migration path for editable settings (both from legacy to the new format, and between versions). Examples of how to do this correctly, and migrate to new versions of a settings file, are in the settings/ subdirectory. As part of this effort, editable settings have been revamped to guarantee atomic saves (due to the increased amount of information in each file), some latent bugs in networking were fixed, and server-cli has been updated to go through StructOpt for both calls through TUI and argv, greatly simplifying parsing logic.
2021-05-08 18:22:21 +00:00
[[package]]
name = "humantime"
version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
Great improvements to the codebase: - better logging in network - we now notify the send of what happened in recv in participant. - works with veloren master servers - works in singleplayer, using a actual mid. - add `mpsc` in whole stack incl tests - speed up internal read/write with `Bytes` crate - use `prometheus-hyper` for metrics - use a metrics cache
2021-02-10 10:37:42 +00:00
[[package]]
name = "hyper"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.14.15"
Great improvements to the codebase: - better logging in network - we now notify the send of what happened in recv in participant. - works with veloren master servers - works in singleplayer, using a actual mid. - add `mpsc` in whole stack incl tests - speed up internal read/write with `Bytes` crate - use `prometheus-hyper` for metrics - use a metrics cache
2021-02-10 10:37:42 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "436ec0091e4f20e655156a30a0df3770fe2900aa301e548e08446ec794b6953c"
Great improvements to the codebase: - better logging in network - we now notify the send of what happened in recv in participant. - works with veloren master servers - works in singleplayer, using a actual mid. - add `mpsc` in whole stack incl tests - speed up internal read/write with `Bytes` crate - use `prometheus-hyper` for metrics - use a metrics cache
2021-02-10 10:37:42 +00:00
dependencies = [
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
"bytes",
Great improvements to the codebase: - better logging in network - we now notify the send of what happened in recv in participant. - works with veloren master servers - works in singleplayer, using a actual mid. - add `mpsc` in whole stack incl tests - speed up internal read/write with `Bytes` crate - use `prometheus-hyper` for metrics - use a metrics cache
2021-02-10 10:37:42 +00:00
"futures-channel",
"futures-core",
"futures-util",
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
"h2",
fmt
2021-03-05 01:23:11 +00:00
"http",
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
"http-body",
Great improvements to the codebase: - better logging in network - we now notify the send of what happened in recv in participant. - works with veloren master servers - works in singleplayer, using a actual mid. - add `mpsc` in whole stack incl tests - speed up internal read/write with `Bytes` crate - use `prometheus-hyper` for metrics - use a metrics cache
2021-02-10 10:37:42 +00:00
"httparse",
"httpdate",
"itoa",
update depednencies
2021-07-08 10:21:02 +00:00
"pin-project-lite",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"socket2",
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
"tokio",
Great improvements to the codebase: - better logging in network - we now notify the send of what happened in recv in participant. - works with veloren master servers - works in singleplayer, using a actual mid. - add `mpsc` in whole stack incl tests - speed up internal read/write with `Bytes` crate - use `prometheus-hyper` for metrics - use a metrics cache
2021-02-10 10:37:42 +00:00
"tower-service",
"tracing",
fmt
2021-03-05 01:23:11 +00:00
"want",
Great improvements to the codebase: - better logging in network - we now notify the send of what happened in recv in participant. - works with veloren master servers - works in singleplayer, using a actual mid. - add `mpsc` in whole stack incl tests - speed up internal read/write with `Bytes` crate - use `prometheus-hyper` for metrics - use a metrics cache
2021-02-10 10:37:42 +00:00
]
update authc
2020-12-28 15:17:43 +00:00
[[package]]
name = "hyper-rustls"
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
version = "0.22.1"
update authc
2020-12-28 15:17:43 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64"
update authc
2020-12-28 15:17:43 +00:00
dependencies = [
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
"ct-logs",
update authc
2020-12-28 15:17:43 +00:00
"futures-util",
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
"hyper",
update authc
2020-12-28 15:17:43 +00:00
"log",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"rustls 0.19.1",
"rustls-native-certs 0.5.0",
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
"tokio",
update authc
2020-12-28 15:17:43 +00:00
"tokio-rustls",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"webpki 0.21.4",
Update chat-cli to work properly. Update reqwest to 0.10.0
2020-01-02 09:49:48 +00:00
]
Initial setup to use iced
2019-12-15 17:13:52 +00:00
[[package]]
name = "iced_core"
Upgrade to winit 0.25
2021-06-15 08:01:57 +00:00
version = "0.4.0"
source = "git+https://github.com/Imberflur/iced?tag=winit-0.25#18a48a5eeefd2aa6e50f5dd0751ac2e94c88a9eb"
Initial setup to use iced
2019-12-15 17:13:52 +00:00
[[package]]
name = "iced_futures"
Upgrade to winit 0.25
2021-06-15 08:01:57 +00:00
version = "0.3.0"
source = "git+https://github.com/Imberflur/iced?tag=winit-0.25#18a48a5eeefd2aa6e50f5dd0751ac2e94c88a9eb"
Initial setup to use iced
2019-12-15 17:13:52 +00:00
dependencies = [
fmt
2021-03-05 01:23:11 +00:00
"futures",
Initial setup to use iced
2019-12-15 17:13:52 +00:00
"log",
"wasm-bindgen-futures",
]
Update to latest iced git, rebase fixes
2020-06-27 17:44:43 +00:00
[[package]]
name = "iced_graphics"
Upgrade to winit 0.25
2021-06-15 08:01:57 +00:00
version = "0.2.0"
source = "git+https://github.com/Imberflur/iced?tag=winit-0.25#18a48a5eeefd2aa6e50f5dd0751ac2e94c88a9eb"
Update to latest iced git, rebase fixes
2020-06-27 17:44:43 +00:00
dependencies = [
"bytemuck",
"glam",
"iced_native",
"iced_style",
"raw-window-handle",
Update to the latest git iced
2020-09-14 04:58:43 +00:00
"thiserror",
Update to latest iced git, rebase fixes
2020-06-27 17:44:43 +00:00
]
Initial setup to use iced
2019-12-15 17:13:52 +00:00
[[package]]
name = "iced_native"
Upgrade to winit 0.25
2021-06-15 08:01:57 +00:00
version = "0.4.0"
source = "git+https://github.com/Imberflur/iced?tag=winit-0.25#18a48a5eeefd2aa6e50f5dd0751ac2e94c88a9eb"
Initial setup to use iced
2019-12-15 17:13:52 +00:00
dependencies = [
"iced_core",
"iced_futures",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"num-traits",
Initial setup to use iced
2019-12-15 17:13:52 +00:00
"twox-hash",
"unicode-segmentation",
]
Update to latest iced git, rebase fixes
2020-06-27 17:44:43 +00:00
[[package]]
name = "iced_style"
Upgrade to winit 0.25
2021-06-15 08:01:57 +00:00
version = "0.3.0"
source = "git+https://github.com/Imberflur/iced?tag=winit-0.25#18a48a5eeefd2aa6e50f5dd0751ac2e94c88a9eb"
Update to latest iced git, rebase fixes
2020-06-27 17:44:43 +00:00
dependencies = [
"iced_core",
]
[[package]]
name = "iced_winit"
Upgrade to winit 0.25
2021-06-15 08:01:57 +00:00
version = "0.3.0"
source = "git+https://github.com/Imberflur/iced?tag=winit-0.25#18a48a5eeefd2aa6e50f5dd0751ac2e94c88a9eb"
Update to latest iced git, rebase fixes
2020-06-27 17:44:43 +00:00
dependencies = [
Update to the latest git iced
2020-09-14 04:58:43 +00:00
"iced_futures",
Update to latest iced git, rebase fixes
2020-06-27 17:44:43 +00:00
"iced_graphics",
"iced_native",
"log",
Update to the latest git iced
2020-09-14 04:58:43 +00:00
"thiserror",
Update to latest iced git, rebase fixes
2020-06-27 17:44:43 +00:00
"winapi 0.3.9",
Upgrade to winit 0.25
2021-06-15 08:01:57 +00:00
"window_clipboard",
Update to latest iced git, rebase fixes
2020-06-27 17:44:43 +00:00
"winit",
]
added const tweaker
2020-03-19 17:11:45 +00:00
[[package]]
name = "ident_case"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
first implementation of prometheus in veloren for git hash, tick times, chunks loaded, player online, entity count and light count
2019-09-06 14:21:09 +00:00
[[package]]
switch from hyper http to rouille for http server
2019-09-08 23:59:19 +00:00
name = "idna"
update dependencies
2021-06-04 07:44:30 +00:00
version = "0.2.3"
[i18n] Configurable fonts - Add font configuration in internationalization files - Scale font size using a configurable ratio - Add a script to identify translation item statuses using Git metadata - Execute the i18n script in a new gitlab-ci step (delayed) - Clone haxrcorp_4089_cyrillic_altgr font (haxrcorp_4089_cyrillic_altgr_extended) to add some additional latin characters (mainly for French)
2020-01-26 19:29:46 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies
2021-06-04 07:44:30 +00:00
checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
[i18n] Configurable fonts - Add font configuration in internationalization files - Scale font size using a configurable ratio - Add a script to identify translation item statuses using Git metadata - Execute the i18n script in a new gitlab-ci step (delayed) - Clone haxrcorp_4089_cyrillic_altgr font (haxrcorp_4089_cyrillic_altgr_extended) to add some additional latin characters (mainly for French)
2020-01-26 19:29:46 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"matches",
"unicode-bidi",
"unicode-normalization",
[i18n] Configurable fonts - Add font configuration in internationalization files - Scale font size using a configurable ratio - Add a script to identify translation item statuses using Git metadata - Execute the i18n script in a new gitlab-ci step (delayed) - Clone haxrcorp_4089_cyrillic_altgr font (haxrcorp_4089_cyrillic_altgr_extended) to add some additional latin characters (mainly for French)
2020-01-26 19:29:46 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "image"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
version = "0.23.14"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
(See sharp/lod-history) LOD, shadows, greedy meshing, new lighting, perf --- Pretty much a Veloren fork at this point. Here's a high level overview of the changes (will be added to CHANGELOG just before merge). At a high level this MR incorporates roughly two groups of changes. The first group consists of new game features: more flexible map sizes, level of detail terrain, shadow maps, and a new lighting engine. This is "feature work" that (mostly) only adds new things to Veloren, and mostly shouldn't affect old stuff. The second big group of changes are those addressing the fallout from all the new features. These include performance fixes of various sorts: the addition of multiple graphics options and optimization of the cheap ones to avoid work, switching all voxel models to use some variant of greedy meshing, switching over much of our CPU-side vector math to exploit SIMD instructions (coinciding with a fork of `vek`), and a rewrite of how the UI handles text rendering (coinciding with updates to our fork of `conrod`). Making Veloren's hardcoded colors appear correct under the new lighting engine also required considerably changes (TODO: Fill in this section when it's complete). The second category of changes often heavily touches code owned by other people, including frequently modified code "owned" by a handful of people, so I recommend that this code be reviewed particularly carefully. --- At a high level (each will be described in more detail below): - The world map has been refactored. - The world size is no longer hardcoded (@zesterer). - The map generation code was made generic to allow using it outside of the `world` crate (@zesterer). - On world creation, we now compute *horizon maps* (@zesterer). - The way we pass the world from the server to the client has been updated (@xMAC94x). - Artifacts related to image rotation were fixed (@imbris). - Multiflow rivers were enabled (@zesterer). - In the process of making changes related to the world map, various incidental fixes and optimizations were required. - The new *level of detail* feature was added (@zesterer wrote part of this and has checked out the rest). - A new LOD terrain rendering step was added to the pipeline. - The LOD terrain quality was made configurable via a graphics setting. - Horizon maps were used to cast shadows from LOD chunks on both LOD and non-LOD terrain. - A "voxelization" effect was incorporated into rendered LOD terrain to make it blend better into the world. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Veloren's lighting has been completely overhauled (@zesterer has already checked most of this out). - A semi-accurate index of refraction was assigned to our materials. - A new, more realistic, physically based approach to lighting was used using the *Ashikhmin Shirley* BRDF. - We emulate *atmospheric scattering* using equations designed for measuring solar panel light exposure. - We attempt to compute *realistic light attenuation* in water using its real material properties. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Point and directional lights now cast realistic shadows, using *shadow mapping.* (@imbris, @zesterer, @Treeco, @YuriMomo) - Point light shadow maps were added to the rendering pipeline, using geometry shaders and *seamless cube maps*. - Directional light shadows were added to the rendering pipeline, using LISPSM together with disabling *depth clamping*. - "Shadow-only" chunks and NPCs were added to prevent shadows from models behind you from disappearing. - In the process of making changes related to shadow maps, various incidental fixes and optimizations were required. The addition of shadow maps, LOD terrain, and the new lighting all led to significant performance degradation, on top of other changes happening in master. Therefore, a large number of performance improvements were also needed: - The graphics options were made much more flexible and configurable, and shaders were optimize. - New options were provided for how to render lights and shadows (@Pfauenauge, @zesterer). - Graphic setting storage and configuration were overhauled to make adding new features easier (@Pfauenauge, @imbris). - Shaders were rewritten to utilize GLSL's preprocessor to avoid overhead (@zesterer, @YuriMomo). - In the process of making changes related to providing additional rendering options, various incidental fixes and optimizations were required. - Voxel model creation was switched to use *greedy meshing.* - A new voxel meshing method, greedy meshing, was added (@imbris). - Uses of the older meshing methods were migrated to use greedy meshing (@imbris, @jshipsey, @Pfauenauge). - New restrictions were added to terrain, figure, and sprites to future proof them for further optimizations (@jshipsey, @Pfauenauge, @zesterer). - Most positions are now relative to either chunk or player position for better precision (@imbris, @zesterer, @scottc). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - Animation and terrain math were switched to use SIMD where possible. - Fixes were made to vek to make its SIMD feature usable for us (@zesterer, @imbris). - The interface and types used in bone animation were changed in various ways (@jshipsey, @Snowram, @Pfauenauge). - Redundant code generation for body animation is now partly taken care of by a macro (@jshipsey, @Snowram, @Pfauenauge). - Animation code was modified to to use vek's SIMD representation where possible (@jshipsey, @Snowram, @Pfauenauge). - Terrain meshing code and shadow map math were also modified to use vek's SIMD representation (@imbris). - SIMD instruction generation was enabled (@YuriMomo, @jshipsey, @Snowram, @imbris, @Angelonfira, @xMAC94x). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - The way we cache glyphs was completely refactored, fixed, and optimized. - Our fork of `conrod` was optimized in various ways (@imbris). - Our fork of `conrod` now exposes whether a widget was updated during the current frame (@imbris). - Our use of the glyph cache was rewritten for correctness (@imbris). - A *text cache* was introduced that lets us skip remeshing glyphs that have not changed (@imbris). - Various changes were made to reduce pressure on the glyph cache, with more planned (@imbris, @Pfauenauge). - In the process of making changes related to the glyph cache, various incidental fixes and optimizations were required. - Colors were changed to keep Veloren's look consistent with master. - Some older tree models were brought back (@Pfauenauge). - TODO(@Sharp): All hardcoded colors were extracted and made hotloadable. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Hardcoded colors were fixed to conform to Veloren's style. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Color models were fixed to conform to Veloren's style. A detailed description of the involved changes follows. --- - The world size is no longer hardcoded. All functions dependent on world size now take a `WorldSizeLg`, which holds the base 2 logarithm of each actual world dimension and is guaranteed to maintain certain properties (outlined in `common/src/terrain/map.rs`). Additionally, many utility functions that utilize the world size were moved into `common` as well (mostly `common/src/terrain/mod.rs`). Finally, the world map format was updated in order to store its size explicitly, with a migration path from the old format that should work whenever the old formatted map was a square (practically always). See `world/src/sim/mod.rs` for these changes. - The map generation code was made generic to allow using it outside of the `world` crate. The parts of the map generating code that do not need to query the world were moved over to `common/src/terrain/map.rs`, allowing them to be used from the client without creating a dependency on `world`. The rest of it was turned into helper functions in `world/src/sim/map.rs`, which can be passed as closures to the generic map generation code to complete its construction. This also means that colors are now passed in separately to the map generation function. See <https://veloren.net/devblog-78/> for more details. - On world creation, we now compute *horizon maps*. See the function in `world/src/sim/util.rs`. Given a height map and a plane intersecting that height map, our horizon maps allow us to encode enough information to reconstruct shadows for each point on the height map using only the *horizon angle* (the angle at which the sun starts to become visible). As Veloren's sun only covers one plane, this is sufficient for encoding sun shadows for LOD terrain, by encoding two angles per chunk (one for each 90 degrees the sun covers). We can also use this for the moon, if we want, since the moon follows the same path. Additionally, we store the *height* of the furthest occluder, to try to make the shadows volumetric; so this means 4 bytes in total for each chunk. Support for horizon maps has been merged into the map functionality in common as well. - The way we pass the world from the server to the client has been updated. Rather than passing the prerendered map, we instead pass three maps with values for each chunk; one with the color information, a second with altitude information, and a third with horizon map information. We then reconstruct the map on the client, together with some additional information we send from the server (like the sea level and maximum height). See `common/src/msg/server.rs` for a detailed description of the format of `WorldMapMsg`, and `server/src/libr.rs` and `client/src/lib.rs` for details of the map construction and parsing. - Artifacts related to image rotation were fixed. See the commit message for commit SHA `cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e` for a detailed explanation. This involved changes to shaders, the addition of a new type of graphic (also reflected in the graphic cache) that allows specifying a border color (which automatically makes the associated texture immutable), and some related fixes. I reproduce the first two paragraphs of the MR description as well: ``` Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). ``` - Multiflow rivers were enabled. This does not really need to be part of this MR, and would be easy to revert, but since it seemed to provide a nice improvement it's currently packaged with it. We already computed multiple outflows from each chunk for erosion purposes long before this MR. However, we never modified river rendering to be able to handle this case (just a single downhill river flow is complex enough!) so this was not exposed when deciding which chunks were rivers. Now that - In the process of making changes related to the world map, various incidental fixes and optimizations were required. Some examples of fixes include making sure terrain is never lowered to below sea level (to make the shadow maps report correct values), fixing map altitudes and colors to understand things like cliffs and "block level" coloring (that doesn'te xist on the column level), and fixing a crashbug when rendering images for the UI where source pixels are strongly rectangular. Some examples of related performance fixes include avoiding allocating a fresh vector for all the maps (i.e. copying it over to change the format from `[u32; n]` to `DynamicImage` and then copying again to convert to `RgbaImage`), and instead using the `gfx::memory::slice` function to accomplish the same thing. These sorts of changes are spread all arond the code. This includes the additon of a new scene, `voxygen/src/scene/lod.rs`, a new pipeline `voxygen/src/render/pipeline/lod_terrain.rs`, and new shaders `assets/vxygen/shaders/lod-terrain-vert.glsl` and `assets/vxygen/shaders/lod-terrain-frag.glsl`, as well as associated changes to the renderer in `voxygen/src/render/renderer.rs`. The main idea behind our initial approach to LOD was to take the world data we now get from the server (altitude, color, and horizon mapping). - Some previously computed values were turned into shader uniforms for better prediction on weak processors. (@zesterer) - Calls to power or trig functions were removed or replaced with multiplications, where possible. - After some deliberation - To properly handle sprite "waving" for nearby sprites, We explicitly designed the greedy meshing system with figures and sprites in mind. In both cases, we want to be able to *efficiently* pack many different models into the same texture, especially in cases where we know we will either not be removing any of the grouped-together from the models from the texture, or will remove all of them at once (so they can be packed into some specific subtexture). For sprites, since we know every model in advance and never intend to deallocate them, we currently pack them all as efficiently as possible into one giant tetxure atlas. However, in the future we might opt to pack them slightly less efficiently in exchange for shrinking the sprite vertex size. For figures, we pack all the textures for each *model* into the same atlas. is a global texture atlas used for every sprite, and for figures which is why we have the ability to mesh multiple models to the same texture area (using the simple texture atlas allocator) without requiring intermediate vector allocations. This is accomplished by delaying the time when we actually write the color and light data to the texture until *after* all the model vertices have been meshed; then, we can just allocate the whole color/light array at once, making the atlas we use an exact fit. In computer science-y terms, we accomplish this delay by, after we perform the initial greedy meshing (without texture information), not continuing to create the texture data, but instead constructing a *continuation*--that is, a function that, when called, will execute the rest of the computation. We push this continuation (which in Rust terms is a `FnOnce` closure that takes the `ColLightsInfo` that it is supposed to write to as context) onto a onto a vector resizing. To allow for suspended writes to texture data, Rust pointed out to me that the continuation that would eventually write the color and light data to the texture atlas (the one that is shared by all models sharing the same greedy mesher) would have to *own* whatever data it mshed. Because we often generate the model data to mesh as a temporary in `voxygen/src/load.rs`, the - Matrix multiplications in the shader were reduced for figure data (@zesterer). - Vertex "waves" for fluid data were removed. - Terrain "bending" near edges was removed. - Scaling was fixed to make sure empty space was not introduced in a space previously occupied by a block. It was also changed to take ownership of its voxel data, rather than sharing it, to let it be used with meshing. - Rust's nightly version was bumped in order to use the `array_map` function, which lets us reuse more code between the simple map and `FigureModelCache`. - PositionedGlyph::standalone. --- I tried to cite sources in many cases[^realtime],[^lloyd],[^lispsm],[^pbrt],[^greedy],[^tjunctions] where I needed features from elsewhere but I am particularly grateful for the following resources, esepcially where they have accompanying source code. I linked all of them that are accessible to the public (those that are not were obtained through legal means). [^realtime]: Eisemann, Elmar, Michael Schwarz, Ulf Assarsson, Michael Wimmer. Real-Time Shadows. A K Peters/CRC Press (T&F), 20160419. [^lloyd]: Lloyd,B. 2007. [Logarithmic perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). PhD thesis, University of North Carolina. [^lispsm]: Wimmer, M., Scherzer, D., and Purgathofer, W. 2004. [Light space perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). In Proceedings of Eurographics Symposium on Rendering 2004, pp. 143– 152. [^pbrt]: Pharr, Matt, et al. [http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf](Physically Based Rendering: From Theory to Implementation). Third edition, Morgan Kaufmann Publishers/Elsevier, 2017. [^greedy]: mikolalysenko. “Meshing in a Minecraft Game.” 0 FPS, 30 June 2012, <https://0fps.net/2012/06/30/meshing-in-a-minecraft-game/>. [^tjunctions]: blackflux. “Meshing in Voxel Engines – Part 1.” Blackflux.Com, 23 Feb. 2014, <https://blackflux.wordpress.com/2014/02/23/meshing-in-voxel-engines-part-1/>. I am also especially grateful to Khronos, Wikiepdia, and stackoverflow for answering many of my specific questions while writing the MR. --- Squashed commit of the following: commit 300505e7305a2fdac722a808ee8538323f215f39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 18:46:25 2020 +0200 Fixing cargo doc and typo in CHANGELOG. commit ec0aeb18e8499d7d84ef818331b4b65c3d76cea6 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 15:38:50 2020 +0200 Hopefully final commit for the LOD branch. commit 5e8ea0b1eaac02903a02feb2eb038d195de4872f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 10:14:26 2020 +0200 Falling back to power as stopgap. commit e44a1cbf46504ee9931a01bdc9033e145500d557 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 09:25:41 2020 +0200 Address imbris feedback. Temporarily disables shiny water, lowers max VD. These restrictions will be lifted soon after merging. commit 561e25778a108ac3712f5ec2ce3a51234c4430d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 08:31:13 2020 +0200 Tweaking shaders a bit. commit 7d19259078ce0dd7b3742ad7d0cb3fab3ece3fdc Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:59:43 2020 +0200 Fix view example as well. commit 051cd4934e0fad2c0b15db4380a4189fa318679f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:29:06 2020 +0200 Fix meshing benchmark. commit c95e07db3b4dcca285678985e65e31b927cb1c61 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 05:46:22 2020 +0200 Address MR feedback, fix scene clouds. commit 1bfb816cabdb3ffc1e507a009c2d98696b4b573a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:39:36 2020 +0200 Incorporating Pfau's figure color changes. New eyes and new humanoid colors. commit 3f9b89a3ac7b3356b1dba0d1a8f6541357f81469 Merge: e2f5162e4 62c53963a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:29:41 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit e2f5162e4f96f4124aa43488f7245d341b3dcfd4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:28:38 2020 +0200 World colors are all hotloadable. They live in assets/world/style/colors.ron. Only a small handful of hardcoed colors remain in World; they are either part of the map, or difficult to disentangle from the rest of the computation. Comments are made where appropriate. commit 62c53963abe1975009d34a8f9515a355bef24f31 Author: Marcel Märtens <marcel.cochem@googlemail.com> Date: Wed Aug 19 15:59:00 2020 +0200 replace pretty_env_logger with tracing commit 5b1625f99d9586fe80e2232f583ec5af9f953099 Merge: d71003acd 4942b5b39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:15:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit d71003acdabeff970b3928e97c26af6847b5b78e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:14:34 2020 +0200 Hotloading colors, part 1: colors in common. Currently, this just entails humanoid colors. There are only three colors not handled; the light emitter colors in common/src/comp/inventory/item/tool.rs. These don't seem important enough to me to warrant making hotloadable, at least not right now, but if it's needed later we can always add them to the file. commit 63b5e0e553eb2ea49276f192a6fc7dd65254270d Merge: c32b337a4 6d2c4b9c1 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 13:05:37 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c32b337a46e10d9de473d178a94a3ccd61c39bb3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:52:04 2020 +0200 Fixing LOD grid, for real. commit a166ae0360395387e09fb35a1f84210c2ce5ec24 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:28:05 2020 +0200 Addressing imbris's initial feedback. Fixes two minor bugs: explosion particles were no longer spawning randomly, and LOD grids were not perfectly even. commit 4cbad004f44060994252dd3d38647a14a589712f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:27:58 2020 +0200 Bumping nightly per request. commit 548680276aac77c25d43d16b5622f847d474dbef Merge: acc098604 8f8b20c91 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:26:06 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit acc0986040589a3492f88a740bc3c3fc693b26d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:28:32 2020 +0200 Lower resolution due to lying drivers. commit d3b878de2a52c358d2944a6bbd0555dad7fbdb10 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:15:38 2020 +0200 Fix issues msh encountered with Intel 4600. commit 10245e0c1b0cb6fae10d86409435364edc6102ef Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 21:15:02 2020 +0200 Merge more models into one mesh than we did previously. commit 3155c31e663c52ae5c3a53d5fb5665892a1a498a Merge: 7204cc8a7 3c199280e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:35:22 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7204cc8a7a4f74a30306bd205d9834fee4bb944f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:34:43 2020 +0200 Fix not yet done NPC animations. This forces them all to be the idle animation if not specified. This fixes issues where you'd have giant NPCs in water. commit bc83360f2a08918f19d417b5f772e1ff554dba08 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 19:36:37 2020 +0200 Try to fix some bugs: - Z fighting with LOD terrain and water. - Audio SFX not playing. commit 1fd104aa603bf3781b6526a5cada46aeca3049dd Merge: 862df3c99 7c2c392a3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 12:02:31 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 862df3c9976c4da9bd7cfd784f1a85973127968a Merge: 0a4218ed9 75c1d4401 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 05:52:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0a4218ed9d541a2b34c133351bea38a99ddf4ea7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 22:27:14 2020 +0200 Fix particle depth. commit f51dfdeb442d0dd5243dd2f344fa4be295bd0875 Merge: c6251a956 5e6dc0471 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:19:04 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit c6251a956ad376400dca5c23420cf8d213dc8fdf Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:15:46 2020 +0200 Cache figures more intelligently. Cache figures for longer, and don't cache character states for the player except where they actually affect the rendered model. commit 0ed801d5404982c6fb63b1eaa4567d908b294c9d Merge: c11b9bdf0 eea64f78f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 16:32:24 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c11b9bdf0a53bf9884d2f5a48fec9b01d582df1a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 11:47:15 2020 +0200 Remove unneeded Clippy annotation. commit 16aa9ef40af56d69289d00aafb3deadfb8bd4f35 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 8 00:53:02 2020 +0200 Fix hotloading and Clippy. commit 3dc973e0be5b758da1e9805eb764ad401374cd0c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 23:50:27 2020 +0200 Major speedups with SIMD. commit fba64a7d93d5a96077ce87287bbce6ab9b7fbcae Merge: 76429d00e d1e10b178 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:19 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 76429d00eea00d212fbd672a84ee91e75b19b938 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:10 2020 +0200 Add clippy.toml. commit c79f512f84dbb83cb82b7954db68ff241dfd8e41 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 11:55:20 2020 +0200 Fix all clippy issues, clean up Rust code. commit 6f90e010b3fbefb53b0d632e819931350015b6b8 Merge: 77a8c7c26 5929cfa5c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:30 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 77a8c7c267d3f44a1a62bd6b2274359973c5e4d4 Merge: b44e44232 44febaabd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:10 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 5929cfa5c713aa392110bbb62407f76caf53c3df Author: jshipsey <jshipsey18@gmail.com> Date: Thu Aug 6 20:47:27 2020 -0400 fixed in-hand arrow bug commit b44e442325d828f1cd564d66908f89d09e80474b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 6 13:40:35 2020 +0200 Miscellaneous performance improvements. commit be37acf287c1360d8085862526ac3365ffd1d768 Merge: 125d7fc6c c11876547 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 05:49:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 125d7fc6c4dcd8c8c5f27b8268a4d64f409f3644 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 04:55:31 2020 +0200 Abstract over simd vs. repr_c vectors. Also some minor improvements to Event size. commit d4d4956e9252e1241ce110b2aa85076c6b1e2a23 Merge: 5f3b7294a aced5f979 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:56:54 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 5f3b7294af1f8533edc2620b58863c248e2b07af Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:43:52 2020 +0200 Fix formatting issues I missed before. commit a428a3ebba70dcab63dd0f8cd983120c90617271 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:41:51 2020 +0200 Fix clippy warnings, part 1. There aer still a bunch of type too complex and function takes too many arguments warnings that I'll fix later (or ignore, since in the one case I did fix a function takes too many arguments warning I think it made the code *less* readable). commit ba54307540ed8a937ac08209730284fc653af85b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 30 13:22:42 2020 +0200 Fix light animations so they are removed when the light turns off. commit 7e0f4bcbf0f4717145d8beac40d52e3acebbe2aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 21:10:20 2020 +0200 Fix crash in edge case for pixel art. commit 56da06f7a351e2b949e9b014a90b974d511a0924 Merge: cf74d55f2 9f53a4a19 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:56:52 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:29:52 2020 +0200 Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). The first concern was addressed by fixing the dimensions of the map images drawn from the UI (so that we always use a square source rectangle, rather than a rectangular one according to the dimensions of the map). We also fixed the way rotation was done in the fragment shader for north-facing sources to make it properly handle aspect ratio (this was already done for north-facing targets). Together, these fix rendering issues peculiar to rectangular maps. The second and third concerns were jointly addressed by adding an optional border color to every 2D image drawn by the UI. This turns out not to waste extra space even though we hold a full f32 color (to avoid an extra dependency on gfx's PackedColor), since voxel images already take up more space than Optiion<[f32; 4]> requires. This is then implemented automatically using the "border color" wrapping method in the attached sampler. Since this is implemented in graphics hardware, it only works (at least naively) if the actual image bounds match the texture bounds. Therefore, we altered the way the graphics cache stores images with a border color to guarantee that they are always in their own texture, whose size exactly matches their extent. Since the easiest currently exposed way to set a border color is to do so for an immutable texture, we went a bit further and added a new "immutable" texture storage type used for these cases; currently, it is always and automatically used only when there is a specified border color, but in theory there's no reason we couldn't provide immutable-only images that use the default wrapping mdoe (though clamp to border is admittedly not a great default). To fix the maps case specifically, we set the border color to a translucent version of the ocean border color. This may need tweaking going forward, which shouldn't be hard. As part of this process, we had to modify graphics replacement to make sure immutable images are *removed* when invalidated, rather than just having a validity flag unset (this is normally done by the UI to try to reuse allocations in place if images are updated in benign ways, since the texture atlases used for Ui do not support deallocation; currently this is only used for item images, so there should be no overlap with immutable image replacement, so this was purely precautionary). Since we were already touching the relevant code, we also updated the image dependency to a newer version that provides more ways to avoid allocations, and made a few other changes that should hopefully eliminate redundant most of the intermediate buffer allocations we were performing for what should be zero-cost conversions. This may slightly improve performance in some cases. commit ad18ce939940a8c697270f6e9b94db9942fd8295 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 13:21:09 2020 +0200 Fix continent scale hack. commit 36b1cb074f5b195aebd7dbbc3da7f0246a1a18ec Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 12:11:40 2020 +0200 Enable loading different sized maps without a recompile. We may want to tweak the effects of the continent_scale_hack. commit 13b6d4d534cc4814b7cb3294ca41bbfea0a6b186 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 10:55:48 2020 +0200 Removing WORLD_SIZE, part 1. Erased almost every instance of WORLD_SIZE and replaced it with a local power of two, map_size_lg (which respects certain invariants; see common/src/terrain/map.rs for more details about MapSizeLg). This also means we can avoid a dependency on the world crate from client, as desired. Now that the rest of the code is not expecting a fixed WORLD_SIZE, the next step is to arrange for maps to store their world size, and to use that world size as a basis prior to loading the map (as well, probably, as prior to configuring some of the noise functions). commit 30b1d2c6428230a9eaa0d749cdcbbd6f1cbccd78 Merge: 7d56ba31b 1377b369f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:58 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 7d56ba31b445441461b28a07fc495d7d4f047c17 Merge: 2101113b4 598f14b25 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 1377b369f6db2258e910d467a5740f31789e3ded Author: Monty Marz <m.marzouq@gmx.de> Date: Sun Jul 19 23:25:38 2020 +0200 more saturated pumpkins commit ae8d50527f93bb0616c2ad46ce4dacb63bc37c6d Author: Monty Marz <m.marzouq@gmx.de> Date: Sat Jul 18 20:29:56 2020 +0200 acacia models commit 2101113b467e691de787392d7f20f1745f5637bd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 18 18:55:25 2020 +0200 Higher detail LOD. commit add2cfae04b4385fa5590e11e2bd5229d9dee0aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 16 01:57:39 2020 +0200 Revert some irrelevant stuff. commit 2e2ab3dc1eaa59a4aef7f8d34a53d8aae4c8553a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 15 13:30:49 2020 +0200 Fixing various things about shadows. * Correcting optimal LISPSM parameter. * Figure shadows are cast when they're not visible. * Chunk shadows stay cast until you look away. * Seamless cubemaps for point lights. * Etc. commit 6c31e6b56217274285b597af297036691ea5d897 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 19:50:26 2020 +0200 Fix shadow creation. commit 6332cbe006115ae205597529cd8bbccd146c2cca Merge: be438657c 930e0028b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:47:00 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit be438657c33d7b5bfb0a9582c3ed3fd366637323 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:28:08 2020 +0200 Tweaks to shadows. Added shadow map resolution configuration, added seamless cubemaps, documented all existing rendering options, and fixed a few Clippy errors. commit 23b4058906013c7d2a40c286e20e32c5fbd897ed Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 10:11:19 2020 +0200 Fix moon, use nonlinear noise for terrain. Note that the latter has a bit of performance cost. commit 7fbe5cbfbb9dc29607957b8e62f432a4deed193d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:23:02 2020 +0200 Address lies about max texture size. commit bcfc62b5e13a1cdd83f57535fde4694720bebfd9 Merge: 75e3626a7 18a08e8fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:22:08 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 75e3626a785919f43fdcf2127c2b10e3e4df2f9f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:21:52 2020 +0200 OpenGL 3.3 minimum. commit 18a08e8fe2739f02af99a5d2cb4e7c38c49e858b Author: Monty Marz <m.marzouq@gmx.de> Date: Tue Jul 7 23:57:52 2020 +0200 settings localization commit 90c5d1ca3620092bc3ae10b2211489eb1cf6f5e8 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 21:11:48 2020 +0200 Lower near distance. commit 0e66f02b25aaddaa2dfddbbc89cd67de54a9a7b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 20:09:01 2020 +0200 All sprites sway in the wind now. commit db1401a6910bf42dcf502462c90038752ff5fbdb Merge: 69e508d8c e8b4b29d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 19:34:17 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 69e508d8c94d8973033817ca86f357e466fc7c4d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 18:41:37 2020 +0200 Make it easy to switch to SIMD for math. commit ffe0f5928c7a7e87d00cb5426b3b1d831d7e02fd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 21:21:12 2020 +0200 Fix some issues with underwater rendering. commit bfda6da42f38fd02c31ee92c81ab785a3e50c2a0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 19:17:59 2020 +0200 Fix some minor display issues. commit 0ed752e087968cf901301884aaeae698e32ef8a5 Merge: ccc6a06a8 518edcb85 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:14:21 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit ccc6a06a8d4504d6b9f7af7905a414d2ee06ab76 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:04:34 2020 +0200 Some minor changes. commit 4e020246702889269efe1a191788992164c508d6 Merge: 50a64d927 e05c9267a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 16:17:40 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 50a64d927e6c4f4b0e4688e4cbfca694bc3f922a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 13:07:03 2020 +0200 Fix far plane. commit 7dd06da34cae8f9ea3b6c889fe965181f3fd3949 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:25:35 2020 +0200 Add shadows.glsl. commit 618a18c998778bf871b905a74657440fcc384c80 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:10:22 2020 +0200 Adding shadows, greedy meshing, and more. commit eaea83fe6a5cb1cb0ba8beef888183c718258496 Merge: 267018495 2f89b863e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 22:47:07 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 2670184954a13e4a9e7a4e35ba79aac0c5fac2f7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 21:20:01 2020 +0200 Make civsim and sites deterministic. For anything in worldgen where you use a HashMap, *please* think carefully about which hasher you are going to use! This is especially true if (for some reason) you are depending on hashmap iteration order remaining stable for some aspect of worldgen. commit f8376fd5dc72b4a9c2f51a6b4570d59c8b8e9343 Merge: 654f7e049 cdee191dd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 17:53:57 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 654f7e049258d9da27c09608bbe6a46ffa8787e5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed May 20 21:22:30 2020 +0200 Correct backface culling. commit 560501df05ca725409b0f2e4eb31bdfdc15fd0c7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue May 19 17:22:06 2020 +0200 Greedy messhing for shadows. commit a4d87e1875ca543436e6bbbeb20348facc5a52d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun May 17 05:59:00 2020 +0200 Shadow maps work for lantern. commit 243d0837b8a3b08172c9a3c348d964d7ddc2a0a8 Merge: 04382dc28 71dd520cd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:53:13 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 04382dc28632b6c66e8821f6870c0daaa1c1901a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:22:17 2020 +0200 WIP: better graphics config, better LOD, shadow maps. commit 22ddbad3eb32bfa70f0932176022208fe67ded81 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 18:54:09 2020 +0200 Minor shader fixes. commit 746a10e8d01ac235f994b0cde78fa48998602a1f Merge: 0f4a0e763 40ab94673 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 04:02:09 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0f4a0e763db3afbdc4fb0558611f38326ca87151 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 23:03:24 2020 +0200 Switch back to pop-in terrain. commit dd74fa7e4a53667b38811d7aec58d7f6a68889bb Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 22:58:55 2020 +0200 LOD shading closer to voxel shading. commit ef67bd58ba0bdaf622b078892d768263b6cba268 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 28 20:49:03 2020 +0200 Experimental underwater lighting. commit 2c5ad9d07605e80d5fd5679dd3a5d70c605b86a9 Merge: 748279835 303967a6f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 22:35:24 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7482798354eda18c8207950080fc24d443a369de Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 21:59:55 2020 +0200 Replace discard in figure-frag. commit d83b4ae69be4912f69bf7835f509c68a1c7770a4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:45:57 2020 +0200 Fix sprite lighting, HDR from focus_pos. commit 0594238004f116274905fa0ed7c2b6c417ed1d29 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:14:10 2020 +0200 Proper HDR from point lights. commit 48c93d2b41ce5743103d18e76cc228f5ac766492 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 14:01:43 2020 +0200 Brighter ambiance, darker LOD shadows. commit e0452e895ccfa8a43f368cae3b8b8aedc24dad93 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 13:13:23 2020 +0200 More proper HDR. commit 4c6da3ed16cfeebb455e40da5f557b4af9a499d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 00:13:10 2020 +0200 Trying LOD noise. commit 682a3d74c85df5503ffe1fc1cc891bce789df1ad Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 23:11:08 2020 +0200 Fix LOD heights in towns. commit cc39e5734e8b18f9077bf42e66337c1319dd6b6e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 21:01:23 2020 +0200 More LOD fixes. commit 8116b21c2e51c836e77894e309ac273caf2917b3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:54:43 2020 +0200 I like this coloring. commit bc2560ea90b36f4b46190005344232d993043ac3 Merge: 14effdd5d e690efe71 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:48:33 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 14effdd5db8747fcf3eb34f03b46b7792e92d1c5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:24:35 2020 +0200 Re-saturate. commit 48a643955d4435b78179acba0beb4a979905cc31 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:23:57 2020 +0200 Various fixes. commit f7b497a0c25f4ad4682c71dd1ed6f608052feb9b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 03:22:49 2020 +0200 Render figures again. commit 44e4aad48deba8266b9f8bdfd3db096b381f5327 Merge: e6f0a5a98 9ec319a18 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 02:01:04 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit e6f0a5a981a82533ba188fff0a54ce98577bb152 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 24 16:12:20 2020 +0200 Add atmospheric scattering. commit f2953087f691a8edbc001cb98ebf5059fc6f8ac0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 23 00:01:20 2020 +0200 Fix shadowing for specular reflections. commit ddd4a67a9799b8d08c7dc0c2bec90621c2bed0e3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Apr 22 22:56:12 2020 +0200 HDR fixes. commit 1015e60deef3c447381996277df7496707a63bd0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 21 18:25:19 2020 +0200 More lighting changes. commit 80c264abd111fb237e57843efcb5c071d4f84613 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 13 00:29:59 2020 +0200 Lighting experiments. commit 8414987e589dd5102bad89762a3adaccc0bfe957 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 9 02:38:40 2020 +0200 WIP -- lighting changes and soft shadows. commit 9cd2b3fb0d6b49776c6dfe463e4169637250b11a Merge: c7ea687eb 8b149ad11 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:29 2020 +0200 Merge branch 'sharp/new-lighting' into sharp/small-fixes commit c7ea687ebbc5aace1b455f134a5bf49ce2c7434a Merge: 476441531 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:02 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 8b149ad11ad4bb75018fcf9519baec27d1c95951 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:32:39 2020 +0200 Trying out a new lighting model. commit b0ac9f36f755dd06f7c17c46150568064790864f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 07:56:11 2020 +0200 Use bicubic interpolation for terrain. commit f6fc9307a121514b614bc50ef8eb055953e7da8a Merge: 33140a295 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 05:01:41 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 4764415312aae6e9ac2d00e86e84577cb958f1ab Merge: ed2d0111d 13388ee6a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 04:54:48 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 13388ee6a42943f3f79a9cb488346cef18e272fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 20:30:08 2020 +0200 Various fixes (to coloring and to soft shadows). commit fbd084a94a067082a87cd6d28b82054709bc9265 Merge: 5a089863b 4fdf6896a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 18:50:38 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/map-colors commit ed2d0111d994262ae836d84d1fe5a45e4de72a0b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 06:49:27 2020 +0200 Combining colors and LOD. commit 88342640c6b835114d01c797b89fdede3b0a2108 Merge: 33140a295 5a089863b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:49:20 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 33140a2951b8212725f42c758b277aaec4d888f7 Merge: 4c65a5aed f34d4b379 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:36:21 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 5a089863beb01d4794bbe3580ada47b278715ea2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 03:17:49 2020 +0200 Making maps brighter. This is probably not the right way to do it, but oh well! commit 32b2c99109dd486aa922886081068f9c550c83f2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 02:46:36 2020 +0200 Horizon mapping and "layered" map generation. Horizon mapping is a method of shadow mapping specific to height maps. It can handle any angle between 0 and 90 degrees from the ground, as long as know the horizontal direction in advance, by remembering only a single angle (the "horizon angle" of the shadow map). More is explained in common/src/msg/server.rs. We also remember the approximate height of the largest occluder, to try to be able to generate soft shadows and create a vertical position where the shadows can't go higher. Additionally, map generation has been reworked. Instead of computing everything from explicit samples, we pass in sampling functions that return exactly what the map generator needs. This allows us to cleanly separate the way we sample things like altitudes and colors from the map generation process. We exploit this to generate maps *partially* on the server (with colors and rivers, but not shading). We can then send the partially completed map to the client, which can combine it with shadow information to generate the final map. This is useful for two reasons: first, it makes sure the client can apply shadow information by itself, and second, it lets us pass the unshaded map for use with level of detail functionality. For similar reasons, river generation is split out into its own layer, but for now we opt to still generate rivers on the server (since the river wire format is more complicated to compress and may require some extra work to make sure we have enough precision to draw rivers well enough for LoD). Finally, the mostly ad-hoc lighting we were performing has been (mostly) replaced with explicit Phong reflection shading (including specular highlights). Regularizing this seems useful and helps clarify the "meaning" of the various light intensities, and helps us keep a more physically plausible basis. However, its interaction with soft shadows is still imperfect, and it's not yet clear to me what we need to do to turn this into something useful for LoD. commit f8926a5737ddc51f3d585c651a64c43677aae0f4 Merge: a1aee931e 875ae6ced Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Mar 13 13:32:42 2020 +0100 Merge remote-tracking branch 'origin/master' into sharp/map-colors commit 4c65a5aed353b119aea65a2aaeb94549b67beb42 Author: Treeco <5021038-Treeco@users.noreply.gitlab.com> Date: Mon Feb 24 16:48:05 2020 +0000 Made LOD setting slider exponential commit 2fa7b2d20d7233dc8bfd64f9f7f54617575248f1 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 17:49:53 2020 +0000 Added mist to LoD commit aab059a450b5f635777129ff82cc15b662965c3c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 15:14:06 2020 +0000 Added LoD slider commit 779c36b538121c5ade3633ae5cb67bb14c8c3877 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:54:55 2020 +0000 Reduced cost of vertex pushing commit 9fea150473906b166365b738ebcea07c697daf3d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:38:53 2020 +0000 Fixed maths, improved LoD resolution commit 5481df38fea5bf183ff376a3337179cfaa5233dc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 11:22:50 2020 +0000 Dynamically relocate LoD vertices to enhance details commit a3e36a50ababd615da7db1b26158c7906a5def01 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 18:13:51 2020 +0000 Simpler terrain spiral rendering commit 255f450ae9ac8763db4bede075fb409161ed57cc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:53:17 2020 +0000 Better LoD precision commit 3d027aebe812a5b8658a4eb8123dc9f61b3776d2 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:04:03 2020 +0000 Better falloff commit be775c9484b457b2c0b1a494aec03392d0c70e76 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 15:30:45 2020 +0000 Applied good ideas from experimental branch commit 58587b68545a23c5c04ab4574a4b94b3bc982246 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 16:15:13 2020 +0000 Minor fixes to LoD merging commit 7b42aebd709c14df2db766aad61d9280ad24d84d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 15:04:44 2020 +0000 Capped LoD dragging commit 8aafc559f87124e1ea5ca6e3ddc2aa0c242d793c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:54:37 2020 +0000 Better blending between LoD and terrain border commit edd3455d5161792d87ddc8eadc0ecbad5532b284 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:40:19 2020 +0000 Fixed LoD z depth, added sea level offset commit b9b06744620114dd5556e73f64fa93c145503a7c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:27:43 2020 +0000 Better LoD smoothing commit a1aee931e790431560cd2d953ad61d9497072afd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Feb 21 14:52:17 2020 +0100 Adding shadows. commit 2400786c13dd891c131ed86d48d05df516a8a778 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 13:48:40 2020 +0000 Use world map as LoD source commit dbf650f504a4c25fbbc2096ac3616c736bf52d23 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Jan 20 00:48:14 2020 +0000 Better clouds at distance commit 5e6f81b86cdb9730b9b056877b19257075fd5fa8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Jan 19 23:59:02 2020 +0000 sync commit 745e7540ddb000cc645f612767b337c2ddc3f7c0 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 12:40:48 2019 +0000 Improved cloud falloff mist, faster noise sampling commit f6a200d0cb866196ba57697466755f9e0c7ea5d8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 10:09:00 2019 +0000 Improved long-range depth precision, removed unnecessary LoD polygons commit 63d1b2bb2292898d59fb4f4e502201103dfeb86f Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 20:57:46 2019 +0000 Working LoD shader commit f13d98ee3e58f881e8b978861a67663b59ed91ec Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 11:03:40 2019 +0000 LoD first attempt (stack overflow issue)
2020-08-20 18:34:59 +00:00
"bytemuck",
Propper Compression support of network. - Compression is no longer enabled always but can now be enabled per Stream. If a Stream is Compression enabled it will compress and decompress all msg (except for `raw` access) before handling them internally. You need to handle compression yourself for `raw` fn. - added a new feature to the network crate to enable or disable the compression - switched to `lz-fear` instead of `lz4-compression` - use `bitflags` to represent the `Promises` struct
2020-08-25 13:32:42 +00:00
"byteorder",
get rid of some insecure dependencies
2020-12-16 09:42:36 +00:00
"color_quant",
Add JPEG, PNG, and mixed compression for terrain.
2021-04-22 00:06:25 +00:00
"jpeg-decoder",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"num-iter",
update further crates
2020-12-16 00:07:39 +00:00
"num-rational 0.3.2",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"num-traits",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"png",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
Add initial region system implementation
2019-10-04 00:41:42 +00:00
[[package]]
name = "indexmap"
update depednencies
2021-07-08 10:21:02 +00:00
version = "1.7.0"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update depednencies
2021-07-08 10:21:02 +00:00
checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"autocfg",
update depednencies
2021-07-08 10:21:02 +00:00
"hashbrown 0.11.2",
Parallelize entity sync loop over regions.
2021-12-25 23:06:55 +00:00
"rayon",
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
"serde",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
progress
2021-11-27 00:03:10 +00:00
[[package]]
name = "inline_tweak"
version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7033e97b20277cc0d043226d1940fa7719ff08d2305d1fc7421e53066d00eb4b"
dependencies = [
"lazy_static",
]
Use assets_manager to load assets
2020-12-12 22:14:24 +00:00
[[package]]
name = "inotify"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4816c66d2c8ae673df83366c18341538f234a26d65a9ecea5c348b453ac1d02f"
dependencies = [
"bitflags",
"inotify-sys",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
Use assets_manager to load assets
2020-12-12 22:14:24 +00:00
]
Move shaders, start asset reloading system
2019-08-03 05:42:33 +00:00
[[package]]
name = "inotify"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.9.6"
Move shaders, start asset reloading system
2019-08-03 05:42:33 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff"
Move shaders, start asset reloading system
2019-08-03 05:42:33 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"bitflags",
"inotify-sys",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
Move shaders, start asset reloading system
2019-08-03 05:42:33 +00:00
]
[[package]]
name = "inotify-sys"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
version = "0.1.5"
Move shaders, start asset reloading system
2019-08-03 05:42:33 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
Move shaders, start asset reloading system
2019-08-03 05:42:33 +00:00
dependencies = [
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
Move shaders, start asset reloading system
2019-08-03 05:42:33 +00:00
]
Started the report of wgpu
2020-08-21 19:10:56 +00:00
[[package]]
name = "inplace_it"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "90953f308a79fe6d62a4643e51f848fbfddcd05975a38e69fdf4ab86a7baf7ca"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "instant"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.1.12"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
dependencies = [
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"cfg-if 1.0.0",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
Added Controller support
2020-03-10 21:00:13 +00:00
[[package]]
name = "io-kit-sys"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f21dcc74995dd4cd090b147e79789f8d65959cbfb5f0b118002db869ea3bd0a0"
dependencies = [
Updated to winit 20
2019-10-26 14:50:01 +00:00
"core-foundation-sys 0.6.2",
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
"mach 0.2.3",
Added Controller support
2020-03-10 21:00:13 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "iovec"
change(log): switch to fern
2019-10-08 15:42:13 +00:00
version = "0.1.4"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
update a few deps
2021-01-20 14:53:58 +00:00
[[package]]
name = "itertools"
update depednencies
2021-07-08 10:21:02 +00:00
version = "0.10.1"
update a few deps
2021-01-20 14:53:58 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update depednencies
2021-07-08 10:21:02 +00:00
checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf"
update a few deps
2021-01-20 14:53:58 +00:00
dependencies = [
"either",
]
Added randomized NPC names veloren/veloren#133
2019-06-01 19:24:17 +00:00
[[package]]
name = "itoa"
update crates
2021-09-20 10:05:41 +00:00
version = "0.4.8"
Added randomized NPC names veloren/veloren#133
2019-06-01 19:24:17 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
Added randomized NPC names veloren/veloren#133
2019-06-01 19:24:17 +00:00
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
[[package]]
name = "jni"
update crates
2021-09-20 10:05:41 +00:00
version = "0.19.0"
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec"
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
dependencies = [
"cesu8",
update dependencies
2021-03-21 21:53:44 +00:00
"combine",
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
"jni-sys",
"log",
update dependencies
2021-03-21 21:53:44 +00:00
"thiserror",
update dependencies and fix audio issues fixed #1027 fixed #1033 fixed #1020 fixed #1017 fixed #1029 fixed #1025 fixed #807 fixed #816 fixed #1004 fixed #1005
2021-03-29 07:45:00 +00:00
"walkdir 2.3.2",
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
]
Winit 0.22 released
2020-03-13 04:05:06 +00:00
[[package]]
name = "jni-sys"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
[i18n] Configurable fonts - Add font configuration in internationalization files - Scale font size using a configurable ratio - Add a script to identify translation item statuses using Git metadata - Execute the i18n script in a new gitlab-ci step (delayed) - Clone haxrcorp_4089_cyrillic_altgr font (haxrcorp_4089_cyrillic_altgr_extended) to add some additional latin characters (mainly for French)
2020-01-26 19:29:46 +00:00
[[package]]
name = "jobserver"
update crates
2021-09-20 10:05:41 +00:00
version = "0.1.24"
[i18n] Configurable fonts - Add font configuration in internationalization files - Scale font size using a configurable ratio - Add a script to identify translation item statuses using Git metadata - Execute the i18n script in a new gitlab-ci step (delayed) - Clone haxrcorp_4089_cyrillic_altgr font (haxrcorp_4089_cyrillic_altgr_extended) to add some additional latin characters (mainly for French)
2020-01-26 19:29:46 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa"
[i18n] Configurable fonts - Add font configuration in internationalization files - Scale font size using a configurable ratio - Add a script to identify translation item statuses using Git metadata - Execute the i18n script in a new gitlab-ci step (delayed) - Clone haxrcorp_4089_cyrillic_altgr font (haxrcorp_4089_cyrillic_altgr_extended) to add some additional latin characters (mainly for French)
2020-01-26 19:29:46 +00:00
dependencies = [
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
[i18n] Configurable fonts - Add font configuration in internationalization files - Scale font size using a configurable ratio - Add a script to identify translation item statuses using Git metadata - Execute the i18n script in a new gitlab-ci step (delayed) - Clone haxrcorp_4089_cyrillic_altgr font (haxrcorp_4089_cyrillic_altgr_extended) to add some additional latin characters (mainly for French)
2020-01-26 19:29:46 +00:00
]
Add JPEG, PNG, and mixed compression for terrain.
2021-04-22 00:06:25 +00:00
[[package]]
name = "jpeg-decoder"
version = "0.1.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2"
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
[[package]]
name = "js-sys"
update crates
2021-09-20 10:05:41 +00:00
version = "0.3.55"
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84"
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"wasm-bindgen",
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
]
Adding many new types of geomorphic laws: - soil production (currently disabled). - debris flow erosion (combined with regular stream power law). - flow computation using multiple receivers. - filling strategy during drainage network calculations. Also tweaks a variety of other aspects of erosion.
2020-01-11 21:05:22 +00:00
[[package]]
name = "kernel32-sys"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
Adding many new types of geomorphic laws: - soil production (currently disabled). - debris flow erosion (combined with regular stream power law). - flow computation using multiple receivers. - filling strategy during drainage network calculations. Also tweaks a variety of other aspects of erosion.
2020-01-11 21:05:22 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"winapi 0.2.8",
"winapi-build",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
Display keys based off of scancodes Queries the OS to translate physical keyboard scancodes into Strings that can be shown in the UI. Addresses issues #861 and #354
2021-03-31 12:56:56 +00:00
[[package]]
name = "keyboard-keynames"
version = "0.1.0"
Update crate for keyboard-keynames This revision includes a fix for supporting Aarch64 platforms Signed-off-by: Jon Nettleton <jon@solid-run.com> (cherry picked from commit a5e64af19972b555cb3b61396324f6a315285bac)
2021-11-01 15:33:40 +00:00
source = "git+https://gitlab.com/Frinksy/keyboard-keynames.git?branch=develop#1ae010ca032a57dfe0ba01d4346a3b03bde36de0"
Display keys based off of scancodes Queries the OS to translate physical keyboard scancodes into Strings that can be shown in the UI. Addresses issues #861 and #354
2021-03-31 12:56:56 +00:00
dependencies = [
build: use git keyboard-keynames to fix nix build error
2021-04-16 15:09:57 +00:00
"libc",
"memmap",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"wayland-client 0.28.6",
Display keys based off of scancodes Queries the OS to translate physical keyboard scancodes into Strings that can be shown in the UI. Addresses issues #861 and #354
2021-03-31 12:56:56 +00:00
"winapi 0.3.9",
"winit",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"xcb 0.9.0",
build: update keyboard-keynames
2021-08-03 15:16:55 +00:00
"xkbcommon-sys 0.7.6",
Display keys based off of scancodes Queries the OS to translate physical keyboard scancodes into Strings that can be shown in the UI. Addresses issues #861 and #354
2021-03-31 12:56:56 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
Finished porting all pipelines
2020-09-13 10:03:42 +00:00
name = "khronos-egl"
Almost implement instance merging for sprites (validation error), rebase fix
2021-01-31 03:50:03 +00:00
version = "4.1.0"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Almost implement instance merging for sprites (validation error), rebase fix
2021-01-31 03:50:03 +00:00
checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3"
Finished porting all pipelines
2020-09-13 10:03:42 +00:00
dependencies = [
"libc",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"libloading 0.7.2",
Finished porting all pipelines
2020-09-13 10:03:42 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
Add block statistics generator to world/examples.
2021-06-28 19:02:57 +00:00
[[package]]
name = "kiddo"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8d9d9b46f84e6d21fda457c8d7a5ed0e50382355194a47f28a3747ce6b5351d4"
dependencies = [
"num-traits",
]
[[package]]
name = "kiddo"
version = "0.2.1"
Add block statistics generator to world/examples.
2021-06-28 19:02:57 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "b65ad2193b81d1050ae6570a00c96e6bd1b3ea0e2a3c3831f02cf6891613c329"
Add block statistics generator to world/examples.
2021-06-28 19:02:57 +00:00
dependencies = [
"num-traits",
]
update crates
2021-09-20 10:05:41 +00:00
[[package]]
name = "kqueue"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "058a107a784f8be94c7d35c1300f4facced2e93d2fbe5b1452b44e905ddca4a9"
dependencies = [
"kqueue-sys",
"libc",
]
[[package]]
name = "kqueue-sys"
version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587"
dependencies = [
"bitflags",
"libc",
]
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
[[package]]
name = "lazy-bytes-cast"
version = "5.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "10257499f089cd156ad82d0a9cd57d9501fa2c989068992a97eb3c27836f206b"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "lazy_static"
Remove vek patch, it's on crates.io now
2019-08-26 12:21:04 +00:00
version = "1.4.0"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "lazycell"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
version = "1.3.0"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
[[package]]
name = "leb128"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.2.5"
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67"
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
Play random music whenever a track ends To support this, a global_state.maintain() method was added that calls audio.maintain(). Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a
2019-05-18 19:28:12 +00:00
[[package]]
name = "lewton"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
version = "0.10.2"
Play random music whenever a track ends To support this, a global_state.maintain() method was added that calls audio.maintain(). Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a
2019-05-18 19:28:12 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "777b48df9aaab155475a83a7df3070395ea1ac6902f5cd062b8f2b028075c030"
Play random music whenever a track ends To support this, a global_state.maintain() method was added that calls audio.maintain(). Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a
2019-05-18 19:28:12 +00:00
dependencies = [
Propper Compression support of network. - Compression is no longer enabled always but can now be enabled per Stream. If a Stream is Compression enabled it will compress and decompress all msg (except for `raw` access) before handling them internally. You need to handle compression yourself for `raw` fn. - added a new feature to the network crate to enable or disable the compression - switched to `lz-fear` instead of `lz4-compression` - use `bitflags` to represent the `Promises` struct
2020-08-25 13:32:42 +00:00
"byteorder",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"ogg",
updated dependencies and fixed stuff - replace serde_derive by feature of serde incl. source code modifications to compile - reduce futures-timer to "2.0" to be same as async_std - update notify - removed mio, bincode and lz4 compress in common as networking is now in own crate btw there is a better lz4 compress crate, which is newer than 2017 - update prometheus to 0.9 - can't update uvth yet due to usues - hashbrown to 7.2 to only need a single version - libsqlite3 update - image didn't change as there is a problem with `image 0.23` - switch old directories with newer directories-next - no num upgrade as we still depend on num 0.2 anyways - rodio and cpal upgrade - const-tewaker update - dispatch (untested) update - git2 update - iterations update
2020-07-06 14:23:08 +00:00
"tinyvec",
Play random music whenever a track ends To support this, a global_state.maintain() method was added that calls audio.maintain(). Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a
2019-05-18 19:28:12 +00:00
]
Began integrating procgen trees
2021-01-03 20:43:07 +00:00
[[package]]
name = "libc"
In case of IPv6 and NON Windows make sure to not listen on dualstack, for that we need to create a socket2 socket and set_only_v6 to true. We need to privude set_nonblocking for tokio to work and we need to set reuseaddr for it to work on linux systems
2022-01-29 18:50:32 +00:00
version = "0.2.116"
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
In case of IPv6 and NON Windows make sure to not listen on dualstack, for that we need to create a socket2 socket and set_only_v6 to true. We need to privude set_nonblocking for tokio to work and we need to set reuseaddr for it to work on linux systems
2022-01-29 18:50:32 +00:00
checksum = "565dbd88872dbe4cc8a46e527f26483c1d1f7afa6b884a3bd6cd893d4f98da74"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
[i18n] Configurable fonts - Add font configuration in internationalization files - Scale font size using a configurable ratio - Add a script to identify translation item statuses using Git metadata - Execute the i18n script in a new gitlab-ci step (delayed) - Clone haxrcorp_4089_cyrillic_altgr font (haxrcorp_4089_cyrillic_altgr_extended) to add some additional latin characters (mainly for French)
2020-01-26 19:29:46 +00:00
[[package]]
name = "libgit2-sys"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.12.25+1.3.0"
[i18n] Configurable fonts - Add font configuration in internationalization files - Scale font size using a configurable ratio - Add a script to identify translation item statuses using Git metadata - Execute the i18n script in a new gitlab-ci step (delayed) - Clone haxrcorp_4089_cyrillic_altgr font (haxrcorp_4089_cyrillic_altgr_extended) to add some additional latin characters (mainly for French)
2020-01-26 19:29:46 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "8f68169ef08d6519b2fe133ecc637408d933c0174b23b80bb2f79828966fbaab"
[i18n] Configurable fonts - Add font configuration in internationalization files - Scale font size using a configurable ratio - Add a script to identify translation item statuses using Git metadata - Execute the i18n script in a new gitlab-ci step (delayed) - Clone haxrcorp_4089_cyrillic_altgr font (haxrcorp_4089_cyrillic_altgr_extended) to add some additional latin characters (mainly for French)
2020-01-26 19:29:46 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"cc",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"libz-sys",
"pkg-config",
[i18n] Configurable fonts - Add font configuration in internationalization files - Scale font size using a configurable ratio - Add a script to identify translation item statuses using Git metadata - Execute the i18n script in a new gitlab-ci step (delayed) - Clone haxrcorp_4089_cyrillic_altgr font (haxrcorp_4089_cyrillic_altgr_extended) to add some additional latin characters (mainly for French)
2020-01-26 19:29:46 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "libloading"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
version = "0.6.7"
dependency reduction: - authc no longer uses reqwest - image only supports PNG - replace routille with tiny_http - several other dependencies - cargo upgrade - following improvement was measured on R7 1700X: before: - cargo build: 3076.73s user / 4:45 total / 589 dependencies - cargo test: 6118.38s user / 7:30 total / 959 dependencies after: - cargo build: 2680.54s user / 4:05 total / 480 dependencies - cargo test: 5351.81s user / 7:04 total / 791 dependencies - added xMAC94x to CODEOWNERS for Cargo.toml, he will protect them from now on and hit people with evil looks ;)
2020-06-01 00:13:35 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "351a32417a12d5f7e82c368a66781e307834dae04c6ce0cd4456d52989229883"
dependency reduction: - authc no longer uses reqwest - image only supports PNG - replace routille with tiny_http - several other dependencies - cargo upgrade - following improvement was measured on R7 1700X: before: - cargo build: 3076.73s user / 4:45 total / 589 dependencies - cargo test: 6118.38s user / 7:30 total / 959 dependencies after: - cargo build: 2680.54s user / 4:05 total / 480 dependencies - cargo test: 5351.81s user / 7:04 total / 791 dependencies - added xMAC94x to CODEOWNERS for Cargo.toml, he will protect them from now on and hit people with evil looks ;)
2020-06-01 00:13:35 +00:00
dependencies = [
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"cfg-if 1.0.0",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"winapi 0.3.9",
dependency reduction: - authc no longer uses reqwest - image only supports PNG - replace routille with tiny_http - several other dependencies - cargo upgrade - following improvement was measured on R7 1700X: before: - cargo build: 3076.73s user / 4:45 total / 589 dependencies - cargo test: 6118.38s user / 7:30 total / 959 dependencies after: - cargo build: 2680.54s user / 4:05 total / 480 dependencies - cargo test: 5351.81s user / 7:04 total / 791 dependencies - added xMAC94x to CODEOWNERS for Cargo.toml, he will protect them from now on and hit people with evil looks ;)
2020-06-01 00:13:35 +00:00
]
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
[[package]]
name = "libloading"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.7.2"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "afe203d669ec979b7128619bae5a63b7b42e9203c1b29146079ee05e2f604b52"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
dependencies = [
"cfg-if 1.0.0",
"winapi 0.3.9",
]
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
[[package]]
name = "libm"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a"
Add CustomPath to Travel enum Defines a custom path to follow, instead of using one from the World. Airships use this to slightly adjust their course to reduce collisions.
2021-04-04 10:55:15 +00:00
[[package]]
name = "libm"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
- Load characters after login. - Make the character screen load with an empty character list from the server, send event to the server for character creation with data, but not yet saving them to the DB. - Working but messy character saving to DB - Add the character_data to the client, rather than keep it in the GLobalState.
2020-05-09 15:41:25 +00:00
[[package]]
name = "libsqlite3-sys"
* Replaced `diesel` with `rusqlite` and `refinery` * Added "migration of migrations" to transfer the data from the __diesel_schema_migrations table to the refinery_schema_history table * Removed all down migrations as refinery does not support down migrations * Changed all diesel up migrations to refinery naming format * Added --sql-log-mode parameter to veloren-server-cli to allow SQL tracing and profiling * Added /disconnect_all_players admin command * Added disconnectall CLI command * Fixes for several potential persistence-related race conditions
2021-04-13 22:05:47 +00:00
version = "0.20.1"
- Load characters after login. - Make the character screen load with an empty character list from the server, send event to the server for character creation with data, but not yet saving them to the DB. - Working but messy character saving to DB - Add the character_data to the client, rather than keep it in the GLobalState.
2020-05-09 15:41:25 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
* Replaced `diesel` with `rusqlite` and `refinery` * Added "migration of migrations" to transfer the data from the __diesel_schema_migrations table to the refinery_schema_history table * Removed all down migrations as refinery does not support down migrations * Changed all diesel up migrations to refinery naming format * Added --sql-log-mode parameter to veloren-server-cli to allow SQL tracing and profiling * Added /disconnect_all_players admin command * Added disconnectall CLI command * Fixes for several potential persistence-related race conditions
2021-04-13 22:05:47 +00:00
checksum = "64d31059f22935e6c31830db5249ba2b7ecd54fd73a9909286f0a67aa55c2fbd"
- Load characters after login. - Make the character screen load with an empty character list from the server, send event to the server for character creation with data, but not yet saving them to the DB. - Working but messy character saving to DB - Add the character_data to the client, rather than keep it in the GLobalState.
2020-05-09 15:41:25 +00:00
dependencies = [
"cc",
"pkg-config",
"vcpkg",
]
Added Controller support
2020-03-10 21:00:13 +00:00
[[package]]
name = "libudev-sys"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324"
dependencies = [
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
Added Controller support
2020-03-10 21:00:13 +00:00
"pkg-config",
]
[i18n] Configurable fonts - Add font configuration in internationalization files - Scale font size using a configurable ratio - Add a script to identify translation item statuses using Git metadata - Execute the i18n script in a new gitlab-ci step (delayed) - Clone haxrcorp_4089_cyrillic_altgr font (haxrcorp_4089_cyrillic_altgr_extended) to add some additional latin characters (mainly for French)
2020-01-26 19:29:46 +00:00
[[package]]
name = "libz-sys"
update dependencies
2021-06-04 07:44:30 +00:00
version = "1.1.3"
[i18n] Configurable fonts - Add font configuration in internationalization files - Scale font size using a configurable ratio - Add a script to identify translation item statuses using Git metadata - Execute the i18n script in a new gitlab-ci step (delayed) - Clone haxrcorp_4089_cyrillic_altgr font (haxrcorp_4089_cyrillic_altgr_extended) to add some additional latin characters (mainly for French)
2020-01-26 19:29:46 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies
2021-06-04 07:44:30 +00:00
checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66"
[i18n] Configurable fonts - Add font configuration in internationalization files - Scale font size using a configurable ratio - Add a script to identify translation item statuses using Git metadata - Execute the i18n script in a new gitlab-ci step (delayed) - Clone haxrcorp_4089_cyrillic_altgr font (haxrcorp_4089_cyrillic_altgr_extended) to add some additional latin characters (mainly for French)
2020-01-26 19:29:46 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"cc",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"pkg-config",
"vcpkg",
[i18n] Configurable fonts - Add font configuration in internationalization files - Scale font size using a configurable ratio - Add a script to identify translation item statuses using Git metadata - Execute the i18n script in a new gitlab-ci step (delayed) - Clone haxrcorp_4089_cyrillic_altgr font (haxrcorp_4089_cyrillic_altgr_extended) to add some additional latin characters (mainly for French)
2020-01-26 19:29:46 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "linked-hash-map"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
version = "0.5.4"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[Voxygen] Switch mutexes to parking_lot and channels to crossbeam.
2019-08-15 22:07:09 +00:00
[[package]]
name = "lock_api"
fix workspaces and Cargo dependencies
2020-05-27 16:20:16 +00:00
version = "0.3.4"
[Voxygen] Switch mutexes to parking_lot and channels to crossbeam.
2019-08-15 22:07:09 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
fix workspaces and Cargo dependencies
2020-05-27 16:20:16 +00:00
checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75"
[Voxygen] Switch mutexes to parking_lot and channels to crossbeam.
2019-08-15 22:07:09 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"scopeguard",
[Voxygen] Switch mutexes to parking_lot and channels to crossbeam.
2019-08-15 22:07:09 +00:00
]
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
[[package]]
name = "lock_api"
update crates
2021-09-20 10:05:41 +00:00
version = "0.4.5"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
dependencies = [
"scopeguard",
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "log"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
version = "0.4.14"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"cfg-if 1.0.0",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
Update wasmer
2021-07-10 13:02:20 +00:00
[[package]]
name = "loupe"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b6a72dfa44fe15b5e76b94307eeb2ff995a8c5b283b55008940c02e0c5b634d"
dependencies = [
"indexmap",
"loupe-derive",
"rustversion",
]
[[package]]
name = "loupe-derive"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0fbfc88337168279f2e9ae06e157cfed4efd3316e14dc96ed074d4f2e6c5952"
dependencies = [
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"quote 1.0.10",
"syn 1.0.81",
Update wasmer
2021-07-10 13:02:20 +00:00
]
Added lz4 compression to networking Former-commit-id: 7910c933f110d595da70552716b6e8f0eb7544a1
2019-05-01 09:22:48 +00:00
[[package]]
Propper Compression support of network. - Compression is no longer enabled always but can now be enabled per Stream. If a Stream is Compression enabled it will compress and decompress all msg (except for `raw` access) before handling them internally. You need to handle compression yourself for `raw` fn. - added a new feature to the network crate to enable or disable the compression - switched to `lz-fear` instead of `lz4-compression` - use `bitflags` to represent the `Promises` struct
2020-08-25 13:32:42 +00:00
name = "lz-fear"
Added lz4 compression to networking Former-commit-id: 7910c933f110d595da70552716b6e8f0eb7544a1
2019-05-01 09:22:48 +00:00
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
Propper Compression support of network. - Compression is no longer enabled always but can now be enabled per Stream. If a Stream is Compression enabled it will compress and decompress all msg (except for `raw` access) before handling them internally. You need to handle compression yourself for `raw` fn. - added a new feature to the network crate to enable or disable the compression - switched to `lz-fear` instead of `lz4-compression` - use `bitflags` to represent the `Promises` struct
2020-08-25 13:32:42 +00:00
checksum = "06aad1ce45e4ccf7a8d7d43e0c3ad38dc5d2255174a5f29a3c39d961fbc6181d"
Added lz4 compression to networking Former-commit-id: 7910c933f110d595da70552716b6e8f0eb7544a1
2019-05-01 09:22:48 +00:00
dependencies = [
Propper Compression support of network. - Compression is no longer enabled always but can now be enabled per Stream. If a Stream is Compression enabled it will compress and decompress all msg (except for `raw` access) before handling them internally. You need to handle compression yourself for `raw` fn. - added a new feature to the network crate to enable or disable the compression - switched to `lz-fear` instead of `lz4-compression` - use `bitflags` to represent the `Promises` struct
2020-08-25 13:32:42 +00:00
"bitflags",
"byteorder",
"fehler",
"thiserror",
"twox-hash",
Added lz4 compression to networking Former-commit-id: 7910c933f110d595da70552716b6e8f0eb7544a1
2019-05-01 09:22:48 +00:00
]
Added Controller support
2020-03-10 21:00:13 +00:00
[[package]]
name = "mach"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "86dd2487cdfea56def77b88438a2c915fb45113c5319bfe7e14306ca4cd0b0e1"
dependencies = [
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
Added Controller support
2020-03-10 21:00:13 +00:00
]
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
[[package]]
name = "mach"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa"
dependencies = [
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "malloc_buf"
version = "0.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
first implementation of connect and tcp using a mio worker protocol and: - introduce a loadtest, for tcp messages - cleanup api - added a unittest - prepared a handshake message, which will in next commits get removed again - experimental mio worker merges - using uuid for participant id
2020-01-13 16:53:28 +00:00
[[package]]
name = "matchers"
Bump tracing-subscriber to 0.3.2 We were pulling two versions of it. Causing some compilation errors
2021-11-26 17:41:51 +00:00
version = "0.1.0"
first implementation of connect and tcp using a mio worker protocol and: - introduce a loadtest, for tcp messages - cleanup api - added a unittest - prepared a handshake message, which will in next commits get removed again - experimental mio worker merges - using uuid for participant id
2020-01-13 16:53:28 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Bump tracing-subscriber to 0.3.2 We were pulling two versions of it. Causing some compilation errors
2021-11-26 17:41:51 +00:00
checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
first implementation of connect and tcp using a mio worker protocol and: - introduce a loadtest, for tcp messages - cleanup api - added a unittest - prepared a handshake message, which will in next commits get removed again - experimental mio worker merges - using uuid for participant id
2020-01-13 16:53:28 +00:00
dependencies = [
"regex-automata",
]
switch from hyper http to rouille for http server
2019-09-08 23:59:19 +00:00
[[package]]
name = "matches"
update crates
2021-09-20 10:05:41 +00:00
version = "0.1.9"
switch from hyper http to rouille for http server
2019-09-08 23:59:19 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
switch from hyper http to rouille for http server
2019-09-08 23:59:19 +00:00
Move shaders, start asset reloading system
2019-08-03 05:42:33 +00:00
[[package]]
name = "maybe-uninit"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
Move shaders, start asset reloading system
2019-08-03 05:42:33 +00:00
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "memchr"
update crates
2021-09-20 10:05:41 +00:00
version = "2.4.1"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
Display keys based off of scancodes Queries the OS to translate physical keyboard scancodes into Strings that can be shown in the UI. Addresses issues #861 and #354
2021-03-31 12:56:56 +00:00
[[package]]
name = "memmap"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
dependencies = [
"libc",
"winapi 0.3.9",
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
name = "memmap2"
version = "0.1.0"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "d9b70ca2a6103ac8b665dc150b142ef0e4e89df640c9e6cf295d189c3caebe5a"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
[[package]]
name = "memmap2"
update dependencies
2021-06-04 07:44:30 +00:00
version = "0.2.3"
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies
2021-06-04 07:44:30 +00:00
checksum = "723e3ebdcdc5c023db1df315364573789f8857c11b631a2fdfad7c00f5c046b4"
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
dependencies = [
"libc",
]
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
[[package]]
name = "memmap2"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "00b6c2ebff6180198788f5db08d7ce3bc1d0b617176678831a7510825973e357"
dependencies = [
"libc",
]
Update most dependencies
2019-07-28 15:47:14 +00:00
[[package]]
name = "memoffset"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
version = "0.5.6"
Update most dependencies
2019-07-28 15:47:14 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa"
Update most dependencies
2019-07-28 15:47:14 +00:00
dependencies = [
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"autocfg",
Made boulders avoid rivers
2020-08-29 07:53:42 +00:00
]
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
[[package]]
name = "memoffset"
update dependencies
2021-06-04 07:44:30 +00:00
version = "0.6.4"
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies
2021-06-04 07:44:30 +00:00
checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9"
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
dependencies = [
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"autocfg",
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
]
Implement toggleable gpu profiling that saves the timings from a recent frame with the screenshot key, rebase fixes
2021-02-27 09:21:23 +00:00
[[package]]
name = "metal"
Revert "Merge branch 'xvar/wgpu-0.9' into 'master'" This reverts merge request !2566
2021-07-07 22:07:00 +00:00
version = "0.22.0"
Use profling to get spans from wgpu, update wpgu & its deps for various fixes
2021-04-30 02:54:10 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Revert "Merge branch 'xvar/wgpu-0.9' into 'master'" This reverts merge request !2566
2021-07-07 22:07:00 +00:00
checksum = "1c12e48c737ee9a55e8bb2352bcde588f79ae308d3529ee888f7cc0f469b5777"
Started the report of wgpu
2020-08-21 19:10:56 +00:00
dependencies = [
"bitflags",
"block",
Revert "Merge branch 'xvar/wgpu-0.9' into 'master'" This reverts merge request !2566
2021-07-07 22:07:00 +00:00
"cocoa-foundation",
Started the report of wgpu
2020-08-21 19:10:56 +00:00
"foreign-types",
"log",
"objc",
]
Restarted worldgen Former-commit-id: e1526ec5f865904f11ab6a1507ecdc1a52acb28d
2019-05-21 00:57:16 +00:00
[[package]]
name = "minifb"
update depednencies
2021-07-08 10:21:02 +00:00
version = "0.19.3"
Add uid to Player component fix: world examples
2020-01-11 21:04:49 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update depednencies
2021-07-08 10:21:02 +00:00
checksum = "7b6e41119d1667465608d36488fa5dcd228057a26c156e25f17f492f38435124"
Restarted worldgen Former-commit-id: e1526ec5f865904f11ab6a1507ecdc1a52acb28d
2019-05-21 00:57:16 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"cc",
"orbclient",
"raw-window-handle",
update further crates
2020-12-16 00:07:39 +00:00
"tempfile",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"wayland-client 0.28.6",
"wayland-cursor 0.28.6",
"wayland-protocols 0.28.6",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"winapi 0.3.9",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"x11-dl",
update further crates
2020-12-16 00:07:39 +00:00
"xkb",
build: update keyboard-keynames
2021-08-03 15:16:55 +00:00
"xkbcommon-sys 0.7.5",
Restarted worldgen Former-commit-id: e1526ec5f865904f11ab6a1507ecdc1a52acb28d
2019-05-21 00:57:16 +00:00
]
update crates
2021-09-20 10:05:41 +00:00
[[package]]
name = "minimal-lexical"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.2.1"
update crates
2021-09-20 10:05:41 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
update crates
2021-09-20 10:05:41 +00:00
(See sharp/lod-history) LOD, shadows, greedy meshing, new lighting, perf --- Pretty much a Veloren fork at this point. Here's a high level overview of the changes (will be added to CHANGELOG just before merge). At a high level this MR incorporates roughly two groups of changes. The first group consists of new game features: more flexible map sizes, level of detail terrain, shadow maps, and a new lighting engine. This is "feature work" that (mostly) only adds new things to Veloren, and mostly shouldn't affect old stuff. The second big group of changes are those addressing the fallout from all the new features. These include performance fixes of various sorts: the addition of multiple graphics options and optimization of the cheap ones to avoid work, switching all voxel models to use some variant of greedy meshing, switching over much of our CPU-side vector math to exploit SIMD instructions (coinciding with a fork of `vek`), and a rewrite of how the UI handles text rendering (coinciding with updates to our fork of `conrod`). Making Veloren's hardcoded colors appear correct under the new lighting engine also required considerably changes (TODO: Fill in this section when it's complete). The second category of changes often heavily touches code owned by other people, including frequently modified code "owned" by a handful of people, so I recommend that this code be reviewed particularly carefully. --- At a high level (each will be described in more detail below): - The world map has been refactored. - The world size is no longer hardcoded (@zesterer). - The map generation code was made generic to allow using it outside of the `world` crate (@zesterer). - On world creation, we now compute *horizon maps* (@zesterer). - The way we pass the world from the server to the client has been updated (@xMAC94x). - Artifacts related to image rotation were fixed (@imbris). - Multiflow rivers were enabled (@zesterer). - In the process of making changes related to the world map, various incidental fixes and optimizations were required. - The new *level of detail* feature was added (@zesterer wrote part of this and has checked out the rest). - A new LOD terrain rendering step was added to the pipeline. - The LOD terrain quality was made configurable via a graphics setting. - Horizon maps were used to cast shadows from LOD chunks on both LOD and non-LOD terrain. - A "voxelization" effect was incorporated into rendered LOD terrain to make it blend better into the world. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Veloren's lighting has been completely overhauled (@zesterer has already checked most of this out). - A semi-accurate index of refraction was assigned to our materials. - A new, more realistic, physically based approach to lighting was used using the *Ashikhmin Shirley* BRDF. - We emulate *atmospheric scattering* using equations designed for measuring solar panel light exposure. - We attempt to compute *realistic light attenuation* in water using its real material properties. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Point and directional lights now cast realistic shadows, using *shadow mapping.* (@imbris, @zesterer, @Treeco, @YuriMomo) - Point light shadow maps were added to the rendering pipeline, using geometry shaders and *seamless cube maps*. - Directional light shadows were added to the rendering pipeline, using LISPSM together with disabling *depth clamping*. - "Shadow-only" chunks and NPCs were added to prevent shadows from models behind you from disappearing. - In the process of making changes related to shadow maps, various incidental fixes and optimizations were required. The addition of shadow maps, LOD terrain, and the new lighting all led to significant performance degradation, on top of other changes happening in master. Therefore, a large number of performance improvements were also needed: - The graphics options were made much more flexible and configurable, and shaders were optimize. - New options were provided for how to render lights and shadows (@Pfauenauge, @zesterer). - Graphic setting storage and configuration were overhauled to make adding new features easier (@Pfauenauge, @imbris). - Shaders were rewritten to utilize GLSL's preprocessor to avoid overhead (@zesterer, @YuriMomo). - In the process of making changes related to providing additional rendering options, various incidental fixes and optimizations were required. - Voxel model creation was switched to use *greedy meshing.* - A new voxel meshing method, greedy meshing, was added (@imbris). - Uses of the older meshing methods were migrated to use greedy meshing (@imbris, @jshipsey, @Pfauenauge). - New restrictions were added to terrain, figure, and sprites to future proof them for further optimizations (@jshipsey, @Pfauenauge, @zesterer). - Most positions are now relative to either chunk or player position for better precision (@imbris, @zesterer, @scottc). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - Animation and terrain math were switched to use SIMD where possible. - Fixes were made to vek to make its SIMD feature usable for us (@zesterer, @imbris). - The interface and types used in bone animation were changed in various ways (@jshipsey, @Snowram, @Pfauenauge). - Redundant code generation for body animation is now partly taken care of by a macro (@jshipsey, @Snowram, @Pfauenauge). - Animation code was modified to to use vek's SIMD representation where possible (@jshipsey, @Snowram, @Pfauenauge). - Terrain meshing code and shadow map math were also modified to use vek's SIMD representation (@imbris). - SIMD instruction generation was enabled (@YuriMomo, @jshipsey, @Snowram, @imbris, @Angelonfira, @xMAC94x). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - The way we cache glyphs was completely refactored, fixed, and optimized. - Our fork of `conrod` was optimized in various ways (@imbris). - Our fork of `conrod` now exposes whether a widget was updated during the current frame (@imbris). - Our use of the glyph cache was rewritten for correctness (@imbris). - A *text cache* was introduced that lets us skip remeshing glyphs that have not changed (@imbris). - Various changes were made to reduce pressure on the glyph cache, with more planned (@imbris, @Pfauenauge). - In the process of making changes related to the glyph cache, various incidental fixes and optimizations were required. - Colors were changed to keep Veloren's look consistent with master. - Some older tree models were brought back (@Pfauenauge). - TODO(@Sharp): All hardcoded colors were extracted and made hotloadable. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Hardcoded colors were fixed to conform to Veloren's style. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Color models were fixed to conform to Veloren's style. A detailed description of the involved changes follows. --- - The world size is no longer hardcoded. All functions dependent on world size now take a `WorldSizeLg`, which holds the base 2 logarithm of each actual world dimension and is guaranteed to maintain certain properties (outlined in `common/src/terrain/map.rs`). Additionally, many utility functions that utilize the world size were moved into `common` as well (mostly `common/src/terrain/mod.rs`). Finally, the world map format was updated in order to store its size explicitly, with a migration path from the old format that should work whenever the old formatted map was a square (practically always). See `world/src/sim/mod.rs` for these changes. - The map generation code was made generic to allow using it outside of the `world` crate. The parts of the map generating code that do not need to query the world were moved over to `common/src/terrain/map.rs`, allowing them to be used from the client without creating a dependency on `world`. The rest of it was turned into helper functions in `world/src/sim/map.rs`, which can be passed as closures to the generic map generation code to complete its construction. This also means that colors are now passed in separately to the map generation function. See <https://veloren.net/devblog-78/> for more details. - On world creation, we now compute *horizon maps*. See the function in `world/src/sim/util.rs`. Given a height map and a plane intersecting that height map, our horizon maps allow us to encode enough information to reconstruct shadows for each point on the height map using only the *horizon angle* (the angle at which the sun starts to become visible). As Veloren's sun only covers one plane, this is sufficient for encoding sun shadows for LOD terrain, by encoding two angles per chunk (one for each 90 degrees the sun covers). We can also use this for the moon, if we want, since the moon follows the same path. Additionally, we store the *height* of the furthest occluder, to try to make the shadows volumetric; so this means 4 bytes in total for each chunk. Support for horizon maps has been merged into the map functionality in common as well. - The way we pass the world from the server to the client has been updated. Rather than passing the prerendered map, we instead pass three maps with values for each chunk; one with the color information, a second with altitude information, and a third with horizon map information. We then reconstruct the map on the client, together with some additional information we send from the server (like the sea level and maximum height). See `common/src/msg/server.rs` for a detailed description of the format of `WorldMapMsg`, and `server/src/libr.rs` and `client/src/lib.rs` for details of the map construction and parsing. - Artifacts related to image rotation were fixed. See the commit message for commit SHA `cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e` for a detailed explanation. This involved changes to shaders, the addition of a new type of graphic (also reflected in the graphic cache) that allows specifying a border color (which automatically makes the associated texture immutable), and some related fixes. I reproduce the first two paragraphs of the MR description as well: ``` Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). ``` - Multiflow rivers were enabled. This does not really need to be part of this MR, and would be easy to revert, but since it seemed to provide a nice improvement it's currently packaged with it. We already computed multiple outflows from each chunk for erosion purposes long before this MR. However, we never modified river rendering to be able to handle this case (just a single downhill river flow is complex enough!) so this was not exposed when deciding which chunks were rivers. Now that - In the process of making changes related to the world map, various incidental fixes and optimizations were required. Some examples of fixes include making sure terrain is never lowered to below sea level (to make the shadow maps report correct values), fixing map altitudes and colors to understand things like cliffs and "block level" coloring (that doesn'te xist on the column level), and fixing a crashbug when rendering images for the UI where source pixels are strongly rectangular. Some examples of related performance fixes include avoiding allocating a fresh vector for all the maps (i.e. copying it over to change the format from `[u32; n]` to `DynamicImage` and then copying again to convert to `RgbaImage`), and instead using the `gfx::memory::slice` function to accomplish the same thing. These sorts of changes are spread all arond the code. This includes the additon of a new scene, `voxygen/src/scene/lod.rs`, a new pipeline `voxygen/src/render/pipeline/lod_terrain.rs`, and new shaders `assets/vxygen/shaders/lod-terrain-vert.glsl` and `assets/vxygen/shaders/lod-terrain-frag.glsl`, as well as associated changes to the renderer in `voxygen/src/render/renderer.rs`. The main idea behind our initial approach to LOD was to take the world data we now get from the server (altitude, color, and horizon mapping). - Some previously computed values were turned into shader uniforms for better prediction on weak processors. (@zesterer) - Calls to power or trig functions were removed or replaced with multiplications, where possible. - After some deliberation - To properly handle sprite "waving" for nearby sprites, We explicitly designed the greedy meshing system with figures and sprites in mind. In both cases, we want to be able to *efficiently* pack many different models into the same texture, especially in cases where we know we will either not be removing any of the grouped-together from the models from the texture, or will remove all of them at once (so they can be packed into some specific subtexture). For sprites, since we know every model in advance and never intend to deallocate them, we currently pack them all as efficiently as possible into one giant tetxure atlas. However, in the future we might opt to pack them slightly less efficiently in exchange for shrinking the sprite vertex size. For figures, we pack all the textures for each *model* into the same atlas. is a global texture atlas used for every sprite, and for figures which is why we have the ability to mesh multiple models to the same texture area (using the simple texture atlas allocator) without requiring intermediate vector allocations. This is accomplished by delaying the time when we actually write the color and light data to the texture until *after* all the model vertices have been meshed; then, we can just allocate the whole color/light array at once, making the atlas we use an exact fit. In computer science-y terms, we accomplish this delay by, after we perform the initial greedy meshing (without texture information), not continuing to create the texture data, but instead constructing a *continuation*--that is, a function that, when called, will execute the rest of the computation. We push this continuation (which in Rust terms is a `FnOnce` closure that takes the `ColLightsInfo` that it is supposed to write to as context) onto a onto a vector resizing. To allow for suspended writes to texture data, Rust pointed out to me that the continuation that would eventually write the color and light data to the texture atlas (the one that is shared by all models sharing the same greedy mesher) would have to *own* whatever data it mshed. Because we often generate the model data to mesh as a temporary in `voxygen/src/load.rs`, the - Matrix multiplications in the shader were reduced for figure data (@zesterer). - Vertex "waves" for fluid data were removed. - Terrain "bending" near edges was removed. - Scaling was fixed to make sure empty space was not introduced in a space previously occupied by a block. It was also changed to take ownership of its voxel data, rather than sharing it, to let it be used with meshing. - Rust's nightly version was bumped in order to use the `array_map` function, which lets us reuse more code between the simple map and `FigureModelCache`. - PositionedGlyph::standalone. --- I tried to cite sources in many cases[^realtime],[^lloyd],[^lispsm],[^pbrt],[^greedy],[^tjunctions] where I needed features from elsewhere but I am particularly grateful for the following resources, esepcially where they have accompanying source code. I linked all of them that are accessible to the public (those that are not were obtained through legal means). [^realtime]: Eisemann, Elmar, Michael Schwarz, Ulf Assarsson, Michael Wimmer. Real-Time Shadows. A K Peters/CRC Press (T&F), 20160419. [^lloyd]: Lloyd,B. 2007. [Logarithmic perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). PhD thesis, University of North Carolina. [^lispsm]: Wimmer, M., Scherzer, D., and Purgathofer, W. 2004. [Light space perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). In Proceedings of Eurographics Symposium on Rendering 2004, pp. 143– 152. [^pbrt]: Pharr, Matt, et al. [http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf](Physically Based Rendering: From Theory to Implementation). Third edition, Morgan Kaufmann Publishers/Elsevier, 2017. [^greedy]: mikolalysenko. “Meshing in a Minecraft Game.” 0 FPS, 30 June 2012, <https://0fps.net/2012/06/30/meshing-in-a-minecraft-game/>. [^tjunctions]: blackflux. “Meshing in Voxel Engines – Part 1.” Blackflux.Com, 23 Feb. 2014, <https://blackflux.wordpress.com/2014/02/23/meshing-in-voxel-engines-part-1/>. I am also especially grateful to Khronos, Wikiepdia, and stackoverflow for answering many of my specific questions while writing the MR. --- Squashed commit of the following: commit 300505e7305a2fdac722a808ee8538323f215f39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 18:46:25 2020 +0200 Fixing cargo doc and typo in CHANGELOG. commit ec0aeb18e8499d7d84ef818331b4b65c3d76cea6 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 15:38:50 2020 +0200 Hopefully final commit for the LOD branch. commit 5e8ea0b1eaac02903a02feb2eb038d195de4872f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 10:14:26 2020 +0200 Falling back to power as stopgap. commit e44a1cbf46504ee9931a01bdc9033e145500d557 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 09:25:41 2020 +0200 Address imbris feedback. Temporarily disables shiny water, lowers max VD. These restrictions will be lifted soon after merging. commit 561e25778a108ac3712f5ec2ce3a51234c4430d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 08:31:13 2020 +0200 Tweaking shaders a bit. commit 7d19259078ce0dd7b3742ad7d0cb3fab3ece3fdc Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:59:43 2020 +0200 Fix view example as well. commit 051cd4934e0fad2c0b15db4380a4189fa318679f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:29:06 2020 +0200 Fix meshing benchmark. commit c95e07db3b4dcca285678985e65e31b927cb1c61 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 05:46:22 2020 +0200 Address MR feedback, fix scene clouds. commit 1bfb816cabdb3ffc1e507a009c2d98696b4b573a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:39:36 2020 +0200 Incorporating Pfau's figure color changes. New eyes and new humanoid colors. commit 3f9b89a3ac7b3356b1dba0d1a8f6541357f81469 Merge: e2f5162e4 62c53963a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:29:41 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit e2f5162e4f96f4124aa43488f7245d341b3dcfd4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:28:38 2020 +0200 World colors are all hotloadable. They live in assets/world/style/colors.ron. Only a small handful of hardcoed colors remain in World; they are either part of the map, or difficult to disentangle from the rest of the computation. Comments are made where appropriate. commit 62c53963abe1975009d34a8f9515a355bef24f31 Author: Marcel Märtens <marcel.cochem@googlemail.com> Date: Wed Aug 19 15:59:00 2020 +0200 replace pretty_env_logger with tracing commit 5b1625f99d9586fe80e2232f583ec5af9f953099 Merge: d71003acd 4942b5b39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:15:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit d71003acdabeff970b3928e97c26af6847b5b78e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:14:34 2020 +0200 Hotloading colors, part 1: colors in common. Currently, this just entails humanoid colors. There are only three colors not handled; the light emitter colors in common/src/comp/inventory/item/tool.rs. These don't seem important enough to me to warrant making hotloadable, at least not right now, but if it's needed later we can always add them to the file. commit 63b5e0e553eb2ea49276f192a6fc7dd65254270d Merge: c32b337a4 6d2c4b9c1 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 13:05:37 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c32b337a46e10d9de473d178a94a3ccd61c39bb3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:52:04 2020 +0200 Fixing LOD grid, for real. commit a166ae0360395387e09fb35a1f84210c2ce5ec24 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:28:05 2020 +0200 Addressing imbris's initial feedback. Fixes two minor bugs: explosion particles were no longer spawning randomly, and LOD grids were not perfectly even. commit 4cbad004f44060994252dd3d38647a14a589712f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:27:58 2020 +0200 Bumping nightly per request. commit 548680276aac77c25d43d16b5622f847d474dbef Merge: acc098604 8f8b20c91 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:26:06 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit acc0986040589a3492f88a740bc3c3fc693b26d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:28:32 2020 +0200 Lower resolution due to lying drivers. commit d3b878de2a52c358d2944a6bbd0555dad7fbdb10 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:15:38 2020 +0200 Fix issues msh encountered with Intel 4600. commit 10245e0c1b0cb6fae10d86409435364edc6102ef Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 21:15:02 2020 +0200 Merge more models into one mesh than we did previously. commit 3155c31e663c52ae5c3a53d5fb5665892a1a498a Merge: 7204cc8a7 3c199280e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:35:22 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7204cc8a7a4f74a30306bd205d9834fee4bb944f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:34:43 2020 +0200 Fix not yet done NPC animations. This forces them all to be the idle animation if not specified. This fixes issues where you'd have giant NPCs in water. commit bc83360f2a08918f19d417b5f772e1ff554dba08 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 19:36:37 2020 +0200 Try to fix some bugs: - Z fighting with LOD terrain and water. - Audio SFX not playing. commit 1fd104aa603bf3781b6526a5cada46aeca3049dd Merge: 862df3c99 7c2c392a3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 12:02:31 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 862df3c9976c4da9bd7cfd784f1a85973127968a Merge: 0a4218ed9 75c1d4401 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 05:52:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0a4218ed9d541a2b34c133351bea38a99ddf4ea7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 22:27:14 2020 +0200 Fix particle depth. commit f51dfdeb442d0dd5243dd2f344fa4be295bd0875 Merge: c6251a956 5e6dc0471 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:19:04 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit c6251a956ad376400dca5c23420cf8d213dc8fdf Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:15:46 2020 +0200 Cache figures more intelligently. Cache figures for longer, and don't cache character states for the player except where they actually affect the rendered model. commit 0ed801d5404982c6fb63b1eaa4567d908b294c9d Merge: c11b9bdf0 eea64f78f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 16:32:24 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c11b9bdf0a53bf9884d2f5a48fec9b01d582df1a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 11:47:15 2020 +0200 Remove unneeded Clippy annotation. commit 16aa9ef40af56d69289d00aafb3deadfb8bd4f35 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 8 00:53:02 2020 +0200 Fix hotloading and Clippy. commit 3dc973e0be5b758da1e9805eb764ad401374cd0c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 23:50:27 2020 +0200 Major speedups with SIMD. commit fba64a7d93d5a96077ce87287bbce6ab9b7fbcae Merge: 76429d00e d1e10b178 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:19 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 76429d00eea00d212fbd672a84ee91e75b19b938 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:10 2020 +0200 Add clippy.toml. commit c79f512f84dbb83cb82b7954db68ff241dfd8e41 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 11:55:20 2020 +0200 Fix all clippy issues, clean up Rust code. commit 6f90e010b3fbefb53b0d632e819931350015b6b8 Merge: 77a8c7c26 5929cfa5c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:30 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 77a8c7c267d3f44a1a62bd6b2274359973c5e4d4 Merge: b44e44232 44febaabd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:10 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 5929cfa5c713aa392110bbb62407f76caf53c3df Author: jshipsey <jshipsey18@gmail.com> Date: Thu Aug 6 20:47:27 2020 -0400 fixed in-hand arrow bug commit b44e442325d828f1cd564d66908f89d09e80474b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 6 13:40:35 2020 +0200 Miscellaneous performance improvements. commit be37acf287c1360d8085862526ac3365ffd1d768 Merge: 125d7fc6c c11876547 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 05:49:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 125d7fc6c4dcd8c8c5f27b8268a4d64f409f3644 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 04:55:31 2020 +0200 Abstract over simd vs. repr_c vectors. Also some minor improvements to Event size. commit d4d4956e9252e1241ce110b2aa85076c6b1e2a23 Merge: 5f3b7294a aced5f979 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:56:54 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 5f3b7294af1f8533edc2620b58863c248e2b07af Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:43:52 2020 +0200 Fix formatting issues I missed before. commit a428a3ebba70dcab63dd0f8cd983120c90617271 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:41:51 2020 +0200 Fix clippy warnings, part 1. There aer still a bunch of type too complex and function takes too many arguments warnings that I'll fix later (or ignore, since in the one case I did fix a function takes too many arguments warning I think it made the code *less* readable). commit ba54307540ed8a937ac08209730284fc653af85b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 30 13:22:42 2020 +0200 Fix light animations so they are removed when the light turns off. commit 7e0f4bcbf0f4717145d8beac40d52e3acebbe2aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 21:10:20 2020 +0200 Fix crash in edge case for pixel art. commit 56da06f7a351e2b949e9b014a90b974d511a0924 Merge: cf74d55f2 9f53a4a19 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:56:52 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:29:52 2020 +0200 Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). The first concern was addressed by fixing the dimensions of the map images drawn from the UI (so that we always use a square source rectangle, rather than a rectangular one according to the dimensions of the map). We also fixed the way rotation was done in the fragment shader for north-facing sources to make it properly handle aspect ratio (this was already done for north-facing targets). Together, these fix rendering issues peculiar to rectangular maps. The second and third concerns were jointly addressed by adding an optional border color to every 2D image drawn by the UI. This turns out not to waste extra space even though we hold a full f32 color (to avoid an extra dependency on gfx's PackedColor), since voxel images already take up more space than Optiion<[f32; 4]> requires. This is then implemented automatically using the "border color" wrapping method in the attached sampler. Since this is implemented in graphics hardware, it only works (at least naively) if the actual image bounds match the texture bounds. Therefore, we altered the way the graphics cache stores images with a border color to guarantee that they are always in their own texture, whose size exactly matches their extent. Since the easiest currently exposed way to set a border color is to do so for an immutable texture, we went a bit further and added a new "immutable" texture storage type used for these cases; currently, it is always and automatically used only when there is a specified border color, but in theory there's no reason we couldn't provide immutable-only images that use the default wrapping mdoe (though clamp to border is admittedly not a great default). To fix the maps case specifically, we set the border color to a translucent version of the ocean border color. This may need tweaking going forward, which shouldn't be hard. As part of this process, we had to modify graphics replacement to make sure immutable images are *removed* when invalidated, rather than just having a validity flag unset (this is normally done by the UI to try to reuse allocations in place if images are updated in benign ways, since the texture atlases used for Ui do not support deallocation; currently this is only used for item images, so there should be no overlap with immutable image replacement, so this was purely precautionary). Since we were already touching the relevant code, we also updated the image dependency to a newer version that provides more ways to avoid allocations, and made a few other changes that should hopefully eliminate redundant most of the intermediate buffer allocations we were performing for what should be zero-cost conversions. This may slightly improve performance in some cases. commit ad18ce939940a8c697270f6e9b94db9942fd8295 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 13:21:09 2020 +0200 Fix continent scale hack. commit 36b1cb074f5b195aebd7dbbc3da7f0246a1a18ec Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 12:11:40 2020 +0200 Enable loading different sized maps without a recompile. We may want to tweak the effects of the continent_scale_hack. commit 13b6d4d534cc4814b7cb3294ca41bbfea0a6b186 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 10:55:48 2020 +0200 Removing WORLD_SIZE, part 1. Erased almost every instance of WORLD_SIZE and replaced it with a local power of two, map_size_lg (which respects certain invariants; see common/src/terrain/map.rs for more details about MapSizeLg). This also means we can avoid a dependency on the world crate from client, as desired. Now that the rest of the code is not expecting a fixed WORLD_SIZE, the next step is to arrange for maps to store their world size, and to use that world size as a basis prior to loading the map (as well, probably, as prior to configuring some of the noise functions). commit 30b1d2c6428230a9eaa0d749cdcbbd6f1cbccd78 Merge: 7d56ba31b 1377b369f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:58 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 7d56ba31b445441461b28a07fc495d7d4f047c17 Merge: 2101113b4 598f14b25 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 1377b369f6db2258e910d467a5740f31789e3ded Author: Monty Marz <m.marzouq@gmx.de> Date: Sun Jul 19 23:25:38 2020 +0200 more saturated pumpkins commit ae8d50527f93bb0616c2ad46ce4dacb63bc37c6d Author: Monty Marz <m.marzouq@gmx.de> Date: Sat Jul 18 20:29:56 2020 +0200 acacia models commit 2101113b467e691de787392d7f20f1745f5637bd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 18 18:55:25 2020 +0200 Higher detail LOD. commit add2cfae04b4385fa5590e11e2bd5229d9dee0aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 16 01:57:39 2020 +0200 Revert some irrelevant stuff. commit 2e2ab3dc1eaa59a4aef7f8d34a53d8aae4c8553a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 15 13:30:49 2020 +0200 Fixing various things about shadows. * Correcting optimal LISPSM parameter. * Figure shadows are cast when they're not visible. * Chunk shadows stay cast until you look away. * Seamless cubemaps for point lights. * Etc. commit 6c31e6b56217274285b597af297036691ea5d897 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 19:50:26 2020 +0200 Fix shadow creation. commit 6332cbe006115ae205597529cd8bbccd146c2cca Merge: be438657c 930e0028b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:47:00 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit be438657c33d7b5bfb0a9582c3ed3fd366637323 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:28:08 2020 +0200 Tweaks to shadows. Added shadow map resolution configuration, added seamless cubemaps, documented all existing rendering options, and fixed a few Clippy errors. commit 23b4058906013c7d2a40c286e20e32c5fbd897ed Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 10:11:19 2020 +0200 Fix moon, use nonlinear noise for terrain. Note that the latter has a bit of performance cost. commit 7fbe5cbfbb9dc29607957b8e62f432a4deed193d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:23:02 2020 +0200 Address lies about max texture size. commit bcfc62b5e13a1cdd83f57535fde4694720bebfd9 Merge: 75e3626a7 18a08e8fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:22:08 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 75e3626a785919f43fdcf2127c2b10e3e4df2f9f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:21:52 2020 +0200 OpenGL 3.3 minimum. commit 18a08e8fe2739f02af99a5d2cb4e7c38c49e858b Author: Monty Marz <m.marzouq@gmx.de> Date: Tue Jul 7 23:57:52 2020 +0200 settings localization commit 90c5d1ca3620092bc3ae10b2211489eb1cf6f5e8 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 21:11:48 2020 +0200 Lower near distance. commit 0e66f02b25aaddaa2dfddbbc89cd67de54a9a7b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 20:09:01 2020 +0200 All sprites sway in the wind now. commit db1401a6910bf42dcf502462c90038752ff5fbdb Merge: 69e508d8c e8b4b29d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 19:34:17 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 69e508d8c94d8973033817ca86f357e466fc7c4d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 18:41:37 2020 +0200 Make it easy to switch to SIMD for math. commit ffe0f5928c7a7e87d00cb5426b3b1d831d7e02fd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 21:21:12 2020 +0200 Fix some issues with underwater rendering. commit bfda6da42f38fd02c31ee92c81ab785a3e50c2a0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 19:17:59 2020 +0200 Fix some minor display issues. commit 0ed752e087968cf901301884aaeae698e32ef8a5 Merge: ccc6a06a8 518edcb85 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:14:21 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit ccc6a06a8d4504d6b9f7af7905a414d2ee06ab76 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:04:34 2020 +0200 Some minor changes. commit 4e020246702889269efe1a191788992164c508d6 Merge: 50a64d927 e05c9267a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 16:17:40 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 50a64d927e6c4f4b0e4688e4cbfca694bc3f922a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 13:07:03 2020 +0200 Fix far plane. commit 7dd06da34cae8f9ea3b6c889fe965181f3fd3949 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:25:35 2020 +0200 Add shadows.glsl. commit 618a18c998778bf871b905a74657440fcc384c80 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:10:22 2020 +0200 Adding shadows, greedy meshing, and more. commit eaea83fe6a5cb1cb0ba8beef888183c718258496 Merge: 267018495 2f89b863e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 22:47:07 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 2670184954a13e4a9e7a4e35ba79aac0c5fac2f7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 21:20:01 2020 +0200 Make civsim and sites deterministic. For anything in worldgen where you use a HashMap, *please* think carefully about which hasher you are going to use! This is especially true if (for some reason) you are depending on hashmap iteration order remaining stable for some aspect of worldgen. commit f8376fd5dc72b4a9c2f51a6b4570d59c8b8e9343 Merge: 654f7e049 cdee191dd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 17:53:57 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 654f7e049258d9da27c09608bbe6a46ffa8787e5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed May 20 21:22:30 2020 +0200 Correct backface culling. commit 560501df05ca725409b0f2e4eb31bdfdc15fd0c7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue May 19 17:22:06 2020 +0200 Greedy messhing for shadows. commit a4d87e1875ca543436e6bbbeb20348facc5a52d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun May 17 05:59:00 2020 +0200 Shadow maps work for lantern. commit 243d0837b8a3b08172c9a3c348d964d7ddc2a0a8 Merge: 04382dc28 71dd520cd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:53:13 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 04382dc28632b6c66e8821f6870c0daaa1c1901a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:22:17 2020 +0200 WIP: better graphics config, better LOD, shadow maps. commit 22ddbad3eb32bfa70f0932176022208fe67ded81 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 18:54:09 2020 +0200 Minor shader fixes. commit 746a10e8d01ac235f994b0cde78fa48998602a1f Merge: 0f4a0e763 40ab94673 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 04:02:09 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0f4a0e763db3afbdc4fb0558611f38326ca87151 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 23:03:24 2020 +0200 Switch back to pop-in terrain. commit dd74fa7e4a53667b38811d7aec58d7f6a68889bb Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 22:58:55 2020 +0200 LOD shading closer to voxel shading. commit ef67bd58ba0bdaf622b078892d768263b6cba268 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 28 20:49:03 2020 +0200 Experimental underwater lighting. commit 2c5ad9d07605e80d5fd5679dd3a5d70c605b86a9 Merge: 748279835 303967a6f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 22:35:24 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7482798354eda18c8207950080fc24d443a369de Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 21:59:55 2020 +0200 Replace discard in figure-frag. commit d83b4ae69be4912f69bf7835f509c68a1c7770a4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:45:57 2020 +0200 Fix sprite lighting, HDR from focus_pos. commit 0594238004f116274905fa0ed7c2b6c417ed1d29 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:14:10 2020 +0200 Proper HDR from point lights. commit 48c93d2b41ce5743103d18e76cc228f5ac766492 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 14:01:43 2020 +0200 Brighter ambiance, darker LOD shadows. commit e0452e895ccfa8a43f368cae3b8b8aedc24dad93 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 13:13:23 2020 +0200 More proper HDR. commit 4c6da3ed16cfeebb455e40da5f557b4af9a499d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 00:13:10 2020 +0200 Trying LOD noise. commit 682a3d74c85df5503ffe1fc1cc891bce789df1ad Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 23:11:08 2020 +0200 Fix LOD heights in towns. commit cc39e5734e8b18f9077bf42e66337c1319dd6b6e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 21:01:23 2020 +0200 More LOD fixes. commit 8116b21c2e51c836e77894e309ac273caf2917b3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:54:43 2020 +0200 I like this coloring. commit bc2560ea90b36f4b46190005344232d993043ac3 Merge: 14effdd5d e690efe71 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:48:33 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 14effdd5db8747fcf3eb34f03b46b7792e92d1c5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:24:35 2020 +0200 Re-saturate. commit 48a643955d4435b78179acba0beb4a979905cc31 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:23:57 2020 +0200 Various fixes. commit f7b497a0c25f4ad4682c71dd1ed6f608052feb9b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 03:22:49 2020 +0200 Render figures again. commit 44e4aad48deba8266b9f8bdfd3db096b381f5327 Merge: e6f0a5a98 9ec319a18 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 02:01:04 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit e6f0a5a981a82533ba188fff0a54ce98577bb152 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 24 16:12:20 2020 +0200 Add atmospheric scattering. commit f2953087f691a8edbc001cb98ebf5059fc6f8ac0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 23 00:01:20 2020 +0200 Fix shadowing for specular reflections. commit ddd4a67a9799b8d08c7dc0c2bec90621c2bed0e3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Apr 22 22:56:12 2020 +0200 HDR fixes. commit 1015e60deef3c447381996277df7496707a63bd0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 21 18:25:19 2020 +0200 More lighting changes. commit 80c264abd111fb237e57843efcb5c071d4f84613 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 13 00:29:59 2020 +0200 Lighting experiments. commit 8414987e589dd5102bad89762a3adaccc0bfe957 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 9 02:38:40 2020 +0200 WIP -- lighting changes and soft shadows. commit 9cd2b3fb0d6b49776c6dfe463e4169637250b11a Merge: c7ea687eb 8b149ad11 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:29 2020 +0200 Merge branch 'sharp/new-lighting' into sharp/small-fixes commit c7ea687ebbc5aace1b455f134a5bf49ce2c7434a Merge: 476441531 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:02 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 8b149ad11ad4bb75018fcf9519baec27d1c95951 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:32:39 2020 +0200 Trying out a new lighting model. commit b0ac9f36f755dd06f7c17c46150568064790864f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 07:56:11 2020 +0200 Use bicubic interpolation for terrain. commit f6fc9307a121514b614bc50ef8eb055953e7da8a Merge: 33140a295 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 05:01:41 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 4764415312aae6e9ac2d00e86e84577cb958f1ab Merge: ed2d0111d 13388ee6a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 04:54:48 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 13388ee6a42943f3f79a9cb488346cef18e272fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 20:30:08 2020 +0200 Various fixes (to coloring and to soft shadows). commit fbd084a94a067082a87cd6d28b82054709bc9265 Merge: 5a089863b 4fdf6896a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 18:50:38 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/map-colors commit ed2d0111d994262ae836d84d1fe5a45e4de72a0b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 06:49:27 2020 +0200 Combining colors and LOD. commit 88342640c6b835114d01c797b89fdede3b0a2108 Merge: 33140a295 5a089863b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:49:20 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 33140a2951b8212725f42c758b277aaec4d888f7 Merge: 4c65a5aed f34d4b379 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:36:21 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 5a089863beb01d4794bbe3580ada47b278715ea2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 03:17:49 2020 +0200 Making maps brighter. This is probably not the right way to do it, but oh well! commit 32b2c99109dd486aa922886081068f9c550c83f2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 02:46:36 2020 +0200 Horizon mapping and "layered" map generation. Horizon mapping is a method of shadow mapping specific to height maps. It can handle any angle between 0 and 90 degrees from the ground, as long as know the horizontal direction in advance, by remembering only a single angle (the "horizon angle" of the shadow map). More is explained in common/src/msg/server.rs. We also remember the approximate height of the largest occluder, to try to be able to generate soft shadows and create a vertical position where the shadows can't go higher. Additionally, map generation has been reworked. Instead of computing everything from explicit samples, we pass in sampling functions that return exactly what the map generator needs. This allows us to cleanly separate the way we sample things like altitudes and colors from the map generation process. We exploit this to generate maps *partially* on the server (with colors and rivers, but not shading). We can then send the partially completed map to the client, which can combine it with shadow information to generate the final map. This is useful for two reasons: first, it makes sure the client can apply shadow information by itself, and second, it lets us pass the unshaded map for use with level of detail functionality. For similar reasons, river generation is split out into its own layer, but for now we opt to still generate rivers on the server (since the river wire format is more complicated to compress and may require some extra work to make sure we have enough precision to draw rivers well enough for LoD). Finally, the mostly ad-hoc lighting we were performing has been (mostly) replaced with explicit Phong reflection shading (including specular highlights). Regularizing this seems useful and helps clarify the "meaning" of the various light intensities, and helps us keep a more physically plausible basis. However, its interaction with soft shadows is still imperfect, and it's not yet clear to me what we need to do to turn this into something useful for LoD. commit f8926a5737ddc51f3d585c651a64c43677aae0f4 Merge: a1aee931e 875ae6ced Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Mar 13 13:32:42 2020 +0100 Merge remote-tracking branch 'origin/master' into sharp/map-colors commit 4c65a5aed353b119aea65a2aaeb94549b67beb42 Author: Treeco <5021038-Treeco@users.noreply.gitlab.com> Date: Mon Feb 24 16:48:05 2020 +0000 Made LOD setting slider exponential commit 2fa7b2d20d7233dc8bfd64f9f7f54617575248f1 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 17:49:53 2020 +0000 Added mist to LoD commit aab059a450b5f635777129ff82cc15b662965c3c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 15:14:06 2020 +0000 Added LoD slider commit 779c36b538121c5ade3633ae5cb67bb14c8c3877 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:54:55 2020 +0000 Reduced cost of vertex pushing commit 9fea150473906b166365b738ebcea07c697daf3d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:38:53 2020 +0000 Fixed maths, improved LoD resolution commit 5481df38fea5bf183ff376a3337179cfaa5233dc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 11:22:50 2020 +0000 Dynamically relocate LoD vertices to enhance details commit a3e36a50ababd615da7db1b26158c7906a5def01 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 18:13:51 2020 +0000 Simpler terrain spiral rendering commit 255f450ae9ac8763db4bede075fb409161ed57cc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:53:17 2020 +0000 Better LoD precision commit 3d027aebe812a5b8658a4eb8123dc9f61b3776d2 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:04:03 2020 +0000 Better falloff commit be775c9484b457b2c0b1a494aec03392d0c70e76 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 15:30:45 2020 +0000 Applied good ideas from experimental branch commit 58587b68545a23c5c04ab4574a4b94b3bc982246 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 16:15:13 2020 +0000 Minor fixes to LoD merging commit 7b42aebd709c14df2db766aad61d9280ad24d84d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 15:04:44 2020 +0000 Capped LoD dragging commit 8aafc559f87124e1ea5ca6e3ddc2aa0c242d793c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:54:37 2020 +0000 Better blending between LoD and terrain border commit edd3455d5161792d87ddc8eadc0ecbad5532b284 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:40:19 2020 +0000 Fixed LoD z depth, added sea level offset commit b9b06744620114dd5556e73f64fa93c145503a7c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:27:43 2020 +0000 Better LoD smoothing commit a1aee931e790431560cd2d953ad61d9497072afd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Feb 21 14:52:17 2020 +0100 Adding shadows. commit 2400786c13dd891c131ed86d48d05df516a8a778 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 13:48:40 2020 +0000 Use world map as LoD source commit dbf650f504a4c25fbbc2096ac3616c736bf52d23 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Jan 20 00:48:14 2020 +0000 Better clouds at distance commit 5e6f81b86cdb9730b9b056877b19257075fd5fa8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Jan 19 23:59:02 2020 +0000 sync commit 745e7540ddb000cc645f612767b337c2ddc3f7c0 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 12:40:48 2019 +0000 Improved cloud falloff mist, faster noise sampling commit f6a200d0cb866196ba57697466755f9e0c7ea5d8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 10:09:00 2019 +0000 Improved long-range depth precision, removed unnecessary LoD polygons commit 63d1b2bb2292898d59fb4f4e502201103dfeb86f Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 20:57:46 2019 +0000 Working LoD shader commit f13d98ee3e58f881e8b978861a67663b59ed91ec Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 11:03:40 2019 +0000 LoD first attempt (stack overflow issue)
2020-08-20 18:34:59 +00:00
[[package]]
name = "miniz_oxide"
version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435"
dependencies = [
"adler32",
]
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
[[package]]
name = "miniz_oxide"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
version = "0.4.4"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
dependencies = [
"adler",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"autocfg",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "mio"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
version = "0.6.23"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
ci cleanup, dependency update
2020-11-06 13:14:54 +00:00
"cfg-if 0.1.10",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"fuchsia-zircon",
"fuchsia-zircon-sys",
"iovec",
"kernel32-sys",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
dependency reduction: - authc no longer uses reqwest - image only supports PNG - replace routille with tiny_http - several other dependencies - cargo upgrade - following improvement was measured on R7 1700X: before: - cargo build: 3076.73s user / 4:45 total / 589 dependencies - cargo test: 6118.38s user / 7:30 total / 959 dependencies after: - cargo build: 2680.54s user / 4:05 total / 480 dependencies - cargo test: 5351.81s user / 7:04 total / 791 dependencies - added xMAC94x to CODEOWNERS for Cargo.toml, he will protect them from now on and hit people with evil looks ;)
2020-06-01 00:13:35 +00:00
"log",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"miow 0.2.2",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"net2",
"slab",
"winapi 0.2.8",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
Made the server cli great
2020-07-27 16:26:34 +00:00
[[package]]
name = "mio"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.7.14"
Made the server cli great
2020-07-27 16:26:34 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc"
Made the server cli great
2020-07-27 16:26:34 +00:00
dependencies = [
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
Made the server cli great
2020-07-27 16:26:34 +00:00
"log",
update dependencies and fix audio issues fixed #1027 fixed #1033 fixed #1020 fixed #1017 fixed #1029 fixed #1025 fixed #807 fixed #816 fixed #1004 fixed #1005
2021-03-29 07:45:00 +00:00
"miow 0.3.7",
Made the server cli great
2020-07-27 16:26:34 +00:00
"ntapi",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"winapi 0.3.9",
Made the server cli great
2020-07-27 16:26:34 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "mio-extras"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
version = "2.0.6"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"lazycell",
dependency reduction: - authc no longer uses reqwest - image only supports PNG - replace routille with tiny_http - several other dependencies - cargo upgrade - following improvement was measured on R7 1700X: before: - cargo build: 3076.73s user / 4:45 total / 589 dependencies - cargo test: 6118.38s user / 7:30 total / 959 dependencies after: - cargo build: 2680.54s user / 4:05 total / 480 dependencies - cargo test: 5351.81s user / 7:04 total / 791 dependencies - added xMAC94x to CODEOWNERS for Cargo.toml, he will protect them from now on and hit people with evil looks ;)
2020-06-01 00:13:35 +00:00
"log",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"mio 0.6.23",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"slab",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
Upgrade to winit 0.25
2021-06-15 08:01:57 +00:00
[[package]]
name = "mio-misc"
version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ddf05411bb159cdb5801bb10002afb66cb4572be656044315e363460ce69dc2"
dependencies = [
"crossbeam",
"crossbeam-queue",
"log",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"mio 0.7.14",
Upgrade to winit 0.25
2021-06-15 08:01:57 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "miow"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
version = "0.2.2"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"kernel32-sys",
"net2",
"winapi 0.2.8",
"ws2_32-sys",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
Made the server cli great
2020-07-27 16:26:34 +00:00
[[package]]
name = "miow"
update dependencies and fix audio issues fixed #1027 fixed #1033 fixed #1020 fixed #1017 fixed #1029 fixed #1025 fixed #807 fixed #816 fixed #1004 fixed #1005
2021-03-29 07:45:00 +00:00
version = "0.3.7"
Made the server cli great
2020-07-27 16:26:34 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies and fix audio issues fixed #1027 fixed #1033 fixed #1020 fixed #1017 fixed #1029 fixed #1025 fixed #807 fixed #816 fixed #1004 fixed #1005
2021-03-29 07:45:00 +00:00
checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21"
Made the server cli great
2020-07-27 16:26:34 +00:00
dependencies = [
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"winapi 0.3.9",
Made the server cli great
2020-07-27 16:26:34 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "mopa"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "a785740271256c230f57462d3b83e52f998433a7062fc18f96d5999474a9f915"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
[[package]]
name = "more-asserts"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.2.2"
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389"
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
switch to SharedLink and unset context
2021-08-30 07:24:32 +00:00
[[package]]
name = "mumble-link"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a92ff7d87d3ca752fda7a1ccfcde284ea3de84fc8b8a0c43bf434652226bd95"
dependencies = [
"kernel32-sys",
"libc",
"winapi 0.2.8",
]
Implement toggleable gpu profiling that saves the timings from a recent frame with the screenshot key, rebase fixes
2021-02-27 09:21:23 +00:00
[[package]]
name = "naga"
Revert "Merge branch 'xvar/wgpu-0.9' into 'master'" This reverts merge request !2566
2021-07-07 22:07:00 +00:00
version = "0.4.0"
source = "git+https://github.com/gfx-rs/naga?tag=gfx-25#057d03ad86f18e3bb3866b20901d8d4e892dd3d6"
Started the report of wgpu
2020-08-21 19:10:56 +00:00
dependencies = [
Finished porting all pipelines
2020-09-13 10:03:42 +00:00
"bit-set",
Started the report of wgpu
2020-08-21 19:10:56 +00:00
"bitflags",
Almost implement instance merging for sprites (validation error), rebase fix
2021-01-31 03:50:03 +00:00
"codespan-reporting",
Started the report of wgpu
2020-08-21 19:10:56 +00:00
"fxhash",
"log",
"num-traits",
Finished porting all pipelines
2020-09-13 10:03:42 +00:00
"petgraph 0.5.1",
Update wgpu, cleanup a bit of commented shader code, improve sprite LOD selection code
2021-05-15 05:08:20 +00:00
"rose_tree",
Started the report of wgpu
2020-08-21 19:10:56 +00:00
"spirv_headers",
"thiserror",
]
Added user-friendly error output for Voxygen Former-commit-id: 55952f32019e826863849f07a71695de3e0c4c3c
2019-04-25 11:49:36 +00:00
[[package]]
replace heavy msgbox with light native-dialog
2020-09-08 14:33:06 +00:00
name = "native-dialog"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
version = "0.5.5"
replace heavy msgbox with light native-dialog
2020-09-08 14:33:06 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
checksum = "d689b01017db3e350e0e9798d233cca9ad3bf810e7c02b9b55ec06b9ee7dbd8a"
Added user-friendly error output for Voxygen Former-commit-id: 55952f32019e826863849f07a71695de3e0c4c3c
2019-04-25 11:49:36 +00:00
dependencies = [
Finished porting all pipelines
2020-09-13 10:03:42 +00:00
"cocoa",
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
"dirs-next",
Update native_dialog to 0.5.2
2021-02-07 05:48:57 +00:00
"objc",
"objc-foundation",
"objc_id",
"once_cell",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"raw-window-handle",
replace heavy msgbox with light native-dialog
2020-09-08 14:33:06 +00:00
"thiserror",
"wfd",
update crates
2021-09-20 10:05:41 +00:00
"which 4.2.2",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"winapi 0.3.9",
Added user-friendly error output for Voxygen Former-commit-id: 55952f32019e826863849f07a71695de3e0c4c3c
2019-04-25 11:49:36 +00:00
]
update dependencies
2021-03-21 21:53:44 +00:00
[[package]]
name = "ndk"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8794322172319b972f528bf90c6b467be0079f1fa82780ffb431088e741a73ab"
dependencies = [
"jni-sys",
"ndk-sys",
Upgrade to winit 0.25
2021-06-15 08:01:57 +00:00
"num_enum",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"thiserror",
Winit 0.22 released
2020-03-13 04:05:06 +00:00
]
update crates
2021-09-20 10:05:41 +00:00
[[package]]
name = "ndk"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d64d6af06fde0e527b1ba5c7b79a6cc89cfc46325b0b2887dffe8f70197e0c3c"
dependencies = [
"bitflags",
"jni-sys",
"ndk-sys",
"num_enum",
"thiserror",
]
update dependencies
2021-03-21 21:53:44 +00:00
[[package]]
name = "ndk-glue"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c5caf0c24d51ac1c905c27d4eda4fa0635bbe0de596b8f79235e0b17a4d29385"
dependencies = [
"lazy_static",
"libc",
"log",
update crates
2021-09-20 10:05:41 +00:00
"ndk 0.3.0",
"ndk-macro",
"ndk-sys",
]
[[package]]
name = "ndk-glue"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3e9e94628f24e7a3cb5b96a2dc5683acd9230bf11991c2a1677b87695138420"
dependencies = [
"lazy_static",
"libc",
"log",
"ndk 0.4.0",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"ndk-macro",
Winit 0.22 released
2020-03-13 04:05:06 +00:00
"ndk-sys",
]
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
[[package]]
name = "ndk-macro"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05d1c6307dc424d0f65b9b06e94f88248e6305726b14729fd67a5e47b2dc481d"
dependencies = [
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
"darling 0.10.2",
update crates
2021-09-20 10:05:41 +00:00
"proc-macro-crate 0.1.5",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"proc-macro2 1.0.32",
"quote 1.0.10",
"syn 1.0.81",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
]
Winit 0.22 released
2020-03-13 04:05:06 +00:00
[[package]]
name = "ndk-sys"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
version = "0.2.1"
Winit 0.22 released
2020-03-13 04:05:06 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "c44922cb3dbb1c70b5e5f443d63b64363a898564d739ba5198e3a9138442868d"
Winit 0.22 released
2020-03-13 04:05:06 +00:00
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "net2"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
version = "0.2.37"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
ci cleanup, dependency update
2020-11-06 13:14:54 +00:00
"cfg-if 0.1.10",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"winapi 0.3.9",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
Draft of botclient.
2021-03-10 18:32:45 +00:00
[[package]]
name = "nibble_vec"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43"
dependencies = [
"smallvec",
]
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
[[package]]
name = "nix"
version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "83450fe6a6142ddd95fb064b746083fc4ef1705fe81f64a64e1d4b39f54a1055"
dependencies = [
"bitflags",
"cc",
ci cleanup, dependency update
2020-11-06 13:14:54 +00:00
"cfg-if 0.1.10",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
Clean and update dependencies * Remove tweak feature * Remove const-tweaker * Update tiny_http * Update bitvec to 0.21.0 * Downgrade euc to avoid conflict with vek 0.12.0 * Require exactly vek 0.12.0 * Update all other dependencies automatically based on these changes * Update gilrs to latest at the request of Ada Lovegirls * Update meshing benchmarks to new criterion API
2021-02-15 07:47:28 +00:00
]
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
[[package]]
name = "nix"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.20.0"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
dependencies = [
"bitflags",
"cc",
"cfg-if 1.0.0",
"libc",
update crates
2021-09-20 10:05:41 +00:00
]
[[package]]
name = "nix"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.22.0"
update crates
2021-09-20 10:05:41 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "cf1e25ee6b412c2a1e3fcb6a4499a5c1bfe7f43e014bdce9a6b6666e5aa2d187"
update crates
2021-09-20 10:05:41 +00:00
dependencies = [
"bitflags",
"cc",
"cfg-if 1.0.0",
"libc",
"memoffset 0.6.4",
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "noise"
Upgrade noise eliminating old rand dependency
2021-01-05 18:10:47 +00:00
version = "0.7.0"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Upgrade noise eliminating old rand dependency
2021-01-05 18:10:47 +00:00
checksum = "82051dd6745d5184c6efb7bc8be14892a7f6d4f3ad6dbf754d1c7d7d5fe24b43"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
Upgrade noise eliminating old rand dependency
2021-01-05 18:10:47 +00:00
"rand 0.7.3",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"rand_xorshift",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
Add default keybindings Former-commit-id: c8886a2eb3326ba62e31ef84b93a29ee59f378b3
2019-04-16 08:56:47 +00:00
[[package]]
name = "nom"
version = "4.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6"
Add default keybindings Former-commit-id: c8886a2eb3326ba62e31ef84b93a29ee59f378b3
2019-04-16 08:56:47 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"memchr",
"version_check 0.1.5",
Add default keybindings Former-commit-id: c8886a2eb3326ba62e31ef84b93a29ee59f378b3
2019-04-16 08:56:47 +00:00
]
Added Controller support
2020-03-10 21:00:13 +00:00
[[package]]
name = "nom"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
version = "5.1.2"
Added Controller support
2020-03-10 21:00:13 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af"
Added Controller support
2020-03-10 21:00:13 +00:00
dependencies = [
"memchr",
update dependencies
2021-03-21 21:53:44 +00:00
"version_check 0.9.3",
Added Controller support
2020-03-10 21:00:13 +00:00
]
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
[[package]]
name = "nom"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "7.1.0"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "1b1d11e1ef389c76fe5b81bcaf2ea32cf88b62bc494e19f493d0b30e7a930109"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
dependencies = [
"memchr",
update crates
2021-09-20 10:05:41 +00:00
"minimal-lexical",
update dependencies
2021-03-21 21:53:44 +00:00
"version_check 0.9.3",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
]
Use assets_manager to load assets
2020-12-12 22:14:24 +00:00
[[package]]
name = "notify"
update dependencies
2021-06-04 07:44:30 +00:00
version = "4.0.17"
Use assets_manager to load assets
2020-12-12 22:14:24 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies
2021-06-04 07:44:30 +00:00
checksum = "ae03c8c853dba7bfd23e571ff0cff7bc9dceb40a4cd684cd1681824183f45257"
Use assets_manager to load assets
2020-12-12 22:14:24 +00:00
dependencies = [
"bitflags",
"filetime",
update dependencies
2021-06-04 07:44:30 +00:00
"fsevent",
Use assets_manager to load assets
2020-12-12 22:14:24 +00:00
"fsevent-sys 2.0.1",
"inotify 0.7.1",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"mio 0.6.23",
Use assets_manager to load assets
2020-12-12 22:14:24 +00:00
"mio-extras",
update dependencies and fix audio issues fixed #1027 fixed #1033 fixed #1020 fixed #1017 fixed #1029 fixed #1025 fixed #807 fixed #816 fixed #1004 fixed #1005
2021-03-29 07:45:00 +00:00
"walkdir 2.3.2",
Use assets_manager to load assets
2020-12-12 22:14:24 +00:00
"winapi 0.3.9",
]
Move shaders, start asset reloading system
2019-08-03 05:42:33 +00:00
[[package]]
name = "notify"
update crates
2021-09-20 10:05:41 +00:00
version = "5.0.0-pre.13"
Move shaders, start asset reloading system
2019-08-03 05:42:33 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "245d358380e2352c2d020e8ee62baac09b3420f1f6c012a31326cfced4ad487d"
Move shaders, start asset reloading system
2019-08-03 05:42:33 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"bitflags",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"crossbeam-channel",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"filetime",
update dependencies
2021-06-04 07:44:30 +00:00
"fsevent-sys 4.0.0",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"inotify 0.9.6",
update crates
2021-09-20 10:05:41 +00:00
"kqueue",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"mio 0.7.14",
update dependencies and fix audio issues fixed #1027 fixed #1033 fixed #1020 fixed #1017 fixed #1029 fixed #1025 fixed #807 fixed #816 fixed #1004 fixed #1005
2021-03-29 07:45:00 +00:00
"walkdir 2.3.2",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"winapi 0.3.9",
Move shaders, start asset reloading system
2019-08-03 05:42:33 +00:00
]
Made the server cli great
2020-07-27 16:26:34 +00:00
[[package]]
name = "ntapi"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
version = "0.3.6"
Made the server cli great
2020-07-27 16:26:34 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
Made the server cli great
2020-07-27 16:26:34 +00:00
dependencies = [
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"winapi 0.3.9",
Made the server cli great
2020-07-27 16:26:34 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "num"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
version = "0.2.1"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "b8536030f9fea7127f841b45bb6243b27255787fb4eb83958aa1ef9d2fdc0c36"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
update further crates
2020-12-16 00:07:39 +00:00
"num-bigint 0.2.6",
"num-complex 0.2.4",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"num-integer",
"num-iter",
(See sharp/lod-history) LOD, shadows, greedy meshing, new lighting, perf --- Pretty much a Veloren fork at this point. Here's a high level overview of the changes (will be added to CHANGELOG just before merge). At a high level this MR incorporates roughly two groups of changes. The first group consists of new game features: more flexible map sizes, level of detail terrain, shadow maps, and a new lighting engine. This is "feature work" that (mostly) only adds new things to Veloren, and mostly shouldn't affect old stuff. The second big group of changes are those addressing the fallout from all the new features. These include performance fixes of various sorts: the addition of multiple graphics options and optimization of the cheap ones to avoid work, switching all voxel models to use some variant of greedy meshing, switching over much of our CPU-side vector math to exploit SIMD instructions (coinciding with a fork of `vek`), and a rewrite of how the UI handles text rendering (coinciding with updates to our fork of `conrod`). Making Veloren's hardcoded colors appear correct under the new lighting engine also required considerably changes (TODO: Fill in this section when it's complete). The second category of changes often heavily touches code owned by other people, including frequently modified code "owned" by a handful of people, so I recommend that this code be reviewed particularly carefully. --- At a high level (each will be described in more detail below): - The world map has been refactored. - The world size is no longer hardcoded (@zesterer). - The map generation code was made generic to allow using it outside of the `world` crate (@zesterer). - On world creation, we now compute *horizon maps* (@zesterer). - The way we pass the world from the server to the client has been updated (@xMAC94x). - Artifacts related to image rotation were fixed (@imbris). - Multiflow rivers were enabled (@zesterer). - In the process of making changes related to the world map, various incidental fixes and optimizations were required. - The new *level of detail* feature was added (@zesterer wrote part of this and has checked out the rest). - A new LOD terrain rendering step was added to the pipeline. - The LOD terrain quality was made configurable via a graphics setting. - Horizon maps were used to cast shadows from LOD chunks on both LOD and non-LOD terrain. - A "voxelization" effect was incorporated into rendered LOD terrain to make it blend better into the world. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Veloren's lighting has been completely overhauled (@zesterer has already checked most of this out). - A semi-accurate index of refraction was assigned to our materials. - A new, more realistic, physically based approach to lighting was used using the *Ashikhmin Shirley* BRDF. - We emulate *atmospheric scattering* using equations designed for measuring solar panel light exposure. - We attempt to compute *realistic light attenuation* in water using its real material properties. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Point and directional lights now cast realistic shadows, using *shadow mapping.* (@imbris, @zesterer, @Treeco, @YuriMomo) - Point light shadow maps were added to the rendering pipeline, using geometry shaders and *seamless cube maps*. - Directional light shadows were added to the rendering pipeline, using LISPSM together with disabling *depth clamping*. - "Shadow-only" chunks and NPCs were added to prevent shadows from models behind you from disappearing. - In the process of making changes related to shadow maps, various incidental fixes and optimizations were required. The addition of shadow maps, LOD terrain, and the new lighting all led to significant performance degradation, on top of other changes happening in master. Therefore, a large number of performance improvements were also needed: - The graphics options were made much more flexible and configurable, and shaders were optimize. - New options were provided for how to render lights and shadows (@Pfauenauge, @zesterer). - Graphic setting storage and configuration were overhauled to make adding new features easier (@Pfauenauge, @imbris). - Shaders were rewritten to utilize GLSL's preprocessor to avoid overhead (@zesterer, @YuriMomo). - In the process of making changes related to providing additional rendering options, various incidental fixes and optimizations were required. - Voxel model creation was switched to use *greedy meshing.* - A new voxel meshing method, greedy meshing, was added (@imbris). - Uses of the older meshing methods were migrated to use greedy meshing (@imbris, @jshipsey, @Pfauenauge). - New restrictions were added to terrain, figure, and sprites to future proof them for further optimizations (@jshipsey, @Pfauenauge, @zesterer). - Most positions are now relative to either chunk or player position for better precision (@imbris, @zesterer, @scottc). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - Animation and terrain math were switched to use SIMD where possible. - Fixes were made to vek to make its SIMD feature usable for us (@zesterer, @imbris). - The interface and types used in bone animation were changed in various ways (@jshipsey, @Snowram, @Pfauenauge). - Redundant code generation for body animation is now partly taken care of by a macro (@jshipsey, @Snowram, @Pfauenauge). - Animation code was modified to to use vek's SIMD representation where possible (@jshipsey, @Snowram, @Pfauenauge). - Terrain meshing code and shadow map math were also modified to use vek's SIMD representation (@imbris). - SIMD instruction generation was enabled (@YuriMomo, @jshipsey, @Snowram, @imbris, @Angelonfira, @xMAC94x). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - The way we cache glyphs was completely refactored, fixed, and optimized. - Our fork of `conrod` was optimized in various ways (@imbris). - Our fork of `conrod` now exposes whether a widget was updated during the current frame (@imbris). - Our use of the glyph cache was rewritten for correctness (@imbris). - A *text cache* was introduced that lets us skip remeshing glyphs that have not changed (@imbris). - Various changes were made to reduce pressure on the glyph cache, with more planned (@imbris, @Pfauenauge). - In the process of making changes related to the glyph cache, various incidental fixes and optimizations were required. - Colors were changed to keep Veloren's look consistent with master. - Some older tree models were brought back (@Pfauenauge). - TODO(@Sharp): All hardcoded colors were extracted and made hotloadable. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Hardcoded colors were fixed to conform to Veloren's style. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Color models were fixed to conform to Veloren's style. A detailed description of the involved changes follows. --- - The world size is no longer hardcoded. All functions dependent on world size now take a `WorldSizeLg`, which holds the base 2 logarithm of each actual world dimension and is guaranteed to maintain certain properties (outlined in `common/src/terrain/map.rs`). Additionally, many utility functions that utilize the world size were moved into `common` as well (mostly `common/src/terrain/mod.rs`). Finally, the world map format was updated in order to store its size explicitly, with a migration path from the old format that should work whenever the old formatted map was a square (practically always). See `world/src/sim/mod.rs` for these changes. - The map generation code was made generic to allow using it outside of the `world` crate. The parts of the map generating code that do not need to query the world were moved over to `common/src/terrain/map.rs`, allowing them to be used from the client without creating a dependency on `world`. The rest of it was turned into helper functions in `world/src/sim/map.rs`, which can be passed as closures to the generic map generation code to complete its construction. This also means that colors are now passed in separately to the map generation function. See <https://veloren.net/devblog-78/> for more details. - On world creation, we now compute *horizon maps*. See the function in `world/src/sim/util.rs`. Given a height map and a plane intersecting that height map, our horizon maps allow us to encode enough information to reconstruct shadows for each point on the height map using only the *horizon angle* (the angle at which the sun starts to become visible). As Veloren's sun only covers one plane, this is sufficient for encoding sun shadows for LOD terrain, by encoding two angles per chunk (one for each 90 degrees the sun covers). We can also use this for the moon, if we want, since the moon follows the same path. Additionally, we store the *height* of the furthest occluder, to try to make the shadows volumetric; so this means 4 bytes in total for each chunk. Support for horizon maps has been merged into the map functionality in common as well. - The way we pass the world from the server to the client has been updated. Rather than passing the prerendered map, we instead pass three maps with values for each chunk; one with the color information, a second with altitude information, and a third with horizon map information. We then reconstruct the map on the client, together with some additional information we send from the server (like the sea level and maximum height). See `common/src/msg/server.rs` for a detailed description of the format of `WorldMapMsg`, and `server/src/libr.rs` and `client/src/lib.rs` for details of the map construction and parsing. - Artifacts related to image rotation were fixed. See the commit message for commit SHA `cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e` for a detailed explanation. This involved changes to shaders, the addition of a new type of graphic (also reflected in the graphic cache) that allows specifying a border color (which automatically makes the associated texture immutable), and some related fixes. I reproduce the first two paragraphs of the MR description as well: ``` Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). ``` - Multiflow rivers were enabled. This does not really need to be part of this MR, and would be easy to revert, but since it seemed to provide a nice improvement it's currently packaged with it. We already computed multiple outflows from each chunk for erosion purposes long before this MR. However, we never modified river rendering to be able to handle this case (just a single downhill river flow is complex enough!) so this was not exposed when deciding which chunks were rivers. Now that - In the process of making changes related to the world map, various incidental fixes and optimizations were required. Some examples of fixes include making sure terrain is never lowered to below sea level (to make the shadow maps report correct values), fixing map altitudes and colors to understand things like cliffs and "block level" coloring (that doesn'te xist on the column level), and fixing a crashbug when rendering images for the UI where source pixels are strongly rectangular. Some examples of related performance fixes include avoiding allocating a fresh vector for all the maps (i.e. copying it over to change the format from `[u32; n]` to `DynamicImage` and then copying again to convert to `RgbaImage`), and instead using the `gfx::memory::slice` function to accomplish the same thing. These sorts of changes are spread all arond the code. This includes the additon of a new scene, `voxygen/src/scene/lod.rs`, a new pipeline `voxygen/src/render/pipeline/lod_terrain.rs`, and new shaders `assets/vxygen/shaders/lod-terrain-vert.glsl` and `assets/vxygen/shaders/lod-terrain-frag.glsl`, as well as associated changes to the renderer in `voxygen/src/render/renderer.rs`. The main idea behind our initial approach to LOD was to take the world data we now get from the server (altitude, color, and horizon mapping). - Some previously computed values were turned into shader uniforms for better prediction on weak processors. (@zesterer) - Calls to power or trig functions were removed or replaced with multiplications, where possible. - After some deliberation - To properly handle sprite "waving" for nearby sprites, We explicitly designed the greedy meshing system with figures and sprites in mind. In both cases, we want to be able to *efficiently* pack many different models into the same texture, especially in cases where we know we will either not be removing any of the grouped-together from the models from the texture, or will remove all of them at once (so they can be packed into some specific subtexture). For sprites, since we know every model in advance and never intend to deallocate them, we currently pack them all as efficiently as possible into one giant tetxure atlas. However, in the future we might opt to pack them slightly less efficiently in exchange for shrinking the sprite vertex size. For figures, we pack all the textures for each *model* into the same atlas. is a global texture atlas used for every sprite, and for figures which is why we have the ability to mesh multiple models to the same texture area (using the simple texture atlas allocator) without requiring intermediate vector allocations. This is accomplished by delaying the time when we actually write the color and light data to the texture until *after* all the model vertices have been meshed; then, we can just allocate the whole color/light array at once, making the atlas we use an exact fit. In computer science-y terms, we accomplish this delay by, after we perform the initial greedy meshing (without texture information), not continuing to create the texture data, but instead constructing a *continuation*--that is, a function that, when called, will execute the rest of the computation. We push this continuation (which in Rust terms is a `FnOnce` closure that takes the `ColLightsInfo` that it is supposed to write to as context) onto a onto a vector resizing. To allow for suspended writes to texture data, Rust pointed out to me that the continuation that would eventually write the color and light data to the texture atlas (the one that is shared by all models sharing the same greedy mesher) would have to *own* whatever data it mshed. Because we often generate the model data to mesh as a temporary in `voxygen/src/load.rs`, the - Matrix multiplications in the shader were reduced for figure data (@zesterer). - Vertex "waves" for fluid data were removed. - Terrain "bending" near edges was removed. - Scaling was fixed to make sure empty space was not introduced in a space previously occupied by a block. It was also changed to take ownership of its voxel data, rather than sharing it, to let it be used with meshing. - Rust's nightly version was bumped in order to use the `array_map` function, which lets us reuse more code between the simple map and `FigureModelCache`. - PositionedGlyph::standalone. --- I tried to cite sources in many cases[^realtime],[^lloyd],[^lispsm],[^pbrt],[^greedy],[^tjunctions] where I needed features from elsewhere but I am particularly grateful for the following resources, esepcially where they have accompanying source code. I linked all of them that are accessible to the public (those that are not were obtained through legal means). [^realtime]: Eisemann, Elmar, Michael Schwarz, Ulf Assarsson, Michael Wimmer. Real-Time Shadows. A K Peters/CRC Press (T&F), 20160419. [^lloyd]: Lloyd,B. 2007. [Logarithmic perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). PhD thesis, University of North Carolina. [^lispsm]: Wimmer, M., Scherzer, D., and Purgathofer, W. 2004. [Light space perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). In Proceedings of Eurographics Symposium on Rendering 2004, pp. 143– 152. [^pbrt]: Pharr, Matt, et al. [http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf](Physically Based Rendering: From Theory to Implementation). Third edition, Morgan Kaufmann Publishers/Elsevier, 2017. [^greedy]: mikolalysenko. “Meshing in a Minecraft Game.” 0 FPS, 30 June 2012, <https://0fps.net/2012/06/30/meshing-in-a-minecraft-game/>. [^tjunctions]: blackflux. “Meshing in Voxel Engines – Part 1.” Blackflux.Com, 23 Feb. 2014, <https://blackflux.wordpress.com/2014/02/23/meshing-in-voxel-engines-part-1/>. I am also especially grateful to Khronos, Wikiepdia, and stackoverflow for answering many of my specific questions while writing the MR. --- Squashed commit of the following: commit 300505e7305a2fdac722a808ee8538323f215f39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 18:46:25 2020 +0200 Fixing cargo doc and typo in CHANGELOG. commit ec0aeb18e8499d7d84ef818331b4b65c3d76cea6 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 15:38:50 2020 +0200 Hopefully final commit for the LOD branch. commit 5e8ea0b1eaac02903a02feb2eb038d195de4872f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 10:14:26 2020 +0200 Falling back to power as stopgap. commit e44a1cbf46504ee9931a01bdc9033e145500d557 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 09:25:41 2020 +0200 Address imbris feedback. Temporarily disables shiny water, lowers max VD. These restrictions will be lifted soon after merging. commit 561e25778a108ac3712f5ec2ce3a51234c4430d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 08:31:13 2020 +0200 Tweaking shaders a bit. commit 7d19259078ce0dd7b3742ad7d0cb3fab3ece3fdc Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:59:43 2020 +0200 Fix view example as well. commit 051cd4934e0fad2c0b15db4380a4189fa318679f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:29:06 2020 +0200 Fix meshing benchmark. commit c95e07db3b4dcca285678985e65e31b927cb1c61 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 05:46:22 2020 +0200 Address MR feedback, fix scene clouds. commit 1bfb816cabdb3ffc1e507a009c2d98696b4b573a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:39:36 2020 +0200 Incorporating Pfau's figure color changes. New eyes and new humanoid colors. commit 3f9b89a3ac7b3356b1dba0d1a8f6541357f81469 Merge: e2f5162e4 62c53963a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:29:41 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit e2f5162e4f96f4124aa43488f7245d341b3dcfd4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:28:38 2020 +0200 World colors are all hotloadable. They live in assets/world/style/colors.ron. Only a small handful of hardcoed colors remain in World; they are either part of the map, or difficult to disentangle from the rest of the computation. Comments are made where appropriate. commit 62c53963abe1975009d34a8f9515a355bef24f31 Author: Marcel Märtens <marcel.cochem@googlemail.com> Date: Wed Aug 19 15:59:00 2020 +0200 replace pretty_env_logger with tracing commit 5b1625f99d9586fe80e2232f583ec5af9f953099 Merge: d71003acd 4942b5b39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:15:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit d71003acdabeff970b3928e97c26af6847b5b78e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:14:34 2020 +0200 Hotloading colors, part 1: colors in common. Currently, this just entails humanoid colors. There are only three colors not handled; the light emitter colors in common/src/comp/inventory/item/tool.rs. These don't seem important enough to me to warrant making hotloadable, at least not right now, but if it's needed later we can always add them to the file. commit 63b5e0e553eb2ea49276f192a6fc7dd65254270d Merge: c32b337a4 6d2c4b9c1 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 13:05:37 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c32b337a46e10d9de473d178a94a3ccd61c39bb3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:52:04 2020 +0200 Fixing LOD grid, for real. commit a166ae0360395387e09fb35a1f84210c2ce5ec24 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:28:05 2020 +0200 Addressing imbris's initial feedback. Fixes two minor bugs: explosion particles were no longer spawning randomly, and LOD grids were not perfectly even. commit 4cbad004f44060994252dd3d38647a14a589712f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:27:58 2020 +0200 Bumping nightly per request. commit 548680276aac77c25d43d16b5622f847d474dbef Merge: acc098604 8f8b20c91 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:26:06 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit acc0986040589a3492f88a740bc3c3fc693b26d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:28:32 2020 +0200 Lower resolution due to lying drivers. commit d3b878de2a52c358d2944a6bbd0555dad7fbdb10 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:15:38 2020 +0200 Fix issues msh encountered with Intel 4600. commit 10245e0c1b0cb6fae10d86409435364edc6102ef Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 21:15:02 2020 +0200 Merge more models into one mesh than we did previously. commit 3155c31e663c52ae5c3a53d5fb5665892a1a498a Merge: 7204cc8a7 3c199280e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:35:22 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7204cc8a7a4f74a30306bd205d9834fee4bb944f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:34:43 2020 +0200 Fix not yet done NPC animations. This forces them all to be the idle animation if not specified. This fixes issues where you'd have giant NPCs in water. commit bc83360f2a08918f19d417b5f772e1ff554dba08 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 19:36:37 2020 +0200 Try to fix some bugs: - Z fighting with LOD terrain and water. - Audio SFX not playing. commit 1fd104aa603bf3781b6526a5cada46aeca3049dd Merge: 862df3c99 7c2c392a3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 12:02:31 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 862df3c9976c4da9bd7cfd784f1a85973127968a Merge: 0a4218ed9 75c1d4401 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 05:52:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0a4218ed9d541a2b34c133351bea38a99ddf4ea7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 22:27:14 2020 +0200 Fix particle depth. commit f51dfdeb442d0dd5243dd2f344fa4be295bd0875 Merge: c6251a956 5e6dc0471 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:19:04 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit c6251a956ad376400dca5c23420cf8d213dc8fdf Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:15:46 2020 +0200 Cache figures more intelligently. Cache figures for longer, and don't cache character states for the player except where they actually affect the rendered model. commit 0ed801d5404982c6fb63b1eaa4567d908b294c9d Merge: c11b9bdf0 eea64f78f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 16:32:24 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c11b9bdf0a53bf9884d2f5a48fec9b01d582df1a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 11:47:15 2020 +0200 Remove unneeded Clippy annotation. commit 16aa9ef40af56d69289d00aafb3deadfb8bd4f35 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 8 00:53:02 2020 +0200 Fix hotloading and Clippy. commit 3dc973e0be5b758da1e9805eb764ad401374cd0c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 23:50:27 2020 +0200 Major speedups with SIMD. commit fba64a7d93d5a96077ce87287bbce6ab9b7fbcae Merge: 76429d00e d1e10b178 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:19 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 76429d00eea00d212fbd672a84ee91e75b19b938 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:10 2020 +0200 Add clippy.toml. commit c79f512f84dbb83cb82b7954db68ff241dfd8e41 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 11:55:20 2020 +0200 Fix all clippy issues, clean up Rust code. commit 6f90e010b3fbefb53b0d632e819931350015b6b8 Merge: 77a8c7c26 5929cfa5c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:30 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 77a8c7c267d3f44a1a62bd6b2274359973c5e4d4 Merge: b44e44232 44febaabd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:10 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 5929cfa5c713aa392110bbb62407f76caf53c3df Author: jshipsey <jshipsey18@gmail.com> Date: Thu Aug 6 20:47:27 2020 -0400 fixed in-hand arrow bug commit b44e442325d828f1cd564d66908f89d09e80474b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 6 13:40:35 2020 +0200 Miscellaneous performance improvements. commit be37acf287c1360d8085862526ac3365ffd1d768 Merge: 125d7fc6c c11876547 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 05:49:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 125d7fc6c4dcd8c8c5f27b8268a4d64f409f3644 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 04:55:31 2020 +0200 Abstract over simd vs. repr_c vectors. Also some minor improvements to Event size. commit d4d4956e9252e1241ce110b2aa85076c6b1e2a23 Merge: 5f3b7294a aced5f979 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:56:54 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 5f3b7294af1f8533edc2620b58863c248e2b07af Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:43:52 2020 +0200 Fix formatting issues I missed before. commit a428a3ebba70dcab63dd0f8cd983120c90617271 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:41:51 2020 +0200 Fix clippy warnings, part 1. There aer still a bunch of type too complex and function takes too many arguments warnings that I'll fix later (or ignore, since in the one case I did fix a function takes too many arguments warning I think it made the code *less* readable). commit ba54307540ed8a937ac08209730284fc653af85b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 30 13:22:42 2020 +0200 Fix light animations so they are removed when the light turns off. commit 7e0f4bcbf0f4717145d8beac40d52e3acebbe2aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 21:10:20 2020 +0200 Fix crash in edge case for pixel art. commit 56da06f7a351e2b949e9b014a90b974d511a0924 Merge: cf74d55f2 9f53a4a19 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:56:52 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:29:52 2020 +0200 Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). The first concern was addressed by fixing the dimensions of the map images drawn from the UI (so that we always use a square source rectangle, rather than a rectangular one according to the dimensions of the map). We also fixed the way rotation was done in the fragment shader for north-facing sources to make it properly handle aspect ratio (this was already done for north-facing targets). Together, these fix rendering issues peculiar to rectangular maps. The second and third concerns were jointly addressed by adding an optional border color to every 2D image drawn by the UI. This turns out not to waste extra space even though we hold a full f32 color (to avoid an extra dependency on gfx's PackedColor), since voxel images already take up more space than Optiion<[f32; 4]> requires. This is then implemented automatically using the "border color" wrapping method in the attached sampler. Since this is implemented in graphics hardware, it only works (at least naively) if the actual image bounds match the texture bounds. Therefore, we altered the way the graphics cache stores images with a border color to guarantee that they are always in their own texture, whose size exactly matches their extent. Since the easiest currently exposed way to set a border color is to do so for an immutable texture, we went a bit further and added a new "immutable" texture storage type used for these cases; currently, it is always and automatically used only when there is a specified border color, but in theory there's no reason we couldn't provide immutable-only images that use the default wrapping mdoe (though clamp to border is admittedly not a great default). To fix the maps case specifically, we set the border color to a translucent version of the ocean border color. This may need tweaking going forward, which shouldn't be hard. As part of this process, we had to modify graphics replacement to make sure immutable images are *removed* when invalidated, rather than just having a validity flag unset (this is normally done by the UI to try to reuse allocations in place if images are updated in benign ways, since the texture atlases used for Ui do not support deallocation; currently this is only used for item images, so there should be no overlap with immutable image replacement, so this was purely precautionary). Since we were already touching the relevant code, we also updated the image dependency to a newer version that provides more ways to avoid allocations, and made a few other changes that should hopefully eliminate redundant most of the intermediate buffer allocations we were performing for what should be zero-cost conversions. This may slightly improve performance in some cases. commit ad18ce939940a8c697270f6e9b94db9942fd8295 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 13:21:09 2020 +0200 Fix continent scale hack. commit 36b1cb074f5b195aebd7dbbc3da7f0246a1a18ec Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 12:11:40 2020 +0200 Enable loading different sized maps without a recompile. We may want to tweak the effects of the continent_scale_hack. commit 13b6d4d534cc4814b7cb3294ca41bbfea0a6b186 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 10:55:48 2020 +0200 Removing WORLD_SIZE, part 1. Erased almost every instance of WORLD_SIZE and replaced it with a local power of two, map_size_lg (which respects certain invariants; see common/src/terrain/map.rs for more details about MapSizeLg). This also means we can avoid a dependency on the world crate from client, as desired. Now that the rest of the code is not expecting a fixed WORLD_SIZE, the next step is to arrange for maps to store their world size, and to use that world size as a basis prior to loading the map (as well, probably, as prior to configuring some of the noise functions). commit 30b1d2c6428230a9eaa0d749cdcbbd6f1cbccd78 Merge: 7d56ba31b 1377b369f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:58 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 7d56ba31b445441461b28a07fc495d7d4f047c17 Merge: 2101113b4 598f14b25 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 1377b369f6db2258e910d467a5740f31789e3ded Author: Monty Marz <m.marzouq@gmx.de> Date: Sun Jul 19 23:25:38 2020 +0200 more saturated pumpkins commit ae8d50527f93bb0616c2ad46ce4dacb63bc37c6d Author: Monty Marz <m.marzouq@gmx.de> Date: Sat Jul 18 20:29:56 2020 +0200 acacia models commit 2101113b467e691de787392d7f20f1745f5637bd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 18 18:55:25 2020 +0200 Higher detail LOD. commit add2cfae04b4385fa5590e11e2bd5229d9dee0aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 16 01:57:39 2020 +0200 Revert some irrelevant stuff. commit 2e2ab3dc1eaa59a4aef7f8d34a53d8aae4c8553a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 15 13:30:49 2020 +0200 Fixing various things about shadows. * Correcting optimal LISPSM parameter. * Figure shadows are cast when they're not visible. * Chunk shadows stay cast until you look away. * Seamless cubemaps for point lights. * Etc. commit 6c31e6b56217274285b597af297036691ea5d897 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 19:50:26 2020 +0200 Fix shadow creation. commit 6332cbe006115ae205597529cd8bbccd146c2cca Merge: be438657c 930e0028b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:47:00 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit be438657c33d7b5bfb0a9582c3ed3fd366637323 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:28:08 2020 +0200 Tweaks to shadows. Added shadow map resolution configuration, added seamless cubemaps, documented all existing rendering options, and fixed a few Clippy errors. commit 23b4058906013c7d2a40c286e20e32c5fbd897ed Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 10:11:19 2020 +0200 Fix moon, use nonlinear noise for terrain. Note that the latter has a bit of performance cost. commit 7fbe5cbfbb9dc29607957b8e62f432a4deed193d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:23:02 2020 +0200 Address lies about max texture size. commit bcfc62b5e13a1cdd83f57535fde4694720bebfd9 Merge: 75e3626a7 18a08e8fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:22:08 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 75e3626a785919f43fdcf2127c2b10e3e4df2f9f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:21:52 2020 +0200 OpenGL 3.3 minimum. commit 18a08e8fe2739f02af99a5d2cb4e7c38c49e858b Author: Monty Marz <m.marzouq@gmx.de> Date: Tue Jul 7 23:57:52 2020 +0200 settings localization commit 90c5d1ca3620092bc3ae10b2211489eb1cf6f5e8 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 21:11:48 2020 +0200 Lower near distance. commit 0e66f02b25aaddaa2dfddbbc89cd67de54a9a7b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 20:09:01 2020 +0200 All sprites sway in the wind now. commit db1401a6910bf42dcf502462c90038752ff5fbdb Merge: 69e508d8c e8b4b29d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 19:34:17 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 69e508d8c94d8973033817ca86f357e466fc7c4d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 18:41:37 2020 +0200 Make it easy to switch to SIMD for math. commit ffe0f5928c7a7e87d00cb5426b3b1d831d7e02fd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 21:21:12 2020 +0200 Fix some issues with underwater rendering. commit bfda6da42f38fd02c31ee92c81ab785a3e50c2a0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 19:17:59 2020 +0200 Fix some minor display issues. commit 0ed752e087968cf901301884aaeae698e32ef8a5 Merge: ccc6a06a8 518edcb85 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:14:21 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit ccc6a06a8d4504d6b9f7af7905a414d2ee06ab76 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:04:34 2020 +0200 Some minor changes. commit 4e020246702889269efe1a191788992164c508d6 Merge: 50a64d927 e05c9267a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 16:17:40 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 50a64d927e6c4f4b0e4688e4cbfca694bc3f922a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 13:07:03 2020 +0200 Fix far plane. commit 7dd06da34cae8f9ea3b6c889fe965181f3fd3949 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:25:35 2020 +0200 Add shadows.glsl. commit 618a18c998778bf871b905a74657440fcc384c80 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:10:22 2020 +0200 Adding shadows, greedy meshing, and more. commit eaea83fe6a5cb1cb0ba8beef888183c718258496 Merge: 267018495 2f89b863e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 22:47:07 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 2670184954a13e4a9e7a4e35ba79aac0c5fac2f7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 21:20:01 2020 +0200 Make civsim and sites deterministic. For anything in worldgen where you use a HashMap, *please* think carefully about which hasher you are going to use! This is especially true if (for some reason) you are depending on hashmap iteration order remaining stable for some aspect of worldgen. commit f8376fd5dc72b4a9c2f51a6b4570d59c8b8e9343 Merge: 654f7e049 cdee191dd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 17:53:57 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 654f7e049258d9da27c09608bbe6a46ffa8787e5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed May 20 21:22:30 2020 +0200 Correct backface culling. commit 560501df05ca725409b0f2e4eb31bdfdc15fd0c7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue May 19 17:22:06 2020 +0200 Greedy messhing for shadows. commit a4d87e1875ca543436e6bbbeb20348facc5a52d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun May 17 05:59:00 2020 +0200 Shadow maps work for lantern. commit 243d0837b8a3b08172c9a3c348d964d7ddc2a0a8 Merge: 04382dc28 71dd520cd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:53:13 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 04382dc28632b6c66e8821f6870c0daaa1c1901a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:22:17 2020 +0200 WIP: better graphics config, better LOD, shadow maps. commit 22ddbad3eb32bfa70f0932176022208fe67ded81 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 18:54:09 2020 +0200 Minor shader fixes. commit 746a10e8d01ac235f994b0cde78fa48998602a1f Merge: 0f4a0e763 40ab94673 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 04:02:09 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0f4a0e763db3afbdc4fb0558611f38326ca87151 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 23:03:24 2020 +0200 Switch back to pop-in terrain. commit dd74fa7e4a53667b38811d7aec58d7f6a68889bb Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 22:58:55 2020 +0200 LOD shading closer to voxel shading. commit ef67bd58ba0bdaf622b078892d768263b6cba268 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 28 20:49:03 2020 +0200 Experimental underwater lighting. commit 2c5ad9d07605e80d5fd5679dd3a5d70c605b86a9 Merge: 748279835 303967a6f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 22:35:24 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7482798354eda18c8207950080fc24d443a369de Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 21:59:55 2020 +0200 Replace discard in figure-frag. commit d83b4ae69be4912f69bf7835f509c68a1c7770a4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:45:57 2020 +0200 Fix sprite lighting, HDR from focus_pos. commit 0594238004f116274905fa0ed7c2b6c417ed1d29 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:14:10 2020 +0200 Proper HDR from point lights. commit 48c93d2b41ce5743103d18e76cc228f5ac766492 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 14:01:43 2020 +0200 Brighter ambiance, darker LOD shadows. commit e0452e895ccfa8a43f368cae3b8b8aedc24dad93 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 13:13:23 2020 +0200 More proper HDR. commit 4c6da3ed16cfeebb455e40da5f557b4af9a499d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 00:13:10 2020 +0200 Trying LOD noise. commit 682a3d74c85df5503ffe1fc1cc891bce789df1ad Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 23:11:08 2020 +0200 Fix LOD heights in towns. commit cc39e5734e8b18f9077bf42e66337c1319dd6b6e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 21:01:23 2020 +0200 More LOD fixes. commit 8116b21c2e51c836e77894e309ac273caf2917b3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:54:43 2020 +0200 I like this coloring. commit bc2560ea90b36f4b46190005344232d993043ac3 Merge: 14effdd5d e690efe71 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:48:33 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 14effdd5db8747fcf3eb34f03b46b7792e92d1c5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:24:35 2020 +0200 Re-saturate. commit 48a643955d4435b78179acba0beb4a979905cc31 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:23:57 2020 +0200 Various fixes. commit f7b497a0c25f4ad4682c71dd1ed6f608052feb9b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 03:22:49 2020 +0200 Render figures again. commit 44e4aad48deba8266b9f8bdfd3db096b381f5327 Merge: e6f0a5a98 9ec319a18 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 02:01:04 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit e6f0a5a981a82533ba188fff0a54ce98577bb152 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 24 16:12:20 2020 +0200 Add atmospheric scattering. commit f2953087f691a8edbc001cb98ebf5059fc6f8ac0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 23 00:01:20 2020 +0200 Fix shadowing for specular reflections. commit ddd4a67a9799b8d08c7dc0c2bec90621c2bed0e3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Apr 22 22:56:12 2020 +0200 HDR fixes. commit 1015e60deef3c447381996277df7496707a63bd0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 21 18:25:19 2020 +0200 More lighting changes. commit 80c264abd111fb237e57843efcb5c071d4f84613 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 13 00:29:59 2020 +0200 Lighting experiments. commit 8414987e589dd5102bad89762a3adaccc0bfe957 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 9 02:38:40 2020 +0200 WIP -- lighting changes and soft shadows. commit 9cd2b3fb0d6b49776c6dfe463e4169637250b11a Merge: c7ea687eb 8b149ad11 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:29 2020 +0200 Merge branch 'sharp/new-lighting' into sharp/small-fixes commit c7ea687ebbc5aace1b455f134a5bf49ce2c7434a Merge: 476441531 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:02 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 8b149ad11ad4bb75018fcf9519baec27d1c95951 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:32:39 2020 +0200 Trying out a new lighting model. commit b0ac9f36f755dd06f7c17c46150568064790864f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 07:56:11 2020 +0200 Use bicubic interpolation for terrain. commit f6fc9307a121514b614bc50ef8eb055953e7da8a Merge: 33140a295 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 05:01:41 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 4764415312aae6e9ac2d00e86e84577cb958f1ab Merge: ed2d0111d 13388ee6a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 04:54:48 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 13388ee6a42943f3f79a9cb488346cef18e272fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 20:30:08 2020 +0200 Various fixes (to coloring and to soft shadows). commit fbd084a94a067082a87cd6d28b82054709bc9265 Merge: 5a089863b 4fdf6896a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 18:50:38 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/map-colors commit ed2d0111d994262ae836d84d1fe5a45e4de72a0b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 06:49:27 2020 +0200 Combining colors and LOD. commit 88342640c6b835114d01c797b89fdede3b0a2108 Merge: 33140a295 5a089863b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:49:20 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 33140a2951b8212725f42c758b277aaec4d888f7 Merge: 4c65a5aed f34d4b379 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:36:21 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 5a089863beb01d4794bbe3580ada47b278715ea2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 03:17:49 2020 +0200 Making maps brighter. This is probably not the right way to do it, but oh well! commit 32b2c99109dd486aa922886081068f9c550c83f2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 02:46:36 2020 +0200 Horizon mapping and "layered" map generation. Horizon mapping is a method of shadow mapping specific to height maps. It can handle any angle between 0 and 90 degrees from the ground, as long as know the horizontal direction in advance, by remembering only a single angle (the "horizon angle" of the shadow map). More is explained in common/src/msg/server.rs. We also remember the approximate height of the largest occluder, to try to be able to generate soft shadows and create a vertical position where the shadows can't go higher. Additionally, map generation has been reworked. Instead of computing everything from explicit samples, we pass in sampling functions that return exactly what the map generator needs. This allows us to cleanly separate the way we sample things like altitudes and colors from the map generation process. We exploit this to generate maps *partially* on the server (with colors and rivers, but not shading). We can then send the partially completed map to the client, which can combine it with shadow information to generate the final map. This is useful for two reasons: first, it makes sure the client can apply shadow information by itself, and second, it lets us pass the unshaded map for use with level of detail functionality. For similar reasons, river generation is split out into its own layer, but for now we opt to still generate rivers on the server (since the river wire format is more complicated to compress and may require some extra work to make sure we have enough precision to draw rivers well enough for LoD). Finally, the mostly ad-hoc lighting we were performing has been (mostly) replaced with explicit Phong reflection shading (including specular highlights). Regularizing this seems useful and helps clarify the "meaning" of the various light intensities, and helps us keep a more physically plausible basis. However, its interaction with soft shadows is still imperfect, and it's not yet clear to me what we need to do to turn this into something useful for LoD. commit f8926a5737ddc51f3d585c651a64c43677aae0f4 Merge: a1aee931e 875ae6ced Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Mar 13 13:32:42 2020 +0100 Merge remote-tracking branch 'origin/master' into sharp/map-colors commit 4c65a5aed353b119aea65a2aaeb94549b67beb42 Author: Treeco <5021038-Treeco@users.noreply.gitlab.com> Date: Mon Feb 24 16:48:05 2020 +0000 Made LOD setting slider exponential commit 2fa7b2d20d7233dc8bfd64f9f7f54617575248f1 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 17:49:53 2020 +0000 Added mist to LoD commit aab059a450b5f635777129ff82cc15b662965c3c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 15:14:06 2020 +0000 Added LoD slider commit 779c36b538121c5ade3633ae5cb67bb14c8c3877 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:54:55 2020 +0000 Reduced cost of vertex pushing commit 9fea150473906b166365b738ebcea07c697daf3d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:38:53 2020 +0000 Fixed maths, improved LoD resolution commit 5481df38fea5bf183ff376a3337179cfaa5233dc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 11:22:50 2020 +0000 Dynamically relocate LoD vertices to enhance details commit a3e36a50ababd615da7db1b26158c7906a5def01 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 18:13:51 2020 +0000 Simpler terrain spiral rendering commit 255f450ae9ac8763db4bede075fb409161ed57cc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:53:17 2020 +0000 Better LoD precision commit 3d027aebe812a5b8658a4eb8123dc9f61b3776d2 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:04:03 2020 +0000 Better falloff commit be775c9484b457b2c0b1a494aec03392d0c70e76 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 15:30:45 2020 +0000 Applied good ideas from experimental branch commit 58587b68545a23c5c04ab4574a4b94b3bc982246 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 16:15:13 2020 +0000 Minor fixes to LoD merging commit 7b42aebd709c14df2db766aad61d9280ad24d84d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 15:04:44 2020 +0000 Capped LoD dragging commit 8aafc559f87124e1ea5ca6e3ddc2aa0c242d793c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:54:37 2020 +0000 Better blending between LoD and terrain border commit edd3455d5161792d87ddc8eadc0ecbad5532b284 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:40:19 2020 +0000 Fixed LoD z depth, added sea level offset commit b9b06744620114dd5556e73f64fa93c145503a7c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:27:43 2020 +0000 Better LoD smoothing commit a1aee931e790431560cd2d953ad61d9497072afd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Feb 21 14:52:17 2020 +0100 Adding shadows. commit 2400786c13dd891c131ed86d48d05df516a8a778 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 13:48:40 2020 +0000 Use world map as LoD source commit dbf650f504a4c25fbbc2096ac3616c736bf52d23 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Jan 20 00:48:14 2020 +0000 Better clouds at distance commit 5e6f81b86cdb9730b9b056877b19257075fd5fa8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Jan 19 23:59:02 2020 +0000 sync commit 745e7540ddb000cc645f612767b337c2ddc3f7c0 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 12:40:48 2019 +0000 Improved cloud falloff mist, faster noise sampling commit f6a200d0cb866196ba57697466755f9e0c7ea5d8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 10:09:00 2019 +0000 Improved long-range depth precision, removed unnecessary LoD polygons commit 63d1b2bb2292898d59fb4f4e502201103dfeb86f Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 20:57:46 2019 +0000 Working LoD shader commit f13d98ee3e58f881e8b978861a67663b59ed91ec Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 11:03:40 2019 +0000 LoD first attempt (stack overflow issue)
2020-08-20 18:34:59 +00:00
"num-rational 0.2.4",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"num-traits",
update further crates
2020-12-16 00:07:39 +00:00
]
[[package]]
name = "num"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
version = "0.4.0"
update further crates
2020-12-16 00:07:39 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606"
update further crates
2020-12-16 00:07:39 +00:00
dependencies = [
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"num-bigint 0.4.3",
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
"num-complex 0.4.0",
update further crates
2020-12-16 00:07:39 +00:00
"num-integer",
"num-iter",
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
"num-rational 0.4.0",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"num-traits",
Began integrating procgen trees
2021-01-03 20:43:07 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "num-bigint"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
version = "0.2.6"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"autocfg",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"num-integer",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"num-traits",
update further crates
2020-12-16 00:07:39 +00:00
]
[[package]]
name = "num-bigint"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.4.3"
update further crates
2020-12-16 00:07:39 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f"
update further crates
2020-12-16 00:07:39 +00:00
dependencies = [
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"autocfg",
update further crates
2020-12-16 00:07:39 +00:00
"num-integer",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"num-traits",
Began integrating procgen trees
2021-01-03 20:43:07 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "num-complex"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
version = "0.2.4"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"autocfg",
"num-traits",
update further crates
2020-12-16 00:07:39 +00:00
]
[[package]]
name = "num-complex"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
version = "0.4.0"
update further crates
2020-12-16 00:07:39 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
checksum = "26873667bbbb7c5182d4a37c1add32cdf09f841af72da53318fdb81543c15085"
update further crates
2020-12-16 00:07:39 +00:00
dependencies = [
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"num-traits",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
Updated lockfile
2020-09-20 09:14:29 +00:00
[[package]]
name = "num-derive"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
version = "0.3.3"
Updated lockfile
2020-09-20 09:14:29 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
Updated lockfile
2020-09-20 09:14:29 +00:00
dependencies = [
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"proc-macro2 1.0.32",
"quote 1.0.10",
"syn 1.0.81",
Updated lockfile
2020-09-20 09:14:29 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "num-integer"
update further crates
2020-12-16 00:07:39 +00:00
version = "0.1.44"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update further crates
2020-12-16 00:07:39 +00:00
checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"autocfg",
"num-traits",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
[[package]]
name = "num-iter"
update further crates
2020-12-16 00:07:39 +00:00
version = "0.1.42"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update further crates
2020-12-16 00:07:39 +00:00
checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"autocfg",
Began integrating procgen trees
2021-01-03 20:43:07 +00:00
"num-integer",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"num-traits",
Began integrating procgen trees
2021-01-03 20:43:07 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "num-rational"
fix workspaces and Cargo dependencies
2020-05-27 16:20:16 +00:00
version = "0.2.4"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
fix workspaces and Cargo dependencies
2020-05-27 16:20:16 +00:00
checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"autocfg",
update further crates
2020-12-16 00:07:39 +00:00
"num-bigint 0.2.6",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"num-integer",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"num-traits",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
(See sharp/lod-history) LOD, shadows, greedy meshing, new lighting, perf --- Pretty much a Veloren fork at this point. Here's a high level overview of the changes (will be added to CHANGELOG just before merge). At a high level this MR incorporates roughly two groups of changes. The first group consists of new game features: more flexible map sizes, level of detail terrain, shadow maps, and a new lighting engine. This is "feature work" that (mostly) only adds new things to Veloren, and mostly shouldn't affect old stuff. The second big group of changes are those addressing the fallout from all the new features. These include performance fixes of various sorts: the addition of multiple graphics options and optimization of the cheap ones to avoid work, switching all voxel models to use some variant of greedy meshing, switching over much of our CPU-side vector math to exploit SIMD instructions (coinciding with a fork of `vek`), and a rewrite of how the UI handles text rendering (coinciding with updates to our fork of `conrod`). Making Veloren's hardcoded colors appear correct under the new lighting engine also required considerably changes (TODO: Fill in this section when it's complete). The second category of changes often heavily touches code owned by other people, including frequently modified code "owned" by a handful of people, so I recommend that this code be reviewed particularly carefully. --- At a high level (each will be described in more detail below): - The world map has been refactored. - The world size is no longer hardcoded (@zesterer). - The map generation code was made generic to allow using it outside of the `world` crate (@zesterer). - On world creation, we now compute *horizon maps* (@zesterer). - The way we pass the world from the server to the client has been updated (@xMAC94x). - Artifacts related to image rotation were fixed (@imbris). - Multiflow rivers were enabled (@zesterer). - In the process of making changes related to the world map, various incidental fixes and optimizations were required. - The new *level of detail* feature was added (@zesterer wrote part of this and has checked out the rest). - A new LOD terrain rendering step was added to the pipeline. - The LOD terrain quality was made configurable via a graphics setting. - Horizon maps were used to cast shadows from LOD chunks on both LOD and non-LOD terrain. - A "voxelization" effect was incorporated into rendered LOD terrain to make it blend better into the world. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Veloren's lighting has been completely overhauled (@zesterer has already checked most of this out). - A semi-accurate index of refraction was assigned to our materials. - A new, more realistic, physically based approach to lighting was used using the *Ashikhmin Shirley* BRDF. - We emulate *atmospheric scattering* using equations designed for measuring solar panel light exposure. - We attempt to compute *realistic light attenuation* in water using its real material properties. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Point and directional lights now cast realistic shadows, using *shadow mapping.* (@imbris, @zesterer, @Treeco, @YuriMomo) - Point light shadow maps were added to the rendering pipeline, using geometry shaders and *seamless cube maps*. - Directional light shadows were added to the rendering pipeline, using LISPSM together with disabling *depth clamping*. - "Shadow-only" chunks and NPCs were added to prevent shadows from models behind you from disappearing. - In the process of making changes related to shadow maps, various incidental fixes and optimizations were required. The addition of shadow maps, LOD terrain, and the new lighting all led to significant performance degradation, on top of other changes happening in master. Therefore, a large number of performance improvements were also needed: - The graphics options were made much more flexible and configurable, and shaders were optimize. - New options were provided for how to render lights and shadows (@Pfauenauge, @zesterer). - Graphic setting storage and configuration were overhauled to make adding new features easier (@Pfauenauge, @imbris). - Shaders were rewritten to utilize GLSL's preprocessor to avoid overhead (@zesterer, @YuriMomo). - In the process of making changes related to providing additional rendering options, various incidental fixes and optimizations were required. - Voxel model creation was switched to use *greedy meshing.* - A new voxel meshing method, greedy meshing, was added (@imbris). - Uses of the older meshing methods were migrated to use greedy meshing (@imbris, @jshipsey, @Pfauenauge). - New restrictions were added to terrain, figure, and sprites to future proof them for further optimizations (@jshipsey, @Pfauenauge, @zesterer). - Most positions are now relative to either chunk or player position for better precision (@imbris, @zesterer, @scottc). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - Animation and terrain math were switched to use SIMD where possible. - Fixes were made to vek to make its SIMD feature usable for us (@zesterer, @imbris). - The interface and types used in bone animation were changed in various ways (@jshipsey, @Snowram, @Pfauenauge). - Redundant code generation for body animation is now partly taken care of by a macro (@jshipsey, @Snowram, @Pfauenauge). - Animation code was modified to to use vek's SIMD representation where possible (@jshipsey, @Snowram, @Pfauenauge). - Terrain meshing code and shadow map math were also modified to use vek's SIMD representation (@imbris). - SIMD instruction generation was enabled (@YuriMomo, @jshipsey, @Snowram, @imbris, @Angelonfira, @xMAC94x). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - The way we cache glyphs was completely refactored, fixed, and optimized. - Our fork of `conrod` was optimized in various ways (@imbris). - Our fork of `conrod` now exposes whether a widget was updated during the current frame (@imbris). - Our use of the glyph cache was rewritten for correctness (@imbris). - A *text cache* was introduced that lets us skip remeshing glyphs that have not changed (@imbris). - Various changes were made to reduce pressure on the glyph cache, with more planned (@imbris, @Pfauenauge). - In the process of making changes related to the glyph cache, various incidental fixes and optimizations were required. - Colors were changed to keep Veloren's look consistent with master. - Some older tree models were brought back (@Pfauenauge). - TODO(@Sharp): All hardcoded colors were extracted and made hotloadable. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Hardcoded colors were fixed to conform to Veloren's style. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Color models were fixed to conform to Veloren's style. A detailed description of the involved changes follows. --- - The world size is no longer hardcoded. All functions dependent on world size now take a `WorldSizeLg`, which holds the base 2 logarithm of each actual world dimension and is guaranteed to maintain certain properties (outlined in `common/src/terrain/map.rs`). Additionally, many utility functions that utilize the world size were moved into `common` as well (mostly `common/src/terrain/mod.rs`). Finally, the world map format was updated in order to store its size explicitly, with a migration path from the old format that should work whenever the old formatted map was a square (practically always). See `world/src/sim/mod.rs` for these changes. - The map generation code was made generic to allow using it outside of the `world` crate. The parts of the map generating code that do not need to query the world were moved over to `common/src/terrain/map.rs`, allowing them to be used from the client without creating a dependency on `world`. The rest of it was turned into helper functions in `world/src/sim/map.rs`, which can be passed as closures to the generic map generation code to complete its construction. This also means that colors are now passed in separately to the map generation function. See <https://veloren.net/devblog-78/> for more details. - On world creation, we now compute *horizon maps*. See the function in `world/src/sim/util.rs`. Given a height map and a plane intersecting that height map, our horizon maps allow us to encode enough information to reconstruct shadows for each point on the height map using only the *horizon angle* (the angle at which the sun starts to become visible). As Veloren's sun only covers one plane, this is sufficient for encoding sun shadows for LOD terrain, by encoding two angles per chunk (one for each 90 degrees the sun covers). We can also use this for the moon, if we want, since the moon follows the same path. Additionally, we store the *height* of the furthest occluder, to try to make the shadows volumetric; so this means 4 bytes in total for each chunk. Support for horizon maps has been merged into the map functionality in common as well. - The way we pass the world from the server to the client has been updated. Rather than passing the prerendered map, we instead pass three maps with values for each chunk; one with the color information, a second with altitude information, and a third with horizon map information. We then reconstruct the map on the client, together with some additional information we send from the server (like the sea level and maximum height). See `common/src/msg/server.rs` for a detailed description of the format of `WorldMapMsg`, and `server/src/libr.rs` and `client/src/lib.rs` for details of the map construction and parsing. - Artifacts related to image rotation were fixed. See the commit message for commit SHA `cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e` for a detailed explanation. This involved changes to shaders, the addition of a new type of graphic (also reflected in the graphic cache) that allows specifying a border color (which automatically makes the associated texture immutable), and some related fixes. I reproduce the first two paragraphs of the MR description as well: ``` Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). ``` - Multiflow rivers were enabled. This does not really need to be part of this MR, and would be easy to revert, but since it seemed to provide a nice improvement it's currently packaged with it. We already computed multiple outflows from each chunk for erosion purposes long before this MR. However, we never modified river rendering to be able to handle this case (just a single downhill river flow is complex enough!) so this was not exposed when deciding which chunks were rivers. Now that - In the process of making changes related to the world map, various incidental fixes and optimizations were required. Some examples of fixes include making sure terrain is never lowered to below sea level (to make the shadow maps report correct values), fixing map altitudes and colors to understand things like cliffs and "block level" coloring (that doesn'te xist on the column level), and fixing a crashbug when rendering images for the UI where source pixels are strongly rectangular. Some examples of related performance fixes include avoiding allocating a fresh vector for all the maps (i.e. copying it over to change the format from `[u32; n]` to `DynamicImage` and then copying again to convert to `RgbaImage`), and instead using the `gfx::memory::slice` function to accomplish the same thing. These sorts of changes are spread all arond the code. This includes the additon of a new scene, `voxygen/src/scene/lod.rs`, a new pipeline `voxygen/src/render/pipeline/lod_terrain.rs`, and new shaders `assets/vxygen/shaders/lod-terrain-vert.glsl` and `assets/vxygen/shaders/lod-terrain-frag.glsl`, as well as associated changes to the renderer in `voxygen/src/render/renderer.rs`. The main idea behind our initial approach to LOD was to take the world data we now get from the server (altitude, color, and horizon mapping). - Some previously computed values were turned into shader uniforms for better prediction on weak processors. (@zesterer) - Calls to power or trig functions were removed or replaced with multiplications, where possible. - After some deliberation - To properly handle sprite "waving" for nearby sprites, We explicitly designed the greedy meshing system with figures and sprites in mind. In both cases, we want to be able to *efficiently* pack many different models into the same texture, especially in cases where we know we will either not be removing any of the grouped-together from the models from the texture, or will remove all of them at once (so they can be packed into some specific subtexture). For sprites, since we know every model in advance and never intend to deallocate them, we currently pack them all as efficiently as possible into one giant tetxure atlas. However, in the future we might opt to pack them slightly less efficiently in exchange for shrinking the sprite vertex size. For figures, we pack all the textures for each *model* into the same atlas. is a global texture atlas used for every sprite, and for figures which is why we have the ability to mesh multiple models to the same texture area (using the simple texture atlas allocator) without requiring intermediate vector allocations. This is accomplished by delaying the time when we actually write the color and light data to the texture until *after* all the model vertices have been meshed; then, we can just allocate the whole color/light array at once, making the atlas we use an exact fit. In computer science-y terms, we accomplish this delay by, after we perform the initial greedy meshing (without texture information), not continuing to create the texture data, but instead constructing a *continuation*--that is, a function that, when called, will execute the rest of the computation. We push this continuation (which in Rust terms is a `FnOnce` closure that takes the `ColLightsInfo` that it is supposed to write to as context) onto a onto a vector resizing. To allow for suspended writes to texture data, Rust pointed out to me that the continuation that would eventually write the color and light data to the texture atlas (the one that is shared by all models sharing the same greedy mesher) would have to *own* whatever data it mshed. Because we often generate the model data to mesh as a temporary in `voxygen/src/load.rs`, the - Matrix multiplications in the shader were reduced for figure data (@zesterer). - Vertex "waves" for fluid data were removed. - Terrain "bending" near edges was removed. - Scaling was fixed to make sure empty space was not introduced in a space previously occupied by a block. It was also changed to take ownership of its voxel data, rather than sharing it, to let it be used with meshing. - Rust's nightly version was bumped in order to use the `array_map` function, which lets us reuse more code between the simple map and `FigureModelCache`. - PositionedGlyph::standalone. --- I tried to cite sources in many cases[^realtime],[^lloyd],[^lispsm],[^pbrt],[^greedy],[^tjunctions] where I needed features from elsewhere but I am particularly grateful for the following resources, esepcially where they have accompanying source code. I linked all of them that are accessible to the public (those that are not were obtained through legal means). [^realtime]: Eisemann, Elmar, Michael Schwarz, Ulf Assarsson, Michael Wimmer. Real-Time Shadows. A K Peters/CRC Press (T&F), 20160419. [^lloyd]: Lloyd,B. 2007. [Logarithmic perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). PhD thesis, University of North Carolina. [^lispsm]: Wimmer, M., Scherzer, D., and Purgathofer, W. 2004. [Light space perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). In Proceedings of Eurographics Symposium on Rendering 2004, pp. 143– 152. [^pbrt]: Pharr, Matt, et al. [http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf](Physically Based Rendering: From Theory to Implementation). Third edition, Morgan Kaufmann Publishers/Elsevier, 2017. [^greedy]: mikolalysenko. “Meshing in a Minecraft Game.” 0 FPS, 30 June 2012, <https://0fps.net/2012/06/30/meshing-in-a-minecraft-game/>. [^tjunctions]: blackflux. “Meshing in Voxel Engines – Part 1.” Blackflux.Com, 23 Feb. 2014, <https://blackflux.wordpress.com/2014/02/23/meshing-in-voxel-engines-part-1/>. I am also especially grateful to Khronos, Wikiepdia, and stackoverflow for answering many of my specific questions while writing the MR. --- Squashed commit of the following: commit 300505e7305a2fdac722a808ee8538323f215f39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 18:46:25 2020 +0200 Fixing cargo doc and typo in CHANGELOG. commit ec0aeb18e8499d7d84ef818331b4b65c3d76cea6 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 15:38:50 2020 +0200 Hopefully final commit for the LOD branch. commit 5e8ea0b1eaac02903a02feb2eb038d195de4872f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 10:14:26 2020 +0200 Falling back to power as stopgap. commit e44a1cbf46504ee9931a01bdc9033e145500d557 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 09:25:41 2020 +0200 Address imbris feedback. Temporarily disables shiny water, lowers max VD. These restrictions will be lifted soon after merging. commit 561e25778a108ac3712f5ec2ce3a51234c4430d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 08:31:13 2020 +0200 Tweaking shaders a bit. commit 7d19259078ce0dd7b3742ad7d0cb3fab3ece3fdc Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:59:43 2020 +0200 Fix view example as well. commit 051cd4934e0fad2c0b15db4380a4189fa318679f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:29:06 2020 +0200 Fix meshing benchmark. commit c95e07db3b4dcca285678985e65e31b927cb1c61 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 05:46:22 2020 +0200 Address MR feedback, fix scene clouds. commit 1bfb816cabdb3ffc1e507a009c2d98696b4b573a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:39:36 2020 +0200 Incorporating Pfau's figure color changes. New eyes and new humanoid colors. commit 3f9b89a3ac7b3356b1dba0d1a8f6541357f81469 Merge: e2f5162e4 62c53963a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:29:41 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit e2f5162e4f96f4124aa43488f7245d341b3dcfd4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:28:38 2020 +0200 World colors are all hotloadable. They live in assets/world/style/colors.ron. Only a small handful of hardcoed colors remain in World; they are either part of the map, or difficult to disentangle from the rest of the computation. Comments are made where appropriate. commit 62c53963abe1975009d34a8f9515a355bef24f31 Author: Marcel Märtens <marcel.cochem@googlemail.com> Date: Wed Aug 19 15:59:00 2020 +0200 replace pretty_env_logger with tracing commit 5b1625f99d9586fe80e2232f583ec5af9f953099 Merge: d71003acd 4942b5b39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:15:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit d71003acdabeff970b3928e97c26af6847b5b78e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:14:34 2020 +0200 Hotloading colors, part 1: colors in common. Currently, this just entails humanoid colors. There are only three colors not handled; the light emitter colors in common/src/comp/inventory/item/tool.rs. These don't seem important enough to me to warrant making hotloadable, at least not right now, but if it's needed later we can always add them to the file. commit 63b5e0e553eb2ea49276f192a6fc7dd65254270d Merge: c32b337a4 6d2c4b9c1 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 13:05:37 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c32b337a46e10d9de473d178a94a3ccd61c39bb3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:52:04 2020 +0200 Fixing LOD grid, for real. commit a166ae0360395387e09fb35a1f84210c2ce5ec24 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:28:05 2020 +0200 Addressing imbris's initial feedback. Fixes two minor bugs: explosion particles were no longer spawning randomly, and LOD grids were not perfectly even. commit 4cbad004f44060994252dd3d38647a14a589712f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:27:58 2020 +0200 Bumping nightly per request. commit 548680276aac77c25d43d16b5622f847d474dbef Merge: acc098604 8f8b20c91 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:26:06 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit acc0986040589a3492f88a740bc3c3fc693b26d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:28:32 2020 +0200 Lower resolution due to lying drivers. commit d3b878de2a52c358d2944a6bbd0555dad7fbdb10 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:15:38 2020 +0200 Fix issues msh encountered with Intel 4600. commit 10245e0c1b0cb6fae10d86409435364edc6102ef Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 21:15:02 2020 +0200 Merge more models into one mesh than we did previously. commit 3155c31e663c52ae5c3a53d5fb5665892a1a498a Merge: 7204cc8a7 3c199280e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:35:22 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7204cc8a7a4f74a30306bd205d9834fee4bb944f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:34:43 2020 +0200 Fix not yet done NPC animations. This forces them all to be the idle animation if not specified. This fixes issues where you'd have giant NPCs in water. commit bc83360f2a08918f19d417b5f772e1ff554dba08 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 19:36:37 2020 +0200 Try to fix some bugs: - Z fighting with LOD terrain and water. - Audio SFX not playing. commit 1fd104aa603bf3781b6526a5cada46aeca3049dd Merge: 862df3c99 7c2c392a3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 12:02:31 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 862df3c9976c4da9bd7cfd784f1a85973127968a Merge: 0a4218ed9 75c1d4401 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 05:52:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0a4218ed9d541a2b34c133351bea38a99ddf4ea7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 22:27:14 2020 +0200 Fix particle depth. commit f51dfdeb442d0dd5243dd2f344fa4be295bd0875 Merge: c6251a956 5e6dc0471 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:19:04 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit c6251a956ad376400dca5c23420cf8d213dc8fdf Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:15:46 2020 +0200 Cache figures more intelligently. Cache figures for longer, and don't cache character states for the player except where they actually affect the rendered model. commit 0ed801d5404982c6fb63b1eaa4567d908b294c9d Merge: c11b9bdf0 eea64f78f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 16:32:24 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c11b9bdf0a53bf9884d2f5a48fec9b01d582df1a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 11:47:15 2020 +0200 Remove unneeded Clippy annotation. commit 16aa9ef40af56d69289d00aafb3deadfb8bd4f35 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 8 00:53:02 2020 +0200 Fix hotloading and Clippy. commit 3dc973e0be5b758da1e9805eb764ad401374cd0c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 23:50:27 2020 +0200 Major speedups with SIMD. commit fba64a7d93d5a96077ce87287bbce6ab9b7fbcae Merge: 76429d00e d1e10b178 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:19 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 76429d00eea00d212fbd672a84ee91e75b19b938 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:10 2020 +0200 Add clippy.toml. commit c79f512f84dbb83cb82b7954db68ff241dfd8e41 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 11:55:20 2020 +0200 Fix all clippy issues, clean up Rust code. commit 6f90e010b3fbefb53b0d632e819931350015b6b8 Merge: 77a8c7c26 5929cfa5c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:30 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 77a8c7c267d3f44a1a62bd6b2274359973c5e4d4 Merge: b44e44232 44febaabd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:10 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 5929cfa5c713aa392110bbb62407f76caf53c3df Author: jshipsey <jshipsey18@gmail.com> Date: Thu Aug 6 20:47:27 2020 -0400 fixed in-hand arrow bug commit b44e442325d828f1cd564d66908f89d09e80474b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 6 13:40:35 2020 +0200 Miscellaneous performance improvements. commit be37acf287c1360d8085862526ac3365ffd1d768 Merge: 125d7fc6c c11876547 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 05:49:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 125d7fc6c4dcd8c8c5f27b8268a4d64f409f3644 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 04:55:31 2020 +0200 Abstract over simd vs. repr_c vectors. Also some minor improvements to Event size. commit d4d4956e9252e1241ce110b2aa85076c6b1e2a23 Merge: 5f3b7294a aced5f979 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:56:54 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 5f3b7294af1f8533edc2620b58863c248e2b07af Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:43:52 2020 +0200 Fix formatting issues I missed before. commit a428a3ebba70dcab63dd0f8cd983120c90617271 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:41:51 2020 +0200 Fix clippy warnings, part 1. There aer still a bunch of type too complex and function takes too many arguments warnings that I'll fix later (or ignore, since in the one case I did fix a function takes too many arguments warning I think it made the code *less* readable). commit ba54307540ed8a937ac08209730284fc653af85b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 30 13:22:42 2020 +0200 Fix light animations so they are removed when the light turns off. commit 7e0f4bcbf0f4717145d8beac40d52e3acebbe2aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 21:10:20 2020 +0200 Fix crash in edge case for pixel art. commit 56da06f7a351e2b949e9b014a90b974d511a0924 Merge: cf74d55f2 9f53a4a19 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:56:52 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:29:52 2020 +0200 Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). The first concern was addressed by fixing the dimensions of the map images drawn from the UI (so that we always use a square source rectangle, rather than a rectangular one according to the dimensions of the map). We also fixed the way rotation was done in the fragment shader for north-facing sources to make it properly handle aspect ratio (this was already done for north-facing targets). Together, these fix rendering issues peculiar to rectangular maps. The second and third concerns were jointly addressed by adding an optional border color to every 2D image drawn by the UI. This turns out not to waste extra space even though we hold a full f32 color (to avoid an extra dependency on gfx's PackedColor), since voxel images already take up more space than Optiion<[f32; 4]> requires. This is then implemented automatically using the "border color" wrapping method in the attached sampler. Since this is implemented in graphics hardware, it only works (at least naively) if the actual image bounds match the texture bounds. Therefore, we altered the way the graphics cache stores images with a border color to guarantee that they are always in their own texture, whose size exactly matches their extent. Since the easiest currently exposed way to set a border color is to do so for an immutable texture, we went a bit further and added a new "immutable" texture storage type used for these cases; currently, it is always and automatically used only when there is a specified border color, but in theory there's no reason we couldn't provide immutable-only images that use the default wrapping mdoe (though clamp to border is admittedly not a great default). To fix the maps case specifically, we set the border color to a translucent version of the ocean border color. This may need tweaking going forward, which shouldn't be hard. As part of this process, we had to modify graphics replacement to make sure immutable images are *removed* when invalidated, rather than just having a validity flag unset (this is normally done by the UI to try to reuse allocations in place if images are updated in benign ways, since the texture atlases used for Ui do not support deallocation; currently this is only used for item images, so there should be no overlap with immutable image replacement, so this was purely precautionary). Since we were already touching the relevant code, we also updated the image dependency to a newer version that provides more ways to avoid allocations, and made a few other changes that should hopefully eliminate redundant most of the intermediate buffer allocations we were performing for what should be zero-cost conversions. This may slightly improve performance in some cases. commit ad18ce939940a8c697270f6e9b94db9942fd8295 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 13:21:09 2020 +0200 Fix continent scale hack. commit 36b1cb074f5b195aebd7dbbc3da7f0246a1a18ec Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 12:11:40 2020 +0200 Enable loading different sized maps without a recompile. We may want to tweak the effects of the continent_scale_hack. commit 13b6d4d534cc4814b7cb3294ca41bbfea0a6b186 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 10:55:48 2020 +0200 Removing WORLD_SIZE, part 1. Erased almost every instance of WORLD_SIZE and replaced it with a local power of two, map_size_lg (which respects certain invariants; see common/src/terrain/map.rs for more details about MapSizeLg). This also means we can avoid a dependency on the world crate from client, as desired. Now that the rest of the code is not expecting a fixed WORLD_SIZE, the next step is to arrange for maps to store their world size, and to use that world size as a basis prior to loading the map (as well, probably, as prior to configuring some of the noise functions). commit 30b1d2c6428230a9eaa0d749cdcbbd6f1cbccd78 Merge: 7d56ba31b 1377b369f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:58 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 7d56ba31b445441461b28a07fc495d7d4f047c17 Merge: 2101113b4 598f14b25 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 1377b369f6db2258e910d467a5740f31789e3ded Author: Monty Marz <m.marzouq@gmx.de> Date: Sun Jul 19 23:25:38 2020 +0200 more saturated pumpkins commit ae8d50527f93bb0616c2ad46ce4dacb63bc37c6d Author: Monty Marz <m.marzouq@gmx.de> Date: Sat Jul 18 20:29:56 2020 +0200 acacia models commit 2101113b467e691de787392d7f20f1745f5637bd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 18 18:55:25 2020 +0200 Higher detail LOD. commit add2cfae04b4385fa5590e11e2bd5229d9dee0aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 16 01:57:39 2020 +0200 Revert some irrelevant stuff. commit 2e2ab3dc1eaa59a4aef7f8d34a53d8aae4c8553a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 15 13:30:49 2020 +0200 Fixing various things about shadows. * Correcting optimal LISPSM parameter. * Figure shadows are cast when they're not visible. * Chunk shadows stay cast until you look away. * Seamless cubemaps for point lights. * Etc. commit 6c31e6b56217274285b597af297036691ea5d897 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 19:50:26 2020 +0200 Fix shadow creation. commit 6332cbe006115ae205597529cd8bbccd146c2cca Merge: be438657c 930e0028b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:47:00 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit be438657c33d7b5bfb0a9582c3ed3fd366637323 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:28:08 2020 +0200 Tweaks to shadows. Added shadow map resolution configuration, added seamless cubemaps, documented all existing rendering options, and fixed a few Clippy errors. commit 23b4058906013c7d2a40c286e20e32c5fbd897ed Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 10:11:19 2020 +0200 Fix moon, use nonlinear noise for terrain. Note that the latter has a bit of performance cost. commit 7fbe5cbfbb9dc29607957b8e62f432a4deed193d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:23:02 2020 +0200 Address lies about max texture size. commit bcfc62b5e13a1cdd83f57535fde4694720bebfd9 Merge: 75e3626a7 18a08e8fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:22:08 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 75e3626a785919f43fdcf2127c2b10e3e4df2f9f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:21:52 2020 +0200 OpenGL 3.3 minimum. commit 18a08e8fe2739f02af99a5d2cb4e7c38c49e858b Author: Monty Marz <m.marzouq@gmx.de> Date: Tue Jul 7 23:57:52 2020 +0200 settings localization commit 90c5d1ca3620092bc3ae10b2211489eb1cf6f5e8 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 21:11:48 2020 +0200 Lower near distance. commit 0e66f02b25aaddaa2dfddbbc89cd67de54a9a7b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 20:09:01 2020 +0200 All sprites sway in the wind now. commit db1401a6910bf42dcf502462c90038752ff5fbdb Merge: 69e508d8c e8b4b29d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 19:34:17 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 69e508d8c94d8973033817ca86f357e466fc7c4d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 18:41:37 2020 +0200 Make it easy to switch to SIMD for math. commit ffe0f5928c7a7e87d00cb5426b3b1d831d7e02fd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 21:21:12 2020 +0200 Fix some issues with underwater rendering. commit bfda6da42f38fd02c31ee92c81ab785a3e50c2a0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 19:17:59 2020 +0200 Fix some minor display issues. commit 0ed752e087968cf901301884aaeae698e32ef8a5 Merge: ccc6a06a8 518edcb85 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:14:21 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit ccc6a06a8d4504d6b9f7af7905a414d2ee06ab76 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:04:34 2020 +0200 Some minor changes. commit 4e020246702889269efe1a191788992164c508d6 Merge: 50a64d927 e05c9267a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 16:17:40 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 50a64d927e6c4f4b0e4688e4cbfca694bc3f922a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 13:07:03 2020 +0200 Fix far plane. commit 7dd06da34cae8f9ea3b6c889fe965181f3fd3949 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:25:35 2020 +0200 Add shadows.glsl. commit 618a18c998778bf871b905a74657440fcc384c80 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:10:22 2020 +0200 Adding shadows, greedy meshing, and more. commit eaea83fe6a5cb1cb0ba8beef888183c718258496 Merge: 267018495 2f89b863e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 22:47:07 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 2670184954a13e4a9e7a4e35ba79aac0c5fac2f7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 21:20:01 2020 +0200 Make civsim and sites deterministic. For anything in worldgen where you use a HashMap, *please* think carefully about which hasher you are going to use! This is especially true if (for some reason) you are depending on hashmap iteration order remaining stable for some aspect of worldgen. commit f8376fd5dc72b4a9c2f51a6b4570d59c8b8e9343 Merge: 654f7e049 cdee191dd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 17:53:57 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 654f7e049258d9da27c09608bbe6a46ffa8787e5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed May 20 21:22:30 2020 +0200 Correct backface culling. commit 560501df05ca725409b0f2e4eb31bdfdc15fd0c7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue May 19 17:22:06 2020 +0200 Greedy messhing for shadows. commit a4d87e1875ca543436e6bbbeb20348facc5a52d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun May 17 05:59:00 2020 +0200 Shadow maps work for lantern. commit 243d0837b8a3b08172c9a3c348d964d7ddc2a0a8 Merge: 04382dc28 71dd520cd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:53:13 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 04382dc28632b6c66e8821f6870c0daaa1c1901a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:22:17 2020 +0200 WIP: better graphics config, better LOD, shadow maps. commit 22ddbad3eb32bfa70f0932176022208fe67ded81 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 18:54:09 2020 +0200 Minor shader fixes. commit 746a10e8d01ac235f994b0cde78fa48998602a1f Merge: 0f4a0e763 40ab94673 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 04:02:09 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0f4a0e763db3afbdc4fb0558611f38326ca87151 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 23:03:24 2020 +0200 Switch back to pop-in terrain. commit dd74fa7e4a53667b38811d7aec58d7f6a68889bb Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 22:58:55 2020 +0200 LOD shading closer to voxel shading. commit ef67bd58ba0bdaf622b078892d768263b6cba268 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 28 20:49:03 2020 +0200 Experimental underwater lighting. commit 2c5ad9d07605e80d5fd5679dd3a5d70c605b86a9 Merge: 748279835 303967a6f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 22:35:24 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7482798354eda18c8207950080fc24d443a369de Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 21:59:55 2020 +0200 Replace discard in figure-frag. commit d83b4ae69be4912f69bf7835f509c68a1c7770a4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:45:57 2020 +0200 Fix sprite lighting, HDR from focus_pos. commit 0594238004f116274905fa0ed7c2b6c417ed1d29 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:14:10 2020 +0200 Proper HDR from point lights. commit 48c93d2b41ce5743103d18e76cc228f5ac766492 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 14:01:43 2020 +0200 Brighter ambiance, darker LOD shadows. commit e0452e895ccfa8a43f368cae3b8b8aedc24dad93 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 13:13:23 2020 +0200 More proper HDR. commit 4c6da3ed16cfeebb455e40da5f557b4af9a499d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 00:13:10 2020 +0200 Trying LOD noise. commit 682a3d74c85df5503ffe1fc1cc891bce789df1ad Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 23:11:08 2020 +0200 Fix LOD heights in towns. commit cc39e5734e8b18f9077bf42e66337c1319dd6b6e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 21:01:23 2020 +0200 More LOD fixes. commit 8116b21c2e51c836e77894e309ac273caf2917b3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:54:43 2020 +0200 I like this coloring. commit bc2560ea90b36f4b46190005344232d993043ac3 Merge: 14effdd5d e690efe71 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:48:33 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 14effdd5db8747fcf3eb34f03b46b7792e92d1c5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:24:35 2020 +0200 Re-saturate. commit 48a643955d4435b78179acba0beb4a979905cc31 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:23:57 2020 +0200 Various fixes. commit f7b497a0c25f4ad4682c71dd1ed6f608052feb9b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 03:22:49 2020 +0200 Render figures again. commit 44e4aad48deba8266b9f8bdfd3db096b381f5327 Merge: e6f0a5a98 9ec319a18 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 02:01:04 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit e6f0a5a981a82533ba188fff0a54ce98577bb152 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 24 16:12:20 2020 +0200 Add atmospheric scattering. commit f2953087f691a8edbc001cb98ebf5059fc6f8ac0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 23 00:01:20 2020 +0200 Fix shadowing for specular reflections. commit ddd4a67a9799b8d08c7dc0c2bec90621c2bed0e3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Apr 22 22:56:12 2020 +0200 HDR fixes. commit 1015e60deef3c447381996277df7496707a63bd0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 21 18:25:19 2020 +0200 More lighting changes. commit 80c264abd111fb237e57843efcb5c071d4f84613 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 13 00:29:59 2020 +0200 Lighting experiments. commit 8414987e589dd5102bad89762a3adaccc0bfe957 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 9 02:38:40 2020 +0200 WIP -- lighting changes and soft shadows. commit 9cd2b3fb0d6b49776c6dfe463e4169637250b11a Merge: c7ea687eb 8b149ad11 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:29 2020 +0200 Merge branch 'sharp/new-lighting' into sharp/small-fixes commit c7ea687ebbc5aace1b455f134a5bf49ce2c7434a Merge: 476441531 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:02 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 8b149ad11ad4bb75018fcf9519baec27d1c95951 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:32:39 2020 +0200 Trying out a new lighting model. commit b0ac9f36f755dd06f7c17c46150568064790864f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 07:56:11 2020 +0200 Use bicubic interpolation for terrain. commit f6fc9307a121514b614bc50ef8eb055953e7da8a Merge: 33140a295 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 05:01:41 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 4764415312aae6e9ac2d00e86e84577cb958f1ab Merge: ed2d0111d 13388ee6a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 04:54:48 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 13388ee6a42943f3f79a9cb488346cef18e272fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 20:30:08 2020 +0200 Various fixes (to coloring and to soft shadows). commit fbd084a94a067082a87cd6d28b82054709bc9265 Merge: 5a089863b 4fdf6896a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 18:50:38 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/map-colors commit ed2d0111d994262ae836d84d1fe5a45e4de72a0b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 06:49:27 2020 +0200 Combining colors and LOD. commit 88342640c6b835114d01c797b89fdede3b0a2108 Merge: 33140a295 5a089863b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:49:20 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 33140a2951b8212725f42c758b277aaec4d888f7 Merge: 4c65a5aed f34d4b379 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:36:21 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 5a089863beb01d4794bbe3580ada47b278715ea2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 03:17:49 2020 +0200 Making maps brighter. This is probably not the right way to do it, but oh well! commit 32b2c99109dd486aa922886081068f9c550c83f2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 02:46:36 2020 +0200 Horizon mapping and "layered" map generation. Horizon mapping is a method of shadow mapping specific to height maps. It can handle any angle between 0 and 90 degrees from the ground, as long as know the horizontal direction in advance, by remembering only a single angle (the "horizon angle" of the shadow map). More is explained in common/src/msg/server.rs. We also remember the approximate height of the largest occluder, to try to be able to generate soft shadows and create a vertical position where the shadows can't go higher. Additionally, map generation has been reworked. Instead of computing everything from explicit samples, we pass in sampling functions that return exactly what the map generator needs. This allows us to cleanly separate the way we sample things like altitudes and colors from the map generation process. We exploit this to generate maps *partially* on the server (with colors and rivers, but not shading). We can then send the partially completed map to the client, which can combine it with shadow information to generate the final map. This is useful for two reasons: first, it makes sure the client can apply shadow information by itself, and second, it lets us pass the unshaded map for use with level of detail functionality. For similar reasons, river generation is split out into its own layer, but for now we opt to still generate rivers on the server (since the river wire format is more complicated to compress and may require some extra work to make sure we have enough precision to draw rivers well enough for LoD). Finally, the mostly ad-hoc lighting we were performing has been (mostly) replaced with explicit Phong reflection shading (including specular highlights). Regularizing this seems useful and helps clarify the "meaning" of the various light intensities, and helps us keep a more physically plausible basis. However, its interaction with soft shadows is still imperfect, and it's not yet clear to me what we need to do to turn this into something useful for LoD. commit f8926a5737ddc51f3d585c651a64c43677aae0f4 Merge: a1aee931e 875ae6ced Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Mar 13 13:32:42 2020 +0100 Merge remote-tracking branch 'origin/master' into sharp/map-colors commit 4c65a5aed353b119aea65a2aaeb94549b67beb42 Author: Treeco <5021038-Treeco@users.noreply.gitlab.com> Date: Mon Feb 24 16:48:05 2020 +0000 Made LOD setting slider exponential commit 2fa7b2d20d7233dc8bfd64f9f7f54617575248f1 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 17:49:53 2020 +0000 Added mist to LoD commit aab059a450b5f635777129ff82cc15b662965c3c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 15:14:06 2020 +0000 Added LoD slider commit 779c36b538121c5ade3633ae5cb67bb14c8c3877 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:54:55 2020 +0000 Reduced cost of vertex pushing commit 9fea150473906b166365b738ebcea07c697daf3d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:38:53 2020 +0000 Fixed maths, improved LoD resolution commit 5481df38fea5bf183ff376a3337179cfaa5233dc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 11:22:50 2020 +0000 Dynamically relocate LoD vertices to enhance details commit a3e36a50ababd615da7db1b26158c7906a5def01 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 18:13:51 2020 +0000 Simpler terrain spiral rendering commit 255f450ae9ac8763db4bede075fb409161ed57cc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:53:17 2020 +0000 Better LoD precision commit 3d027aebe812a5b8658a4eb8123dc9f61b3776d2 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:04:03 2020 +0000 Better falloff commit be775c9484b457b2c0b1a494aec03392d0c70e76 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 15:30:45 2020 +0000 Applied good ideas from experimental branch commit 58587b68545a23c5c04ab4574a4b94b3bc982246 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 16:15:13 2020 +0000 Minor fixes to LoD merging commit 7b42aebd709c14df2db766aad61d9280ad24d84d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 15:04:44 2020 +0000 Capped LoD dragging commit 8aafc559f87124e1ea5ca6e3ddc2aa0c242d793c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:54:37 2020 +0000 Better blending between LoD and terrain border commit edd3455d5161792d87ddc8eadc0ecbad5532b284 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:40:19 2020 +0000 Fixed LoD z depth, added sea level offset commit b9b06744620114dd5556e73f64fa93c145503a7c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:27:43 2020 +0000 Better LoD smoothing commit a1aee931e790431560cd2d953ad61d9497072afd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Feb 21 14:52:17 2020 +0100 Adding shadows. commit 2400786c13dd891c131ed86d48d05df516a8a778 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 13:48:40 2020 +0000 Use world map as LoD source commit dbf650f504a4c25fbbc2096ac3616c736bf52d23 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Jan 20 00:48:14 2020 +0000 Better clouds at distance commit 5e6f81b86cdb9730b9b056877b19257075fd5fa8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Jan 19 23:59:02 2020 +0000 sync commit 745e7540ddb000cc645f612767b337c2ddc3f7c0 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 12:40:48 2019 +0000 Improved cloud falloff mist, faster noise sampling commit f6a200d0cb866196ba57697466755f9e0c7ea5d8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 10:09:00 2019 +0000 Improved long-range depth precision, removed unnecessary LoD polygons commit 63d1b2bb2292898d59fb4f4e502201103dfeb86f Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 20:57:46 2019 +0000 Working LoD shader commit f13d98ee3e58f881e8b978861a67663b59ed91ec Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 11:03:40 2019 +0000 LoD first attempt (stack overflow issue)
2020-08-20 18:34:59 +00:00
[[package]]
name = "num-rational"
update further crates
2020-12-16 00:07:39 +00:00
version = "0.3.2"
(See sharp/lod-history) LOD, shadows, greedy meshing, new lighting, perf --- Pretty much a Veloren fork at this point. Here's a high level overview of the changes (will be added to CHANGELOG just before merge). At a high level this MR incorporates roughly two groups of changes. The first group consists of new game features: more flexible map sizes, level of detail terrain, shadow maps, and a new lighting engine. This is "feature work" that (mostly) only adds new things to Veloren, and mostly shouldn't affect old stuff. The second big group of changes are those addressing the fallout from all the new features. These include performance fixes of various sorts: the addition of multiple graphics options and optimization of the cheap ones to avoid work, switching all voxel models to use some variant of greedy meshing, switching over much of our CPU-side vector math to exploit SIMD instructions (coinciding with a fork of `vek`), and a rewrite of how the UI handles text rendering (coinciding with updates to our fork of `conrod`). Making Veloren's hardcoded colors appear correct under the new lighting engine also required considerably changes (TODO: Fill in this section when it's complete). The second category of changes often heavily touches code owned by other people, including frequently modified code "owned" by a handful of people, so I recommend that this code be reviewed particularly carefully. --- At a high level (each will be described in more detail below): - The world map has been refactored. - The world size is no longer hardcoded (@zesterer). - The map generation code was made generic to allow using it outside of the `world` crate (@zesterer). - On world creation, we now compute *horizon maps* (@zesterer). - The way we pass the world from the server to the client has been updated (@xMAC94x). - Artifacts related to image rotation were fixed (@imbris). - Multiflow rivers were enabled (@zesterer). - In the process of making changes related to the world map, various incidental fixes and optimizations were required. - The new *level of detail* feature was added (@zesterer wrote part of this and has checked out the rest). - A new LOD terrain rendering step was added to the pipeline. - The LOD terrain quality was made configurable via a graphics setting. - Horizon maps were used to cast shadows from LOD chunks on both LOD and non-LOD terrain. - A "voxelization" effect was incorporated into rendered LOD terrain to make it blend better into the world. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Veloren's lighting has been completely overhauled (@zesterer has already checked most of this out). - A semi-accurate index of refraction was assigned to our materials. - A new, more realistic, physically based approach to lighting was used using the *Ashikhmin Shirley* BRDF. - We emulate *atmospheric scattering* using equations designed for measuring solar panel light exposure. - We attempt to compute *realistic light attenuation* in water using its real material properties. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Point and directional lights now cast realistic shadows, using *shadow mapping.* (@imbris, @zesterer, @Treeco, @YuriMomo) - Point light shadow maps were added to the rendering pipeline, using geometry shaders and *seamless cube maps*. - Directional light shadows were added to the rendering pipeline, using LISPSM together with disabling *depth clamping*. - "Shadow-only" chunks and NPCs were added to prevent shadows from models behind you from disappearing. - In the process of making changes related to shadow maps, various incidental fixes and optimizations were required. The addition of shadow maps, LOD terrain, and the new lighting all led to significant performance degradation, on top of other changes happening in master. Therefore, a large number of performance improvements were also needed: - The graphics options were made much more flexible and configurable, and shaders were optimize. - New options were provided for how to render lights and shadows (@Pfauenauge, @zesterer). - Graphic setting storage and configuration were overhauled to make adding new features easier (@Pfauenauge, @imbris). - Shaders were rewritten to utilize GLSL's preprocessor to avoid overhead (@zesterer, @YuriMomo). - In the process of making changes related to providing additional rendering options, various incidental fixes and optimizations were required. - Voxel model creation was switched to use *greedy meshing.* - A new voxel meshing method, greedy meshing, was added (@imbris). - Uses of the older meshing methods were migrated to use greedy meshing (@imbris, @jshipsey, @Pfauenauge). - New restrictions were added to terrain, figure, and sprites to future proof them for further optimizations (@jshipsey, @Pfauenauge, @zesterer). - Most positions are now relative to either chunk or player position for better precision (@imbris, @zesterer, @scottc). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - Animation and terrain math were switched to use SIMD where possible. - Fixes were made to vek to make its SIMD feature usable for us (@zesterer, @imbris). - The interface and types used in bone animation were changed in various ways (@jshipsey, @Snowram, @Pfauenauge). - Redundant code generation for body animation is now partly taken care of by a macro (@jshipsey, @Snowram, @Pfauenauge). - Animation code was modified to to use vek's SIMD representation where possible (@jshipsey, @Snowram, @Pfauenauge). - Terrain meshing code and shadow map math were also modified to use vek's SIMD representation (@imbris). - SIMD instruction generation was enabled (@YuriMomo, @jshipsey, @Snowram, @imbris, @Angelonfira, @xMAC94x). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - The way we cache glyphs was completely refactored, fixed, and optimized. - Our fork of `conrod` was optimized in various ways (@imbris). - Our fork of `conrod` now exposes whether a widget was updated during the current frame (@imbris). - Our use of the glyph cache was rewritten for correctness (@imbris). - A *text cache* was introduced that lets us skip remeshing glyphs that have not changed (@imbris). - Various changes were made to reduce pressure on the glyph cache, with more planned (@imbris, @Pfauenauge). - In the process of making changes related to the glyph cache, various incidental fixes and optimizations were required. - Colors were changed to keep Veloren's look consistent with master. - Some older tree models were brought back (@Pfauenauge). - TODO(@Sharp): All hardcoded colors were extracted and made hotloadable. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Hardcoded colors were fixed to conform to Veloren's style. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Color models were fixed to conform to Veloren's style. A detailed description of the involved changes follows. --- - The world size is no longer hardcoded. All functions dependent on world size now take a `WorldSizeLg`, which holds the base 2 logarithm of each actual world dimension and is guaranteed to maintain certain properties (outlined in `common/src/terrain/map.rs`). Additionally, many utility functions that utilize the world size were moved into `common` as well (mostly `common/src/terrain/mod.rs`). Finally, the world map format was updated in order to store its size explicitly, with a migration path from the old format that should work whenever the old formatted map was a square (practically always). See `world/src/sim/mod.rs` for these changes. - The map generation code was made generic to allow using it outside of the `world` crate. The parts of the map generating code that do not need to query the world were moved over to `common/src/terrain/map.rs`, allowing them to be used from the client without creating a dependency on `world`. The rest of it was turned into helper functions in `world/src/sim/map.rs`, which can be passed as closures to the generic map generation code to complete its construction. This also means that colors are now passed in separately to the map generation function. See <https://veloren.net/devblog-78/> for more details. - On world creation, we now compute *horizon maps*. See the function in `world/src/sim/util.rs`. Given a height map and a plane intersecting that height map, our horizon maps allow us to encode enough information to reconstruct shadows for each point on the height map using only the *horizon angle* (the angle at which the sun starts to become visible). As Veloren's sun only covers one plane, this is sufficient for encoding sun shadows for LOD terrain, by encoding two angles per chunk (one for each 90 degrees the sun covers). We can also use this for the moon, if we want, since the moon follows the same path. Additionally, we store the *height* of the furthest occluder, to try to make the shadows volumetric; so this means 4 bytes in total for each chunk. Support for horizon maps has been merged into the map functionality in common as well. - The way we pass the world from the server to the client has been updated. Rather than passing the prerendered map, we instead pass three maps with values for each chunk; one with the color information, a second with altitude information, and a third with horizon map information. We then reconstruct the map on the client, together with some additional information we send from the server (like the sea level and maximum height). See `common/src/msg/server.rs` for a detailed description of the format of `WorldMapMsg`, and `server/src/libr.rs` and `client/src/lib.rs` for details of the map construction and parsing. - Artifacts related to image rotation were fixed. See the commit message for commit SHA `cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e` for a detailed explanation. This involved changes to shaders, the addition of a new type of graphic (also reflected in the graphic cache) that allows specifying a border color (which automatically makes the associated texture immutable), and some related fixes. I reproduce the first two paragraphs of the MR description as well: ``` Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). ``` - Multiflow rivers were enabled. This does not really need to be part of this MR, and would be easy to revert, but since it seemed to provide a nice improvement it's currently packaged with it. We already computed multiple outflows from each chunk for erosion purposes long before this MR. However, we never modified river rendering to be able to handle this case (just a single downhill river flow is complex enough!) so this was not exposed when deciding which chunks were rivers. Now that - In the process of making changes related to the world map, various incidental fixes and optimizations were required. Some examples of fixes include making sure terrain is never lowered to below sea level (to make the shadow maps report correct values), fixing map altitudes and colors to understand things like cliffs and "block level" coloring (that doesn'te xist on the column level), and fixing a crashbug when rendering images for the UI where source pixels are strongly rectangular. Some examples of related performance fixes include avoiding allocating a fresh vector for all the maps (i.e. copying it over to change the format from `[u32; n]` to `DynamicImage` and then copying again to convert to `RgbaImage`), and instead using the `gfx::memory::slice` function to accomplish the same thing. These sorts of changes are spread all arond the code. This includes the additon of a new scene, `voxygen/src/scene/lod.rs`, a new pipeline `voxygen/src/render/pipeline/lod_terrain.rs`, and new shaders `assets/vxygen/shaders/lod-terrain-vert.glsl` and `assets/vxygen/shaders/lod-terrain-frag.glsl`, as well as associated changes to the renderer in `voxygen/src/render/renderer.rs`. The main idea behind our initial approach to LOD was to take the world data we now get from the server (altitude, color, and horizon mapping). - Some previously computed values were turned into shader uniforms for better prediction on weak processors. (@zesterer) - Calls to power or trig functions were removed or replaced with multiplications, where possible. - After some deliberation - To properly handle sprite "waving" for nearby sprites, We explicitly designed the greedy meshing system with figures and sprites in mind. In both cases, we want to be able to *efficiently* pack many different models into the same texture, especially in cases where we know we will either not be removing any of the grouped-together from the models from the texture, or will remove all of them at once (so they can be packed into some specific subtexture). For sprites, since we know every model in advance and never intend to deallocate them, we currently pack them all as efficiently as possible into one giant tetxure atlas. However, in the future we might opt to pack them slightly less efficiently in exchange for shrinking the sprite vertex size. For figures, we pack all the textures for each *model* into the same atlas. is a global texture atlas used for every sprite, and for figures which is why we have the ability to mesh multiple models to the same texture area (using the simple texture atlas allocator) without requiring intermediate vector allocations. This is accomplished by delaying the time when we actually write the color and light data to the texture until *after* all the model vertices have been meshed; then, we can just allocate the whole color/light array at once, making the atlas we use an exact fit. In computer science-y terms, we accomplish this delay by, after we perform the initial greedy meshing (without texture information), not continuing to create the texture data, but instead constructing a *continuation*--that is, a function that, when called, will execute the rest of the computation. We push this continuation (which in Rust terms is a `FnOnce` closure that takes the `ColLightsInfo` that it is supposed to write to as context) onto a onto a vector resizing. To allow for suspended writes to texture data, Rust pointed out to me that the continuation that would eventually write the color and light data to the texture atlas (the one that is shared by all models sharing the same greedy mesher) would have to *own* whatever data it mshed. Because we often generate the model data to mesh as a temporary in `voxygen/src/load.rs`, the - Matrix multiplications in the shader were reduced for figure data (@zesterer). - Vertex "waves" for fluid data were removed. - Terrain "bending" near edges was removed. - Scaling was fixed to make sure empty space was not introduced in a space previously occupied by a block. It was also changed to take ownership of its voxel data, rather than sharing it, to let it be used with meshing. - Rust's nightly version was bumped in order to use the `array_map` function, which lets us reuse more code between the simple map and `FigureModelCache`. - PositionedGlyph::standalone. --- I tried to cite sources in many cases[^realtime],[^lloyd],[^lispsm],[^pbrt],[^greedy],[^tjunctions] where I needed features from elsewhere but I am particularly grateful for the following resources, esepcially where they have accompanying source code. I linked all of them that are accessible to the public (those that are not were obtained through legal means). [^realtime]: Eisemann, Elmar, Michael Schwarz, Ulf Assarsson, Michael Wimmer. Real-Time Shadows. A K Peters/CRC Press (T&F), 20160419. [^lloyd]: Lloyd,B. 2007. [Logarithmic perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). PhD thesis, University of North Carolina. [^lispsm]: Wimmer, M., Scherzer, D., and Purgathofer, W. 2004. [Light space perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). In Proceedings of Eurographics Symposium on Rendering 2004, pp. 143– 152. [^pbrt]: Pharr, Matt, et al. [http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf](Physically Based Rendering: From Theory to Implementation). Third edition, Morgan Kaufmann Publishers/Elsevier, 2017. [^greedy]: mikolalysenko. “Meshing in a Minecraft Game.” 0 FPS, 30 June 2012, <https://0fps.net/2012/06/30/meshing-in-a-minecraft-game/>. [^tjunctions]: blackflux. “Meshing in Voxel Engines – Part 1.” Blackflux.Com, 23 Feb. 2014, <https://blackflux.wordpress.com/2014/02/23/meshing-in-voxel-engines-part-1/>. I am also especially grateful to Khronos, Wikiepdia, and stackoverflow for answering many of my specific questions while writing the MR. --- Squashed commit of the following: commit 300505e7305a2fdac722a808ee8538323f215f39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 18:46:25 2020 +0200 Fixing cargo doc and typo in CHANGELOG. commit ec0aeb18e8499d7d84ef818331b4b65c3d76cea6 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 15:38:50 2020 +0200 Hopefully final commit for the LOD branch. commit 5e8ea0b1eaac02903a02feb2eb038d195de4872f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 10:14:26 2020 +0200 Falling back to power as stopgap. commit e44a1cbf46504ee9931a01bdc9033e145500d557 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 09:25:41 2020 +0200 Address imbris feedback. Temporarily disables shiny water, lowers max VD. These restrictions will be lifted soon after merging. commit 561e25778a108ac3712f5ec2ce3a51234c4430d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 08:31:13 2020 +0200 Tweaking shaders a bit. commit 7d19259078ce0dd7b3742ad7d0cb3fab3ece3fdc Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:59:43 2020 +0200 Fix view example as well. commit 051cd4934e0fad2c0b15db4380a4189fa318679f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:29:06 2020 +0200 Fix meshing benchmark. commit c95e07db3b4dcca285678985e65e31b927cb1c61 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 05:46:22 2020 +0200 Address MR feedback, fix scene clouds. commit 1bfb816cabdb3ffc1e507a009c2d98696b4b573a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:39:36 2020 +0200 Incorporating Pfau's figure color changes. New eyes and new humanoid colors. commit 3f9b89a3ac7b3356b1dba0d1a8f6541357f81469 Merge: e2f5162e4 62c53963a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:29:41 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit e2f5162e4f96f4124aa43488f7245d341b3dcfd4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:28:38 2020 +0200 World colors are all hotloadable. They live in assets/world/style/colors.ron. Only a small handful of hardcoed colors remain in World; they are either part of the map, or difficult to disentangle from the rest of the computation. Comments are made where appropriate. commit 62c53963abe1975009d34a8f9515a355bef24f31 Author: Marcel Märtens <marcel.cochem@googlemail.com> Date: Wed Aug 19 15:59:00 2020 +0200 replace pretty_env_logger with tracing commit 5b1625f99d9586fe80e2232f583ec5af9f953099 Merge: d71003acd 4942b5b39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:15:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit d71003acdabeff970b3928e97c26af6847b5b78e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:14:34 2020 +0200 Hotloading colors, part 1: colors in common. Currently, this just entails humanoid colors. There are only three colors not handled; the light emitter colors in common/src/comp/inventory/item/tool.rs. These don't seem important enough to me to warrant making hotloadable, at least not right now, but if it's needed later we can always add them to the file. commit 63b5e0e553eb2ea49276f192a6fc7dd65254270d Merge: c32b337a4 6d2c4b9c1 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 13:05:37 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c32b337a46e10d9de473d178a94a3ccd61c39bb3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:52:04 2020 +0200 Fixing LOD grid, for real. commit a166ae0360395387e09fb35a1f84210c2ce5ec24 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:28:05 2020 +0200 Addressing imbris's initial feedback. Fixes two minor bugs: explosion particles were no longer spawning randomly, and LOD grids were not perfectly even. commit 4cbad004f44060994252dd3d38647a14a589712f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:27:58 2020 +0200 Bumping nightly per request. commit 548680276aac77c25d43d16b5622f847d474dbef Merge: acc098604 8f8b20c91 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:26:06 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit acc0986040589a3492f88a740bc3c3fc693b26d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:28:32 2020 +0200 Lower resolution due to lying drivers. commit d3b878de2a52c358d2944a6bbd0555dad7fbdb10 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:15:38 2020 +0200 Fix issues msh encountered with Intel 4600. commit 10245e0c1b0cb6fae10d86409435364edc6102ef Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 21:15:02 2020 +0200 Merge more models into one mesh than we did previously. commit 3155c31e663c52ae5c3a53d5fb5665892a1a498a Merge: 7204cc8a7 3c199280e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:35:22 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7204cc8a7a4f74a30306bd205d9834fee4bb944f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:34:43 2020 +0200 Fix not yet done NPC animations. This forces them all to be the idle animation if not specified. This fixes issues where you'd have giant NPCs in water. commit bc83360f2a08918f19d417b5f772e1ff554dba08 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 19:36:37 2020 +0200 Try to fix some bugs: - Z fighting with LOD terrain and water. - Audio SFX not playing. commit 1fd104aa603bf3781b6526a5cada46aeca3049dd Merge: 862df3c99 7c2c392a3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 12:02:31 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 862df3c9976c4da9bd7cfd784f1a85973127968a Merge: 0a4218ed9 75c1d4401 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 05:52:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0a4218ed9d541a2b34c133351bea38a99ddf4ea7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 22:27:14 2020 +0200 Fix particle depth. commit f51dfdeb442d0dd5243dd2f344fa4be295bd0875 Merge: c6251a956 5e6dc0471 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:19:04 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit c6251a956ad376400dca5c23420cf8d213dc8fdf Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:15:46 2020 +0200 Cache figures more intelligently. Cache figures for longer, and don't cache character states for the player except where they actually affect the rendered model. commit 0ed801d5404982c6fb63b1eaa4567d908b294c9d Merge: c11b9bdf0 eea64f78f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 16:32:24 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c11b9bdf0a53bf9884d2f5a48fec9b01d582df1a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 11:47:15 2020 +0200 Remove unneeded Clippy annotation. commit 16aa9ef40af56d69289d00aafb3deadfb8bd4f35 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 8 00:53:02 2020 +0200 Fix hotloading and Clippy. commit 3dc973e0be5b758da1e9805eb764ad401374cd0c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 23:50:27 2020 +0200 Major speedups with SIMD. commit fba64a7d93d5a96077ce87287bbce6ab9b7fbcae Merge: 76429d00e d1e10b178 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:19 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 76429d00eea00d212fbd672a84ee91e75b19b938 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:10 2020 +0200 Add clippy.toml. commit c79f512f84dbb83cb82b7954db68ff241dfd8e41 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 11:55:20 2020 +0200 Fix all clippy issues, clean up Rust code. commit 6f90e010b3fbefb53b0d632e819931350015b6b8 Merge: 77a8c7c26 5929cfa5c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:30 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 77a8c7c267d3f44a1a62bd6b2274359973c5e4d4 Merge: b44e44232 44febaabd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:10 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 5929cfa5c713aa392110bbb62407f76caf53c3df Author: jshipsey <jshipsey18@gmail.com> Date: Thu Aug 6 20:47:27 2020 -0400 fixed in-hand arrow bug commit b44e442325d828f1cd564d66908f89d09e80474b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 6 13:40:35 2020 +0200 Miscellaneous performance improvements. commit be37acf287c1360d8085862526ac3365ffd1d768 Merge: 125d7fc6c c11876547 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 05:49:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 125d7fc6c4dcd8c8c5f27b8268a4d64f409f3644 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 04:55:31 2020 +0200 Abstract over simd vs. repr_c vectors. Also some minor improvements to Event size. commit d4d4956e9252e1241ce110b2aa85076c6b1e2a23 Merge: 5f3b7294a aced5f979 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:56:54 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 5f3b7294af1f8533edc2620b58863c248e2b07af Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:43:52 2020 +0200 Fix formatting issues I missed before. commit a428a3ebba70dcab63dd0f8cd983120c90617271 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:41:51 2020 +0200 Fix clippy warnings, part 1. There aer still a bunch of type too complex and function takes too many arguments warnings that I'll fix later (or ignore, since in the one case I did fix a function takes too many arguments warning I think it made the code *less* readable). commit ba54307540ed8a937ac08209730284fc653af85b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 30 13:22:42 2020 +0200 Fix light animations so they are removed when the light turns off. commit 7e0f4bcbf0f4717145d8beac40d52e3acebbe2aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 21:10:20 2020 +0200 Fix crash in edge case for pixel art. commit 56da06f7a351e2b949e9b014a90b974d511a0924 Merge: cf74d55f2 9f53a4a19 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:56:52 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:29:52 2020 +0200 Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). The first concern was addressed by fixing the dimensions of the map images drawn from the UI (so that we always use a square source rectangle, rather than a rectangular one according to the dimensions of the map). We also fixed the way rotation was done in the fragment shader for north-facing sources to make it properly handle aspect ratio (this was already done for north-facing targets). Together, these fix rendering issues peculiar to rectangular maps. The second and third concerns were jointly addressed by adding an optional border color to every 2D image drawn by the UI. This turns out not to waste extra space even though we hold a full f32 color (to avoid an extra dependency on gfx's PackedColor), since voxel images already take up more space than Optiion<[f32; 4]> requires. This is then implemented automatically using the "border color" wrapping method in the attached sampler. Since this is implemented in graphics hardware, it only works (at least naively) if the actual image bounds match the texture bounds. Therefore, we altered the way the graphics cache stores images with a border color to guarantee that they are always in their own texture, whose size exactly matches their extent. Since the easiest currently exposed way to set a border color is to do so for an immutable texture, we went a bit further and added a new "immutable" texture storage type used for these cases; currently, it is always and automatically used only when there is a specified border color, but in theory there's no reason we couldn't provide immutable-only images that use the default wrapping mdoe (though clamp to border is admittedly not a great default). To fix the maps case specifically, we set the border color to a translucent version of the ocean border color. This may need tweaking going forward, which shouldn't be hard. As part of this process, we had to modify graphics replacement to make sure immutable images are *removed* when invalidated, rather than just having a validity flag unset (this is normally done by the UI to try to reuse allocations in place if images are updated in benign ways, since the texture atlases used for Ui do not support deallocation; currently this is only used for item images, so there should be no overlap with immutable image replacement, so this was purely precautionary). Since we were already touching the relevant code, we also updated the image dependency to a newer version that provides more ways to avoid allocations, and made a few other changes that should hopefully eliminate redundant most of the intermediate buffer allocations we were performing for what should be zero-cost conversions. This may slightly improve performance in some cases. commit ad18ce939940a8c697270f6e9b94db9942fd8295 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 13:21:09 2020 +0200 Fix continent scale hack. commit 36b1cb074f5b195aebd7dbbc3da7f0246a1a18ec Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 12:11:40 2020 +0200 Enable loading different sized maps without a recompile. We may want to tweak the effects of the continent_scale_hack. commit 13b6d4d534cc4814b7cb3294ca41bbfea0a6b186 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 10:55:48 2020 +0200 Removing WORLD_SIZE, part 1. Erased almost every instance of WORLD_SIZE and replaced it with a local power of two, map_size_lg (which respects certain invariants; see common/src/terrain/map.rs for more details about MapSizeLg). This also means we can avoid a dependency on the world crate from client, as desired. Now that the rest of the code is not expecting a fixed WORLD_SIZE, the next step is to arrange for maps to store their world size, and to use that world size as a basis prior to loading the map (as well, probably, as prior to configuring some of the noise functions). commit 30b1d2c6428230a9eaa0d749cdcbbd6f1cbccd78 Merge: 7d56ba31b 1377b369f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:58 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 7d56ba31b445441461b28a07fc495d7d4f047c17 Merge: 2101113b4 598f14b25 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 1377b369f6db2258e910d467a5740f31789e3ded Author: Monty Marz <m.marzouq@gmx.de> Date: Sun Jul 19 23:25:38 2020 +0200 more saturated pumpkins commit ae8d50527f93bb0616c2ad46ce4dacb63bc37c6d Author: Monty Marz <m.marzouq@gmx.de> Date: Sat Jul 18 20:29:56 2020 +0200 acacia models commit 2101113b467e691de787392d7f20f1745f5637bd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 18 18:55:25 2020 +0200 Higher detail LOD. commit add2cfae04b4385fa5590e11e2bd5229d9dee0aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 16 01:57:39 2020 +0200 Revert some irrelevant stuff. commit 2e2ab3dc1eaa59a4aef7f8d34a53d8aae4c8553a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 15 13:30:49 2020 +0200 Fixing various things about shadows. * Correcting optimal LISPSM parameter. * Figure shadows are cast when they're not visible. * Chunk shadows stay cast until you look away. * Seamless cubemaps for point lights. * Etc. commit 6c31e6b56217274285b597af297036691ea5d897 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 19:50:26 2020 +0200 Fix shadow creation. commit 6332cbe006115ae205597529cd8bbccd146c2cca Merge: be438657c 930e0028b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:47:00 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit be438657c33d7b5bfb0a9582c3ed3fd366637323 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:28:08 2020 +0200 Tweaks to shadows. Added shadow map resolution configuration, added seamless cubemaps, documented all existing rendering options, and fixed a few Clippy errors. commit 23b4058906013c7d2a40c286e20e32c5fbd897ed Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 10:11:19 2020 +0200 Fix moon, use nonlinear noise for terrain. Note that the latter has a bit of performance cost. commit 7fbe5cbfbb9dc29607957b8e62f432a4deed193d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:23:02 2020 +0200 Address lies about max texture size. commit bcfc62b5e13a1cdd83f57535fde4694720bebfd9 Merge: 75e3626a7 18a08e8fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:22:08 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 75e3626a785919f43fdcf2127c2b10e3e4df2f9f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:21:52 2020 +0200 OpenGL 3.3 minimum. commit 18a08e8fe2739f02af99a5d2cb4e7c38c49e858b Author: Monty Marz <m.marzouq@gmx.de> Date: Tue Jul 7 23:57:52 2020 +0200 settings localization commit 90c5d1ca3620092bc3ae10b2211489eb1cf6f5e8 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 21:11:48 2020 +0200 Lower near distance. commit 0e66f02b25aaddaa2dfddbbc89cd67de54a9a7b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 20:09:01 2020 +0200 All sprites sway in the wind now. commit db1401a6910bf42dcf502462c90038752ff5fbdb Merge: 69e508d8c e8b4b29d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 19:34:17 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 69e508d8c94d8973033817ca86f357e466fc7c4d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 18:41:37 2020 +0200 Make it easy to switch to SIMD for math. commit ffe0f5928c7a7e87d00cb5426b3b1d831d7e02fd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 21:21:12 2020 +0200 Fix some issues with underwater rendering. commit bfda6da42f38fd02c31ee92c81ab785a3e50c2a0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 19:17:59 2020 +0200 Fix some minor display issues. commit 0ed752e087968cf901301884aaeae698e32ef8a5 Merge: ccc6a06a8 518edcb85 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:14:21 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit ccc6a06a8d4504d6b9f7af7905a414d2ee06ab76 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:04:34 2020 +0200 Some minor changes. commit 4e020246702889269efe1a191788992164c508d6 Merge: 50a64d927 e05c9267a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 16:17:40 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 50a64d927e6c4f4b0e4688e4cbfca694bc3f922a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 13:07:03 2020 +0200 Fix far plane. commit 7dd06da34cae8f9ea3b6c889fe965181f3fd3949 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:25:35 2020 +0200 Add shadows.glsl. commit 618a18c998778bf871b905a74657440fcc384c80 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:10:22 2020 +0200 Adding shadows, greedy meshing, and more. commit eaea83fe6a5cb1cb0ba8beef888183c718258496 Merge: 267018495 2f89b863e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 22:47:07 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 2670184954a13e4a9e7a4e35ba79aac0c5fac2f7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 21:20:01 2020 +0200 Make civsim and sites deterministic. For anything in worldgen where you use a HashMap, *please* think carefully about which hasher you are going to use! This is especially true if (for some reason) you are depending on hashmap iteration order remaining stable for some aspect of worldgen. commit f8376fd5dc72b4a9c2f51a6b4570d59c8b8e9343 Merge: 654f7e049 cdee191dd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 17:53:57 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 654f7e049258d9da27c09608bbe6a46ffa8787e5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed May 20 21:22:30 2020 +0200 Correct backface culling. commit 560501df05ca725409b0f2e4eb31bdfdc15fd0c7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue May 19 17:22:06 2020 +0200 Greedy messhing for shadows. commit a4d87e1875ca543436e6bbbeb20348facc5a52d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun May 17 05:59:00 2020 +0200 Shadow maps work for lantern. commit 243d0837b8a3b08172c9a3c348d964d7ddc2a0a8 Merge: 04382dc28 71dd520cd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:53:13 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 04382dc28632b6c66e8821f6870c0daaa1c1901a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:22:17 2020 +0200 WIP: better graphics config, better LOD, shadow maps. commit 22ddbad3eb32bfa70f0932176022208fe67ded81 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 18:54:09 2020 +0200 Minor shader fixes. commit 746a10e8d01ac235f994b0cde78fa48998602a1f Merge: 0f4a0e763 40ab94673 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 04:02:09 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0f4a0e763db3afbdc4fb0558611f38326ca87151 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 23:03:24 2020 +0200 Switch back to pop-in terrain. commit dd74fa7e4a53667b38811d7aec58d7f6a68889bb Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 22:58:55 2020 +0200 LOD shading closer to voxel shading. commit ef67bd58ba0bdaf622b078892d768263b6cba268 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 28 20:49:03 2020 +0200 Experimental underwater lighting. commit 2c5ad9d07605e80d5fd5679dd3a5d70c605b86a9 Merge: 748279835 303967a6f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 22:35:24 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7482798354eda18c8207950080fc24d443a369de Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 21:59:55 2020 +0200 Replace discard in figure-frag. commit d83b4ae69be4912f69bf7835f509c68a1c7770a4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:45:57 2020 +0200 Fix sprite lighting, HDR from focus_pos. commit 0594238004f116274905fa0ed7c2b6c417ed1d29 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:14:10 2020 +0200 Proper HDR from point lights. commit 48c93d2b41ce5743103d18e76cc228f5ac766492 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 14:01:43 2020 +0200 Brighter ambiance, darker LOD shadows. commit e0452e895ccfa8a43f368cae3b8b8aedc24dad93 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 13:13:23 2020 +0200 More proper HDR. commit 4c6da3ed16cfeebb455e40da5f557b4af9a499d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 00:13:10 2020 +0200 Trying LOD noise. commit 682a3d74c85df5503ffe1fc1cc891bce789df1ad Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 23:11:08 2020 +0200 Fix LOD heights in towns. commit cc39e5734e8b18f9077bf42e66337c1319dd6b6e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 21:01:23 2020 +0200 More LOD fixes. commit 8116b21c2e51c836e77894e309ac273caf2917b3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:54:43 2020 +0200 I like this coloring. commit bc2560ea90b36f4b46190005344232d993043ac3 Merge: 14effdd5d e690efe71 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:48:33 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 14effdd5db8747fcf3eb34f03b46b7792e92d1c5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:24:35 2020 +0200 Re-saturate. commit 48a643955d4435b78179acba0beb4a979905cc31 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:23:57 2020 +0200 Various fixes. commit f7b497a0c25f4ad4682c71dd1ed6f608052feb9b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 03:22:49 2020 +0200 Render figures again. commit 44e4aad48deba8266b9f8bdfd3db096b381f5327 Merge: e6f0a5a98 9ec319a18 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 02:01:04 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit e6f0a5a981a82533ba188fff0a54ce98577bb152 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 24 16:12:20 2020 +0200 Add atmospheric scattering. commit f2953087f691a8edbc001cb98ebf5059fc6f8ac0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 23 00:01:20 2020 +0200 Fix shadowing for specular reflections. commit ddd4a67a9799b8d08c7dc0c2bec90621c2bed0e3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Apr 22 22:56:12 2020 +0200 HDR fixes. commit 1015e60deef3c447381996277df7496707a63bd0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 21 18:25:19 2020 +0200 More lighting changes. commit 80c264abd111fb237e57843efcb5c071d4f84613 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 13 00:29:59 2020 +0200 Lighting experiments. commit 8414987e589dd5102bad89762a3adaccc0bfe957 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 9 02:38:40 2020 +0200 WIP -- lighting changes and soft shadows. commit 9cd2b3fb0d6b49776c6dfe463e4169637250b11a Merge: c7ea687eb 8b149ad11 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:29 2020 +0200 Merge branch 'sharp/new-lighting' into sharp/small-fixes commit c7ea687ebbc5aace1b455f134a5bf49ce2c7434a Merge: 476441531 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:02 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 8b149ad11ad4bb75018fcf9519baec27d1c95951 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:32:39 2020 +0200 Trying out a new lighting model. commit b0ac9f36f755dd06f7c17c46150568064790864f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 07:56:11 2020 +0200 Use bicubic interpolation for terrain. commit f6fc9307a121514b614bc50ef8eb055953e7da8a Merge: 33140a295 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 05:01:41 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 4764415312aae6e9ac2d00e86e84577cb958f1ab Merge: ed2d0111d 13388ee6a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 04:54:48 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 13388ee6a42943f3f79a9cb488346cef18e272fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 20:30:08 2020 +0200 Various fixes (to coloring and to soft shadows). commit fbd084a94a067082a87cd6d28b82054709bc9265 Merge: 5a089863b 4fdf6896a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 18:50:38 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/map-colors commit ed2d0111d994262ae836d84d1fe5a45e4de72a0b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 06:49:27 2020 +0200 Combining colors and LOD. commit 88342640c6b835114d01c797b89fdede3b0a2108 Merge: 33140a295 5a089863b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:49:20 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 33140a2951b8212725f42c758b277aaec4d888f7 Merge: 4c65a5aed f34d4b379 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:36:21 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 5a089863beb01d4794bbe3580ada47b278715ea2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 03:17:49 2020 +0200 Making maps brighter. This is probably not the right way to do it, but oh well! commit 32b2c99109dd486aa922886081068f9c550c83f2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 02:46:36 2020 +0200 Horizon mapping and "layered" map generation. Horizon mapping is a method of shadow mapping specific to height maps. It can handle any angle between 0 and 90 degrees from the ground, as long as know the horizontal direction in advance, by remembering only a single angle (the "horizon angle" of the shadow map). More is explained in common/src/msg/server.rs. We also remember the approximate height of the largest occluder, to try to be able to generate soft shadows and create a vertical position where the shadows can't go higher. Additionally, map generation has been reworked. Instead of computing everything from explicit samples, we pass in sampling functions that return exactly what the map generator needs. This allows us to cleanly separate the way we sample things like altitudes and colors from the map generation process. We exploit this to generate maps *partially* on the server (with colors and rivers, but not shading). We can then send the partially completed map to the client, which can combine it with shadow information to generate the final map. This is useful for two reasons: first, it makes sure the client can apply shadow information by itself, and second, it lets us pass the unshaded map for use with level of detail functionality. For similar reasons, river generation is split out into its own layer, but for now we opt to still generate rivers on the server (since the river wire format is more complicated to compress and may require some extra work to make sure we have enough precision to draw rivers well enough for LoD). Finally, the mostly ad-hoc lighting we were performing has been (mostly) replaced with explicit Phong reflection shading (including specular highlights). Regularizing this seems useful and helps clarify the "meaning" of the various light intensities, and helps us keep a more physically plausible basis. However, its interaction with soft shadows is still imperfect, and it's not yet clear to me what we need to do to turn this into something useful for LoD. commit f8926a5737ddc51f3d585c651a64c43677aae0f4 Merge: a1aee931e 875ae6ced Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Mar 13 13:32:42 2020 +0100 Merge remote-tracking branch 'origin/master' into sharp/map-colors commit 4c65a5aed353b119aea65a2aaeb94549b67beb42 Author: Treeco <5021038-Treeco@users.noreply.gitlab.com> Date: Mon Feb 24 16:48:05 2020 +0000 Made LOD setting slider exponential commit 2fa7b2d20d7233dc8bfd64f9f7f54617575248f1 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 17:49:53 2020 +0000 Added mist to LoD commit aab059a450b5f635777129ff82cc15b662965c3c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 15:14:06 2020 +0000 Added LoD slider commit 779c36b538121c5ade3633ae5cb67bb14c8c3877 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:54:55 2020 +0000 Reduced cost of vertex pushing commit 9fea150473906b166365b738ebcea07c697daf3d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:38:53 2020 +0000 Fixed maths, improved LoD resolution commit 5481df38fea5bf183ff376a3337179cfaa5233dc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 11:22:50 2020 +0000 Dynamically relocate LoD vertices to enhance details commit a3e36a50ababd615da7db1b26158c7906a5def01 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 18:13:51 2020 +0000 Simpler terrain spiral rendering commit 255f450ae9ac8763db4bede075fb409161ed57cc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:53:17 2020 +0000 Better LoD precision commit 3d027aebe812a5b8658a4eb8123dc9f61b3776d2 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:04:03 2020 +0000 Better falloff commit be775c9484b457b2c0b1a494aec03392d0c70e76 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 15:30:45 2020 +0000 Applied good ideas from experimental branch commit 58587b68545a23c5c04ab4574a4b94b3bc982246 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 16:15:13 2020 +0000 Minor fixes to LoD merging commit 7b42aebd709c14df2db766aad61d9280ad24d84d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 15:04:44 2020 +0000 Capped LoD dragging commit 8aafc559f87124e1ea5ca6e3ddc2aa0c242d793c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:54:37 2020 +0000 Better blending between LoD and terrain border commit edd3455d5161792d87ddc8eadc0ecbad5532b284 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:40:19 2020 +0000 Fixed LoD z depth, added sea level offset commit b9b06744620114dd5556e73f64fa93c145503a7c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:27:43 2020 +0000 Better LoD smoothing commit a1aee931e790431560cd2d953ad61d9497072afd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Feb 21 14:52:17 2020 +0100 Adding shadows. commit 2400786c13dd891c131ed86d48d05df516a8a778 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 13:48:40 2020 +0000 Use world map as LoD source commit dbf650f504a4c25fbbc2096ac3616c736bf52d23 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Jan 20 00:48:14 2020 +0000 Better clouds at distance commit 5e6f81b86cdb9730b9b056877b19257075fd5fa8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Jan 19 23:59:02 2020 +0000 sync commit 745e7540ddb000cc645f612767b337c2ddc3f7c0 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 12:40:48 2019 +0000 Improved cloud falloff mist, faster noise sampling commit f6a200d0cb866196ba57697466755f9e0c7ea5d8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 10:09:00 2019 +0000 Improved long-range depth precision, removed unnecessary LoD polygons commit 63d1b2bb2292898d59fb4f4e502201103dfeb86f Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 20:57:46 2019 +0000 Working LoD shader commit f13d98ee3e58f881e8b978861a67663b59ed91ec Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 11:03:40 2019 +0000 LoD first attempt (stack overflow issue)
2020-08-20 18:34:59 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update further crates
2020-12-16 00:07:39 +00:00
checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07"
(See sharp/lod-history) LOD, shadows, greedy meshing, new lighting, perf --- Pretty much a Veloren fork at this point. Here's a high level overview of the changes (will be added to CHANGELOG just before merge). At a high level this MR incorporates roughly two groups of changes. The first group consists of new game features: more flexible map sizes, level of detail terrain, shadow maps, and a new lighting engine. This is "feature work" that (mostly) only adds new things to Veloren, and mostly shouldn't affect old stuff. The second big group of changes are those addressing the fallout from all the new features. These include performance fixes of various sorts: the addition of multiple graphics options and optimization of the cheap ones to avoid work, switching all voxel models to use some variant of greedy meshing, switching over much of our CPU-side vector math to exploit SIMD instructions (coinciding with a fork of `vek`), and a rewrite of how the UI handles text rendering (coinciding with updates to our fork of `conrod`). Making Veloren's hardcoded colors appear correct under the new lighting engine also required considerably changes (TODO: Fill in this section when it's complete). The second category of changes often heavily touches code owned by other people, including frequently modified code "owned" by a handful of people, so I recommend that this code be reviewed particularly carefully. --- At a high level (each will be described in more detail below): - The world map has been refactored. - The world size is no longer hardcoded (@zesterer). - The map generation code was made generic to allow using it outside of the `world` crate (@zesterer). - On world creation, we now compute *horizon maps* (@zesterer). - The way we pass the world from the server to the client has been updated (@xMAC94x). - Artifacts related to image rotation were fixed (@imbris). - Multiflow rivers were enabled (@zesterer). - In the process of making changes related to the world map, various incidental fixes and optimizations were required. - The new *level of detail* feature was added (@zesterer wrote part of this and has checked out the rest). - A new LOD terrain rendering step was added to the pipeline. - The LOD terrain quality was made configurable via a graphics setting. - Horizon maps were used to cast shadows from LOD chunks on both LOD and non-LOD terrain. - A "voxelization" effect was incorporated into rendered LOD terrain to make it blend better into the world. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Veloren's lighting has been completely overhauled (@zesterer has already checked most of this out). - A semi-accurate index of refraction was assigned to our materials. - A new, more realistic, physically based approach to lighting was used using the *Ashikhmin Shirley* BRDF. - We emulate *atmospheric scattering* using equations designed for measuring solar panel light exposure. - We attempt to compute *realistic light attenuation* in water using its real material properties. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Point and directional lights now cast realistic shadows, using *shadow mapping.* (@imbris, @zesterer, @Treeco, @YuriMomo) - Point light shadow maps were added to the rendering pipeline, using geometry shaders and *seamless cube maps*. - Directional light shadows were added to the rendering pipeline, using LISPSM together with disabling *depth clamping*. - "Shadow-only" chunks and NPCs were added to prevent shadows from models behind you from disappearing. - In the process of making changes related to shadow maps, various incidental fixes and optimizations were required. The addition of shadow maps, LOD terrain, and the new lighting all led to significant performance degradation, on top of other changes happening in master. Therefore, a large number of performance improvements were also needed: - The graphics options were made much more flexible and configurable, and shaders were optimize. - New options were provided for how to render lights and shadows (@Pfauenauge, @zesterer). - Graphic setting storage and configuration were overhauled to make adding new features easier (@Pfauenauge, @imbris). - Shaders were rewritten to utilize GLSL's preprocessor to avoid overhead (@zesterer, @YuriMomo). - In the process of making changes related to providing additional rendering options, various incidental fixes and optimizations were required. - Voxel model creation was switched to use *greedy meshing.* - A new voxel meshing method, greedy meshing, was added (@imbris). - Uses of the older meshing methods were migrated to use greedy meshing (@imbris, @jshipsey, @Pfauenauge). - New restrictions were added to terrain, figure, and sprites to future proof them for further optimizations (@jshipsey, @Pfauenauge, @zesterer). - Most positions are now relative to either chunk or player position for better precision (@imbris, @zesterer, @scottc). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - Animation and terrain math were switched to use SIMD where possible. - Fixes were made to vek to make its SIMD feature usable for us (@zesterer, @imbris). - The interface and types used in bone animation were changed in various ways (@jshipsey, @Snowram, @Pfauenauge). - Redundant code generation for body animation is now partly taken care of by a macro (@jshipsey, @Snowram, @Pfauenauge). - Animation code was modified to to use vek's SIMD representation where possible (@jshipsey, @Snowram, @Pfauenauge). - Terrain meshing code and shadow map math were also modified to use vek's SIMD representation (@imbris). - SIMD instruction generation was enabled (@YuriMomo, @jshipsey, @Snowram, @imbris, @Angelonfira, @xMAC94x). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - The way we cache glyphs was completely refactored, fixed, and optimized. - Our fork of `conrod` was optimized in various ways (@imbris). - Our fork of `conrod` now exposes whether a widget was updated during the current frame (@imbris). - Our use of the glyph cache was rewritten for correctness (@imbris). - A *text cache* was introduced that lets us skip remeshing glyphs that have not changed (@imbris). - Various changes were made to reduce pressure on the glyph cache, with more planned (@imbris, @Pfauenauge). - In the process of making changes related to the glyph cache, various incidental fixes and optimizations were required. - Colors were changed to keep Veloren's look consistent with master. - Some older tree models were brought back (@Pfauenauge). - TODO(@Sharp): All hardcoded colors were extracted and made hotloadable. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Hardcoded colors were fixed to conform to Veloren's style. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Color models were fixed to conform to Veloren's style. A detailed description of the involved changes follows. --- - The world size is no longer hardcoded. All functions dependent on world size now take a `WorldSizeLg`, which holds the base 2 logarithm of each actual world dimension and is guaranteed to maintain certain properties (outlined in `common/src/terrain/map.rs`). Additionally, many utility functions that utilize the world size were moved into `common` as well (mostly `common/src/terrain/mod.rs`). Finally, the world map format was updated in order to store its size explicitly, with a migration path from the old format that should work whenever the old formatted map was a square (practically always). See `world/src/sim/mod.rs` for these changes. - The map generation code was made generic to allow using it outside of the `world` crate. The parts of the map generating code that do not need to query the world were moved over to `common/src/terrain/map.rs`, allowing them to be used from the client without creating a dependency on `world`. The rest of it was turned into helper functions in `world/src/sim/map.rs`, which can be passed as closures to the generic map generation code to complete its construction. This also means that colors are now passed in separately to the map generation function. See <https://veloren.net/devblog-78/> for more details. - On world creation, we now compute *horizon maps*. See the function in `world/src/sim/util.rs`. Given a height map and a plane intersecting that height map, our horizon maps allow us to encode enough information to reconstruct shadows for each point on the height map using only the *horizon angle* (the angle at which the sun starts to become visible). As Veloren's sun only covers one plane, this is sufficient for encoding sun shadows for LOD terrain, by encoding two angles per chunk (one for each 90 degrees the sun covers). We can also use this for the moon, if we want, since the moon follows the same path. Additionally, we store the *height* of the furthest occluder, to try to make the shadows volumetric; so this means 4 bytes in total for each chunk. Support for horizon maps has been merged into the map functionality in common as well. - The way we pass the world from the server to the client has been updated. Rather than passing the prerendered map, we instead pass three maps with values for each chunk; one with the color information, a second with altitude information, and a third with horizon map information. We then reconstruct the map on the client, together with some additional information we send from the server (like the sea level and maximum height). See `common/src/msg/server.rs` for a detailed description of the format of `WorldMapMsg`, and `server/src/libr.rs` and `client/src/lib.rs` for details of the map construction and parsing. - Artifacts related to image rotation were fixed. See the commit message for commit SHA `cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e` for a detailed explanation. This involved changes to shaders, the addition of a new type of graphic (also reflected in the graphic cache) that allows specifying a border color (which automatically makes the associated texture immutable), and some related fixes. I reproduce the first two paragraphs of the MR description as well: ``` Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). ``` - Multiflow rivers were enabled. This does not really need to be part of this MR, and would be easy to revert, but since it seemed to provide a nice improvement it's currently packaged with it. We already computed multiple outflows from each chunk for erosion purposes long before this MR. However, we never modified river rendering to be able to handle this case (just a single downhill river flow is complex enough!) so this was not exposed when deciding which chunks were rivers. Now that - In the process of making changes related to the world map, various incidental fixes and optimizations were required. Some examples of fixes include making sure terrain is never lowered to below sea level (to make the shadow maps report correct values), fixing map altitudes and colors to understand things like cliffs and "block level" coloring (that doesn'te xist on the column level), and fixing a crashbug when rendering images for the UI where source pixels are strongly rectangular. Some examples of related performance fixes include avoiding allocating a fresh vector for all the maps (i.e. copying it over to change the format from `[u32; n]` to `DynamicImage` and then copying again to convert to `RgbaImage`), and instead using the `gfx::memory::slice` function to accomplish the same thing. These sorts of changes are spread all arond the code. This includes the additon of a new scene, `voxygen/src/scene/lod.rs`, a new pipeline `voxygen/src/render/pipeline/lod_terrain.rs`, and new shaders `assets/vxygen/shaders/lod-terrain-vert.glsl` and `assets/vxygen/shaders/lod-terrain-frag.glsl`, as well as associated changes to the renderer in `voxygen/src/render/renderer.rs`. The main idea behind our initial approach to LOD was to take the world data we now get from the server (altitude, color, and horizon mapping). - Some previously computed values were turned into shader uniforms for better prediction on weak processors. (@zesterer) - Calls to power or trig functions were removed or replaced with multiplications, where possible. - After some deliberation - To properly handle sprite "waving" for nearby sprites, We explicitly designed the greedy meshing system with figures and sprites in mind. In both cases, we want to be able to *efficiently* pack many different models into the same texture, especially in cases where we know we will either not be removing any of the grouped-together from the models from the texture, or will remove all of them at once (so they can be packed into some specific subtexture). For sprites, since we know every model in advance and never intend to deallocate them, we currently pack them all as efficiently as possible into one giant tetxure atlas. However, in the future we might opt to pack them slightly less efficiently in exchange for shrinking the sprite vertex size. For figures, we pack all the textures for each *model* into the same atlas. is a global texture atlas used for every sprite, and for figures which is why we have the ability to mesh multiple models to the same texture area (using the simple texture atlas allocator) without requiring intermediate vector allocations. This is accomplished by delaying the time when we actually write the color and light data to the texture until *after* all the model vertices have been meshed; then, we can just allocate the whole color/light array at once, making the atlas we use an exact fit. In computer science-y terms, we accomplish this delay by, after we perform the initial greedy meshing (without texture information), not continuing to create the texture data, but instead constructing a *continuation*--that is, a function that, when called, will execute the rest of the computation. We push this continuation (which in Rust terms is a `FnOnce` closure that takes the `ColLightsInfo` that it is supposed to write to as context) onto a onto a vector resizing. To allow for suspended writes to texture data, Rust pointed out to me that the continuation that would eventually write the color and light data to the texture atlas (the one that is shared by all models sharing the same greedy mesher) would have to *own* whatever data it mshed. Because we often generate the model data to mesh as a temporary in `voxygen/src/load.rs`, the - Matrix multiplications in the shader were reduced for figure data (@zesterer). - Vertex "waves" for fluid data were removed. - Terrain "bending" near edges was removed. - Scaling was fixed to make sure empty space was not introduced in a space previously occupied by a block. It was also changed to take ownership of its voxel data, rather than sharing it, to let it be used with meshing. - Rust's nightly version was bumped in order to use the `array_map` function, which lets us reuse more code between the simple map and `FigureModelCache`. - PositionedGlyph::standalone. --- I tried to cite sources in many cases[^realtime],[^lloyd],[^lispsm],[^pbrt],[^greedy],[^tjunctions] where I needed features from elsewhere but I am particularly grateful for the following resources, esepcially where they have accompanying source code. I linked all of them that are accessible to the public (those that are not were obtained through legal means). [^realtime]: Eisemann, Elmar, Michael Schwarz, Ulf Assarsson, Michael Wimmer. Real-Time Shadows. A K Peters/CRC Press (T&F), 20160419. [^lloyd]: Lloyd,B. 2007. [Logarithmic perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). PhD thesis, University of North Carolina. [^lispsm]: Wimmer, M., Scherzer, D., and Purgathofer, W. 2004. [Light space perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). In Proceedings of Eurographics Symposium on Rendering 2004, pp. 143– 152. [^pbrt]: Pharr, Matt, et al. [http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf](Physically Based Rendering: From Theory to Implementation). Third edition, Morgan Kaufmann Publishers/Elsevier, 2017. [^greedy]: mikolalysenko. “Meshing in a Minecraft Game.” 0 FPS, 30 June 2012, <https://0fps.net/2012/06/30/meshing-in-a-minecraft-game/>. [^tjunctions]: blackflux. “Meshing in Voxel Engines – Part 1.” Blackflux.Com, 23 Feb. 2014, <https://blackflux.wordpress.com/2014/02/23/meshing-in-voxel-engines-part-1/>. I am also especially grateful to Khronos, Wikiepdia, and stackoverflow for answering many of my specific questions while writing the MR. --- Squashed commit of the following: commit 300505e7305a2fdac722a808ee8538323f215f39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 18:46:25 2020 +0200 Fixing cargo doc and typo in CHANGELOG. commit ec0aeb18e8499d7d84ef818331b4b65c3d76cea6 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 15:38:50 2020 +0200 Hopefully final commit for the LOD branch. commit 5e8ea0b1eaac02903a02feb2eb038d195de4872f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 10:14:26 2020 +0200 Falling back to power as stopgap. commit e44a1cbf46504ee9931a01bdc9033e145500d557 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 09:25:41 2020 +0200 Address imbris feedback. Temporarily disables shiny water, lowers max VD. These restrictions will be lifted soon after merging. commit 561e25778a108ac3712f5ec2ce3a51234c4430d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 08:31:13 2020 +0200 Tweaking shaders a bit. commit 7d19259078ce0dd7b3742ad7d0cb3fab3ece3fdc Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:59:43 2020 +0200 Fix view example as well. commit 051cd4934e0fad2c0b15db4380a4189fa318679f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:29:06 2020 +0200 Fix meshing benchmark. commit c95e07db3b4dcca285678985e65e31b927cb1c61 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 05:46:22 2020 +0200 Address MR feedback, fix scene clouds. commit 1bfb816cabdb3ffc1e507a009c2d98696b4b573a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:39:36 2020 +0200 Incorporating Pfau's figure color changes. New eyes and new humanoid colors. commit 3f9b89a3ac7b3356b1dba0d1a8f6541357f81469 Merge: e2f5162e4 62c53963a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:29:41 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit e2f5162e4f96f4124aa43488f7245d341b3dcfd4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:28:38 2020 +0200 World colors are all hotloadable. They live in assets/world/style/colors.ron. Only a small handful of hardcoed colors remain in World; they are either part of the map, or difficult to disentangle from the rest of the computation. Comments are made where appropriate. commit 62c53963abe1975009d34a8f9515a355bef24f31 Author: Marcel Märtens <marcel.cochem@googlemail.com> Date: Wed Aug 19 15:59:00 2020 +0200 replace pretty_env_logger with tracing commit 5b1625f99d9586fe80e2232f583ec5af9f953099 Merge: d71003acd 4942b5b39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:15:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit d71003acdabeff970b3928e97c26af6847b5b78e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:14:34 2020 +0200 Hotloading colors, part 1: colors in common. Currently, this just entails humanoid colors. There are only three colors not handled; the light emitter colors in common/src/comp/inventory/item/tool.rs. These don't seem important enough to me to warrant making hotloadable, at least not right now, but if it's needed later we can always add them to the file. commit 63b5e0e553eb2ea49276f192a6fc7dd65254270d Merge: c32b337a4 6d2c4b9c1 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 13:05:37 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c32b337a46e10d9de473d178a94a3ccd61c39bb3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:52:04 2020 +0200 Fixing LOD grid, for real. commit a166ae0360395387e09fb35a1f84210c2ce5ec24 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:28:05 2020 +0200 Addressing imbris's initial feedback. Fixes two minor bugs: explosion particles were no longer spawning randomly, and LOD grids were not perfectly even. commit 4cbad004f44060994252dd3d38647a14a589712f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:27:58 2020 +0200 Bumping nightly per request. commit 548680276aac77c25d43d16b5622f847d474dbef Merge: acc098604 8f8b20c91 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:26:06 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit acc0986040589a3492f88a740bc3c3fc693b26d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:28:32 2020 +0200 Lower resolution due to lying drivers. commit d3b878de2a52c358d2944a6bbd0555dad7fbdb10 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:15:38 2020 +0200 Fix issues msh encountered with Intel 4600. commit 10245e0c1b0cb6fae10d86409435364edc6102ef Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 21:15:02 2020 +0200 Merge more models into one mesh than we did previously. commit 3155c31e663c52ae5c3a53d5fb5665892a1a498a Merge: 7204cc8a7 3c199280e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:35:22 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7204cc8a7a4f74a30306bd205d9834fee4bb944f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:34:43 2020 +0200 Fix not yet done NPC animations. This forces them all to be the idle animation if not specified. This fixes issues where you'd have giant NPCs in water. commit bc83360f2a08918f19d417b5f772e1ff554dba08 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 19:36:37 2020 +0200 Try to fix some bugs: - Z fighting with LOD terrain and water. - Audio SFX not playing. commit 1fd104aa603bf3781b6526a5cada46aeca3049dd Merge: 862df3c99 7c2c392a3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 12:02:31 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 862df3c9976c4da9bd7cfd784f1a85973127968a Merge: 0a4218ed9 75c1d4401 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 05:52:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0a4218ed9d541a2b34c133351bea38a99ddf4ea7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 22:27:14 2020 +0200 Fix particle depth. commit f51dfdeb442d0dd5243dd2f344fa4be295bd0875 Merge: c6251a956 5e6dc0471 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:19:04 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit c6251a956ad376400dca5c23420cf8d213dc8fdf Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:15:46 2020 +0200 Cache figures more intelligently. Cache figures for longer, and don't cache character states for the player except where they actually affect the rendered model. commit 0ed801d5404982c6fb63b1eaa4567d908b294c9d Merge: c11b9bdf0 eea64f78f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 16:32:24 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c11b9bdf0a53bf9884d2f5a48fec9b01d582df1a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 11:47:15 2020 +0200 Remove unneeded Clippy annotation. commit 16aa9ef40af56d69289d00aafb3deadfb8bd4f35 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 8 00:53:02 2020 +0200 Fix hotloading and Clippy. commit 3dc973e0be5b758da1e9805eb764ad401374cd0c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 23:50:27 2020 +0200 Major speedups with SIMD. commit fba64a7d93d5a96077ce87287bbce6ab9b7fbcae Merge: 76429d00e d1e10b178 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:19 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 76429d00eea00d212fbd672a84ee91e75b19b938 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:10 2020 +0200 Add clippy.toml. commit c79f512f84dbb83cb82b7954db68ff241dfd8e41 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 11:55:20 2020 +0200 Fix all clippy issues, clean up Rust code. commit 6f90e010b3fbefb53b0d632e819931350015b6b8 Merge: 77a8c7c26 5929cfa5c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:30 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 77a8c7c267d3f44a1a62bd6b2274359973c5e4d4 Merge: b44e44232 44febaabd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:10 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 5929cfa5c713aa392110bbb62407f76caf53c3df Author: jshipsey <jshipsey18@gmail.com> Date: Thu Aug 6 20:47:27 2020 -0400 fixed in-hand arrow bug commit b44e442325d828f1cd564d66908f89d09e80474b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 6 13:40:35 2020 +0200 Miscellaneous performance improvements. commit be37acf287c1360d8085862526ac3365ffd1d768 Merge: 125d7fc6c c11876547 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 05:49:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 125d7fc6c4dcd8c8c5f27b8268a4d64f409f3644 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 04:55:31 2020 +0200 Abstract over simd vs. repr_c vectors. Also some minor improvements to Event size. commit d4d4956e9252e1241ce110b2aa85076c6b1e2a23 Merge: 5f3b7294a aced5f979 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:56:54 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 5f3b7294af1f8533edc2620b58863c248e2b07af Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:43:52 2020 +0200 Fix formatting issues I missed before. commit a428a3ebba70dcab63dd0f8cd983120c90617271 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:41:51 2020 +0200 Fix clippy warnings, part 1. There aer still a bunch of type too complex and function takes too many arguments warnings that I'll fix later (or ignore, since in the one case I did fix a function takes too many arguments warning I think it made the code *less* readable). commit ba54307540ed8a937ac08209730284fc653af85b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 30 13:22:42 2020 +0200 Fix light animations so they are removed when the light turns off. commit 7e0f4bcbf0f4717145d8beac40d52e3acebbe2aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 21:10:20 2020 +0200 Fix crash in edge case for pixel art. commit 56da06f7a351e2b949e9b014a90b974d511a0924 Merge: cf74d55f2 9f53a4a19 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:56:52 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:29:52 2020 +0200 Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). The first concern was addressed by fixing the dimensions of the map images drawn from the UI (so that we always use a square source rectangle, rather than a rectangular one according to the dimensions of the map). We also fixed the way rotation was done in the fragment shader for north-facing sources to make it properly handle aspect ratio (this was already done for north-facing targets). Together, these fix rendering issues peculiar to rectangular maps. The second and third concerns were jointly addressed by adding an optional border color to every 2D image drawn by the UI. This turns out not to waste extra space even though we hold a full f32 color (to avoid an extra dependency on gfx's PackedColor), since voxel images already take up more space than Optiion<[f32; 4]> requires. This is then implemented automatically using the "border color" wrapping method in the attached sampler. Since this is implemented in graphics hardware, it only works (at least naively) if the actual image bounds match the texture bounds. Therefore, we altered the way the graphics cache stores images with a border color to guarantee that they are always in their own texture, whose size exactly matches their extent. Since the easiest currently exposed way to set a border color is to do so for an immutable texture, we went a bit further and added a new "immutable" texture storage type used for these cases; currently, it is always and automatically used only when there is a specified border color, but in theory there's no reason we couldn't provide immutable-only images that use the default wrapping mdoe (though clamp to border is admittedly not a great default). To fix the maps case specifically, we set the border color to a translucent version of the ocean border color. This may need tweaking going forward, which shouldn't be hard. As part of this process, we had to modify graphics replacement to make sure immutable images are *removed* when invalidated, rather than just having a validity flag unset (this is normally done by the UI to try to reuse allocations in place if images are updated in benign ways, since the texture atlases used for Ui do not support deallocation; currently this is only used for item images, so there should be no overlap with immutable image replacement, so this was purely precautionary). Since we were already touching the relevant code, we also updated the image dependency to a newer version that provides more ways to avoid allocations, and made a few other changes that should hopefully eliminate redundant most of the intermediate buffer allocations we were performing for what should be zero-cost conversions. This may slightly improve performance in some cases. commit ad18ce939940a8c697270f6e9b94db9942fd8295 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 13:21:09 2020 +0200 Fix continent scale hack. commit 36b1cb074f5b195aebd7dbbc3da7f0246a1a18ec Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 12:11:40 2020 +0200 Enable loading different sized maps without a recompile. We may want to tweak the effects of the continent_scale_hack. commit 13b6d4d534cc4814b7cb3294ca41bbfea0a6b186 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 10:55:48 2020 +0200 Removing WORLD_SIZE, part 1. Erased almost every instance of WORLD_SIZE and replaced it with a local power of two, map_size_lg (which respects certain invariants; see common/src/terrain/map.rs for more details about MapSizeLg). This also means we can avoid a dependency on the world crate from client, as desired. Now that the rest of the code is not expecting a fixed WORLD_SIZE, the next step is to arrange for maps to store their world size, and to use that world size as a basis prior to loading the map (as well, probably, as prior to configuring some of the noise functions). commit 30b1d2c6428230a9eaa0d749cdcbbd6f1cbccd78 Merge: 7d56ba31b 1377b369f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:58 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 7d56ba31b445441461b28a07fc495d7d4f047c17 Merge: 2101113b4 598f14b25 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 1377b369f6db2258e910d467a5740f31789e3ded Author: Monty Marz <m.marzouq@gmx.de> Date: Sun Jul 19 23:25:38 2020 +0200 more saturated pumpkins commit ae8d50527f93bb0616c2ad46ce4dacb63bc37c6d Author: Monty Marz <m.marzouq@gmx.de> Date: Sat Jul 18 20:29:56 2020 +0200 acacia models commit 2101113b467e691de787392d7f20f1745f5637bd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 18 18:55:25 2020 +0200 Higher detail LOD. commit add2cfae04b4385fa5590e11e2bd5229d9dee0aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 16 01:57:39 2020 +0200 Revert some irrelevant stuff. commit 2e2ab3dc1eaa59a4aef7f8d34a53d8aae4c8553a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 15 13:30:49 2020 +0200 Fixing various things about shadows. * Correcting optimal LISPSM parameter. * Figure shadows are cast when they're not visible. * Chunk shadows stay cast until you look away. * Seamless cubemaps for point lights. * Etc. commit 6c31e6b56217274285b597af297036691ea5d897 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 19:50:26 2020 +0200 Fix shadow creation. commit 6332cbe006115ae205597529cd8bbccd146c2cca Merge: be438657c 930e0028b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:47:00 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit be438657c33d7b5bfb0a9582c3ed3fd366637323 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:28:08 2020 +0200 Tweaks to shadows. Added shadow map resolution configuration, added seamless cubemaps, documented all existing rendering options, and fixed a few Clippy errors. commit 23b4058906013c7d2a40c286e20e32c5fbd897ed Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 10:11:19 2020 +0200 Fix moon, use nonlinear noise for terrain. Note that the latter has a bit of performance cost. commit 7fbe5cbfbb9dc29607957b8e62f432a4deed193d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:23:02 2020 +0200 Address lies about max texture size. commit bcfc62b5e13a1cdd83f57535fde4694720bebfd9 Merge: 75e3626a7 18a08e8fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:22:08 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 75e3626a785919f43fdcf2127c2b10e3e4df2f9f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:21:52 2020 +0200 OpenGL 3.3 minimum. commit 18a08e8fe2739f02af99a5d2cb4e7c38c49e858b Author: Monty Marz <m.marzouq@gmx.de> Date: Tue Jul 7 23:57:52 2020 +0200 settings localization commit 90c5d1ca3620092bc3ae10b2211489eb1cf6f5e8 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 21:11:48 2020 +0200 Lower near distance. commit 0e66f02b25aaddaa2dfddbbc89cd67de54a9a7b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 20:09:01 2020 +0200 All sprites sway in the wind now. commit db1401a6910bf42dcf502462c90038752ff5fbdb Merge: 69e508d8c e8b4b29d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 19:34:17 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 69e508d8c94d8973033817ca86f357e466fc7c4d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 18:41:37 2020 +0200 Make it easy to switch to SIMD for math. commit ffe0f5928c7a7e87d00cb5426b3b1d831d7e02fd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 21:21:12 2020 +0200 Fix some issues with underwater rendering. commit bfda6da42f38fd02c31ee92c81ab785a3e50c2a0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 19:17:59 2020 +0200 Fix some minor display issues. commit 0ed752e087968cf901301884aaeae698e32ef8a5 Merge: ccc6a06a8 518edcb85 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:14:21 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit ccc6a06a8d4504d6b9f7af7905a414d2ee06ab76 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:04:34 2020 +0200 Some minor changes. commit 4e020246702889269efe1a191788992164c508d6 Merge: 50a64d927 e05c9267a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 16:17:40 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 50a64d927e6c4f4b0e4688e4cbfca694bc3f922a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 13:07:03 2020 +0200 Fix far plane. commit 7dd06da34cae8f9ea3b6c889fe965181f3fd3949 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:25:35 2020 +0200 Add shadows.glsl. commit 618a18c998778bf871b905a74657440fcc384c80 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:10:22 2020 +0200 Adding shadows, greedy meshing, and more. commit eaea83fe6a5cb1cb0ba8beef888183c718258496 Merge: 267018495 2f89b863e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 22:47:07 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 2670184954a13e4a9e7a4e35ba79aac0c5fac2f7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 21:20:01 2020 +0200 Make civsim and sites deterministic. For anything in worldgen where you use a HashMap, *please* think carefully about which hasher you are going to use! This is especially true if (for some reason) you are depending on hashmap iteration order remaining stable for some aspect of worldgen. commit f8376fd5dc72b4a9c2f51a6b4570d59c8b8e9343 Merge: 654f7e049 cdee191dd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 17:53:57 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 654f7e049258d9da27c09608bbe6a46ffa8787e5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed May 20 21:22:30 2020 +0200 Correct backface culling. commit 560501df05ca725409b0f2e4eb31bdfdc15fd0c7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue May 19 17:22:06 2020 +0200 Greedy messhing for shadows. commit a4d87e1875ca543436e6bbbeb20348facc5a52d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun May 17 05:59:00 2020 +0200 Shadow maps work for lantern. commit 243d0837b8a3b08172c9a3c348d964d7ddc2a0a8 Merge: 04382dc28 71dd520cd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:53:13 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 04382dc28632b6c66e8821f6870c0daaa1c1901a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:22:17 2020 +0200 WIP: better graphics config, better LOD, shadow maps. commit 22ddbad3eb32bfa70f0932176022208fe67ded81 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 18:54:09 2020 +0200 Minor shader fixes. commit 746a10e8d01ac235f994b0cde78fa48998602a1f Merge: 0f4a0e763 40ab94673 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 04:02:09 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0f4a0e763db3afbdc4fb0558611f38326ca87151 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 23:03:24 2020 +0200 Switch back to pop-in terrain. commit dd74fa7e4a53667b38811d7aec58d7f6a68889bb Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 22:58:55 2020 +0200 LOD shading closer to voxel shading. commit ef67bd58ba0bdaf622b078892d768263b6cba268 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 28 20:49:03 2020 +0200 Experimental underwater lighting. commit 2c5ad9d07605e80d5fd5679dd3a5d70c605b86a9 Merge: 748279835 303967a6f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 22:35:24 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7482798354eda18c8207950080fc24d443a369de Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 21:59:55 2020 +0200 Replace discard in figure-frag. commit d83b4ae69be4912f69bf7835f509c68a1c7770a4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:45:57 2020 +0200 Fix sprite lighting, HDR from focus_pos. commit 0594238004f116274905fa0ed7c2b6c417ed1d29 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:14:10 2020 +0200 Proper HDR from point lights. commit 48c93d2b41ce5743103d18e76cc228f5ac766492 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 14:01:43 2020 +0200 Brighter ambiance, darker LOD shadows. commit e0452e895ccfa8a43f368cae3b8b8aedc24dad93 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 13:13:23 2020 +0200 More proper HDR. commit 4c6da3ed16cfeebb455e40da5f557b4af9a499d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 00:13:10 2020 +0200 Trying LOD noise. commit 682a3d74c85df5503ffe1fc1cc891bce789df1ad Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 23:11:08 2020 +0200 Fix LOD heights in towns. commit cc39e5734e8b18f9077bf42e66337c1319dd6b6e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 21:01:23 2020 +0200 More LOD fixes. commit 8116b21c2e51c836e77894e309ac273caf2917b3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:54:43 2020 +0200 I like this coloring. commit bc2560ea90b36f4b46190005344232d993043ac3 Merge: 14effdd5d e690efe71 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:48:33 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 14effdd5db8747fcf3eb34f03b46b7792e92d1c5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:24:35 2020 +0200 Re-saturate. commit 48a643955d4435b78179acba0beb4a979905cc31 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:23:57 2020 +0200 Various fixes. commit f7b497a0c25f4ad4682c71dd1ed6f608052feb9b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 03:22:49 2020 +0200 Render figures again. commit 44e4aad48deba8266b9f8bdfd3db096b381f5327 Merge: e6f0a5a98 9ec319a18 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 02:01:04 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit e6f0a5a981a82533ba188fff0a54ce98577bb152 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 24 16:12:20 2020 +0200 Add atmospheric scattering. commit f2953087f691a8edbc001cb98ebf5059fc6f8ac0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 23 00:01:20 2020 +0200 Fix shadowing for specular reflections. commit ddd4a67a9799b8d08c7dc0c2bec90621c2bed0e3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Apr 22 22:56:12 2020 +0200 HDR fixes. commit 1015e60deef3c447381996277df7496707a63bd0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 21 18:25:19 2020 +0200 More lighting changes. commit 80c264abd111fb237e57843efcb5c071d4f84613 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 13 00:29:59 2020 +0200 Lighting experiments. commit 8414987e589dd5102bad89762a3adaccc0bfe957 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 9 02:38:40 2020 +0200 WIP -- lighting changes and soft shadows. commit 9cd2b3fb0d6b49776c6dfe463e4169637250b11a Merge: c7ea687eb 8b149ad11 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:29 2020 +0200 Merge branch 'sharp/new-lighting' into sharp/small-fixes commit c7ea687ebbc5aace1b455f134a5bf49ce2c7434a Merge: 476441531 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:02 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 8b149ad11ad4bb75018fcf9519baec27d1c95951 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:32:39 2020 +0200 Trying out a new lighting model. commit b0ac9f36f755dd06f7c17c46150568064790864f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 07:56:11 2020 +0200 Use bicubic interpolation for terrain. commit f6fc9307a121514b614bc50ef8eb055953e7da8a Merge: 33140a295 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 05:01:41 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 4764415312aae6e9ac2d00e86e84577cb958f1ab Merge: ed2d0111d 13388ee6a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 04:54:48 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 13388ee6a42943f3f79a9cb488346cef18e272fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 20:30:08 2020 +0200 Various fixes (to coloring and to soft shadows). commit fbd084a94a067082a87cd6d28b82054709bc9265 Merge: 5a089863b 4fdf6896a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 18:50:38 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/map-colors commit ed2d0111d994262ae836d84d1fe5a45e4de72a0b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 06:49:27 2020 +0200 Combining colors and LOD. commit 88342640c6b835114d01c797b89fdede3b0a2108 Merge: 33140a295 5a089863b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:49:20 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 33140a2951b8212725f42c758b277aaec4d888f7 Merge: 4c65a5aed f34d4b379 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:36:21 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 5a089863beb01d4794bbe3580ada47b278715ea2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 03:17:49 2020 +0200 Making maps brighter. This is probably not the right way to do it, but oh well! commit 32b2c99109dd486aa922886081068f9c550c83f2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 02:46:36 2020 +0200 Horizon mapping and "layered" map generation. Horizon mapping is a method of shadow mapping specific to height maps. It can handle any angle between 0 and 90 degrees from the ground, as long as know the horizontal direction in advance, by remembering only a single angle (the "horizon angle" of the shadow map). More is explained in common/src/msg/server.rs. We also remember the approximate height of the largest occluder, to try to be able to generate soft shadows and create a vertical position where the shadows can't go higher. Additionally, map generation has been reworked. Instead of computing everything from explicit samples, we pass in sampling functions that return exactly what the map generator needs. This allows us to cleanly separate the way we sample things like altitudes and colors from the map generation process. We exploit this to generate maps *partially* on the server (with colors and rivers, but not shading). We can then send the partially completed map to the client, which can combine it with shadow information to generate the final map. This is useful for two reasons: first, it makes sure the client can apply shadow information by itself, and second, it lets us pass the unshaded map for use with level of detail functionality. For similar reasons, river generation is split out into its own layer, but for now we opt to still generate rivers on the server (since the river wire format is more complicated to compress and may require some extra work to make sure we have enough precision to draw rivers well enough for LoD). Finally, the mostly ad-hoc lighting we were performing has been (mostly) replaced with explicit Phong reflection shading (including specular highlights). Regularizing this seems useful and helps clarify the "meaning" of the various light intensities, and helps us keep a more physically plausible basis. However, its interaction with soft shadows is still imperfect, and it's not yet clear to me what we need to do to turn this into something useful for LoD. commit f8926a5737ddc51f3d585c651a64c43677aae0f4 Merge: a1aee931e 875ae6ced Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Mar 13 13:32:42 2020 +0100 Merge remote-tracking branch 'origin/master' into sharp/map-colors commit 4c65a5aed353b119aea65a2aaeb94549b67beb42 Author: Treeco <5021038-Treeco@users.noreply.gitlab.com> Date: Mon Feb 24 16:48:05 2020 +0000 Made LOD setting slider exponential commit 2fa7b2d20d7233dc8bfd64f9f7f54617575248f1 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 17:49:53 2020 +0000 Added mist to LoD commit aab059a450b5f635777129ff82cc15b662965c3c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 15:14:06 2020 +0000 Added LoD slider commit 779c36b538121c5ade3633ae5cb67bb14c8c3877 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:54:55 2020 +0000 Reduced cost of vertex pushing commit 9fea150473906b166365b738ebcea07c697daf3d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:38:53 2020 +0000 Fixed maths, improved LoD resolution commit 5481df38fea5bf183ff376a3337179cfaa5233dc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 11:22:50 2020 +0000 Dynamically relocate LoD vertices to enhance details commit a3e36a50ababd615da7db1b26158c7906a5def01 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 18:13:51 2020 +0000 Simpler terrain spiral rendering commit 255f450ae9ac8763db4bede075fb409161ed57cc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:53:17 2020 +0000 Better LoD precision commit 3d027aebe812a5b8658a4eb8123dc9f61b3776d2 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:04:03 2020 +0000 Better falloff commit be775c9484b457b2c0b1a494aec03392d0c70e76 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 15:30:45 2020 +0000 Applied good ideas from experimental branch commit 58587b68545a23c5c04ab4574a4b94b3bc982246 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 16:15:13 2020 +0000 Minor fixes to LoD merging commit 7b42aebd709c14df2db766aad61d9280ad24d84d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 15:04:44 2020 +0000 Capped LoD dragging commit 8aafc559f87124e1ea5ca6e3ddc2aa0c242d793c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:54:37 2020 +0000 Better blending between LoD and terrain border commit edd3455d5161792d87ddc8eadc0ecbad5532b284 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:40:19 2020 +0000 Fixed LoD z depth, added sea level offset commit b9b06744620114dd5556e73f64fa93c145503a7c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:27:43 2020 +0000 Better LoD smoothing commit a1aee931e790431560cd2d953ad61d9497072afd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Feb 21 14:52:17 2020 +0100 Adding shadows. commit 2400786c13dd891c131ed86d48d05df516a8a778 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 13:48:40 2020 +0000 Use world map as LoD source commit dbf650f504a4c25fbbc2096ac3616c736bf52d23 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Jan 20 00:48:14 2020 +0000 Better clouds at distance commit 5e6f81b86cdb9730b9b056877b19257075fd5fa8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Jan 19 23:59:02 2020 +0000 sync commit 745e7540ddb000cc645f612767b337c2ddc3f7c0 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 12:40:48 2019 +0000 Improved cloud falloff mist, faster noise sampling commit f6a200d0cb866196ba57697466755f9e0c7ea5d8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 10:09:00 2019 +0000 Improved long-range depth precision, removed unnecessary LoD polygons commit 63d1b2bb2292898d59fb4f4e502201103dfeb86f Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 20:57:46 2019 +0000 Working LoD shader commit f13d98ee3e58f881e8b978861a67663b59ed91ec Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 11:03:40 2019 +0000 LoD first attempt (stack overflow issue)
2020-08-20 18:34:59 +00:00
dependencies = [
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"autocfg",
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
"num-integer",
"num-traits",
]
[[package]]
name = "num-rational"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a"
dependencies = [
"autocfg",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"num-bigint 0.4.3",
(See sharp/lod-history) LOD, shadows, greedy meshing, new lighting, perf --- Pretty much a Veloren fork at this point. Here's a high level overview of the changes (will be added to CHANGELOG just before merge). At a high level this MR incorporates roughly two groups of changes. The first group consists of new game features: more flexible map sizes, level of detail terrain, shadow maps, and a new lighting engine. This is "feature work" that (mostly) only adds new things to Veloren, and mostly shouldn't affect old stuff. The second big group of changes are those addressing the fallout from all the new features. These include performance fixes of various sorts: the addition of multiple graphics options and optimization of the cheap ones to avoid work, switching all voxel models to use some variant of greedy meshing, switching over much of our CPU-side vector math to exploit SIMD instructions (coinciding with a fork of `vek`), and a rewrite of how the UI handles text rendering (coinciding with updates to our fork of `conrod`). Making Veloren's hardcoded colors appear correct under the new lighting engine also required considerably changes (TODO: Fill in this section when it's complete). The second category of changes often heavily touches code owned by other people, including frequently modified code "owned" by a handful of people, so I recommend that this code be reviewed particularly carefully. --- At a high level (each will be described in more detail below): - The world map has been refactored. - The world size is no longer hardcoded (@zesterer). - The map generation code was made generic to allow using it outside of the `world` crate (@zesterer). - On world creation, we now compute *horizon maps* (@zesterer). - The way we pass the world from the server to the client has been updated (@xMAC94x). - Artifacts related to image rotation were fixed (@imbris). - Multiflow rivers were enabled (@zesterer). - In the process of making changes related to the world map, various incidental fixes and optimizations were required. - The new *level of detail* feature was added (@zesterer wrote part of this and has checked out the rest). - A new LOD terrain rendering step was added to the pipeline. - The LOD terrain quality was made configurable via a graphics setting. - Horizon maps were used to cast shadows from LOD chunks on both LOD and non-LOD terrain. - A "voxelization" effect was incorporated into rendered LOD terrain to make it blend better into the world. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Veloren's lighting has been completely overhauled (@zesterer has already checked most of this out). - A semi-accurate index of refraction was assigned to our materials. - A new, more realistic, physically based approach to lighting was used using the *Ashikhmin Shirley* BRDF. - We emulate *atmospheric scattering* using equations designed for measuring solar panel light exposure. - We attempt to compute *realistic light attenuation* in water using its real material properties. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Point and directional lights now cast realistic shadows, using *shadow mapping.* (@imbris, @zesterer, @Treeco, @YuriMomo) - Point light shadow maps were added to the rendering pipeline, using geometry shaders and *seamless cube maps*. - Directional light shadows were added to the rendering pipeline, using LISPSM together with disabling *depth clamping*. - "Shadow-only" chunks and NPCs were added to prevent shadows from models behind you from disappearing. - In the process of making changes related to shadow maps, various incidental fixes and optimizations were required. The addition of shadow maps, LOD terrain, and the new lighting all led to significant performance degradation, on top of other changes happening in master. Therefore, a large number of performance improvements were also needed: - The graphics options were made much more flexible and configurable, and shaders were optimize. - New options were provided for how to render lights and shadows (@Pfauenauge, @zesterer). - Graphic setting storage and configuration were overhauled to make adding new features easier (@Pfauenauge, @imbris). - Shaders were rewritten to utilize GLSL's preprocessor to avoid overhead (@zesterer, @YuriMomo). - In the process of making changes related to providing additional rendering options, various incidental fixes and optimizations were required. - Voxel model creation was switched to use *greedy meshing.* - A new voxel meshing method, greedy meshing, was added (@imbris). - Uses of the older meshing methods were migrated to use greedy meshing (@imbris, @jshipsey, @Pfauenauge). - New restrictions were added to terrain, figure, and sprites to future proof them for further optimizations (@jshipsey, @Pfauenauge, @zesterer). - Most positions are now relative to either chunk or player position for better precision (@imbris, @zesterer, @scottc). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - Animation and terrain math were switched to use SIMD where possible. - Fixes were made to vek to make its SIMD feature usable for us (@zesterer, @imbris). - The interface and types used in bone animation were changed in various ways (@jshipsey, @Snowram, @Pfauenauge). - Redundant code generation for body animation is now partly taken care of by a macro (@jshipsey, @Snowram, @Pfauenauge). - Animation code was modified to to use vek's SIMD representation where possible (@jshipsey, @Snowram, @Pfauenauge). - Terrain meshing code and shadow map math were also modified to use vek's SIMD representation (@imbris). - SIMD instruction generation was enabled (@YuriMomo, @jshipsey, @Snowram, @imbris, @Angelonfira, @xMAC94x). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - The way we cache glyphs was completely refactored, fixed, and optimized. - Our fork of `conrod` was optimized in various ways (@imbris). - Our fork of `conrod` now exposes whether a widget was updated during the current frame (@imbris). - Our use of the glyph cache was rewritten for correctness (@imbris). - A *text cache* was introduced that lets us skip remeshing glyphs that have not changed (@imbris). - Various changes were made to reduce pressure on the glyph cache, with more planned (@imbris, @Pfauenauge). - In the process of making changes related to the glyph cache, various incidental fixes and optimizations were required. - Colors were changed to keep Veloren's look consistent with master. - Some older tree models were brought back (@Pfauenauge). - TODO(@Sharp): All hardcoded colors were extracted and made hotloadable. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Hardcoded colors were fixed to conform to Veloren's style. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Color models were fixed to conform to Veloren's style. A detailed description of the involved changes follows. --- - The world size is no longer hardcoded. All functions dependent on world size now take a `WorldSizeLg`, which holds the base 2 logarithm of each actual world dimension and is guaranteed to maintain certain properties (outlined in `common/src/terrain/map.rs`). Additionally, many utility functions that utilize the world size were moved into `common` as well (mostly `common/src/terrain/mod.rs`). Finally, the world map format was updated in order to store its size explicitly, with a migration path from the old format that should work whenever the old formatted map was a square (practically always). See `world/src/sim/mod.rs` for these changes. - The map generation code was made generic to allow using it outside of the `world` crate. The parts of the map generating code that do not need to query the world were moved over to `common/src/terrain/map.rs`, allowing them to be used from the client without creating a dependency on `world`. The rest of it was turned into helper functions in `world/src/sim/map.rs`, which can be passed as closures to the generic map generation code to complete its construction. This also means that colors are now passed in separately to the map generation function. See <https://veloren.net/devblog-78/> for more details. - On world creation, we now compute *horizon maps*. See the function in `world/src/sim/util.rs`. Given a height map and a plane intersecting that height map, our horizon maps allow us to encode enough information to reconstruct shadows for each point on the height map using only the *horizon angle* (the angle at which the sun starts to become visible). As Veloren's sun only covers one plane, this is sufficient for encoding sun shadows for LOD terrain, by encoding two angles per chunk (one for each 90 degrees the sun covers). We can also use this for the moon, if we want, since the moon follows the same path. Additionally, we store the *height* of the furthest occluder, to try to make the shadows volumetric; so this means 4 bytes in total for each chunk. Support for horizon maps has been merged into the map functionality in common as well. - The way we pass the world from the server to the client has been updated. Rather than passing the prerendered map, we instead pass three maps with values for each chunk; one with the color information, a second with altitude information, and a third with horizon map information. We then reconstruct the map on the client, together with some additional information we send from the server (like the sea level and maximum height). See `common/src/msg/server.rs` for a detailed description of the format of `WorldMapMsg`, and `server/src/libr.rs` and `client/src/lib.rs` for details of the map construction and parsing. - Artifacts related to image rotation were fixed. See the commit message for commit SHA `cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e` for a detailed explanation. This involved changes to shaders, the addition of a new type of graphic (also reflected in the graphic cache) that allows specifying a border color (which automatically makes the associated texture immutable), and some related fixes. I reproduce the first two paragraphs of the MR description as well: ``` Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). ``` - Multiflow rivers were enabled. This does not really need to be part of this MR, and would be easy to revert, but since it seemed to provide a nice improvement it's currently packaged with it. We already computed multiple outflows from each chunk for erosion purposes long before this MR. However, we never modified river rendering to be able to handle this case (just a single downhill river flow is complex enough!) so this was not exposed when deciding which chunks were rivers. Now that - In the process of making changes related to the world map, various incidental fixes and optimizations were required. Some examples of fixes include making sure terrain is never lowered to below sea level (to make the shadow maps report correct values), fixing map altitudes and colors to understand things like cliffs and "block level" coloring (that doesn'te xist on the column level), and fixing a crashbug when rendering images for the UI where source pixels are strongly rectangular. Some examples of related performance fixes include avoiding allocating a fresh vector for all the maps (i.e. copying it over to change the format from `[u32; n]` to `DynamicImage` and then copying again to convert to `RgbaImage`), and instead using the `gfx::memory::slice` function to accomplish the same thing. These sorts of changes are spread all arond the code. This includes the additon of a new scene, `voxygen/src/scene/lod.rs`, a new pipeline `voxygen/src/render/pipeline/lod_terrain.rs`, and new shaders `assets/vxygen/shaders/lod-terrain-vert.glsl` and `assets/vxygen/shaders/lod-terrain-frag.glsl`, as well as associated changes to the renderer in `voxygen/src/render/renderer.rs`. The main idea behind our initial approach to LOD was to take the world data we now get from the server (altitude, color, and horizon mapping). - Some previously computed values were turned into shader uniforms for better prediction on weak processors. (@zesterer) - Calls to power or trig functions were removed or replaced with multiplications, where possible. - After some deliberation - To properly handle sprite "waving" for nearby sprites, We explicitly designed the greedy meshing system with figures and sprites in mind. In both cases, we want to be able to *efficiently* pack many different models into the same texture, especially in cases where we know we will either not be removing any of the grouped-together from the models from the texture, or will remove all of them at once (so they can be packed into some specific subtexture). For sprites, since we know every model in advance and never intend to deallocate them, we currently pack them all as efficiently as possible into one giant tetxure atlas. However, in the future we might opt to pack them slightly less efficiently in exchange for shrinking the sprite vertex size. For figures, we pack all the textures for each *model* into the same atlas. is a global texture atlas used for every sprite, and for figures which is why we have the ability to mesh multiple models to the same texture area (using the simple texture atlas allocator) without requiring intermediate vector allocations. This is accomplished by delaying the time when we actually write the color and light data to the texture until *after* all the model vertices have been meshed; then, we can just allocate the whole color/light array at once, making the atlas we use an exact fit. In computer science-y terms, we accomplish this delay by, after we perform the initial greedy meshing (without texture information), not continuing to create the texture data, but instead constructing a *continuation*--that is, a function that, when called, will execute the rest of the computation. We push this continuation (which in Rust terms is a `FnOnce` closure that takes the `ColLightsInfo` that it is supposed to write to as context) onto a onto a vector resizing. To allow for suspended writes to texture data, Rust pointed out to me that the continuation that would eventually write the color and light data to the texture atlas (the one that is shared by all models sharing the same greedy mesher) would have to *own* whatever data it mshed. Because we often generate the model data to mesh as a temporary in `voxygen/src/load.rs`, the - Matrix multiplications in the shader were reduced for figure data (@zesterer). - Vertex "waves" for fluid data were removed. - Terrain "bending" near edges was removed. - Scaling was fixed to make sure empty space was not introduced in a space previously occupied by a block. It was also changed to take ownership of its voxel data, rather than sharing it, to let it be used with meshing. - Rust's nightly version was bumped in order to use the `array_map` function, which lets us reuse more code between the simple map and `FigureModelCache`. - PositionedGlyph::standalone. --- I tried to cite sources in many cases[^realtime],[^lloyd],[^lispsm],[^pbrt],[^greedy],[^tjunctions] where I needed features from elsewhere but I am particularly grateful for the following resources, esepcially where they have accompanying source code. I linked all of them that are accessible to the public (those that are not were obtained through legal means). [^realtime]: Eisemann, Elmar, Michael Schwarz, Ulf Assarsson, Michael Wimmer. Real-Time Shadows. A K Peters/CRC Press (T&F), 20160419. [^lloyd]: Lloyd,B. 2007. [Logarithmic perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). PhD thesis, University of North Carolina. [^lispsm]: Wimmer, M., Scherzer, D., and Purgathofer, W. 2004. [Light space perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). In Proceedings of Eurographics Symposium on Rendering 2004, pp. 143– 152. [^pbrt]: Pharr, Matt, et al. [http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf](Physically Based Rendering: From Theory to Implementation). Third edition, Morgan Kaufmann Publishers/Elsevier, 2017. [^greedy]: mikolalysenko. “Meshing in a Minecraft Game.” 0 FPS, 30 June 2012, <https://0fps.net/2012/06/30/meshing-in-a-minecraft-game/>. [^tjunctions]: blackflux. “Meshing in Voxel Engines – Part 1.” Blackflux.Com, 23 Feb. 2014, <https://blackflux.wordpress.com/2014/02/23/meshing-in-voxel-engines-part-1/>. I am also especially grateful to Khronos, Wikiepdia, and stackoverflow for answering many of my specific questions while writing the MR. --- Squashed commit of the following: commit 300505e7305a2fdac722a808ee8538323f215f39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 18:46:25 2020 +0200 Fixing cargo doc and typo in CHANGELOG. commit ec0aeb18e8499d7d84ef818331b4b65c3d76cea6 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 15:38:50 2020 +0200 Hopefully final commit for the LOD branch. commit 5e8ea0b1eaac02903a02feb2eb038d195de4872f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 10:14:26 2020 +0200 Falling back to power as stopgap. commit e44a1cbf46504ee9931a01bdc9033e145500d557 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 09:25:41 2020 +0200 Address imbris feedback. Temporarily disables shiny water, lowers max VD. These restrictions will be lifted soon after merging. commit 561e25778a108ac3712f5ec2ce3a51234c4430d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 08:31:13 2020 +0200 Tweaking shaders a bit. commit 7d19259078ce0dd7b3742ad7d0cb3fab3ece3fdc Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:59:43 2020 +0200 Fix view example as well. commit 051cd4934e0fad2c0b15db4380a4189fa318679f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:29:06 2020 +0200 Fix meshing benchmark. commit c95e07db3b4dcca285678985e65e31b927cb1c61 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 05:46:22 2020 +0200 Address MR feedback, fix scene clouds. commit 1bfb816cabdb3ffc1e507a009c2d98696b4b573a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:39:36 2020 +0200 Incorporating Pfau's figure color changes. New eyes and new humanoid colors. commit 3f9b89a3ac7b3356b1dba0d1a8f6541357f81469 Merge: e2f5162e4 62c53963a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:29:41 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit e2f5162e4f96f4124aa43488f7245d341b3dcfd4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:28:38 2020 +0200 World colors are all hotloadable. They live in assets/world/style/colors.ron. Only a small handful of hardcoed colors remain in World; they are either part of the map, or difficult to disentangle from the rest of the computation. Comments are made where appropriate. commit 62c53963abe1975009d34a8f9515a355bef24f31 Author: Marcel Märtens <marcel.cochem@googlemail.com> Date: Wed Aug 19 15:59:00 2020 +0200 replace pretty_env_logger with tracing commit 5b1625f99d9586fe80e2232f583ec5af9f953099 Merge: d71003acd 4942b5b39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:15:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit d71003acdabeff970b3928e97c26af6847b5b78e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:14:34 2020 +0200 Hotloading colors, part 1: colors in common. Currently, this just entails humanoid colors. There are only three colors not handled; the light emitter colors in common/src/comp/inventory/item/tool.rs. These don't seem important enough to me to warrant making hotloadable, at least not right now, but if it's needed later we can always add them to the file. commit 63b5e0e553eb2ea49276f192a6fc7dd65254270d Merge: c32b337a4 6d2c4b9c1 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 13:05:37 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c32b337a46e10d9de473d178a94a3ccd61c39bb3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:52:04 2020 +0200 Fixing LOD grid, for real. commit a166ae0360395387e09fb35a1f84210c2ce5ec24 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:28:05 2020 +0200 Addressing imbris's initial feedback. Fixes two minor bugs: explosion particles were no longer spawning randomly, and LOD grids were not perfectly even. commit 4cbad004f44060994252dd3d38647a14a589712f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:27:58 2020 +0200 Bumping nightly per request. commit 548680276aac77c25d43d16b5622f847d474dbef Merge: acc098604 8f8b20c91 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:26:06 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit acc0986040589a3492f88a740bc3c3fc693b26d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:28:32 2020 +0200 Lower resolution due to lying drivers. commit d3b878de2a52c358d2944a6bbd0555dad7fbdb10 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:15:38 2020 +0200 Fix issues msh encountered with Intel 4600. commit 10245e0c1b0cb6fae10d86409435364edc6102ef Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 21:15:02 2020 +0200 Merge more models into one mesh than we did previously. commit 3155c31e663c52ae5c3a53d5fb5665892a1a498a Merge: 7204cc8a7 3c199280e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:35:22 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7204cc8a7a4f74a30306bd205d9834fee4bb944f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:34:43 2020 +0200 Fix not yet done NPC animations. This forces them all to be the idle animation if not specified. This fixes issues where you'd have giant NPCs in water. commit bc83360f2a08918f19d417b5f772e1ff554dba08 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 19:36:37 2020 +0200 Try to fix some bugs: - Z fighting with LOD terrain and water. - Audio SFX not playing. commit 1fd104aa603bf3781b6526a5cada46aeca3049dd Merge: 862df3c99 7c2c392a3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 12:02:31 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 862df3c9976c4da9bd7cfd784f1a85973127968a Merge: 0a4218ed9 75c1d4401 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 05:52:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0a4218ed9d541a2b34c133351bea38a99ddf4ea7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 22:27:14 2020 +0200 Fix particle depth. commit f51dfdeb442d0dd5243dd2f344fa4be295bd0875 Merge: c6251a956 5e6dc0471 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:19:04 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit c6251a956ad376400dca5c23420cf8d213dc8fdf Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:15:46 2020 +0200 Cache figures more intelligently. Cache figures for longer, and don't cache character states for the player except where they actually affect the rendered model. commit 0ed801d5404982c6fb63b1eaa4567d908b294c9d Merge: c11b9bdf0 eea64f78f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 16:32:24 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c11b9bdf0a53bf9884d2f5a48fec9b01d582df1a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 11:47:15 2020 +0200 Remove unneeded Clippy annotation. commit 16aa9ef40af56d69289d00aafb3deadfb8bd4f35 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 8 00:53:02 2020 +0200 Fix hotloading and Clippy. commit 3dc973e0be5b758da1e9805eb764ad401374cd0c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 23:50:27 2020 +0200 Major speedups with SIMD. commit fba64a7d93d5a96077ce87287bbce6ab9b7fbcae Merge: 76429d00e d1e10b178 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:19 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 76429d00eea00d212fbd672a84ee91e75b19b938 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:10 2020 +0200 Add clippy.toml. commit c79f512f84dbb83cb82b7954db68ff241dfd8e41 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 11:55:20 2020 +0200 Fix all clippy issues, clean up Rust code. commit 6f90e010b3fbefb53b0d632e819931350015b6b8 Merge: 77a8c7c26 5929cfa5c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:30 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 77a8c7c267d3f44a1a62bd6b2274359973c5e4d4 Merge: b44e44232 44febaabd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:10 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 5929cfa5c713aa392110bbb62407f76caf53c3df Author: jshipsey <jshipsey18@gmail.com> Date: Thu Aug 6 20:47:27 2020 -0400 fixed in-hand arrow bug commit b44e442325d828f1cd564d66908f89d09e80474b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 6 13:40:35 2020 +0200 Miscellaneous performance improvements. commit be37acf287c1360d8085862526ac3365ffd1d768 Merge: 125d7fc6c c11876547 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 05:49:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 125d7fc6c4dcd8c8c5f27b8268a4d64f409f3644 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 04:55:31 2020 +0200 Abstract over simd vs. repr_c vectors. Also some minor improvements to Event size. commit d4d4956e9252e1241ce110b2aa85076c6b1e2a23 Merge: 5f3b7294a aced5f979 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:56:54 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 5f3b7294af1f8533edc2620b58863c248e2b07af Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:43:52 2020 +0200 Fix formatting issues I missed before. commit a428a3ebba70dcab63dd0f8cd983120c90617271 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:41:51 2020 +0200 Fix clippy warnings, part 1. There aer still a bunch of type too complex and function takes too many arguments warnings that I'll fix later (or ignore, since in the one case I did fix a function takes too many arguments warning I think it made the code *less* readable). commit ba54307540ed8a937ac08209730284fc653af85b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 30 13:22:42 2020 +0200 Fix light animations so they are removed when the light turns off. commit 7e0f4bcbf0f4717145d8beac40d52e3acebbe2aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 21:10:20 2020 +0200 Fix crash in edge case for pixel art. commit 56da06f7a351e2b949e9b014a90b974d511a0924 Merge: cf74d55f2 9f53a4a19 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:56:52 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:29:52 2020 +0200 Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). The first concern was addressed by fixing the dimensions of the map images drawn from the UI (so that we always use a square source rectangle, rather than a rectangular one according to the dimensions of the map). We also fixed the way rotation was done in the fragment shader for north-facing sources to make it properly handle aspect ratio (this was already done for north-facing targets). Together, these fix rendering issues peculiar to rectangular maps. The second and third concerns were jointly addressed by adding an optional border color to every 2D image drawn by the UI. This turns out not to waste extra space even though we hold a full f32 color (to avoid an extra dependency on gfx's PackedColor), since voxel images already take up more space than Optiion<[f32; 4]> requires. This is then implemented automatically using the "border color" wrapping method in the attached sampler. Since this is implemented in graphics hardware, it only works (at least naively) if the actual image bounds match the texture bounds. Therefore, we altered the way the graphics cache stores images with a border color to guarantee that they are always in their own texture, whose size exactly matches their extent. Since the easiest currently exposed way to set a border color is to do so for an immutable texture, we went a bit further and added a new "immutable" texture storage type used for these cases; currently, it is always and automatically used only when there is a specified border color, but in theory there's no reason we couldn't provide immutable-only images that use the default wrapping mdoe (though clamp to border is admittedly not a great default). To fix the maps case specifically, we set the border color to a translucent version of the ocean border color. This may need tweaking going forward, which shouldn't be hard. As part of this process, we had to modify graphics replacement to make sure immutable images are *removed* when invalidated, rather than just having a validity flag unset (this is normally done by the UI to try to reuse allocations in place if images are updated in benign ways, since the texture atlases used for Ui do not support deallocation; currently this is only used for item images, so there should be no overlap with immutable image replacement, so this was purely precautionary). Since we were already touching the relevant code, we also updated the image dependency to a newer version that provides more ways to avoid allocations, and made a few other changes that should hopefully eliminate redundant most of the intermediate buffer allocations we were performing for what should be zero-cost conversions. This may slightly improve performance in some cases. commit ad18ce939940a8c697270f6e9b94db9942fd8295 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 13:21:09 2020 +0200 Fix continent scale hack. commit 36b1cb074f5b195aebd7dbbc3da7f0246a1a18ec Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 12:11:40 2020 +0200 Enable loading different sized maps without a recompile. We may want to tweak the effects of the continent_scale_hack. commit 13b6d4d534cc4814b7cb3294ca41bbfea0a6b186 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 10:55:48 2020 +0200 Removing WORLD_SIZE, part 1. Erased almost every instance of WORLD_SIZE and replaced it with a local power of two, map_size_lg (which respects certain invariants; see common/src/terrain/map.rs for more details about MapSizeLg). This also means we can avoid a dependency on the world crate from client, as desired. Now that the rest of the code is not expecting a fixed WORLD_SIZE, the next step is to arrange for maps to store their world size, and to use that world size as a basis prior to loading the map (as well, probably, as prior to configuring some of the noise functions). commit 30b1d2c6428230a9eaa0d749cdcbbd6f1cbccd78 Merge: 7d56ba31b 1377b369f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:58 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 7d56ba31b445441461b28a07fc495d7d4f047c17 Merge: 2101113b4 598f14b25 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 1377b369f6db2258e910d467a5740f31789e3ded Author: Monty Marz <m.marzouq@gmx.de> Date: Sun Jul 19 23:25:38 2020 +0200 more saturated pumpkins commit ae8d50527f93bb0616c2ad46ce4dacb63bc37c6d Author: Monty Marz <m.marzouq@gmx.de> Date: Sat Jul 18 20:29:56 2020 +0200 acacia models commit 2101113b467e691de787392d7f20f1745f5637bd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 18 18:55:25 2020 +0200 Higher detail LOD. commit add2cfae04b4385fa5590e11e2bd5229d9dee0aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 16 01:57:39 2020 +0200 Revert some irrelevant stuff. commit 2e2ab3dc1eaa59a4aef7f8d34a53d8aae4c8553a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 15 13:30:49 2020 +0200 Fixing various things about shadows. * Correcting optimal LISPSM parameter. * Figure shadows are cast when they're not visible. * Chunk shadows stay cast until you look away. * Seamless cubemaps for point lights. * Etc. commit 6c31e6b56217274285b597af297036691ea5d897 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 19:50:26 2020 +0200 Fix shadow creation. commit 6332cbe006115ae205597529cd8bbccd146c2cca Merge: be438657c 930e0028b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:47:00 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit be438657c33d7b5bfb0a9582c3ed3fd366637323 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:28:08 2020 +0200 Tweaks to shadows. Added shadow map resolution configuration, added seamless cubemaps, documented all existing rendering options, and fixed a few Clippy errors. commit 23b4058906013c7d2a40c286e20e32c5fbd897ed Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 10:11:19 2020 +0200 Fix moon, use nonlinear noise for terrain. Note that the latter has a bit of performance cost. commit 7fbe5cbfbb9dc29607957b8e62f432a4deed193d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:23:02 2020 +0200 Address lies about max texture size. commit bcfc62b5e13a1cdd83f57535fde4694720bebfd9 Merge: 75e3626a7 18a08e8fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:22:08 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 75e3626a785919f43fdcf2127c2b10e3e4df2f9f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:21:52 2020 +0200 OpenGL 3.3 minimum. commit 18a08e8fe2739f02af99a5d2cb4e7c38c49e858b Author: Monty Marz <m.marzouq@gmx.de> Date: Tue Jul 7 23:57:52 2020 +0200 settings localization commit 90c5d1ca3620092bc3ae10b2211489eb1cf6f5e8 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 21:11:48 2020 +0200 Lower near distance. commit 0e66f02b25aaddaa2dfddbbc89cd67de54a9a7b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 20:09:01 2020 +0200 All sprites sway in the wind now. commit db1401a6910bf42dcf502462c90038752ff5fbdb Merge: 69e508d8c e8b4b29d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 19:34:17 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 69e508d8c94d8973033817ca86f357e466fc7c4d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 18:41:37 2020 +0200 Make it easy to switch to SIMD for math. commit ffe0f5928c7a7e87d00cb5426b3b1d831d7e02fd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 21:21:12 2020 +0200 Fix some issues with underwater rendering. commit bfda6da42f38fd02c31ee92c81ab785a3e50c2a0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 19:17:59 2020 +0200 Fix some minor display issues. commit 0ed752e087968cf901301884aaeae698e32ef8a5 Merge: ccc6a06a8 518edcb85 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:14:21 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit ccc6a06a8d4504d6b9f7af7905a414d2ee06ab76 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:04:34 2020 +0200 Some minor changes. commit 4e020246702889269efe1a191788992164c508d6 Merge: 50a64d927 e05c9267a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 16:17:40 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 50a64d927e6c4f4b0e4688e4cbfca694bc3f922a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 13:07:03 2020 +0200 Fix far plane. commit 7dd06da34cae8f9ea3b6c889fe965181f3fd3949 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:25:35 2020 +0200 Add shadows.glsl. commit 618a18c998778bf871b905a74657440fcc384c80 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:10:22 2020 +0200 Adding shadows, greedy meshing, and more. commit eaea83fe6a5cb1cb0ba8beef888183c718258496 Merge: 267018495 2f89b863e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 22:47:07 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 2670184954a13e4a9e7a4e35ba79aac0c5fac2f7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 21:20:01 2020 +0200 Make civsim and sites deterministic. For anything in worldgen where you use a HashMap, *please* think carefully about which hasher you are going to use! This is especially true if (for some reason) you are depending on hashmap iteration order remaining stable for some aspect of worldgen. commit f8376fd5dc72b4a9c2f51a6b4570d59c8b8e9343 Merge: 654f7e049 cdee191dd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 17:53:57 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 654f7e049258d9da27c09608bbe6a46ffa8787e5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed May 20 21:22:30 2020 +0200 Correct backface culling. commit 560501df05ca725409b0f2e4eb31bdfdc15fd0c7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue May 19 17:22:06 2020 +0200 Greedy messhing for shadows. commit a4d87e1875ca543436e6bbbeb20348facc5a52d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun May 17 05:59:00 2020 +0200 Shadow maps work for lantern. commit 243d0837b8a3b08172c9a3c348d964d7ddc2a0a8 Merge: 04382dc28 71dd520cd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:53:13 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 04382dc28632b6c66e8821f6870c0daaa1c1901a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:22:17 2020 +0200 WIP: better graphics config, better LOD, shadow maps. commit 22ddbad3eb32bfa70f0932176022208fe67ded81 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 18:54:09 2020 +0200 Minor shader fixes. commit 746a10e8d01ac235f994b0cde78fa48998602a1f Merge: 0f4a0e763 40ab94673 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 04:02:09 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0f4a0e763db3afbdc4fb0558611f38326ca87151 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 23:03:24 2020 +0200 Switch back to pop-in terrain. commit dd74fa7e4a53667b38811d7aec58d7f6a68889bb Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 22:58:55 2020 +0200 LOD shading closer to voxel shading. commit ef67bd58ba0bdaf622b078892d768263b6cba268 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 28 20:49:03 2020 +0200 Experimental underwater lighting. commit 2c5ad9d07605e80d5fd5679dd3a5d70c605b86a9 Merge: 748279835 303967a6f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 22:35:24 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7482798354eda18c8207950080fc24d443a369de Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 21:59:55 2020 +0200 Replace discard in figure-frag. commit d83b4ae69be4912f69bf7835f509c68a1c7770a4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:45:57 2020 +0200 Fix sprite lighting, HDR from focus_pos. commit 0594238004f116274905fa0ed7c2b6c417ed1d29 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:14:10 2020 +0200 Proper HDR from point lights. commit 48c93d2b41ce5743103d18e76cc228f5ac766492 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 14:01:43 2020 +0200 Brighter ambiance, darker LOD shadows. commit e0452e895ccfa8a43f368cae3b8b8aedc24dad93 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 13:13:23 2020 +0200 More proper HDR. commit 4c6da3ed16cfeebb455e40da5f557b4af9a499d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 00:13:10 2020 +0200 Trying LOD noise. commit 682a3d74c85df5503ffe1fc1cc891bce789df1ad Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 23:11:08 2020 +0200 Fix LOD heights in towns. commit cc39e5734e8b18f9077bf42e66337c1319dd6b6e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 21:01:23 2020 +0200 More LOD fixes. commit 8116b21c2e51c836e77894e309ac273caf2917b3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:54:43 2020 +0200 I like this coloring. commit bc2560ea90b36f4b46190005344232d993043ac3 Merge: 14effdd5d e690efe71 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:48:33 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 14effdd5db8747fcf3eb34f03b46b7792e92d1c5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:24:35 2020 +0200 Re-saturate. commit 48a643955d4435b78179acba0beb4a979905cc31 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:23:57 2020 +0200 Various fixes. commit f7b497a0c25f4ad4682c71dd1ed6f608052feb9b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 03:22:49 2020 +0200 Render figures again. commit 44e4aad48deba8266b9f8bdfd3db096b381f5327 Merge: e6f0a5a98 9ec319a18 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 02:01:04 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit e6f0a5a981a82533ba188fff0a54ce98577bb152 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 24 16:12:20 2020 +0200 Add atmospheric scattering. commit f2953087f691a8edbc001cb98ebf5059fc6f8ac0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 23 00:01:20 2020 +0200 Fix shadowing for specular reflections. commit ddd4a67a9799b8d08c7dc0c2bec90621c2bed0e3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Apr 22 22:56:12 2020 +0200 HDR fixes. commit 1015e60deef3c447381996277df7496707a63bd0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 21 18:25:19 2020 +0200 More lighting changes. commit 80c264abd111fb237e57843efcb5c071d4f84613 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 13 00:29:59 2020 +0200 Lighting experiments. commit 8414987e589dd5102bad89762a3adaccc0bfe957 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 9 02:38:40 2020 +0200 WIP -- lighting changes and soft shadows. commit 9cd2b3fb0d6b49776c6dfe463e4169637250b11a Merge: c7ea687eb 8b149ad11 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:29 2020 +0200 Merge branch 'sharp/new-lighting' into sharp/small-fixes commit c7ea687ebbc5aace1b455f134a5bf49ce2c7434a Merge: 476441531 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:02 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 8b149ad11ad4bb75018fcf9519baec27d1c95951 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:32:39 2020 +0200 Trying out a new lighting model. commit b0ac9f36f755dd06f7c17c46150568064790864f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 07:56:11 2020 +0200 Use bicubic interpolation for terrain. commit f6fc9307a121514b614bc50ef8eb055953e7da8a Merge: 33140a295 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 05:01:41 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 4764415312aae6e9ac2d00e86e84577cb958f1ab Merge: ed2d0111d 13388ee6a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 04:54:48 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 13388ee6a42943f3f79a9cb488346cef18e272fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 20:30:08 2020 +0200 Various fixes (to coloring and to soft shadows). commit fbd084a94a067082a87cd6d28b82054709bc9265 Merge: 5a089863b 4fdf6896a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 18:50:38 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/map-colors commit ed2d0111d994262ae836d84d1fe5a45e4de72a0b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 06:49:27 2020 +0200 Combining colors and LOD. commit 88342640c6b835114d01c797b89fdede3b0a2108 Merge: 33140a295 5a089863b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:49:20 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 33140a2951b8212725f42c758b277aaec4d888f7 Merge: 4c65a5aed f34d4b379 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:36:21 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 5a089863beb01d4794bbe3580ada47b278715ea2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 03:17:49 2020 +0200 Making maps brighter. This is probably not the right way to do it, but oh well! commit 32b2c99109dd486aa922886081068f9c550c83f2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 02:46:36 2020 +0200 Horizon mapping and "layered" map generation. Horizon mapping is a method of shadow mapping specific to height maps. It can handle any angle between 0 and 90 degrees from the ground, as long as know the horizontal direction in advance, by remembering only a single angle (the "horizon angle" of the shadow map). More is explained in common/src/msg/server.rs. We also remember the approximate height of the largest occluder, to try to be able to generate soft shadows and create a vertical position where the shadows can't go higher. Additionally, map generation has been reworked. Instead of computing everything from explicit samples, we pass in sampling functions that return exactly what the map generator needs. This allows us to cleanly separate the way we sample things like altitudes and colors from the map generation process. We exploit this to generate maps *partially* on the server (with colors and rivers, but not shading). We can then send the partially completed map to the client, which can combine it with shadow information to generate the final map. This is useful for two reasons: first, it makes sure the client can apply shadow information by itself, and second, it lets us pass the unshaded map for use with level of detail functionality. For similar reasons, river generation is split out into its own layer, but for now we opt to still generate rivers on the server (since the river wire format is more complicated to compress and may require some extra work to make sure we have enough precision to draw rivers well enough for LoD). Finally, the mostly ad-hoc lighting we were performing has been (mostly) replaced with explicit Phong reflection shading (including specular highlights). Regularizing this seems useful and helps clarify the "meaning" of the various light intensities, and helps us keep a more physically plausible basis. However, its interaction with soft shadows is still imperfect, and it's not yet clear to me what we need to do to turn this into something useful for LoD. commit f8926a5737ddc51f3d585c651a64c43677aae0f4 Merge: a1aee931e 875ae6ced Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Mar 13 13:32:42 2020 +0100 Merge remote-tracking branch 'origin/master' into sharp/map-colors commit 4c65a5aed353b119aea65a2aaeb94549b67beb42 Author: Treeco <5021038-Treeco@users.noreply.gitlab.com> Date: Mon Feb 24 16:48:05 2020 +0000 Made LOD setting slider exponential commit 2fa7b2d20d7233dc8bfd64f9f7f54617575248f1 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 17:49:53 2020 +0000 Added mist to LoD commit aab059a450b5f635777129ff82cc15b662965c3c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 15:14:06 2020 +0000 Added LoD slider commit 779c36b538121c5ade3633ae5cb67bb14c8c3877 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:54:55 2020 +0000 Reduced cost of vertex pushing commit 9fea150473906b166365b738ebcea07c697daf3d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:38:53 2020 +0000 Fixed maths, improved LoD resolution commit 5481df38fea5bf183ff376a3337179cfaa5233dc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 11:22:50 2020 +0000 Dynamically relocate LoD vertices to enhance details commit a3e36a50ababd615da7db1b26158c7906a5def01 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 18:13:51 2020 +0000 Simpler terrain spiral rendering commit 255f450ae9ac8763db4bede075fb409161ed57cc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:53:17 2020 +0000 Better LoD precision commit 3d027aebe812a5b8658a4eb8123dc9f61b3776d2 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:04:03 2020 +0000 Better falloff commit be775c9484b457b2c0b1a494aec03392d0c70e76 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 15:30:45 2020 +0000 Applied good ideas from experimental branch commit 58587b68545a23c5c04ab4574a4b94b3bc982246 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 16:15:13 2020 +0000 Minor fixes to LoD merging commit 7b42aebd709c14df2db766aad61d9280ad24d84d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 15:04:44 2020 +0000 Capped LoD dragging commit 8aafc559f87124e1ea5ca6e3ddc2aa0c242d793c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:54:37 2020 +0000 Better blending between LoD and terrain border commit edd3455d5161792d87ddc8eadc0ecbad5532b284 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:40:19 2020 +0000 Fixed LoD z depth, added sea level offset commit b9b06744620114dd5556e73f64fa93c145503a7c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:27:43 2020 +0000 Better LoD smoothing commit a1aee931e790431560cd2d953ad61d9497072afd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Feb 21 14:52:17 2020 +0100 Adding shadows. commit 2400786c13dd891c131ed86d48d05df516a8a778 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 13:48:40 2020 +0000 Use world map as LoD source commit dbf650f504a4c25fbbc2096ac3616c736bf52d23 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Jan 20 00:48:14 2020 +0000 Better clouds at distance commit 5e6f81b86cdb9730b9b056877b19257075fd5fa8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Jan 19 23:59:02 2020 +0000 sync commit 745e7540ddb000cc645f612767b337c2ddc3f7c0 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 12:40:48 2019 +0000 Improved cloud falloff mist, faster noise sampling commit f6a200d0cb866196ba57697466755f9e0c7ea5d8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 10:09:00 2019 +0000 Improved long-range depth precision, removed unnecessary LoD polygons commit 63d1b2bb2292898d59fb4f4e502201103dfeb86f Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 20:57:46 2019 +0000 Working LoD shader commit f13d98ee3e58f881e8b978861a67663b59ed91ec Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 11:03:40 2019 +0000 LoD first attempt (stack overflow issue)
2020-08-20 18:34:59 +00:00
"num-integer",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"num-traits",
(See sharp/lod-history) LOD, shadows, greedy meshing, new lighting, perf --- Pretty much a Veloren fork at this point. Here's a high level overview of the changes (will be added to CHANGELOG just before merge). At a high level this MR incorporates roughly two groups of changes. The first group consists of new game features: more flexible map sizes, level of detail terrain, shadow maps, and a new lighting engine. This is "feature work" that (mostly) only adds new things to Veloren, and mostly shouldn't affect old stuff. The second big group of changes are those addressing the fallout from all the new features. These include performance fixes of various sorts: the addition of multiple graphics options and optimization of the cheap ones to avoid work, switching all voxel models to use some variant of greedy meshing, switching over much of our CPU-side vector math to exploit SIMD instructions (coinciding with a fork of `vek`), and a rewrite of how the UI handles text rendering (coinciding with updates to our fork of `conrod`). Making Veloren's hardcoded colors appear correct under the new lighting engine also required considerably changes (TODO: Fill in this section when it's complete). The second category of changes often heavily touches code owned by other people, including frequently modified code "owned" by a handful of people, so I recommend that this code be reviewed particularly carefully. --- At a high level (each will be described in more detail below): - The world map has been refactored. - The world size is no longer hardcoded (@zesterer). - The map generation code was made generic to allow using it outside of the `world` crate (@zesterer). - On world creation, we now compute *horizon maps* (@zesterer). - The way we pass the world from the server to the client has been updated (@xMAC94x). - Artifacts related to image rotation were fixed (@imbris). - Multiflow rivers were enabled (@zesterer). - In the process of making changes related to the world map, various incidental fixes and optimizations were required. - The new *level of detail* feature was added (@zesterer wrote part of this and has checked out the rest). - A new LOD terrain rendering step was added to the pipeline. - The LOD terrain quality was made configurable via a graphics setting. - Horizon maps were used to cast shadows from LOD chunks on both LOD and non-LOD terrain. - A "voxelization" effect was incorporated into rendered LOD terrain to make it blend better into the world. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Veloren's lighting has been completely overhauled (@zesterer has already checked most of this out). - A semi-accurate index of refraction was assigned to our materials. - A new, more realistic, physically based approach to lighting was used using the *Ashikhmin Shirley* BRDF. - We emulate *atmospheric scattering* using equations designed for measuring solar panel light exposure. - We attempt to compute *realistic light attenuation* in water using its real material properties. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Point and directional lights now cast realistic shadows, using *shadow mapping.* (@imbris, @zesterer, @Treeco, @YuriMomo) - Point light shadow maps were added to the rendering pipeline, using geometry shaders and *seamless cube maps*. - Directional light shadows were added to the rendering pipeline, using LISPSM together with disabling *depth clamping*. - "Shadow-only" chunks and NPCs were added to prevent shadows from models behind you from disappearing. - In the process of making changes related to shadow maps, various incidental fixes and optimizations were required. The addition of shadow maps, LOD terrain, and the new lighting all led to significant performance degradation, on top of other changes happening in master. Therefore, a large number of performance improvements were also needed: - The graphics options were made much more flexible and configurable, and shaders were optimize. - New options were provided for how to render lights and shadows (@Pfauenauge, @zesterer). - Graphic setting storage and configuration were overhauled to make adding new features easier (@Pfauenauge, @imbris). - Shaders were rewritten to utilize GLSL's preprocessor to avoid overhead (@zesterer, @YuriMomo). - In the process of making changes related to providing additional rendering options, various incidental fixes and optimizations were required. - Voxel model creation was switched to use *greedy meshing.* - A new voxel meshing method, greedy meshing, was added (@imbris). - Uses of the older meshing methods were migrated to use greedy meshing (@imbris, @jshipsey, @Pfauenauge). - New restrictions were added to terrain, figure, and sprites to future proof them for further optimizations (@jshipsey, @Pfauenauge, @zesterer). - Most positions are now relative to either chunk or player position for better precision (@imbris, @zesterer, @scottc). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - Animation and terrain math were switched to use SIMD where possible. - Fixes were made to vek to make its SIMD feature usable for us (@zesterer, @imbris). - The interface and types used in bone animation were changed in various ways (@jshipsey, @Snowram, @Pfauenauge). - Redundant code generation for body animation is now partly taken care of by a macro (@jshipsey, @Snowram, @Pfauenauge). - Animation code was modified to to use vek's SIMD representation where possible (@jshipsey, @Snowram, @Pfauenauge). - Terrain meshing code and shadow map math were also modified to use vek's SIMD representation (@imbris). - SIMD instruction generation was enabled (@YuriMomo, @jshipsey, @Snowram, @imbris, @Angelonfira, @xMAC94x). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - The way we cache glyphs was completely refactored, fixed, and optimized. - Our fork of `conrod` was optimized in various ways (@imbris). - Our fork of `conrod` now exposes whether a widget was updated during the current frame (@imbris). - Our use of the glyph cache was rewritten for correctness (@imbris). - A *text cache* was introduced that lets us skip remeshing glyphs that have not changed (@imbris). - Various changes were made to reduce pressure on the glyph cache, with more planned (@imbris, @Pfauenauge). - In the process of making changes related to the glyph cache, various incidental fixes and optimizations were required. - Colors were changed to keep Veloren's look consistent with master. - Some older tree models were brought back (@Pfauenauge). - TODO(@Sharp): All hardcoded colors were extracted and made hotloadable. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Hardcoded colors were fixed to conform to Veloren's style. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Color models were fixed to conform to Veloren's style. A detailed description of the involved changes follows. --- - The world size is no longer hardcoded. All functions dependent on world size now take a `WorldSizeLg`, which holds the base 2 logarithm of each actual world dimension and is guaranteed to maintain certain properties (outlined in `common/src/terrain/map.rs`). Additionally, many utility functions that utilize the world size were moved into `common` as well (mostly `common/src/terrain/mod.rs`). Finally, the world map format was updated in order to store its size explicitly, with a migration path from the old format that should work whenever the old formatted map was a square (practically always). See `world/src/sim/mod.rs` for these changes. - The map generation code was made generic to allow using it outside of the `world` crate. The parts of the map generating code that do not need to query the world were moved over to `common/src/terrain/map.rs`, allowing them to be used from the client without creating a dependency on `world`. The rest of it was turned into helper functions in `world/src/sim/map.rs`, which can be passed as closures to the generic map generation code to complete its construction. This also means that colors are now passed in separately to the map generation function. See <https://veloren.net/devblog-78/> for more details. - On world creation, we now compute *horizon maps*. See the function in `world/src/sim/util.rs`. Given a height map and a plane intersecting that height map, our horizon maps allow us to encode enough information to reconstruct shadows for each point on the height map using only the *horizon angle* (the angle at which the sun starts to become visible). As Veloren's sun only covers one plane, this is sufficient for encoding sun shadows for LOD terrain, by encoding two angles per chunk (one for each 90 degrees the sun covers). We can also use this for the moon, if we want, since the moon follows the same path. Additionally, we store the *height* of the furthest occluder, to try to make the shadows volumetric; so this means 4 bytes in total for each chunk. Support for horizon maps has been merged into the map functionality in common as well. - The way we pass the world from the server to the client has been updated. Rather than passing the prerendered map, we instead pass three maps with values for each chunk; one with the color information, a second with altitude information, and a third with horizon map information. We then reconstruct the map on the client, together with some additional information we send from the server (like the sea level and maximum height). See `common/src/msg/server.rs` for a detailed description of the format of `WorldMapMsg`, and `server/src/libr.rs` and `client/src/lib.rs` for details of the map construction and parsing. - Artifacts related to image rotation were fixed. See the commit message for commit SHA `cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e` for a detailed explanation. This involved changes to shaders, the addition of a new type of graphic (also reflected in the graphic cache) that allows specifying a border color (which automatically makes the associated texture immutable), and some related fixes. I reproduce the first two paragraphs of the MR description as well: ``` Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). ``` - Multiflow rivers were enabled. This does not really need to be part of this MR, and would be easy to revert, but since it seemed to provide a nice improvement it's currently packaged with it. We already computed multiple outflows from each chunk for erosion purposes long before this MR. However, we never modified river rendering to be able to handle this case (just a single downhill river flow is complex enough!) so this was not exposed when deciding which chunks were rivers. Now that - In the process of making changes related to the world map, various incidental fixes and optimizations were required. Some examples of fixes include making sure terrain is never lowered to below sea level (to make the shadow maps report correct values), fixing map altitudes and colors to understand things like cliffs and "block level" coloring (that doesn'te xist on the column level), and fixing a crashbug when rendering images for the UI where source pixels are strongly rectangular. Some examples of related performance fixes include avoiding allocating a fresh vector for all the maps (i.e. copying it over to change the format from `[u32; n]` to `DynamicImage` and then copying again to convert to `RgbaImage`), and instead using the `gfx::memory::slice` function to accomplish the same thing. These sorts of changes are spread all arond the code. This includes the additon of a new scene, `voxygen/src/scene/lod.rs`, a new pipeline `voxygen/src/render/pipeline/lod_terrain.rs`, and new shaders `assets/vxygen/shaders/lod-terrain-vert.glsl` and `assets/vxygen/shaders/lod-terrain-frag.glsl`, as well as associated changes to the renderer in `voxygen/src/render/renderer.rs`. The main idea behind our initial approach to LOD was to take the world data we now get from the server (altitude, color, and horizon mapping). - Some previously computed values were turned into shader uniforms for better prediction on weak processors. (@zesterer) - Calls to power or trig functions were removed or replaced with multiplications, where possible. - After some deliberation - To properly handle sprite "waving" for nearby sprites, We explicitly designed the greedy meshing system with figures and sprites in mind. In both cases, we want to be able to *efficiently* pack many different models into the same texture, especially in cases where we know we will either not be removing any of the grouped-together from the models from the texture, or will remove all of them at once (so they can be packed into some specific subtexture). For sprites, since we know every model in advance and never intend to deallocate them, we currently pack them all as efficiently as possible into one giant tetxure atlas. However, in the future we might opt to pack them slightly less efficiently in exchange for shrinking the sprite vertex size. For figures, we pack all the textures for each *model* into the same atlas. is a global texture atlas used for every sprite, and for figures which is why we have the ability to mesh multiple models to the same texture area (using the simple texture atlas allocator) without requiring intermediate vector allocations. This is accomplished by delaying the time when we actually write the color and light data to the texture until *after* all the model vertices have been meshed; then, we can just allocate the whole color/light array at once, making the atlas we use an exact fit. In computer science-y terms, we accomplish this delay by, after we perform the initial greedy meshing (without texture information), not continuing to create the texture data, but instead constructing a *continuation*--that is, a function that, when called, will execute the rest of the computation. We push this continuation (which in Rust terms is a `FnOnce` closure that takes the `ColLightsInfo` that it is supposed to write to as context) onto a onto a vector resizing. To allow for suspended writes to texture data, Rust pointed out to me that the continuation that would eventually write the color and light data to the texture atlas (the one that is shared by all models sharing the same greedy mesher) would have to *own* whatever data it mshed. Because we often generate the model data to mesh as a temporary in `voxygen/src/load.rs`, the - Matrix multiplications in the shader were reduced for figure data (@zesterer). - Vertex "waves" for fluid data were removed. - Terrain "bending" near edges was removed. - Scaling was fixed to make sure empty space was not introduced in a space previously occupied by a block. It was also changed to take ownership of its voxel data, rather than sharing it, to let it be used with meshing. - Rust's nightly version was bumped in order to use the `array_map` function, which lets us reuse more code between the simple map and `FigureModelCache`. - PositionedGlyph::standalone. --- I tried to cite sources in many cases[^realtime],[^lloyd],[^lispsm],[^pbrt],[^greedy],[^tjunctions] where I needed features from elsewhere but I am particularly grateful for the following resources, esepcially where they have accompanying source code. I linked all of them that are accessible to the public (those that are not were obtained through legal means). [^realtime]: Eisemann, Elmar, Michael Schwarz, Ulf Assarsson, Michael Wimmer. Real-Time Shadows. A K Peters/CRC Press (T&F), 20160419. [^lloyd]: Lloyd,B. 2007. [Logarithmic perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). PhD thesis, University of North Carolina. [^lispsm]: Wimmer, M., Scherzer, D., and Purgathofer, W. 2004. [Light space perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). In Proceedings of Eurographics Symposium on Rendering 2004, pp. 143– 152. [^pbrt]: Pharr, Matt, et al. [http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf](Physically Based Rendering: From Theory to Implementation). Third edition, Morgan Kaufmann Publishers/Elsevier, 2017. [^greedy]: mikolalysenko. “Meshing in a Minecraft Game.” 0 FPS, 30 June 2012, <https://0fps.net/2012/06/30/meshing-in-a-minecraft-game/>. [^tjunctions]: blackflux. “Meshing in Voxel Engines – Part 1.” Blackflux.Com, 23 Feb. 2014, <https://blackflux.wordpress.com/2014/02/23/meshing-in-voxel-engines-part-1/>. I am also especially grateful to Khronos, Wikiepdia, and stackoverflow for answering many of my specific questions while writing the MR. --- Squashed commit of the following: commit 300505e7305a2fdac722a808ee8538323f215f39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 18:46:25 2020 +0200 Fixing cargo doc and typo in CHANGELOG. commit ec0aeb18e8499d7d84ef818331b4b65c3d76cea6 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 15:38:50 2020 +0200 Hopefully final commit for the LOD branch. commit 5e8ea0b1eaac02903a02feb2eb038d195de4872f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 10:14:26 2020 +0200 Falling back to power as stopgap. commit e44a1cbf46504ee9931a01bdc9033e145500d557 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 09:25:41 2020 +0200 Address imbris feedback. Temporarily disables shiny water, lowers max VD. These restrictions will be lifted soon after merging. commit 561e25778a108ac3712f5ec2ce3a51234c4430d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 08:31:13 2020 +0200 Tweaking shaders a bit. commit 7d19259078ce0dd7b3742ad7d0cb3fab3ece3fdc Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:59:43 2020 +0200 Fix view example as well. commit 051cd4934e0fad2c0b15db4380a4189fa318679f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:29:06 2020 +0200 Fix meshing benchmark. commit c95e07db3b4dcca285678985e65e31b927cb1c61 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 05:46:22 2020 +0200 Address MR feedback, fix scene clouds. commit 1bfb816cabdb3ffc1e507a009c2d98696b4b573a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:39:36 2020 +0200 Incorporating Pfau's figure color changes. New eyes and new humanoid colors. commit 3f9b89a3ac7b3356b1dba0d1a8f6541357f81469 Merge: e2f5162e4 62c53963a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:29:41 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit e2f5162e4f96f4124aa43488f7245d341b3dcfd4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:28:38 2020 +0200 World colors are all hotloadable. They live in assets/world/style/colors.ron. Only a small handful of hardcoed colors remain in World; they are either part of the map, or difficult to disentangle from the rest of the computation. Comments are made where appropriate. commit 62c53963abe1975009d34a8f9515a355bef24f31 Author: Marcel Märtens <marcel.cochem@googlemail.com> Date: Wed Aug 19 15:59:00 2020 +0200 replace pretty_env_logger with tracing commit 5b1625f99d9586fe80e2232f583ec5af9f953099 Merge: d71003acd 4942b5b39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:15:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit d71003acdabeff970b3928e97c26af6847b5b78e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:14:34 2020 +0200 Hotloading colors, part 1: colors in common. Currently, this just entails humanoid colors. There are only three colors not handled; the light emitter colors in common/src/comp/inventory/item/tool.rs. These don't seem important enough to me to warrant making hotloadable, at least not right now, but if it's needed later we can always add them to the file. commit 63b5e0e553eb2ea49276f192a6fc7dd65254270d Merge: c32b337a4 6d2c4b9c1 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 13:05:37 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c32b337a46e10d9de473d178a94a3ccd61c39bb3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:52:04 2020 +0200 Fixing LOD grid, for real. commit a166ae0360395387e09fb35a1f84210c2ce5ec24 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:28:05 2020 +0200 Addressing imbris's initial feedback. Fixes two minor bugs: explosion particles were no longer spawning randomly, and LOD grids were not perfectly even. commit 4cbad004f44060994252dd3d38647a14a589712f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:27:58 2020 +0200 Bumping nightly per request. commit 548680276aac77c25d43d16b5622f847d474dbef Merge: acc098604 8f8b20c91 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:26:06 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit acc0986040589a3492f88a740bc3c3fc693b26d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:28:32 2020 +0200 Lower resolution due to lying drivers. commit d3b878de2a52c358d2944a6bbd0555dad7fbdb10 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:15:38 2020 +0200 Fix issues msh encountered with Intel 4600. commit 10245e0c1b0cb6fae10d86409435364edc6102ef Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 21:15:02 2020 +0200 Merge more models into one mesh than we did previously. commit 3155c31e663c52ae5c3a53d5fb5665892a1a498a Merge: 7204cc8a7 3c199280e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:35:22 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7204cc8a7a4f74a30306bd205d9834fee4bb944f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:34:43 2020 +0200 Fix not yet done NPC animations. This forces them all to be the idle animation if not specified. This fixes issues where you'd have giant NPCs in water. commit bc83360f2a08918f19d417b5f772e1ff554dba08 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 19:36:37 2020 +0200 Try to fix some bugs: - Z fighting with LOD terrain and water. - Audio SFX not playing. commit 1fd104aa603bf3781b6526a5cada46aeca3049dd Merge: 862df3c99 7c2c392a3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 12:02:31 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 862df3c9976c4da9bd7cfd784f1a85973127968a Merge: 0a4218ed9 75c1d4401 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 05:52:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0a4218ed9d541a2b34c133351bea38a99ddf4ea7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 22:27:14 2020 +0200 Fix particle depth. commit f51dfdeb442d0dd5243dd2f344fa4be295bd0875 Merge: c6251a956 5e6dc0471 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:19:04 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit c6251a956ad376400dca5c23420cf8d213dc8fdf Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:15:46 2020 +0200 Cache figures more intelligently. Cache figures for longer, and don't cache character states for the player except where they actually affect the rendered model. commit 0ed801d5404982c6fb63b1eaa4567d908b294c9d Merge: c11b9bdf0 eea64f78f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 16:32:24 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c11b9bdf0a53bf9884d2f5a48fec9b01d582df1a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 11:47:15 2020 +0200 Remove unneeded Clippy annotation. commit 16aa9ef40af56d69289d00aafb3deadfb8bd4f35 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 8 00:53:02 2020 +0200 Fix hotloading and Clippy. commit 3dc973e0be5b758da1e9805eb764ad401374cd0c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 23:50:27 2020 +0200 Major speedups with SIMD. commit fba64a7d93d5a96077ce87287bbce6ab9b7fbcae Merge: 76429d00e d1e10b178 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:19 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 76429d00eea00d212fbd672a84ee91e75b19b938 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:10 2020 +0200 Add clippy.toml. commit c79f512f84dbb83cb82b7954db68ff241dfd8e41 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 11:55:20 2020 +0200 Fix all clippy issues, clean up Rust code. commit 6f90e010b3fbefb53b0d632e819931350015b6b8 Merge: 77a8c7c26 5929cfa5c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:30 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 77a8c7c267d3f44a1a62bd6b2274359973c5e4d4 Merge: b44e44232 44febaabd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:10 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 5929cfa5c713aa392110bbb62407f76caf53c3df Author: jshipsey <jshipsey18@gmail.com> Date: Thu Aug 6 20:47:27 2020 -0400 fixed in-hand arrow bug commit b44e442325d828f1cd564d66908f89d09e80474b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 6 13:40:35 2020 +0200 Miscellaneous performance improvements. commit be37acf287c1360d8085862526ac3365ffd1d768 Merge: 125d7fc6c c11876547 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 05:49:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 125d7fc6c4dcd8c8c5f27b8268a4d64f409f3644 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 04:55:31 2020 +0200 Abstract over simd vs. repr_c vectors. Also some minor improvements to Event size. commit d4d4956e9252e1241ce110b2aa85076c6b1e2a23 Merge: 5f3b7294a aced5f979 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:56:54 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 5f3b7294af1f8533edc2620b58863c248e2b07af Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:43:52 2020 +0200 Fix formatting issues I missed before. commit a428a3ebba70dcab63dd0f8cd983120c90617271 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:41:51 2020 +0200 Fix clippy warnings, part 1. There aer still a bunch of type too complex and function takes too many arguments warnings that I'll fix later (or ignore, since in the one case I did fix a function takes too many arguments warning I think it made the code *less* readable). commit ba54307540ed8a937ac08209730284fc653af85b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 30 13:22:42 2020 +0200 Fix light animations so they are removed when the light turns off. commit 7e0f4bcbf0f4717145d8beac40d52e3acebbe2aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 21:10:20 2020 +0200 Fix crash in edge case for pixel art. commit 56da06f7a351e2b949e9b014a90b974d511a0924 Merge: cf74d55f2 9f53a4a19 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:56:52 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:29:52 2020 +0200 Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). The first concern was addressed by fixing the dimensions of the map images drawn from the UI (so that we always use a square source rectangle, rather than a rectangular one according to the dimensions of the map). We also fixed the way rotation was done in the fragment shader for north-facing sources to make it properly handle aspect ratio (this was already done for north-facing targets). Together, these fix rendering issues peculiar to rectangular maps. The second and third concerns were jointly addressed by adding an optional border color to every 2D image drawn by the UI. This turns out not to waste extra space even though we hold a full f32 color (to avoid an extra dependency on gfx's PackedColor), since voxel images already take up more space than Optiion<[f32; 4]> requires. This is then implemented automatically using the "border color" wrapping method in the attached sampler. Since this is implemented in graphics hardware, it only works (at least naively) if the actual image bounds match the texture bounds. Therefore, we altered the way the graphics cache stores images with a border color to guarantee that they are always in their own texture, whose size exactly matches their extent. Since the easiest currently exposed way to set a border color is to do so for an immutable texture, we went a bit further and added a new "immutable" texture storage type used for these cases; currently, it is always and automatically used only when there is a specified border color, but in theory there's no reason we couldn't provide immutable-only images that use the default wrapping mdoe (though clamp to border is admittedly not a great default). To fix the maps case specifically, we set the border color to a translucent version of the ocean border color. This may need tweaking going forward, which shouldn't be hard. As part of this process, we had to modify graphics replacement to make sure immutable images are *removed* when invalidated, rather than just having a validity flag unset (this is normally done by the UI to try to reuse allocations in place if images are updated in benign ways, since the texture atlases used for Ui do not support deallocation; currently this is only used for item images, so there should be no overlap with immutable image replacement, so this was purely precautionary). Since we were already touching the relevant code, we also updated the image dependency to a newer version that provides more ways to avoid allocations, and made a few other changes that should hopefully eliminate redundant most of the intermediate buffer allocations we were performing for what should be zero-cost conversions. This may slightly improve performance in some cases. commit ad18ce939940a8c697270f6e9b94db9942fd8295 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 13:21:09 2020 +0200 Fix continent scale hack. commit 36b1cb074f5b195aebd7dbbc3da7f0246a1a18ec Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 12:11:40 2020 +0200 Enable loading different sized maps without a recompile. We may want to tweak the effects of the continent_scale_hack. commit 13b6d4d534cc4814b7cb3294ca41bbfea0a6b186 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 10:55:48 2020 +0200 Removing WORLD_SIZE, part 1. Erased almost every instance of WORLD_SIZE and replaced it with a local power of two, map_size_lg (which respects certain invariants; see common/src/terrain/map.rs for more details about MapSizeLg). This also means we can avoid a dependency on the world crate from client, as desired. Now that the rest of the code is not expecting a fixed WORLD_SIZE, the next step is to arrange for maps to store their world size, and to use that world size as a basis prior to loading the map (as well, probably, as prior to configuring some of the noise functions). commit 30b1d2c6428230a9eaa0d749cdcbbd6f1cbccd78 Merge: 7d56ba31b 1377b369f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:58 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 7d56ba31b445441461b28a07fc495d7d4f047c17 Merge: 2101113b4 598f14b25 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 1377b369f6db2258e910d467a5740f31789e3ded Author: Monty Marz <m.marzouq@gmx.de> Date: Sun Jul 19 23:25:38 2020 +0200 more saturated pumpkins commit ae8d50527f93bb0616c2ad46ce4dacb63bc37c6d Author: Monty Marz <m.marzouq@gmx.de> Date: Sat Jul 18 20:29:56 2020 +0200 acacia models commit 2101113b467e691de787392d7f20f1745f5637bd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 18 18:55:25 2020 +0200 Higher detail LOD. commit add2cfae04b4385fa5590e11e2bd5229d9dee0aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 16 01:57:39 2020 +0200 Revert some irrelevant stuff. commit 2e2ab3dc1eaa59a4aef7f8d34a53d8aae4c8553a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 15 13:30:49 2020 +0200 Fixing various things about shadows. * Correcting optimal LISPSM parameter. * Figure shadows are cast when they're not visible. * Chunk shadows stay cast until you look away. * Seamless cubemaps for point lights. * Etc. commit 6c31e6b56217274285b597af297036691ea5d897 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 19:50:26 2020 +0200 Fix shadow creation. commit 6332cbe006115ae205597529cd8bbccd146c2cca Merge: be438657c 930e0028b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:47:00 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit be438657c33d7b5bfb0a9582c3ed3fd366637323 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:28:08 2020 +0200 Tweaks to shadows. Added shadow map resolution configuration, added seamless cubemaps, documented all existing rendering options, and fixed a few Clippy errors. commit 23b4058906013c7d2a40c286e20e32c5fbd897ed Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 10:11:19 2020 +0200 Fix moon, use nonlinear noise for terrain. Note that the latter has a bit of performance cost. commit 7fbe5cbfbb9dc29607957b8e62f432a4deed193d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:23:02 2020 +0200 Address lies about max texture size. commit bcfc62b5e13a1cdd83f57535fde4694720bebfd9 Merge: 75e3626a7 18a08e8fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:22:08 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 75e3626a785919f43fdcf2127c2b10e3e4df2f9f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:21:52 2020 +0200 OpenGL 3.3 minimum. commit 18a08e8fe2739f02af99a5d2cb4e7c38c49e858b Author: Monty Marz <m.marzouq@gmx.de> Date: Tue Jul 7 23:57:52 2020 +0200 settings localization commit 90c5d1ca3620092bc3ae10b2211489eb1cf6f5e8 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 21:11:48 2020 +0200 Lower near distance. commit 0e66f02b25aaddaa2dfddbbc89cd67de54a9a7b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 20:09:01 2020 +0200 All sprites sway in the wind now. commit db1401a6910bf42dcf502462c90038752ff5fbdb Merge: 69e508d8c e8b4b29d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 19:34:17 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 69e508d8c94d8973033817ca86f357e466fc7c4d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 18:41:37 2020 +0200 Make it easy to switch to SIMD for math. commit ffe0f5928c7a7e87d00cb5426b3b1d831d7e02fd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 21:21:12 2020 +0200 Fix some issues with underwater rendering. commit bfda6da42f38fd02c31ee92c81ab785a3e50c2a0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 19:17:59 2020 +0200 Fix some minor display issues. commit 0ed752e087968cf901301884aaeae698e32ef8a5 Merge: ccc6a06a8 518edcb85 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:14:21 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit ccc6a06a8d4504d6b9f7af7905a414d2ee06ab76 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:04:34 2020 +0200 Some minor changes. commit 4e020246702889269efe1a191788992164c508d6 Merge: 50a64d927 e05c9267a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 16:17:40 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 50a64d927e6c4f4b0e4688e4cbfca694bc3f922a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 13:07:03 2020 +0200 Fix far plane. commit 7dd06da34cae8f9ea3b6c889fe965181f3fd3949 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:25:35 2020 +0200 Add shadows.glsl. commit 618a18c998778bf871b905a74657440fcc384c80 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:10:22 2020 +0200 Adding shadows, greedy meshing, and more. commit eaea83fe6a5cb1cb0ba8beef888183c718258496 Merge: 267018495 2f89b863e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 22:47:07 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 2670184954a13e4a9e7a4e35ba79aac0c5fac2f7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 21:20:01 2020 +0200 Make civsim and sites deterministic. For anything in worldgen where you use a HashMap, *please* think carefully about which hasher you are going to use! This is especially true if (for some reason) you are depending on hashmap iteration order remaining stable for some aspect of worldgen. commit f8376fd5dc72b4a9c2f51a6b4570d59c8b8e9343 Merge: 654f7e049 cdee191dd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 17:53:57 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 654f7e049258d9da27c09608bbe6a46ffa8787e5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed May 20 21:22:30 2020 +0200 Correct backface culling. commit 560501df05ca725409b0f2e4eb31bdfdc15fd0c7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue May 19 17:22:06 2020 +0200 Greedy messhing for shadows. commit a4d87e1875ca543436e6bbbeb20348facc5a52d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun May 17 05:59:00 2020 +0200 Shadow maps work for lantern. commit 243d0837b8a3b08172c9a3c348d964d7ddc2a0a8 Merge: 04382dc28 71dd520cd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:53:13 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 04382dc28632b6c66e8821f6870c0daaa1c1901a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:22:17 2020 +0200 WIP: better graphics config, better LOD, shadow maps. commit 22ddbad3eb32bfa70f0932176022208fe67ded81 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 18:54:09 2020 +0200 Minor shader fixes. commit 746a10e8d01ac235f994b0cde78fa48998602a1f Merge: 0f4a0e763 40ab94673 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 04:02:09 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0f4a0e763db3afbdc4fb0558611f38326ca87151 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 23:03:24 2020 +0200 Switch back to pop-in terrain. commit dd74fa7e4a53667b38811d7aec58d7f6a68889bb Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 22:58:55 2020 +0200 LOD shading closer to voxel shading. commit ef67bd58ba0bdaf622b078892d768263b6cba268 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 28 20:49:03 2020 +0200 Experimental underwater lighting. commit 2c5ad9d07605e80d5fd5679dd3a5d70c605b86a9 Merge: 748279835 303967a6f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 22:35:24 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7482798354eda18c8207950080fc24d443a369de Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 21:59:55 2020 +0200 Replace discard in figure-frag. commit d83b4ae69be4912f69bf7835f509c68a1c7770a4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:45:57 2020 +0200 Fix sprite lighting, HDR from focus_pos. commit 0594238004f116274905fa0ed7c2b6c417ed1d29 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:14:10 2020 +0200 Proper HDR from point lights. commit 48c93d2b41ce5743103d18e76cc228f5ac766492 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 14:01:43 2020 +0200 Brighter ambiance, darker LOD shadows. commit e0452e895ccfa8a43f368cae3b8b8aedc24dad93 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 13:13:23 2020 +0200 More proper HDR. commit 4c6da3ed16cfeebb455e40da5f557b4af9a499d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 00:13:10 2020 +0200 Trying LOD noise. commit 682a3d74c85df5503ffe1fc1cc891bce789df1ad Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 23:11:08 2020 +0200 Fix LOD heights in towns. commit cc39e5734e8b18f9077bf42e66337c1319dd6b6e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 21:01:23 2020 +0200 More LOD fixes. commit 8116b21c2e51c836e77894e309ac273caf2917b3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:54:43 2020 +0200 I like this coloring. commit bc2560ea90b36f4b46190005344232d993043ac3 Merge: 14effdd5d e690efe71 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:48:33 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 14effdd5db8747fcf3eb34f03b46b7792e92d1c5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:24:35 2020 +0200 Re-saturate. commit 48a643955d4435b78179acba0beb4a979905cc31 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:23:57 2020 +0200 Various fixes. commit f7b497a0c25f4ad4682c71dd1ed6f608052feb9b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 03:22:49 2020 +0200 Render figures again. commit 44e4aad48deba8266b9f8bdfd3db096b381f5327 Merge: e6f0a5a98 9ec319a18 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 02:01:04 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit e6f0a5a981a82533ba188fff0a54ce98577bb152 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 24 16:12:20 2020 +0200 Add atmospheric scattering. commit f2953087f691a8edbc001cb98ebf5059fc6f8ac0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 23 00:01:20 2020 +0200 Fix shadowing for specular reflections. commit ddd4a67a9799b8d08c7dc0c2bec90621c2bed0e3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Apr 22 22:56:12 2020 +0200 HDR fixes. commit 1015e60deef3c447381996277df7496707a63bd0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 21 18:25:19 2020 +0200 More lighting changes. commit 80c264abd111fb237e57843efcb5c071d4f84613 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 13 00:29:59 2020 +0200 Lighting experiments. commit 8414987e589dd5102bad89762a3adaccc0bfe957 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 9 02:38:40 2020 +0200 WIP -- lighting changes and soft shadows. commit 9cd2b3fb0d6b49776c6dfe463e4169637250b11a Merge: c7ea687eb 8b149ad11 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:29 2020 +0200 Merge branch 'sharp/new-lighting' into sharp/small-fixes commit c7ea687ebbc5aace1b455f134a5bf49ce2c7434a Merge: 476441531 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:02 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 8b149ad11ad4bb75018fcf9519baec27d1c95951 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:32:39 2020 +0200 Trying out a new lighting model. commit b0ac9f36f755dd06f7c17c46150568064790864f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 07:56:11 2020 +0200 Use bicubic interpolation for terrain. commit f6fc9307a121514b614bc50ef8eb055953e7da8a Merge: 33140a295 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 05:01:41 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 4764415312aae6e9ac2d00e86e84577cb958f1ab Merge: ed2d0111d 13388ee6a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 04:54:48 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 13388ee6a42943f3f79a9cb488346cef18e272fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 20:30:08 2020 +0200 Various fixes (to coloring and to soft shadows). commit fbd084a94a067082a87cd6d28b82054709bc9265 Merge: 5a089863b 4fdf6896a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 18:50:38 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/map-colors commit ed2d0111d994262ae836d84d1fe5a45e4de72a0b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 06:49:27 2020 +0200 Combining colors and LOD. commit 88342640c6b835114d01c797b89fdede3b0a2108 Merge: 33140a295 5a089863b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:49:20 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 33140a2951b8212725f42c758b277aaec4d888f7 Merge: 4c65a5aed f34d4b379 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:36:21 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 5a089863beb01d4794bbe3580ada47b278715ea2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 03:17:49 2020 +0200 Making maps brighter. This is probably not the right way to do it, but oh well! commit 32b2c99109dd486aa922886081068f9c550c83f2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 02:46:36 2020 +0200 Horizon mapping and "layered" map generation. Horizon mapping is a method of shadow mapping specific to height maps. It can handle any angle between 0 and 90 degrees from the ground, as long as know the horizontal direction in advance, by remembering only a single angle (the "horizon angle" of the shadow map). More is explained in common/src/msg/server.rs. We also remember the approximate height of the largest occluder, to try to be able to generate soft shadows and create a vertical position where the shadows can't go higher. Additionally, map generation has been reworked. Instead of computing everything from explicit samples, we pass in sampling functions that return exactly what the map generator needs. This allows us to cleanly separate the way we sample things like altitudes and colors from the map generation process. We exploit this to generate maps *partially* on the server (with colors and rivers, but not shading). We can then send the partially completed map to the client, which can combine it with shadow information to generate the final map. This is useful for two reasons: first, it makes sure the client can apply shadow information by itself, and second, it lets us pass the unshaded map for use with level of detail functionality. For similar reasons, river generation is split out into its own layer, but for now we opt to still generate rivers on the server (since the river wire format is more complicated to compress and may require some extra work to make sure we have enough precision to draw rivers well enough for LoD). Finally, the mostly ad-hoc lighting we were performing has been (mostly) replaced with explicit Phong reflection shading (including specular highlights). Regularizing this seems useful and helps clarify the "meaning" of the various light intensities, and helps us keep a more physically plausible basis. However, its interaction with soft shadows is still imperfect, and it's not yet clear to me what we need to do to turn this into something useful for LoD. commit f8926a5737ddc51f3d585c651a64c43677aae0f4 Merge: a1aee931e 875ae6ced Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Mar 13 13:32:42 2020 +0100 Merge remote-tracking branch 'origin/master' into sharp/map-colors commit 4c65a5aed353b119aea65a2aaeb94549b67beb42 Author: Treeco <5021038-Treeco@users.noreply.gitlab.com> Date: Mon Feb 24 16:48:05 2020 +0000 Made LOD setting slider exponential commit 2fa7b2d20d7233dc8bfd64f9f7f54617575248f1 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 17:49:53 2020 +0000 Added mist to LoD commit aab059a450b5f635777129ff82cc15b662965c3c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 15:14:06 2020 +0000 Added LoD slider commit 779c36b538121c5ade3633ae5cb67bb14c8c3877 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:54:55 2020 +0000 Reduced cost of vertex pushing commit 9fea150473906b166365b738ebcea07c697daf3d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:38:53 2020 +0000 Fixed maths, improved LoD resolution commit 5481df38fea5bf183ff376a3337179cfaa5233dc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 11:22:50 2020 +0000 Dynamically relocate LoD vertices to enhance details commit a3e36a50ababd615da7db1b26158c7906a5def01 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 18:13:51 2020 +0000 Simpler terrain spiral rendering commit 255f450ae9ac8763db4bede075fb409161ed57cc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:53:17 2020 +0000 Better LoD precision commit 3d027aebe812a5b8658a4eb8123dc9f61b3776d2 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:04:03 2020 +0000 Better falloff commit be775c9484b457b2c0b1a494aec03392d0c70e76 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 15:30:45 2020 +0000 Applied good ideas from experimental branch commit 58587b68545a23c5c04ab4574a4b94b3bc982246 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 16:15:13 2020 +0000 Minor fixes to LoD merging commit 7b42aebd709c14df2db766aad61d9280ad24d84d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 15:04:44 2020 +0000 Capped LoD dragging commit 8aafc559f87124e1ea5ca6e3ddc2aa0c242d793c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:54:37 2020 +0000 Better blending between LoD and terrain border commit edd3455d5161792d87ddc8eadc0ecbad5532b284 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:40:19 2020 +0000 Fixed LoD z depth, added sea level offset commit b9b06744620114dd5556e73f64fa93c145503a7c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:27:43 2020 +0000 Better LoD smoothing commit a1aee931e790431560cd2d953ad61d9497072afd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Feb 21 14:52:17 2020 +0100 Adding shadows. commit 2400786c13dd891c131ed86d48d05df516a8a778 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 13:48:40 2020 +0000 Use world map as LoD source commit dbf650f504a4c25fbbc2096ac3616c736bf52d23 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Jan 20 00:48:14 2020 +0000 Better clouds at distance commit 5e6f81b86cdb9730b9b056877b19257075fd5fa8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Jan 19 23:59:02 2020 +0000 sync commit 745e7540ddb000cc645f612767b337c2ddc3f7c0 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 12:40:48 2019 +0000 Improved cloud falloff mist, faster noise sampling commit f6a200d0cb866196ba57697466755f9e0c7ea5d8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 10:09:00 2019 +0000 Improved long-range depth precision, removed unnecessary LoD polygons commit 63d1b2bb2292898d59fb4f4e502201103dfeb86f Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 20:57:46 2019 +0000 Working LoD shader commit f13d98ee3e58f881e8b978861a67663b59ed91ec Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 11:03:40 2019 +0000 LoD first attempt (stack overflow issue)
2020-08-20 18:34:59 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "num-traits"
update further crates
2020-12-16 00:07:39 +00:00
version = "0.2.14"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update further crates
2020-12-16 00:07:39 +00:00
checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
upgrade dependencies
2019-06-29 15:25:58 +00:00
dependencies = [
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"autocfg",
Add CustomPath to Travel enum Defines a custom path to follow, instead of using one from the World. Airships use this to slightly adjust their course to reduce collisions.
2021-04-04 10:55:15 +00:00
"libm 0.2.1",
upgrade dependencies
2019-06-29 15:25:58 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "num_cpus"
fix workspaces and Cargo dependencies
2020-05-27 16:20:16 +00:00
version = "1.13.0"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
fix workspaces and Cargo dependencies
2020-05-27 16:20:16 +00:00
checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"hermit-abi",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
update dependencies
2021-03-21 21:53:44 +00:00
[[package]]
name = "num_enum"
update crates
2021-09-20 10:05:41 +00:00
version = "0.5.4"
update dependencies
2021-03-21 21:53:44 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "3f9bd055fb730c4f8f4f57d45d35cd6b3f0980535b056dc7ff119cee6a66ed6f"
update dependencies
2021-03-21 21:53:44 +00:00
dependencies = [
"derivative",
Upgrade to winit 0.25
2021-06-15 08:01:57 +00:00
"num_enum_derive",
update dependencies
2021-03-21 21:53:44 +00:00
]
[[package]]
name = "num_enum_derive"
update crates
2021-09-20 10:05:41 +00:00
version = "0.5.4"
update dependencies
2021-03-21 21:53:44 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "486ea01961c4a818096de679a8b740b26d9033146ac5291b1c98557658f8cdd9"
update dependencies
2021-03-21 21:53:44 +00:00
dependencies = [
update crates
2021-09-20 10:05:41 +00:00
"proc-macro-crate 1.1.0",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"proc-macro2 1.0.32",
"quote 1.0.10",
"syn 1.0.81",
Winit 0.22 released
2020-03-13 04:05:06 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "objc"
change(log): switch to fern
2019-10-08 15:42:13 +00:00
version = "0.2.7"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"malloc_buf",
Started the report of wgpu
2020-08-21 19:10:56 +00:00
"objc_exception",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
WIP (testing) Update conrod_core This is a `cargo update -p conrod_core` to bring in updates to `veloren/conrod/conrod_core` to add support for copy and paste. Ref: veloren/conrod!2 Fixes #171
2019-10-19 06:12:37 +00:00
[[package]]
name = "objc-foundation"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
WIP (testing) Update conrod_core This is a `cargo update -p conrod_core` to bring in updates to `veloren/conrod/conrod_core` to add support for copy and paste. Ref: veloren/conrod!2 Fixes #171
2019-10-19 06:12:37 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"block",
"objc",
"objc_id",
WIP (testing) Update conrod_core This is a `cargo update -p conrod_core` to bring in updates to `veloren/conrod/conrod_core` to add support for copy and paste. Ref: veloren/conrod!2 Fixes #171
2019-10-19 06:12:37 +00:00
]
Started the report of wgpu
2020-08-21 19:10:56 +00:00
[[package]]
name = "objc_exception"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4"
dependencies = [
"cc",
]
WIP (testing) Update conrod_core This is a `cargo update -p conrod_core` to bring in updates to `veloren/conrod/conrod_core` to add support for copy and paste. Ref: veloren/conrod!2 Fixes #171
2019-10-19 06:12:37 +00:00
[[package]]
name = "objc_id"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b"
WIP (testing) Update conrod_core This is a `cargo update -p conrod_core` to bring in updates to `veloren/conrod/conrod_core` to add support for copy and paste. Ref: veloren/conrod!2 Fixes #171
2019-10-19 06:12:37 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"objc",
WIP (testing) Update conrod_core This is a `cargo update -p conrod_core` to bring in updates to `veloren/conrod/conrod_core` to add support for copy and paste. Ref: veloren/conrod!2 Fixes #171
2019-10-19 06:12:37 +00:00
]
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
[[package]]
name = "object"
update depednencies
2021-07-08 10:21:02 +00:00
version = "0.25.3"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update depednencies
2021-07-08 10:21:02 +00:00
checksum = "a38f2be3697a57b4060074ff41b44c16870d916ad7877c17696e063257482bc7"
update dependencies
2021-06-04 07:44:30 +00:00
dependencies = [
Update wasmer
2021-07-10 13:02:20 +00:00
"crc32fast",
"indexmap",
update dependencies
2021-06-04 07:44:30 +00:00
"memchr",
]
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
update crates
2021-09-20 10:05:41 +00:00
[[package]]
name = "object"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.27.1"
update crates
2021-09-20 10:05:41 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9"
update crates
2021-09-20 10:05:41 +00:00
dependencies = [
"memchr",
]
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
[[package]]
name = "oboe"
update crates
2021-09-20 10:05:41 +00:00
version = "0.4.4"
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "e15e22bc67e047fe342a32ecba55f555e3be6166b04dd157cd0f803dfa9f48e1"
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
dependencies = [
update dependencies
2021-03-21 21:53:44 +00:00
"jni",
update crates
2021-09-20 10:05:41 +00:00
"ndk 0.4.0",
"ndk-glue 0.4.0",
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
"num-derive",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"num-traits",
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
"oboe-sys",
]
[[package]]
name = "oboe-sys"
update crates
2021-09-20 10:05:41 +00:00
version = "0.4.4"
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "338142ae5ab0aaedc8275aa8f67f460e43ae0fca76a695a742d56da0a269eadc"
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
dependencies = [
update dependencies
2021-03-21 21:53:44 +00:00
"cc",
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
]
Play random music whenever a track ends To support this, a global_state.maintain() method was added that calls audio.maintain(). Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a
2019-05-18 19:28:12 +00:00
[[package]]
name = "ogg"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
version = "0.8.0"
Play random music whenever a track ends To support this, a global_state.maintain() method was added that calls audio.maintain(). Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a
2019-05-18 19:28:12 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "6951b4e8bf21c8193da321bcce9c9dd2e13c858fe078bf9054a288b419ae5d6e"
Play random music whenever a track ends To support this, a global_state.maintain() method was added that calls audio.maintain(). Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a
2019-05-18 19:28:12 +00:00
dependencies = [
Propper Compression support of network. - Compression is no longer enabled always but can now be enabled per Stream. If a Stream is Compression enabled it will compress and decompress all msg (except for `raw` access) before handling them internally. You need to handle compression yourself for `raw` fn. - added a new feature to the network crate to enable or disable the compression - switched to `lz-fear` instead of `lz4-compression` - use `bitflags` to represent the `Promises` struct
2020-08-25 13:32:42 +00:00
"byteorder",
Play random music whenever a track ends To support this, a global_state.maintain() method was added that calls audio.maintain(). Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a
2019-05-18 19:28:12 +00:00
]
added const tweaker
2020-03-19 17:11:45 +00:00
[[package]]
name = "once_cell"
update depednencies
2021-07-08 10:21:02 +00:00
version = "1.8.0"
added const tweaker
2020-03-19 17:11:45 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update depednencies
2021-07-08 10:21:02 +00:00
checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"
added const tweaker
2020-03-19 17:11:45 +00:00
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
[[package]]
name = "oorandom"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
version = "11.1.3"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
Added hash value to decide if we should invalidate persited skills and allow a respec.
2021-11-14 18:32:37 +00:00
[[package]]
name = "opaque-debug"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
[i18n] Configurable fonts - Add font configuration in internationalization files - Scale font size using a configurable ratio - Add a script to identify translation item statuses using Git metadata - Execute the i18n script in a new gitlab-ci step (delayed) - Clone haxrcorp_4089_cyrillic_altgr font (haxrcorp_4089_cyrillic_altgr_extended) to add some additional latin characters (mainly for French)
2020-01-26 19:29:46 +00:00
[[package]]
name = "openssl-probe"
update dependencies
2021-06-04 07:44:30 +00:00
version = "0.1.4"
[i18n] Configurable fonts - Add font configuration in internationalization files - Scale font size using a configurable ratio - Add a script to identify translation item statuses using Git metadata - Execute the i18n script in a new gitlab-ci step (delayed) - Clone haxrcorp_4089_cyrillic_altgr font (haxrcorp_4089_cyrillic_altgr_extended) to add some additional latin characters (mainly for French)
2020-01-26 19:29:46 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies
2021-06-04 07:44:30 +00:00
checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"
[i18n] Configurable fonts - Add font configuration in internationalization files - Scale font size using a configurable ratio - Add a script to identify translation item statuses using Git metadata - Execute the i18n script in a new gitlab-ci step (delayed) - Clone haxrcorp_4089_cyrillic_altgr font (haxrcorp_4089_cyrillic_altgr_extended) to add some additional latin characters (mainly for French)
2020-01-26 19:29:46 +00:00
Restarted worldgen Former-commit-id: e1526ec5f865904f11ab6a1507ecdc1a52acb28d
2019-05-21 00:57:16 +00:00
[[package]]
name = "orbclient"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
version = "0.3.31"
Restarted worldgen Former-commit-id: e1526ec5f865904f11ab6a1507ecdc1a52acb28d
2019-05-21 00:57:16 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
checksum = "0c976c5018e7f1db4359616d8b31ef8ae7d9649b11803c0b38fff67fd2999fc8"
Restarted worldgen Former-commit-id: e1526ec5f865904f11ab6a1507ecdc1a52acb28d
2019-05-21 00:57:16 +00:00
dependencies = [
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"libc",
"raw-window-handle",
update crates
2021-09-20 10:05:41 +00:00
"redox_syscall 0.2.10",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"sdl2",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"sdl2-sys",
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
"wasm-bindgen",
"web-sys",
Restarted worldgen Former-commit-id: e1526ec5f865904f11ab6a1507ecdc1a52acb28d
2019-05-21 00:57:16 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "ordered-float"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
version = "1.1.1"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "3305af35278dd29f46fcdd139e0b1fbfae2153f0e5928b39b035542dd31e37b7"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"num-traits",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
Allow interacting with nearby blocks without pointing at them, unify selection of block/entity interactors so that only one is select at once, rearrange pickup and mount range consts
2020-10-29 06:11:10 +00:00
[[package]]
name = "ordered-float"
update crates
2021-09-20 10:05:41 +00:00
version = "2.8.0"
Allow interacting with nearby blocks without pointing at them, unify selection of block/entity interactors so that only one is select at once, rearrange pickup and mount range consts
2020-10-29 06:11:10 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "97c9d06878b3a851e8026ef94bf7fef9ba93062cd412601da4d9cf369b1cc62d"
Allow interacting with nearby blocks without pointing at them, unify selection of block/entity interactors so that only one is select at once, rearrange pickup and mount range consts
2020-10-29 06:11:10 +00:00
dependencies = [
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"num-traits",
Allow interacting with nearby blocks without pointing at them, unify selection of block/entity interactors so that only one is select at once, rearrange pickup and mount range consts
2020-10-29 06:11:10 +00:00
]
Adding many new types of geomorphic laws: - soil production (currently disabled). - debris flow erosion (combined with regular stream power law). - flow computation using multiple receivers. - filling strategy during drainage network calculations. Also tweaks a variety of other aspects of erosion.
2020-01-11 21:05:22 +00:00
[[package]]
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
name = "owned_ttf_parser"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9f923fb806c46266c02ab4a5b239735c144bdeda724a50ed058e5226f594cde3"
dependencies = [
Add support for TextInput widget, rename widgets module to widget, update to glyph_brush 0.7.0
2020-05-29 04:40:22 +00:00
"ttf-parser 0.6.2",
]
[[package]]
name = "owned_ttf_parser"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.13.2"
Add support for TextInput widget, rename widgets module to widget, update to glyph_brush 0.7.0
2020-05-29 04:40:22 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "65ee3f72636e6f164cc41c9f9057f4e58c4e13507699ea7f5e5242b64b8198ee"
Add support for TextInput widget, rename widgets module to widget, update to glyph_brush 0.7.0
2020-05-29 04:40:22 +00:00
dependencies = [
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"ttf-parser 0.13.2",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
]
[[package]]
name = "packed_simd_2"
update toolchain to `nightly-2021-09-24`
2021-09-20 10:05:41 +00:00
version = "0.3.6"
Adding many new types of geomorphic laws: - soil production (currently disabled). - debris flow erosion (combined with regular stream power law). - flow computation using multiple receivers. - filling strategy during drainage network calculations. Also tweaks a variety of other aspects of erosion.
2020-01-11 21:05:22 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update toolchain to `nightly-2021-09-24`
2021-09-20 10:05:41 +00:00
checksum = "71c0c06716cfc81616fa8e22b721ce92fecd594508bc0eb3d04ae3ef35ac10c5"
Adding many new types of geomorphic laws: - soil production (currently disabled). - debris flow erosion (combined with regular stream power law). - flow computation using multiple receivers. - filling strategy during drainage network calculations. Also tweaks a variety of other aspects of erosion.
2020-01-11 21:05:22 +00:00
dependencies = [
ci cleanup, dependency update
2020-11-06 13:14:54 +00:00
"cfg-if 0.1.10",
Add CustomPath to Travel enum Defines a custom path to follow, instead of using one from the World. Airships use this to slightly adjust their course to reduce collisions.
2021-04-04 10:55:15 +00:00
"libm 0.1.4",
Adding many new types of geomorphic laws: - soil production (currently disabled). - debris flow erosion (combined with regular stream power law). - flow computation using multiple receivers. - filling strategy during drainage network calculations. Also tweaks a variety of other aspects of erosion.
2020-01-11 21:05:22 +00:00
]
[Voxygen] Switch mutexes to parking_lot and channels to crossbeam.
2019-08-15 22:07:09 +00:00
[[package]]
name = "parking_lot"
Clean and update dependencies * Remove tweak feature * Remove const-tweaker * Update tiny_http * Update bitvec to 0.21.0 * Downgrade euc to avoid conflict with vek 0.12.0 * Require exactly vek 0.12.0 * Update all other dependencies automatically based on these changes * Update gilrs to latest at the request of Ada Lovegirls * Update meshing benchmarks to new criterion API
2021-02-15 07:47:28 +00:00
version = "0.10.2"
[Voxygen] Switch mutexes to parking_lot and channels to crossbeam.
2019-08-15 22:07:09 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Clean and update dependencies * Remove tweak feature * Remove const-tweaker * Update tiny_http * Update bitvec to 0.21.0 * Downgrade euc to avoid conflict with vek 0.12.0 * Require exactly vek 0.12.0 * Update all other dependencies automatically based on these changes * Update gilrs to latest at the request of Ada Lovegirls * Update meshing benchmarks to new criterion API
2021-02-15 07:47:28 +00:00
checksum = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e"
[Voxygen] Switch mutexes to parking_lot and channels to crossbeam.
2019-08-15 22:07:09 +00:00
dependencies = [
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"lock_api 0.3.4",
Clean and update dependencies * Remove tweak feature * Remove const-tweaker * Update tiny_http * Update bitvec to 0.21.0 * Downgrade euc to avoid conflict with vek 0.12.0 * Require exactly vek 0.12.0 * Update all other dependencies automatically based on these changes * Update gilrs to latest at the request of Ada Lovegirls * Update meshing benchmarks to new criterion API
2021-02-15 07:47:28 +00:00
"parking_lot_core 0.7.2",
[Voxygen] Switch mutexes to parking_lot and channels to crossbeam.
2019-08-15 22:07:09 +00:00
]
added const tweaker
2020-03-19 17:11:45 +00:00
[[package]]
name = "parking_lot"
update crates
2021-09-20 10:05:41 +00:00
version = "0.11.2"
added const tweaker
2020-03-19 17:11:45 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
dependencies = [
"instant",
update crates
2021-09-20 10:05:41 +00:00
"lock_api 0.4.5",
"parking_lot_core 0.8.5",
[Voxygen] Switch mutexes to parking_lot and channels to crossbeam.
2019-08-15 22:07:09 +00:00
]
added const tweaker
2020-03-19 17:11:45 +00:00
[[package]]
name = "parking_lot_core"
Converting the API interface to Async and experimenting with a Channel implementation for TCP, UDP, MPSC, which will later be reverted It should compile and tests run fine now. If not, the 2nd last squashed commit message said it currently only send frames but not incomming messages, also recv would only handle frames. The last one said i added internal messages and a reverse path (prob for .recv)
2020-02-10 17:25:47 +00:00
version = "0.7.2"
added const tweaker
2020-03-19 17:11:45 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Converting the API interface to Async and experimenting with a Channel implementation for TCP, UDP, MPSC, which will later be reverted It should compile and tests run fine now. If not, the 2nd last squashed commit message said it currently only send frames but not incomming messages, also recv would only handle frames. The last one said i added internal messages and a reverse path (prob for .recv)
2020-02-10 17:25:47 +00:00
checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3"
added const tweaker
2020-03-19 17:11:45 +00:00
dependencies = [
ci cleanup, dependency update
2020-11-06 13:14:54 +00:00
"cfg-if 0.1.10",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"cloudabi",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"redox_syscall 0.1.57",
"smallvec",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"winapi 0.3.9",
]
[[package]]
name = "parking_lot_core"
update crates
2021-09-20 10:05:41 +00:00
version = "0.8.5"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
dependencies = [
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"cfg-if 1.0.0",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"instant",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
update crates
2021-09-20 10:05:41 +00:00
"redox_syscall 0.2.10",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"smallvec",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"winapi 0.3.9",
Made boulders avoid rivers
2020-08-29 07:53:42 +00:00
]
- add Polaris Lantern, created by Gemu and Uncomfy for Christmas
2021-12-11 23:42:15 +00:00
[[package]]
name = "parse-zoneinfo"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c705f256449c60da65e11ff6626e0c16a0a0b96aaa348de61376b249bc340f41"
dependencies = [
"regex",
]
Add benchmark for color quantization using the rtree crate.
2021-07-01 17:41:37 +00:00
[[package]]
name = "pdqselect"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ec91767ecc0a0bbe558ce8c9da33c068066c57ecc8bb8477ef8c1ad3ef77c27"
Play random music whenever a track ends To support this, a global_state.maintain() method was added that calls audio.maintain(). Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a
2019-05-18 19:28:12 +00:00
[[package]]
name = "peeking_take_while"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
Play random music whenever a track ends To support this, a global_state.maintain() method was added that calls audio.maintain(). Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a
2019-05-18 19:28:12 +00:00
protocoladdr change for listen and connect (remove a loop in quic protocol which wasnt a actual loop)
2021-04-15 08:16:42 +00:00
[[package]]
name = "pem"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "1.0.1"
protocoladdr change for listen and connect (remove a loop in quic protocol which wasnt a actual loop)
2021-04-15 08:16:42 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "06673860db84d02a63942fa69cd9543f2624a5df3aea7f33173048fa7ad5cf1a"
protocoladdr change for listen and connect (remove a loop in quic protocol which wasnt a actual loop)
2021-04-15 08:16:42 +00:00
dependencies = [
"base64",
"once_cell",
"regex",
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "percent-encoding"
Move shaders, start asset reloading system
2019-08-03 05:42:33 +00:00
version = "2.1.0"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "petgraph"
version = "0.4.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "9c3659d1ee90221741f65dd128d9998311b0e40c5d3c23a62445938214abce4f"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
Finished porting all pipelines
2020-09-13 10:03:42 +00:00
"fixedbitset 0.1.9",
]
[[package]]
name = "petgraph"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "467d164a6de56270bd7c4d070df81d07beace25012d5103ced4e9ff08d6afdb7"
dependencies = [
"fixedbitset 0.2.0",
"indexmap",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
- add Polaris Lantern, created by Gemu and Uncomfy for Christmas
2021-12-11 23:42:15 +00:00
[[package]]
name = "phf"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b9fc3db1018c4b59d7d582a739436478b6035138b6aecbce989fc91c3e98409f"
dependencies = [
"phf_shared",
]
[[package]]
name = "phf_codegen"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd"
dependencies = [
"phf_generator",
"phf_shared",
]
[[package]]
name = "phf_generator"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6"
dependencies = [
"phf_shared",
"rand 0.8.4",
]
[[package]]
name = "phf_shared"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
dependencies = [
"siphasher",
"uncased",
]
fmt
2021-03-05 01:23:11 +00:00
[[package]]
name = "pin-project-lite"
update depednencies
2021-07-08 10:21:02 +00:00
version = "0.2.7"
fmt
2021-03-05 01:23:11 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update depednencies
2021-07-08 10:21:02 +00:00
checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443"
fmt
2021-03-05 01:23:11 +00:00
switch from hyper http to rouille for http server
2019-09-08 23:59:19 +00:00
[[package]]
dependency reduction: - authc no longer uses reqwest - image only supports PNG - replace routille with tiny_http - several other dependencies - cargo upgrade - following improvement was measured on R7 1700X: before: - cargo build: 3076.73s user / 4:45 total / 589 dependencies - cargo test: 6118.38s user / 7:30 total / 959 dependencies after: - cargo build: 2680.54s user / 4:05 total / 480 dependencies - cargo test: 5351.81s user / 7:04 total / 791 dependencies - added xMAC94x to CODEOWNERS for Cargo.toml, he will protect them from now on and hit people with evil looks ;)
2020-06-01 00:13:35 +00:00
name = "pin-utils"
version = "0.1.0"
switch from hyper http to rouille for http server
2019-09-08 23:59:19 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
dependency reduction: - authc no longer uses reqwest - image only supports PNG - replace routille with tiny_http - several other dependencies - cargo upgrade - following improvement was measured on R7 1700X: before: - cargo build: 3076.73s user / 4:45 total / 589 dependencies - cargo test: 6118.38s user / 7:30 total / 959 dependencies after: - cargo build: 2680.54s user / 4:05 total / 480 dependencies - cargo test: 5351.81s user / 7:04 total / 791 dependencies - added xMAC94x to CODEOWNERS for Cargo.toml, he will protect them from now on and hit people with evil looks ;)
2020-06-01 00:13:35 +00:00
checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
Update chat-cli to work properly. Update reqwest to 0.10.0
2020-01-02 09:49:48 +00:00
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "piston-float"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "b058c3a640efd4bcf63266512e4bb03187192c1b29edd38b16d5a014613e3199"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "piston-viewport"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "7d96dd995f7dabe6d57cda668ec0fda39d6fe6e1e0b23f772582f383f2013611"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"piston-float",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
[[package]]
name = "pistoncore-input"
version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "0c612ce242c7bac8e96426a0ca34275fd980af440f0cca7c6c0e840ef8a4052f"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"bitflags",
"piston-viewport",
"serde",
"serde_derive",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
[[package]]
name = "pkg-config"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.3.22"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "12295df4f294471248581bc09bef3c38a5e46f1e36d6a37353621a0c6c357e1f"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
[[package]]
name = "plotters"
fmt
2021-03-05 01:23:11 +00:00
version = "0.3.0"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
fmt
2021-03-05 01:23:11 +00:00
checksum = "45ca0ae5f169d0917a7c7f5a9c1a3d3d9598f18f529dd2b8373ed988efea307a"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
dependencies = [
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"num-traits",
fmt
2021-03-05 01:23:11 +00:00
"plotters-backend",
"plotters-svg",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"wasm-bindgen",
"web-sys",
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
fmt
2021-03-05 01:23:11 +00:00
[[package]]
name = "plotters-backend"
update depednencies
2021-07-08 10:21:02 +00:00
version = "0.3.2"
fmt
2021-03-05 01:23:11 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update depednencies
2021-07-08 10:21:02 +00:00
checksum = "d88417318da0eaf0fdcdb51a0ee6c3bed624333bff8f946733049380be67ac1c"
fmt
2021-03-05 01:23:11 +00:00
[[package]]
name = "plotters-svg"
update depednencies
2021-07-08 10:21:02 +00:00
version = "0.3.1"
fmt
2021-03-05 01:23:11 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update depednencies
2021-07-08 10:21:02 +00:00
checksum = "521fa9638fa597e1dc53e9412a4f9cefb01187ee1f7413076f9e6749e2885ba9"
fmt
2021-03-05 01:23:11 +00:00
dependencies = [
"plotters-backend",
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "png"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
version = "0.16.8"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "3c3287920cb847dee3de33d301c463fba14dda99db24214ddf93f83d3021f4c6"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"bitflags",
"crc32fast",
Compress terrain chunks with deflate. Includes a benchmark showing that this makes them around 70% smaller, and is the same speed as LZ4.
2021-04-20 21:33:46 +00:00
"deflate 0.8.6",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"miniz_oxide 0.3.7",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
Made single-player server start on random unused port Former-commit-id: 95ec85b9be58d0fd348144c398004a69676eb6cd
2019-05-06 14:26:10 +00:00
[[package]]
name = "portpicker"
version = "0.1.0"
Move agent system to server
2021-02-06 06:15:25 +00:00
source = "git+https://github.com/xMAC94x/portpicker-rs?rev=df6b37872f3586ac3b21d08b56c8ec7cd92fb172#df6b37872f3586ac3b21d08b56c8ec7cd92fb172"
Made single-player server start on random unused port Former-commit-id: 95ec85b9be58d0fd348144c398004a69676eb6cd
2019-05-06 14:26:10 +00:00
dependencies = [
update depednencies
2021-07-08 10:21:02 +00:00
"rand 0.8.4",
Made single-player server start on random unused port Former-commit-id: 95ec85b9be58d0fd348144c398004a69676eb6cd
2019-05-06 14:26:10 +00:00
]
Update most dependencies
2019-07-28 15:47:14 +00:00
[[package]]
name = "ppv-lite86"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.2.15"
Update most dependencies
2019-07-28 15:47:14 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba"
Update most dependencies
2019-07-28 15:47:14 +00:00
Winit 0.22 released
2020-03-13 04:05:06 +00:00
[[package]]
name = "proc-macro-crate"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785"
dependencies = [
"toml",
]
update crates
2021-09-20 10:05:41 +00:00
[[package]]
name = "proc-macro-crate"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ebace6889caf889b4d3f76becee12e90353f2b8c7d875534a71e5742f8f6f83"
dependencies = [
"thiserror",
"toml",
]
Dis some distance and attack arc tweaking
2020-07-03 00:45:30 +00:00
[[package]]
name = "proc-macro-error"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
dependencies = [
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"proc-macro-error-attr",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"proc-macro2 1.0.32",
"quote 1.0.10",
"syn 1.0.81",
update dependencies
2021-03-21 21:53:44 +00:00
"version_check 0.9.3",
Added protection stat to admin armor hidden in debug folder. Removed blue cultist armor set from drop table as it is an admin set.
2020-07-18 00:05:28 +00:00
]
Dis some distance and attack arc tweaking
2020-07-03 00:45:30 +00:00
[[package]]
name = "proc-macro-error-attr"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
dependencies = [
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"proc-macro2 1.0.32",
"quote 1.0.10",
update dependencies
2021-03-21 21:53:44 +00:00
"version_check 0.9.3",
Dis some distance and attack arc tweaking
2020-07-03 00:45:30 +00:00
]
Update lockfile.
2019-09-17 14:12:26 +00:00
[[package]]
name = "proc-macro-hack"
get rid of some insecure dependencies
2020-12-16 09:42:36 +00:00
version = "0.5.19"
Update lockfile.
2019-09-17 14:12:26 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
get rid of some insecure dependencies
2020-12-16 09:42:36 +00:00
checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
Update lockfile.
2019-09-17 14:12:26 +00:00
Update chat-cli to work properly. Update reqwest to 0.10.0
2020-01-02 09:49:48 +00:00
[[package]]
name = "proc-macro-nested"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
version = "0.1.7"
Update chat-cli to work properly. Update reqwest to 0.10.0
2020-01-02 09:49:48 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"
Update chat-cli to work properly. Update reqwest to 0.10.0
2020-01-02 09:49:48 +00:00
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "proc-macro2"
Updated sphynx Former-commit-id: f81484571bda8c5e15ea2b6c0e8b9b6892b094a3
2019-05-16 23:05:46 +00:00
version = "0.4.30"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"unicode-xid 0.1.0",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
Remove vek patch, it's on crates.io now
2019-08-26 12:21:04 +00:00
[[package]]
name = "proc-macro2"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "1.0.32"
Remove vek patch, it's on crates.io now
2019-08-26 12:21:04 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "ba508cc11742c0dc5c1659771673afbab7a0efab23aa17e854cbab0837ed0b43"
Remove vek patch, it's on crates.io now
2019-08-26 12:21:04 +00:00
dependencies = [
update dependencies
2021-06-04 07:44:30 +00:00
"unicode-xid 0.2.2",
Remove vek patch, it's on crates.io now
2019-08-26 12:21:04 +00:00
]
Almost implement instance merging for sprites (validation error), rebase fix
2021-01-31 03:50:03 +00:00
[[package]]
name = "profiling"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "1.0.4"
Almost implement instance merging for sprites (validation error), rebase fix
2021-01-31 03:50:03 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "9926767b8b8244d7b6b64546585121d193c3d0b4856ccd656b7bfa9deb91ab6a"
Use profling to get spans from wgpu, update wpgu & its deps for various fixes
2021-04-30 02:54:10 +00:00
dependencies = [
"profiling-procmacros",
"tracy-client",
]
[[package]]
name = "profiling-procmacros"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "1.0.4"
Use profling to get spans from wgpu, update wpgu & its deps for various fixes
2021-04-30 02:54:10 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "f899bc77213a95c5b7272c1f9889c1948eacafe06b035e976abbcadbb34fe517"
Use profling to get spans from wgpu, update wpgu & its deps for various fixes
2021-04-30 02:54:10 +00:00
dependencies = [
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"quote 1.0.10",
"syn 1.0.81",
Use profling to get spans from wgpu, update wpgu & its deps for various fixes
2021-04-30 02:54:10 +00:00
]
Almost implement instance merging for sprites (validation error), rebase fix
2021-01-31 03:50:03 +00:00
first implementation of prometheus in veloren for git hash, tick times, chunks loaded, player online, entity count and light count
2019-09-06 14:21:09 +00:00
[[package]]
name = "prometheus"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
version = "0.12.0"
first implementation of prometheus in veloren for git hash, tick times, chunks loaded, player online, entity count and light count
2019-09-06 14:21:09 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
checksum = "5986aa8d62380092d2f50f8b1cdba9cb9b6731ffd4b25b51fd126b6c3e05b99c"
first implementation of prometheus in veloren for git hash, tick times, chunks loaded, player online, entity count and light count
2019-09-06 14:21:09 +00:00
dependencies = [
update chrossbeam, tracy, prometheus (and reduce server deps to crossbeam-channel)
2020-12-15 23:51:07 +00:00
"cfg-if 1.0.0",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"fnv",
"lazy_static",
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
"memchr",
update crates
2021-09-20 10:05:41 +00:00
"parking_lot 0.11.2",
updated dependencies and fixed stuff - replace serde_derive by feature of serde incl. source code modifications to compile - reduce futures-timer to "2.0" to be same as async_std - update notify - removed mio, bincode and lz4 compress in common as networking is now in own crate btw there is a better lz4 compress crate, which is newer than 2017 - update prometheus to 0.9 - can't update uvth yet due to usues - hashbrown to 7.2 to only need a single version - libsqlite3 update - image didn't change as there is a problem with `image 0.23` - switch old directories with newer directories-next - no num upgrade as we still depend on num 0.2 anyways - rodio and cpal upgrade - const-tewaker update - dispatch (untested) update - git2 update - iterations update
2020-07-06 14:23:08 +00:00
"thiserror",
first implementation of prometheus in veloren for git hash, tick times, chunks loaded, player online, entity count and light count
2019-09-06 14:21:09 +00:00
]
fmt
2021-03-05 01:23:11 +00:00
[[package]]
name = "prometheus-hyper"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
version = "0.1.2"
fmt
2021-03-05 01:23:11 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
checksum = "df5edaa7893393e195534aefb9ace447292d9fa0afcb70e114a4de05cd0a7d81"
fmt
2021-03-05 01:23:11 +00:00
dependencies = [
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
"hyper",
fmt
2021-03-05 01:23:11 +00:00
"prometheus",
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
"tokio",
fmt
2021-03-05 01:23:11 +00:00
"tracing",
]
Update wasmer
2021-07-10 13:02:20 +00:00
[[package]]
name = "ptr_meta"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1"
dependencies = [
"ptr_meta_derive",
]
[[package]]
name = "ptr_meta_derive"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac"
dependencies = [
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"proc-macro2 1.0.32",
"quote 1.0.10",
"syn 1.0.81",
]
[[package]]
name = "quick-xml"
version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8533f14c8382aaad0d592c812ac3b826162128b65662331e1127b45c3d18536b"
dependencies = [
"memchr",
Update wasmer
2021-07-10 13:02:20 +00:00
]
Quic: We had the followuing problem: - locally we open a stream, our local Drain is sending OpenStream - remote Sink will know this and notify remote Drain - remote side sends a message - local sink does not know about the Stream. as there is (and CANT) be a wat to notify local Sink from local Drain (it could introduce race conditions). One of the possible solutions was, that the remote drain will copy the OpenStream Msg ON the Quic::stream before first data is send. This would work but is complicated. Instead we now just mark such streams as "potentially open" and we listen for the first DataHeader to get it's SID. add support for unreliable messages in quic protocol, benchmarks
2021-04-09 11:17:38 +00:00
[[package]]
name = "quinn"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.8.0"
Quic: We had the followuing problem: - locally we open a stream, our local Drain is sending OpenStream - remote Sink will know this and notify remote Drain - remote side sends a message - local sink does not know about the Stream. as there is (and CANT) be a wat to notify local Sink from local Drain (it could introduce race conditions). One of the possible solutions was, that the remote drain will copy the OpenStream Msg ON the Quic::stream before first data is send. This would work but is complicated. Instead we now just mark such streams as "potentially open" and we listen for the first DataHeader to get it's SID. add support for unreliable messages in quic protocol, benchmarks
2021-04-09 11:17:38 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "61a84d97630b137463c8e6802adc1dfe9de81457b41bb1ac59189e6761ab9255"
Quic: We had the followuing problem: - locally we open a stream, our local Drain is sending OpenStream - remote Sink will know this and notify remote Drain - remote side sends a message - local sink does not know about the Stream. as there is (and CANT) be a wat to notify local Sink from local Drain (it could introduce race conditions). One of the possible solutions was, that the remote drain will copy the OpenStream Msg ON the Quic::stream before first data is send. This would work but is complicated. Instead we now just mark such streams as "potentially open" and we listen for the first DataHeader to get it's SID. add support for unreliable messages in quic protocol, benchmarks
2021-04-09 11:17:38 +00:00
dependencies = [
"bytes",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"futures-channel",
"futures-util",
"fxhash",
Quic: We had the followuing problem: - locally we open a stream, our local Drain is sending OpenStream - remote Sink will know this and notify remote Drain - remote side sends a message - local sink does not know about the Stream. as there is (and CANT) be a wat to notify local Sink from local Drain (it could introduce race conditions). One of the possible solutions was, that the remote drain will copy the OpenStream Msg ON the Quic::stream before first data is send. This would work but is complicated. Instead we now just mark such streams as "potentially open" and we listen for the first DataHeader to get it's SID. add support for unreliable messages in quic protocol, benchmarks
2021-04-09 11:17:38 +00:00
"quinn-proto",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"quinn-udp",
"rustls 0.20.1",
Quic: We had the followuing problem: - locally we open a stream, our local Drain is sending OpenStream - remote Sink will know this and notify remote Drain - remote side sends a message - local sink does not know about the Stream. as there is (and CANT) be a wat to notify local Sink from local Drain (it could introduce race conditions). One of the possible solutions was, that the remote drain will copy the OpenStream Msg ON the Quic::stream before first data is send. This would work but is complicated. Instead we now just mark such streams as "potentially open" and we listen for the first DataHeader to get it's SID. add support for unreliable messages in quic protocol, benchmarks
2021-04-09 11:17:38 +00:00
"thiserror",
"tokio",
"tracing",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"webpki 0.22.0",
Quic: We had the followuing problem: - locally we open a stream, our local Drain is sending OpenStream - remote Sink will know this and notify remote Drain - remote side sends a message - local sink does not know about the Stream. as there is (and CANT) be a wat to notify local Sink from local Drain (it could introduce race conditions). One of the possible solutions was, that the remote drain will copy the OpenStream Msg ON the Quic::stream before first data is send. This would work but is complicated. Instead we now just mark such streams as "potentially open" and we listen for the first DataHeader to get it's SID. add support for unreliable messages in quic protocol, benchmarks
2021-04-09 11:17:38 +00:00
]
[[package]]
name = "quinn-proto"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.8.0"
Quic: We had the followuing problem: - locally we open a stream, our local Drain is sending OpenStream - remote Sink will know this and notify remote Drain - remote side sends a message - local sink does not know about the Stream. as there is (and CANT) be a wat to notify local Sink from local Drain (it could introduce race conditions). One of the possible solutions was, that the remote drain will copy the OpenStream Msg ON the Quic::stream before first data is send. This would work but is complicated. Instead we now just mark such streams as "potentially open" and we listen for the first DataHeader to get it's SID. add support for unreliable messages in quic protocol, benchmarks
2021-04-09 11:17:38 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "063dedf7983c8d57db474218f258daa85b627de6f2dbc458b690a93b1de790e8"
Quic: We had the followuing problem: - locally we open a stream, our local Drain is sending OpenStream - remote Sink will know this and notify remote Drain - remote side sends a message - local sink does not know about the Stream. as there is (and CANT) be a wat to notify local Sink from local Drain (it could introduce race conditions). One of the possible solutions was, that the remote drain will copy the OpenStream Msg ON the Quic::stream before first data is send. This would work but is complicated. Instead we now just mark such streams as "potentially open" and we listen for the first DataHeader to get it's SID. add support for unreliable messages in quic protocol, benchmarks
2021-04-09 11:17:38 +00:00
dependencies = [
"bytes",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"fxhash",
update depednencies
2021-07-08 10:21:02 +00:00
"rand 0.8.4",
Quic: We had the followuing problem: - locally we open a stream, our local Drain is sending OpenStream - remote Sink will know this and notify remote Drain - remote side sends a message - local sink does not know about the Stream. as there is (and CANT) be a wat to notify local Sink from local Drain (it could introduce race conditions). One of the possible solutions was, that the remote drain will copy the OpenStream Msg ON the Quic::stream before first data is send. This would work but is complicated. Instead we now just mark such streams as "potentially open" and we listen for the first DataHeader to get it's SID. add support for unreliable messages in quic protocol, benchmarks
2021-04-09 11:17:38 +00:00
"ring",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"rustls 0.20.1",
"rustls-native-certs 0.6.1",
"rustls-pemfile",
Quic: We had the followuing problem: - locally we open a stream, our local Drain is sending OpenStream - remote Sink will know this and notify remote Drain - remote side sends a message - local sink does not know about the Stream. as there is (and CANT) be a wat to notify local Sink from local Drain (it could introduce race conditions). One of the possible solutions was, that the remote drain will copy the OpenStream Msg ON the Quic::stream before first data is send. This would work but is complicated. Instead we now just mark such streams as "potentially open" and we listen for the first DataHeader to get it's SID. add support for unreliable messages in quic protocol, benchmarks
2021-04-09 11:17:38 +00:00
"slab",
"thiserror",
"tinyvec",
"tracing",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"webpki 0.22.0",
]
[[package]]
name = "quinn-udp"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f7996776e9ee3fc0e5c14476c1a640a17e993c847ae9c81191c2c102fbef903"
dependencies = [
"futures-util",
"libc",
"mio 0.7.14",
"quinn-proto",
"socket2",
"tokio",
"tracing",
Quic: We had the followuing problem: - locally we open a stream, our local Drain is sending OpenStream - remote Sink will know this and notify remote Drain - remote side sends a message - local sink does not know about the Stream. as there is (and CANT) be a wat to notify local Sink from local Drain (it could introduce race conditions). One of the possible solutions was, that the remote drain will copy the OpenStream Msg ON the Quic::stream before first data is send. This would work but is complicated. Instead we now just mark such streams as "potentially open" and we listen for the first DataHeader to get it's SID. add support for unreliable messages in quic protocol, benchmarks
2021-04-09 11:17:38 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "quote"
Fixed some misses.
2019-07-12 18:51:22 +00:00
version = "0.6.13"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"proc-macro2 0.4.30",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
Remove vek patch, it's on crates.io now
2019-08-26 12:21:04 +00:00
[[package]]
name = "quote"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "1.0.10"
Remove vek patch, it's on crates.io now
2019-08-26 12:21:04 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05"
Remove vek patch, it's on crates.io now
2019-08-26 12:21:04 +00:00
dependencies = [
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"proc-macro2 1.0.32",
Remove vek patch, it's on crates.io now
2019-08-26 12:21:04 +00:00
]
Fix security
2020-04-02 00:03:15 +00:00
[[package]]
name = "radium"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
version = "0.6.2"
Fix security
2020-04-02 00:03:15 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
Draft of botclient.
2021-03-10 18:32:45 +00:00
[[package]]
name = "radix_trie"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd"
dependencies = [
"endian-type",
"nibble_vec",
]
Update most dependencies
2019-07-28 15:47:14 +00:00
[[package]]
name = "rand"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
version = "0.7.3"
Update most dependencies
2019-07-28 15:47:14 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
Update most dependencies
2019-07-28 15:47:14 +00:00
dependencies = [
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"getrandom 0.1.16",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
Added Controller support
2020-03-10 21:00:13 +00:00
"rand_chacha 0.2.2",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"rand_core 0.5.1",
"rand_hc 0.2.0",
Update rand dependency
2021-01-26 20:23:18 +00:00
]
[[package]]
name = "rand"
update depednencies
2021-07-08 10:21:02 +00:00
version = "0.8.4"
Update rand dependency
2021-01-26 20:23:18 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update depednencies
2021-07-08 10:21:02 +00:00
checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
Update rand dependency
2021-01-26 20:23:18 +00:00
dependencies = [
"libc",
update depednencies
2021-07-08 10:21:02 +00:00
"rand_chacha 0.3.1",
"rand_core 0.6.3",
"rand_hc 0.3.1",
Update most dependencies
2019-07-28 15:47:14 +00:00
]
[[package]]
name = "rand_chacha"
Added Controller support
2020-03-10 21:00:13 +00:00
version = "0.2.2"
Update most dependencies
2019-07-28 15:47:14 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Added Controller support
2020-03-10 21:00:13 +00:00
checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
Update most dependencies
2019-07-28 15:47:14 +00:00
dependencies = [
Added Controller support
2020-03-10 21:00:13 +00:00
"ppv-lite86",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"rand_core 0.5.1",
Update most dependencies
2019-07-28 15:47:14 +00:00
]
Update rand dependency
2021-01-26 20:23:18 +00:00
[[package]]
name = "rand_chacha"
update depednencies
2021-07-08 10:21:02 +00:00
version = "0.3.1"
Update rand dependency
2021-01-26 20:23:18 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update depednencies
2021-07-08 10:21:02 +00:00
checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
Update rand dependency
2021-01-26 20:23:18 +00:00
dependencies = [
"ppv-lite86",
update depednencies
2021-07-08 10:21:02 +00:00
"rand_core 0.6.3",
Began integrating procgen trees
2021-01-03 20:43:07 +00:00
]
Update most dependencies
2019-07-28 15:47:14 +00:00
[[package]]
name = "rand_core"
Update lockfile.
2019-09-17 14:12:26 +00:00
version = "0.5.1"
Update most dependencies
2019-07-28 15:47:14 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
Update most dependencies
2019-07-28 15:47:14 +00:00
dependencies = [
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"getrandom 0.1.16",
Update most dependencies
2019-07-28 15:47:14 +00:00
]
Update rand dependency
2021-01-26 20:23:18 +00:00
[[package]]
name = "rand_core"
update depednencies
2021-07-08 10:21:02 +00:00
version = "0.6.3"
Began integrating procgen trees
2021-01-03 20:43:07 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update depednencies
2021-07-08 10:21:02 +00:00
checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
Began integrating procgen trees
2021-01-03 20:43:07 +00:00
dependencies = [
update dependencies
2021-06-04 07:44:30 +00:00
"getrandom 0.2.3",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
Add CustomPath to Travel enum Defines a custom path to follow, instead of using one from the World. Airships use this to slightly adjust their course to reduce collisions.
2021-04-04 10:55:15 +00:00
[[package]]
name = "rand_distr"
update crates
2021-09-20 10:05:41 +00:00
version = "0.4.2"
Add CustomPath to Travel enum Defines a custom path to follow, instead of using one from the World. Airships use this to slightly adjust their course to reduce collisions.
2021-04-04 10:55:15 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "964d548f8e7d12e102ef183a0de7e98180c9f8729f555897a857b96e48122d2f"
Add CustomPath to Travel enum Defines a custom path to follow, instead of using one from the World. Airships use this to slightly adjust their course to reduce collisions.
2021-04-04 10:55:15 +00:00
dependencies = [
"num-traits",
update depednencies
2021-07-08 10:21:02 +00:00
"rand 0.8.4",
Add CustomPath to Travel enum Defines a custom path to follow, instead of using one from the World. Airships use this to slightly adjust their course to reduce collisions.
2021-04-04 10:55:15 +00:00
]
Update most dependencies
2019-07-28 15:47:14 +00:00
[[package]]
name = "rand_hc"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
Update most dependencies
2019-07-28 15:47:14 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"rand_core 0.5.1",
Update most dependencies
2019-07-28 15:47:14 +00:00
]
Update rand dependency
2021-01-26 20:23:18 +00:00
[[package]]
name = "rand_hc"
update depednencies
2021-07-08 10:21:02 +00:00
version = "0.3.1"
Update rand dependency
2021-01-26 20:23:18 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update depednencies
2021-07-08 10:21:02 +00:00
checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
Update rand dependency
2021-01-26 20:23:18 +00:00
dependencies = [
update depednencies
2021-07-08 10:21:02 +00:00
"rand_core 0.6.3",
common: Add benchmark for `Chonk`
2019-09-03 23:00:50 +00:00
]
Upgrade noise eliminating old rand dependency
2021-01-05 18:10:47 +00:00
[[package]]
name = "rand_xorshift"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77d416b86801d23dde1aa643023b775c3a462efc0ed96443add11546cdf1dca8"
dependencies = [
"rand_core 0.5.1",
]
Implement toggleable gpu profiling that saves the timings from a recent frame with the screenshot key, rebase fixes
2021-02-27 09:21:23 +00:00
[[package]]
name = "range-alloc"
version = "0.1.2"
Revert "Merge branch 'xvar/wgpu-0.9' into 'master'" This reverts merge request !2566
2021-07-07 22:07:00 +00:00
source = "git+https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521#27a1dae3796d33d23812f2bb8c7e3b5aea18b521"
Started the report of wgpu
2020-08-21 19:10:56 +00:00
Mitgated RUSTSEC-2019-0014 by updating `noise` and disabling its default features, specifically `image`, which had the vulnerability.
2019-11-05 11:14:39 +00:00
[[package]]
name = "raw-window-handle"
Updated to latest and greatest auth version.
2020-01-01 18:41:42 +00:00
version = "0.3.3"
Mitgated RUSTSEC-2019-0014 by updating `noise` and disabling its default features, specifically `image`, which had the vulnerability.
2019-11-05 11:14:39 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "0a441a7a6c80ad6473bd4b74ec1c9a4c951794285bf941c2126f607c72e48211"
Mitgated RUSTSEC-2019-0014 by updating `noise` and disabling its default features, specifically `image`, which had the vulnerability.
2019-11-05 11:14:39 +00:00
dependencies = [
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
Mitgated RUSTSEC-2019-0014 by updating `noise` and disabling its default features, specifically `image`, which had the vulnerability.
2019-11-05 11:14:39 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "rayon"
update dependencies
2021-06-04 07:44:30 +00:00
version = "1.5.1"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies
2021-06-04 07:44:30 +00:00
checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"autocfg",
update crates
2021-09-20 10:05:41 +00:00
"crossbeam-deque 0.8.1",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"either",
"rayon-core",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
[[package]]
name = "rayon-core"
update dependencies
2021-06-04 07:44:30 +00:00
version = "1.9.1"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies
2021-06-04 07:44:30 +00:00
checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"crossbeam-channel",
update crates
2021-09-20 10:05:41 +00:00
"crossbeam-deque 0.8.1",
update dependencies
2021-06-04 07:44:30 +00:00
"crossbeam-utils 0.8.5",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"lazy_static",
"num_cpus",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
protocoladdr change for listen and connect (remove a loop in quic protocol which wasnt a actual loop)
2021-04-15 08:16:42 +00:00
[[package]]
name = "rcgen"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.8.14"
protocoladdr change for listen and connect (remove a loop in quic protocol which wasnt a actual loop)
2021-04-15 08:16:42 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "5911d1403f4143c9d56a702069d593e8d0f3fab880a85e103604d0893ea31ba7"
protocoladdr change for listen and connect (remove a loop in quic protocol which wasnt a actual loop)
2021-04-15 08:16:42 +00:00
dependencies = [
"chrono",
"pem",
"ring",
"yasna",
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
name = "redox_syscall"
version = "0.1.57"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "redox_syscall"
update crates
2021-09-20 10:05:41 +00:00
version = "0.2.10"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
dependencies = [
"bitflags",
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
[[package]]
name = "redox_users"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64"
dependencies = [
update dependencies
2021-06-04 07:44:30 +00:00
"getrandom 0.2.3",
update crates
2021-09-20 10:05:41 +00:00
"redox_syscall 0.2.10",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
]
* Replaced `diesel` with `rusqlite` and `refinery` * Added "migration of migrations" to transfer the data from the __diesel_schema_migrations table to the refinery_schema_history table * Removed all down migrations as refinery does not support down migrations * Changed all diesel up migrations to refinery naming format * Added --sql-log-mode parameter to veloren-server-cli to allow SQL tracing and profiling * Added /disconnect_all_players admin command * Added disconnectall CLI command * Fixes for several potential persistence-related race conditions
2021-04-13 22:05:47 +00:00
[[package]]
name = "refinery"
version = "0.5.0"
source = "git+https://gitlab.com/veloren/refinery.git?rev=8ecf4b4772d791e6c8c0a3f9b66a7530fad1af3e#8ecf4b4772d791e6c8c0a3f9b66a7530fad1af3e"
dependencies = [
"refinery-core",
"refinery-macros",
]
[[package]]
name = "refinery-core"
version = "0.5.0"
source = "git+https://gitlab.com/veloren/refinery.git?rev=8ecf4b4772d791e6c8c0a3f9b66a7530fad1af3e#8ecf4b4772d791e6c8c0a3f9b66a7530fad1af3e"
dependencies = [
"async-trait",
"cfg-if 1.0.0",
"chrono",
"lazy_static",
"log",
"regex",
"rusqlite",
"serde",
"siphasher",
"thiserror",
"toml",
"url",
"walkdir 2.3.2",
]
[[package]]
name = "refinery-macros"
version = "0.5.0"
source = "git+https://gitlab.com/veloren/refinery.git?rev=8ecf4b4772d791e6c8c0a3f9b66a7530fad1af3e#8ecf4b4772d791e6c8c0a3f9b66a7530fad1af3e"
dependencies = [
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"proc-macro2 1.0.32",
"quote 1.0.10",
* Replaced `diesel` with `rusqlite` and `refinery` * Added "migration of migrations" to transfer the data from the __diesel_schema_migrations table to the refinery_schema_history table * Removed all down migrations as refinery does not support down migrations * Changed all diesel up migrations to refinery naming format * Added --sql-log-mode parameter to veloren-server-cli to allow SQL tracing and profiling * Added /disconnect_all_players admin command * Added disconnectall CLI command * Fixes for several potential persistence-related race conditions
2021-04-13 22:05:47 +00:00
"refinery-core",
"regex",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"syn 1.0.81",
* Replaced `diesel` with `rusqlite` and `refinery` * Added "migration of migrations" to transfer the data from the __diesel_schema_migrations table to the refinery_schema_history table * Removed all down migrations as refinery does not support down migrations * Changed all diesel up migrations to refinery naming format * Added --sql-log-mode parameter to veloren-server-cli to allow SQL tracing and profiling * Added /disconnect_all_players admin command * Added disconnectall CLI command * Fixes for several potential persistence-related race conditions
2021-04-13 22:05:47 +00:00
]
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
[[package]]
name = "regalloc"
version = "0.0.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "571f7f397d61c4755285cd37853fe8e03271c243424a907415909379659381c5"
dependencies = [
"log",
"rustc-hash",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"smallvec",
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "regex"
update dependencies
2021-06-04 07:44:30 +00:00
version = "1.5.4"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies
2021-06-04 07:44:30 +00:00
checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"aho-corasick",
"memchr",
"regex-syntax",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
common: Add benchmark for `Chonk`
2019-09-03 23:00:50 +00:00
[[package]]
name = "regex-automata"
update dependencies
2021-06-04 07:44:30 +00:00
version = "0.1.10"
common: Add benchmark for `Chonk`
2019-09-03 23:00:50 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies
2021-06-04 07:44:30 +00:00
checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
common: Add benchmark for `Chonk`
2019-09-03 23:00:50 +00:00
dependencies = [
first implementation of connect and tcp using a mio worker protocol and: - introduce a loadtest, for tcp messages - cleanup api - added a unittest - prepared a handshake message, which will in next commits get removed again - experimental mio worker merges - using uuid for participant id
2020-01-13 16:53:28 +00:00
"regex-syntax",
common: Add benchmark for `Chonk`
2019-09-03 23:00:50 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "regex-syntax"
update dependencies
2021-06-04 07:44:30 +00:00
version = "0.6.25"
Update chat-cli to work properly. Update reqwest to 0.10.0
2020-01-02 09:49:48 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies
2021-06-04 07:44:30 +00:00
checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
Update chat-cli to work properly. Update reqwest to 0.10.0
2020-01-02 09:49:48 +00:00
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
[[package]]
name = "region"
version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "877e54ea2adcd70d80e9179344c97f93ef0dffd6b03e1f4529e6e83ab2fa9ae0"
dependencies = [
"bitflags",
"libc",
"mach 0.3.2",
"winapi 0.3.9",
]
update further crates
2020-12-16 00:07:39 +00:00
[[package]]
name = "remove_dir_all"
version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
dependencies = [
"winapi 0.3.9",
]
Use profling to get spans from wgpu, update wpgu & its deps for various fixes
2021-04-30 02:54:10 +00:00
[[package]]
name = "renderdoc-sys"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f1382d1f0a252c4bf97dc20d979a2fdd05b024acd7c2ed0f7595d7817666a157"
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
[[package]]
name = "ring"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
version = "0.16.20"
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"cc",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
fix workspaces and Cargo dependencies
2020-05-27 16:20:16 +00:00
"once_cell",
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
"spin",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"untrusted",
"web-sys",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"winapi 0.3.9",
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
]
Update wasmer
2021-07-10 13:02:20 +00:00
[[package]]
name = "rkyv"
version = "0.6.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb135b3e5e3311f0a254bfb00333f4bac9ef1d89888b84242a89eb8722b09a07"
dependencies = [
"memoffset 0.6.4",
"ptr_meta",
"rkyv_derive",
"seahash",
]
[[package]]
name = "rkyv_derive"
version = "0.6.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba8f489f6b6d8551bb15904293c1ad58a6abafa7d8390d15f7ed05a2afcd87d5"
dependencies = [
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"proc-macro2 1.0.32",
"quote 1.0.10",
"syn 1.0.81",
Update wasmer
2021-07-10 13:02:20 +00:00
]
Play random music whenever a track ends To support this, a global_state.maintain() method was added that calls audio.maintain(). Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a
2019-05-18 19:28:12 +00:00
[[package]]
name = "rodio"
Bump rodio to 0.14
2021-06-14 20:03:57 +00:00
version = "0.14.0"
Split the audio channels into SFX and music channels. This makes the Music Channel for exploration music a basic Sink without spatial audio functionality, which is not required.
2020-02-15 21:30:44 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Bump rodio to 0.14
2021-06-14 20:03:57 +00:00
checksum = "4d98f5e557b61525057e2bc142c8cd7f0e70d75dc32852309bec440e6e046bf9"
Play random music whenever a track ends To support this, a global_state.maintain() method was added that calls audio.maintain(). Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a
2019-05-18 19:28:12 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"cpal",
"lewton",
Play random music whenever a track ends To support this, a global_state.maintain() method was added that calls audio.maintain(). Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a
2019-05-18 19:28:12 +00:00
]
Add default keybindings Former-commit-id: c8886a2eb3326ba62e31ef84b93a29ee59f378b3
2019-04-16 08:56:47 +00:00
[[package]]
Make Failed to tick go back to the main screen and move to ron Former-commit-id: 14d4ab3cb9d964805a2f275b932e93cef9b72d38
2019-05-26 09:21:51 +00:00
name = "ron"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.6.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "86018df177b1beef6c7c8ef949969c4f7cb9a9344181b92486b23c79995bdaa4"
dependencies = [
"base64",
"bitflags",
"serde",
]
[[package]]
name = "ron"
version = "0.7.0"
Add default keybindings Former-commit-id: c8886a2eb3326ba62e31ef84b93a29ee59f378b3
2019-04-16 08:56:47 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "1b861ecaade43ac97886a512b360d01d66be9f41f3c61088b42cedf92e03d678"
Make Failed to tick go back to the main screen and move to ron Former-commit-id: 14d4ab3cb9d964805a2f275b932e93cef9b72d38
2019-05-26 09:21:51 +00:00
dependencies = [
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
"base64",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"bitflags",
"serde",
Make Failed to tick go back to the main screen and move to ron Former-commit-id: 14d4ab3cb9d964805a2f275b932e93cef9b72d38
2019-05-26 09:21:51 +00:00
]
Add default keybindings Former-commit-id: c8886a2eb3326ba62e31ef84b93a29ee59f378b3
2019-04-16 08:56:47 +00:00
Allow canceling chunk generation. Currently we only do this when no players are in range of the chunk. We also send the first client who posted the chunk a message indicating that it's canceled, the hope being that this will be a performance win in single player mode since you don't have to wait three seconds to realize that the server won't generate the chunk for you. We now check an atomic flag for every column sample in a chunk. We could probably do this less frequently, but since it's a relaxed load it has essentially no performance impact on Intel architectures.
2019-10-16 11:39:41 +00:00
[[package]]
name = "roots"
(See sharp/lod-history) LOD, shadows, greedy meshing, new lighting, perf --- Pretty much a Veloren fork at this point. Here's a high level overview of the changes (will be added to CHANGELOG just before merge). At a high level this MR incorporates roughly two groups of changes. The first group consists of new game features: more flexible map sizes, level of detail terrain, shadow maps, and a new lighting engine. This is "feature work" that (mostly) only adds new things to Veloren, and mostly shouldn't affect old stuff. The second big group of changes are those addressing the fallout from all the new features. These include performance fixes of various sorts: the addition of multiple graphics options and optimization of the cheap ones to avoid work, switching all voxel models to use some variant of greedy meshing, switching over much of our CPU-side vector math to exploit SIMD instructions (coinciding with a fork of `vek`), and a rewrite of how the UI handles text rendering (coinciding with updates to our fork of `conrod`). Making Veloren's hardcoded colors appear correct under the new lighting engine also required considerably changes (TODO: Fill in this section when it's complete). The second category of changes often heavily touches code owned by other people, including frequently modified code "owned" by a handful of people, so I recommend that this code be reviewed particularly carefully. --- At a high level (each will be described in more detail below): - The world map has been refactored. - The world size is no longer hardcoded (@zesterer). - The map generation code was made generic to allow using it outside of the `world` crate (@zesterer). - On world creation, we now compute *horizon maps* (@zesterer). - The way we pass the world from the server to the client has been updated (@xMAC94x). - Artifacts related to image rotation were fixed (@imbris). - Multiflow rivers were enabled (@zesterer). - In the process of making changes related to the world map, various incidental fixes and optimizations were required. - The new *level of detail* feature was added (@zesterer wrote part of this and has checked out the rest). - A new LOD terrain rendering step was added to the pipeline. - The LOD terrain quality was made configurable via a graphics setting. - Horizon maps were used to cast shadows from LOD chunks on both LOD and non-LOD terrain. - A "voxelization" effect was incorporated into rendered LOD terrain to make it blend better into the world. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Veloren's lighting has been completely overhauled (@zesterer has already checked most of this out). - A semi-accurate index of refraction was assigned to our materials. - A new, more realistic, physically based approach to lighting was used using the *Ashikhmin Shirley* BRDF. - We emulate *atmospheric scattering* using equations designed for measuring solar panel light exposure. - We attempt to compute *realistic light attenuation* in water using its real material properties. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Point and directional lights now cast realistic shadows, using *shadow mapping.* (@imbris, @zesterer, @Treeco, @YuriMomo) - Point light shadow maps were added to the rendering pipeline, using geometry shaders and *seamless cube maps*. - Directional light shadows were added to the rendering pipeline, using LISPSM together with disabling *depth clamping*. - "Shadow-only" chunks and NPCs were added to prevent shadows from models behind you from disappearing. - In the process of making changes related to shadow maps, various incidental fixes and optimizations were required. The addition of shadow maps, LOD terrain, and the new lighting all led to significant performance degradation, on top of other changes happening in master. Therefore, a large number of performance improvements were also needed: - The graphics options were made much more flexible and configurable, and shaders were optimize. - New options were provided for how to render lights and shadows (@Pfauenauge, @zesterer). - Graphic setting storage and configuration were overhauled to make adding new features easier (@Pfauenauge, @imbris). - Shaders were rewritten to utilize GLSL's preprocessor to avoid overhead (@zesterer, @YuriMomo). - In the process of making changes related to providing additional rendering options, various incidental fixes and optimizations were required. - Voxel model creation was switched to use *greedy meshing.* - A new voxel meshing method, greedy meshing, was added (@imbris). - Uses of the older meshing methods were migrated to use greedy meshing (@imbris, @jshipsey, @Pfauenauge). - New restrictions were added to terrain, figure, and sprites to future proof them for further optimizations (@jshipsey, @Pfauenauge, @zesterer). - Most positions are now relative to either chunk or player position for better precision (@imbris, @zesterer, @scottc). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - Animation and terrain math were switched to use SIMD where possible. - Fixes were made to vek to make its SIMD feature usable for us (@zesterer, @imbris). - The interface and types used in bone animation were changed in various ways (@jshipsey, @Snowram, @Pfauenauge). - Redundant code generation for body animation is now partly taken care of by a macro (@jshipsey, @Snowram, @Pfauenauge). - Animation code was modified to to use vek's SIMD representation where possible (@jshipsey, @Snowram, @Pfauenauge). - Terrain meshing code and shadow map math were also modified to use vek's SIMD representation (@imbris). - SIMD instruction generation was enabled (@YuriMomo, @jshipsey, @Snowram, @imbris, @Angelonfira, @xMAC94x). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - The way we cache glyphs was completely refactored, fixed, and optimized. - Our fork of `conrod` was optimized in various ways (@imbris). - Our fork of `conrod` now exposes whether a widget was updated during the current frame (@imbris). - Our use of the glyph cache was rewritten for correctness (@imbris). - A *text cache* was introduced that lets us skip remeshing glyphs that have not changed (@imbris). - Various changes were made to reduce pressure on the glyph cache, with more planned (@imbris, @Pfauenauge). - In the process of making changes related to the glyph cache, various incidental fixes and optimizations were required. - Colors were changed to keep Veloren's look consistent with master. - Some older tree models were brought back (@Pfauenauge). - TODO(@Sharp): All hardcoded colors were extracted and made hotloadable. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Hardcoded colors were fixed to conform to Veloren's style. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Color models were fixed to conform to Veloren's style. A detailed description of the involved changes follows. --- - The world size is no longer hardcoded. All functions dependent on world size now take a `WorldSizeLg`, which holds the base 2 logarithm of each actual world dimension and is guaranteed to maintain certain properties (outlined in `common/src/terrain/map.rs`). Additionally, many utility functions that utilize the world size were moved into `common` as well (mostly `common/src/terrain/mod.rs`). Finally, the world map format was updated in order to store its size explicitly, with a migration path from the old format that should work whenever the old formatted map was a square (practically always). See `world/src/sim/mod.rs` for these changes. - The map generation code was made generic to allow using it outside of the `world` crate. The parts of the map generating code that do not need to query the world were moved over to `common/src/terrain/map.rs`, allowing them to be used from the client without creating a dependency on `world`. The rest of it was turned into helper functions in `world/src/sim/map.rs`, which can be passed as closures to the generic map generation code to complete its construction. This also means that colors are now passed in separately to the map generation function. See <https://veloren.net/devblog-78/> for more details. - On world creation, we now compute *horizon maps*. See the function in `world/src/sim/util.rs`. Given a height map and a plane intersecting that height map, our horizon maps allow us to encode enough information to reconstruct shadows for each point on the height map using only the *horizon angle* (the angle at which the sun starts to become visible). As Veloren's sun only covers one plane, this is sufficient for encoding sun shadows for LOD terrain, by encoding two angles per chunk (one for each 90 degrees the sun covers). We can also use this for the moon, if we want, since the moon follows the same path. Additionally, we store the *height* of the furthest occluder, to try to make the shadows volumetric; so this means 4 bytes in total for each chunk. Support for horizon maps has been merged into the map functionality in common as well. - The way we pass the world from the server to the client has been updated. Rather than passing the prerendered map, we instead pass three maps with values for each chunk; one with the color information, a second with altitude information, and a third with horizon map information. We then reconstruct the map on the client, together with some additional information we send from the server (like the sea level and maximum height). See `common/src/msg/server.rs` for a detailed description of the format of `WorldMapMsg`, and `server/src/libr.rs` and `client/src/lib.rs` for details of the map construction and parsing. - Artifacts related to image rotation were fixed. See the commit message for commit SHA `cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e` for a detailed explanation. This involved changes to shaders, the addition of a new type of graphic (also reflected in the graphic cache) that allows specifying a border color (which automatically makes the associated texture immutable), and some related fixes. I reproduce the first two paragraphs of the MR description as well: ``` Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). ``` - Multiflow rivers were enabled. This does not really need to be part of this MR, and would be easy to revert, but since it seemed to provide a nice improvement it's currently packaged with it. We already computed multiple outflows from each chunk for erosion purposes long before this MR. However, we never modified river rendering to be able to handle this case (just a single downhill river flow is complex enough!) so this was not exposed when deciding which chunks were rivers. Now that - In the process of making changes related to the world map, various incidental fixes and optimizations were required. Some examples of fixes include making sure terrain is never lowered to below sea level (to make the shadow maps report correct values), fixing map altitudes and colors to understand things like cliffs and "block level" coloring (that doesn'te xist on the column level), and fixing a crashbug when rendering images for the UI where source pixels are strongly rectangular. Some examples of related performance fixes include avoiding allocating a fresh vector for all the maps (i.e. copying it over to change the format from `[u32; n]` to `DynamicImage` and then copying again to convert to `RgbaImage`), and instead using the `gfx::memory::slice` function to accomplish the same thing. These sorts of changes are spread all arond the code. This includes the additon of a new scene, `voxygen/src/scene/lod.rs`, a new pipeline `voxygen/src/render/pipeline/lod_terrain.rs`, and new shaders `assets/vxygen/shaders/lod-terrain-vert.glsl` and `assets/vxygen/shaders/lod-terrain-frag.glsl`, as well as associated changes to the renderer in `voxygen/src/render/renderer.rs`. The main idea behind our initial approach to LOD was to take the world data we now get from the server (altitude, color, and horizon mapping). - Some previously computed values were turned into shader uniforms for better prediction on weak processors. (@zesterer) - Calls to power or trig functions were removed or replaced with multiplications, where possible. - After some deliberation - To properly handle sprite "waving" for nearby sprites, We explicitly designed the greedy meshing system with figures and sprites in mind. In both cases, we want to be able to *efficiently* pack many different models into the same texture, especially in cases where we know we will either not be removing any of the grouped-together from the models from the texture, or will remove all of them at once (so they can be packed into some specific subtexture). For sprites, since we know every model in advance and never intend to deallocate them, we currently pack them all as efficiently as possible into one giant tetxure atlas. However, in the future we might opt to pack them slightly less efficiently in exchange for shrinking the sprite vertex size. For figures, we pack all the textures for each *model* into the same atlas. is a global texture atlas used for every sprite, and for figures which is why we have the ability to mesh multiple models to the same texture area (using the simple texture atlas allocator) without requiring intermediate vector allocations. This is accomplished by delaying the time when we actually write the color and light data to the texture until *after* all the model vertices have been meshed; then, we can just allocate the whole color/light array at once, making the atlas we use an exact fit. In computer science-y terms, we accomplish this delay by, after we perform the initial greedy meshing (without texture information), not continuing to create the texture data, but instead constructing a *continuation*--that is, a function that, when called, will execute the rest of the computation. We push this continuation (which in Rust terms is a `FnOnce` closure that takes the `ColLightsInfo` that it is supposed to write to as context) onto a onto a vector resizing. To allow for suspended writes to texture data, Rust pointed out to me that the continuation that would eventually write the color and light data to the texture atlas (the one that is shared by all models sharing the same greedy mesher) would have to *own* whatever data it mshed. Because we often generate the model data to mesh as a temporary in `voxygen/src/load.rs`, the - Matrix multiplications in the shader were reduced for figure data (@zesterer). - Vertex "waves" for fluid data were removed. - Terrain "bending" near edges was removed. - Scaling was fixed to make sure empty space was not introduced in a space previously occupied by a block. It was also changed to take ownership of its voxel data, rather than sharing it, to let it be used with meshing. - Rust's nightly version was bumped in order to use the `array_map` function, which lets us reuse more code between the simple map and `FigureModelCache`. - PositionedGlyph::standalone. --- I tried to cite sources in many cases[^realtime],[^lloyd],[^lispsm],[^pbrt],[^greedy],[^tjunctions] where I needed features from elsewhere but I am particularly grateful for the following resources, esepcially where they have accompanying source code. I linked all of them that are accessible to the public (those that are not were obtained through legal means). [^realtime]: Eisemann, Elmar, Michael Schwarz, Ulf Assarsson, Michael Wimmer. Real-Time Shadows. A K Peters/CRC Press (T&F), 20160419. [^lloyd]: Lloyd,B. 2007. [Logarithmic perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). PhD thesis, University of North Carolina. [^lispsm]: Wimmer, M., Scherzer, D., and Purgathofer, W. 2004. [Light space perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). In Proceedings of Eurographics Symposium on Rendering 2004, pp. 143– 152. [^pbrt]: Pharr, Matt, et al. [http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf](Physically Based Rendering: From Theory to Implementation). Third edition, Morgan Kaufmann Publishers/Elsevier, 2017. [^greedy]: mikolalysenko. “Meshing in a Minecraft Game.” 0 FPS, 30 June 2012, <https://0fps.net/2012/06/30/meshing-in-a-minecraft-game/>. [^tjunctions]: blackflux. “Meshing in Voxel Engines – Part 1.” Blackflux.Com, 23 Feb. 2014, <https://blackflux.wordpress.com/2014/02/23/meshing-in-voxel-engines-part-1/>. I am also especially grateful to Khronos, Wikiepdia, and stackoverflow for answering many of my specific questions while writing the MR. --- Squashed commit of the following: commit 300505e7305a2fdac722a808ee8538323f215f39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 18:46:25 2020 +0200 Fixing cargo doc and typo in CHANGELOG. commit ec0aeb18e8499d7d84ef818331b4b65c3d76cea6 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 15:38:50 2020 +0200 Hopefully final commit for the LOD branch. commit 5e8ea0b1eaac02903a02feb2eb038d195de4872f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 10:14:26 2020 +0200 Falling back to power as stopgap. commit e44a1cbf46504ee9931a01bdc9033e145500d557 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 09:25:41 2020 +0200 Address imbris feedback. Temporarily disables shiny water, lowers max VD. These restrictions will be lifted soon after merging. commit 561e25778a108ac3712f5ec2ce3a51234c4430d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 08:31:13 2020 +0200 Tweaking shaders a bit. commit 7d19259078ce0dd7b3742ad7d0cb3fab3ece3fdc Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:59:43 2020 +0200 Fix view example as well. commit 051cd4934e0fad2c0b15db4380a4189fa318679f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:29:06 2020 +0200 Fix meshing benchmark. commit c95e07db3b4dcca285678985e65e31b927cb1c61 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 05:46:22 2020 +0200 Address MR feedback, fix scene clouds. commit 1bfb816cabdb3ffc1e507a009c2d98696b4b573a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:39:36 2020 +0200 Incorporating Pfau's figure color changes. New eyes and new humanoid colors. commit 3f9b89a3ac7b3356b1dba0d1a8f6541357f81469 Merge: e2f5162e4 62c53963a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:29:41 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit e2f5162e4f96f4124aa43488f7245d341b3dcfd4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:28:38 2020 +0200 World colors are all hotloadable. They live in assets/world/style/colors.ron. Only a small handful of hardcoed colors remain in World; they are either part of the map, or difficult to disentangle from the rest of the computation. Comments are made where appropriate. commit 62c53963abe1975009d34a8f9515a355bef24f31 Author: Marcel Märtens <marcel.cochem@googlemail.com> Date: Wed Aug 19 15:59:00 2020 +0200 replace pretty_env_logger with tracing commit 5b1625f99d9586fe80e2232f583ec5af9f953099 Merge: d71003acd 4942b5b39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:15:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit d71003acdabeff970b3928e97c26af6847b5b78e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:14:34 2020 +0200 Hotloading colors, part 1: colors in common. Currently, this just entails humanoid colors. There are only three colors not handled; the light emitter colors in common/src/comp/inventory/item/tool.rs. These don't seem important enough to me to warrant making hotloadable, at least not right now, but if it's needed later we can always add them to the file. commit 63b5e0e553eb2ea49276f192a6fc7dd65254270d Merge: c32b337a4 6d2c4b9c1 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 13:05:37 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c32b337a46e10d9de473d178a94a3ccd61c39bb3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:52:04 2020 +0200 Fixing LOD grid, for real. commit a166ae0360395387e09fb35a1f84210c2ce5ec24 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:28:05 2020 +0200 Addressing imbris's initial feedback. Fixes two minor bugs: explosion particles were no longer spawning randomly, and LOD grids were not perfectly even. commit 4cbad004f44060994252dd3d38647a14a589712f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:27:58 2020 +0200 Bumping nightly per request. commit 548680276aac77c25d43d16b5622f847d474dbef Merge: acc098604 8f8b20c91 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:26:06 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit acc0986040589a3492f88a740bc3c3fc693b26d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:28:32 2020 +0200 Lower resolution due to lying drivers. commit d3b878de2a52c358d2944a6bbd0555dad7fbdb10 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:15:38 2020 +0200 Fix issues msh encountered with Intel 4600. commit 10245e0c1b0cb6fae10d86409435364edc6102ef Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 21:15:02 2020 +0200 Merge more models into one mesh than we did previously. commit 3155c31e663c52ae5c3a53d5fb5665892a1a498a Merge: 7204cc8a7 3c199280e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:35:22 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7204cc8a7a4f74a30306bd205d9834fee4bb944f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:34:43 2020 +0200 Fix not yet done NPC animations. This forces them all to be the idle animation if not specified. This fixes issues where you'd have giant NPCs in water. commit bc83360f2a08918f19d417b5f772e1ff554dba08 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 19:36:37 2020 +0200 Try to fix some bugs: - Z fighting with LOD terrain and water. - Audio SFX not playing. commit 1fd104aa603bf3781b6526a5cada46aeca3049dd Merge: 862df3c99 7c2c392a3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 12:02:31 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 862df3c9976c4da9bd7cfd784f1a85973127968a Merge: 0a4218ed9 75c1d4401 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 05:52:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0a4218ed9d541a2b34c133351bea38a99ddf4ea7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 22:27:14 2020 +0200 Fix particle depth. commit f51dfdeb442d0dd5243dd2f344fa4be295bd0875 Merge: c6251a956 5e6dc0471 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:19:04 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit c6251a956ad376400dca5c23420cf8d213dc8fdf Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:15:46 2020 +0200 Cache figures more intelligently. Cache figures for longer, and don't cache character states for the player except where they actually affect the rendered model. commit 0ed801d5404982c6fb63b1eaa4567d908b294c9d Merge: c11b9bdf0 eea64f78f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 16:32:24 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c11b9bdf0a53bf9884d2f5a48fec9b01d582df1a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 11:47:15 2020 +0200 Remove unneeded Clippy annotation. commit 16aa9ef40af56d69289d00aafb3deadfb8bd4f35 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 8 00:53:02 2020 +0200 Fix hotloading and Clippy. commit 3dc973e0be5b758da1e9805eb764ad401374cd0c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 23:50:27 2020 +0200 Major speedups with SIMD. commit fba64a7d93d5a96077ce87287bbce6ab9b7fbcae Merge: 76429d00e d1e10b178 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:19 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 76429d00eea00d212fbd672a84ee91e75b19b938 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:10 2020 +0200 Add clippy.toml. commit c79f512f84dbb83cb82b7954db68ff241dfd8e41 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 11:55:20 2020 +0200 Fix all clippy issues, clean up Rust code. commit 6f90e010b3fbefb53b0d632e819931350015b6b8 Merge: 77a8c7c26 5929cfa5c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:30 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 77a8c7c267d3f44a1a62bd6b2274359973c5e4d4 Merge: b44e44232 44febaabd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:10 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 5929cfa5c713aa392110bbb62407f76caf53c3df Author: jshipsey <jshipsey18@gmail.com> Date: Thu Aug 6 20:47:27 2020 -0400 fixed in-hand arrow bug commit b44e442325d828f1cd564d66908f89d09e80474b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 6 13:40:35 2020 +0200 Miscellaneous performance improvements. commit be37acf287c1360d8085862526ac3365ffd1d768 Merge: 125d7fc6c c11876547 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 05:49:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 125d7fc6c4dcd8c8c5f27b8268a4d64f409f3644 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 04:55:31 2020 +0200 Abstract over simd vs. repr_c vectors. Also some minor improvements to Event size. commit d4d4956e9252e1241ce110b2aa85076c6b1e2a23 Merge: 5f3b7294a aced5f979 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:56:54 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 5f3b7294af1f8533edc2620b58863c248e2b07af Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:43:52 2020 +0200 Fix formatting issues I missed before. commit a428a3ebba70dcab63dd0f8cd983120c90617271 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:41:51 2020 +0200 Fix clippy warnings, part 1. There aer still a bunch of type too complex and function takes too many arguments warnings that I'll fix later (or ignore, since in the one case I did fix a function takes too many arguments warning I think it made the code *less* readable). commit ba54307540ed8a937ac08209730284fc653af85b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 30 13:22:42 2020 +0200 Fix light animations so they are removed when the light turns off. commit 7e0f4bcbf0f4717145d8beac40d52e3acebbe2aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 21:10:20 2020 +0200 Fix crash in edge case for pixel art. commit 56da06f7a351e2b949e9b014a90b974d511a0924 Merge: cf74d55f2 9f53a4a19 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:56:52 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:29:52 2020 +0200 Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). The first concern was addressed by fixing the dimensions of the map images drawn from the UI (so that we always use a square source rectangle, rather than a rectangular one according to the dimensions of the map). We also fixed the way rotation was done in the fragment shader for north-facing sources to make it properly handle aspect ratio (this was already done for north-facing targets). Together, these fix rendering issues peculiar to rectangular maps. The second and third concerns were jointly addressed by adding an optional border color to every 2D image drawn by the UI. This turns out not to waste extra space even though we hold a full f32 color (to avoid an extra dependency on gfx's PackedColor), since voxel images already take up more space than Optiion<[f32; 4]> requires. This is then implemented automatically using the "border color" wrapping method in the attached sampler. Since this is implemented in graphics hardware, it only works (at least naively) if the actual image bounds match the texture bounds. Therefore, we altered the way the graphics cache stores images with a border color to guarantee that they are always in their own texture, whose size exactly matches their extent. Since the easiest currently exposed way to set a border color is to do so for an immutable texture, we went a bit further and added a new "immutable" texture storage type used for these cases; currently, it is always and automatically used only when there is a specified border color, but in theory there's no reason we couldn't provide immutable-only images that use the default wrapping mdoe (though clamp to border is admittedly not a great default). To fix the maps case specifically, we set the border color to a translucent version of the ocean border color. This may need tweaking going forward, which shouldn't be hard. As part of this process, we had to modify graphics replacement to make sure immutable images are *removed* when invalidated, rather than just having a validity flag unset (this is normally done by the UI to try to reuse allocations in place if images are updated in benign ways, since the texture atlases used for Ui do not support deallocation; currently this is only used for item images, so there should be no overlap with immutable image replacement, so this was purely precautionary). Since we were already touching the relevant code, we also updated the image dependency to a newer version that provides more ways to avoid allocations, and made a few other changes that should hopefully eliminate redundant most of the intermediate buffer allocations we were performing for what should be zero-cost conversions. This may slightly improve performance in some cases. commit ad18ce939940a8c697270f6e9b94db9942fd8295 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 13:21:09 2020 +0200 Fix continent scale hack. commit 36b1cb074f5b195aebd7dbbc3da7f0246a1a18ec Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 12:11:40 2020 +0200 Enable loading different sized maps without a recompile. We may want to tweak the effects of the continent_scale_hack. commit 13b6d4d534cc4814b7cb3294ca41bbfea0a6b186 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 10:55:48 2020 +0200 Removing WORLD_SIZE, part 1. Erased almost every instance of WORLD_SIZE and replaced it with a local power of two, map_size_lg (which respects certain invariants; see common/src/terrain/map.rs for more details about MapSizeLg). This also means we can avoid a dependency on the world crate from client, as desired. Now that the rest of the code is not expecting a fixed WORLD_SIZE, the next step is to arrange for maps to store their world size, and to use that world size as a basis prior to loading the map (as well, probably, as prior to configuring some of the noise functions). commit 30b1d2c6428230a9eaa0d749cdcbbd6f1cbccd78 Merge: 7d56ba31b 1377b369f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:58 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 7d56ba31b445441461b28a07fc495d7d4f047c17 Merge: 2101113b4 598f14b25 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 1377b369f6db2258e910d467a5740f31789e3ded Author: Monty Marz <m.marzouq@gmx.de> Date: Sun Jul 19 23:25:38 2020 +0200 more saturated pumpkins commit ae8d50527f93bb0616c2ad46ce4dacb63bc37c6d Author: Monty Marz <m.marzouq@gmx.de> Date: Sat Jul 18 20:29:56 2020 +0200 acacia models commit 2101113b467e691de787392d7f20f1745f5637bd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 18 18:55:25 2020 +0200 Higher detail LOD. commit add2cfae04b4385fa5590e11e2bd5229d9dee0aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 16 01:57:39 2020 +0200 Revert some irrelevant stuff. commit 2e2ab3dc1eaa59a4aef7f8d34a53d8aae4c8553a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 15 13:30:49 2020 +0200 Fixing various things about shadows. * Correcting optimal LISPSM parameter. * Figure shadows are cast when they're not visible. * Chunk shadows stay cast until you look away. * Seamless cubemaps for point lights. * Etc. commit 6c31e6b56217274285b597af297036691ea5d897 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 19:50:26 2020 +0200 Fix shadow creation. commit 6332cbe006115ae205597529cd8bbccd146c2cca Merge: be438657c 930e0028b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:47:00 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit be438657c33d7b5bfb0a9582c3ed3fd366637323 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:28:08 2020 +0200 Tweaks to shadows. Added shadow map resolution configuration, added seamless cubemaps, documented all existing rendering options, and fixed a few Clippy errors. commit 23b4058906013c7d2a40c286e20e32c5fbd897ed Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 10:11:19 2020 +0200 Fix moon, use nonlinear noise for terrain. Note that the latter has a bit of performance cost. commit 7fbe5cbfbb9dc29607957b8e62f432a4deed193d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:23:02 2020 +0200 Address lies about max texture size. commit bcfc62b5e13a1cdd83f57535fde4694720bebfd9 Merge: 75e3626a7 18a08e8fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:22:08 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 75e3626a785919f43fdcf2127c2b10e3e4df2f9f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:21:52 2020 +0200 OpenGL 3.3 minimum. commit 18a08e8fe2739f02af99a5d2cb4e7c38c49e858b Author: Monty Marz <m.marzouq@gmx.de> Date: Tue Jul 7 23:57:52 2020 +0200 settings localization commit 90c5d1ca3620092bc3ae10b2211489eb1cf6f5e8 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 21:11:48 2020 +0200 Lower near distance. commit 0e66f02b25aaddaa2dfddbbc89cd67de54a9a7b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 20:09:01 2020 +0200 All sprites sway in the wind now. commit db1401a6910bf42dcf502462c90038752ff5fbdb Merge: 69e508d8c e8b4b29d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 19:34:17 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 69e508d8c94d8973033817ca86f357e466fc7c4d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 18:41:37 2020 +0200 Make it easy to switch to SIMD for math. commit ffe0f5928c7a7e87d00cb5426b3b1d831d7e02fd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 21:21:12 2020 +0200 Fix some issues with underwater rendering. commit bfda6da42f38fd02c31ee92c81ab785a3e50c2a0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 19:17:59 2020 +0200 Fix some minor display issues. commit 0ed752e087968cf901301884aaeae698e32ef8a5 Merge: ccc6a06a8 518edcb85 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:14:21 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit ccc6a06a8d4504d6b9f7af7905a414d2ee06ab76 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:04:34 2020 +0200 Some minor changes. commit 4e020246702889269efe1a191788992164c508d6 Merge: 50a64d927 e05c9267a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 16:17:40 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 50a64d927e6c4f4b0e4688e4cbfca694bc3f922a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 13:07:03 2020 +0200 Fix far plane. commit 7dd06da34cae8f9ea3b6c889fe965181f3fd3949 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:25:35 2020 +0200 Add shadows.glsl. commit 618a18c998778bf871b905a74657440fcc384c80 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:10:22 2020 +0200 Adding shadows, greedy meshing, and more. commit eaea83fe6a5cb1cb0ba8beef888183c718258496 Merge: 267018495 2f89b863e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 22:47:07 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 2670184954a13e4a9e7a4e35ba79aac0c5fac2f7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 21:20:01 2020 +0200 Make civsim and sites deterministic. For anything in worldgen where you use a HashMap, *please* think carefully about which hasher you are going to use! This is especially true if (for some reason) you are depending on hashmap iteration order remaining stable for some aspect of worldgen. commit f8376fd5dc72b4a9c2f51a6b4570d59c8b8e9343 Merge: 654f7e049 cdee191dd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 17:53:57 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 654f7e049258d9da27c09608bbe6a46ffa8787e5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed May 20 21:22:30 2020 +0200 Correct backface culling. commit 560501df05ca725409b0f2e4eb31bdfdc15fd0c7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue May 19 17:22:06 2020 +0200 Greedy messhing for shadows. commit a4d87e1875ca543436e6bbbeb20348facc5a52d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun May 17 05:59:00 2020 +0200 Shadow maps work for lantern. commit 243d0837b8a3b08172c9a3c348d964d7ddc2a0a8 Merge: 04382dc28 71dd520cd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:53:13 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 04382dc28632b6c66e8821f6870c0daaa1c1901a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:22:17 2020 +0200 WIP: better graphics config, better LOD, shadow maps. commit 22ddbad3eb32bfa70f0932176022208fe67ded81 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 18:54:09 2020 +0200 Minor shader fixes. commit 746a10e8d01ac235f994b0cde78fa48998602a1f Merge: 0f4a0e763 40ab94673 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 04:02:09 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0f4a0e763db3afbdc4fb0558611f38326ca87151 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 23:03:24 2020 +0200 Switch back to pop-in terrain. commit dd74fa7e4a53667b38811d7aec58d7f6a68889bb Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 22:58:55 2020 +0200 LOD shading closer to voxel shading. commit ef67bd58ba0bdaf622b078892d768263b6cba268 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 28 20:49:03 2020 +0200 Experimental underwater lighting. commit 2c5ad9d07605e80d5fd5679dd3a5d70c605b86a9 Merge: 748279835 303967a6f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 22:35:24 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7482798354eda18c8207950080fc24d443a369de Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 21:59:55 2020 +0200 Replace discard in figure-frag. commit d83b4ae69be4912f69bf7835f509c68a1c7770a4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:45:57 2020 +0200 Fix sprite lighting, HDR from focus_pos. commit 0594238004f116274905fa0ed7c2b6c417ed1d29 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:14:10 2020 +0200 Proper HDR from point lights. commit 48c93d2b41ce5743103d18e76cc228f5ac766492 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 14:01:43 2020 +0200 Brighter ambiance, darker LOD shadows. commit e0452e895ccfa8a43f368cae3b8b8aedc24dad93 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 13:13:23 2020 +0200 More proper HDR. commit 4c6da3ed16cfeebb455e40da5f557b4af9a499d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 00:13:10 2020 +0200 Trying LOD noise. commit 682a3d74c85df5503ffe1fc1cc891bce789df1ad Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 23:11:08 2020 +0200 Fix LOD heights in towns. commit cc39e5734e8b18f9077bf42e66337c1319dd6b6e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 21:01:23 2020 +0200 More LOD fixes. commit 8116b21c2e51c836e77894e309ac273caf2917b3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:54:43 2020 +0200 I like this coloring. commit bc2560ea90b36f4b46190005344232d993043ac3 Merge: 14effdd5d e690efe71 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:48:33 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 14effdd5db8747fcf3eb34f03b46b7792e92d1c5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:24:35 2020 +0200 Re-saturate. commit 48a643955d4435b78179acba0beb4a979905cc31 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:23:57 2020 +0200 Various fixes. commit f7b497a0c25f4ad4682c71dd1ed6f608052feb9b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 03:22:49 2020 +0200 Render figures again. commit 44e4aad48deba8266b9f8bdfd3db096b381f5327 Merge: e6f0a5a98 9ec319a18 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 02:01:04 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit e6f0a5a981a82533ba188fff0a54ce98577bb152 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 24 16:12:20 2020 +0200 Add atmospheric scattering. commit f2953087f691a8edbc001cb98ebf5059fc6f8ac0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 23 00:01:20 2020 +0200 Fix shadowing for specular reflections. commit ddd4a67a9799b8d08c7dc0c2bec90621c2bed0e3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Apr 22 22:56:12 2020 +0200 HDR fixes. commit 1015e60deef3c447381996277df7496707a63bd0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 21 18:25:19 2020 +0200 More lighting changes. commit 80c264abd111fb237e57843efcb5c071d4f84613 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 13 00:29:59 2020 +0200 Lighting experiments. commit 8414987e589dd5102bad89762a3adaccc0bfe957 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 9 02:38:40 2020 +0200 WIP -- lighting changes and soft shadows. commit 9cd2b3fb0d6b49776c6dfe463e4169637250b11a Merge: c7ea687eb 8b149ad11 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:29 2020 +0200 Merge branch 'sharp/new-lighting' into sharp/small-fixes commit c7ea687ebbc5aace1b455f134a5bf49ce2c7434a Merge: 476441531 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:02 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 8b149ad11ad4bb75018fcf9519baec27d1c95951 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:32:39 2020 +0200 Trying out a new lighting model. commit b0ac9f36f755dd06f7c17c46150568064790864f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 07:56:11 2020 +0200 Use bicubic interpolation for terrain. commit f6fc9307a121514b614bc50ef8eb055953e7da8a Merge: 33140a295 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 05:01:41 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 4764415312aae6e9ac2d00e86e84577cb958f1ab Merge: ed2d0111d 13388ee6a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 04:54:48 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 13388ee6a42943f3f79a9cb488346cef18e272fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 20:30:08 2020 +0200 Various fixes (to coloring and to soft shadows). commit fbd084a94a067082a87cd6d28b82054709bc9265 Merge: 5a089863b 4fdf6896a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 18:50:38 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/map-colors commit ed2d0111d994262ae836d84d1fe5a45e4de72a0b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 06:49:27 2020 +0200 Combining colors and LOD. commit 88342640c6b835114d01c797b89fdede3b0a2108 Merge: 33140a295 5a089863b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:49:20 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 33140a2951b8212725f42c758b277aaec4d888f7 Merge: 4c65a5aed f34d4b379 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:36:21 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 5a089863beb01d4794bbe3580ada47b278715ea2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 03:17:49 2020 +0200 Making maps brighter. This is probably not the right way to do it, but oh well! commit 32b2c99109dd486aa922886081068f9c550c83f2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 02:46:36 2020 +0200 Horizon mapping and "layered" map generation. Horizon mapping is a method of shadow mapping specific to height maps. It can handle any angle between 0 and 90 degrees from the ground, as long as know the horizontal direction in advance, by remembering only a single angle (the "horizon angle" of the shadow map). More is explained in common/src/msg/server.rs. We also remember the approximate height of the largest occluder, to try to be able to generate soft shadows and create a vertical position where the shadows can't go higher. Additionally, map generation has been reworked. Instead of computing everything from explicit samples, we pass in sampling functions that return exactly what the map generator needs. This allows us to cleanly separate the way we sample things like altitudes and colors from the map generation process. We exploit this to generate maps *partially* on the server (with colors and rivers, but not shading). We can then send the partially completed map to the client, which can combine it with shadow information to generate the final map. This is useful for two reasons: first, it makes sure the client can apply shadow information by itself, and second, it lets us pass the unshaded map for use with level of detail functionality. For similar reasons, river generation is split out into its own layer, but for now we opt to still generate rivers on the server (since the river wire format is more complicated to compress and may require some extra work to make sure we have enough precision to draw rivers well enough for LoD). Finally, the mostly ad-hoc lighting we were performing has been (mostly) replaced with explicit Phong reflection shading (including specular highlights). Regularizing this seems useful and helps clarify the "meaning" of the various light intensities, and helps us keep a more physically plausible basis. However, its interaction with soft shadows is still imperfect, and it's not yet clear to me what we need to do to turn this into something useful for LoD. commit f8926a5737ddc51f3d585c651a64c43677aae0f4 Merge: a1aee931e 875ae6ced Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Mar 13 13:32:42 2020 +0100 Merge remote-tracking branch 'origin/master' into sharp/map-colors commit 4c65a5aed353b119aea65a2aaeb94549b67beb42 Author: Treeco <5021038-Treeco@users.noreply.gitlab.com> Date: Mon Feb 24 16:48:05 2020 +0000 Made LOD setting slider exponential commit 2fa7b2d20d7233dc8bfd64f9f7f54617575248f1 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 17:49:53 2020 +0000 Added mist to LoD commit aab059a450b5f635777129ff82cc15b662965c3c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 15:14:06 2020 +0000 Added LoD slider commit 779c36b538121c5ade3633ae5cb67bb14c8c3877 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:54:55 2020 +0000 Reduced cost of vertex pushing commit 9fea150473906b166365b738ebcea07c697daf3d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:38:53 2020 +0000 Fixed maths, improved LoD resolution commit 5481df38fea5bf183ff376a3337179cfaa5233dc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 11:22:50 2020 +0000 Dynamically relocate LoD vertices to enhance details commit a3e36a50ababd615da7db1b26158c7906a5def01 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 18:13:51 2020 +0000 Simpler terrain spiral rendering commit 255f450ae9ac8763db4bede075fb409161ed57cc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:53:17 2020 +0000 Better LoD precision commit 3d027aebe812a5b8658a4eb8123dc9f61b3776d2 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:04:03 2020 +0000 Better falloff commit be775c9484b457b2c0b1a494aec03392d0c70e76 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 15:30:45 2020 +0000 Applied good ideas from experimental branch commit 58587b68545a23c5c04ab4574a4b94b3bc982246 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 16:15:13 2020 +0000 Minor fixes to LoD merging commit 7b42aebd709c14df2db766aad61d9280ad24d84d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 15:04:44 2020 +0000 Capped LoD dragging commit 8aafc559f87124e1ea5ca6e3ddc2aa0c242d793c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:54:37 2020 +0000 Better blending between LoD and terrain border commit edd3455d5161792d87ddc8eadc0ecbad5532b284 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:40:19 2020 +0000 Fixed LoD z depth, added sea level offset commit b9b06744620114dd5556e73f64fa93c145503a7c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:27:43 2020 +0000 Better LoD smoothing commit a1aee931e790431560cd2d953ad61d9497072afd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Feb 21 14:52:17 2020 +0100 Adding shadows. commit 2400786c13dd891c131ed86d48d05df516a8a778 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 13:48:40 2020 +0000 Use world map as LoD source commit dbf650f504a4c25fbbc2096ac3616c736bf52d23 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Jan 20 00:48:14 2020 +0000 Better clouds at distance commit 5e6f81b86cdb9730b9b056877b19257075fd5fa8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Jan 19 23:59:02 2020 +0000 sync commit 745e7540ddb000cc645f612767b337c2ddc3f7c0 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 12:40:48 2019 +0000 Improved cloud falloff mist, faster noise sampling commit f6a200d0cb866196ba57697466755f9e0c7ea5d8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 10:09:00 2019 +0000 Improved long-range depth precision, removed unnecessary LoD polygons commit 63d1b2bb2292898d59fb4f4e502201103dfeb86f Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 20:57:46 2019 +0000 Working LoD shader commit f13d98ee3e58f881e8b978861a67663b59ed91ec Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 11:03:40 2019 +0000 LoD first attempt (stack overflow issue)
2020-08-20 18:34:59 +00:00
version = "0.0.6"
Allow canceling chunk generation. Currently we only do this when no players are in range of the chunk. We also send the first client who posted the chunk a message indicating that it's canceled, the hope being that this will be a performance win in single player mode since you don't have to wait three seconds to realize that the server won't generate the chunk for you. We now check an atomic flag for every column sample in a chunk. We could probably do this less frequently, but since it's a relaxed load it has essentially no performance impact on Intel architectures.
2019-10-16 11:39:41 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
(See sharp/lod-history) LOD, shadows, greedy meshing, new lighting, perf --- Pretty much a Veloren fork at this point. Here's a high level overview of the changes (will be added to CHANGELOG just before merge). At a high level this MR incorporates roughly two groups of changes. The first group consists of new game features: more flexible map sizes, level of detail terrain, shadow maps, and a new lighting engine. This is "feature work" that (mostly) only adds new things to Veloren, and mostly shouldn't affect old stuff. The second big group of changes are those addressing the fallout from all the new features. These include performance fixes of various sorts: the addition of multiple graphics options and optimization of the cheap ones to avoid work, switching all voxel models to use some variant of greedy meshing, switching over much of our CPU-side vector math to exploit SIMD instructions (coinciding with a fork of `vek`), and a rewrite of how the UI handles text rendering (coinciding with updates to our fork of `conrod`). Making Veloren's hardcoded colors appear correct under the new lighting engine also required considerably changes (TODO: Fill in this section when it's complete). The second category of changes often heavily touches code owned by other people, including frequently modified code "owned" by a handful of people, so I recommend that this code be reviewed particularly carefully. --- At a high level (each will be described in more detail below): - The world map has been refactored. - The world size is no longer hardcoded (@zesterer). - The map generation code was made generic to allow using it outside of the `world` crate (@zesterer). - On world creation, we now compute *horizon maps* (@zesterer). - The way we pass the world from the server to the client has been updated (@xMAC94x). - Artifacts related to image rotation were fixed (@imbris). - Multiflow rivers were enabled (@zesterer). - In the process of making changes related to the world map, various incidental fixes and optimizations were required. - The new *level of detail* feature was added (@zesterer wrote part of this and has checked out the rest). - A new LOD terrain rendering step was added to the pipeline. - The LOD terrain quality was made configurable via a graphics setting. - Horizon maps were used to cast shadows from LOD chunks on both LOD and non-LOD terrain. - A "voxelization" effect was incorporated into rendered LOD terrain to make it blend better into the world. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Veloren's lighting has been completely overhauled (@zesterer has already checked most of this out). - A semi-accurate index of refraction was assigned to our materials. - A new, more realistic, physically based approach to lighting was used using the *Ashikhmin Shirley* BRDF. - We emulate *atmospheric scattering* using equations designed for measuring solar panel light exposure. - We attempt to compute *realistic light attenuation* in water using its real material properties. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Point and directional lights now cast realistic shadows, using *shadow mapping.* (@imbris, @zesterer, @Treeco, @YuriMomo) - Point light shadow maps were added to the rendering pipeline, using geometry shaders and *seamless cube maps*. - Directional light shadows were added to the rendering pipeline, using LISPSM together with disabling *depth clamping*. - "Shadow-only" chunks and NPCs were added to prevent shadows from models behind you from disappearing. - In the process of making changes related to shadow maps, various incidental fixes and optimizations were required. The addition of shadow maps, LOD terrain, and the new lighting all led to significant performance degradation, on top of other changes happening in master. Therefore, a large number of performance improvements were also needed: - The graphics options were made much more flexible and configurable, and shaders were optimize. - New options were provided for how to render lights and shadows (@Pfauenauge, @zesterer). - Graphic setting storage and configuration were overhauled to make adding new features easier (@Pfauenauge, @imbris). - Shaders were rewritten to utilize GLSL's preprocessor to avoid overhead (@zesterer, @YuriMomo). - In the process of making changes related to providing additional rendering options, various incidental fixes and optimizations were required. - Voxel model creation was switched to use *greedy meshing.* - A new voxel meshing method, greedy meshing, was added (@imbris). - Uses of the older meshing methods were migrated to use greedy meshing (@imbris, @jshipsey, @Pfauenauge). - New restrictions were added to terrain, figure, and sprites to future proof them for further optimizations (@jshipsey, @Pfauenauge, @zesterer). - Most positions are now relative to either chunk or player position for better precision (@imbris, @zesterer, @scottc). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - Animation and terrain math were switched to use SIMD where possible. - Fixes were made to vek to make its SIMD feature usable for us (@zesterer, @imbris). - The interface and types used in bone animation were changed in various ways (@jshipsey, @Snowram, @Pfauenauge). - Redundant code generation for body animation is now partly taken care of by a macro (@jshipsey, @Snowram, @Pfauenauge). - Animation code was modified to to use vek's SIMD representation where possible (@jshipsey, @Snowram, @Pfauenauge). - Terrain meshing code and shadow map math were also modified to use vek's SIMD representation (@imbris). - SIMD instruction generation was enabled (@YuriMomo, @jshipsey, @Snowram, @imbris, @Angelonfira, @xMAC94x). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - The way we cache glyphs was completely refactored, fixed, and optimized. - Our fork of `conrod` was optimized in various ways (@imbris). - Our fork of `conrod` now exposes whether a widget was updated during the current frame (@imbris). - Our use of the glyph cache was rewritten for correctness (@imbris). - A *text cache* was introduced that lets us skip remeshing glyphs that have not changed (@imbris). - Various changes were made to reduce pressure on the glyph cache, with more planned (@imbris, @Pfauenauge). - In the process of making changes related to the glyph cache, various incidental fixes and optimizations were required. - Colors were changed to keep Veloren's look consistent with master. - Some older tree models were brought back (@Pfauenauge). - TODO(@Sharp): All hardcoded colors were extracted and made hotloadable. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Hardcoded colors were fixed to conform to Veloren's style. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Color models were fixed to conform to Veloren's style. A detailed description of the involved changes follows. --- - The world size is no longer hardcoded. All functions dependent on world size now take a `WorldSizeLg`, which holds the base 2 logarithm of each actual world dimension and is guaranteed to maintain certain properties (outlined in `common/src/terrain/map.rs`). Additionally, many utility functions that utilize the world size were moved into `common` as well (mostly `common/src/terrain/mod.rs`). Finally, the world map format was updated in order to store its size explicitly, with a migration path from the old format that should work whenever the old formatted map was a square (practically always). See `world/src/sim/mod.rs` for these changes. - The map generation code was made generic to allow using it outside of the `world` crate. The parts of the map generating code that do not need to query the world were moved over to `common/src/terrain/map.rs`, allowing them to be used from the client without creating a dependency on `world`. The rest of it was turned into helper functions in `world/src/sim/map.rs`, which can be passed as closures to the generic map generation code to complete its construction. This also means that colors are now passed in separately to the map generation function. See <https://veloren.net/devblog-78/> for more details. - On world creation, we now compute *horizon maps*. See the function in `world/src/sim/util.rs`. Given a height map and a plane intersecting that height map, our horizon maps allow us to encode enough information to reconstruct shadows for each point on the height map using only the *horizon angle* (the angle at which the sun starts to become visible). As Veloren's sun only covers one plane, this is sufficient for encoding sun shadows for LOD terrain, by encoding two angles per chunk (one for each 90 degrees the sun covers). We can also use this for the moon, if we want, since the moon follows the same path. Additionally, we store the *height* of the furthest occluder, to try to make the shadows volumetric; so this means 4 bytes in total for each chunk. Support for horizon maps has been merged into the map functionality in common as well. - The way we pass the world from the server to the client has been updated. Rather than passing the prerendered map, we instead pass three maps with values for each chunk; one with the color information, a second with altitude information, and a third with horizon map information. We then reconstruct the map on the client, together with some additional information we send from the server (like the sea level and maximum height). See `common/src/msg/server.rs` for a detailed description of the format of `WorldMapMsg`, and `server/src/libr.rs` and `client/src/lib.rs` for details of the map construction and parsing. - Artifacts related to image rotation were fixed. See the commit message for commit SHA `cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e` for a detailed explanation. This involved changes to shaders, the addition of a new type of graphic (also reflected in the graphic cache) that allows specifying a border color (which automatically makes the associated texture immutable), and some related fixes. I reproduce the first two paragraphs of the MR description as well: ``` Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). ``` - Multiflow rivers were enabled. This does not really need to be part of this MR, and would be easy to revert, but since it seemed to provide a nice improvement it's currently packaged with it. We already computed multiple outflows from each chunk for erosion purposes long before this MR. However, we never modified river rendering to be able to handle this case (just a single downhill river flow is complex enough!) so this was not exposed when deciding which chunks were rivers. Now that - In the process of making changes related to the world map, various incidental fixes and optimizations were required. Some examples of fixes include making sure terrain is never lowered to below sea level (to make the shadow maps report correct values), fixing map altitudes and colors to understand things like cliffs and "block level" coloring (that doesn'te xist on the column level), and fixing a crashbug when rendering images for the UI where source pixels are strongly rectangular. Some examples of related performance fixes include avoiding allocating a fresh vector for all the maps (i.e. copying it over to change the format from `[u32; n]` to `DynamicImage` and then copying again to convert to `RgbaImage`), and instead using the `gfx::memory::slice` function to accomplish the same thing. These sorts of changes are spread all arond the code. This includes the additon of a new scene, `voxygen/src/scene/lod.rs`, a new pipeline `voxygen/src/render/pipeline/lod_terrain.rs`, and new shaders `assets/vxygen/shaders/lod-terrain-vert.glsl` and `assets/vxygen/shaders/lod-terrain-frag.glsl`, as well as associated changes to the renderer in `voxygen/src/render/renderer.rs`. The main idea behind our initial approach to LOD was to take the world data we now get from the server (altitude, color, and horizon mapping). - Some previously computed values were turned into shader uniforms for better prediction on weak processors. (@zesterer) - Calls to power or trig functions were removed or replaced with multiplications, where possible. - After some deliberation - To properly handle sprite "waving" for nearby sprites, We explicitly designed the greedy meshing system with figures and sprites in mind. In both cases, we want to be able to *efficiently* pack many different models into the same texture, especially in cases where we know we will either not be removing any of the grouped-together from the models from the texture, or will remove all of them at once (so they can be packed into some specific subtexture). For sprites, since we know every model in advance and never intend to deallocate them, we currently pack them all as efficiently as possible into one giant tetxure atlas. However, in the future we might opt to pack them slightly less efficiently in exchange for shrinking the sprite vertex size. For figures, we pack all the textures for each *model* into the same atlas. is a global texture atlas used for every sprite, and for figures which is why we have the ability to mesh multiple models to the same texture area (using the simple texture atlas allocator) without requiring intermediate vector allocations. This is accomplished by delaying the time when we actually write the color and light data to the texture until *after* all the model vertices have been meshed; then, we can just allocate the whole color/light array at once, making the atlas we use an exact fit. In computer science-y terms, we accomplish this delay by, after we perform the initial greedy meshing (without texture information), not continuing to create the texture data, but instead constructing a *continuation*--that is, a function that, when called, will execute the rest of the computation. We push this continuation (which in Rust terms is a `FnOnce` closure that takes the `ColLightsInfo` that it is supposed to write to as context) onto a onto a vector resizing. To allow for suspended writes to texture data, Rust pointed out to me that the continuation that would eventually write the color and light data to the texture atlas (the one that is shared by all models sharing the same greedy mesher) would have to *own* whatever data it mshed. Because we often generate the model data to mesh as a temporary in `voxygen/src/load.rs`, the - Matrix multiplications in the shader were reduced for figure data (@zesterer). - Vertex "waves" for fluid data were removed. - Terrain "bending" near edges was removed. - Scaling was fixed to make sure empty space was not introduced in a space previously occupied by a block. It was also changed to take ownership of its voxel data, rather than sharing it, to let it be used with meshing. - Rust's nightly version was bumped in order to use the `array_map` function, which lets us reuse more code between the simple map and `FigureModelCache`. - PositionedGlyph::standalone. --- I tried to cite sources in many cases[^realtime],[^lloyd],[^lispsm],[^pbrt],[^greedy],[^tjunctions] where I needed features from elsewhere but I am particularly grateful for the following resources, esepcially where they have accompanying source code. I linked all of them that are accessible to the public (those that are not were obtained through legal means). [^realtime]: Eisemann, Elmar, Michael Schwarz, Ulf Assarsson, Michael Wimmer. Real-Time Shadows. A K Peters/CRC Press (T&F), 20160419. [^lloyd]: Lloyd,B. 2007. [Logarithmic perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). PhD thesis, University of North Carolina. [^lispsm]: Wimmer, M., Scherzer, D., and Purgathofer, W. 2004. [Light space perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). In Proceedings of Eurographics Symposium on Rendering 2004, pp. 143– 152. [^pbrt]: Pharr, Matt, et al. [http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf](Physically Based Rendering: From Theory to Implementation). Third edition, Morgan Kaufmann Publishers/Elsevier, 2017. [^greedy]: mikolalysenko. “Meshing in a Minecraft Game.” 0 FPS, 30 June 2012, <https://0fps.net/2012/06/30/meshing-in-a-minecraft-game/>. [^tjunctions]: blackflux. “Meshing in Voxel Engines – Part 1.” Blackflux.Com, 23 Feb. 2014, <https://blackflux.wordpress.com/2014/02/23/meshing-in-voxel-engines-part-1/>. I am also especially grateful to Khronos, Wikiepdia, and stackoverflow for answering many of my specific questions while writing the MR. --- Squashed commit of the following: commit 300505e7305a2fdac722a808ee8538323f215f39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 18:46:25 2020 +0200 Fixing cargo doc and typo in CHANGELOG. commit ec0aeb18e8499d7d84ef818331b4b65c3d76cea6 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 15:38:50 2020 +0200 Hopefully final commit for the LOD branch. commit 5e8ea0b1eaac02903a02feb2eb038d195de4872f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 10:14:26 2020 +0200 Falling back to power as stopgap. commit e44a1cbf46504ee9931a01bdc9033e145500d557 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 09:25:41 2020 +0200 Address imbris feedback. Temporarily disables shiny water, lowers max VD. These restrictions will be lifted soon after merging. commit 561e25778a108ac3712f5ec2ce3a51234c4430d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 08:31:13 2020 +0200 Tweaking shaders a bit. commit 7d19259078ce0dd7b3742ad7d0cb3fab3ece3fdc Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:59:43 2020 +0200 Fix view example as well. commit 051cd4934e0fad2c0b15db4380a4189fa318679f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:29:06 2020 +0200 Fix meshing benchmark. commit c95e07db3b4dcca285678985e65e31b927cb1c61 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 05:46:22 2020 +0200 Address MR feedback, fix scene clouds. commit 1bfb816cabdb3ffc1e507a009c2d98696b4b573a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:39:36 2020 +0200 Incorporating Pfau's figure color changes. New eyes and new humanoid colors. commit 3f9b89a3ac7b3356b1dba0d1a8f6541357f81469 Merge: e2f5162e4 62c53963a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:29:41 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit e2f5162e4f96f4124aa43488f7245d341b3dcfd4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:28:38 2020 +0200 World colors are all hotloadable. They live in assets/world/style/colors.ron. Only a small handful of hardcoed colors remain in World; they are either part of the map, or difficult to disentangle from the rest of the computation. Comments are made where appropriate. commit 62c53963abe1975009d34a8f9515a355bef24f31 Author: Marcel Märtens <marcel.cochem@googlemail.com> Date: Wed Aug 19 15:59:00 2020 +0200 replace pretty_env_logger with tracing commit 5b1625f99d9586fe80e2232f583ec5af9f953099 Merge: d71003acd 4942b5b39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:15:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit d71003acdabeff970b3928e97c26af6847b5b78e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:14:34 2020 +0200 Hotloading colors, part 1: colors in common. Currently, this just entails humanoid colors. There are only three colors not handled; the light emitter colors in common/src/comp/inventory/item/tool.rs. These don't seem important enough to me to warrant making hotloadable, at least not right now, but if it's needed later we can always add them to the file. commit 63b5e0e553eb2ea49276f192a6fc7dd65254270d Merge: c32b337a4 6d2c4b9c1 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 13:05:37 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c32b337a46e10d9de473d178a94a3ccd61c39bb3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:52:04 2020 +0200 Fixing LOD grid, for real. commit a166ae0360395387e09fb35a1f84210c2ce5ec24 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:28:05 2020 +0200 Addressing imbris's initial feedback. Fixes two minor bugs: explosion particles were no longer spawning randomly, and LOD grids were not perfectly even. commit 4cbad004f44060994252dd3d38647a14a589712f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:27:58 2020 +0200 Bumping nightly per request. commit 548680276aac77c25d43d16b5622f847d474dbef Merge: acc098604 8f8b20c91 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:26:06 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit acc0986040589a3492f88a740bc3c3fc693b26d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:28:32 2020 +0200 Lower resolution due to lying drivers. commit d3b878de2a52c358d2944a6bbd0555dad7fbdb10 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:15:38 2020 +0200 Fix issues msh encountered with Intel 4600. commit 10245e0c1b0cb6fae10d86409435364edc6102ef Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 21:15:02 2020 +0200 Merge more models into one mesh than we did previously. commit 3155c31e663c52ae5c3a53d5fb5665892a1a498a Merge: 7204cc8a7 3c199280e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:35:22 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7204cc8a7a4f74a30306bd205d9834fee4bb944f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:34:43 2020 +0200 Fix not yet done NPC animations. This forces them all to be the idle animation if not specified. This fixes issues where you'd have giant NPCs in water. commit bc83360f2a08918f19d417b5f772e1ff554dba08 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 19:36:37 2020 +0200 Try to fix some bugs: - Z fighting with LOD terrain and water. - Audio SFX not playing. commit 1fd104aa603bf3781b6526a5cada46aeca3049dd Merge: 862df3c99 7c2c392a3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 12:02:31 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 862df3c9976c4da9bd7cfd784f1a85973127968a Merge: 0a4218ed9 75c1d4401 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 05:52:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0a4218ed9d541a2b34c133351bea38a99ddf4ea7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 22:27:14 2020 +0200 Fix particle depth. commit f51dfdeb442d0dd5243dd2f344fa4be295bd0875 Merge: c6251a956 5e6dc0471 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:19:04 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit c6251a956ad376400dca5c23420cf8d213dc8fdf Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:15:46 2020 +0200 Cache figures more intelligently. Cache figures for longer, and don't cache character states for the player except where they actually affect the rendered model. commit 0ed801d5404982c6fb63b1eaa4567d908b294c9d Merge: c11b9bdf0 eea64f78f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 16:32:24 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c11b9bdf0a53bf9884d2f5a48fec9b01d582df1a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 11:47:15 2020 +0200 Remove unneeded Clippy annotation. commit 16aa9ef40af56d69289d00aafb3deadfb8bd4f35 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 8 00:53:02 2020 +0200 Fix hotloading and Clippy. commit 3dc973e0be5b758da1e9805eb764ad401374cd0c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 23:50:27 2020 +0200 Major speedups with SIMD. commit fba64a7d93d5a96077ce87287bbce6ab9b7fbcae Merge: 76429d00e d1e10b178 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:19 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 76429d00eea00d212fbd672a84ee91e75b19b938 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:10 2020 +0200 Add clippy.toml. commit c79f512f84dbb83cb82b7954db68ff241dfd8e41 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 11:55:20 2020 +0200 Fix all clippy issues, clean up Rust code. commit 6f90e010b3fbefb53b0d632e819931350015b6b8 Merge: 77a8c7c26 5929cfa5c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:30 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 77a8c7c267d3f44a1a62bd6b2274359973c5e4d4 Merge: b44e44232 44febaabd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:10 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 5929cfa5c713aa392110bbb62407f76caf53c3df Author: jshipsey <jshipsey18@gmail.com> Date: Thu Aug 6 20:47:27 2020 -0400 fixed in-hand arrow bug commit b44e442325d828f1cd564d66908f89d09e80474b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 6 13:40:35 2020 +0200 Miscellaneous performance improvements. commit be37acf287c1360d8085862526ac3365ffd1d768 Merge: 125d7fc6c c11876547 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 05:49:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 125d7fc6c4dcd8c8c5f27b8268a4d64f409f3644 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 04:55:31 2020 +0200 Abstract over simd vs. repr_c vectors. Also some minor improvements to Event size. commit d4d4956e9252e1241ce110b2aa85076c6b1e2a23 Merge: 5f3b7294a aced5f979 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:56:54 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 5f3b7294af1f8533edc2620b58863c248e2b07af Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:43:52 2020 +0200 Fix formatting issues I missed before. commit a428a3ebba70dcab63dd0f8cd983120c90617271 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:41:51 2020 +0200 Fix clippy warnings, part 1. There aer still a bunch of type too complex and function takes too many arguments warnings that I'll fix later (or ignore, since in the one case I did fix a function takes too many arguments warning I think it made the code *less* readable). commit ba54307540ed8a937ac08209730284fc653af85b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 30 13:22:42 2020 +0200 Fix light animations so they are removed when the light turns off. commit 7e0f4bcbf0f4717145d8beac40d52e3acebbe2aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 21:10:20 2020 +0200 Fix crash in edge case for pixel art. commit 56da06f7a351e2b949e9b014a90b974d511a0924 Merge: cf74d55f2 9f53a4a19 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:56:52 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:29:52 2020 +0200 Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). The first concern was addressed by fixing the dimensions of the map images drawn from the UI (so that we always use a square source rectangle, rather than a rectangular one according to the dimensions of the map). We also fixed the way rotation was done in the fragment shader for north-facing sources to make it properly handle aspect ratio (this was already done for north-facing targets). Together, these fix rendering issues peculiar to rectangular maps. The second and third concerns were jointly addressed by adding an optional border color to every 2D image drawn by the UI. This turns out not to waste extra space even though we hold a full f32 color (to avoid an extra dependency on gfx's PackedColor), since voxel images already take up more space than Optiion<[f32; 4]> requires. This is then implemented automatically using the "border color" wrapping method in the attached sampler. Since this is implemented in graphics hardware, it only works (at least naively) if the actual image bounds match the texture bounds. Therefore, we altered the way the graphics cache stores images with a border color to guarantee that they are always in their own texture, whose size exactly matches their extent. Since the easiest currently exposed way to set a border color is to do so for an immutable texture, we went a bit further and added a new "immutable" texture storage type used for these cases; currently, it is always and automatically used only when there is a specified border color, but in theory there's no reason we couldn't provide immutable-only images that use the default wrapping mdoe (though clamp to border is admittedly not a great default). To fix the maps case specifically, we set the border color to a translucent version of the ocean border color. This may need tweaking going forward, which shouldn't be hard. As part of this process, we had to modify graphics replacement to make sure immutable images are *removed* when invalidated, rather than just having a validity flag unset (this is normally done by the UI to try to reuse allocations in place if images are updated in benign ways, since the texture atlases used for Ui do not support deallocation; currently this is only used for item images, so there should be no overlap with immutable image replacement, so this was purely precautionary). Since we were already touching the relevant code, we also updated the image dependency to a newer version that provides more ways to avoid allocations, and made a few other changes that should hopefully eliminate redundant most of the intermediate buffer allocations we were performing for what should be zero-cost conversions. This may slightly improve performance in some cases. commit ad18ce939940a8c697270f6e9b94db9942fd8295 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 13:21:09 2020 +0200 Fix continent scale hack. commit 36b1cb074f5b195aebd7dbbc3da7f0246a1a18ec Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 12:11:40 2020 +0200 Enable loading different sized maps without a recompile. We may want to tweak the effects of the continent_scale_hack. commit 13b6d4d534cc4814b7cb3294ca41bbfea0a6b186 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 10:55:48 2020 +0200 Removing WORLD_SIZE, part 1. Erased almost every instance of WORLD_SIZE and replaced it with a local power of two, map_size_lg (which respects certain invariants; see common/src/terrain/map.rs for more details about MapSizeLg). This also means we can avoid a dependency on the world crate from client, as desired. Now that the rest of the code is not expecting a fixed WORLD_SIZE, the next step is to arrange for maps to store their world size, and to use that world size as a basis prior to loading the map (as well, probably, as prior to configuring some of the noise functions). commit 30b1d2c6428230a9eaa0d749cdcbbd6f1cbccd78 Merge: 7d56ba31b 1377b369f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:58 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 7d56ba31b445441461b28a07fc495d7d4f047c17 Merge: 2101113b4 598f14b25 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 1377b369f6db2258e910d467a5740f31789e3ded Author: Monty Marz <m.marzouq@gmx.de> Date: Sun Jul 19 23:25:38 2020 +0200 more saturated pumpkins commit ae8d50527f93bb0616c2ad46ce4dacb63bc37c6d Author: Monty Marz <m.marzouq@gmx.de> Date: Sat Jul 18 20:29:56 2020 +0200 acacia models commit 2101113b467e691de787392d7f20f1745f5637bd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 18 18:55:25 2020 +0200 Higher detail LOD. commit add2cfae04b4385fa5590e11e2bd5229d9dee0aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 16 01:57:39 2020 +0200 Revert some irrelevant stuff. commit 2e2ab3dc1eaa59a4aef7f8d34a53d8aae4c8553a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 15 13:30:49 2020 +0200 Fixing various things about shadows. * Correcting optimal LISPSM parameter. * Figure shadows are cast when they're not visible. * Chunk shadows stay cast until you look away. * Seamless cubemaps for point lights. * Etc. commit 6c31e6b56217274285b597af297036691ea5d897 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 19:50:26 2020 +0200 Fix shadow creation. commit 6332cbe006115ae205597529cd8bbccd146c2cca Merge: be438657c 930e0028b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:47:00 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit be438657c33d7b5bfb0a9582c3ed3fd366637323 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:28:08 2020 +0200 Tweaks to shadows. Added shadow map resolution configuration, added seamless cubemaps, documented all existing rendering options, and fixed a few Clippy errors. commit 23b4058906013c7d2a40c286e20e32c5fbd897ed Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 10:11:19 2020 +0200 Fix moon, use nonlinear noise for terrain. Note that the latter has a bit of performance cost. commit 7fbe5cbfbb9dc29607957b8e62f432a4deed193d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:23:02 2020 +0200 Address lies about max texture size. commit bcfc62b5e13a1cdd83f57535fde4694720bebfd9 Merge: 75e3626a7 18a08e8fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:22:08 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 75e3626a785919f43fdcf2127c2b10e3e4df2f9f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:21:52 2020 +0200 OpenGL 3.3 minimum. commit 18a08e8fe2739f02af99a5d2cb4e7c38c49e858b Author: Monty Marz <m.marzouq@gmx.de> Date: Tue Jul 7 23:57:52 2020 +0200 settings localization commit 90c5d1ca3620092bc3ae10b2211489eb1cf6f5e8 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 21:11:48 2020 +0200 Lower near distance. commit 0e66f02b25aaddaa2dfddbbc89cd67de54a9a7b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 20:09:01 2020 +0200 All sprites sway in the wind now. commit db1401a6910bf42dcf502462c90038752ff5fbdb Merge: 69e508d8c e8b4b29d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 19:34:17 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 69e508d8c94d8973033817ca86f357e466fc7c4d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 18:41:37 2020 +0200 Make it easy to switch to SIMD for math. commit ffe0f5928c7a7e87d00cb5426b3b1d831d7e02fd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 21:21:12 2020 +0200 Fix some issues with underwater rendering. commit bfda6da42f38fd02c31ee92c81ab785a3e50c2a0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 19:17:59 2020 +0200 Fix some minor display issues. commit 0ed752e087968cf901301884aaeae698e32ef8a5 Merge: ccc6a06a8 518edcb85 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:14:21 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit ccc6a06a8d4504d6b9f7af7905a414d2ee06ab76 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:04:34 2020 +0200 Some minor changes. commit 4e020246702889269efe1a191788992164c508d6 Merge: 50a64d927 e05c9267a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 16:17:40 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 50a64d927e6c4f4b0e4688e4cbfca694bc3f922a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 13:07:03 2020 +0200 Fix far plane. commit 7dd06da34cae8f9ea3b6c889fe965181f3fd3949 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:25:35 2020 +0200 Add shadows.glsl. commit 618a18c998778bf871b905a74657440fcc384c80 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:10:22 2020 +0200 Adding shadows, greedy meshing, and more. commit eaea83fe6a5cb1cb0ba8beef888183c718258496 Merge: 267018495 2f89b863e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 22:47:07 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 2670184954a13e4a9e7a4e35ba79aac0c5fac2f7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 21:20:01 2020 +0200 Make civsim and sites deterministic. For anything in worldgen where you use a HashMap, *please* think carefully about which hasher you are going to use! This is especially true if (for some reason) you are depending on hashmap iteration order remaining stable for some aspect of worldgen. commit f8376fd5dc72b4a9c2f51a6b4570d59c8b8e9343 Merge: 654f7e049 cdee191dd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 17:53:57 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 654f7e049258d9da27c09608bbe6a46ffa8787e5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed May 20 21:22:30 2020 +0200 Correct backface culling. commit 560501df05ca725409b0f2e4eb31bdfdc15fd0c7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue May 19 17:22:06 2020 +0200 Greedy messhing for shadows. commit a4d87e1875ca543436e6bbbeb20348facc5a52d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun May 17 05:59:00 2020 +0200 Shadow maps work for lantern. commit 243d0837b8a3b08172c9a3c348d964d7ddc2a0a8 Merge: 04382dc28 71dd520cd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:53:13 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 04382dc28632b6c66e8821f6870c0daaa1c1901a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:22:17 2020 +0200 WIP: better graphics config, better LOD, shadow maps. commit 22ddbad3eb32bfa70f0932176022208fe67ded81 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 18:54:09 2020 +0200 Minor shader fixes. commit 746a10e8d01ac235f994b0cde78fa48998602a1f Merge: 0f4a0e763 40ab94673 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 04:02:09 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0f4a0e763db3afbdc4fb0558611f38326ca87151 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 23:03:24 2020 +0200 Switch back to pop-in terrain. commit dd74fa7e4a53667b38811d7aec58d7f6a68889bb Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 22:58:55 2020 +0200 LOD shading closer to voxel shading. commit ef67bd58ba0bdaf622b078892d768263b6cba268 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 28 20:49:03 2020 +0200 Experimental underwater lighting. commit 2c5ad9d07605e80d5fd5679dd3a5d70c605b86a9 Merge: 748279835 303967a6f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 22:35:24 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7482798354eda18c8207950080fc24d443a369de Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 21:59:55 2020 +0200 Replace discard in figure-frag. commit d83b4ae69be4912f69bf7835f509c68a1c7770a4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:45:57 2020 +0200 Fix sprite lighting, HDR from focus_pos. commit 0594238004f116274905fa0ed7c2b6c417ed1d29 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:14:10 2020 +0200 Proper HDR from point lights. commit 48c93d2b41ce5743103d18e76cc228f5ac766492 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 14:01:43 2020 +0200 Brighter ambiance, darker LOD shadows. commit e0452e895ccfa8a43f368cae3b8b8aedc24dad93 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 13:13:23 2020 +0200 More proper HDR. commit 4c6da3ed16cfeebb455e40da5f557b4af9a499d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 00:13:10 2020 +0200 Trying LOD noise. commit 682a3d74c85df5503ffe1fc1cc891bce789df1ad Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 23:11:08 2020 +0200 Fix LOD heights in towns. commit cc39e5734e8b18f9077bf42e66337c1319dd6b6e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 21:01:23 2020 +0200 More LOD fixes. commit 8116b21c2e51c836e77894e309ac273caf2917b3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:54:43 2020 +0200 I like this coloring. commit bc2560ea90b36f4b46190005344232d993043ac3 Merge: 14effdd5d e690efe71 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:48:33 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 14effdd5db8747fcf3eb34f03b46b7792e92d1c5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:24:35 2020 +0200 Re-saturate. commit 48a643955d4435b78179acba0beb4a979905cc31 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:23:57 2020 +0200 Various fixes. commit f7b497a0c25f4ad4682c71dd1ed6f608052feb9b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 03:22:49 2020 +0200 Render figures again. commit 44e4aad48deba8266b9f8bdfd3db096b381f5327 Merge: e6f0a5a98 9ec319a18 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 02:01:04 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit e6f0a5a981a82533ba188fff0a54ce98577bb152 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 24 16:12:20 2020 +0200 Add atmospheric scattering. commit f2953087f691a8edbc001cb98ebf5059fc6f8ac0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 23 00:01:20 2020 +0200 Fix shadowing for specular reflections. commit ddd4a67a9799b8d08c7dc0c2bec90621c2bed0e3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Apr 22 22:56:12 2020 +0200 HDR fixes. commit 1015e60deef3c447381996277df7496707a63bd0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 21 18:25:19 2020 +0200 More lighting changes. commit 80c264abd111fb237e57843efcb5c071d4f84613 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 13 00:29:59 2020 +0200 Lighting experiments. commit 8414987e589dd5102bad89762a3adaccc0bfe957 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 9 02:38:40 2020 +0200 WIP -- lighting changes and soft shadows. commit 9cd2b3fb0d6b49776c6dfe463e4169637250b11a Merge: c7ea687eb 8b149ad11 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:29 2020 +0200 Merge branch 'sharp/new-lighting' into sharp/small-fixes commit c7ea687ebbc5aace1b455f134a5bf49ce2c7434a Merge: 476441531 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:02 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 8b149ad11ad4bb75018fcf9519baec27d1c95951 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:32:39 2020 +0200 Trying out a new lighting model. commit b0ac9f36f755dd06f7c17c46150568064790864f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 07:56:11 2020 +0200 Use bicubic interpolation for terrain. commit f6fc9307a121514b614bc50ef8eb055953e7da8a Merge: 33140a295 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 05:01:41 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 4764415312aae6e9ac2d00e86e84577cb958f1ab Merge: ed2d0111d 13388ee6a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 04:54:48 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 13388ee6a42943f3f79a9cb488346cef18e272fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 20:30:08 2020 +0200 Various fixes (to coloring and to soft shadows). commit fbd084a94a067082a87cd6d28b82054709bc9265 Merge: 5a089863b 4fdf6896a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 18:50:38 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/map-colors commit ed2d0111d994262ae836d84d1fe5a45e4de72a0b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 06:49:27 2020 +0200 Combining colors and LOD. commit 88342640c6b835114d01c797b89fdede3b0a2108 Merge: 33140a295 5a089863b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:49:20 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 33140a2951b8212725f42c758b277aaec4d888f7 Merge: 4c65a5aed f34d4b379 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:36:21 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 5a089863beb01d4794bbe3580ada47b278715ea2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 03:17:49 2020 +0200 Making maps brighter. This is probably not the right way to do it, but oh well! commit 32b2c99109dd486aa922886081068f9c550c83f2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 02:46:36 2020 +0200 Horizon mapping and "layered" map generation. Horizon mapping is a method of shadow mapping specific to height maps. It can handle any angle between 0 and 90 degrees from the ground, as long as know the horizontal direction in advance, by remembering only a single angle (the "horizon angle" of the shadow map). More is explained in common/src/msg/server.rs. We also remember the approximate height of the largest occluder, to try to be able to generate soft shadows and create a vertical position where the shadows can't go higher. Additionally, map generation has been reworked. Instead of computing everything from explicit samples, we pass in sampling functions that return exactly what the map generator needs. This allows us to cleanly separate the way we sample things like altitudes and colors from the map generation process. We exploit this to generate maps *partially* on the server (with colors and rivers, but not shading). We can then send the partially completed map to the client, which can combine it with shadow information to generate the final map. This is useful for two reasons: first, it makes sure the client can apply shadow information by itself, and second, it lets us pass the unshaded map for use with level of detail functionality. For similar reasons, river generation is split out into its own layer, but for now we opt to still generate rivers on the server (since the river wire format is more complicated to compress and may require some extra work to make sure we have enough precision to draw rivers well enough for LoD). Finally, the mostly ad-hoc lighting we were performing has been (mostly) replaced with explicit Phong reflection shading (including specular highlights). Regularizing this seems useful and helps clarify the "meaning" of the various light intensities, and helps us keep a more physically plausible basis. However, its interaction with soft shadows is still imperfect, and it's not yet clear to me what we need to do to turn this into something useful for LoD. commit f8926a5737ddc51f3d585c651a64c43677aae0f4 Merge: a1aee931e 875ae6ced Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Mar 13 13:32:42 2020 +0100 Merge remote-tracking branch 'origin/master' into sharp/map-colors commit 4c65a5aed353b119aea65a2aaeb94549b67beb42 Author: Treeco <5021038-Treeco@users.noreply.gitlab.com> Date: Mon Feb 24 16:48:05 2020 +0000 Made LOD setting slider exponential commit 2fa7b2d20d7233dc8bfd64f9f7f54617575248f1 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 17:49:53 2020 +0000 Added mist to LoD commit aab059a450b5f635777129ff82cc15b662965c3c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 15:14:06 2020 +0000 Added LoD slider commit 779c36b538121c5ade3633ae5cb67bb14c8c3877 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:54:55 2020 +0000 Reduced cost of vertex pushing commit 9fea150473906b166365b738ebcea07c697daf3d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:38:53 2020 +0000 Fixed maths, improved LoD resolution commit 5481df38fea5bf183ff376a3337179cfaa5233dc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 11:22:50 2020 +0000 Dynamically relocate LoD vertices to enhance details commit a3e36a50ababd615da7db1b26158c7906a5def01 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 18:13:51 2020 +0000 Simpler terrain spiral rendering commit 255f450ae9ac8763db4bede075fb409161ed57cc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:53:17 2020 +0000 Better LoD precision commit 3d027aebe812a5b8658a4eb8123dc9f61b3776d2 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:04:03 2020 +0000 Better falloff commit be775c9484b457b2c0b1a494aec03392d0c70e76 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 15:30:45 2020 +0000 Applied good ideas from experimental branch commit 58587b68545a23c5c04ab4574a4b94b3bc982246 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 16:15:13 2020 +0000 Minor fixes to LoD merging commit 7b42aebd709c14df2db766aad61d9280ad24d84d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 15:04:44 2020 +0000 Capped LoD dragging commit 8aafc559f87124e1ea5ca6e3ddc2aa0c242d793c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:54:37 2020 +0000 Better blending between LoD and terrain border commit edd3455d5161792d87ddc8eadc0ecbad5532b284 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:40:19 2020 +0000 Fixed LoD z depth, added sea level offset commit b9b06744620114dd5556e73f64fa93c145503a7c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:27:43 2020 +0000 Better LoD smoothing commit a1aee931e790431560cd2d953ad61d9497072afd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Feb 21 14:52:17 2020 +0100 Adding shadows. commit 2400786c13dd891c131ed86d48d05df516a8a778 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 13:48:40 2020 +0000 Use world map as LoD source commit dbf650f504a4c25fbbc2096ac3616c736bf52d23 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Jan 20 00:48:14 2020 +0000 Better clouds at distance commit 5e6f81b86cdb9730b9b056877b19257075fd5fa8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Jan 19 23:59:02 2020 +0000 sync commit 745e7540ddb000cc645f612767b337c2ddc3f7c0 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 12:40:48 2019 +0000 Improved cloud falloff mist, faster noise sampling commit f6a200d0cb866196ba57697466755f9e0c7ea5d8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 10:09:00 2019 +0000 Improved long-range depth precision, removed unnecessary LoD polygons commit 63d1b2bb2292898d59fb4f4e502201103dfeb86f Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 20:57:46 2019 +0000 Working LoD shader commit f13d98ee3e58f881e8b978861a67663b59ed91ec Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 11:03:40 2019 +0000 LoD first attempt (stack overflow issue)
2020-08-20 18:34:59 +00:00
checksum = "84348444bd7ad45729d0c49a4240d7cdc11c9d512c06c5ad1835c1ad4acda6db"
Allow canceling chunk generation. Currently we only do this when no players are in range of the chunk. We also send the first client who posted the chunk a message indicating that it's canceled, the hope being that this will be a performance win in single player mode since you don't have to wait three seconds to realize that the server won't generate the chunk for you. We now check an atomic flag for every column sample in a chunk. We could probably do this less frequently, but since it's a relaxed load it has essentially no performance impact on Intel architectures.
2019-10-16 11:39:41 +00:00
Update wgpu, cleanup a bit of commented shader code, improve sprite LOD selection code
2021-05-15 05:08:20 +00:00
[[package]]
name = "rose_tree"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "284de9dae38774e2813aaabd7e947b4a6fe9b8c58c2309f754a487cdd50de1c2"
dependencies = [
"petgraph 0.5.1",
]
Add benchmark for color quantization using the rtree crate.
2021-07-01 17:41:37 +00:00
[[package]]
name = "rstar"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.9.2"
Add benchmark for color quantization using the rtree crate.
2021-07-01 17:41:37 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "1fc6fc513b8c3853e43a0c3f909ded14ffa82e5170c9c5f6fb175f9c85c8a433"
Add benchmark for color quantization using the rtree crate.
2021-07-01 17:41:37 +00:00
dependencies = [
"heapless 0.6.1",
"num-traits",
"pdqselect",
"smallvec",
]
* Replaced `diesel` with `rusqlite` and `refinery` * Added "migration of migrations" to transfer the data from the __diesel_schema_migrations table to the refinery_schema_history table * Removed all down migrations as refinery does not support down migrations * Changed all diesel up migrations to refinery naming format * Added --sql-log-mode parameter to veloren-server-cli to allow SQL tracing and profiling * Added /disconnect_all_players admin command * Added disconnectall CLI command * Fixes for several potential persistence-related race conditions
2021-04-13 22:05:47 +00:00
[[package]]
name = "rusqlite"
version = "0.24.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d5f38ee71cbab2c827ec0ac24e76f82eca723cee92c509a65f67dee393c25112"
dependencies = [
"bitflags",
"fallible-iterator",
"fallible-streaming-iterator",
"hashlink",
"lazy_static",
"libsqlite3-sys",
"memchr",
"smallvec",
]
Update auth to use new hashing scheme.
2020-01-05 22:37:40 +00:00
[[package]]
name = "rust-argon2"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
version = "0.8.3"
Update auth to use new hashing scheme.
2020-01-05 22:37:40 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb"
Update auth to use new hashing scheme.
2020-01-05 22:37:40 +00:00
dependencies = [
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
"base64",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"blake2b_simd",
"constant_time_eq",
Update auth to use new hashing scheme.
2020-01-05 22:37:40 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "rustc-demangle"
update crates
2021-09-20 10:05:41 +00:00
version = "0.1.21"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "rustc-hash"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
version = "1.1.0"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
Add Linux support
2019-06-19 19:25:08 +00:00
[[package]]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
name = "rustc_version"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
update dependencies
2021-06-04 07:44:30 +00:00
"semver 0.9.0",
]
[[package]]
name = "rustc_version"
update depednencies
2021-07-08 10:21:02 +00:00
version = "0.4.0"
update dependencies
2021-06-04 07:44:30 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update depednencies
2021-07-08 10:21:02 +00:00
checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
update dependencies
2021-06-04 07:44:30 +00:00
dependencies = [
update crates
2021-09-20 10:05:41 +00:00
"semver 1.0.4",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
[[package]]
name = "rustls"
update dependencies
2021-06-04 07:44:30 +00:00
version = "0.19.1"
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies
2021-06-04 07:44:30 +00:00
checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7"
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
dependencies = [
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
"base64",
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
"log",
"ring",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"sct 0.6.1",
"webpki 0.21.4",
]
[[package]]
name = "rustls"
version = "0.20.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dac4581f0fc0e0efd529d069e8189ec7b90b8e7680e21beb35141bdc45f36040"
dependencies = [
update other binaries
2021-11-19 14:40:59 +00:00
"log",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"ring",
"sct 0.7.0",
"webpki 0.22.0",
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
]
Update chat-cli to work properly. Update reqwest to 0.10.0
2020-01-02 09:49:48 +00:00
[[package]]
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
name = "rustls-native-certs"
version = "0.5.0"
Update chat-cli to work properly. Update reqwest to 0.10.0
2020-01-02 09:49:48 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092"
Update chat-cli to work properly. Update reqwest to 0.10.0
2020-01-02 09:49:48 +00:00
dependencies = [
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
"openssl-probe",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"rustls 0.19.1",
"schannel",
"security-framework",
]
[[package]]
name = "rustls-native-certs"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5ca9ebdfa27d3fc180e42879037b5338ab1c040c06affd00d8338598e7800943"
dependencies = [
"openssl-probe",
"rustls-pemfile",
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
"schannel",
"security-framework",
Update chat-cli to work properly. Update reqwest to 0.10.0
2020-01-02 09:49:48 +00:00
]
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
[[package]]
name = "rustls-pemfile"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9"
dependencies = [
"base64",
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "rusttype"
Updated toolchain version and a bunch of deps.
2019-09-06 05:16:11 +00:00
version = "0.7.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "310942406a39981bed7e12b09182a221a29e0990f3e7e0c971f131922ed135d5"
Updated toolchain version and a bunch of deps.
2019-09-06 05:16:11 +00:00
dependencies = [
fix workspaces and Cargo dependencies
2020-05-27 16:20:16 +00:00
"rusttype 0.8.3",
Updated toolchain version and a bunch of deps.
2019-09-06 05:16:11 +00:00
]
[[package]]
name = "rusttype"
fix workspaces and Cargo dependencies
2020-05-27 16:20:16 +00:00
version = "0.8.3"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
fix workspaces and Cargo dependencies
2020-05-27 16:20:16 +00:00
checksum = "9f61411055101f7b60ecf1041d87fb74205fb20b0c7a723f07ef39174cf6b4c0"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
Add support for TextInput widget, rename widgets module to widget, update to glyph_brush 0.7.0
2020-05-29 04:40:22 +00:00
"approx 0.3.2",
update crates
2021-09-20 10:05:41 +00:00
"crossbeam-deque 0.7.4",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"crossbeam-utils 0.7.2",
"linked-hash-map",
"num_cpus",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"ordered-float 1.1.1",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"rustc-hash",
"stb_truetype",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
[[package]]
name = "rusttype"
version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc7c727aded0be18c5b80c1640eae0ac8e396abf6fa8477d96cb37d18ee5ec59"
dependencies = [
"ab_glyph_rasterizer",
Add support for TextInput widget, rename widgets module to widget, update to glyph_brush 0.7.0
2020-05-29 04:40:22 +00:00
"owned_ttf_parser 0.6.0",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
]
Update wasmer
2021-07-10 13:02:20 +00:00
[[package]]
name = "rustversion"
version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "61b3909d758bb75c79f23d4736fac9433868679d3ad2ea7a61e3c25cfda9a088"
Added Controller support
2020-03-10 21:00:13 +00:00
[[package]]
name = "rusty-xinput"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2aa654bc32eb9ca14cce1a084abc9dfe43949a4547c35269a094c39272db3bb"
dependencies = [
"lazy_static",
dependency reduction: - authc no longer uses reqwest - image only supports PNG - replace routille with tiny_http - several other dependencies - cargo upgrade - following improvement was measured on R7 1700X: before: - cargo build: 3076.73s user / 4:45 total / 589 dependencies - cargo test: 6118.38s user / 7:30 total / 959 dependencies after: - cargo build: 2680.54s user / 4:05 total / 480 dependencies - cargo test: 5351.81s user / 7:04 total / 791 dependencies - added xMAC94x to CODEOWNERS for Cargo.toml, he will protect them from now on and hit people with evil looks ;)
2020-06-01 00:13:35 +00:00
"log",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"winapi 0.3.9",
Added Controller support
2020-03-10 21:00:13 +00:00
]
Draft of botclient.
2021-03-10 18:32:45 +00:00
[[package]]
name = "rustyline"
update crates
2021-09-20 10:05:41 +00:00
version = "9.0.0"
Draft of botclient.
2021-03-10 18:32:45 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "790487c3881a63489ae77126f57048b42d62d3b2bafbf37453ea19eedb6340d6"
Draft of botclient.
2021-03-10 18:32:45 +00:00
dependencies = [
"bitflags",
"cfg-if 1.0.0",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"clipboard-win 4.2.2",
Draft of botclient.
2021-03-10 18:32:45 +00:00
"dirs-next",
update dependencies
2021-06-04 07:44:30 +00:00
"fd-lock",
Draft of botclient.
2021-03-10 18:32:45 +00:00
"libc",
"log",
"memchr",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"nix 0.22.0",
Draft of botclient.
2021-03-10 18:32:45 +00:00
"radix_trie",
"scopeguard",
"smallvec",
"unicode-segmentation",
"unicode-width",
"utf8parse",
"winapi 0.3.9",
]
Added randomized NPC names veloren/veloren#133
2019-06-01 19:24:17 +00:00
[[package]]
name = "ryu"
dependency reduction: - authc no longer uses reqwest - image only supports PNG - replace routille with tiny_http - several other dependencies - cargo upgrade - following improvement was measured on R7 1700X: before: - cargo build: 3076.73s user / 4:45 total / 589 dependencies - cargo test: 6118.38s user / 7:30 total / 959 dependencies after: - cargo build: 2680.54s user / 4:05 total / 480 dependencies - cargo test: 5351.81s user / 7:04 total / 791 dependencies - added xMAC94x to CODEOWNERS for Cargo.toml, he will protect them from now on and hit people with evil looks ;)
2020-06-01 00:13:35 +00:00
version = "1.0.5"
switch from hyper http to rouille for http server
2019-09-08 23:59:19 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
dependency reduction: - authc no longer uses reqwest - image only supports PNG - replace routille with tiny_http - several other dependencies - cargo upgrade - following improvement was measured on R7 1700X: before: - cargo build: 3076.73s user / 4:45 total / 589 dependencies - cargo test: 6118.38s user / 7:30 total / 959 dependencies after: - cargo build: 2680.54s user / 4:05 total / 480 dependencies - cargo test: 5351.81s user / 7:04 total / 791 dependencies - added xMAC94x to CODEOWNERS for Cargo.toml, he will protect them from now on and hit people with evil looks ;)
2020-06-01 00:13:35 +00:00
checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
switch from hyper http to rouille for http server
2019-09-08 23:59:19 +00:00
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "same-file"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
version = "1.0.6"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"winapi-util",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
[[package]]
name = "schannel"
version = "0.1.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75"
dependencies = [
"lazy_static",
"winapi 0.3.9",
]
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
[[package]]
name = "scoped-tls"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
Update most dependencies
2019-07-28 15:47:14 +00:00
[[package]]
name = "scopeguard"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
version = "1.1.0"
Update most dependencies
2019-07-28 15:47:14 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
Update most dependencies
2019-07-28 15:47:14 +00:00
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
[[package]]
name = "sct"
update dependencies
2021-06-04 07:44:30 +00:00
version = "0.6.1"
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies
2021-06-04 07:44:30 +00:00
checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce"
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"ring",
"untrusted",
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
]
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
[[package]]
name = "sct"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
dependencies = [
"ring",
"untrusted",
]
Restarted worldgen Former-commit-id: e1526ec5f865904f11ab6a1507ecdc1a52acb28d
2019-05-21 00:57:16 +00:00
[[package]]
name = "sdl2"
update dependencies
2021-06-04 07:44:30 +00:00
version = "0.34.5"
Restarted worldgen Former-commit-id: e1526ec5f865904f11ab6a1507ecdc1a52acb28d
2019-05-21 00:57:16 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies
2021-06-04 07:44:30 +00:00
checksum = "deecbc3fa9460acff5a1e563e05cb5f31bba0aa0c214bb49a43db8159176d54b"
Restarted worldgen Former-commit-id: e1526ec5f865904f11ab6a1507ecdc1a52acb28d
2019-05-21 00:57:16 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"bitflags",
"lazy_static",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"raw-window-handle",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"sdl2-sys",
Restarted worldgen Former-commit-id: e1526ec5f865904f11ab6a1507ecdc1a52acb28d
2019-05-21 00:57:16 +00:00
]
[[package]]
name = "sdl2-sys"
update dependencies
2021-06-04 07:44:30 +00:00
version = "0.34.5"
Restarted worldgen Former-commit-id: e1526ec5f865904f11ab6a1507ecdc1a52acb28d
2019-05-21 00:57:16 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies
2021-06-04 07:44:30 +00:00
checksum = "41a29aa21f175b5a41a6e26da572d5e5d1ee5660d35f9f9d0913e8a802098f74"
Restarted worldgen Former-commit-id: e1526ec5f865904f11ab6a1507ecdc1a52acb28d
2019-05-21 00:57:16 +00:00
dependencies = [
ci cleanup, dependency update
2020-11-06 13:14:54 +00:00
"cfg-if 0.1.10",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"cmake",
"flate2",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"tar",
"unidiff",
"version-compare",
Restarted worldgen Former-commit-id: e1526ec5f865904f11ab6a1507ecdc1a52acb28d
2019-05-21 00:57:16 +00:00
]
Update wasmer
2021-07-10 13:02:20 +00:00
[[package]]
name = "seahash"
version = "4.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
[[package]]
name = "security-framework"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "2.4.2"
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "525bc1abfda2e1998d152c45cf13e696f76d0a4972310b22fac1658b05df7c87"
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
dependencies = [
"bitflags",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"core-foundation 0.9.2",
"core-foundation-sys 0.8.3",
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
"libc",
"security-framework-sys",
]
[[package]]
name = "security-framework-sys"
update crates
2021-09-20 10:05:41 +00:00
version = "2.4.2"
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "a9dd14d83160b528b7bfd66439110573efcfbe281b17fc2ca9f39f550d619c7e"
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
dependencies = [
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"core-foundation-sys 0.8.3",
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
"libc",
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "semver"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
update depednencies
2021-07-08 10:21:02 +00:00
"semver-parser",
update dependencies
2021-06-04 07:44:30 +00:00
]
[[package]]
name = "semver"
update crates
2021-09-20 10:05:41 +00:00
version = "1.0.4"
update dependencies
2021-06-04 07:44:30 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "semver-parser"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "serde"
update crates
2021-09-20 10:05:41 +00:00
version = "1.0.130"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"serde_derive",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
[[package]]
name = "serde_bytes"
version = "0.11.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "16ae07dd2f88a366f15bd0632ba725227018c69a1c8550a927324f8eb8368bb9"
dependencies = [
"serde",
]
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
[[package]]
name = "serde_cbor"
update crates
2021-09-20 10:05:41 +00:00
version = "0.11.2"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
dependencies = [
"half",
"serde",
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "serde_derive"
update crates
2021-09-20 10:05:41 +00:00
version = "1.0.130"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"proc-macro2 1.0.32",
"quote 1.0.10",
"syn 1.0.81",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
Added randomized NPC names veloren/veloren#133
2019-06-01 19:24:17 +00:00
[[package]]
name = "serde_json"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "1.0.71"
Added randomized NPC names veloren/veloren#133
2019-06-01 19:24:17 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "063bf466a64011ac24040a49009724ee60a57da1b437617ceb32e53ad61bfb19"
Added randomized NPC names veloren/veloren#133
2019-06-01 19:24:17 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"itoa",
"ryu",
"serde",
Added randomized NPC names veloren/veloren#133
2019-06-01 19:24:17 +00:00
]
(See sharp/lod-history) LOD, shadows, greedy meshing, new lighting, perf --- Pretty much a Veloren fork at this point. Here's a high level overview of the changes (will be added to CHANGELOG just before merge). At a high level this MR incorporates roughly two groups of changes. The first group consists of new game features: more flexible map sizes, level of detail terrain, shadow maps, and a new lighting engine. This is "feature work" that (mostly) only adds new things to Veloren, and mostly shouldn't affect old stuff. The second big group of changes are those addressing the fallout from all the new features. These include performance fixes of various sorts: the addition of multiple graphics options and optimization of the cheap ones to avoid work, switching all voxel models to use some variant of greedy meshing, switching over much of our CPU-side vector math to exploit SIMD instructions (coinciding with a fork of `vek`), and a rewrite of how the UI handles text rendering (coinciding with updates to our fork of `conrod`). Making Veloren's hardcoded colors appear correct under the new lighting engine also required considerably changes (TODO: Fill in this section when it's complete). The second category of changes often heavily touches code owned by other people, including frequently modified code "owned" by a handful of people, so I recommend that this code be reviewed particularly carefully. --- At a high level (each will be described in more detail below): - The world map has been refactored. - The world size is no longer hardcoded (@zesterer). - The map generation code was made generic to allow using it outside of the `world` crate (@zesterer). - On world creation, we now compute *horizon maps* (@zesterer). - The way we pass the world from the server to the client has been updated (@xMAC94x). - Artifacts related to image rotation were fixed (@imbris). - Multiflow rivers were enabled (@zesterer). - In the process of making changes related to the world map, various incidental fixes and optimizations were required. - The new *level of detail* feature was added (@zesterer wrote part of this and has checked out the rest). - A new LOD terrain rendering step was added to the pipeline. - The LOD terrain quality was made configurable via a graphics setting. - Horizon maps were used to cast shadows from LOD chunks on both LOD and non-LOD terrain. - A "voxelization" effect was incorporated into rendered LOD terrain to make it blend better into the world. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Veloren's lighting has been completely overhauled (@zesterer has already checked most of this out). - A semi-accurate index of refraction was assigned to our materials. - A new, more realistic, physically based approach to lighting was used using the *Ashikhmin Shirley* BRDF. - We emulate *atmospheric scattering* using equations designed for measuring solar panel light exposure. - We attempt to compute *realistic light attenuation* in water using its real material properties. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Point and directional lights now cast realistic shadows, using *shadow mapping.* (@imbris, @zesterer, @Treeco, @YuriMomo) - Point light shadow maps were added to the rendering pipeline, using geometry shaders and *seamless cube maps*. - Directional light shadows were added to the rendering pipeline, using LISPSM together with disabling *depth clamping*. - "Shadow-only" chunks and NPCs were added to prevent shadows from models behind you from disappearing. - In the process of making changes related to shadow maps, various incidental fixes and optimizations were required. The addition of shadow maps, LOD terrain, and the new lighting all led to significant performance degradation, on top of other changes happening in master. Therefore, a large number of performance improvements were also needed: - The graphics options were made much more flexible and configurable, and shaders were optimize. - New options were provided for how to render lights and shadows (@Pfauenauge, @zesterer). - Graphic setting storage and configuration were overhauled to make adding new features easier (@Pfauenauge, @imbris). - Shaders were rewritten to utilize GLSL's preprocessor to avoid overhead (@zesterer, @YuriMomo). - In the process of making changes related to providing additional rendering options, various incidental fixes and optimizations were required. - Voxel model creation was switched to use *greedy meshing.* - A new voxel meshing method, greedy meshing, was added (@imbris). - Uses of the older meshing methods were migrated to use greedy meshing (@imbris, @jshipsey, @Pfauenauge). - New restrictions were added to terrain, figure, and sprites to future proof them for further optimizations (@jshipsey, @Pfauenauge, @zesterer). - Most positions are now relative to either chunk or player position for better precision (@imbris, @zesterer, @scottc). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - Animation and terrain math were switched to use SIMD where possible. - Fixes were made to vek to make its SIMD feature usable for us (@zesterer, @imbris). - The interface and types used in bone animation were changed in various ways (@jshipsey, @Snowram, @Pfauenauge). - Redundant code generation for body animation is now partly taken care of by a macro (@jshipsey, @Snowram, @Pfauenauge). - Animation code was modified to to use vek's SIMD representation where possible (@jshipsey, @Snowram, @Pfauenauge). - Terrain meshing code and shadow map math were also modified to use vek's SIMD representation (@imbris). - SIMD instruction generation was enabled (@YuriMomo, @jshipsey, @Snowram, @imbris, @Angelonfira, @xMAC94x). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - The way we cache glyphs was completely refactored, fixed, and optimized. - Our fork of `conrod` was optimized in various ways (@imbris). - Our fork of `conrod` now exposes whether a widget was updated during the current frame (@imbris). - Our use of the glyph cache was rewritten for correctness (@imbris). - A *text cache* was introduced that lets us skip remeshing glyphs that have not changed (@imbris). - Various changes were made to reduce pressure on the glyph cache, with more planned (@imbris, @Pfauenauge). - In the process of making changes related to the glyph cache, various incidental fixes and optimizations were required. - Colors were changed to keep Veloren's look consistent with master. - Some older tree models were brought back (@Pfauenauge). - TODO(@Sharp): All hardcoded colors were extracted and made hotloadable. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Hardcoded colors were fixed to conform to Veloren's style. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Color models were fixed to conform to Veloren's style. A detailed description of the involved changes follows. --- - The world size is no longer hardcoded. All functions dependent on world size now take a `WorldSizeLg`, which holds the base 2 logarithm of each actual world dimension and is guaranteed to maintain certain properties (outlined in `common/src/terrain/map.rs`). Additionally, many utility functions that utilize the world size were moved into `common` as well (mostly `common/src/terrain/mod.rs`). Finally, the world map format was updated in order to store its size explicitly, with a migration path from the old format that should work whenever the old formatted map was a square (practically always). See `world/src/sim/mod.rs` for these changes. - The map generation code was made generic to allow using it outside of the `world` crate. The parts of the map generating code that do not need to query the world were moved over to `common/src/terrain/map.rs`, allowing them to be used from the client without creating a dependency on `world`. The rest of it was turned into helper functions in `world/src/sim/map.rs`, which can be passed as closures to the generic map generation code to complete its construction. This also means that colors are now passed in separately to the map generation function. See <https://veloren.net/devblog-78/> for more details. - On world creation, we now compute *horizon maps*. See the function in `world/src/sim/util.rs`. Given a height map and a plane intersecting that height map, our horizon maps allow us to encode enough information to reconstruct shadows for each point on the height map using only the *horizon angle* (the angle at which the sun starts to become visible). As Veloren's sun only covers one plane, this is sufficient for encoding sun shadows for LOD terrain, by encoding two angles per chunk (one for each 90 degrees the sun covers). We can also use this for the moon, if we want, since the moon follows the same path. Additionally, we store the *height* of the furthest occluder, to try to make the shadows volumetric; so this means 4 bytes in total for each chunk. Support for horizon maps has been merged into the map functionality in common as well. - The way we pass the world from the server to the client has been updated. Rather than passing the prerendered map, we instead pass three maps with values for each chunk; one with the color information, a second with altitude information, and a third with horizon map information. We then reconstruct the map on the client, together with some additional information we send from the server (like the sea level and maximum height). See `common/src/msg/server.rs` for a detailed description of the format of `WorldMapMsg`, and `server/src/libr.rs` and `client/src/lib.rs` for details of the map construction and parsing. - Artifacts related to image rotation were fixed. See the commit message for commit SHA `cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e` for a detailed explanation. This involved changes to shaders, the addition of a new type of graphic (also reflected in the graphic cache) that allows specifying a border color (which automatically makes the associated texture immutable), and some related fixes. I reproduce the first two paragraphs of the MR description as well: ``` Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). ``` - Multiflow rivers were enabled. This does not really need to be part of this MR, and would be easy to revert, but since it seemed to provide a nice improvement it's currently packaged with it. We already computed multiple outflows from each chunk for erosion purposes long before this MR. However, we never modified river rendering to be able to handle this case (just a single downhill river flow is complex enough!) so this was not exposed when deciding which chunks were rivers. Now that - In the process of making changes related to the world map, various incidental fixes and optimizations were required. Some examples of fixes include making sure terrain is never lowered to below sea level (to make the shadow maps report correct values), fixing map altitudes and colors to understand things like cliffs and "block level" coloring (that doesn'te xist on the column level), and fixing a crashbug when rendering images for the UI where source pixels are strongly rectangular. Some examples of related performance fixes include avoiding allocating a fresh vector for all the maps (i.e. copying it over to change the format from `[u32; n]` to `DynamicImage` and then copying again to convert to `RgbaImage`), and instead using the `gfx::memory::slice` function to accomplish the same thing. These sorts of changes are spread all arond the code. This includes the additon of a new scene, `voxygen/src/scene/lod.rs`, a new pipeline `voxygen/src/render/pipeline/lod_terrain.rs`, and new shaders `assets/vxygen/shaders/lod-terrain-vert.glsl` and `assets/vxygen/shaders/lod-terrain-frag.glsl`, as well as associated changes to the renderer in `voxygen/src/render/renderer.rs`. The main idea behind our initial approach to LOD was to take the world data we now get from the server (altitude, color, and horizon mapping). - Some previously computed values were turned into shader uniforms for better prediction on weak processors. (@zesterer) - Calls to power or trig functions were removed or replaced with multiplications, where possible. - After some deliberation - To properly handle sprite "waving" for nearby sprites, We explicitly designed the greedy meshing system with figures and sprites in mind. In both cases, we want to be able to *efficiently* pack many different models into the same texture, especially in cases where we know we will either not be removing any of the grouped-together from the models from the texture, or will remove all of them at once (so they can be packed into some specific subtexture). For sprites, since we know every model in advance and never intend to deallocate them, we currently pack them all as efficiently as possible into one giant tetxure atlas. However, in the future we might opt to pack them slightly less efficiently in exchange for shrinking the sprite vertex size. For figures, we pack all the textures for each *model* into the same atlas. is a global texture atlas used for every sprite, and for figures which is why we have the ability to mesh multiple models to the same texture area (using the simple texture atlas allocator) without requiring intermediate vector allocations. This is accomplished by delaying the time when we actually write the color and light data to the texture until *after* all the model vertices have been meshed; then, we can just allocate the whole color/light array at once, making the atlas we use an exact fit. In computer science-y terms, we accomplish this delay by, after we perform the initial greedy meshing (without texture information), not continuing to create the texture data, but instead constructing a *continuation*--that is, a function that, when called, will execute the rest of the computation. We push this continuation (which in Rust terms is a `FnOnce` closure that takes the `ColLightsInfo` that it is supposed to write to as context) onto a onto a vector resizing. To allow for suspended writes to texture data, Rust pointed out to me that the continuation that would eventually write the color and light data to the texture atlas (the one that is shared by all models sharing the same greedy mesher) would have to *own* whatever data it mshed. Because we often generate the model data to mesh as a temporary in `voxygen/src/load.rs`, the - Matrix multiplications in the shader were reduced for figure data (@zesterer). - Vertex "waves" for fluid data were removed. - Terrain "bending" near edges was removed. - Scaling was fixed to make sure empty space was not introduced in a space previously occupied by a block. It was also changed to take ownership of its voxel data, rather than sharing it, to let it be used with meshing. - Rust's nightly version was bumped in order to use the `array_map` function, which lets us reuse more code between the simple map and `FigureModelCache`. - PositionedGlyph::standalone. --- I tried to cite sources in many cases[^realtime],[^lloyd],[^lispsm],[^pbrt],[^greedy],[^tjunctions] where I needed features from elsewhere but I am particularly grateful for the following resources, esepcially where they have accompanying source code. I linked all of them that are accessible to the public (those that are not were obtained through legal means). [^realtime]: Eisemann, Elmar, Michael Schwarz, Ulf Assarsson, Michael Wimmer. Real-Time Shadows. A K Peters/CRC Press (T&F), 20160419. [^lloyd]: Lloyd,B. 2007. [Logarithmic perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). PhD thesis, University of North Carolina. [^lispsm]: Wimmer, M., Scherzer, D., and Purgathofer, W. 2004. [Light space perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). In Proceedings of Eurographics Symposium on Rendering 2004, pp. 143– 152. [^pbrt]: Pharr, Matt, et al. [http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf](Physically Based Rendering: From Theory to Implementation). Third edition, Morgan Kaufmann Publishers/Elsevier, 2017. [^greedy]: mikolalysenko. “Meshing in a Minecraft Game.” 0 FPS, 30 June 2012, <https://0fps.net/2012/06/30/meshing-in-a-minecraft-game/>. [^tjunctions]: blackflux. “Meshing in Voxel Engines – Part 1.” Blackflux.Com, 23 Feb. 2014, <https://blackflux.wordpress.com/2014/02/23/meshing-in-voxel-engines-part-1/>. I am also especially grateful to Khronos, Wikiepdia, and stackoverflow for answering many of my specific questions while writing the MR. --- Squashed commit of the following: commit 300505e7305a2fdac722a808ee8538323f215f39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 18:46:25 2020 +0200 Fixing cargo doc and typo in CHANGELOG. commit ec0aeb18e8499d7d84ef818331b4b65c3d76cea6 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 15:38:50 2020 +0200 Hopefully final commit for the LOD branch. commit 5e8ea0b1eaac02903a02feb2eb038d195de4872f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 10:14:26 2020 +0200 Falling back to power as stopgap. commit e44a1cbf46504ee9931a01bdc9033e145500d557 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 09:25:41 2020 +0200 Address imbris feedback. Temporarily disables shiny water, lowers max VD. These restrictions will be lifted soon after merging. commit 561e25778a108ac3712f5ec2ce3a51234c4430d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 08:31:13 2020 +0200 Tweaking shaders a bit. commit 7d19259078ce0dd7b3742ad7d0cb3fab3ece3fdc Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:59:43 2020 +0200 Fix view example as well. commit 051cd4934e0fad2c0b15db4380a4189fa318679f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:29:06 2020 +0200 Fix meshing benchmark. commit c95e07db3b4dcca285678985e65e31b927cb1c61 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 05:46:22 2020 +0200 Address MR feedback, fix scene clouds. commit 1bfb816cabdb3ffc1e507a009c2d98696b4b573a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:39:36 2020 +0200 Incorporating Pfau's figure color changes. New eyes and new humanoid colors. commit 3f9b89a3ac7b3356b1dba0d1a8f6541357f81469 Merge: e2f5162e4 62c53963a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:29:41 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit e2f5162e4f96f4124aa43488f7245d341b3dcfd4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:28:38 2020 +0200 World colors are all hotloadable. They live in assets/world/style/colors.ron. Only a small handful of hardcoed colors remain in World; they are either part of the map, or difficult to disentangle from the rest of the computation. Comments are made where appropriate. commit 62c53963abe1975009d34a8f9515a355bef24f31 Author: Marcel Märtens <marcel.cochem@googlemail.com> Date: Wed Aug 19 15:59:00 2020 +0200 replace pretty_env_logger with tracing commit 5b1625f99d9586fe80e2232f583ec5af9f953099 Merge: d71003acd 4942b5b39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:15:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit d71003acdabeff970b3928e97c26af6847b5b78e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:14:34 2020 +0200 Hotloading colors, part 1: colors in common. Currently, this just entails humanoid colors. There are only three colors not handled; the light emitter colors in common/src/comp/inventory/item/tool.rs. These don't seem important enough to me to warrant making hotloadable, at least not right now, but if it's needed later we can always add them to the file. commit 63b5e0e553eb2ea49276f192a6fc7dd65254270d Merge: c32b337a4 6d2c4b9c1 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 13:05:37 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c32b337a46e10d9de473d178a94a3ccd61c39bb3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:52:04 2020 +0200 Fixing LOD grid, for real. commit a166ae0360395387e09fb35a1f84210c2ce5ec24 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:28:05 2020 +0200 Addressing imbris's initial feedback. Fixes two minor bugs: explosion particles were no longer spawning randomly, and LOD grids were not perfectly even. commit 4cbad004f44060994252dd3d38647a14a589712f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:27:58 2020 +0200 Bumping nightly per request. commit 548680276aac77c25d43d16b5622f847d474dbef Merge: acc098604 8f8b20c91 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:26:06 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit acc0986040589a3492f88a740bc3c3fc693b26d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:28:32 2020 +0200 Lower resolution due to lying drivers. commit d3b878de2a52c358d2944a6bbd0555dad7fbdb10 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:15:38 2020 +0200 Fix issues msh encountered with Intel 4600. commit 10245e0c1b0cb6fae10d86409435364edc6102ef Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 21:15:02 2020 +0200 Merge more models into one mesh than we did previously. commit 3155c31e663c52ae5c3a53d5fb5665892a1a498a Merge: 7204cc8a7 3c199280e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:35:22 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7204cc8a7a4f74a30306bd205d9834fee4bb944f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:34:43 2020 +0200 Fix not yet done NPC animations. This forces them all to be the idle animation if not specified. This fixes issues where you'd have giant NPCs in water. commit bc83360f2a08918f19d417b5f772e1ff554dba08 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 19:36:37 2020 +0200 Try to fix some bugs: - Z fighting with LOD terrain and water. - Audio SFX not playing. commit 1fd104aa603bf3781b6526a5cada46aeca3049dd Merge: 862df3c99 7c2c392a3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 12:02:31 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 862df3c9976c4da9bd7cfd784f1a85973127968a Merge: 0a4218ed9 75c1d4401 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 05:52:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0a4218ed9d541a2b34c133351bea38a99ddf4ea7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 22:27:14 2020 +0200 Fix particle depth. commit f51dfdeb442d0dd5243dd2f344fa4be295bd0875 Merge: c6251a956 5e6dc0471 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:19:04 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit c6251a956ad376400dca5c23420cf8d213dc8fdf Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:15:46 2020 +0200 Cache figures more intelligently. Cache figures for longer, and don't cache character states for the player except where they actually affect the rendered model. commit 0ed801d5404982c6fb63b1eaa4567d908b294c9d Merge: c11b9bdf0 eea64f78f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 16:32:24 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c11b9bdf0a53bf9884d2f5a48fec9b01d582df1a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 11:47:15 2020 +0200 Remove unneeded Clippy annotation. commit 16aa9ef40af56d69289d00aafb3deadfb8bd4f35 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 8 00:53:02 2020 +0200 Fix hotloading and Clippy. commit 3dc973e0be5b758da1e9805eb764ad401374cd0c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 23:50:27 2020 +0200 Major speedups with SIMD. commit fba64a7d93d5a96077ce87287bbce6ab9b7fbcae Merge: 76429d00e d1e10b178 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:19 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 76429d00eea00d212fbd672a84ee91e75b19b938 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:10 2020 +0200 Add clippy.toml. commit c79f512f84dbb83cb82b7954db68ff241dfd8e41 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 11:55:20 2020 +0200 Fix all clippy issues, clean up Rust code. commit 6f90e010b3fbefb53b0d632e819931350015b6b8 Merge: 77a8c7c26 5929cfa5c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:30 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 77a8c7c267d3f44a1a62bd6b2274359973c5e4d4 Merge: b44e44232 44febaabd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:10 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 5929cfa5c713aa392110bbb62407f76caf53c3df Author: jshipsey <jshipsey18@gmail.com> Date: Thu Aug 6 20:47:27 2020 -0400 fixed in-hand arrow bug commit b44e442325d828f1cd564d66908f89d09e80474b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 6 13:40:35 2020 +0200 Miscellaneous performance improvements. commit be37acf287c1360d8085862526ac3365ffd1d768 Merge: 125d7fc6c c11876547 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 05:49:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 125d7fc6c4dcd8c8c5f27b8268a4d64f409f3644 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 04:55:31 2020 +0200 Abstract over simd vs. repr_c vectors. Also some minor improvements to Event size. commit d4d4956e9252e1241ce110b2aa85076c6b1e2a23 Merge: 5f3b7294a aced5f979 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:56:54 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 5f3b7294af1f8533edc2620b58863c248e2b07af Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:43:52 2020 +0200 Fix formatting issues I missed before. commit a428a3ebba70dcab63dd0f8cd983120c90617271 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:41:51 2020 +0200 Fix clippy warnings, part 1. There aer still a bunch of type too complex and function takes too many arguments warnings that I'll fix later (or ignore, since in the one case I did fix a function takes too many arguments warning I think it made the code *less* readable). commit ba54307540ed8a937ac08209730284fc653af85b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 30 13:22:42 2020 +0200 Fix light animations so they are removed when the light turns off. commit 7e0f4bcbf0f4717145d8beac40d52e3acebbe2aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 21:10:20 2020 +0200 Fix crash in edge case for pixel art. commit 56da06f7a351e2b949e9b014a90b974d511a0924 Merge: cf74d55f2 9f53a4a19 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:56:52 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:29:52 2020 +0200 Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). The first concern was addressed by fixing the dimensions of the map images drawn from the UI (so that we always use a square source rectangle, rather than a rectangular one according to the dimensions of the map). We also fixed the way rotation was done in the fragment shader for north-facing sources to make it properly handle aspect ratio (this was already done for north-facing targets). Together, these fix rendering issues peculiar to rectangular maps. The second and third concerns were jointly addressed by adding an optional border color to every 2D image drawn by the UI. This turns out not to waste extra space even though we hold a full f32 color (to avoid an extra dependency on gfx's PackedColor), since voxel images already take up more space than Optiion<[f32; 4]> requires. This is then implemented automatically using the "border color" wrapping method in the attached sampler. Since this is implemented in graphics hardware, it only works (at least naively) if the actual image bounds match the texture bounds. Therefore, we altered the way the graphics cache stores images with a border color to guarantee that they are always in their own texture, whose size exactly matches their extent. Since the easiest currently exposed way to set a border color is to do so for an immutable texture, we went a bit further and added a new "immutable" texture storage type used for these cases; currently, it is always and automatically used only when there is a specified border color, but in theory there's no reason we couldn't provide immutable-only images that use the default wrapping mdoe (though clamp to border is admittedly not a great default). To fix the maps case specifically, we set the border color to a translucent version of the ocean border color. This may need tweaking going forward, which shouldn't be hard. As part of this process, we had to modify graphics replacement to make sure immutable images are *removed* when invalidated, rather than just having a validity flag unset (this is normally done by the UI to try to reuse allocations in place if images are updated in benign ways, since the texture atlases used for Ui do not support deallocation; currently this is only used for item images, so there should be no overlap with immutable image replacement, so this was purely precautionary). Since we were already touching the relevant code, we also updated the image dependency to a newer version that provides more ways to avoid allocations, and made a few other changes that should hopefully eliminate redundant most of the intermediate buffer allocations we were performing for what should be zero-cost conversions. This may slightly improve performance in some cases. commit ad18ce939940a8c697270f6e9b94db9942fd8295 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 13:21:09 2020 +0200 Fix continent scale hack. commit 36b1cb074f5b195aebd7dbbc3da7f0246a1a18ec Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 12:11:40 2020 +0200 Enable loading different sized maps without a recompile. We may want to tweak the effects of the continent_scale_hack. commit 13b6d4d534cc4814b7cb3294ca41bbfea0a6b186 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 10:55:48 2020 +0200 Removing WORLD_SIZE, part 1. Erased almost every instance of WORLD_SIZE and replaced it with a local power of two, map_size_lg (which respects certain invariants; see common/src/terrain/map.rs for more details about MapSizeLg). This also means we can avoid a dependency on the world crate from client, as desired. Now that the rest of the code is not expecting a fixed WORLD_SIZE, the next step is to arrange for maps to store their world size, and to use that world size as a basis prior to loading the map (as well, probably, as prior to configuring some of the noise functions). commit 30b1d2c6428230a9eaa0d749cdcbbd6f1cbccd78 Merge: 7d56ba31b 1377b369f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:58 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 7d56ba31b445441461b28a07fc495d7d4f047c17 Merge: 2101113b4 598f14b25 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 1377b369f6db2258e910d467a5740f31789e3ded Author: Monty Marz <m.marzouq@gmx.de> Date: Sun Jul 19 23:25:38 2020 +0200 more saturated pumpkins commit ae8d50527f93bb0616c2ad46ce4dacb63bc37c6d Author: Monty Marz <m.marzouq@gmx.de> Date: Sat Jul 18 20:29:56 2020 +0200 acacia models commit 2101113b467e691de787392d7f20f1745f5637bd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 18 18:55:25 2020 +0200 Higher detail LOD. commit add2cfae04b4385fa5590e11e2bd5229d9dee0aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 16 01:57:39 2020 +0200 Revert some irrelevant stuff. commit 2e2ab3dc1eaa59a4aef7f8d34a53d8aae4c8553a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 15 13:30:49 2020 +0200 Fixing various things about shadows. * Correcting optimal LISPSM parameter. * Figure shadows are cast when they're not visible. * Chunk shadows stay cast until you look away. * Seamless cubemaps for point lights. * Etc. commit 6c31e6b56217274285b597af297036691ea5d897 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 19:50:26 2020 +0200 Fix shadow creation. commit 6332cbe006115ae205597529cd8bbccd146c2cca Merge: be438657c 930e0028b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:47:00 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit be438657c33d7b5bfb0a9582c3ed3fd366637323 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:28:08 2020 +0200 Tweaks to shadows. Added shadow map resolution configuration, added seamless cubemaps, documented all existing rendering options, and fixed a few Clippy errors. commit 23b4058906013c7d2a40c286e20e32c5fbd897ed Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 10:11:19 2020 +0200 Fix moon, use nonlinear noise for terrain. Note that the latter has a bit of performance cost. commit 7fbe5cbfbb9dc29607957b8e62f432a4deed193d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:23:02 2020 +0200 Address lies about max texture size. commit bcfc62b5e13a1cdd83f57535fde4694720bebfd9 Merge: 75e3626a7 18a08e8fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:22:08 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 75e3626a785919f43fdcf2127c2b10e3e4df2f9f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:21:52 2020 +0200 OpenGL 3.3 minimum. commit 18a08e8fe2739f02af99a5d2cb4e7c38c49e858b Author: Monty Marz <m.marzouq@gmx.de> Date: Tue Jul 7 23:57:52 2020 +0200 settings localization commit 90c5d1ca3620092bc3ae10b2211489eb1cf6f5e8 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 21:11:48 2020 +0200 Lower near distance. commit 0e66f02b25aaddaa2dfddbbc89cd67de54a9a7b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 20:09:01 2020 +0200 All sprites sway in the wind now. commit db1401a6910bf42dcf502462c90038752ff5fbdb Merge: 69e508d8c e8b4b29d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 19:34:17 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 69e508d8c94d8973033817ca86f357e466fc7c4d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 18:41:37 2020 +0200 Make it easy to switch to SIMD for math. commit ffe0f5928c7a7e87d00cb5426b3b1d831d7e02fd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 21:21:12 2020 +0200 Fix some issues with underwater rendering. commit bfda6da42f38fd02c31ee92c81ab785a3e50c2a0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 19:17:59 2020 +0200 Fix some minor display issues. commit 0ed752e087968cf901301884aaeae698e32ef8a5 Merge: ccc6a06a8 518edcb85 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:14:21 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit ccc6a06a8d4504d6b9f7af7905a414d2ee06ab76 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:04:34 2020 +0200 Some minor changes. commit 4e020246702889269efe1a191788992164c508d6 Merge: 50a64d927 e05c9267a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 16:17:40 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 50a64d927e6c4f4b0e4688e4cbfca694bc3f922a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 13:07:03 2020 +0200 Fix far plane. commit 7dd06da34cae8f9ea3b6c889fe965181f3fd3949 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:25:35 2020 +0200 Add shadows.glsl. commit 618a18c998778bf871b905a74657440fcc384c80 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:10:22 2020 +0200 Adding shadows, greedy meshing, and more. commit eaea83fe6a5cb1cb0ba8beef888183c718258496 Merge: 267018495 2f89b863e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 22:47:07 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 2670184954a13e4a9e7a4e35ba79aac0c5fac2f7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 21:20:01 2020 +0200 Make civsim and sites deterministic. For anything in worldgen where you use a HashMap, *please* think carefully about which hasher you are going to use! This is especially true if (for some reason) you are depending on hashmap iteration order remaining stable for some aspect of worldgen. commit f8376fd5dc72b4a9c2f51a6b4570d59c8b8e9343 Merge: 654f7e049 cdee191dd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 17:53:57 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 654f7e049258d9da27c09608bbe6a46ffa8787e5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed May 20 21:22:30 2020 +0200 Correct backface culling. commit 560501df05ca725409b0f2e4eb31bdfdc15fd0c7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue May 19 17:22:06 2020 +0200 Greedy messhing for shadows. commit a4d87e1875ca543436e6bbbeb20348facc5a52d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun May 17 05:59:00 2020 +0200 Shadow maps work for lantern. commit 243d0837b8a3b08172c9a3c348d964d7ddc2a0a8 Merge: 04382dc28 71dd520cd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:53:13 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 04382dc28632b6c66e8821f6870c0daaa1c1901a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:22:17 2020 +0200 WIP: better graphics config, better LOD, shadow maps. commit 22ddbad3eb32bfa70f0932176022208fe67ded81 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 18:54:09 2020 +0200 Minor shader fixes. commit 746a10e8d01ac235f994b0cde78fa48998602a1f Merge: 0f4a0e763 40ab94673 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 04:02:09 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0f4a0e763db3afbdc4fb0558611f38326ca87151 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 23:03:24 2020 +0200 Switch back to pop-in terrain. commit dd74fa7e4a53667b38811d7aec58d7f6a68889bb Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 22:58:55 2020 +0200 LOD shading closer to voxel shading. commit ef67bd58ba0bdaf622b078892d768263b6cba268 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 28 20:49:03 2020 +0200 Experimental underwater lighting. commit 2c5ad9d07605e80d5fd5679dd3a5d70c605b86a9 Merge: 748279835 303967a6f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 22:35:24 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7482798354eda18c8207950080fc24d443a369de Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 21:59:55 2020 +0200 Replace discard in figure-frag. commit d83b4ae69be4912f69bf7835f509c68a1c7770a4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:45:57 2020 +0200 Fix sprite lighting, HDR from focus_pos. commit 0594238004f116274905fa0ed7c2b6c417ed1d29 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:14:10 2020 +0200 Proper HDR from point lights. commit 48c93d2b41ce5743103d18e76cc228f5ac766492 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 14:01:43 2020 +0200 Brighter ambiance, darker LOD shadows. commit e0452e895ccfa8a43f368cae3b8b8aedc24dad93 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 13:13:23 2020 +0200 More proper HDR. commit 4c6da3ed16cfeebb455e40da5f557b4af9a499d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 00:13:10 2020 +0200 Trying LOD noise. commit 682a3d74c85df5503ffe1fc1cc891bce789df1ad Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 23:11:08 2020 +0200 Fix LOD heights in towns. commit cc39e5734e8b18f9077bf42e66337c1319dd6b6e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 21:01:23 2020 +0200 More LOD fixes. commit 8116b21c2e51c836e77894e309ac273caf2917b3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:54:43 2020 +0200 I like this coloring. commit bc2560ea90b36f4b46190005344232d993043ac3 Merge: 14effdd5d e690efe71 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:48:33 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 14effdd5db8747fcf3eb34f03b46b7792e92d1c5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:24:35 2020 +0200 Re-saturate. commit 48a643955d4435b78179acba0beb4a979905cc31 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:23:57 2020 +0200 Various fixes. commit f7b497a0c25f4ad4682c71dd1ed6f608052feb9b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 03:22:49 2020 +0200 Render figures again. commit 44e4aad48deba8266b9f8bdfd3db096b381f5327 Merge: e6f0a5a98 9ec319a18 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 02:01:04 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit e6f0a5a981a82533ba188fff0a54ce98577bb152 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 24 16:12:20 2020 +0200 Add atmospheric scattering. commit f2953087f691a8edbc001cb98ebf5059fc6f8ac0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 23 00:01:20 2020 +0200 Fix shadowing for specular reflections. commit ddd4a67a9799b8d08c7dc0c2bec90621c2bed0e3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Apr 22 22:56:12 2020 +0200 HDR fixes. commit 1015e60deef3c447381996277df7496707a63bd0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 21 18:25:19 2020 +0200 More lighting changes. commit 80c264abd111fb237e57843efcb5c071d4f84613 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 13 00:29:59 2020 +0200 Lighting experiments. commit 8414987e589dd5102bad89762a3adaccc0bfe957 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 9 02:38:40 2020 +0200 WIP -- lighting changes and soft shadows. commit 9cd2b3fb0d6b49776c6dfe463e4169637250b11a Merge: c7ea687eb 8b149ad11 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:29 2020 +0200 Merge branch 'sharp/new-lighting' into sharp/small-fixes commit c7ea687ebbc5aace1b455f134a5bf49ce2c7434a Merge: 476441531 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:02 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 8b149ad11ad4bb75018fcf9519baec27d1c95951 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:32:39 2020 +0200 Trying out a new lighting model. commit b0ac9f36f755dd06f7c17c46150568064790864f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 07:56:11 2020 +0200 Use bicubic interpolation for terrain. commit f6fc9307a121514b614bc50ef8eb055953e7da8a Merge: 33140a295 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 05:01:41 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 4764415312aae6e9ac2d00e86e84577cb958f1ab Merge: ed2d0111d 13388ee6a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 04:54:48 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 13388ee6a42943f3f79a9cb488346cef18e272fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 20:30:08 2020 +0200 Various fixes (to coloring and to soft shadows). commit fbd084a94a067082a87cd6d28b82054709bc9265 Merge: 5a089863b 4fdf6896a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 18:50:38 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/map-colors commit ed2d0111d994262ae836d84d1fe5a45e4de72a0b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 06:49:27 2020 +0200 Combining colors and LOD. commit 88342640c6b835114d01c797b89fdede3b0a2108 Merge: 33140a295 5a089863b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:49:20 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 33140a2951b8212725f42c758b277aaec4d888f7 Merge: 4c65a5aed f34d4b379 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:36:21 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 5a089863beb01d4794bbe3580ada47b278715ea2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 03:17:49 2020 +0200 Making maps brighter. This is probably not the right way to do it, but oh well! commit 32b2c99109dd486aa922886081068f9c550c83f2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 02:46:36 2020 +0200 Horizon mapping and "layered" map generation. Horizon mapping is a method of shadow mapping specific to height maps. It can handle any angle between 0 and 90 degrees from the ground, as long as know the horizontal direction in advance, by remembering only a single angle (the "horizon angle" of the shadow map). More is explained in common/src/msg/server.rs. We also remember the approximate height of the largest occluder, to try to be able to generate soft shadows and create a vertical position where the shadows can't go higher. Additionally, map generation has been reworked. Instead of computing everything from explicit samples, we pass in sampling functions that return exactly what the map generator needs. This allows us to cleanly separate the way we sample things like altitudes and colors from the map generation process. We exploit this to generate maps *partially* on the server (with colors and rivers, but not shading). We can then send the partially completed map to the client, which can combine it with shadow information to generate the final map. This is useful for two reasons: first, it makes sure the client can apply shadow information by itself, and second, it lets us pass the unshaded map for use with level of detail functionality. For similar reasons, river generation is split out into its own layer, but for now we opt to still generate rivers on the server (since the river wire format is more complicated to compress and may require some extra work to make sure we have enough precision to draw rivers well enough for LoD). Finally, the mostly ad-hoc lighting we were performing has been (mostly) replaced with explicit Phong reflection shading (including specular highlights). Regularizing this seems useful and helps clarify the "meaning" of the various light intensities, and helps us keep a more physically plausible basis. However, its interaction with soft shadows is still imperfect, and it's not yet clear to me what we need to do to turn this into something useful for LoD. commit f8926a5737ddc51f3d585c651a64c43677aae0f4 Merge: a1aee931e 875ae6ced Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Mar 13 13:32:42 2020 +0100 Merge remote-tracking branch 'origin/master' into sharp/map-colors commit 4c65a5aed353b119aea65a2aaeb94549b67beb42 Author: Treeco <5021038-Treeco@users.noreply.gitlab.com> Date: Mon Feb 24 16:48:05 2020 +0000 Made LOD setting slider exponential commit 2fa7b2d20d7233dc8bfd64f9f7f54617575248f1 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 17:49:53 2020 +0000 Added mist to LoD commit aab059a450b5f635777129ff82cc15b662965c3c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 15:14:06 2020 +0000 Added LoD slider commit 779c36b538121c5ade3633ae5cb67bb14c8c3877 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:54:55 2020 +0000 Reduced cost of vertex pushing commit 9fea150473906b166365b738ebcea07c697daf3d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:38:53 2020 +0000 Fixed maths, improved LoD resolution commit 5481df38fea5bf183ff376a3337179cfaa5233dc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 11:22:50 2020 +0000 Dynamically relocate LoD vertices to enhance details commit a3e36a50ababd615da7db1b26158c7906a5def01 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 18:13:51 2020 +0000 Simpler terrain spiral rendering commit 255f450ae9ac8763db4bede075fb409161ed57cc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:53:17 2020 +0000 Better LoD precision commit 3d027aebe812a5b8658a4eb8123dc9f61b3776d2 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:04:03 2020 +0000 Better falloff commit be775c9484b457b2c0b1a494aec03392d0c70e76 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 15:30:45 2020 +0000 Applied good ideas from experimental branch commit 58587b68545a23c5c04ab4574a4b94b3bc982246 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 16:15:13 2020 +0000 Minor fixes to LoD merging commit 7b42aebd709c14df2db766aad61d9280ad24d84d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 15:04:44 2020 +0000 Capped LoD dragging commit 8aafc559f87124e1ea5ca6e3ddc2aa0c242d793c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:54:37 2020 +0000 Better blending between LoD and terrain border commit edd3455d5161792d87ddc8eadc0ecbad5532b284 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:40:19 2020 +0000 Fixed LoD z depth, added sea level offset commit b9b06744620114dd5556e73f64fa93c145503a7c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:27:43 2020 +0000 Better LoD smoothing commit a1aee931e790431560cd2d953ad61d9497072afd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Feb 21 14:52:17 2020 +0100 Adding shadows. commit 2400786c13dd891c131ed86d48d05df516a8a778 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 13:48:40 2020 +0000 Use world map as LoD source commit dbf650f504a4c25fbbc2096ac3616c736bf52d23 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Jan 20 00:48:14 2020 +0000 Better clouds at distance commit 5e6f81b86cdb9730b9b056877b19257075fd5fa8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Jan 19 23:59:02 2020 +0000 sync commit 745e7540ddb000cc645f612767b337c2ddc3f7c0 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 12:40:48 2019 +0000 Improved cloud falloff mist, faster noise sampling commit f6a200d0cb866196ba57697466755f9e0c7ea5d8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 10:09:00 2019 +0000 Improved long-range depth precision, removed unnecessary LoD polygons commit 63d1b2bb2292898d59fb4f4e502201103dfeb86f Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 20:57:46 2019 +0000 Working LoD shader commit f13d98ee3e58f881e8b978861a67663b59ed91ec Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 11:03:40 2019 +0000 LoD first attempt (stack overflow issue)
2020-08-20 18:34:59 +00:00
[[package]]
name = "serde_repr"
update dependencies
2021-06-04 07:44:30 +00:00
version = "0.1.7"
(See sharp/lod-history) LOD, shadows, greedy meshing, new lighting, perf --- Pretty much a Veloren fork at this point. Here's a high level overview of the changes (will be added to CHANGELOG just before merge). At a high level this MR incorporates roughly two groups of changes. The first group consists of new game features: more flexible map sizes, level of detail terrain, shadow maps, and a new lighting engine. This is "feature work" that (mostly) only adds new things to Veloren, and mostly shouldn't affect old stuff. The second big group of changes are those addressing the fallout from all the new features. These include performance fixes of various sorts: the addition of multiple graphics options and optimization of the cheap ones to avoid work, switching all voxel models to use some variant of greedy meshing, switching over much of our CPU-side vector math to exploit SIMD instructions (coinciding with a fork of `vek`), and a rewrite of how the UI handles text rendering (coinciding with updates to our fork of `conrod`). Making Veloren's hardcoded colors appear correct under the new lighting engine also required considerably changes (TODO: Fill in this section when it's complete). The second category of changes often heavily touches code owned by other people, including frequently modified code "owned" by a handful of people, so I recommend that this code be reviewed particularly carefully. --- At a high level (each will be described in more detail below): - The world map has been refactored. - The world size is no longer hardcoded (@zesterer). - The map generation code was made generic to allow using it outside of the `world` crate (@zesterer). - On world creation, we now compute *horizon maps* (@zesterer). - The way we pass the world from the server to the client has been updated (@xMAC94x). - Artifacts related to image rotation were fixed (@imbris). - Multiflow rivers were enabled (@zesterer). - In the process of making changes related to the world map, various incidental fixes and optimizations were required. - The new *level of detail* feature was added (@zesterer wrote part of this and has checked out the rest). - A new LOD terrain rendering step was added to the pipeline. - The LOD terrain quality was made configurable via a graphics setting. - Horizon maps were used to cast shadows from LOD chunks on both LOD and non-LOD terrain. - A "voxelization" effect was incorporated into rendered LOD terrain to make it blend better into the world. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Veloren's lighting has been completely overhauled (@zesterer has already checked most of this out). - A semi-accurate index of refraction was assigned to our materials. - A new, more realistic, physically based approach to lighting was used using the *Ashikhmin Shirley* BRDF. - We emulate *atmospheric scattering* using equations designed for measuring solar panel light exposure. - We attempt to compute *realistic light attenuation* in water using its real material properties. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Point and directional lights now cast realistic shadows, using *shadow mapping.* (@imbris, @zesterer, @Treeco, @YuriMomo) - Point light shadow maps were added to the rendering pipeline, using geometry shaders and *seamless cube maps*. - Directional light shadows were added to the rendering pipeline, using LISPSM together with disabling *depth clamping*. - "Shadow-only" chunks and NPCs were added to prevent shadows from models behind you from disappearing. - In the process of making changes related to shadow maps, various incidental fixes and optimizations were required. The addition of shadow maps, LOD terrain, and the new lighting all led to significant performance degradation, on top of other changes happening in master. Therefore, a large number of performance improvements were also needed: - The graphics options were made much more flexible and configurable, and shaders were optimize. - New options were provided for how to render lights and shadows (@Pfauenauge, @zesterer). - Graphic setting storage and configuration were overhauled to make adding new features easier (@Pfauenauge, @imbris). - Shaders were rewritten to utilize GLSL's preprocessor to avoid overhead (@zesterer, @YuriMomo). - In the process of making changes related to providing additional rendering options, various incidental fixes and optimizations were required. - Voxel model creation was switched to use *greedy meshing.* - A new voxel meshing method, greedy meshing, was added (@imbris). - Uses of the older meshing methods were migrated to use greedy meshing (@imbris, @jshipsey, @Pfauenauge). - New restrictions were added to terrain, figure, and sprites to future proof them for further optimizations (@jshipsey, @Pfauenauge, @zesterer). - Most positions are now relative to either chunk or player position for better precision (@imbris, @zesterer, @scottc). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - Animation and terrain math were switched to use SIMD where possible. - Fixes were made to vek to make its SIMD feature usable for us (@zesterer, @imbris). - The interface and types used in bone animation were changed in various ways (@jshipsey, @Snowram, @Pfauenauge). - Redundant code generation for body animation is now partly taken care of by a macro (@jshipsey, @Snowram, @Pfauenauge). - Animation code was modified to to use vek's SIMD representation where possible (@jshipsey, @Snowram, @Pfauenauge). - Terrain meshing code and shadow map math were also modified to use vek's SIMD representation (@imbris). - SIMD instruction generation was enabled (@YuriMomo, @jshipsey, @Snowram, @imbris, @Angelonfira, @xMAC94x). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - The way we cache glyphs was completely refactored, fixed, and optimized. - Our fork of `conrod` was optimized in various ways (@imbris). - Our fork of `conrod` now exposes whether a widget was updated during the current frame (@imbris). - Our use of the glyph cache was rewritten for correctness (@imbris). - A *text cache* was introduced that lets us skip remeshing glyphs that have not changed (@imbris). - Various changes were made to reduce pressure on the glyph cache, with more planned (@imbris, @Pfauenauge). - In the process of making changes related to the glyph cache, various incidental fixes and optimizations were required. - Colors were changed to keep Veloren's look consistent with master. - Some older tree models were brought back (@Pfauenauge). - TODO(@Sharp): All hardcoded colors were extracted and made hotloadable. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Hardcoded colors were fixed to conform to Veloren's style. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Color models were fixed to conform to Veloren's style. A detailed description of the involved changes follows. --- - The world size is no longer hardcoded. All functions dependent on world size now take a `WorldSizeLg`, which holds the base 2 logarithm of each actual world dimension and is guaranteed to maintain certain properties (outlined in `common/src/terrain/map.rs`). Additionally, many utility functions that utilize the world size were moved into `common` as well (mostly `common/src/terrain/mod.rs`). Finally, the world map format was updated in order to store its size explicitly, with a migration path from the old format that should work whenever the old formatted map was a square (practically always). See `world/src/sim/mod.rs` for these changes. - The map generation code was made generic to allow using it outside of the `world` crate. The parts of the map generating code that do not need to query the world were moved over to `common/src/terrain/map.rs`, allowing them to be used from the client without creating a dependency on `world`. The rest of it was turned into helper functions in `world/src/sim/map.rs`, which can be passed as closures to the generic map generation code to complete its construction. This also means that colors are now passed in separately to the map generation function. See <https://veloren.net/devblog-78/> for more details. - On world creation, we now compute *horizon maps*. See the function in `world/src/sim/util.rs`. Given a height map and a plane intersecting that height map, our horizon maps allow us to encode enough information to reconstruct shadows for each point on the height map using only the *horizon angle* (the angle at which the sun starts to become visible). As Veloren's sun only covers one plane, this is sufficient for encoding sun shadows for LOD terrain, by encoding two angles per chunk (one for each 90 degrees the sun covers). We can also use this for the moon, if we want, since the moon follows the same path. Additionally, we store the *height* of the furthest occluder, to try to make the shadows volumetric; so this means 4 bytes in total for each chunk. Support for horizon maps has been merged into the map functionality in common as well. - The way we pass the world from the server to the client has been updated. Rather than passing the prerendered map, we instead pass three maps with values for each chunk; one with the color information, a second with altitude information, and a third with horizon map information. We then reconstruct the map on the client, together with some additional information we send from the server (like the sea level and maximum height). See `common/src/msg/server.rs` for a detailed description of the format of `WorldMapMsg`, and `server/src/libr.rs` and `client/src/lib.rs` for details of the map construction and parsing. - Artifacts related to image rotation were fixed. See the commit message for commit SHA `cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e` for a detailed explanation. This involved changes to shaders, the addition of a new type of graphic (also reflected in the graphic cache) that allows specifying a border color (which automatically makes the associated texture immutable), and some related fixes. I reproduce the first two paragraphs of the MR description as well: ``` Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). ``` - Multiflow rivers were enabled. This does not really need to be part of this MR, and would be easy to revert, but since it seemed to provide a nice improvement it's currently packaged with it. We already computed multiple outflows from each chunk for erosion purposes long before this MR. However, we never modified river rendering to be able to handle this case (just a single downhill river flow is complex enough!) so this was not exposed when deciding which chunks were rivers. Now that - In the process of making changes related to the world map, various incidental fixes and optimizations were required. Some examples of fixes include making sure terrain is never lowered to below sea level (to make the shadow maps report correct values), fixing map altitudes and colors to understand things like cliffs and "block level" coloring (that doesn'te xist on the column level), and fixing a crashbug when rendering images for the UI where source pixels are strongly rectangular. Some examples of related performance fixes include avoiding allocating a fresh vector for all the maps (i.e. copying it over to change the format from `[u32; n]` to `DynamicImage` and then copying again to convert to `RgbaImage`), and instead using the `gfx::memory::slice` function to accomplish the same thing. These sorts of changes are spread all arond the code. This includes the additon of a new scene, `voxygen/src/scene/lod.rs`, a new pipeline `voxygen/src/render/pipeline/lod_terrain.rs`, and new shaders `assets/vxygen/shaders/lod-terrain-vert.glsl` and `assets/vxygen/shaders/lod-terrain-frag.glsl`, as well as associated changes to the renderer in `voxygen/src/render/renderer.rs`. The main idea behind our initial approach to LOD was to take the world data we now get from the server (altitude, color, and horizon mapping). - Some previously computed values were turned into shader uniforms for better prediction on weak processors. (@zesterer) - Calls to power or trig functions were removed or replaced with multiplications, where possible. - After some deliberation - To properly handle sprite "waving" for nearby sprites, We explicitly designed the greedy meshing system with figures and sprites in mind. In both cases, we want to be able to *efficiently* pack many different models into the same texture, especially in cases where we know we will either not be removing any of the grouped-together from the models from the texture, or will remove all of them at once (so they can be packed into some specific subtexture). For sprites, since we know every model in advance and never intend to deallocate them, we currently pack them all as efficiently as possible into one giant tetxure atlas. However, in the future we might opt to pack them slightly less efficiently in exchange for shrinking the sprite vertex size. For figures, we pack all the textures for each *model* into the same atlas. is a global texture atlas used for every sprite, and for figures which is why we have the ability to mesh multiple models to the same texture area (using the simple texture atlas allocator) without requiring intermediate vector allocations. This is accomplished by delaying the time when we actually write the color and light data to the texture until *after* all the model vertices have been meshed; then, we can just allocate the whole color/light array at once, making the atlas we use an exact fit. In computer science-y terms, we accomplish this delay by, after we perform the initial greedy meshing (without texture information), not continuing to create the texture data, but instead constructing a *continuation*--that is, a function that, when called, will execute the rest of the computation. We push this continuation (which in Rust terms is a `FnOnce` closure that takes the `ColLightsInfo` that it is supposed to write to as context) onto a onto a vector resizing. To allow for suspended writes to texture data, Rust pointed out to me that the continuation that would eventually write the color and light data to the texture atlas (the one that is shared by all models sharing the same greedy mesher) would have to *own* whatever data it mshed. Because we often generate the model data to mesh as a temporary in `voxygen/src/load.rs`, the - Matrix multiplications in the shader were reduced for figure data (@zesterer). - Vertex "waves" for fluid data were removed. - Terrain "bending" near edges was removed. - Scaling was fixed to make sure empty space was not introduced in a space previously occupied by a block. It was also changed to take ownership of its voxel data, rather than sharing it, to let it be used with meshing. - Rust's nightly version was bumped in order to use the `array_map` function, which lets us reuse more code between the simple map and `FigureModelCache`. - PositionedGlyph::standalone. --- I tried to cite sources in many cases[^realtime],[^lloyd],[^lispsm],[^pbrt],[^greedy],[^tjunctions] where I needed features from elsewhere but I am particularly grateful for the following resources, esepcially where they have accompanying source code. I linked all of them that are accessible to the public (those that are not were obtained through legal means). [^realtime]: Eisemann, Elmar, Michael Schwarz, Ulf Assarsson, Michael Wimmer. Real-Time Shadows. A K Peters/CRC Press (T&F), 20160419. [^lloyd]: Lloyd,B. 2007. [Logarithmic perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). PhD thesis, University of North Carolina. [^lispsm]: Wimmer, M., Scherzer, D., and Purgathofer, W. 2004. [Light space perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). In Proceedings of Eurographics Symposium on Rendering 2004, pp. 143– 152. [^pbrt]: Pharr, Matt, et al. [http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf](Physically Based Rendering: From Theory to Implementation). Third edition, Morgan Kaufmann Publishers/Elsevier, 2017. [^greedy]: mikolalysenko. “Meshing in a Minecraft Game.” 0 FPS, 30 June 2012, <https://0fps.net/2012/06/30/meshing-in-a-minecraft-game/>. [^tjunctions]: blackflux. “Meshing in Voxel Engines – Part 1.” Blackflux.Com, 23 Feb. 2014, <https://blackflux.wordpress.com/2014/02/23/meshing-in-voxel-engines-part-1/>. I am also especially grateful to Khronos, Wikiepdia, and stackoverflow for answering many of my specific questions while writing the MR. --- Squashed commit of the following: commit 300505e7305a2fdac722a808ee8538323f215f39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 18:46:25 2020 +0200 Fixing cargo doc and typo in CHANGELOG. commit ec0aeb18e8499d7d84ef818331b4b65c3d76cea6 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 15:38:50 2020 +0200 Hopefully final commit for the LOD branch. commit 5e8ea0b1eaac02903a02feb2eb038d195de4872f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 10:14:26 2020 +0200 Falling back to power as stopgap. commit e44a1cbf46504ee9931a01bdc9033e145500d557 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 09:25:41 2020 +0200 Address imbris feedback. Temporarily disables shiny water, lowers max VD. These restrictions will be lifted soon after merging. commit 561e25778a108ac3712f5ec2ce3a51234c4430d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 08:31:13 2020 +0200 Tweaking shaders a bit. commit 7d19259078ce0dd7b3742ad7d0cb3fab3ece3fdc Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:59:43 2020 +0200 Fix view example as well. commit 051cd4934e0fad2c0b15db4380a4189fa318679f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:29:06 2020 +0200 Fix meshing benchmark. commit c95e07db3b4dcca285678985e65e31b927cb1c61 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 05:46:22 2020 +0200 Address MR feedback, fix scene clouds. commit 1bfb816cabdb3ffc1e507a009c2d98696b4b573a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:39:36 2020 +0200 Incorporating Pfau's figure color changes. New eyes and new humanoid colors. commit 3f9b89a3ac7b3356b1dba0d1a8f6541357f81469 Merge: e2f5162e4 62c53963a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:29:41 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit e2f5162e4f96f4124aa43488f7245d341b3dcfd4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:28:38 2020 +0200 World colors are all hotloadable. They live in assets/world/style/colors.ron. Only a small handful of hardcoed colors remain in World; they are either part of the map, or difficult to disentangle from the rest of the computation. Comments are made where appropriate. commit 62c53963abe1975009d34a8f9515a355bef24f31 Author: Marcel Märtens <marcel.cochem@googlemail.com> Date: Wed Aug 19 15:59:00 2020 +0200 replace pretty_env_logger with tracing commit 5b1625f99d9586fe80e2232f583ec5af9f953099 Merge: d71003acd 4942b5b39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:15:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit d71003acdabeff970b3928e97c26af6847b5b78e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:14:34 2020 +0200 Hotloading colors, part 1: colors in common. Currently, this just entails humanoid colors. There are only three colors not handled; the light emitter colors in common/src/comp/inventory/item/tool.rs. These don't seem important enough to me to warrant making hotloadable, at least not right now, but if it's needed later we can always add them to the file. commit 63b5e0e553eb2ea49276f192a6fc7dd65254270d Merge: c32b337a4 6d2c4b9c1 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 13:05:37 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c32b337a46e10d9de473d178a94a3ccd61c39bb3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:52:04 2020 +0200 Fixing LOD grid, for real. commit a166ae0360395387e09fb35a1f84210c2ce5ec24 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:28:05 2020 +0200 Addressing imbris's initial feedback. Fixes two minor bugs: explosion particles were no longer spawning randomly, and LOD grids were not perfectly even. commit 4cbad004f44060994252dd3d38647a14a589712f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:27:58 2020 +0200 Bumping nightly per request. commit 548680276aac77c25d43d16b5622f847d474dbef Merge: acc098604 8f8b20c91 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:26:06 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit acc0986040589a3492f88a740bc3c3fc693b26d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:28:32 2020 +0200 Lower resolution due to lying drivers. commit d3b878de2a52c358d2944a6bbd0555dad7fbdb10 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:15:38 2020 +0200 Fix issues msh encountered with Intel 4600. commit 10245e0c1b0cb6fae10d86409435364edc6102ef Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 21:15:02 2020 +0200 Merge more models into one mesh than we did previously. commit 3155c31e663c52ae5c3a53d5fb5665892a1a498a Merge: 7204cc8a7 3c199280e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:35:22 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7204cc8a7a4f74a30306bd205d9834fee4bb944f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:34:43 2020 +0200 Fix not yet done NPC animations. This forces them all to be the idle animation if not specified. This fixes issues where you'd have giant NPCs in water. commit bc83360f2a08918f19d417b5f772e1ff554dba08 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 19:36:37 2020 +0200 Try to fix some bugs: - Z fighting with LOD terrain and water. - Audio SFX not playing. commit 1fd104aa603bf3781b6526a5cada46aeca3049dd Merge: 862df3c99 7c2c392a3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 12:02:31 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 862df3c9976c4da9bd7cfd784f1a85973127968a Merge: 0a4218ed9 75c1d4401 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 05:52:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0a4218ed9d541a2b34c133351bea38a99ddf4ea7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 22:27:14 2020 +0200 Fix particle depth. commit f51dfdeb442d0dd5243dd2f344fa4be295bd0875 Merge: c6251a956 5e6dc0471 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:19:04 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit c6251a956ad376400dca5c23420cf8d213dc8fdf Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:15:46 2020 +0200 Cache figures more intelligently. Cache figures for longer, and don't cache character states for the player except where they actually affect the rendered model. commit 0ed801d5404982c6fb63b1eaa4567d908b294c9d Merge: c11b9bdf0 eea64f78f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 16:32:24 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c11b9bdf0a53bf9884d2f5a48fec9b01d582df1a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 11:47:15 2020 +0200 Remove unneeded Clippy annotation. commit 16aa9ef40af56d69289d00aafb3deadfb8bd4f35 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 8 00:53:02 2020 +0200 Fix hotloading and Clippy. commit 3dc973e0be5b758da1e9805eb764ad401374cd0c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 23:50:27 2020 +0200 Major speedups with SIMD. commit fba64a7d93d5a96077ce87287bbce6ab9b7fbcae Merge: 76429d00e d1e10b178 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:19 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 76429d00eea00d212fbd672a84ee91e75b19b938 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:10 2020 +0200 Add clippy.toml. commit c79f512f84dbb83cb82b7954db68ff241dfd8e41 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 11:55:20 2020 +0200 Fix all clippy issues, clean up Rust code. commit 6f90e010b3fbefb53b0d632e819931350015b6b8 Merge: 77a8c7c26 5929cfa5c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:30 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 77a8c7c267d3f44a1a62bd6b2274359973c5e4d4 Merge: b44e44232 44febaabd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:10 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 5929cfa5c713aa392110bbb62407f76caf53c3df Author: jshipsey <jshipsey18@gmail.com> Date: Thu Aug 6 20:47:27 2020 -0400 fixed in-hand arrow bug commit b44e442325d828f1cd564d66908f89d09e80474b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 6 13:40:35 2020 +0200 Miscellaneous performance improvements. commit be37acf287c1360d8085862526ac3365ffd1d768 Merge: 125d7fc6c c11876547 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 05:49:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 125d7fc6c4dcd8c8c5f27b8268a4d64f409f3644 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 04:55:31 2020 +0200 Abstract over simd vs. repr_c vectors. Also some minor improvements to Event size. commit d4d4956e9252e1241ce110b2aa85076c6b1e2a23 Merge: 5f3b7294a aced5f979 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:56:54 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 5f3b7294af1f8533edc2620b58863c248e2b07af Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:43:52 2020 +0200 Fix formatting issues I missed before. commit a428a3ebba70dcab63dd0f8cd983120c90617271 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:41:51 2020 +0200 Fix clippy warnings, part 1. There aer still a bunch of type too complex and function takes too many arguments warnings that I'll fix later (or ignore, since in the one case I did fix a function takes too many arguments warning I think it made the code *less* readable). commit ba54307540ed8a937ac08209730284fc653af85b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 30 13:22:42 2020 +0200 Fix light animations so they are removed when the light turns off. commit 7e0f4bcbf0f4717145d8beac40d52e3acebbe2aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 21:10:20 2020 +0200 Fix crash in edge case for pixel art. commit 56da06f7a351e2b949e9b014a90b974d511a0924 Merge: cf74d55f2 9f53a4a19 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:56:52 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:29:52 2020 +0200 Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). The first concern was addressed by fixing the dimensions of the map images drawn from the UI (so that we always use a square source rectangle, rather than a rectangular one according to the dimensions of the map). We also fixed the way rotation was done in the fragment shader for north-facing sources to make it properly handle aspect ratio (this was already done for north-facing targets). Together, these fix rendering issues peculiar to rectangular maps. The second and third concerns were jointly addressed by adding an optional border color to every 2D image drawn by the UI. This turns out not to waste extra space even though we hold a full f32 color (to avoid an extra dependency on gfx's PackedColor), since voxel images already take up more space than Optiion<[f32; 4]> requires. This is then implemented automatically using the "border color" wrapping method in the attached sampler. Since this is implemented in graphics hardware, it only works (at least naively) if the actual image bounds match the texture bounds. Therefore, we altered the way the graphics cache stores images with a border color to guarantee that they are always in their own texture, whose size exactly matches their extent. Since the easiest currently exposed way to set a border color is to do so for an immutable texture, we went a bit further and added a new "immutable" texture storage type used for these cases; currently, it is always and automatically used only when there is a specified border color, but in theory there's no reason we couldn't provide immutable-only images that use the default wrapping mdoe (though clamp to border is admittedly not a great default). To fix the maps case specifically, we set the border color to a translucent version of the ocean border color. This may need tweaking going forward, which shouldn't be hard. As part of this process, we had to modify graphics replacement to make sure immutable images are *removed* when invalidated, rather than just having a validity flag unset (this is normally done by the UI to try to reuse allocations in place if images are updated in benign ways, since the texture atlases used for Ui do not support deallocation; currently this is only used for item images, so there should be no overlap with immutable image replacement, so this was purely precautionary). Since we were already touching the relevant code, we also updated the image dependency to a newer version that provides more ways to avoid allocations, and made a few other changes that should hopefully eliminate redundant most of the intermediate buffer allocations we were performing for what should be zero-cost conversions. This may slightly improve performance in some cases. commit ad18ce939940a8c697270f6e9b94db9942fd8295 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 13:21:09 2020 +0200 Fix continent scale hack. commit 36b1cb074f5b195aebd7dbbc3da7f0246a1a18ec Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 12:11:40 2020 +0200 Enable loading different sized maps without a recompile. We may want to tweak the effects of the continent_scale_hack. commit 13b6d4d534cc4814b7cb3294ca41bbfea0a6b186 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 10:55:48 2020 +0200 Removing WORLD_SIZE, part 1. Erased almost every instance of WORLD_SIZE and replaced it with a local power of two, map_size_lg (which respects certain invariants; see common/src/terrain/map.rs for more details about MapSizeLg). This also means we can avoid a dependency on the world crate from client, as desired. Now that the rest of the code is not expecting a fixed WORLD_SIZE, the next step is to arrange for maps to store their world size, and to use that world size as a basis prior to loading the map (as well, probably, as prior to configuring some of the noise functions). commit 30b1d2c6428230a9eaa0d749cdcbbd6f1cbccd78 Merge: 7d56ba31b 1377b369f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:58 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 7d56ba31b445441461b28a07fc495d7d4f047c17 Merge: 2101113b4 598f14b25 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 1377b369f6db2258e910d467a5740f31789e3ded Author: Monty Marz <m.marzouq@gmx.de> Date: Sun Jul 19 23:25:38 2020 +0200 more saturated pumpkins commit ae8d50527f93bb0616c2ad46ce4dacb63bc37c6d Author: Monty Marz <m.marzouq@gmx.de> Date: Sat Jul 18 20:29:56 2020 +0200 acacia models commit 2101113b467e691de787392d7f20f1745f5637bd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 18 18:55:25 2020 +0200 Higher detail LOD. commit add2cfae04b4385fa5590e11e2bd5229d9dee0aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 16 01:57:39 2020 +0200 Revert some irrelevant stuff. commit 2e2ab3dc1eaa59a4aef7f8d34a53d8aae4c8553a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 15 13:30:49 2020 +0200 Fixing various things about shadows. * Correcting optimal LISPSM parameter. * Figure shadows are cast when they're not visible. * Chunk shadows stay cast until you look away. * Seamless cubemaps for point lights. * Etc. commit 6c31e6b56217274285b597af297036691ea5d897 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 19:50:26 2020 +0200 Fix shadow creation. commit 6332cbe006115ae205597529cd8bbccd146c2cca Merge: be438657c 930e0028b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:47:00 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit be438657c33d7b5bfb0a9582c3ed3fd366637323 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:28:08 2020 +0200 Tweaks to shadows. Added shadow map resolution configuration, added seamless cubemaps, documented all existing rendering options, and fixed a few Clippy errors. commit 23b4058906013c7d2a40c286e20e32c5fbd897ed Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 10:11:19 2020 +0200 Fix moon, use nonlinear noise for terrain. Note that the latter has a bit of performance cost. commit 7fbe5cbfbb9dc29607957b8e62f432a4deed193d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:23:02 2020 +0200 Address lies about max texture size. commit bcfc62b5e13a1cdd83f57535fde4694720bebfd9 Merge: 75e3626a7 18a08e8fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:22:08 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 75e3626a785919f43fdcf2127c2b10e3e4df2f9f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:21:52 2020 +0200 OpenGL 3.3 minimum. commit 18a08e8fe2739f02af99a5d2cb4e7c38c49e858b Author: Monty Marz <m.marzouq@gmx.de> Date: Tue Jul 7 23:57:52 2020 +0200 settings localization commit 90c5d1ca3620092bc3ae10b2211489eb1cf6f5e8 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 21:11:48 2020 +0200 Lower near distance. commit 0e66f02b25aaddaa2dfddbbc89cd67de54a9a7b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 20:09:01 2020 +0200 All sprites sway in the wind now. commit db1401a6910bf42dcf502462c90038752ff5fbdb Merge: 69e508d8c e8b4b29d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 19:34:17 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 69e508d8c94d8973033817ca86f357e466fc7c4d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 18:41:37 2020 +0200 Make it easy to switch to SIMD for math. commit ffe0f5928c7a7e87d00cb5426b3b1d831d7e02fd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 21:21:12 2020 +0200 Fix some issues with underwater rendering. commit bfda6da42f38fd02c31ee92c81ab785a3e50c2a0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 19:17:59 2020 +0200 Fix some minor display issues. commit 0ed752e087968cf901301884aaeae698e32ef8a5 Merge: ccc6a06a8 518edcb85 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:14:21 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit ccc6a06a8d4504d6b9f7af7905a414d2ee06ab76 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:04:34 2020 +0200 Some minor changes. commit 4e020246702889269efe1a191788992164c508d6 Merge: 50a64d927 e05c9267a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 16:17:40 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 50a64d927e6c4f4b0e4688e4cbfca694bc3f922a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 13:07:03 2020 +0200 Fix far plane. commit 7dd06da34cae8f9ea3b6c889fe965181f3fd3949 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:25:35 2020 +0200 Add shadows.glsl. commit 618a18c998778bf871b905a74657440fcc384c80 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:10:22 2020 +0200 Adding shadows, greedy meshing, and more. commit eaea83fe6a5cb1cb0ba8beef888183c718258496 Merge: 267018495 2f89b863e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 22:47:07 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 2670184954a13e4a9e7a4e35ba79aac0c5fac2f7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 21:20:01 2020 +0200 Make civsim and sites deterministic. For anything in worldgen where you use a HashMap, *please* think carefully about which hasher you are going to use! This is especially true if (for some reason) you are depending on hashmap iteration order remaining stable for some aspect of worldgen. commit f8376fd5dc72b4a9c2f51a6b4570d59c8b8e9343 Merge: 654f7e049 cdee191dd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 17:53:57 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 654f7e049258d9da27c09608bbe6a46ffa8787e5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed May 20 21:22:30 2020 +0200 Correct backface culling. commit 560501df05ca725409b0f2e4eb31bdfdc15fd0c7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue May 19 17:22:06 2020 +0200 Greedy messhing for shadows. commit a4d87e1875ca543436e6bbbeb20348facc5a52d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun May 17 05:59:00 2020 +0200 Shadow maps work for lantern. commit 243d0837b8a3b08172c9a3c348d964d7ddc2a0a8 Merge: 04382dc28 71dd520cd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:53:13 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 04382dc28632b6c66e8821f6870c0daaa1c1901a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:22:17 2020 +0200 WIP: better graphics config, better LOD, shadow maps. commit 22ddbad3eb32bfa70f0932176022208fe67ded81 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 18:54:09 2020 +0200 Minor shader fixes. commit 746a10e8d01ac235f994b0cde78fa48998602a1f Merge: 0f4a0e763 40ab94673 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 04:02:09 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0f4a0e763db3afbdc4fb0558611f38326ca87151 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 23:03:24 2020 +0200 Switch back to pop-in terrain. commit dd74fa7e4a53667b38811d7aec58d7f6a68889bb Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 22:58:55 2020 +0200 LOD shading closer to voxel shading. commit ef67bd58ba0bdaf622b078892d768263b6cba268 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 28 20:49:03 2020 +0200 Experimental underwater lighting. commit 2c5ad9d07605e80d5fd5679dd3a5d70c605b86a9 Merge: 748279835 303967a6f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 22:35:24 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7482798354eda18c8207950080fc24d443a369de Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 21:59:55 2020 +0200 Replace discard in figure-frag. commit d83b4ae69be4912f69bf7835f509c68a1c7770a4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:45:57 2020 +0200 Fix sprite lighting, HDR from focus_pos. commit 0594238004f116274905fa0ed7c2b6c417ed1d29 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:14:10 2020 +0200 Proper HDR from point lights. commit 48c93d2b41ce5743103d18e76cc228f5ac766492 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 14:01:43 2020 +0200 Brighter ambiance, darker LOD shadows. commit e0452e895ccfa8a43f368cae3b8b8aedc24dad93 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 13:13:23 2020 +0200 More proper HDR. commit 4c6da3ed16cfeebb455e40da5f557b4af9a499d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 00:13:10 2020 +0200 Trying LOD noise. commit 682a3d74c85df5503ffe1fc1cc891bce789df1ad Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 23:11:08 2020 +0200 Fix LOD heights in towns. commit cc39e5734e8b18f9077bf42e66337c1319dd6b6e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 21:01:23 2020 +0200 More LOD fixes. commit 8116b21c2e51c836e77894e309ac273caf2917b3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:54:43 2020 +0200 I like this coloring. commit bc2560ea90b36f4b46190005344232d993043ac3 Merge: 14effdd5d e690efe71 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:48:33 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 14effdd5db8747fcf3eb34f03b46b7792e92d1c5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:24:35 2020 +0200 Re-saturate. commit 48a643955d4435b78179acba0beb4a979905cc31 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:23:57 2020 +0200 Various fixes. commit f7b497a0c25f4ad4682c71dd1ed6f608052feb9b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 03:22:49 2020 +0200 Render figures again. commit 44e4aad48deba8266b9f8bdfd3db096b381f5327 Merge: e6f0a5a98 9ec319a18 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 02:01:04 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit e6f0a5a981a82533ba188fff0a54ce98577bb152 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 24 16:12:20 2020 +0200 Add atmospheric scattering. commit f2953087f691a8edbc001cb98ebf5059fc6f8ac0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 23 00:01:20 2020 +0200 Fix shadowing for specular reflections. commit ddd4a67a9799b8d08c7dc0c2bec90621c2bed0e3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Apr 22 22:56:12 2020 +0200 HDR fixes. commit 1015e60deef3c447381996277df7496707a63bd0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 21 18:25:19 2020 +0200 More lighting changes. commit 80c264abd111fb237e57843efcb5c071d4f84613 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 13 00:29:59 2020 +0200 Lighting experiments. commit 8414987e589dd5102bad89762a3adaccc0bfe957 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 9 02:38:40 2020 +0200 WIP -- lighting changes and soft shadows. commit 9cd2b3fb0d6b49776c6dfe463e4169637250b11a Merge: c7ea687eb 8b149ad11 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:29 2020 +0200 Merge branch 'sharp/new-lighting' into sharp/small-fixes commit c7ea687ebbc5aace1b455f134a5bf49ce2c7434a Merge: 476441531 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:02 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 8b149ad11ad4bb75018fcf9519baec27d1c95951 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:32:39 2020 +0200 Trying out a new lighting model. commit b0ac9f36f755dd06f7c17c46150568064790864f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 07:56:11 2020 +0200 Use bicubic interpolation for terrain. commit f6fc9307a121514b614bc50ef8eb055953e7da8a Merge: 33140a295 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 05:01:41 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 4764415312aae6e9ac2d00e86e84577cb958f1ab Merge: ed2d0111d 13388ee6a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 04:54:48 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 13388ee6a42943f3f79a9cb488346cef18e272fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 20:30:08 2020 +0200 Various fixes (to coloring and to soft shadows). commit fbd084a94a067082a87cd6d28b82054709bc9265 Merge: 5a089863b 4fdf6896a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 18:50:38 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/map-colors commit ed2d0111d994262ae836d84d1fe5a45e4de72a0b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 06:49:27 2020 +0200 Combining colors and LOD. commit 88342640c6b835114d01c797b89fdede3b0a2108 Merge: 33140a295 5a089863b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:49:20 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 33140a2951b8212725f42c758b277aaec4d888f7 Merge: 4c65a5aed f34d4b379 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:36:21 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 5a089863beb01d4794bbe3580ada47b278715ea2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 03:17:49 2020 +0200 Making maps brighter. This is probably not the right way to do it, but oh well! commit 32b2c99109dd486aa922886081068f9c550c83f2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 02:46:36 2020 +0200 Horizon mapping and "layered" map generation. Horizon mapping is a method of shadow mapping specific to height maps. It can handle any angle between 0 and 90 degrees from the ground, as long as know the horizontal direction in advance, by remembering only a single angle (the "horizon angle" of the shadow map). More is explained in common/src/msg/server.rs. We also remember the approximate height of the largest occluder, to try to be able to generate soft shadows and create a vertical position where the shadows can't go higher. Additionally, map generation has been reworked. Instead of computing everything from explicit samples, we pass in sampling functions that return exactly what the map generator needs. This allows us to cleanly separate the way we sample things like altitudes and colors from the map generation process. We exploit this to generate maps *partially* on the server (with colors and rivers, but not shading). We can then send the partially completed map to the client, which can combine it with shadow information to generate the final map. This is useful for two reasons: first, it makes sure the client can apply shadow information by itself, and second, it lets us pass the unshaded map for use with level of detail functionality. For similar reasons, river generation is split out into its own layer, but for now we opt to still generate rivers on the server (since the river wire format is more complicated to compress and may require some extra work to make sure we have enough precision to draw rivers well enough for LoD). Finally, the mostly ad-hoc lighting we were performing has been (mostly) replaced with explicit Phong reflection shading (including specular highlights). Regularizing this seems useful and helps clarify the "meaning" of the various light intensities, and helps us keep a more physically plausible basis. However, its interaction with soft shadows is still imperfect, and it's not yet clear to me what we need to do to turn this into something useful for LoD. commit f8926a5737ddc51f3d585c651a64c43677aae0f4 Merge: a1aee931e 875ae6ced Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Mar 13 13:32:42 2020 +0100 Merge remote-tracking branch 'origin/master' into sharp/map-colors commit 4c65a5aed353b119aea65a2aaeb94549b67beb42 Author: Treeco <5021038-Treeco@users.noreply.gitlab.com> Date: Mon Feb 24 16:48:05 2020 +0000 Made LOD setting slider exponential commit 2fa7b2d20d7233dc8bfd64f9f7f54617575248f1 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 17:49:53 2020 +0000 Added mist to LoD commit aab059a450b5f635777129ff82cc15b662965c3c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 15:14:06 2020 +0000 Added LoD slider commit 779c36b538121c5ade3633ae5cb67bb14c8c3877 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:54:55 2020 +0000 Reduced cost of vertex pushing commit 9fea150473906b166365b738ebcea07c697daf3d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:38:53 2020 +0000 Fixed maths, improved LoD resolution commit 5481df38fea5bf183ff376a3337179cfaa5233dc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 11:22:50 2020 +0000 Dynamically relocate LoD vertices to enhance details commit a3e36a50ababd615da7db1b26158c7906a5def01 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 18:13:51 2020 +0000 Simpler terrain spiral rendering commit 255f450ae9ac8763db4bede075fb409161ed57cc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:53:17 2020 +0000 Better LoD precision commit 3d027aebe812a5b8658a4eb8123dc9f61b3776d2 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:04:03 2020 +0000 Better falloff commit be775c9484b457b2c0b1a494aec03392d0c70e76 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 15:30:45 2020 +0000 Applied good ideas from experimental branch commit 58587b68545a23c5c04ab4574a4b94b3bc982246 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 16:15:13 2020 +0000 Minor fixes to LoD merging commit 7b42aebd709c14df2db766aad61d9280ad24d84d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 15:04:44 2020 +0000 Capped LoD dragging commit 8aafc559f87124e1ea5ca6e3ddc2aa0c242d793c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:54:37 2020 +0000 Better blending between LoD and terrain border commit edd3455d5161792d87ddc8eadc0ecbad5532b284 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:40:19 2020 +0000 Fixed LoD z depth, added sea level offset commit b9b06744620114dd5556e73f64fa93c145503a7c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:27:43 2020 +0000 Better LoD smoothing commit a1aee931e790431560cd2d953ad61d9497072afd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Feb 21 14:52:17 2020 +0100 Adding shadows. commit 2400786c13dd891c131ed86d48d05df516a8a778 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 13:48:40 2020 +0000 Use world map as LoD source commit dbf650f504a4c25fbbc2096ac3616c736bf52d23 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Jan 20 00:48:14 2020 +0000 Better clouds at distance commit 5e6f81b86cdb9730b9b056877b19257075fd5fa8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Jan 19 23:59:02 2020 +0000 sync commit 745e7540ddb000cc645f612767b337c2ddc3f7c0 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 12:40:48 2019 +0000 Improved cloud falloff mist, faster noise sampling commit f6a200d0cb866196ba57697466755f9e0c7ea5d8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 10:09:00 2019 +0000 Improved long-range depth precision, removed unnecessary LoD polygons commit 63d1b2bb2292898d59fb4f4e502201103dfeb86f Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 20:57:46 2019 +0000 Working LoD shader commit f13d98ee3e58f881e8b978861a67663b59ed91ec Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 11:03:40 2019 +0000 LoD first attempt (stack overflow issue)
2020-08-20 18:34:59 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies
2021-06-04 07:44:30 +00:00
checksum = "98d0516900518c29efa217c298fa1f4e6c6ffc85ae29fd7f4ee48f176e1a9ed5"
(See sharp/lod-history) LOD, shadows, greedy meshing, new lighting, perf --- Pretty much a Veloren fork at this point. Here's a high level overview of the changes (will be added to CHANGELOG just before merge). At a high level this MR incorporates roughly two groups of changes. The first group consists of new game features: more flexible map sizes, level of detail terrain, shadow maps, and a new lighting engine. This is "feature work" that (mostly) only adds new things to Veloren, and mostly shouldn't affect old stuff. The second big group of changes are those addressing the fallout from all the new features. These include performance fixes of various sorts: the addition of multiple graphics options and optimization of the cheap ones to avoid work, switching all voxel models to use some variant of greedy meshing, switching over much of our CPU-side vector math to exploit SIMD instructions (coinciding with a fork of `vek`), and a rewrite of how the UI handles text rendering (coinciding with updates to our fork of `conrod`). Making Veloren's hardcoded colors appear correct under the new lighting engine also required considerably changes (TODO: Fill in this section when it's complete). The second category of changes often heavily touches code owned by other people, including frequently modified code "owned" by a handful of people, so I recommend that this code be reviewed particularly carefully. --- At a high level (each will be described in more detail below): - The world map has been refactored. - The world size is no longer hardcoded (@zesterer). - The map generation code was made generic to allow using it outside of the `world` crate (@zesterer). - On world creation, we now compute *horizon maps* (@zesterer). - The way we pass the world from the server to the client has been updated (@xMAC94x). - Artifacts related to image rotation were fixed (@imbris). - Multiflow rivers were enabled (@zesterer). - In the process of making changes related to the world map, various incidental fixes and optimizations were required. - The new *level of detail* feature was added (@zesterer wrote part of this and has checked out the rest). - A new LOD terrain rendering step was added to the pipeline. - The LOD terrain quality was made configurable via a graphics setting. - Horizon maps were used to cast shadows from LOD chunks on both LOD and non-LOD terrain. - A "voxelization" effect was incorporated into rendered LOD terrain to make it blend better into the world. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Veloren's lighting has been completely overhauled (@zesterer has already checked most of this out). - A semi-accurate index of refraction was assigned to our materials. - A new, more realistic, physically based approach to lighting was used using the *Ashikhmin Shirley* BRDF. - We emulate *atmospheric scattering* using equations designed for measuring solar panel light exposure. - We attempt to compute *realistic light attenuation* in water using its real material properties. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Point and directional lights now cast realistic shadows, using *shadow mapping.* (@imbris, @zesterer, @Treeco, @YuriMomo) - Point light shadow maps were added to the rendering pipeline, using geometry shaders and *seamless cube maps*. - Directional light shadows were added to the rendering pipeline, using LISPSM together with disabling *depth clamping*. - "Shadow-only" chunks and NPCs were added to prevent shadows from models behind you from disappearing. - In the process of making changes related to shadow maps, various incidental fixes and optimizations were required. The addition of shadow maps, LOD terrain, and the new lighting all led to significant performance degradation, on top of other changes happening in master. Therefore, a large number of performance improvements were also needed: - The graphics options were made much more flexible and configurable, and shaders were optimize. - New options were provided for how to render lights and shadows (@Pfauenauge, @zesterer). - Graphic setting storage and configuration were overhauled to make adding new features easier (@Pfauenauge, @imbris). - Shaders were rewritten to utilize GLSL's preprocessor to avoid overhead (@zesterer, @YuriMomo). - In the process of making changes related to providing additional rendering options, various incidental fixes and optimizations were required. - Voxel model creation was switched to use *greedy meshing.* - A new voxel meshing method, greedy meshing, was added (@imbris). - Uses of the older meshing methods were migrated to use greedy meshing (@imbris, @jshipsey, @Pfauenauge). - New restrictions were added to terrain, figure, and sprites to future proof them for further optimizations (@jshipsey, @Pfauenauge, @zesterer). - Most positions are now relative to either chunk or player position for better precision (@imbris, @zesterer, @scottc). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - Animation and terrain math were switched to use SIMD where possible. - Fixes were made to vek to make its SIMD feature usable for us (@zesterer, @imbris). - The interface and types used in bone animation were changed in various ways (@jshipsey, @Snowram, @Pfauenauge). - Redundant code generation for body animation is now partly taken care of by a macro (@jshipsey, @Snowram, @Pfauenauge). - Animation code was modified to to use vek's SIMD representation where possible (@jshipsey, @Snowram, @Pfauenauge). - Terrain meshing code and shadow map math were also modified to use vek's SIMD representation (@imbris). - SIMD instruction generation was enabled (@YuriMomo, @jshipsey, @Snowram, @imbris, @Angelonfira, @xMAC94x). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - The way we cache glyphs was completely refactored, fixed, and optimized. - Our fork of `conrod` was optimized in various ways (@imbris). - Our fork of `conrod` now exposes whether a widget was updated during the current frame (@imbris). - Our use of the glyph cache was rewritten for correctness (@imbris). - A *text cache* was introduced that lets us skip remeshing glyphs that have not changed (@imbris). - Various changes were made to reduce pressure on the glyph cache, with more planned (@imbris, @Pfauenauge). - In the process of making changes related to the glyph cache, various incidental fixes and optimizations were required. - Colors were changed to keep Veloren's look consistent with master. - Some older tree models were brought back (@Pfauenauge). - TODO(@Sharp): All hardcoded colors were extracted and made hotloadable. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Hardcoded colors were fixed to conform to Veloren's style. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Color models were fixed to conform to Veloren's style. A detailed description of the involved changes follows. --- - The world size is no longer hardcoded. All functions dependent on world size now take a `WorldSizeLg`, which holds the base 2 logarithm of each actual world dimension and is guaranteed to maintain certain properties (outlined in `common/src/terrain/map.rs`). Additionally, many utility functions that utilize the world size were moved into `common` as well (mostly `common/src/terrain/mod.rs`). Finally, the world map format was updated in order to store its size explicitly, with a migration path from the old format that should work whenever the old formatted map was a square (practically always). See `world/src/sim/mod.rs` for these changes. - The map generation code was made generic to allow using it outside of the `world` crate. The parts of the map generating code that do not need to query the world were moved over to `common/src/terrain/map.rs`, allowing them to be used from the client without creating a dependency on `world`. The rest of it was turned into helper functions in `world/src/sim/map.rs`, which can be passed as closures to the generic map generation code to complete its construction. This also means that colors are now passed in separately to the map generation function. See <https://veloren.net/devblog-78/> for more details. - On world creation, we now compute *horizon maps*. See the function in `world/src/sim/util.rs`. Given a height map and a plane intersecting that height map, our horizon maps allow us to encode enough information to reconstruct shadows for each point on the height map using only the *horizon angle* (the angle at which the sun starts to become visible). As Veloren's sun only covers one plane, this is sufficient for encoding sun shadows for LOD terrain, by encoding two angles per chunk (one for each 90 degrees the sun covers). We can also use this for the moon, if we want, since the moon follows the same path. Additionally, we store the *height* of the furthest occluder, to try to make the shadows volumetric; so this means 4 bytes in total for each chunk. Support for horizon maps has been merged into the map functionality in common as well. - The way we pass the world from the server to the client has been updated. Rather than passing the prerendered map, we instead pass three maps with values for each chunk; one with the color information, a second with altitude information, and a third with horizon map information. We then reconstruct the map on the client, together with some additional information we send from the server (like the sea level and maximum height). See `common/src/msg/server.rs` for a detailed description of the format of `WorldMapMsg`, and `server/src/libr.rs` and `client/src/lib.rs` for details of the map construction and parsing. - Artifacts related to image rotation were fixed. See the commit message for commit SHA `cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e` for a detailed explanation. This involved changes to shaders, the addition of a new type of graphic (also reflected in the graphic cache) that allows specifying a border color (which automatically makes the associated texture immutable), and some related fixes. I reproduce the first two paragraphs of the MR description as well: ``` Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). ``` - Multiflow rivers were enabled. This does not really need to be part of this MR, and would be easy to revert, but since it seemed to provide a nice improvement it's currently packaged with it. We already computed multiple outflows from each chunk for erosion purposes long before this MR. However, we never modified river rendering to be able to handle this case (just a single downhill river flow is complex enough!) so this was not exposed when deciding which chunks were rivers. Now that - In the process of making changes related to the world map, various incidental fixes and optimizations were required. Some examples of fixes include making sure terrain is never lowered to below sea level (to make the shadow maps report correct values), fixing map altitudes and colors to understand things like cliffs and "block level" coloring (that doesn'te xist on the column level), and fixing a crashbug when rendering images for the UI where source pixels are strongly rectangular. Some examples of related performance fixes include avoiding allocating a fresh vector for all the maps (i.e. copying it over to change the format from `[u32; n]` to `DynamicImage` and then copying again to convert to `RgbaImage`), and instead using the `gfx::memory::slice` function to accomplish the same thing. These sorts of changes are spread all arond the code. This includes the additon of a new scene, `voxygen/src/scene/lod.rs`, a new pipeline `voxygen/src/render/pipeline/lod_terrain.rs`, and new shaders `assets/vxygen/shaders/lod-terrain-vert.glsl` and `assets/vxygen/shaders/lod-terrain-frag.glsl`, as well as associated changes to the renderer in `voxygen/src/render/renderer.rs`. The main idea behind our initial approach to LOD was to take the world data we now get from the server (altitude, color, and horizon mapping). - Some previously computed values were turned into shader uniforms for better prediction on weak processors. (@zesterer) - Calls to power or trig functions were removed or replaced with multiplications, where possible. - After some deliberation - To properly handle sprite "waving" for nearby sprites, We explicitly designed the greedy meshing system with figures and sprites in mind. In both cases, we want to be able to *efficiently* pack many different models into the same texture, especially in cases where we know we will either not be removing any of the grouped-together from the models from the texture, or will remove all of them at once (so they can be packed into some specific subtexture). For sprites, since we know every model in advance and never intend to deallocate them, we currently pack them all as efficiently as possible into one giant tetxure atlas. However, in the future we might opt to pack them slightly less efficiently in exchange for shrinking the sprite vertex size. For figures, we pack all the textures for each *model* into the same atlas. is a global texture atlas used for every sprite, and for figures which is why we have the ability to mesh multiple models to the same texture area (using the simple texture atlas allocator) without requiring intermediate vector allocations. This is accomplished by delaying the time when we actually write the color and light data to the texture until *after* all the model vertices have been meshed; then, we can just allocate the whole color/light array at once, making the atlas we use an exact fit. In computer science-y terms, we accomplish this delay by, after we perform the initial greedy meshing (without texture information), not continuing to create the texture data, but instead constructing a *continuation*--that is, a function that, when called, will execute the rest of the computation. We push this continuation (which in Rust terms is a `FnOnce` closure that takes the `ColLightsInfo` that it is supposed to write to as context) onto a onto a vector resizing. To allow for suspended writes to texture data, Rust pointed out to me that the continuation that would eventually write the color and light data to the texture atlas (the one that is shared by all models sharing the same greedy mesher) would have to *own* whatever data it mshed. Because we often generate the model data to mesh as a temporary in `voxygen/src/load.rs`, the - Matrix multiplications in the shader were reduced for figure data (@zesterer). - Vertex "waves" for fluid data were removed. - Terrain "bending" near edges was removed. - Scaling was fixed to make sure empty space was not introduced in a space previously occupied by a block. It was also changed to take ownership of its voxel data, rather than sharing it, to let it be used with meshing. - Rust's nightly version was bumped in order to use the `array_map` function, which lets us reuse more code between the simple map and `FigureModelCache`. - PositionedGlyph::standalone. --- I tried to cite sources in many cases[^realtime],[^lloyd],[^lispsm],[^pbrt],[^greedy],[^tjunctions] where I needed features from elsewhere but I am particularly grateful for the following resources, esepcially where they have accompanying source code. I linked all of them that are accessible to the public (those that are not were obtained through legal means). [^realtime]: Eisemann, Elmar, Michael Schwarz, Ulf Assarsson, Michael Wimmer. Real-Time Shadows. A K Peters/CRC Press (T&F), 20160419. [^lloyd]: Lloyd,B. 2007. [Logarithmic perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). PhD thesis, University of North Carolina. [^lispsm]: Wimmer, M., Scherzer, D., and Purgathofer, W. 2004. [Light space perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). In Proceedings of Eurographics Symposium on Rendering 2004, pp. 143– 152. [^pbrt]: Pharr, Matt, et al. [http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf](Physically Based Rendering: From Theory to Implementation). Third edition, Morgan Kaufmann Publishers/Elsevier, 2017. [^greedy]: mikolalysenko. “Meshing in a Minecraft Game.” 0 FPS, 30 June 2012, <https://0fps.net/2012/06/30/meshing-in-a-minecraft-game/>. [^tjunctions]: blackflux. “Meshing in Voxel Engines – Part 1.” Blackflux.Com, 23 Feb. 2014, <https://blackflux.wordpress.com/2014/02/23/meshing-in-voxel-engines-part-1/>. I am also especially grateful to Khronos, Wikiepdia, and stackoverflow for answering many of my specific questions while writing the MR. --- Squashed commit of the following: commit 300505e7305a2fdac722a808ee8538323f215f39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 18:46:25 2020 +0200 Fixing cargo doc and typo in CHANGELOG. commit ec0aeb18e8499d7d84ef818331b4b65c3d76cea6 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 15:38:50 2020 +0200 Hopefully final commit for the LOD branch. commit 5e8ea0b1eaac02903a02feb2eb038d195de4872f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 10:14:26 2020 +0200 Falling back to power as stopgap. commit e44a1cbf46504ee9931a01bdc9033e145500d557 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 09:25:41 2020 +0200 Address imbris feedback. Temporarily disables shiny water, lowers max VD. These restrictions will be lifted soon after merging. commit 561e25778a108ac3712f5ec2ce3a51234c4430d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 08:31:13 2020 +0200 Tweaking shaders a bit. commit 7d19259078ce0dd7b3742ad7d0cb3fab3ece3fdc Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:59:43 2020 +0200 Fix view example as well. commit 051cd4934e0fad2c0b15db4380a4189fa318679f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:29:06 2020 +0200 Fix meshing benchmark. commit c95e07db3b4dcca285678985e65e31b927cb1c61 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 05:46:22 2020 +0200 Address MR feedback, fix scene clouds. commit 1bfb816cabdb3ffc1e507a009c2d98696b4b573a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:39:36 2020 +0200 Incorporating Pfau's figure color changes. New eyes and new humanoid colors. commit 3f9b89a3ac7b3356b1dba0d1a8f6541357f81469 Merge: e2f5162e4 62c53963a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:29:41 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit e2f5162e4f96f4124aa43488f7245d341b3dcfd4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:28:38 2020 +0200 World colors are all hotloadable. They live in assets/world/style/colors.ron. Only a small handful of hardcoed colors remain in World; they are either part of the map, or difficult to disentangle from the rest of the computation. Comments are made where appropriate. commit 62c53963abe1975009d34a8f9515a355bef24f31 Author: Marcel Märtens <marcel.cochem@googlemail.com> Date: Wed Aug 19 15:59:00 2020 +0200 replace pretty_env_logger with tracing commit 5b1625f99d9586fe80e2232f583ec5af9f953099 Merge: d71003acd 4942b5b39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:15:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit d71003acdabeff970b3928e97c26af6847b5b78e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:14:34 2020 +0200 Hotloading colors, part 1: colors in common. Currently, this just entails humanoid colors. There are only three colors not handled; the light emitter colors in common/src/comp/inventory/item/tool.rs. These don't seem important enough to me to warrant making hotloadable, at least not right now, but if it's needed later we can always add them to the file. commit 63b5e0e553eb2ea49276f192a6fc7dd65254270d Merge: c32b337a4 6d2c4b9c1 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 13:05:37 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c32b337a46e10d9de473d178a94a3ccd61c39bb3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:52:04 2020 +0200 Fixing LOD grid, for real. commit a166ae0360395387e09fb35a1f84210c2ce5ec24 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:28:05 2020 +0200 Addressing imbris's initial feedback. Fixes two minor bugs: explosion particles were no longer spawning randomly, and LOD grids were not perfectly even. commit 4cbad004f44060994252dd3d38647a14a589712f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:27:58 2020 +0200 Bumping nightly per request. commit 548680276aac77c25d43d16b5622f847d474dbef Merge: acc098604 8f8b20c91 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:26:06 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit acc0986040589a3492f88a740bc3c3fc693b26d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:28:32 2020 +0200 Lower resolution due to lying drivers. commit d3b878de2a52c358d2944a6bbd0555dad7fbdb10 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:15:38 2020 +0200 Fix issues msh encountered with Intel 4600. commit 10245e0c1b0cb6fae10d86409435364edc6102ef Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 21:15:02 2020 +0200 Merge more models into one mesh than we did previously. commit 3155c31e663c52ae5c3a53d5fb5665892a1a498a Merge: 7204cc8a7 3c199280e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:35:22 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7204cc8a7a4f74a30306bd205d9834fee4bb944f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:34:43 2020 +0200 Fix not yet done NPC animations. This forces them all to be the idle animation if not specified. This fixes issues where you'd have giant NPCs in water. commit bc83360f2a08918f19d417b5f772e1ff554dba08 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 19:36:37 2020 +0200 Try to fix some bugs: - Z fighting with LOD terrain and water. - Audio SFX not playing. commit 1fd104aa603bf3781b6526a5cada46aeca3049dd Merge: 862df3c99 7c2c392a3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 12:02:31 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 862df3c9976c4da9bd7cfd784f1a85973127968a Merge: 0a4218ed9 75c1d4401 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 05:52:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0a4218ed9d541a2b34c133351bea38a99ddf4ea7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 22:27:14 2020 +0200 Fix particle depth. commit f51dfdeb442d0dd5243dd2f344fa4be295bd0875 Merge: c6251a956 5e6dc0471 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:19:04 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit c6251a956ad376400dca5c23420cf8d213dc8fdf Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:15:46 2020 +0200 Cache figures more intelligently. Cache figures for longer, and don't cache character states for the player except where they actually affect the rendered model. commit 0ed801d5404982c6fb63b1eaa4567d908b294c9d Merge: c11b9bdf0 eea64f78f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 16:32:24 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c11b9bdf0a53bf9884d2f5a48fec9b01d582df1a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 11:47:15 2020 +0200 Remove unneeded Clippy annotation. commit 16aa9ef40af56d69289d00aafb3deadfb8bd4f35 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 8 00:53:02 2020 +0200 Fix hotloading and Clippy. commit 3dc973e0be5b758da1e9805eb764ad401374cd0c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 23:50:27 2020 +0200 Major speedups with SIMD. commit fba64a7d93d5a96077ce87287bbce6ab9b7fbcae Merge: 76429d00e d1e10b178 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:19 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 76429d00eea00d212fbd672a84ee91e75b19b938 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:10 2020 +0200 Add clippy.toml. commit c79f512f84dbb83cb82b7954db68ff241dfd8e41 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 11:55:20 2020 +0200 Fix all clippy issues, clean up Rust code. commit 6f90e010b3fbefb53b0d632e819931350015b6b8 Merge: 77a8c7c26 5929cfa5c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:30 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 77a8c7c267d3f44a1a62bd6b2274359973c5e4d4 Merge: b44e44232 44febaabd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:10 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 5929cfa5c713aa392110bbb62407f76caf53c3df Author: jshipsey <jshipsey18@gmail.com> Date: Thu Aug 6 20:47:27 2020 -0400 fixed in-hand arrow bug commit b44e442325d828f1cd564d66908f89d09e80474b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 6 13:40:35 2020 +0200 Miscellaneous performance improvements. commit be37acf287c1360d8085862526ac3365ffd1d768 Merge: 125d7fc6c c11876547 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 05:49:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 125d7fc6c4dcd8c8c5f27b8268a4d64f409f3644 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 04:55:31 2020 +0200 Abstract over simd vs. repr_c vectors. Also some minor improvements to Event size. commit d4d4956e9252e1241ce110b2aa85076c6b1e2a23 Merge: 5f3b7294a aced5f979 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:56:54 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 5f3b7294af1f8533edc2620b58863c248e2b07af Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:43:52 2020 +0200 Fix formatting issues I missed before. commit a428a3ebba70dcab63dd0f8cd983120c90617271 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:41:51 2020 +0200 Fix clippy warnings, part 1. There aer still a bunch of type too complex and function takes too many arguments warnings that I'll fix later (or ignore, since in the one case I did fix a function takes too many arguments warning I think it made the code *less* readable). commit ba54307540ed8a937ac08209730284fc653af85b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 30 13:22:42 2020 +0200 Fix light animations so they are removed when the light turns off. commit 7e0f4bcbf0f4717145d8beac40d52e3acebbe2aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 21:10:20 2020 +0200 Fix crash in edge case for pixel art. commit 56da06f7a351e2b949e9b014a90b974d511a0924 Merge: cf74d55f2 9f53a4a19 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:56:52 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:29:52 2020 +0200 Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). The first concern was addressed by fixing the dimensions of the map images drawn from the UI (so that we always use a square source rectangle, rather than a rectangular one according to the dimensions of the map). We also fixed the way rotation was done in the fragment shader for north-facing sources to make it properly handle aspect ratio (this was already done for north-facing targets). Together, these fix rendering issues peculiar to rectangular maps. The second and third concerns were jointly addressed by adding an optional border color to every 2D image drawn by the UI. This turns out not to waste extra space even though we hold a full f32 color (to avoid an extra dependency on gfx's PackedColor), since voxel images already take up more space than Optiion<[f32; 4]> requires. This is then implemented automatically using the "border color" wrapping method in the attached sampler. Since this is implemented in graphics hardware, it only works (at least naively) if the actual image bounds match the texture bounds. Therefore, we altered the way the graphics cache stores images with a border color to guarantee that they are always in their own texture, whose size exactly matches their extent. Since the easiest currently exposed way to set a border color is to do so for an immutable texture, we went a bit further and added a new "immutable" texture storage type used for these cases; currently, it is always and automatically used only when there is a specified border color, but in theory there's no reason we couldn't provide immutable-only images that use the default wrapping mdoe (though clamp to border is admittedly not a great default). To fix the maps case specifically, we set the border color to a translucent version of the ocean border color. This may need tweaking going forward, which shouldn't be hard. As part of this process, we had to modify graphics replacement to make sure immutable images are *removed* when invalidated, rather than just having a validity flag unset (this is normally done by the UI to try to reuse allocations in place if images are updated in benign ways, since the texture atlases used for Ui do not support deallocation; currently this is only used for item images, so there should be no overlap with immutable image replacement, so this was purely precautionary). Since we were already touching the relevant code, we also updated the image dependency to a newer version that provides more ways to avoid allocations, and made a few other changes that should hopefully eliminate redundant most of the intermediate buffer allocations we were performing for what should be zero-cost conversions. This may slightly improve performance in some cases. commit ad18ce939940a8c697270f6e9b94db9942fd8295 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 13:21:09 2020 +0200 Fix continent scale hack. commit 36b1cb074f5b195aebd7dbbc3da7f0246a1a18ec Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 12:11:40 2020 +0200 Enable loading different sized maps without a recompile. We may want to tweak the effects of the continent_scale_hack. commit 13b6d4d534cc4814b7cb3294ca41bbfea0a6b186 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 10:55:48 2020 +0200 Removing WORLD_SIZE, part 1. Erased almost every instance of WORLD_SIZE and replaced it with a local power of two, map_size_lg (which respects certain invariants; see common/src/terrain/map.rs for more details about MapSizeLg). This also means we can avoid a dependency on the world crate from client, as desired. Now that the rest of the code is not expecting a fixed WORLD_SIZE, the next step is to arrange for maps to store their world size, and to use that world size as a basis prior to loading the map (as well, probably, as prior to configuring some of the noise functions). commit 30b1d2c6428230a9eaa0d749cdcbbd6f1cbccd78 Merge: 7d56ba31b 1377b369f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:58 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 7d56ba31b445441461b28a07fc495d7d4f047c17 Merge: 2101113b4 598f14b25 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 1377b369f6db2258e910d467a5740f31789e3ded Author: Monty Marz <m.marzouq@gmx.de> Date: Sun Jul 19 23:25:38 2020 +0200 more saturated pumpkins commit ae8d50527f93bb0616c2ad46ce4dacb63bc37c6d Author: Monty Marz <m.marzouq@gmx.de> Date: Sat Jul 18 20:29:56 2020 +0200 acacia models commit 2101113b467e691de787392d7f20f1745f5637bd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 18 18:55:25 2020 +0200 Higher detail LOD. commit add2cfae04b4385fa5590e11e2bd5229d9dee0aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 16 01:57:39 2020 +0200 Revert some irrelevant stuff. commit 2e2ab3dc1eaa59a4aef7f8d34a53d8aae4c8553a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 15 13:30:49 2020 +0200 Fixing various things about shadows. * Correcting optimal LISPSM parameter. * Figure shadows are cast when they're not visible. * Chunk shadows stay cast until you look away. * Seamless cubemaps for point lights. * Etc. commit 6c31e6b56217274285b597af297036691ea5d897 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 19:50:26 2020 +0200 Fix shadow creation. commit 6332cbe006115ae205597529cd8bbccd146c2cca Merge: be438657c 930e0028b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:47:00 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit be438657c33d7b5bfb0a9582c3ed3fd366637323 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:28:08 2020 +0200 Tweaks to shadows. Added shadow map resolution configuration, added seamless cubemaps, documented all existing rendering options, and fixed a few Clippy errors. commit 23b4058906013c7d2a40c286e20e32c5fbd897ed Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 10:11:19 2020 +0200 Fix moon, use nonlinear noise for terrain. Note that the latter has a bit of performance cost. commit 7fbe5cbfbb9dc29607957b8e62f432a4deed193d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:23:02 2020 +0200 Address lies about max texture size. commit bcfc62b5e13a1cdd83f57535fde4694720bebfd9 Merge: 75e3626a7 18a08e8fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:22:08 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 75e3626a785919f43fdcf2127c2b10e3e4df2f9f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:21:52 2020 +0200 OpenGL 3.3 minimum. commit 18a08e8fe2739f02af99a5d2cb4e7c38c49e858b Author: Monty Marz <m.marzouq@gmx.de> Date: Tue Jul 7 23:57:52 2020 +0200 settings localization commit 90c5d1ca3620092bc3ae10b2211489eb1cf6f5e8 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 21:11:48 2020 +0200 Lower near distance. commit 0e66f02b25aaddaa2dfddbbc89cd67de54a9a7b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 20:09:01 2020 +0200 All sprites sway in the wind now. commit db1401a6910bf42dcf502462c90038752ff5fbdb Merge: 69e508d8c e8b4b29d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 19:34:17 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 69e508d8c94d8973033817ca86f357e466fc7c4d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 18:41:37 2020 +0200 Make it easy to switch to SIMD for math. commit ffe0f5928c7a7e87d00cb5426b3b1d831d7e02fd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 21:21:12 2020 +0200 Fix some issues with underwater rendering. commit bfda6da42f38fd02c31ee92c81ab785a3e50c2a0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 19:17:59 2020 +0200 Fix some minor display issues. commit 0ed752e087968cf901301884aaeae698e32ef8a5 Merge: ccc6a06a8 518edcb85 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:14:21 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit ccc6a06a8d4504d6b9f7af7905a414d2ee06ab76 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:04:34 2020 +0200 Some minor changes. commit 4e020246702889269efe1a191788992164c508d6 Merge: 50a64d927 e05c9267a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 16:17:40 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 50a64d927e6c4f4b0e4688e4cbfca694bc3f922a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 13:07:03 2020 +0200 Fix far plane. commit 7dd06da34cae8f9ea3b6c889fe965181f3fd3949 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:25:35 2020 +0200 Add shadows.glsl. commit 618a18c998778bf871b905a74657440fcc384c80 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:10:22 2020 +0200 Adding shadows, greedy meshing, and more. commit eaea83fe6a5cb1cb0ba8beef888183c718258496 Merge: 267018495 2f89b863e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 22:47:07 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 2670184954a13e4a9e7a4e35ba79aac0c5fac2f7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 21:20:01 2020 +0200 Make civsim and sites deterministic. For anything in worldgen where you use a HashMap, *please* think carefully about which hasher you are going to use! This is especially true if (for some reason) you are depending on hashmap iteration order remaining stable for some aspect of worldgen. commit f8376fd5dc72b4a9c2f51a6b4570d59c8b8e9343 Merge: 654f7e049 cdee191dd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 17:53:57 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 654f7e049258d9da27c09608bbe6a46ffa8787e5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed May 20 21:22:30 2020 +0200 Correct backface culling. commit 560501df05ca725409b0f2e4eb31bdfdc15fd0c7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue May 19 17:22:06 2020 +0200 Greedy messhing for shadows. commit a4d87e1875ca543436e6bbbeb20348facc5a52d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun May 17 05:59:00 2020 +0200 Shadow maps work for lantern. commit 243d0837b8a3b08172c9a3c348d964d7ddc2a0a8 Merge: 04382dc28 71dd520cd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:53:13 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 04382dc28632b6c66e8821f6870c0daaa1c1901a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:22:17 2020 +0200 WIP: better graphics config, better LOD, shadow maps. commit 22ddbad3eb32bfa70f0932176022208fe67ded81 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 18:54:09 2020 +0200 Minor shader fixes. commit 746a10e8d01ac235f994b0cde78fa48998602a1f Merge: 0f4a0e763 40ab94673 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 04:02:09 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0f4a0e763db3afbdc4fb0558611f38326ca87151 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 23:03:24 2020 +0200 Switch back to pop-in terrain. commit dd74fa7e4a53667b38811d7aec58d7f6a68889bb Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 22:58:55 2020 +0200 LOD shading closer to voxel shading. commit ef67bd58ba0bdaf622b078892d768263b6cba268 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 28 20:49:03 2020 +0200 Experimental underwater lighting. commit 2c5ad9d07605e80d5fd5679dd3a5d70c605b86a9 Merge: 748279835 303967a6f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 22:35:24 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7482798354eda18c8207950080fc24d443a369de Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 21:59:55 2020 +0200 Replace discard in figure-frag. commit d83b4ae69be4912f69bf7835f509c68a1c7770a4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:45:57 2020 +0200 Fix sprite lighting, HDR from focus_pos. commit 0594238004f116274905fa0ed7c2b6c417ed1d29 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:14:10 2020 +0200 Proper HDR from point lights. commit 48c93d2b41ce5743103d18e76cc228f5ac766492 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 14:01:43 2020 +0200 Brighter ambiance, darker LOD shadows. commit e0452e895ccfa8a43f368cae3b8b8aedc24dad93 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 13:13:23 2020 +0200 More proper HDR. commit 4c6da3ed16cfeebb455e40da5f557b4af9a499d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 00:13:10 2020 +0200 Trying LOD noise. commit 682a3d74c85df5503ffe1fc1cc891bce789df1ad Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 23:11:08 2020 +0200 Fix LOD heights in towns. commit cc39e5734e8b18f9077bf42e66337c1319dd6b6e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 21:01:23 2020 +0200 More LOD fixes. commit 8116b21c2e51c836e77894e309ac273caf2917b3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:54:43 2020 +0200 I like this coloring. commit bc2560ea90b36f4b46190005344232d993043ac3 Merge: 14effdd5d e690efe71 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:48:33 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 14effdd5db8747fcf3eb34f03b46b7792e92d1c5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:24:35 2020 +0200 Re-saturate. commit 48a643955d4435b78179acba0beb4a979905cc31 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:23:57 2020 +0200 Various fixes. commit f7b497a0c25f4ad4682c71dd1ed6f608052feb9b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 03:22:49 2020 +0200 Render figures again. commit 44e4aad48deba8266b9f8bdfd3db096b381f5327 Merge: e6f0a5a98 9ec319a18 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 02:01:04 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit e6f0a5a981a82533ba188fff0a54ce98577bb152 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 24 16:12:20 2020 +0200 Add atmospheric scattering. commit f2953087f691a8edbc001cb98ebf5059fc6f8ac0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 23 00:01:20 2020 +0200 Fix shadowing for specular reflections. commit ddd4a67a9799b8d08c7dc0c2bec90621c2bed0e3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Apr 22 22:56:12 2020 +0200 HDR fixes. commit 1015e60deef3c447381996277df7496707a63bd0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 21 18:25:19 2020 +0200 More lighting changes. commit 80c264abd111fb237e57843efcb5c071d4f84613 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 13 00:29:59 2020 +0200 Lighting experiments. commit 8414987e589dd5102bad89762a3adaccc0bfe957 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 9 02:38:40 2020 +0200 WIP -- lighting changes and soft shadows. commit 9cd2b3fb0d6b49776c6dfe463e4169637250b11a Merge: c7ea687eb 8b149ad11 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:29 2020 +0200 Merge branch 'sharp/new-lighting' into sharp/small-fixes commit c7ea687ebbc5aace1b455f134a5bf49ce2c7434a Merge: 476441531 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:02 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 8b149ad11ad4bb75018fcf9519baec27d1c95951 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:32:39 2020 +0200 Trying out a new lighting model. commit b0ac9f36f755dd06f7c17c46150568064790864f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 07:56:11 2020 +0200 Use bicubic interpolation for terrain. commit f6fc9307a121514b614bc50ef8eb055953e7da8a Merge: 33140a295 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 05:01:41 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 4764415312aae6e9ac2d00e86e84577cb958f1ab Merge: ed2d0111d 13388ee6a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 04:54:48 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 13388ee6a42943f3f79a9cb488346cef18e272fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 20:30:08 2020 +0200 Various fixes (to coloring and to soft shadows). commit fbd084a94a067082a87cd6d28b82054709bc9265 Merge: 5a089863b 4fdf6896a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 18:50:38 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/map-colors commit ed2d0111d994262ae836d84d1fe5a45e4de72a0b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 06:49:27 2020 +0200 Combining colors and LOD. commit 88342640c6b835114d01c797b89fdede3b0a2108 Merge: 33140a295 5a089863b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:49:20 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 33140a2951b8212725f42c758b277aaec4d888f7 Merge: 4c65a5aed f34d4b379 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:36:21 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 5a089863beb01d4794bbe3580ada47b278715ea2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 03:17:49 2020 +0200 Making maps brighter. This is probably not the right way to do it, but oh well! commit 32b2c99109dd486aa922886081068f9c550c83f2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 02:46:36 2020 +0200 Horizon mapping and "layered" map generation. Horizon mapping is a method of shadow mapping specific to height maps. It can handle any angle between 0 and 90 degrees from the ground, as long as know the horizontal direction in advance, by remembering only a single angle (the "horizon angle" of the shadow map). More is explained in common/src/msg/server.rs. We also remember the approximate height of the largest occluder, to try to be able to generate soft shadows and create a vertical position where the shadows can't go higher. Additionally, map generation has been reworked. Instead of computing everything from explicit samples, we pass in sampling functions that return exactly what the map generator needs. This allows us to cleanly separate the way we sample things like altitudes and colors from the map generation process. We exploit this to generate maps *partially* on the server (with colors and rivers, but not shading). We can then send the partially completed map to the client, which can combine it with shadow information to generate the final map. This is useful for two reasons: first, it makes sure the client can apply shadow information by itself, and second, it lets us pass the unshaded map for use with level of detail functionality. For similar reasons, river generation is split out into its own layer, but for now we opt to still generate rivers on the server (since the river wire format is more complicated to compress and may require some extra work to make sure we have enough precision to draw rivers well enough for LoD). Finally, the mostly ad-hoc lighting we were performing has been (mostly) replaced with explicit Phong reflection shading (including specular highlights). Regularizing this seems useful and helps clarify the "meaning" of the various light intensities, and helps us keep a more physically plausible basis. However, its interaction with soft shadows is still imperfect, and it's not yet clear to me what we need to do to turn this into something useful for LoD. commit f8926a5737ddc51f3d585c651a64c43677aae0f4 Merge: a1aee931e 875ae6ced Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Mar 13 13:32:42 2020 +0100 Merge remote-tracking branch 'origin/master' into sharp/map-colors commit 4c65a5aed353b119aea65a2aaeb94549b67beb42 Author: Treeco <5021038-Treeco@users.noreply.gitlab.com> Date: Mon Feb 24 16:48:05 2020 +0000 Made LOD setting slider exponential commit 2fa7b2d20d7233dc8bfd64f9f7f54617575248f1 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 17:49:53 2020 +0000 Added mist to LoD commit aab059a450b5f635777129ff82cc15b662965c3c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 15:14:06 2020 +0000 Added LoD slider commit 779c36b538121c5ade3633ae5cb67bb14c8c3877 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:54:55 2020 +0000 Reduced cost of vertex pushing commit 9fea150473906b166365b738ebcea07c697daf3d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:38:53 2020 +0000 Fixed maths, improved LoD resolution commit 5481df38fea5bf183ff376a3337179cfaa5233dc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 11:22:50 2020 +0000 Dynamically relocate LoD vertices to enhance details commit a3e36a50ababd615da7db1b26158c7906a5def01 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 18:13:51 2020 +0000 Simpler terrain spiral rendering commit 255f450ae9ac8763db4bede075fb409161ed57cc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:53:17 2020 +0000 Better LoD precision commit 3d027aebe812a5b8658a4eb8123dc9f61b3776d2 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:04:03 2020 +0000 Better falloff commit be775c9484b457b2c0b1a494aec03392d0c70e76 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 15:30:45 2020 +0000 Applied good ideas from experimental branch commit 58587b68545a23c5c04ab4574a4b94b3bc982246 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 16:15:13 2020 +0000 Minor fixes to LoD merging commit 7b42aebd709c14df2db766aad61d9280ad24d84d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 15:04:44 2020 +0000 Capped LoD dragging commit 8aafc559f87124e1ea5ca6e3ddc2aa0c242d793c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:54:37 2020 +0000 Better blending between LoD and terrain border commit edd3455d5161792d87ddc8eadc0ecbad5532b284 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:40:19 2020 +0000 Fixed LoD z depth, added sea level offset commit b9b06744620114dd5556e73f64fa93c145503a7c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:27:43 2020 +0000 Better LoD smoothing commit a1aee931e790431560cd2d953ad61d9497072afd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Feb 21 14:52:17 2020 +0100 Adding shadows. commit 2400786c13dd891c131ed86d48d05df516a8a778 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 13:48:40 2020 +0000 Use world map as LoD source commit dbf650f504a4c25fbbc2096ac3616c736bf52d23 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Jan 20 00:48:14 2020 +0000 Better clouds at distance commit 5e6f81b86cdb9730b9b056877b19257075fd5fa8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Jan 19 23:59:02 2020 +0000 sync commit 745e7540ddb000cc645f612767b337c2ddc3f7c0 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 12:40:48 2019 +0000 Improved cloud falloff mist, faster noise sampling commit f6a200d0cb866196ba57697466755f9e0c7ea5d8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 10:09:00 2019 +0000 Improved long-range depth precision, removed unnecessary LoD polygons commit 63d1b2bb2292898d59fb4f4e502201103dfeb86f Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 20:57:46 2019 +0000 Working LoD shader commit f13d98ee3e58f881e8b978861a67663b59ed91ec Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 11:03:40 2019 +0000 LoD first attempt (stack overflow issue)
2020-08-20 18:34:59 +00:00
dependencies = [
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"proc-macro2 1.0.32",
"quote 1.0.10",
"syn 1.0.81",
Made boulders avoid rivers
2020-08-29 07:53:42 +00:00
]
switch from hyper http to rouille for http server
2019-09-08 23:59:19 +00:00
[[package]]
name = "sha1"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
switch from hyper http to rouille for http server
2019-09-08 23:59:19 +00:00
Added hash value to decide if we should invalidate persited skills and allow a respec.
2021-11-14 18:32:37 +00:00
[[package]]
name = "sha2"
version = "0.9.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa"
dependencies = [
"block-buffer",
"cfg-if 1.0.0",
"cpufeatures",
"digest",
"opaque-debug",
]
Revert "Replace shaderc with naga" This reverts commit 446d93dda0db486d65ec9374946205cc5bf35a59.
2021-09-04 18:59:18 +00:00
[[package]]
name = "shaderc"
version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "50b8aeaae10b9bda5cba66736a7e265f67698e912e1cc6a4678acba286e22be9"
dependencies = [
"libc",
"shaderc-sys",
]
[[package]]
name = "shaderc-sys"
version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b12d7c62d6732884c9dfab587503fa3a795b108df152415a89da23812d4737e"
dependencies = [
"cmake",
"libc",
]
Finished porting all pipelines
2020-09-13 10:03:42 +00:00
[[package]]
name = "sharded-slab"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.1.4"
Finished porting all pipelines
2020-09-13 10:03:42 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
Finished porting all pipelines
2020-09-13 10:03:42 +00:00
dependencies = [
"lazy_static",
]
More fixes to stdin input. Adding tty makes sure docker attach won't be accidentally detached by ctrl-C (there are better ways of doing this but this one works for now) shell-words more closely emulates Bash's tokenizer rules (but without doing things like environment variable expansion) which allows us to use multiline strings as reasons, etc. Unfortunately entering newlines still won't work the way we've written things since shell-words does not right now give enough information to incrementally build up a valid string, just says there was a tokenizing error; but maybe in the future we can fix that.
2021-05-11 11:13:22 +00:00
[[package]]
name = "shell-words"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b6fa3938c99da4914afedd13bf3d79bcb6c277d1b2c398d23257a304d9e1b074"
Switch veloren_network over to use the official example layout. adjusted those examples to run again created a CI TEST to always `check` examples fixed fmt in examples so that pipeline gets green
2020-08-26 08:07:22 +00:00
[[package]]
name = "shellexpand"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
version = "2.1.0"
Switch veloren_network over to use the official example layout. adjusted those examples to run again created a CI TEST to always `check` examples fixed fmt in examples so that pipeline gets green
2020-08-26 08:07:22 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "83bdb7831b2d85ddf4a7b148aa19d0587eddbe8671a436b7bd1182eaad0f2829"
Switch veloren_network over to use the official example layout. adjusted those examples to run again created a CI TEST to always `check` examples fixed fmt in examples so that pipeline gets green
2020-08-26 08:07:22 +00:00
dependencies = [
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"dirs-next",
Switch veloren_network over to use the official example layout. adjusted those examples to run again created a CI TEST to always `check` examples fixed fmt in examples so that pipeline gets green
2020-08-26 08:07:22 +00:00
]
Updated toolchain version and a bunch of deps.
2019-09-06 05:16:11 +00:00
[[package]]
name = "shlex"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
Updated toolchain version and a bunch of deps.
2019-09-06 05:16:11 +00:00
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "shred"
switch to hashbrown 0.11 and specs 0.16.2
2021-06-07 11:01:01 +00:00
version = "0.12.0"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
switch to hashbrown 0.11 and specs 0.16.2
2021-06-07 11:01:01 +00:00
checksum = "eb0210289d693217926314867c807e0b7b42f7e23c136adb31f8697f5bf242d3"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
update chrossbeam, tracy, prometheus (and reduce server deps to crossbeam-channel)
2020-12-15 23:51:07 +00:00
"arrayvec",
switch to hashbrown 0.11 and specs 0.16.2
2021-06-07 11:01:01 +00:00
"hashbrown 0.11.2",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"mopa",
"rayon",
"shred-derive",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"smallvec",
point to github specs to access PairedStorage type, fix Loadout sync spam
2020-07-06 05:56:02 +00:00
"tynm",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
Revert "Merge branch 'imbris/upgrade_specs' into 'master'" This reverts merge request !375
2019-08-01 23:32:33 +00:00
[[package]]
name = "shred-derive"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
version = "0.6.3"
Revert "Merge branch 'imbris/upgrade_specs' into 'master'" This reverts merge request !375
2019-08-01 23:32:33 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "d5404c36bd155e41a54276ab6aafedad2fb627e5e5849d36ec439c9ddc044a2f"
Revert "Merge branch 'imbris/upgrade_specs' into 'master'" This reverts merge request !375
2019-08-01 23:32:33 +00:00
dependencies = [
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"proc-macro2 1.0.32",
"quote 1.0.10",
"syn 1.0.81",
Revert "Merge branch 'imbris/upgrade_specs' into 'master'" This reverts merge request !375
2019-08-01 23:32:33 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "shrev"
Updated sphynx Former-commit-id: f81484571bda8c5e15ea2b6c0e8b9b6892b094a3
2019-05-16 23:05:46 +00:00
version = "1.1.1"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "b5752e017e03af9d735b4b069f53b7a7fd90fefafa04d8bd0c25581b0bff437f"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
Made the server cli great
2020-07-27 16:26:34 +00:00
[[package]]
name = "signal-hook"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
version = "0.1.17"
Made the server cli great
2020-07-27 16:26:34 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "7e31d442c16f047a671b5a71e2161d6e68814012b7f5379d269ebd915fac2729"
Made the server cli great
2020-07-27 16:26:34 +00:00
dependencies = [
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"mio 0.7.14",
Made the server cli great
2020-07-27 16:26:34 +00:00
"signal-hook-registry",
]
update further crates
2020-12-16 00:07:39 +00:00
[[package]]
name = "signal-hook"
update crates
2021-09-20 10:05:41 +00:00
version = "0.3.10"
update further crates
2020-12-16 00:07:39 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "9c98891d737e271a2954825ef19e46bd16bdb98e2746f2eec4f7a4ef7946efd1"
update further crates
2020-12-16 00:07:39 +00:00
dependencies = [
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
update further crates
2020-12-16 00:07:39 +00:00
"signal-hook-registry",
]
update depednencies
2021-07-08 10:21:02 +00:00
[[package]]
name = "signal-hook-mio"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "29fd5867f1c4f2c5be079aee7a2adf1152ebb04a4bc4d341f504b7dece607ed4"
dependencies = [
"libc",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"mio 0.7.14",
update crates
2021-09-20 10:05:41 +00:00
"signal-hook 0.3.10",
update depednencies
2021-07-08 10:21:02 +00:00
]
Made the server cli great
2020-07-27 16:26:34 +00:00
[[package]]
name = "signal-hook-registry"
update dependencies
2021-06-04 07:44:30 +00:00
version = "1.4.0"
Made the server cli great
2020-07-27 16:26:34 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies
2021-06-04 07:44:30 +00:00
checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
Made the server cli great
2020-07-27 16:26:34 +00:00
dependencies = [
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
Made the server cli great
2020-07-27 16:26:34 +00:00
]
* Replaced `diesel` with `rusqlite` and `refinery` * Added "migration of migrations" to transfer the data from the __diesel_schema_migrations table to the refinery_schema_history table * Removed all down migrations as refinery does not support down migrations * Changed all diesel up migrations to refinery naming format * Added --sql-log-mode parameter to veloren-server-cli to allow SQL tracing and profiling * Added /disconnect_all_players admin command * Added disconnectall CLI command * Fixes for several potential persistence-related race conditions
2021-04-13 22:05:47 +00:00
[[package]]
name = "siphasher"
update crates
2021-09-20 10:05:41 +00:00
version = "0.3.7"
* Replaced `diesel` with `rusqlite` and `refinery` * Added "migration of migrations" to transfer the data from the __diesel_schema_migrations table to the refinery_schema_history table * Removed all down migrations as refinery does not support down migrations * Changed all diesel up migrations to refinery naming format * Added --sql-log-mode parameter to veloren-server-cli to allow SQL tracing and profiling * Added /disconnect_all_players admin command * Added disconnectall CLI command * Fixes for several potential persistence-related race conditions
2021-04-13 22:05:47 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "533494a8f9b724d33625ab53c6c4800f7cc445895924a8ef649222dcb76e938b"
* Replaced `diesel` with `rusqlite` and `refinery` * Added "migration of migrations" to transfer the data from the __diesel_schema_migrations table to the refinery_schema_history table * Removed all down migrations as refinery does not support down migrations * Changed all diesel up migrations to refinery naming format * Added --sql-log-mode parameter to veloren-server-cli to allow SQL tracing and profiling * Added /disconnect_all_players admin command * Added disconnectall CLI command * Fixes for several potential persistence-related race conditions
2021-04-13 22:05:47 +00:00
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "slab"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.4.5"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
Finished porting all pipelines
2020-09-13 10:03:42 +00:00
[[package]]
name = "slotmap"
update crates
2021-09-20 10:05:41 +00:00
version = "0.4.3"
Finished porting all pipelines
2020-09-13 10:03:42 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "6bf34684c5767b87de9119790e92e9a1d60056be2ceeaf16a8e6ef13082aeab1"
Finished porting all pipelines
2020-09-13 10:03:42 +00:00
Aura System and Campfire Health Regen
2020-12-04 22:24:56 +00:00
[[package]]
name = "slotmap"
update crates
2021-09-20 10:05:41 +00:00
version = "1.0.6"
Aura System and Campfire Health Regen
2020-12-04 22:24:56 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342"
Aura System and Campfire Health Regen
2020-12-04 22:24:56 +00:00
dependencies = [
"serde",
update dependencies
2021-03-21 21:53:44 +00:00
"version_check 0.9.3",
Aura System and Campfire Health Regen
2020-12-04 22:24:56 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "smallvec"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "1.7.0"
Began integrating procgen trees
2021-01-03 20:43:07 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309"
Stop global syncing of entity creation
2019-11-04 00:57:36 +00:00
WIP (testing) Update conrod_core This is a `cargo update -p conrod_core` to bring in updates to `veloren/conrod/conrod_core` to add support for copy and paste. Ref: veloren/conrod!2 Fixes #171
2019-10-19 06:12:37 +00:00
[[package]]
name = "smithay-client-toolkit"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
version = "0.12.3"
WIP (testing) Update conrod_core This is a `cargo update -p conrod_core` to bring in updates to `veloren/conrod/conrod_core` to add support for copy and paste. Ref: veloren/conrod!2 Fixes #171
2019-10-19 06:12:37 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
checksum = "4750c76fd5d3ac95fa3ed80fe667d6a3d8590a960e5b575b98eea93339a80b80"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
dependencies = [
Update iced
2020-10-31 08:52:38 +00:00
"andrew",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"bitflags",
Update iced
2020-10-31 08:52:38 +00:00
"calloop",
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
"dlib 0.4.2",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"lazy_static",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"log",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"memmap2 0.1.0",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"nix 0.18.0",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"wayland-client 0.28.6",
"wayland-cursor 0.28.6",
"wayland-protocols 0.28.6",
update depednencies
2021-07-08 10:21:02 +00:00
]
[[package]]
name = "smithay-client-toolkit"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.15.2"
update depednencies
2021-07-08 10:21:02 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "210cf40de565aaaa085face1d860b17f6aee9f76f9d2816307ea2cc45eeb64f3"
update depednencies
2021-07-08 10:21:02 +00:00
dependencies = [
"bitflags",
"dlib 0.5.0",
"lazy_static",
"log",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"memmap2 0.3.1",
"nix 0.22.0",
"pkg-config",
"wayland-client 0.29.1",
"wayland-cursor 0.29.1",
"wayland-protocols 0.29.1",
Initial setup to use iced
2019-12-15 17:13:52 +00:00
]
WIP (testing) Update conrod_core This is a `cargo update -p conrod_core` to bring in updates to `veloren/conrod/conrod_core` to add support for copy and paste. Ref: veloren/conrod!2 Fixes #171
2019-10-19 06:12:37 +00:00
[[package]]
name = "smithay-clipboard"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.6.5"
Quic: We had the followuing problem: - locally we open a stream, our local Drain is sending OpenStream - remote Sink will know this and notify remote Drain - remote side sends a message - local sink does not know about the Stream. as there is (and CANT) be a wat to notify local Sink from local Drain (it could introduce race conditions). One of the possible solutions was, that the remote drain will copy the OpenStream Msg ON the Quic::stream before first data is send. This would work but is complicated. Instead we now just mark such streams as "potentially open" and we listen for the first DataHeader to get it's SID. add support for unreliable messages in quic protocol, benchmarks
2021-04-09 11:17:38 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "610b551bd25378bfd2b8e7a0fcbd83d427e8f2f6a40c47ae0f70688e9949dd55"
Quic: We had the followuing problem: - locally we open a stream, our local Drain is sending OpenStream - remote Sink will know this and notify remote Drain - remote side sends a message - local sink does not know about the Stream. as there is (and CANT) be a wat to notify local Sink from local Drain (it could introduce race conditions). One of the possible solutions was, that the remote drain will copy the OpenStream Msg ON the Quic::stream before first data is send. This would work but is complicated. Instead we now just mark such streams as "potentially open" and we listen for the first DataHeader to get it's SID. add support for unreliable messages in quic protocol, benchmarks
2021-04-09 11:17:38 +00:00
dependencies = [
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"smithay-client-toolkit 0.15.2",
"wayland-client 0.29.1",
Quic: We had the followuing problem: - locally we open a stream, our local Drain is sending OpenStream - remote Sink will know this and notify remote Drain - remote side sends a message - local sink does not know about the Stream. as there is (and CANT) be a wat to notify local Sink from local Drain (it could introduce race conditions). One of the possible solutions was, that the remote drain will copy the OpenStream Msg ON the Quic::stream before first data is send. This would work but is complicated. Instead we now just mark such streams as "potentially open" and we listen for the first DataHeader to get it's SID. add support for unreliable messages in quic protocol, benchmarks
2021-04-09 11:17:38 +00:00
]
Made the server cli great
2020-07-27 16:26:34 +00:00
[[package]]
name = "socket2"
In case of IPv6 and NON Windows make sure to not listen on dualstack, for that we need to create a socket2 socket and set_only_v6 to true. We need to privude set_nonblocking for tokio to work and we need to set reuseaddr for it to work on linux systems
2022-01-29 18:50:32 +00:00
version = "0.4.4"
Made the server cli great
2020-07-27 16:26:34 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
In case of IPv6 and NON Windows make sure to not listen on dualstack, for that we need to create a socket2 socket and set_only_v6 to true. We need to privude set_nonblocking for tokio to work and we need to set reuseaddr for it to work on linux systems
2022-01-29 18:50:32 +00:00
checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"
Made the server cli great
2020-07-27 16:26:34 +00:00
dependencies = [
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"winapi 0.3.9",
Made the server cli great
2020-07-27 16:26:34 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "specs"
switch to hashbrown 0.11 and specs 0.16.2
2021-06-07 11:01:01 +00:00
version = "0.16.2"
source = "git+https://github.com/amethyst/specs.git?rev=f985bec5d456f7b0dd8aae99848f9473c2cd9d46#f985bec5d456f7b0dd8aae99848f9473c2cd9d46"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
fmt
2021-03-05 01:23:11 +00:00
"crossbeam-queue",
switch to hashbrown 0.11 and specs 0.16.2
2021-06-07 11:01:01 +00:00
"hashbrown 0.11.2",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"hibitset",
dependency reduction: - authc no longer uses reqwest - image only supports PNG - replace routille with tiny_http - several other dependencies - cargo upgrade - following improvement was measured on R7 1700X: before: - cargo build: 3076.73s user / 4:45 total / 589 dependencies - cargo test: 6118.38s user / 7:30 total / 959 dependencies after: - cargo build: 2680.54s user / 4:05 total / 480 dependencies - cargo test: 5351.81s user / 7:04 total / 791 dependencies - added xMAC94x to CODEOWNERS for Cargo.toml, he will protect them from now on and hit people with evil looks ;)
2020-06-01 00:13:35 +00:00
"log",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"rayon",
"serde",
"shred",
"shrev",
Test fix for torvus
2021-02-23 19:16:43 +00:00
"specs-derive",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"tuple_utils",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
Test fix for torvus
2021-02-23 19:16:43 +00:00
[[package]]
name = "specs-derive"
version = "0.4.1"
switch to hashbrown 0.11 and specs 0.16.2
2021-06-07 11:01:01 +00:00
source = "git+https://github.com/amethyst/specs.git?rev=f985bec5d456f7b0dd8aae99848f9473c2cd9d46#f985bec5d456f7b0dd8aae99848f9473c2cd9d46"
Test fix for torvus
2021-02-23 19:16:43 +00:00
dependencies = [
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"proc-macro2 1.0.32",
"quote 1.0.10",
"syn 1.0.81",
Test fix for torvus
2021-02-23 19:16:43 +00:00
]
specs back to master
2020-07-07 10:55:06 +00:00
[[package]]
name = "specs-idvs"
update specs
2020-12-16 13:17:28 +00:00
version = "0.1.1"
switch to hashbrown 0.11 and specs 0.16.2
2021-06-07 11:01:01 +00:00
source = "git+https://gitlab.com/veloren/specs-idvs.git?rev=8be2abcddf8f524cb5876e8dd20a7e47cfaf7573#8be2abcddf8f524cb5876e8dd20a7e47cfaf7573"
specs back to master
2020-07-07 10:55:06 +00:00
dependencies = [
"specs",
]
first implementation of prometheus in veloren for git hash, tick times, chunks loaded, player online, entity count and light count
2019-09-06 14:21:09 +00:00
[[package]]
name = "spin"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
first implementation of prometheus in veloren for git hash, tick times, chunks loaded, player online, entity count and light count
2019-09-06 14:21:09 +00:00
switch to `spin_sleep`
2020-11-10 21:39:10 +00:00
[[package]]
name = "spin_sleep"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2a98101bdc3833e192713c2af0b0dd2614f50d1cf1f7a97c5221b7aac052acc7"
dependencies = [
"once_cell",
"winapi 0.3.9",
]
Started the report of wgpu
2020-08-21 19:10:56 +00:00
[[package]]
name = "spirv_cross"
Finished porting all pipelines
2020-09-13 10:03:42 +00:00
version = "0.23.1"
Started the report of wgpu
2020-08-21 19:10:56 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Finished porting all pipelines
2020-09-13 10:03:42 +00:00
checksum = "60647fadbf83c4a72f0d7ea67a7ca3a81835cf442b8deae5c134c3e0055b2e14"
Started the report of wgpu
2020-08-21 19:10:56 +00:00
dependencies = [
"cc",
"js-sys",
"wasm-bindgen",
]
[[package]]
name = "spirv_headers"
version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f5b132530b1ac069df335577e3581765995cba5a13995cdbbdbc8fb057c532c"
dependencies = [
"bitflags",
"num-traits",
]
update further crates
2020-12-16 00:07:39 +00:00
[[package]]
name = "stable_deref_trait"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
Upgrade vek version so that it actually uses the patch
2020-03-30 23:44:51 +00:00
[[package]]
name = "static_assertions"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "stb_truetype"
Stop global syncing of entity creation
2019-11-04 00:57:36 +00:00
version = "0.3.1"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "f77b6b07e862c66a9f3e62a07588fee67cd90a9135a2b942409f195507b4fb51"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
Propper Compression support of network. - Compression is no longer enabled always but can now be enabled per Stream. If a Stream is Compression enabled it will compress and decompress all msg (except for `raw` access) before handling them internally. You need to handle compression yourself for `raw` fn. - added a new feature to the network crate to enable or disable the compression - switched to `lz-fear` instead of `lz4-compression` - use `bitflags` to represent the `Promises` struct
2020-08-25 13:32:42 +00:00
"byteorder",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
Play random music whenever a track ends To support this, a global_state.maintain() method was added that calls audio.maintain(). Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a
2019-05-18 19:28:12 +00:00
[[package]]
name = "stdweb"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e"
Play random music whenever a track ends To support this, a global_state.maintain() method was added that calls audio.maintain(). Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a
2019-05-18 19:28:12 +00:00
Added Controller support
2020-03-10 21:00:13 +00:00
[[package]]
name = "stdweb"
version = "0.4.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5"
dependencies = [
"discard",
update dependencies
2021-06-04 07:44:30 +00:00
"rustc_version 0.2.3",
Added Controller support
2020-03-10 21:00:13 +00:00
"serde",
"serde_json",
"stdweb-derive",
"stdweb-internal-macros",
"stdweb-internal-runtime",
"wasm-bindgen",
]
[[package]]
name = "stdweb-derive"
version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
dependencies = [
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"proc-macro2 1.0.32",
"quote 1.0.10",
Added Controller support
2020-03-10 21:00:13 +00:00
"serde",
"serde_derive",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"syn 1.0.81",
Added Controller support
2020-03-10 21:00:13 +00:00
]
[[package]]
name = "stdweb-internal-macros"
version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11"
dependencies = [
"base-x",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"proc-macro2 1.0.32",
"quote 1.0.10",
Added Controller support
2020-03-10 21:00:13 +00:00
"serde",
"serde_derive",
"serde_json",
"sha1",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"syn 1.0.81",
Added Controller support
2020-03-10 21:00:13 +00:00
]
[[package]]
name = "stdweb-internal-runtime"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0"
Started the report of wgpu
2020-08-21 19:10:56 +00:00
[[package]]
name = "storage-map"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "418bb14643aa55a7841d5303f72cf512cfb323b8cc221d51580500a1ca75206c"
dependencies = [
update crates
2021-09-20 10:05:41 +00:00
"lock_api 0.4.5",
Started the report of wgpu
2020-08-21 19:10:56 +00:00
]
Initial setup to use iced
2019-12-15 17:13:52 +00:00
[[package]]
name = "str-buf"
version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d44a3643b4ff9caf57abcee9c2c621d6c03d9135e0d8b589bd9afb5992cb176a"
Dis some distance and attack arc tweaking
2020-07-03 00:45:30 +00:00
[[package]]
name = "strsim"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
Add a speedtest program to benchmark networking
2020-02-25 18:30:50 +00:00
[[package]]
name = "strsim"
added const tweaker
2020-03-19 17:11:45 +00:00
version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
[[package]]
name = "strsim"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
Dis some distance and attack arc tweaking
2020-07-03 00:45:30 +00:00
[[package]]
name = "structopt"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.3.25"
Dis some distance and attack arc tweaking
2020-07-03 00:45:30 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "40b9788f4202aa75c240ecc9c15c65185e6a39ccdeb0fd5d008b98825464c87c"
Dis some distance and attack arc tweaking
2020-07-03 00:45:30 +00:00
dependencies = [
"clap",
"lazy_static",
"structopt-derive",
]
[[package]]
name = "structopt-derive"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.4.18"
Dis some distance and attack arc tweaking
2020-07-03 00:45:30 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0"
Dis some distance and attack arc tweaking
2020-07-03 00:45:30 +00:00
dependencies = [
"heck",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"proc-macro-error",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"proc-macro2 1.0.32",
"quote 1.0.10",
"syn 1.0.81",
Dis some distance and attack arc tweaking
2020-07-03 00:45:30 +00:00
]
Crafting Tabs and more item tags
2021-04-04 13:02:27 +00:00
[[package]]
name = "strum"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.23.0"
Crafting Tabs and more item tags
2021-04-04 13:02:27 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "cae14b91c7d11c9a851d3fbc80a963198998c2a64eec840477fa92d8ce9b70bb"
Moved GameInput to own module and made use of strum's EnumIter and AsRefStr.
2021-07-21 11:23:45 +00:00
dependencies = [
"strum_macros",
]
Crafting Tabs and more item tags
2021-04-04 13:02:27 +00:00
[[package]]
name = "strum_macros"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.23.0"
Crafting Tabs and more item tags
2021-04-04 13:02:27 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "00ad150e9d51e33e8142984f577662c1324d49f3be45ed37bac8645fdcbe0fe5"
Crafting Tabs and more item tags
2021-04-04 13:02:27 +00:00
dependencies = [
"heck",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"proc-macro2 1.0.32",
"quote 1.0.10",
"rustversion",
"syn 1.0.81",
Crafting Tabs and more item tags
2021-04-04 13:02:27 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "sum_type"
Update most dependencies
2019-07-28 15:47:14 +00:00
version = "0.2.0"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "da5b4a0c9f3c7c8e891e445a7c776627e208e8bba23ab680798066dd283e6a15"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
Updated sphynx Former-commit-id: f81484571bda8c5e15ea2b6c0e8b9b6892b094a3
2019-05-16 23:05:46 +00:00
[[package]]
name = "svg_fmt"
(See sharp/lod-history) LOD, shadows, greedy meshing, new lighting, perf --- Pretty much a Veloren fork at this point. Here's a high level overview of the changes (will be added to CHANGELOG just before merge). At a high level this MR incorporates roughly two groups of changes. The first group consists of new game features: more flexible map sizes, level of detail terrain, shadow maps, and a new lighting engine. This is "feature work" that (mostly) only adds new things to Veloren, and mostly shouldn't affect old stuff. The second big group of changes are those addressing the fallout from all the new features. These include performance fixes of various sorts: the addition of multiple graphics options and optimization of the cheap ones to avoid work, switching all voxel models to use some variant of greedy meshing, switching over much of our CPU-side vector math to exploit SIMD instructions (coinciding with a fork of `vek`), and a rewrite of how the UI handles text rendering (coinciding with updates to our fork of `conrod`). Making Veloren's hardcoded colors appear correct under the new lighting engine also required considerably changes (TODO: Fill in this section when it's complete). The second category of changes often heavily touches code owned by other people, including frequently modified code "owned" by a handful of people, so I recommend that this code be reviewed particularly carefully. --- At a high level (each will be described in more detail below): - The world map has been refactored. - The world size is no longer hardcoded (@zesterer). - The map generation code was made generic to allow using it outside of the `world` crate (@zesterer). - On world creation, we now compute *horizon maps* (@zesterer). - The way we pass the world from the server to the client has been updated (@xMAC94x). - Artifacts related to image rotation were fixed (@imbris). - Multiflow rivers were enabled (@zesterer). - In the process of making changes related to the world map, various incidental fixes and optimizations were required. - The new *level of detail* feature was added (@zesterer wrote part of this and has checked out the rest). - A new LOD terrain rendering step was added to the pipeline. - The LOD terrain quality was made configurable via a graphics setting. - Horizon maps were used to cast shadows from LOD chunks on both LOD and non-LOD terrain. - A "voxelization" effect was incorporated into rendered LOD terrain to make it blend better into the world. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Veloren's lighting has been completely overhauled (@zesterer has already checked most of this out). - A semi-accurate index of refraction was assigned to our materials. - A new, more realistic, physically based approach to lighting was used using the *Ashikhmin Shirley* BRDF. - We emulate *atmospheric scattering* using equations designed for measuring solar panel light exposure. - We attempt to compute *realistic light attenuation* in water using its real material properties. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Point and directional lights now cast realistic shadows, using *shadow mapping.* (@imbris, @zesterer, @Treeco, @YuriMomo) - Point light shadow maps were added to the rendering pipeline, using geometry shaders and *seamless cube maps*. - Directional light shadows were added to the rendering pipeline, using LISPSM together with disabling *depth clamping*. - "Shadow-only" chunks and NPCs were added to prevent shadows from models behind you from disappearing. - In the process of making changes related to shadow maps, various incidental fixes and optimizations were required. The addition of shadow maps, LOD terrain, and the new lighting all led to significant performance degradation, on top of other changes happening in master. Therefore, a large number of performance improvements were also needed: - The graphics options were made much more flexible and configurable, and shaders were optimize. - New options were provided for how to render lights and shadows (@Pfauenauge, @zesterer). - Graphic setting storage and configuration were overhauled to make adding new features easier (@Pfauenauge, @imbris). - Shaders were rewritten to utilize GLSL's preprocessor to avoid overhead (@zesterer, @YuriMomo). - In the process of making changes related to providing additional rendering options, various incidental fixes and optimizations were required. - Voxel model creation was switched to use *greedy meshing.* - A new voxel meshing method, greedy meshing, was added (@imbris). - Uses of the older meshing methods were migrated to use greedy meshing (@imbris, @jshipsey, @Pfauenauge). - New restrictions were added to terrain, figure, and sprites to future proof them for further optimizations (@jshipsey, @Pfauenauge, @zesterer). - Most positions are now relative to either chunk or player position for better precision (@imbris, @zesterer, @scottc). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - Animation and terrain math were switched to use SIMD where possible. - Fixes were made to vek to make its SIMD feature usable for us (@zesterer, @imbris). - The interface and types used in bone animation were changed in various ways (@jshipsey, @Snowram, @Pfauenauge). - Redundant code generation for body animation is now partly taken care of by a macro (@jshipsey, @Snowram, @Pfauenauge). - Animation code was modified to to use vek's SIMD representation where possible (@jshipsey, @Snowram, @Pfauenauge). - Terrain meshing code and shadow map math were also modified to use vek's SIMD representation (@imbris). - SIMD instruction generation was enabled (@YuriMomo, @jshipsey, @Snowram, @imbris, @Angelonfira, @xMAC94x). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - The way we cache glyphs was completely refactored, fixed, and optimized. - Our fork of `conrod` was optimized in various ways (@imbris). - Our fork of `conrod` now exposes whether a widget was updated during the current frame (@imbris). - Our use of the glyph cache was rewritten for correctness (@imbris). - A *text cache* was introduced that lets us skip remeshing glyphs that have not changed (@imbris). - Various changes were made to reduce pressure on the glyph cache, with more planned (@imbris, @Pfauenauge). - In the process of making changes related to the glyph cache, various incidental fixes and optimizations were required. - Colors were changed to keep Veloren's look consistent with master. - Some older tree models were brought back (@Pfauenauge). - TODO(@Sharp): All hardcoded colors were extracted and made hotloadable. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Hardcoded colors were fixed to conform to Veloren's style. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Color models were fixed to conform to Veloren's style. A detailed description of the involved changes follows. --- - The world size is no longer hardcoded. All functions dependent on world size now take a `WorldSizeLg`, which holds the base 2 logarithm of each actual world dimension and is guaranteed to maintain certain properties (outlined in `common/src/terrain/map.rs`). Additionally, many utility functions that utilize the world size were moved into `common` as well (mostly `common/src/terrain/mod.rs`). Finally, the world map format was updated in order to store its size explicitly, with a migration path from the old format that should work whenever the old formatted map was a square (practically always). See `world/src/sim/mod.rs` for these changes. - The map generation code was made generic to allow using it outside of the `world` crate. The parts of the map generating code that do not need to query the world were moved over to `common/src/terrain/map.rs`, allowing them to be used from the client without creating a dependency on `world`. The rest of it was turned into helper functions in `world/src/sim/map.rs`, which can be passed as closures to the generic map generation code to complete its construction. This also means that colors are now passed in separately to the map generation function. See <https://veloren.net/devblog-78/> for more details. - On world creation, we now compute *horizon maps*. See the function in `world/src/sim/util.rs`. Given a height map and a plane intersecting that height map, our horizon maps allow us to encode enough information to reconstruct shadows for each point on the height map using only the *horizon angle* (the angle at which the sun starts to become visible). As Veloren's sun only covers one plane, this is sufficient for encoding sun shadows for LOD terrain, by encoding two angles per chunk (one for each 90 degrees the sun covers). We can also use this for the moon, if we want, since the moon follows the same path. Additionally, we store the *height* of the furthest occluder, to try to make the shadows volumetric; so this means 4 bytes in total for each chunk. Support for horizon maps has been merged into the map functionality in common as well. - The way we pass the world from the server to the client has been updated. Rather than passing the prerendered map, we instead pass three maps with values for each chunk; one with the color information, a second with altitude information, and a third with horizon map information. We then reconstruct the map on the client, together with some additional information we send from the server (like the sea level and maximum height). See `common/src/msg/server.rs` for a detailed description of the format of `WorldMapMsg`, and `server/src/libr.rs` and `client/src/lib.rs` for details of the map construction and parsing. - Artifacts related to image rotation were fixed. See the commit message for commit SHA `cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e` for a detailed explanation. This involved changes to shaders, the addition of a new type of graphic (also reflected in the graphic cache) that allows specifying a border color (which automatically makes the associated texture immutable), and some related fixes. I reproduce the first two paragraphs of the MR description as well: ``` Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). ``` - Multiflow rivers were enabled. This does not really need to be part of this MR, and would be easy to revert, but since it seemed to provide a nice improvement it's currently packaged with it. We already computed multiple outflows from each chunk for erosion purposes long before this MR. However, we never modified river rendering to be able to handle this case (just a single downhill river flow is complex enough!) so this was not exposed when deciding which chunks were rivers. Now that - In the process of making changes related to the world map, various incidental fixes and optimizations were required. Some examples of fixes include making sure terrain is never lowered to below sea level (to make the shadow maps report correct values), fixing map altitudes and colors to understand things like cliffs and "block level" coloring (that doesn'te xist on the column level), and fixing a crashbug when rendering images for the UI where source pixels are strongly rectangular. Some examples of related performance fixes include avoiding allocating a fresh vector for all the maps (i.e. copying it over to change the format from `[u32; n]` to `DynamicImage` and then copying again to convert to `RgbaImage`), and instead using the `gfx::memory::slice` function to accomplish the same thing. These sorts of changes are spread all arond the code. This includes the additon of a new scene, `voxygen/src/scene/lod.rs`, a new pipeline `voxygen/src/render/pipeline/lod_terrain.rs`, and new shaders `assets/vxygen/shaders/lod-terrain-vert.glsl` and `assets/vxygen/shaders/lod-terrain-frag.glsl`, as well as associated changes to the renderer in `voxygen/src/render/renderer.rs`. The main idea behind our initial approach to LOD was to take the world data we now get from the server (altitude, color, and horizon mapping). - Some previously computed values were turned into shader uniforms for better prediction on weak processors. (@zesterer) - Calls to power or trig functions were removed or replaced with multiplications, where possible. - After some deliberation - To properly handle sprite "waving" for nearby sprites, We explicitly designed the greedy meshing system with figures and sprites in mind. In both cases, we want to be able to *efficiently* pack many different models into the same texture, especially in cases where we know we will either not be removing any of the grouped-together from the models from the texture, or will remove all of them at once (so they can be packed into some specific subtexture). For sprites, since we know every model in advance and never intend to deallocate them, we currently pack them all as efficiently as possible into one giant tetxure atlas. However, in the future we might opt to pack them slightly less efficiently in exchange for shrinking the sprite vertex size. For figures, we pack all the textures for each *model* into the same atlas. is a global texture atlas used for every sprite, and for figures which is why we have the ability to mesh multiple models to the same texture area (using the simple texture atlas allocator) without requiring intermediate vector allocations. This is accomplished by delaying the time when we actually write the color and light data to the texture until *after* all the model vertices have been meshed; then, we can just allocate the whole color/light array at once, making the atlas we use an exact fit. In computer science-y terms, we accomplish this delay by, after we perform the initial greedy meshing (without texture information), not continuing to create the texture data, but instead constructing a *continuation*--that is, a function that, when called, will execute the rest of the computation. We push this continuation (which in Rust terms is a `FnOnce` closure that takes the `ColLightsInfo` that it is supposed to write to as context) onto a onto a vector resizing. To allow for suspended writes to texture data, Rust pointed out to me that the continuation that would eventually write the color and light data to the texture atlas (the one that is shared by all models sharing the same greedy mesher) would have to *own* whatever data it mshed. Because we often generate the model data to mesh as a temporary in `voxygen/src/load.rs`, the - Matrix multiplications in the shader were reduced for figure data (@zesterer). - Vertex "waves" for fluid data were removed. - Terrain "bending" near edges was removed. - Scaling was fixed to make sure empty space was not introduced in a space previously occupied by a block. It was also changed to take ownership of its voxel data, rather than sharing it, to let it be used with meshing. - Rust's nightly version was bumped in order to use the `array_map` function, which lets us reuse more code between the simple map and `FigureModelCache`. - PositionedGlyph::standalone. --- I tried to cite sources in many cases[^realtime],[^lloyd],[^lispsm],[^pbrt],[^greedy],[^tjunctions] where I needed features from elsewhere but I am particularly grateful for the following resources, esepcially where they have accompanying source code. I linked all of them that are accessible to the public (those that are not were obtained through legal means). [^realtime]: Eisemann, Elmar, Michael Schwarz, Ulf Assarsson, Michael Wimmer. Real-Time Shadows. A K Peters/CRC Press (T&F), 20160419. [^lloyd]: Lloyd,B. 2007. [Logarithmic perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). PhD thesis, University of North Carolina. [^lispsm]: Wimmer, M., Scherzer, D., and Purgathofer, W. 2004. [Light space perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). In Proceedings of Eurographics Symposium on Rendering 2004, pp. 143– 152. [^pbrt]: Pharr, Matt, et al. [http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf](Physically Based Rendering: From Theory to Implementation). Third edition, Morgan Kaufmann Publishers/Elsevier, 2017. [^greedy]: mikolalysenko. “Meshing in a Minecraft Game.” 0 FPS, 30 June 2012, <https://0fps.net/2012/06/30/meshing-in-a-minecraft-game/>. [^tjunctions]: blackflux. “Meshing in Voxel Engines – Part 1.” Blackflux.Com, 23 Feb. 2014, <https://blackflux.wordpress.com/2014/02/23/meshing-in-voxel-engines-part-1/>. I am also especially grateful to Khronos, Wikiepdia, and stackoverflow for answering many of my specific questions while writing the MR. --- Squashed commit of the following: commit 300505e7305a2fdac722a808ee8538323f215f39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 18:46:25 2020 +0200 Fixing cargo doc and typo in CHANGELOG. commit ec0aeb18e8499d7d84ef818331b4b65c3d76cea6 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 15:38:50 2020 +0200 Hopefully final commit for the LOD branch. commit 5e8ea0b1eaac02903a02feb2eb038d195de4872f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 10:14:26 2020 +0200 Falling back to power as stopgap. commit e44a1cbf46504ee9931a01bdc9033e145500d557 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 09:25:41 2020 +0200 Address imbris feedback. Temporarily disables shiny water, lowers max VD. These restrictions will be lifted soon after merging. commit 561e25778a108ac3712f5ec2ce3a51234c4430d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 08:31:13 2020 +0200 Tweaking shaders a bit. commit 7d19259078ce0dd7b3742ad7d0cb3fab3ece3fdc Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:59:43 2020 +0200 Fix view example as well. commit 051cd4934e0fad2c0b15db4380a4189fa318679f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:29:06 2020 +0200 Fix meshing benchmark. commit c95e07db3b4dcca285678985e65e31b927cb1c61 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 05:46:22 2020 +0200 Address MR feedback, fix scene clouds. commit 1bfb816cabdb3ffc1e507a009c2d98696b4b573a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:39:36 2020 +0200 Incorporating Pfau's figure color changes. New eyes and new humanoid colors. commit 3f9b89a3ac7b3356b1dba0d1a8f6541357f81469 Merge: e2f5162e4 62c53963a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:29:41 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit e2f5162e4f96f4124aa43488f7245d341b3dcfd4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:28:38 2020 +0200 World colors are all hotloadable. They live in assets/world/style/colors.ron. Only a small handful of hardcoed colors remain in World; they are either part of the map, or difficult to disentangle from the rest of the computation. Comments are made where appropriate. commit 62c53963abe1975009d34a8f9515a355bef24f31 Author: Marcel Märtens <marcel.cochem@googlemail.com> Date: Wed Aug 19 15:59:00 2020 +0200 replace pretty_env_logger with tracing commit 5b1625f99d9586fe80e2232f583ec5af9f953099 Merge: d71003acd 4942b5b39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:15:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit d71003acdabeff970b3928e97c26af6847b5b78e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:14:34 2020 +0200 Hotloading colors, part 1: colors in common. Currently, this just entails humanoid colors. There are only three colors not handled; the light emitter colors in common/src/comp/inventory/item/tool.rs. These don't seem important enough to me to warrant making hotloadable, at least not right now, but if it's needed later we can always add them to the file. commit 63b5e0e553eb2ea49276f192a6fc7dd65254270d Merge: c32b337a4 6d2c4b9c1 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 13:05:37 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c32b337a46e10d9de473d178a94a3ccd61c39bb3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:52:04 2020 +0200 Fixing LOD grid, for real. commit a166ae0360395387e09fb35a1f84210c2ce5ec24 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:28:05 2020 +0200 Addressing imbris's initial feedback. Fixes two minor bugs: explosion particles were no longer spawning randomly, and LOD grids were not perfectly even. commit 4cbad004f44060994252dd3d38647a14a589712f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:27:58 2020 +0200 Bumping nightly per request. commit 548680276aac77c25d43d16b5622f847d474dbef Merge: acc098604 8f8b20c91 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:26:06 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit acc0986040589a3492f88a740bc3c3fc693b26d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:28:32 2020 +0200 Lower resolution due to lying drivers. commit d3b878de2a52c358d2944a6bbd0555dad7fbdb10 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:15:38 2020 +0200 Fix issues msh encountered with Intel 4600. commit 10245e0c1b0cb6fae10d86409435364edc6102ef Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 21:15:02 2020 +0200 Merge more models into one mesh than we did previously. commit 3155c31e663c52ae5c3a53d5fb5665892a1a498a Merge: 7204cc8a7 3c199280e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:35:22 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7204cc8a7a4f74a30306bd205d9834fee4bb944f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:34:43 2020 +0200 Fix not yet done NPC animations. This forces them all to be the idle animation if not specified. This fixes issues where you'd have giant NPCs in water. commit bc83360f2a08918f19d417b5f772e1ff554dba08 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 19:36:37 2020 +0200 Try to fix some bugs: - Z fighting with LOD terrain and water. - Audio SFX not playing. commit 1fd104aa603bf3781b6526a5cada46aeca3049dd Merge: 862df3c99 7c2c392a3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 12:02:31 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 862df3c9976c4da9bd7cfd784f1a85973127968a Merge: 0a4218ed9 75c1d4401 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 05:52:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0a4218ed9d541a2b34c133351bea38a99ddf4ea7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 22:27:14 2020 +0200 Fix particle depth. commit f51dfdeb442d0dd5243dd2f344fa4be295bd0875 Merge: c6251a956 5e6dc0471 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:19:04 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit c6251a956ad376400dca5c23420cf8d213dc8fdf Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:15:46 2020 +0200 Cache figures more intelligently. Cache figures for longer, and don't cache character states for the player except where they actually affect the rendered model. commit 0ed801d5404982c6fb63b1eaa4567d908b294c9d Merge: c11b9bdf0 eea64f78f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 16:32:24 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c11b9bdf0a53bf9884d2f5a48fec9b01d582df1a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 11:47:15 2020 +0200 Remove unneeded Clippy annotation. commit 16aa9ef40af56d69289d00aafb3deadfb8bd4f35 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 8 00:53:02 2020 +0200 Fix hotloading and Clippy. commit 3dc973e0be5b758da1e9805eb764ad401374cd0c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 23:50:27 2020 +0200 Major speedups with SIMD. commit fba64a7d93d5a96077ce87287bbce6ab9b7fbcae Merge: 76429d00e d1e10b178 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:19 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 76429d00eea00d212fbd672a84ee91e75b19b938 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:10 2020 +0200 Add clippy.toml. commit c79f512f84dbb83cb82b7954db68ff241dfd8e41 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 11:55:20 2020 +0200 Fix all clippy issues, clean up Rust code. commit 6f90e010b3fbefb53b0d632e819931350015b6b8 Merge: 77a8c7c26 5929cfa5c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:30 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 77a8c7c267d3f44a1a62bd6b2274359973c5e4d4 Merge: b44e44232 44febaabd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:10 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 5929cfa5c713aa392110bbb62407f76caf53c3df Author: jshipsey <jshipsey18@gmail.com> Date: Thu Aug 6 20:47:27 2020 -0400 fixed in-hand arrow bug commit b44e442325d828f1cd564d66908f89d09e80474b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 6 13:40:35 2020 +0200 Miscellaneous performance improvements. commit be37acf287c1360d8085862526ac3365ffd1d768 Merge: 125d7fc6c c11876547 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 05:49:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 125d7fc6c4dcd8c8c5f27b8268a4d64f409f3644 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 04:55:31 2020 +0200 Abstract over simd vs. repr_c vectors. Also some minor improvements to Event size. commit d4d4956e9252e1241ce110b2aa85076c6b1e2a23 Merge: 5f3b7294a aced5f979 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:56:54 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 5f3b7294af1f8533edc2620b58863c248e2b07af Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:43:52 2020 +0200 Fix formatting issues I missed before. commit a428a3ebba70dcab63dd0f8cd983120c90617271 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:41:51 2020 +0200 Fix clippy warnings, part 1. There aer still a bunch of type too complex and function takes too many arguments warnings that I'll fix later (or ignore, since in the one case I did fix a function takes too many arguments warning I think it made the code *less* readable). commit ba54307540ed8a937ac08209730284fc653af85b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 30 13:22:42 2020 +0200 Fix light animations so they are removed when the light turns off. commit 7e0f4bcbf0f4717145d8beac40d52e3acebbe2aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 21:10:20 2020 +0200 Fix crash in edge case for pixel art. commit 56da06f7a351e2b949e9b014a90b974d511a0924 Merge: cf74d55f2 9f53a4a19 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:56:52 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:29:52 2020 +0200 Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). The first concern was addressed by fixing the dimensions of the map images drawn from the UI (so that we always use a square source rectangle, rather than a rectangular one according to the dimensions of the map). We also fixed the way rotation was done in the fragment shader for north-facing sources to make it properly handle aspect ratio (this was already done for north-facing targets). Together, these fix rendering issues peculiar to rectangular maps. The second and third concerns were jointly addressed by adding an optional border color to every 2D image drawn by the UI. This turns out not to waste extra space even though we hold a full f32 color (to avoid an extra dependency on gfx's PackedColor), since voxel images already take up more space than Optiion<[f32; 4]> requires. This is then implemented automatically using the "border color" wrapping method in the attached sampler. Since this is implemented in graphics hardware, it only works (at least naively) if the actual image bounds match the texture bounds. Therefore, we altered the way the graphics cache stores images with a border color to guarantee that they are always in their own texture, whose size exactly matches their extent. Since the easiest currently exposed way to set a border color is to do so for an immutable texture, we went a bit further and added a new "immutable" texture storage type used for these cases; currently, it is always and automatically used only when there is a specified border color, but in theory there's no reason we couldn't provide immutable-only images that use the default wrapping mdoe (though clamp to border is admittedly not a great default). To fix the maps case specifically, we set the border color to a translucent version of the ocean border color. This may need tweaking going forward, which shouldn't be hard. As part of this process, we had to modify graphics replacement to make sure immutable images are *removed* when invalidated, rather than just having a validity flag unset (this is normally done by the UI to try to reuse allocations in place if images are updated in benign ways, since the texture atlases used for Ui do not support deallocation; currently this is only used for item images, so there should be no overlap with immutable image replacement, so this was purely precautionary). Since we were already touching the relevant code, we also updated the image dependency to a newer version that provides more ways to avoid allocations, and made a few other changes that should hopefully eliminate redundant most of the intermediate buffer allocations we were performing for what should be zero-cost conversions. This may slightly improve performance in some cases. commit ad18ce939940a8c697270f6e9b94db9942fd8295 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 13:21:09 2020 +0200 Fix continent scale hack. commit 36b1cb074f5b195aebd7dbbc3da7f0246a1a18ec Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 12:11:40 2020 +0200 Enable loading different sized maps without a recompile. We may want to tweak the effects of the continent_scale_hack. commit 13b6d4d534cc4814b7cb3294ca41bbfea0a6b186 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 10:55:48 2020 +0200 Removing WORLD_SIZE, part 1. Erased almost every instance of WORLD_SIZE and replaced it with a local power of two, map_size_lg (which respects certain invariants; see common/src/terrain/map.rs for more details about MapSizeLg). This also means we can avoid a dependency on the world crate from client, as desired. Now that the rest of the code is not expecting a fixed WORLD_SIZE, the next step is to arrange for maps to store their world size, and to use that world size as a basis prior to loading the map (as well, probably, as prior to configuring some of the noise functions). commit 30b1d2c6428230a9eaa0d749cdcbbd6f1cbccd78 Merge: 7d56ba31b 1377b369f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:58 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 7d56ba31b445441461b28a07fc495d7d4f047c17 Merge: 2101113b4 598f14b25 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 1377b369f6db2258e910d467a5740f31789e3ded Author: Monty Marz <m.marzouq@gmx.de> Date: Sun Jul 19 23:25:38 2020 +0200 more saturated pumpkins commit ae8d50527f93bb0616c2ad46ce4dacb63bc37c6d Author: Monty Marz <m.marzouq@gmx.de> Date: Sat Jul 18 20:29:56 2020 +0200 acacia models commit 2101113b467e691de787392d7f20f1745f5637bd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 18 18:55:25 2020 +0200 Higher detail LOD. commit add2cfae04b4385fa5590e11e2bd5229d9dee0aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 16 01:57:39 2020 +0200 Revert some irrelevant stuff. commit 2e2ab3dc1eaa59a4aef7f8d34a53d8aae4c8553a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 15 13:30:49 2020 +0200 Fixing various things about shadows. * Correcting optimal LISPSM parameter. * Figure shadows are cast when they're not visible. * Chunk shadows stay cast until you look away. * Seamless cubemaps for point lights. * Etc. commit 6c31e6b56217274285b597af297036691ea5d897 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 19:50:26 2020 +0200 Fix shadow creation. commit 6332cbe006115ae205597529cd8bbccd146c2cca Merge: be438657c 930e0028b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:47:00 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit be438657c33d7b5bfb0a9582c3ed3fd366637323 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:28:08 2020 +0200 Tweaks to shadows. Added shadow map resolution configuration, added seamless cubemaps, documented all existing rendering options, and fixed a few Clippy errors. commit 23b4058906013c7d2a40c286e20e32c5fbd897ed Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 10:11:19 2020 +0200 Fix moon, use nonlinear noise for terrain. Note that the latter has a bit of performance cost. commit 7fbe5cbfbb9dc29607957b8e62f432a4deed193d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:23:02 2020 +0200 Address lies about max texture size. commit bcfc62b5e13a1cdd83f57535fde4694720bebfd9 Merge: 75e3626a7 18a08e8fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:22:08 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 75e3626a785919f43fdcf2127c2b10e3e4df2f9f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:21:52 2020 +0200 OpenGL 3.3 minimum. commit 18a08e8fe2739f02af99a5d2cb4e7c38c49e858b Author: Monty Marz <m.marzouq@gmx.de> Date: Tue Jul 7 23:57:52 2020 +0200 settings localization commit 90c5d1ca3620092bc3ae10b2211489eb1cf6f5e8 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 21:11:48 2020 +0200 Lower near distance. commit 0e66f02b25aaddaa2dfddbbc89cd67de54a9a7b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 20:09:01 2020 +0200 All sprites sway in the wind now. commit db1401a6910bf42dcf502462c90038752ff5fbdb Merge: 69e508d8c e8b4b29d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 19:34:17 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 69e508d8c94d8973033817ca86f357e466fc7c4d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 18:41:37 2020 +0200 Make it easy to switch to SIMD for math. commit ffe0f5928c7a7e87d00cb5426b3b1d831d7e02fd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 21:21:12 2020 +0200 Fix some issues with underwater rendering. commit bfda6da42f38fd02c31ee92c81ab785a3e50c2a0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 19:17:59 2020 +0200 Fix some minor display issues. commit 0ed752e087968cf901301884aaeae698e32ef8a5 Merge: ccc6a06a8 518edcb85 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:14:21 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit ccc6a06a8d4504d6b9f7af7905a414d2ee06ab76 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:04:34 2020 +0200 Some minor changes. commit 4e020246702889269efe1a191788992164c508d6 Merge: 50a64d927 e05c9267a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 16:17:40 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 50a64d927e6c4f4b0e4688e4cbfca694bc3f922a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 13:07:03 2020 +0200 Fix far plane. commit 7dd06da34cae8f9ea3b6c889fe965181f3fd3949 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:25:35 2020 +0200 Add shadows.glsl. commit 618a18c998778bf871b905a74657440fcc384c80 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:10:22 2020 +0200 Adding shadows, greedy meshing, and more. commit eaea83fe6a5cb1cb0ba8beef888183c718258496 Merge: 267018495 2f89b863e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 22:47:07 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 2670184954a13e4a9e7a4e35ba79aac0c5fac2f7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 21:20:01 2020 +0200 Make civsim and sites deterministic. For anything in worldgen where you use a HashMap, *please* think carefully about which hasher you are going to use! This is especially true if (for some reason) you are depending on hashmap iteration order remaining stable for some aspect of worldgen. commit f8376fd5dc72b4a9c2f51a6b4570d59c8b8e9343 Merge: 654f7e049 cdee191dd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 17:53:57 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 654f7e049258d9da27c09608bbe6a46ffa8787e5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed May 20 21:22:30 2020 +0200 Correct backface culling. commit 560501df05ca725409b0f2e4eb31bdfdc15fd0c7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue May 19 17:22:06 2020 +0200 Greedy messhing for shadows. commit a4d87e1875ca543436e6bbbeb20348facc5a52d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun May 17 05:59:00 2020 +0200 Shadow maps work for lantern. commit 243d0837b8a3b08172c9a3c348d964d7ddc2a0a8 Merge: 04382dc28 71dd520cd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:53:13 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 04382dc28632b6c66e8821f6870c0daaa1c1901a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:22:17 2020 +0200 WIP: better graphics config, better LOD, shadow maps. commit 22ddbad3eb32bfa70f0932176022208fe67ded81 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 18:54:09 2020 +0200 Minor shader fixes. commit 746a10e8d01ac235f994b0cde78fa48998602a1f Merge: 0f4a0e763 40ab94673 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 04:02:09 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0f4a0e763db3afbdc4fb0558611f38326ca87151 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 23:03:24 2020 +0200 Switch back to pop-in terrain. commit dd74fa7e4a53667b38811d7aec58d7f6a68889bb Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 22:58:55 2020 +0200 LOD shading closer to voxel shading. commit ef67bd58ba0bdaf622b078892d768263b6cba268 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 28 20:49:03 2020 +0200 Experimental underwater lighting. commit 2c5ad9d07605e80d5fd5679dd3a5d70c605b86a9 Merge: 748279835 303967a6f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 22:35:24 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7482798354eda18c8207950080fc24d443a369de Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 21:59:55 2020 +0200 Replace discard in figure-frag. commit d83b4ae69be4912f69bf7835f509c68a1c7770a4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:45:57 2020 +0200 Fix sprite lighting, HDR from focus_pos. commit 0594238004f116274905fa0ed7c2b6c417ed1d29 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:14:10 2020 +0200 Proper HDR from point lights. commit 48c93d2b41ce5743103d18e76cc228f5ac766492 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 14:01:43 2020 +0200 Brighter ambiance, darker LOD shadows. commit e0452e895ccfa8a43f368cae3b8b8aedc24dad93 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 13:13:23 2020 +0200 More proper HDR. commit 4c6da3ed16cfeebb455e40da5f557b4af9a499d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 00:13:10 2020 +0200 Trying LOD noise. commit 682a3d74c85df5503ffe1fc1cc891bce789df1ad Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 23:11:08 2020 +0200 Fix LOD heights in towns. commit cc39e5734e8b18f9077bf42e66337c1319dd6b6e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 21:01:23 2020 +0200 More LOD fixes. commit 8116b21c2e51c836e77894e309ac273caf2917b3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:54:43 2020 +0200 I like this coloring. commit bc2560ea90b36f4b46190005344232d993043ac3 Merge: 14effdd5d e690efe71 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:48:33 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 14effdd5db8747fcf3eb34f03b46b7792e92d1c5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:24:35 2020 +0200 Re-saturate. commit 48a643955d4435b78179acba0beb4a979905cc31 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:23:57 2020 +0200 Various fixes. commit f7b497a0c25f4ad4682c71dd1ed6f608052feb9b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 03:22:49 2020 +0200 Render figures again. commit 44e4aad48deba8266b9f8bdfd3db096b381f5327 Merge: e6f0a5a98 9ec319a18 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 02:01:04 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit e6f0a5a981a82533ba188fff0a54ce98577bb152 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 24 16:12:20 2020 +0200 Add atmospheric scattering. commit f2953087f691a8edbc001cb98ebf5059fc6f8ac0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 23 00:01:20 2020 +0200 Fix shadowing for specular reflections. commit ddd4a67a9799b8d08c7dc0c2bec90621c2bed0e3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Apr 22 22:56:12 2020 +0200 HDR fixes. commit 1015e60deef3c447381996277df7496707a63bd0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 21 18:25:19 2020 +0200 More lighting changes. commit 80c264abd111fb237e57843efcb5c071d4f84613 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 13 00:29:59 2020 +0200 Lighting experiments. commit 8414987e589dd5102bad89762a3adaccc0bfe957 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 9 02:38:40 2020 +0200 WIP -- lighting changes and soft shadows. commit 9cd2b3fb0d6b49776c6dfe463e4169637250b11a Merge: c7ea687eb 8b149ad11 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:29 2020 +0200 Merge branch 'sharp/new-lighting' into sharp/small-fixes commit c7ea687ebbc5aace1b455f134a5bf49ce2c7434a Merge: 476441531 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:02 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 8b149ad11ad4bb75018fcf9519baec27d1c95951 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:32:39 2020 +0200 Trying out a new lighting model. commit b0ac9f36f755dd06f7c17c46150568064790864f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 07:56:11 2020 +0200 Use bicubic interpolation for terrain. commit f6fc9307a121514b614bc50ef8eb055953e7da8a Merge: 33140a295 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 05:01:41 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 4764415312aae6e9ac2d00e86e84577cb958f1ab Merge: ed2d0111d 13388ee6a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 04:54:48 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 13388ee6a42943f3f79a9cb488346cef18e272fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 20:30:08 2020 +0200 Various fixes (to coloring and to soft shadows). commit fbd084a94a067082a87cd6d28b82054709bc9265 Merge: 5a089863b 4fdf6896a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 18:50:38 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/map-colors commit ed2d0111d994262ae836d84d1fe5a45e4de72a0b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 06:49:27 2020 +0200 Combining colors and LOD. commit 88342640c6b835114d01c797b89fdede3b0a2108 Merge: 33140a295 5a089863b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:49:20 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 33140a2951b8212725f42c758b277aaec4d888f7 Merge: 4c65a5aed f34d4b379 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:36:21 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 5a089863beb01d4794bbe3580ada47b278715ea2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 03:17:49 2020 +0200 Making maps brighter. This is probably not the right way to do it, but oh well! commit 32b2c99109dd486aa922886081068f9c550c83f2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 02:46:36 2020 +0200 Horizon mapping and "layered" map generation. Horizon mapping is a method of shadow mapping specific to height maps. It can handle any angle between 0 and 90 degrees from the ground, as long as know the horizontal direction in advance, by remembering only a single angle (the "horizon angle" of the shadow map). More is explained in common/src/msg/server.rs. We also remember the approximate height of the largest occluder, to try to be able to generate soft shadows and create a vertical position where the shadows can't go higher. Additionally, map generation has been reworked. Instead of computing everything from explicit samples, we pass in sampling functions that return exactly what the map generator needs. This allows us to cleanly separate the way we sample things like altitudes and colors from the map generation process. We exploit this to generate maps *partially* on the server (with colors and rivers, but not shading). We can then send the partially completed map to the client, which can combine it with shadow information to generate the final map. This is useful for two reasons: first, it makes sure the client can apply shadow information by itself, and second, it lets us pass the unshaded map for use with level of detail functionality. For similar reasons, river generation is split out into its own layer, but for now we opt to still generate rivers on the server (since the river wire format is more complicated to compress and may require some extra work to make sure we have enough precision to draw rivers well enough for LoD). Finally, the mostly ad-hoc lighting we were performing has been (mostly) replaced with explicit Phong reflection shading (including specular highlights). Regularizing this seems useful and helps clarify the "meaning" of the various light intensities, and helps us keep a more physically plausible basis. However, its interaction with soft shadows is still imperfect, and it's not yet clear to me what we need to do to turn this into something useful for LoD. commit f8926a5737ddc51f3d585c651a64c43677aae0f4 Merge: a1aee931e 875ae6ced Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Mar 13 13:32:42 2020 +0100 Merge remote-tracking branch 'origin/master' into sharp/map-colors commit 4c65a5aed353b119aea65a2aaeb94549b67beb42 Author: Treeco <5021038-Treeco@users.noreply.gitlab.com> Date: Mon Feb 24 16:48:05 2020 +0000 Made LOD setting slider exponential commit 2fa7b2d20d7233dc8bfd64f9f7f54617575248f1 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 17:49:53 2020 +0000 Added mist to LoD commit aab059a450b5f635777129ff82cc15b662965c3c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 15:14:06 2020 +0000 Added LoD slider commit 779c36b538121c5ade3633ae5cb67bb14c8c3877 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:54:55 2020 +0000 Reduced cost of vertex pushing commit 9fea150473906b166365b738ebcea07c697daf3d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:38:53 2020 +0000 Fixed maths, improved LoD resolution commit 5481df38fea5bf183ff376a3337179cfaa5233dc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 11:22:50 2020 +0000 Dynamically relocate LoD vertices to enhance details commit a3e36a50ababd615da7db1b26158c7906a5def01 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 18:13:51 2020 +0000 Simpler terrain spiral rendering commit 255f450ae9ac8763db4bede075fb409161ed57cc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:53:17 2020 +0000 Better LoD precision commit 3d027aebe812a5b8658a4eb8123dc9f61b3776d2 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:04:03 2020 +0000 Better falloff commit be775c9484b457b2c0b1a494aec03392d0c70e76 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 15:30:45 2020 +0000 Applied good ideas from experimental branch commit 58587b68545a23c5c04ab4574a4b94b3bc982246 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 16:15:13 2020 +0000 Minor fixes to LoD merging commit 7b42aebd709c14df2db766aad61d9280ad24d84d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 15:04:44 2020 +0000 Capped LoD dragging commit 8aafc559f87124e1ea5ca6e3ddc2aa0c242d793c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:54:37 2020 +0000 Better blending between LoD and terrain border commit edd3455d5161792d87ddc8eadc0ecbad5532b284 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:40:19 2020 +0000 Fixed LoD z depth, added sea level offset commit b9b06744620114dd5556e73f64fa93c145503a7c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:27:43 2020 +0000 Better LoD smoothing commit a1aee931e790431560cd2d953ad61d9497072afd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Feb 21 14:52:17 2020 +0100 Adding shadows. commit 2400786c13dd891c131ed86d48d05df516a8a778 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 13:48:40 2020 +0000 Use world map as LoD source commit dbf650f504a4c25fbbc2096ac3616c736bf52d23 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Jan 20 00:48:14 2020 +0000 Better clouds at distance commit 5e6f81b86cdb9730b9b056877b19257075fd5fa8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Jan 19 23:59:02 2020 +0000 sync commit 745e7540ddb000cc645f612767b337c2ddc3f7c0 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 12:40:48 2019 +0000 Improved cloud falloff mist, faster noise sampling commit f6a200d0cb866196ba57697466755f9e0c7ea5d8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 10:09:00 2019 +0000 Improved long-range depth precision, removed unnecessary LoD polygons commit 63d1b2bb2292898d59fb4f4e502201103dfeb86f Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 20:57:46 2019 +0000 Working LoD shader commit f13d98ee3e58f881e8b978861a67663b59ed91ec Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 11:03:40 2019 +0000 LoD first attempt (stack overflow issue)
2020-08-20 18:34:59 +00:00
version = "0.4.1"
Updated sphynx Former-commit-id: f81484571bda8c5e15ea2b6c0e8b9b6892b094a3
2019-05-16 23:05:46 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
(See sharp/lod-history) LOD, shadows, greedy meshing, new lighting, perf --- Pretty much a Veloren fork at this point. Here's a high level overview of the changes (will be added to CHANGELOG just before merge). At a high level this MR incorporates roughly two groups of changes. The first group consists of new game features: more flexible map sizes, level of detail terrain, shadow maps, and a new lighting engine. This is "feature work" that (mostly) only adds new things to Veloren, and mostly shouldn't affect old stuff. The second big group of changes are those addressing the fallout from all the new features. These include performance fixes of various sorts: the addition of multiple graphics options and optimization of the cheap ones to avoid work, switching all voxel models to use some variant of greedy meshing, switching over much of our CPU-side vector math to exploit SIMD instructions (coinciding with a fork of `vek`), and a rewrite of how the UI handles text rendering (coinciding with updates to our fork of `conrod`). Making Veloren's hardcoded colors appear correct under the new lighting engine also required considerably changes (TODO: Fill in this section when it's complete). The second category of changes often heavily touches code owned by other people, including frequently modified code "owned" by a handful of people, so I recommend that this code be reviewed particularly carefully. --- At a high level (each will be described in more detail below): - The world map has been refactored. - The world size is no longer hardcoded (@zesterer). - The map generation code was made generic to allow using it outside of the `world` crate (@zesterer). - On world creation, we now compute *horizon maps* (@zesterer). - The way we pass the world from the server to the client has been updated (@xMAC94x). - Artifacts related to image rotation were fixed (@imbris). - Multiflow rivers were enabled (@zesterer). - In the process of making changes related to the world map, various incidental fixes and optimizations were required. - The new *level of detail* feature was added (@zesterer wrote part of this and has checked out the rest). - A new LOD terrain rendering step was added to the pipeline. - The LOD terrain quality was made configurable via a graphics setting. - Horizon maps were used to cast shadows from LOD chunks on both LOD and non-LOD terrain. - A "voxelization" effect was incorporated into rendered LOD terrain to make it blend better into the world. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Veloren's lighting has been completely overhauled (@zesterer has already checked most of this out). - A semi-accurate index of refraction was assigned to our materials. - A new, more realistic, physically based approach to lighting was used using the *Ashikhmin Shirley* BRDF. - We emulate *atmospheric scattering* using equations designed for measuring solar panel light exposure. - We attempt to compute *realistic light attenuation* in water using its real material properties. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Point and directional lights now cast realistic shadows, using *shadow mapping.* (@imbris, @zesterer, @Treeco, @YuriMomo) - Point light shadow maps were added to the rendering pipeline, using geometry shaders and *seamless cube maps*. - Directional light shadows were added to the rendering pipeline, using LISPSM together with disabling *depth clamping*. - "Shadow-only" chunks and NPCs were added to prevent shadows from models behind you from disappearing. - In the process of making changes related to shadow maps, various incidental fixes and optimizations were required. The addition of shadow maps, LOD terrain, and the new lighting all led to significant performance degradation, on top of other changes happening in master. Therefore, a large number of performance improvements were also needed: - The graphics options were made much more flexible and configurable, and shaders were optimize. - New options were provided for how to render lights and shadows (@Pfauenauge, @zesterer). - Graphic setting storage and configuration were overhauled to make adding new features easier (@Pfauenauge, @imbris). - Shaders were rewritten to utilize GLSL's preprocessor to avoid overhead (@zesterer, @YuriMomo). - In the process of making changes related to providing additional rendering options, various incidental fixes and optimizations were required. - Voxel model creation was switched to use *greedy meshing.* - A new voxel meshing method, greedy meshing, was added (@imbris). - Uses of the older meshing methods were migrated to use greedy meshing (@imbris, @jshipsey, @Pfauenauge). - New restrictions were added to terrain, figure, and sprites to future proof them for further optimizations (@jshipsey, @Pfauenauge, @zesterer). - Most positions are now relative to either chunk or player position for better precision (@imbris, @zesterer, @scottc). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - Animation and terrain math were switched to use SIMD where possible. - Fixes were made to vek to make its SIMD feature usable for us (@zesterer, @imbris). - The interface and types used in bone animation were changed in various ways (@jshipsey, @Snowram, @Pfauenauge). - Redundant code generation for body animation is now partly taken care of by a macro (@jshipsey, @Snowram, @Pfauenauge). - Animation code was modified to to use vek's SIMD representation where possible (@jshipsey, @Snowram, @Pfauenauge). - Terrain meshing code and shadow map math were also modified to use vek's SIMD representation (@imbris). - SIMD instruction generation was enabled (@YuriMomo, @jshipsey, @Snowram, @imbris, @Angelonfira, @xMAC94x). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - The way we cache glyphs was completely refactored, fixed, and optimized. - Our fork of `conrod` was optimized in various ways (@imbris). - Our fork of `conrod` now exposes whether a widget was updated during the current frame (@imbris). - Our use of the glyph cache was rewritten for correctness (@imbris). - A *text cache* was introduced that lets us skip remeshing glyphs that have not changed (@imbris). - Various changes were made to reduce pressure on the glyph cache, with more planned (@imbris, @Pfauenauge). - In the process of making changes related to the glyph cache, various incidental fixes and optimizations were required. - Colors were changed to keep Veloren's look consistent with master. - Some older tree models were brought back (@Pfauenauge). - TODO(@Sharp): All hardcoded colors were extracted and made hotloadable. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Hardcoded colors were fixed to conform to Veloren's style. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Color models were fixed to conform to Veloren's style. A detailed description of the involved changes follows. --- - The world size is no longer hardcoded. All functions dependent on world size now take a `WorldSizeLg`, which holds the base 2 logarithm of each actual world dimension and is guaranteed to maintain certain properties (outlined in `common/src/terrain/map.rs`). Additionally, many utility functions that utilize the world size were moved into `common` as well (mostly `common/src/terrain/mod.rs`). Finally, the world map format was updated in order to store its size explicitly, with a migration path from the old format that should work whenever the old formatted map was a square (practically always). See `world/src/sim/mod.rs` for these changes. - The map generation code was made generic to allow using it outside of the `world` crate. The parts of the map generating code that do not need to query the world were moved over to `common/src/terrain/map.rs`, allowing them to be used from the client without creating a dependency on `world`. The rest of it was turned into helper functions in `world/src/sim/map.rs`, which can be passed as closures to the generic map generation code to complete its construction. This also means that colors are now passed in separately to the map generation function. See <https://veloren.net/devblog-78/> for more details. - On world creation, we now compute *horizon maps*. See the function in `world/src/sim/util.rs`. Given a height map and a plane intersecting that height map, our horizon maps allow us to encode enough information to reconstruct shadows for each point on the height map using only the *horizon angle* (the angle at which the sun starts to become visible). As Veloren's sun only covers one plane, this is sufficient for encoding sun shadows for LOD terrain, by encoding two angles per chunk (one for each 90 degrees the sun covers). We can also use this for the moon, if we want, since the moon follows the same path. Additionally, we store the *height* of the furthest occluder, to try to make the shadows volumetric; so this means 4 bytes in total for each chunk. Support for horizon maps has been merged into the map functionality in common as well. - The way we pass the world from the server to the client has been updated. Rather than passing the prerendered map, we instead pass three maps with values for each chunk; one with the color information, a second with altitude information, and a third with horizon map information. We then reconstruct the map on the client, together with some additional information we send from the server (like the sea level and maximum height). See `common/src/msg/server.rs` for a detailed description of the format of `WorldMapMsg`, and `server/src/libr.rs` and `client/src/lib.rs` for details of the map construction and parsing. - Artifacts related to image rotation were fixed. See the commit message for commit SHA `cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e` for a detailed explanation. This involved changes to shaders, the addition of a new type of graphic (also reflected in the graphic cache) that allows specifying a border color (which automatically makes the associated texture immutable), and some related fixes. I reproduce the first two paragraphs of the MR description as well: ``` Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). ``` - Multiflow rivers were enabled. This does not really need to be part of this MR, and would be easy to revert, but since it seemed to provide a nice improvement it's currently packaged with it. We already computed multiple outflows from each chunk for erosion purposes long before this MR. However, we never modified river rendering to be able to handle this case (just a single downhill river flow is complex enough!) so this was not exposed when deciding which chunks were rivers. Now that - In the process of making changes related to the world map, various incidental fixes and optimizations were required. Some examples of fixes include making sure terrain is never lowered to below sea level (to make the shadow maps report correct values), fixing map altitudes and colors to understand things like cliffs and "block level" coloring (that doesn'te xist on the column level), and fixing a crashbug when rendering images for the UI where source pixels are strongly rectangular. Some examples of related performance fixes include avoiding allocating a fresh vector for all the maps (i.e. copying it over to change the format from `[u32; n]` to `DynamicImage` and then copying again to convert to `RgbaImage`), and instead using the `gfx::memory::slice` function to accomplish the same thing. These sorts of changes are spread all arond the code. This includes the additon of a new scene, `voxygen/src/scene/lod.rs`, a new pipeline `voxygen/src/render/pipeline/lod_terrain.rs`, and new shaders `assets/vxygen/shaders/lod-terrain-vert.glsl` and `assets/vxygen/shaders/lod-terrain-frag.glsl`, as well as associated changes to the renderer in `voxygen/src/render/renderer.rs`. The main idea behind our initial approach to LOD was to take the world data we now get from the server (altitude, color, and horizon mapping). - Some previously computed values were turned into shader uniforms for better prediction on weak processors. (@zesterer) - Calls to power or trig functions were removed or replaced with multiplications, where possible. - After some deliberation - To properly handle sprite "waving" for nearby sprites, We explicitly designed the greedy meshing system with figures and sprites in mind. In both cases, we want to be able to *efficiently* pack many different models into the same texture, especially in cases where we know we will either not be removing any of the grouped-together from the models from the texture, or will remove all of them at once (so they can be packed into some specific subtexture). For sprites, since we know every model in advance and never intend to deallocate them, we currently pack them all as efficiently as possible into one giant tetxure atlas. However, in the future we might opt to pack them slightly less efficiently in exchange for shrinking the sprite vertex size. For figures, we pack all the textures for each *model* into the same atlas. is a global texture atlas used for every sprite, and for figures which is why we have the ability to mesh multiple models to the same texture area (using the simple texture atlas allocator) without requiring intermediate vector allocations. This is accomplished by delaying the time when we actually write the color and light data to the texture until *after* all the model vertices have been meshed; then, we can just allocate the whole color/light array at once, making the atlas we use an exact fit. In computer science-y terms, we accomplish this delay by, after we perform the initial greedy meshing (without texture information), not continuing to create the texture data, but instead constructing a *continuation*--that is, a function that, when called, will execute the rest of the computation. We push this continuation (which in Rust terms is a `FnOnce` closure that takes the `ColLightsInfo` that it is supposed to write to as context) onto a onto a vector resizing. To allow for suspended writes to texture data, Rust pointed out to me that the continuation that would eventually write the color and light data to the texture atlas (the one that is shared by all models sharing the same greedy mesher) would have to *own* whatever data it mshed. Because we often generate the model data to mesh as a temporary in `voxygen/src/load.rs`, the - Matrix multiplications in the shader were reduced for figure data (@zesterer). - Vertex "waves" for fluid data were removed. - Terrain "bending" near edges was removed. - Scaling was fixed to make sure empty space was not introduced in a space previously occupied by a block. It was also changed to take ownership of its voxel data, rather than sharing it, to let it be used with meshing. - Rust's nightly version was bumped in order to use the `array_map` function, which lets us reuse more code between the simple map and `FigureModelCache`. - PositionedGlyph::standalone. --- I tried to cite sources in many cases[^realtime],[^lloyd],[^lispsm],[^pbrt],[^greedy],[^tjunctions] where I needed features from elsewhere but I am particularly grateful for the following resources, esepcially where they have accompanying source code. I linked all of them that are accessible to the public (those that are not were obtained through legal means). [^realtime]: Eisemann, Elmar, Michael Schwarz, Ulf Assarsson, Michael Wimmer. Real-Time Shadows. A K Peters/CRC Press (T&F), 20160419. [^lloyd]: Lloyd,B. 2007. [Logarithmic perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). PhD thesis, University of North Carolina. [^lispsm]: Wimmer, M., Scherzer, D., and Purgathofer, W. 2004. [Light space perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). In Proceedings of Eurographics Symposium on Rendering 2004, pp. 143– 152. [^pbrt]: Pharr, Matt, et al. [http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf](Physically Based Rendering: From Theory to Implementation). Third edition, Morgan Kaufmann Publishers/Elsevier, 2017. [^greedy]: mikolalysenko. “Meshing in a Minecraft Game.” 0 FPS, 30 June 2012, <https://0fps.net/2012/06/30/meshing-in-a-minecraft-game/>. [^tjunctions]: blackflux. “Meshing in Voxel Engines – Part 1.” Blackflux.Com, 23 Feb. 2014, <https://blackflux.wordpress.com/2014/02/23/meshing-in-voxel-engines-part-1/>. I am also especially grateful to Khronos, Wikiepdia, and stackoverflow for answering many of my specific questions while writing the MR. --- Squashed commit of the following: commit 300505e7305a2fdac722a808ee8538323f215f39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 18:46:25 2020 +0200 Fixing cargo doc and typo in CHANGELOG. commit ec0aeb18e8499d7d84ef818331b4b65c3d76cea6 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 15:38:50 2020 +0200 Hopefully final commit for the LOD branch. commit 5e8ea0b1eaac02903a02feb2eb038d195de4872f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 10:14:26 2020 +0200 Falling back to power as stopgap. commit e44a1cbf46504ee9931a01bdc9033e145500d557 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 09:25:41 2020 +0200 Address imbris feedback. Temporarily disables shiny water, lowers max VD. These restrictions will be lifted soon after merging. commit 561e25778a108ac3712f5ec2ce3a51234c4430d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 08:31:13 2020 +0200 Tweaking shaders a bit. commit 7d19259078ce0dd7b3742ad7d0cb3fab3ece3fdc Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:59:43 2020 +0200 Fix view example as well. commit 051cd4934e0fad2c0b15db4380a4189fa318679f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:29:06 2020 +0200 Fix meshing benchmark. commit c95e07db3b4dcca285678985e65e31b927cb1c61 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 05:46:22 2020 +0200 Address MR feedback, fix scene clouds. commit 1bfb816cabdb3ffc1e507a009c2d98696b4b573a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:39:36 2020 +0200 Incorporating Pfau's figure color changes. New eyes and new humanoid colors. commit 3f9b89a3ac7b3356b1dba0d1a8f6541357f81469 Merge: e2f5162e4 62c53963a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:29:41 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit e2f5162e4f96f4124aa43488f7245d341b3dcfd4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:28:38 2020 +0200 World colors are all hotloadable. They live in assets/world/style/colors.ron. Only a small handful of hardcoed colors remain in World; they are either part of the map, or difficult to disentangle from the rest of the computation. Comments are made where appropriate. commit 62c53963abe1975009d34a8f9515a355bef24f31 Author: Marcel Märtens <marcel.cochem@googlemail.com> Date: Wed Aug 19 15:59:00 2020 +0200 replace pretty_env_logger with tracing commit 5b1625f99d9586fe80e2232f583ec5af9f953099 Merge: d71003acd 4942b5b39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:15:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit d71003acdabeff970b3928e97c26af6847b5b78e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:14:34 2020 +0200 Hotloading colors, part 1: colors in common. Currently, this just entails humanoid colors. There are only three colors not handled; the light emitter colors in common/src/comp/inventory/item/tool.rs. These don't seem important enough to me to warrant making hotloadable, at least not right now, but if it's needed later we can always add them to the file. commit 63b5e0e553eb2ea49276f192a6fc7dd65254270d Merge: c32b337a4 6d2c4b9c1 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 13:05:37 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c32b337a46e10d9de473d178a94a3ccd61c39bb3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:52:04 2020 +0200 Fixing LOD grid, for real. commit a166ae0360395387e09fb35a1f84210c2ce5ec24 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:28:05 2020 +0200 Addressing imbris's initial feedback. Fixes two minor bugs: explosion particles were no longer spawning randomly, and LOD grids were not perfectly even. commit 4cbad004f44060994252dd3d38647a14a589712f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:27:58 2020 +0200 Bumping nightly per request. commit 548680276aac77c25d43d16b5622f847d474dbef Merge: acc098604 8f8b20c91 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:26:06 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit acc0986040589a3492f88a740bc3c3fc693b26d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:28:32 2020 +0200 Lower resolution due to lying drivers. commit d3b878de2a52c358d2944a6bbd0555dad7fbdb10 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:15:38 2020 +0200 Fix issues msh encountered with Intel 4600. commit 10245e0c1b0cb6fae10d86409435364edc6102ef Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 21:15:02 2020 +0200 Merge more models into one mesh than we did previously. commit 3155c31e663c52ae5c3a53d5fb5665892a1a498a Merge: 7204cc8a7 3c199280e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:35:22 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7204cc8a7a4f74a30306bd205d9834fee4bb944f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:34:43 2020 +0200 Fix not yet done NPC animations. This forces them all to be the idle animation if not specified. This fixes issues where you'd have giant NPCs in water. commit bc83360f2a08918f19d417b5f772e1ff554dba08 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 19:36:37 2020 +0200 Try to fix some bugs: - Z fighting with LOD terrain and water. - Audio SFX not playing. commit 1fd104aa603bf3781b6526a5cada46aeca3049dd Merge: 862df3c99 7c2c392a3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 12:02:31 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 862df3c9976c4da9bd7cfd784f1a85973127968a Merge: 0a4218ed9 75c1d4401 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 05:52:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0a4218ed9d541a2b34c133351bea38a99ddf4ea7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 22:27:14 2020 +0200 Fix particle depth. commit f51dfdeb442d0dd5243dd2f344fa4be295bd0875 Merge: c6251a956 5e6dc0471 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:19:04 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit c6251a956ad376400dca5c23420cf8d213dc8fdf Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:15:46 2020 +0200 Cache figures more intelligently. Cache figures for longer, and don't cache character states for the player except where they actually affect the rendered model. commit 0ed801d5404982c6fb63b1eaa4567d908b294c9d Merge: c11b9bdf0 eea64f78f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 16:32:24 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c11b9bdf0a53bf9884d2f5a48fec9b01d582df1a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 11:47:15 2020 +0200 Remove unneeded Clippy annotation. commit 16aa9ef40af56d69289d00aafb3deadfb8bd4f35 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 8 00:53:02 2020 +0200 Fix hotloading and Clippy. commit 3dc973e0be5b758da1e9805eb764ad401374cd0c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 23:50:27 2020 +0200 Major speedups with SIMD. commit fba64a7d93d5a96077ce87287bbce6ab9b7fbcae Merge: 76429d00e d1e10b178 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:19 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 76429d00eea00d212fbd672a84ee91e75b19b938 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:10 2020 +0200 Add clippy.toml. commit c79f512f84dbb83cb82b7954db68ff241dfd8e41 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 11:55:20 2020 +0200 Fix all clippy issues, clean up Rust code. commit 6f90e010b3fbefb53b0d632e819931350015b6b8 Merge: 77a8c7c26 5929cfa5c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:30 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 77a8c7c267d3f44a1a62bd6b2274359973c5e4d4 Merge: b44e44232 44febaabd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:10 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 5929cfa5c713aa392110bbb62407f76caf53c3df Author: jshipsey <jshipsey18@gmail.com> Date: Thu Aug 6 20:47:27 2020 -0400 fixed in-hand arrow bug commit b44e442325d828f1cd564d66908f89d09e80474b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 6 13:40:35 2020 +0200 Miscellaneous performance improvements. commit be37acf287c1360d8085862526ac3365ffd1d768 Merge: 125d7fc6c c11876547 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 05:49:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 125d7fc6c4dcd8c8c5f27b8268a4d64f409f3644 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 04:55:31 2020 +0200 Abstract over simd vs. repr_c vectors. Also some minor improvements to Event size. commit d4d4956e9252e1241ce110b2aa85076c6b1e2a23 Merge: 5f3b7294a aced5f979 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:56:54 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 5f3b7294af1f8533edc2620b58863c248e2b07af Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:43:52 2020 +0200 Fix formatting issues I missed before. commit a428a3ebba70dcab63dd0f8cd983120c90617271 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:41:51 2020 +0200 Fix clippy warnings, part 1. There aer still a bunch of type too complex and function takes too many arguments warnings that I'll fix later (or ignore, since in the one case I did fix a function takes too many arguments warning I think it made the code *less* readable). commit ba54307540ed8a937ac08209730284fc653af85b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 30 13:22:42 2020 +0200 Fix light animations so they are removed when the light turns off. commit 7e0f4bcbf0f4717145d8beac40d52e3acebbe2aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 21:10:20 2020 +0200 Fix crash in edge case for pixel art. commit 56da06f7a351e2b949e9b014a90b974d511a0924 Merge: cf74d55f2 9f53a4a19 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:56:52 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:29:52 2020 +0200 Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). The first concern was addressed by fixing the dimensions of the map images drawn from the UI (so that we always use a square source rectangle, rather than a rectangular one according to the dimensions of the map). We also fixed the way rotation was done in the fragment shader for north-facing sources to make it properly handle aspect ratio (this was already done for north-facing targets). Together, these fix rendering issues peculiar to rectangular maps. The second and third concerns were jointly addressed by adding an optional border color to every 2D image drawn by the UI. This turns out not to waste extra space even though we hold a full f32 color (to avoid an extra dependency on gfx's PackedColor), since voxel images already take up more space than Optiion<[f32; 4]> requires. This is then implemented automatically using the "border color" wrapping method in the attached sampler. Since this is implemented in graphics hardware, it only works (at least naively) if the actual image bounds match the texture bounds. Therefore, we altered the way the graphics cache stores images with a border color to guarantee that they are always in their own texture, whose size exactly matches their extent. Since the easiest currently exposed way to set a border color is to do so for an immutable texture, we went a bit further and added a new "immutable" texture storage type used for these cases; currently, it is always and automatically used only when there is a specified border color, but in theory there's no reason we couldn't provide immutable-only images that use the default wrapping mdoe (though clamp to border is admittedly not a great default). To fix the maps case specifically, we set the border color to a translucent version of the ocean border color. This may need tweaking going forward, which shouldn't be hard. As part of this process, we had to modify graphics replacement to make sure immutable images are *removed* when invalidated, rather than just having a validity flag unset (this is normally done by the UI to try to reuse allocations in place if images are updated in benign ways, since the texture atlases used for Ui do not support deallocation; currently this is only used for item images, so there should be no overlap with immutable image replacement, so this was purely precautionary). Since we were already touching the relevant code, we also updated the image dependency to a newer version that provides more ways to avoid allocations, and made a few other changes that should hopefully eliminate redundant most of the intermediate buffer allocations we were performing for what should be zero-cost conversions. This may slightly improve performance in some cases. commit ad18ce939940a8c697270f6e9b94db9942fd8295 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 13:21:09 2020 +0200 Fix continent scale hack. commit 36b1cb074f5b195aebd7dbbc3da7f0246a1a18ec Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 12:11:40 2020 +0200 Enable loading different sized maps without a recompile. We may want to tweak the effects of the continent_scale_hack. commit 13b6d4d534cc4814b7cb3294ca41bbfea0a6b186 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 10:55:48 2020 +0200 Removing WORLD_SIZE, part 1. Erased almost every instance of WORLD_SIZE and replaced it with a local power of two, map_size_lg (which respects certain invariants; see common/src/terrain/map.rs for more details about MapSizeLg). This also means we can avoid a dependency on the world crate from client, as desired. Now that the rest of the code is not expecting a fixed WORLD_SIZE, the next step is to arrange for maps to store their world size, and to use that world size as a basis prior to loading the map (as well, probably, as prior to configuring some of the noise functions). commit 30b1d2c6428230a9eaa0d749cdcbbd6f1cbccd78 Merge: 7d56ba31b 1377b369f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:58 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 7d56ba31b445441461b28a07fc495d7d4f047c17 Merge: 2101113b4 598f14b25 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 1377b369f6db2258e910d467a5740f31789e3ded Author: Monty Marz <m.marzouq@gmx.de> Date: Sun Jul 19 23:25:38 2020 +0200 more saturated pumpkins commit ae8d50527f93bb0616c2ad46ce4dacb63bc37c6d Author: Monty Marz <m.marzouq@gmx.de> Date: Sat Jul 18 20:29:56 2020 +0200 acacia models commit 2101113b467e691de787392d7f20f1745f5637bd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 18 18:55:25 2020 +0200 Higher detail LOD. commit add2cfae04b4385fa5590e11e2bd5229d9dee0aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 16 01:57:39 2020 +0200 Revert some irrelevant stuff. commit 2e2ab3dc1eaa59a4aef7f8d34a53d8aae4c8553a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 15 13:30:49 2020 +0200 Fixing various things about shadows. * Correcting optimal LISPSM parameter. * Figure shadows are cast when they're not visible. * Chunk shadows stay cast until you look away. * Seamless cubemaps for point lights. * Etc. commit 6c31e6b56217274285b597af297036691ea5d897 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 19:50:26 2020 +0200 Fix shadow creation. commit 6332cbe006115ae205597529cd8bbccd146c2cca Merge: be438657c 930e0028b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:47:00 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit be438657c33d7b5bfb0a9582c3ed3fd366637323 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:28:08 2020 +0200 Tweaks to shadows. Added shadow map resolution configuration, added seamless cubemaps, documented all existing rendering options, and fixed a few Clippy errors. commit 23b4058906013c7d2a40c286e20e32c5fbd897ed Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 10:11:19 2020 +0200 Fix moon, use nonlinear noise for terrain. Note that the latter has a bit of performance cost. commit 7fbe5cbfbb9dc29607957b8e62f432a4deed193d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:23:02 2020 +0200 Address lies about max texture size. commit bcfc62b5e13a1cdd83f57535fde4694720bebfd9 Merge: 75e3626a7 18a08e8fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:22:08 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 75e3626a785919f43fdcf2127c2b10e3e4df2f9f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:21:52 2020 +0200 OpenGL 3.3 minimum. commit 18a08e8fe2739f02af99a5d2cb4e7c38c49e858b Author: Monty Marz <m.marzouq@gmx.de> Date: Tue Jul 7 23:57:52 2020 +0200 settings localization commit 90c5d1ca3620092bc3ae10b2211489eb1cf6f5e8 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 21:11:48 2020 +0200 Lower near distance. commit 0e66f02b25aaddaa2dfddbbc89cd67de54a9a7b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 20:09:01 2020 +0200 All sprites sway in the wind now. commit db1401a6910bf42dcf502462c90038752ff5fbdb Merge: 69e508d8c e8b4b29d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 19:34:17 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 69e508d8c94d8973033817ca86f357e466fc7c4d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 18:41:37 2020 +0200 Make it easy to switch to SIMD for math. commit ffe0f5928c7a7e87d00cb5426b3b1d831d7e02fd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 21:21:12 2020 +0200 Fix some issues with underwater rendering. commit bfda6da42f38fd02c31ee92c81ab785a3e50c2a0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 19:17:59 2020 +0200 Fix some minor display issues. commit 0ed752e087968cf901301884aaeae698e32ef8a5 Merge: ccc6a06a8 518edcb85 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:14:21 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit ccc6a06a8d4504d6b9f7af7905a414d2ee06ab76 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:04:34 2020 +0200 Some minor changes. commit 4e020246702889269efe1a191788992164c508d6 Merge: 50a64d927 e05c9267a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 16:17:40 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 50a64d927e6c4f4b0e4688e4cbfca694bc3f922a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 13:07:03 2020 +0200 Fix far plane. commit 7dd06da34cae8f9ea3b6c889fe965181f3fd3949 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:25:35 2020 +0200 Add shadows.glsl. commit 618a18c998778bf871b905a74657440fcc384c80 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:10:22 2020 +0200 Adding shadows, greedy meshing, and more. commit eaea83fe6a5cb1cb0ba8beef888183c718258496 Merge: 267018495 2f89b863e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 22:47:07 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 2670184954a13e4a9e7a4e35ba79aac0c5fac2f7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 21:20:01 2020 +0200 Make civsim and sites deterministic. For anything in worldgen where you use a HashMap, *please* think carefully about which hasher you are going to use! This is especially true if (for some reason) you are depending on hashmap iteration order remaining stable for some aspect of worldgen. commit f8376fd5dc72b4a9c2f51a6b4570d59c8b8e9343 Merge: 654f7e049 cdee191dd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 17:53:57 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 654f7e049258d9da27c09608bbe6a46ffa8787e5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed May 20 21:22:30 2020 +0200 Correct backface culling. commit 560501df05ca725409b0f2e4eb31bdfdc15fd0c7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue May 19 17:22:06 2020 +0200 Greedy messhing for shadows. commit a4d87e1875ca543436e6bbbeb20348facc5a52d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun May 17 05:59:00 2020 +0200 Shadow maps work for lantern. commit 243d0837b8a3b08172c9a3c348d964d7ddc2a0a8 Merge: 04382dc28 71dd520cd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:53:13 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 04382dc28632b6c66e8821f6870c0daaa1c1901a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:22:17 2020 +0200 WIP: better graphics config, better LOD, shadow maps. commit 22ddbad3eb32bfa70f0932176022208fe67ded81 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 18:54:09 2020 +0200 Minor shader fixes. commit 746a10e8d01ac235f994b0cde78fa48998602a1f Merge: 0f4a0e763 40ab94673 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 04:02:09 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0f4a0e763db3afbdc4fb0558611f38326ca87151 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 23:03:24 2020 +0200 Switch back to pop-in terrain. commit dd74fa7e4a53667b38811d7aec58d7f6a68889bb Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 22:58:55 2020 +0200 LOD shading closer to voxel shading. commit ef67bd58ba0bdaf622b078892d768263b6cba268 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 28 20:49:03 2020 +0200 Experimental underwater lighting. commit 2c5ad9d07605e80d5fd5679dd3a5d70c605b86a9 Merge: 748279835 303967a6f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 22:35:24 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7482798354eda18c8207950080fc24d443a369de Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 21:59:55 2020 +0200 Replace discard in figure-frag. commit d83b4ae69be4912f69bf7835f509c68a1c7770a4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:45:57 2020 +0200 Fix sprite lighting, HDR from focus_pos. commit 0594238004f116274905fa0ed7c2b6c417ed1d29 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:14:10 2020 +0200 Proper HDR from point lights. commit 48c93d2b41ce5743103d18e76cc228f5ac766492 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 14:01:43 2020 +0200 Brighter ambiance, darker LOD shadows. commit e0452e895ccfa8a43f368cae3b8b8aedc24dad93 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 13:13:23 2020 +0200 More proper HDR. commit 4c6da3ed16cfeebb455e40da5f557b4af9a499d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 00:13:10 2020 +0200 Trying LOD noise. commit 682a3d74c85df5503ffe1fc1cc891bce789df1ad Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 23:11:08 2020 +0200 Fix LOD heights in towns. commit cc39e5734e8b18f9077bf42e66337c1319dd6b6e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 21:01:23 2020 +0200 More LOD fixes. commit 8116b21c2e51c836e77894e309ac273caf2917b3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:54:43 2020 +0200 I like this coloring. commit bc2560ea90b36f4b46190005344232d993043ac3 Merge: 14effdd5d e690efe71 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:48:33 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 14effdd5db8747fcf3eb34f03b46b7792e92d1c5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:24:35 2020 +0200 Re-saturate. commit 48a643955d4435b78179acba0beb4a979905cc31 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:23:57 2020 +0200 Various fixes. commit f7b497a0c25f4ad4682c71dd1ed6f608052feb9b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 03:22:49 2020 +0200 Render figures again. commit 44e4aad48deba8266b9f8bdfd3db096b381f5327 Merge: e6f0a5a98 9ec319a18 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 02:01:04 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit e6f0a5a981a82533ba188fff0a54ce98577bb152 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 24 16:12:20 2020 +0200 Add atmospheric scattering. commit f2953087f691a8edbc001cb98ebf5059fc6f8ac0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 23 00:01:20 2020 +0200 Fix shadowing for specular reflections. commit ddd4a67a9799b8d08c7dc0c2bec90621c2bed0e3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Apr 22 22:56:12 2020 +0200 HDR fixes. commit 1015e60deef3c447381996277df7496707a63bd0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 21 18:25:19 2020 +0200 More lighting changes. commit 80c264abd111fb237e57843efcb5c071d4f84613 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 13 00:29:59 2020 +0200 Lighting experiments. commit 8414987e589dd5102bad89762a3adaccc0bfe957 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 9 02:38:40 2020 +0200 WIP -- lighting changes and soft shadows. commit 9cd2b3fb0d6b49776c6dfe463e4169637250b11a Merge: c7ea687eb 8b149ad11 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:29 2020 +0200 Merge branch 'sharp/new-lighting' into sharp/small-fixes commit c7ea687ebbc5aace1b455f134a5bf49ce2c7434a Merge: 476441531 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:02 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 8b149ad11ad4bb75018fcf9519baec27d1c95951 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:32:39 2020 +0200 Trying out a new lighting model. commit b0ac9f36f755dd06f7c17c46150568064790864f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 07:56:11 2020 +0200 Use bicubic interpolation for terrain. commit f6fc9307a121514b614bc50ef8eb055953e7da8a Merge: 33140a295 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 05:01:41 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 4764415312aae6e9ac2d00e86e84577cb958f1ab Merge: ed2d0111d 13388ee6a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 04:54:48 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 13388ee6a42943f3f79a9cb488346cef18e272fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 20:30:08 2020 +0200 Various fixes (to coloring and to soft shadows). commit fbd084a94a067082a87cd6d28b82054709bc9265 Merge: 5a089863b 4fdf6896a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 18:50:38 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/map-colors commit ed2d0111d994262ae836d84d1fe5a45e4de72a0b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 06:49:27 2020 +0200 Combining colors and LOD. commit 88342640c6b835114d01c797b89fdede3b0a2108 Merge: 33140a295 5a089863b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:49:20 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 33140a2951b8212725f42c758b277aaec4d888f7 Merge: 4c65a5aed f34d4b379 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:36:21 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 5a089863beb01d4794bbe3580ada47b278715ea2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 03:17:49 2020 +0200 Making maps brighter. This is probably not the right way to do it, but oh well! commit 32b2c99109dd486aa922886081068f9c550c83f2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 02:46:36 2020 +0200 Horizon mapping and "layered" map generation. Horizon mapping is a method of shadow mapping specific to height maps. It can handle any angle between 0 and 90 degrees from the ground, as long as know the horizontal direction in advance, by remembering only a single angle (the "horizon angle" of the shadow map). More is explained in common/src/msg/server.rs. We also remember the approximate height of the largest occluder, to try to be able to generate soft shadows and create a vertical position where the shadows can't go higher. Additionally, map generation has been reworked. Instead of computing everything from explicit samples, we pass in sampling functions that return exactly what the map generator needs. This allows us to cleanly separate the way we sample things like altitudes and colors from the map generation process. We exploit this to generate maps *partially* on the server (with colors and rivers, but not shading). We can then send the partially completed map to the client, which can combine it with shadow information to generate the final map. This is useful for two reasons: first, it makes sure the client can apply shadow information by itself, and second, it lets us pass the unshaded map for use with level of detail functionality. For similar reasons, river generation is split out into its own layer, but for now we opt to still generate rivers on the server (since the river wire format is more complicated to compress and may require some extra work to make sure we have enough precision to draw rivers well enough for LoD). Finally, the mostly ad-hoc lighting we were performing has been (mostly) replaced with explicit Phong reflection shading (including specular highlights). Regularizing this seems useful and helps clarify the "meaning" of the various light intensities, and helps us keep a more physically plausible basis. However, its interaction with soft shadows is still imperfect, and it's not yet clear to me what we need to do to turn this into something useful for LoD. commit f8926a5737ddc51f3d585c651a64c43677aae0f4 Merge: a1aee931e 875ae6ced Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Mar 13 13:32:42 2020 +0100 Merge remote-tracking branch 'origin/master' into sharp/map-colors commit 4c65a5aed353b119aea65a2aaeb94549b67beb42 Author: Treeco <5021038-Treeco@users.noreply.gitlab.com> Date: Mon Feb 24 16:48:05 2020 +0000 Made LOD setting slider exponential commit 2fa7b2d20d7233dc8bfd64f9f7f54617575248f1 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 17:49:53 2020 +0000 Added mist to LoD commit aab059a450b5f635777129ff82cc15b662965c3c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 15:14:06 2020 +0000 Added LoD slider commit 779c36b538121c5ade3633ae5cb67bb14c8c3877 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:54:55 2020 +0000 Reduced cost of vertex pushing commit 9fea150473906b166365b738ebcea07c697daf3d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:38:53 2020 +0000 Fixed maths, improved LoD resolution commit 5481df38fea5bf183ff376a3337179cfaa5233dc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 11:22:50 2020 +0000 Dynamically relocate LoD vertices to enhance details commit a3e36a50ababd615da7db1b26158c7906a5def01 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 18:13:51 2020 +0000 Simpler terrain spiral rendering commit 255f450ae9ac8763db4bede075fb409161ed57cc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:53:17 2020 +0000 Better LoD precision commit 3d027aebe812a5b8658a4eb8123dc9f61b3776d2 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:04:03 2020 +0000 Better falloff commit be775c9484b457b2c0b1a494aec03392d0c70e76 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 15:30:45 2020 +0000 Applied good ideas from experimental branch commit 58587b68545a23c5c04ab4574a4b94b3bc982246 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 16:15:13 2020 +0000 Minor fixes to LoD merging commit 7b42aebd709c14df2db766aad61d9280ad24d84d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 15:04:44 2020 +0000 Capped LoD dragging commit 8aafc559f87124e1ea5ca6e3ddc2aa0c242d793c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:54:37 2020 +0000 Better blending between LoD and terrain border commit edd3455d5161792d87ddc8eadc0ecbad5532b284 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:40:19 2020 +0000 Fixed LoD z depth, added sea level offset commit b9b06744620114dd5556e73f64fa93c145503a7c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:27:43 2020 +0000 Better LoD smoothing commit a1aee931e790431560cd2d953ad61d9497072afd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Feb 21 14:52:17 2020 +0100 Adding shadows. commit 2400786c13dd891c131ed86d48d05df516a8a778 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 13:48:40 2020 +0000 Use world map as LoD source commit dbf650f504a4c25fbbc2096ac3616c736bf52d23 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Jan 20 00:48:14 2020 +0000 Better clouds at distance commit 5e6f81b86cdb9730b9b056877b19257075fd5fa8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Jan 19 23:59:02 2020 +0000 sync commit 745e7540ddb000cc645f612767b337c2ddc3f7c0 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 12:40:48 2019 +0000 Improved cloud falloff mist, faster noise sampling commit f6a200d0cb866196ba57697466755f9e0c7ea5d8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 10:09:00 2019 +0000 Improved long-range depth precision, removed unnecessary LoD polygons commit 63d1b2bb2292898d59fb4f4e502201103dfeb86f Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 20:57:46 2019 +0000 Working LoD shader commit f13d98ee3e58f881e8b978861a67663b59ed91ec Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 11:03:40 2019 +0000 LoD first attempt (stack overflow issue)
2020-08-20 18:34:59 +00:00
checksum = "8fb1df15f412ee2e9dfc1c504260fa695c1c3f10fe9f4a6ee2d2184d7d6450e2"
Updated sphynx Former-commit-id: f81484571bda8c5e15ea2b6c0e8b9b6892b094a3
2019-05-16 23:05:46 +00:00
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "syn"
Move shaders, start asset reloading system
2019-08-03 05:42:33 +00:00
version = "0.15.44"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"proc-macro2 0.4.30",
"quote 0.6.13",
"unicode-xid 0.1.0",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
Remove vek patch, it's on crates.io now
2019-08-26 12:21:04 +00:00
[[package]]
name = "syn"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "1.0.81"
Added protection stat to admin armor hidden in debug folder. Removed blue cultist armor set from drop table as it is an admin set.
2020-07-18 00:05:28 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "f2afee18b8beb5a596ecb4a2dce128c719b4ba399d34126b9e4396e3f9860966"
Added protection stat to admin armor hidden in debug folder. Removed blue cultist armor set from drop table as it is an admin set.
2020-07-18 00:05:28 +00:00
dependencies = [
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"proc-macro2 1.0.32",
"quote 1.0.10",
update dependencies
2021-06-04 07:44:30 +00:00
"unicode-xid 0.2.2",
Added protection stat to admin armor hidden in debug folder. Removed blue cultist armor set from drop table as it is an admin set.
2020-07-18 00:05:28 +00:00
]
update further crates
2020-12-16 00:07:39 +00:00
[[package]]
name = "tap"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
version = "1.0.1"
update further crates
2020-12-16 00:07:39 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
update further crates
2020-12-16 00:07:39 +00:00
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
[[package]]
name = "tar"
update crates
2021-09-20 10:05:41 +00:00
version = "0.4.37"
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "d6f5515d3add52e0bbdcad7b83c388bb36ba7b754dda3b5f5bc2d38640cdba5c"
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
dependencies = [
"filetime",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
"xattr",
]
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
[[package]]
Clean and update dependencies * Remove tweak feature * Remove const-tweaker * Update tiny_http * Update bitvec to 0.21.0 * Downgrade euc to avoid conflict with vek 0.12.0 * Require exactly vek 0.12.0 * Update all other dependencies automatically based on these changes * Update gilrs to latest at the request of Ada Lovegirls * Update meshing benchmarks to new criterion API
2021-02-15 07:47:28 +00:00
name = "target-lexicon"
update crates
2021-09-20 10:05:41 +00:00
version = "0.12.2"
Clean and update dependencies * Remove tweak feature * Remove const-tweaker * Update tiny_http * Update bitvec to 0.21.0 * Downgrade euc to avoid conflict with vek 0.12.0 * Require exactly vek 0.12.0 * Update all other dependencies automatically based on these changes * Update gilrs to latest at the request of Ada Lovegirls * Update meshing benchmarks to new criterion API
2021-02-15 07:47:28 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "d9bffcddbc2458fa3e6058414599e3c838a022abae82e5c67b4f7f80298d5bff"
added const tweaker
2020-03-19 17:11:45 +00:00
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
Clean and update dependencies * Remove tweak feature * Remove const-tweaker * Update tiny_http * Update bitvec to 0.21.0 * Downgrade euc to avoid conflict with vek 0.12.0 * Require exactly vek 0.12.0 * Update all other dependencies automatically based on these changes * Update gilrs to latest at the request of Ada Lovegirls * Update meshing benchmarks to new criterion API
2021-02-15 07:47:28 +00:00
name = "tempfile"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
version = "3.2.0"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"cfg-if 1.0.0",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
update depednencies
2021-07-08 10:21:02 +00:00
"rand 0.8.4",
update crates
2021-09-20 10:05:41 +00:00
"redox_syscall 0.2.10",
Clean and update dependencies * Remove tweak feature * Remove const-tweaker * Update tiny_http * Update bitvec to 0.21.0 * Downgrade euc to avoid conflict with vek 0.12.0 * Require exactly vek 0.12.0 * Update all other dependencies automatically based on these changes * Update gilrs to latest at the request of Ada Lovegirls * Update meshing benchmarks to new criterion API
2021-02-15 07:47:28 +00:00
"remove_dir_all",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"winapi 0.3.9",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
common: Add benchmark for `Chonk`
2019-09-03 23:00:50 +00:00
[[package]]
Clean and update dependencies * Remove tweak feature * Remove const-tweaker * Update tiny_http * Update bitvec to 0.21.0 * Downgrade euc to avoid conflict with vek 0.12.0 * Require exactly vek 0.12.0 * Update all other dependencies automatically based on these changes * Update gilrs to latest at the request of Ada Lovegirls * Update meshing benchmarks to new criterion API
2021-02-15 07:47:28 +00:00
name = "termcolor"
version = "1.1.2"
first implementation of prometheus in veloren for git hash, tick times, chunks loaded, player online, entity count and light count
2019-09-06 14:21:09 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Clean and update dependencies * Remove tweak feature * Remove const-tweaker * Update tiny_http * Update bitvec to 0.21.0 * Downgrade euc to avoid conflict with vek 0.12.0 * Require exactly vek 0.12.0 * Update all other dependencies automatically based on these changes * Update gilrs to latest at the request of Ada Lovegirls * Update meshing benchmarks to new criterion API
2021-02-15 07:47:28 +00:00
checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
first implementation of prometheus in veloren for git hash, tick times, chunks loaded, player online, entity count and light count
2019-09-06 14:21:09 +00:00
dependencies = [
Clean and update dependencies * Remove tweak feature * Remove const-tweaker * Update tiny_http * Update bitvec to 0.21.0 * Downgrade euc to avoid conflict with vek 0.12.0 * Require exactly vek 0.12.0 * Update all other dependencies automatically based on these changes * Update gilrs to latest at the request of Ada Lovegirls * Update meshing benchmarks to new criterion API
2021-02-15 07:47:28 +00:00
"winapi-util",
first implementation of prometheus in veloren for git hash, tick times, chunks loaded, player online, entity count and light count
2019-09-06 14:21:09 +00:00
]
[[package]]
Clean and update dependencies * Remove tweak feature * Remove const-tweaker * Update tiny_http * Update bitvec to 0.21.0 * Downgrade euc to avoid conflict with vek 0.12.0 * Require exactly vek 0.12.0 * Update all other dependencies automatically based on these changes * Update gilrs to latest at the request of Ada Lovegirls * Update meshing benchmarks to new criterion API
2021-02-15 07:47:28 +00:00
name = "textwrap"
version = "0.11.0"
first implementation of prometheus in veloren for git hash, tick times, chunks loaded, player online, entity count and light count
2019-09-06 14:21:09 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Clean and update dependencies * Remove tweak feature * Remove const-tweaker * Update tiny_http * Update bitvec to 0.21.0 * Downgrade euc to avoid conflict with vek 0.12.0 * Require exactly vek 0.12.0 * Update all other dependencies automatically based on these changes * Update gilrs to latest at the request of Ada Lovegirls * Update meshing benchmarks to new criterion API
2021-02-15 07:47:28 +00:00
checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
first implementation of prometheus in veloren for git hash, tick times, chunks loaded, player online, entity count and light count
2019-09-06 14:21:09 +00:00
dependencies = [
Clean and update dependencies * Remove tweak feature * Remove const-tweaker * Update tiny_http * Update bitvec to 0.21.0 * Downgrade euc to avoid conflict with vek 0.12.0 * Require exactly vek 0.12.0 * Update all other dependencies automatically based on these changes * Update gilrs to latest at the request of Ada Lovegirls * Update meshing benchmarks to new criterion API
2021-02-15 07:47:28 +00:00
"unicode-width",
first implementation of prometheus in veloren for git hash, tick times, chunks loaded, player online, entity count and light count
2019-09-06 14:21:09 +00:00
]
updated dependencies and fixed stuff - replace serde_derive by feature of serde incl. source code modifications to compile - reduce futures-timer to "2.0" to be same as async_std - update notify - removed mio, bincode and lz4 compress in common as networking is now in own crate btw there is a better lz4 compress crate, which is newer than 2017 - update prometheus to 0.9 - can't update uvth yet due to usues - hashbrown to 7.2 to only need a single version - libsqlite3 update - image didn't change as there is a problem with `image 0.23` - switch old directories with newer directories-next - no num upgrade as we still depend on num 0.2 anyways - rodio and cpal upgrade - const-tewaker update - dispatch (untested) update - git2 update - iterations update
2020-07-06 14:23:08 +00:00
[[package]]
Clean and update dependencies * Remove tweak feature * Remove const-tweaker * Update tiny_http * Update bitvec to 0.21.0 * Downgrade euc to avoid conflict with vek 0.12.0 * Require exactly vek 0.12.0 * Update all other dependencies automatically based on these changes * Update gilrs to latest at the request of Ada Lovegirls * Update meshing benchmarks to new criterion API
2021-02-15 07:47:28 +00:00
name = "thiserror"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "1.0.30"
updated dependencies and fixed stuff - replace serde_derive by feature of serde incl. source code modifications to compile - reduce futures-timer to "2.0" to be same as async_std - update notify - removed mio, bincode and lz4 compress in common as networking is now in own crate btw there is a better lz4 compress crate, which is newer than 2017 - update prometheus to 0.9 - can't update uvth yet due to usues - hashbrown to 7.2 to only need a single version - libsqlite3 update - image didn't change as there is a problem with `image 0.23` - switch old directories with newer directories-next - no num upgrade as we still depend on num 0.2 anyways - rodio and cpal upgrade - const-tewaker update - dispatch (untested) update - git2 update - iterations update
2020-07-06 14:23:08 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417"
Clean and update dependencies * Remove tweak feature * Remove const-tweaker * Update tiny_http * Update bitvec to 0.21.0 * Downgrade euc to avoid conflict with vek 0.12.0 * Require exactly vek 0.12.0 * Update all other dependencies automatically based on these changes * Update gilrs to latest at the request of Ada Lovegirls * Update meshing benchmarks to new criterion API
2021-02-15 07:47:28 +00:00
dependencies = [
"thiserror-impl",
]
updated dependencies and fixed stuff - replace serde_derive by feature of serde incl. source code modifications to compile - reduce futures-timer to "2.0" to be same as async_std - update notify - removed mio, bincode and lz4 compress in common as networking is now in own crate btw there is a better lz4 compress crate, which is newer than 2017 - update prometheus to 0.9 - can't update uvth yet due to usues - hashbrown to 7.2 to only need a single version - libsqlite3 update - image didn't change as there is a problem with `image 0.23` - switch old directories with newer directories-next - no num upgrade as we still depend on num 0.2 anyways - rodio and cpal upgrade - const-tewaker update - dispatch (untested) update - git2 update - iterations update
2020-07-06 14:23:08 +00:00
added const tweaker
2020-03-19 17:11:45 +00:00
[[package]]
Clean and update dependencies * Remove tweak feature * Remove const-tweaker * Update tiny_http * Update bitvec to 0.21.0 * Downgrade euc to avoid conflict with vek 0.12.0 * Require exactly vek 0.12.0 * Update all other dependencies automatically based on these changes * Update gilrs to latest at the request of Ada Lovegirls * Update meshing benchmarks to new criterion API
2021-02-15 07:47:28 +00:00
name = "thiserror-impl"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "1.0.30"
added const tweaker
2020-03-19 17:11:45 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b"
added const tweaker
2020-03-19 17:11:45 +00:00
dependencies = [
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"proc-macro2 1.0.32",
"quote 1.0.10",
"syn 1.0.81",
added const tweaker
2020-03-19 17:11:45 +00:00
]
update authc
2020-12-28 15:17:43 +00:00
[[package]]
Clean and update dependencies * Remove tweak feature * Remove const-tweaker * Update tiny_http * Update bitvec to 0.21.0 * Downgrade euc to avoid conflict with vek 0.12.0 * Require exactly vek 0.12.0 * Update all other dependencies automatically based on these changes * Update gilrs to latest at the request of Ada Lovegirls * Update meshing benchmarks to new criterion API
2021-02-15 07:47:28 +00:00
name = "thread_local"
Fix RUSTSEC-2022-0006
2022-01-26 21:08:38 +00:00
version = "1.1.4"
update authc
2020-12-28 15:17:43 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Fix RUSTSEC-2022-0006
2022-01-26 21:08:38 +00:00
checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180"
update authc
2020-12-28 15:17:43 +00:00
dependencies = [
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"once_cell",
update authc
2020-12-28 15:17:43 +00:00
]
Started the report of wgpu
2020-08-21 19:10:56 +00:00
[[package]]
name = "thunderdome"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.4.2"
Started the report of wgpu
2020-08-21 19:10:56 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "f685624f172cd0bde6f3363412455e81c018f2379fdf5a218e0be003f1bba642"
Started the report of wgpu
2020-08-21 19:10:56 +00:00
added const tweaker
2020-03-19 17:11:45 +00:00
[[package]]
Clean and update dependencies * Remove tweak feature * Remove const-tweaker * Update tiny_http * Update bitvec to 0.21.0 * Downgrade euc to avoid conflict with vek 0.12.0 * Require exactly vek 0.12.0 * Update all other dependencies automatically based on these changes * Update gilrs to latest at the request of Ada Lovegirls * Update meshing benchmarks to new criterion API
2021-02-15 07:47:28 +00:00
name = "time"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.1.44"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
dependencies = [
"libc",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"wasi 0.10.0+wasi-snapshot-preview1",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"winapi 0.3.9",
]
Bump tracing-subscriber to 0.3.2 We were pulling two versions of it. Causing some compilation errors
2021-11-26 17:41:51 +00:00
[[package]]
name = "time"
version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "41effe7cfa8af36f439fac33861b66b049edc6f9a32331e2312660529c1c24ad"
dependencies = [
"itoa",
"libc",
]
update authc
2020-12-28 15:17:43 +00:00
[[package]]
Clean and update dependencies * Remove tweak feature * Remove const-tweaker * Update tiny_http * Update bitvec to 0.21.0 * Downgrade euc to avoid conflict with vek 0.12.0 * Require exactly vek 0.12.0 * Update all other dependencies automatically based on these changes * Update gilrs to latest at the request of Ada Lovegirls * Update meshing benchmarks to new criterion API
2021-02-15 07:47:28 +00:00
name = "tinytemplate"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
version = "1.2.1"
update authc
2020-12-28 15:17:43 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
update authc
2020-12-28 15:17:43 +00:00
dependencies = [
Clean and update dependencies * Remove tweak feature * Remove const-tweaker * Update tiny_http * Update bitvec to 0.21.0 * Downgrade euc to avoid conflict with vek 0.12.0 * Require exactly vek 0.12.0 * Update all other dependencies automatically based on these changes * Update gilrs to latest at the request of Ada Lovegirls * Update meshing benchmarks to new criterion API
2021-02-15 07:47:28 +00:00
"serde",
"serde_json",
update authc
2020-12-28 15:17:43 +00:00
]
added const tweaker
2020-03-19 17:11:45 +00:00
[[package]]
Clean and update dependencies * Remove tweak feature * Remove const-tweaker * Update tiny_http * Update bitvec to 0.21.0 * Downgrade euc to avoid conflict with vek 0.12.0 * Require exactly vek 0.12.0 * Update all other dependencies automatically based on these changes * Update gilrs to latest at the request of Ada Lovegirls * Update meshing benchmarks to new criterion API
2021-02-15 07:47:28 +00:00
name = "tinyvec"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "1.5.1"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
dependencies = [
"tinyvec_macros",
]
[[package]]
name = "tinyvec_macros"
version = "0.1.0"
added const tweaker
2020-03-19 17:11:45 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
added const tweaker
2020-03-19 17:11:45 +00:00
Began integrating procgen trees
2021-01-03 20:43:07 +00:00
[[package]]
fmt
2021-03-05 01:23:11 +00:00
name = "tokio"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "1.14.0"
Began integrating procgen trees
2021-01-03 20:43:07 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "70e992e41e0d2fb9f755b37446f20900f64446ef54874f40a60c78f021ac6144"
Began integrating procgen trees
2021-01-03 20:43:07 +00:00
dependencies = [
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"autocfg",
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
"bytes",
fmt
2021-03-05 01:23:11 +00:00
"libc",
"memchr",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"mio 0.7.14",
fmt
2021-03-05 01:23:11 +00:00
"num_cpus",
"once_cell",
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
"pin-project-lite",
fmt
2021-03-05 01:23:11 +00:00
"signal-hook-registry",
"tokio-macros",
"winapi 0.3.9",
Began integrating procgen trees
2021-01-03 20:43:07 +00:00
]
[[package]]
fmt
2021-03-05 01:23:11 +00:00
name = "tokio-macros"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "1.6.0"
Began integrating procgen trees
2021-01-03 20:43:07 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "c9efc1aba077437943f7515666aa2b882dfabfbfdf89c819ea75a8d6e9eaba5e"
Began integrating procgen trees
2021-01-03 20:43:07 +00:00
dependencies = [
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"proc-macro2 1.0.32",
"quote 1.0.10",
"syn 1.0.81",
Began integrating procgen trees
2021-01-03 20:43:07 +00:00
]
[[package]]
name = "tokio-rustls"
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
version = "0.22.0"
Began integrating procgen trees
2021-01-03 20:43:07 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6"
Began integrating procgen trees
2021-01-03 20:43:07 +00:00
dependencies = [
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"rustls 0.19.1",
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
"tokio",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"webpki 0.21.4",
added const tweaker
2020-03-19 17:11:45 +00:00
]
Initial switch to tokio for network, minimum working example.
2021-01-13 13:16:22 +00:00
[[package]]
fmt
2021-03-05 01:23:11 +00:00
name = "tokio-stream"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.1.8"
get rid of `async_std::channel` switch to `tokio` and `async_channel` crate. I wanted to do tokio first, but it doesnt feature Sender::close(), thus i included async_channel Got rid of `futures` and only need `futures_core` and `futures_util`. Tokio does not support `Stream` and `StreamExt` so for now i need to use `tokio-stream`, i think this will go in `std` in the future Created `b2b_close_stream_opened_sender_r` as the shutdown procedure does not need a copy of a Sender, it just need to stop it. Various adjustments, e.g. for `select!` which now requieres a `&mut` for oneshots. Future things to do: - Use some better signalling than oneshot<()> in some cases. - Use a Watch for the Prio propergation (impl. it ofc) - Use Bounded Channels in order to improve performance - adjust tests coding bring tests to work
2021-01-15 13:04:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3"
get rid of `async_std::channel` switch to `tokio` and `async_channel` crate. I wanted to do tokio first, but it doesnt feature Sender::close(), thus i included async_channel Got rid of `futures` and only need `futures_core` and `futures_util`. Tokio does not support `Stream` and `StreamExt` so for now i need to use `tokio-stream`, i think this will go in `std` in the future Created `b2b_close_stream_opened_sender_r` as the shutdown procedure does not need a copy of a Sender, it just need to stop it. Various adjustments, e.g. for `select!` which now requieres a `&mut` for oneshots. Future things to do: - Use some better signalling than oneshot<()> in some cases. - Use a Watch for the Prio propergation (impl. it ofc) - Use Bounded Channels in order to improve performance - adjust tests coding bring tests to work
2021-01-15 13:04:32 +00:00
dependencies = [
fmt
2021-03-05 01:23:11 +00:00
"futures-core",
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
"pin-project-lite",
"tokio",
get rid of `async_std::channel` switch to `tokio` and `async_channel` crate. I wanted to do tokio first, but it doesnt feature Sender::close(), thus i included async_channel Got rid of `futures` and only need `futures_core` and `futures_util`. Tokio does not support `Stream` and `StreamExt` so for now i need to use `tokio-stream`, i think this will go in `std` in the future Created `b2b_close_stream_opened_sender_r` as the shutdown procedure does not need a copy of a Sender, it just need to stop it. Various adjustments, e.g. for `select!` which now requieres a `&mut` for oneshots. Future things to do: - Use some better signalling than oneshot<()> in some cases. - Use a Watch for the Prio propergation (impl. it ofc) - Use Bounded Channels in order to improve performance - adjust tests coding bring tests to work
2021-01-15 13:04:32 +00:00
]
update authc
2020-12-28 15:17:43 +00:00
[[package]]
name = "tokio-util"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.6.9"
update authc
2020-12-28 15:17:43 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0"
update authc
2020-12-28 15:17:43 +00:00
dependencies = [
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
"bytes",
update authc
2020-12-28 15:17:43 +00:00
"futures-core",
"futures-sink",
"log",
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
"pin-project-lite",
"tokio",
update authc
2020-12-28 15:17:43 +00:00
]
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
[[package]]
Updated to latest and greatest auth version.
2020-01-01 18:41:42 +00:00
name = "toml"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
version = "0.5.8"
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa"
Updated to latest and greatest auth version.
2020-01-01 18:41:42 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"serde",
Updated to latest and greatest auth version.
2020-01-01 18:41:42 +00:00
]
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
update authc
2020-12-28 15:17:43 +00:00
[[package]]
name = "tower-service"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
version = "0.3.1"
update authc
2020-12-28 15:17:43 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
update authc
2020-12-28 15:17:43 +00:00
first implementation of connect and tcp using a mio worker protocol and: - introduce a loadtest, for tcp messages - cleanup api - added a unittest - prepared a handshake message, which will in next commits get removed again - experimental mio worker merges - using uuid for participant id
2020-01-13 16:53:28 +00:00
[[package]]
name = "tracing"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.1.29"
first implementation of connect and tcp using a mio worker protocol and: - introduce a loadtest, for tcp messages - cleanup api - added a unittest - prepared a handshake message, which will in next commits get removed again - experimental mio worker merges - using uuid for participant id
2020-01-13 16:53:28 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105"
first implementation of connect and tcp using a mio worker protocol and: - introduce a loadtest, for tcp messages - cleanup api - added a unittest - prepared a handshake message, which will in next commits get removed again - experimental mio worker merges - using uuid for participant id
2020-01-13 16:53:28 +00:00
dependencies = [
fmt
2021-03-05 01:23:11 +00:00
"cfg-if 1.0.0",
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
"pin-project-lite",
fix: hot-anim feature
2020-06-24 12:35:52 +00:00
"tracing-attributes",
first implementation of connect and tcp using a mio worker protocol and: - introduce a loadtest, for tcp messages - cleanup api - added a unittest - prepared a handshake message, which will in next commits get removed again - experimental mio worker merges - using uuid for participant id
2020-01-13 16:53:28 +00:00
"tracing-core",
]
Convert voxygen to use tracing There are several noteable changes in this commit that mean that logging will behave differently to how it did previously. - There are now no separate filter levels for terminal and file output. This is a feature that is lacking in `tracing` but is set to be resolved by https://github.com/tokio-rs/tracing/pull/508. At which point we MAY include it. - The default log level was previously `WARN` - it is now `INFO`.
2020-06-21 10:22:26 +00:00
[[package]]
name = "tracing-appender"
Bump tracing-subscriber to 0.3.2 We were pulling two versions of it. Causing some compilation errors
2021-11-26 17:41:51 +00:00
version = "0.2.0"
Convert voxygen to use tracing There are several noteable changes in this commit that mean that logging will behave differently to how it did previously. - There are now no separate filter levels for terminal and file output. This is a feature that is lacking in `tracing` but is set to be resolved by https://github.com/tokio-rs/tracing/pull/508. At which point we MAY include it. - The default log level was previously `WARN` - it is now `INFO`.
2020-06-21 10:22:26 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Bump tracing-subscriber to 0.3.2 We were pulling two versions of it. Causing some compilation errors
2021-11-26 17:41:51 +00:00
checksum = "94571df2eae3ed4353815ea5a90974a594a1792d8782ff2cbcc9392d1101f366"
Convert voxygen to use tracing There are several noteable changes in this commit that mean that logging will behave differently to how it did previously. - There are now no separate filter levels for terminal and file output. This is a feature that is lacking in `tracing` but is set to be resolved by https://github.com/tokio-rs/tracing/pull/508. At which point we MAY include it. - The default log level was previously `WARN` - it is now `INFO`.
2020-06-21 10:22:26 +00:00
dependencies = [
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"crossbeam-channel",
Bump tracing-subscriber to 0.3.2 We were pulling two versions of it. Causing some compilation errors
2021-11-26 17:41:51 +00:00
"time 0.3.5",
"tracing-subscriber",
Convert voxygen to use tracing There are several noteable changes in this commit that mean that logging will behave differently to how it did previously. - There are now no separate filter levels for terminal and file output. This is a feature that is lacking in `tracing` but is set to be resolved by https://github.com/tokio-rs/tracing/pull/508. At which point we MAY include it. - The default log level was previously `WARN` - it is now `INFO`.
2020-06-21 10:22:26 +00:00
]
fix: hot-anim feature
2020-06-24 12:35:52 +00:00
[[package]]
name = "tracing-attributes"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.1.18"
fix: hot-anim feature
2020-06-24 12:35:52 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e"
fix: hot-anim feature
2020-06-24 12:35:52 +00:00
dependencies = [
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"proc-macro2 1.0.32",
"quote 1.0.10",
"syn 1.0.81",
fix: hot-anim feature
2020-06-24 12:35:52 +00:00
]
first implementation of connect and tcp using a mio worker protocol and: - introduce a loadtest, for tcp messages - cleanup api - added a unittest - prepared a handshake message, which will in next commits get removed again - experimental mio worker merges - using uuid for participant id
2020-01-13 16:53:28 +00:00
[[package]]
name = "tracing-core"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.1.21"
first implementation of connect and tcp using a mio worker protocol and: - introduce a loadtest, for tcp messages - cleanup api - added a unittest - prepared a handshake message, which will in next commits get removed again - experimental mio worker merges - using uuid for participant id
2020-01-13 16:53:28 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4"
first implementation of connect and tcp using a mio worker protocol and: - introduce a loadtest, for tcp messages - cleanup api - added a unittest - prepared a handshake message, which will in next commits get removed again - experimental mio worker merges - using uuid for participant id
2020-01-13 16:53:28 +00:00
dependencies = [
"lazy_static",
]
Convert voxygen to use tracing There are several noteable changes in this commit that mean that logging will behave differently to how it did previously. - There are now no separate filter levels for terminal and file output. This is a feature that is lacking in `tracing` but is set to be resolved by https://github.com/tokio-rs/tracing/pull/508. At which point we MAY include it. - The default log level was previously `WARN` - it is now `INFO`.
2020-06-21 10:22:26 +00:00
[[package]]
name = "tracing-log"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
version = "0.1.2"
Convert voxygen to use tracing There are several noteable changes in this commit that mean that logging will behave differently to how it did previously. - There are now no separate filter levels for terminal and file output. This is a feature that is lacking in `tracing` but is set to be resolved by https://github.com/tokio-rs/tracing/pull/508. At which point we MAY include it. - The default log level was previously `WARN` - it is now `INFO`.
2020-06-21 10:22:26 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
checksum = "a6923477a48e41c1951f1999ef8bb5a3023eb723ceadafe78ffb65dc366761e3"
Convert voxygen to use tracing There are several noteable changes in this commit that mean that logging will behave differently to how it did previously. - There are now no separate filter levels for terminal and file output. This is a feature that is lacking in `tracing` but is set to be resolved by https://github.com/tokio-rs/tracing/pull/508. At which point we MAY include it. - The default log level was previously `WARN` - it is now `INFO`.
2020-06-21 10:22:26 +00:00
dependencies = [
"lazy_static",
"log",
"tracing-core",
]
first implementation of connect and tcp using a mio worker protocol and: - introduce a loadtest, for tcp messages - cleanup api - added a unittest - prepared a handshake message, which will in next commits get removed again - experimental mio worker merges - using uuid for participant id
2020-01-13 16:53:28 +00:00
[[package]]
name = "tracing-subscriber"
Fix RUSTSEC-2022-0006
2022-01-26 21:08:38 +00:00
version = "0.3.7"
first implementation of connect and tcp using a mio worker protocol and: - introduce a loadtest, for tcp messages - cleanup api - added a unittest - prepared a handshake message, which will in next commits get removed again - experimental mio worker merges - using uuid for participant id
2020-01-13 16:53:28 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Fix RUSTSEC-2022-0006
2022-01-26 21:08:38 +00:00
checksum = "5312f325fe3588e277415f5a6cca1f4ccad0f248c4cd5a4bd33032d7286abc22"
first implementation of connect and tcp using a mio worker protocol and: - introduce a loadtest, for tcp messages - cleanup api - added a unittest - prepared a handshake message, which will in next commits get removed again - experimental mio worker merges - using uuid for participant id
2020-01-13 16:53:28 +00:00
dependencies = [
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"ansi_term 0.12.1",
first implementation of connect and tcp using a mio worker protocol and: - introduce a loadtest, for tcp messages - cleanup api - added a unittest - prepared a handshake message, which will in next commits get removed again - experimental mio worker merges - using uuid for participant id
2020-01-13 16:53:28 +00:00
"lazy_static",
"matchers",
"regex",
"sharded-slab",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"smallvec",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"thread_local",
Bump tracing-subscriber to 0.3.2 We were pulling two versions of it. Causing some compilation errors
2021-11-26 17:41:51 +00:00
"time 0.3.5",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"tracing",
first implementation of connect and tcp using a mio worker protocol and: - introduce a loadtest, for tcp messages - cleanup api - added a unittest - prepared a handshake message, which will in next commits get removed again - experimental mio worker merges - using uuid for participant id
2020-01-13 16:53:28 +00:00
"tracing-core",
Convert voxygen to use tracing There are several noteable changes in this commit that mean that logging will behave differently to how it did previously. - There are now no separate filter levels for terminal and file output. This is a feature that is lacking in `tracing` but is set to be resolved by https://github.com/tokio-rs/tracing/pull/508. At which point we MAY include it. - The default log level was previously `WARN` - it is now `INFO`.
2020-06-21 10:22:26 +00:00
"tracing-log",
first implementation of connect and tcp using a mio worker protocol and: - introduce a loadtest, for tcp messages - cleanup api - added a unittest - prepared a handshake message, which will in next commits get removed again - experimental mio worker merges - using uuid for participant id
2020-01-13 16:53:28 +00:00
]
Intial setup of tracy
2020-08-25 08:18:41 +00:00
[[package]]
name = "tracing-tracy"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.8.0"
Intial setup of tracy
2020-08-25 08:18:41 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "773057bb2b440e868776522a0587f732b1125116f12aca0eb37dea48d55ad2cd"
Intial setup of tracy
2020-08-25 08:18:41 +00:00
dependencies = [
"tracing-core",
Bump tracing-subscriber to 0.3.2 We were pulling two versions of it. Causing some compilation errors
2021-11-26 17:41:51 +00:00
"tracing-subscriber",
massivly switch clock algorithm. - before we had a Clock that tried to average multiple ticks and predict the next sleep. This system is massivly bugged. a) We know exactly how long the busy time took, so we dont need to predict anything in the first place b) Preduction was totally unrealistic after a single lag spike c) When a very slow tick happens, we dont benefit from 10 fast ticks. - Instead we just try to keep the tick time exact what we expect. If we can't manage a constant tick time because we are to slow, the systems have to "catch" this via the `dt` anyway.
2020-11-10 12:30:01 +00:00
"tracy-client",
ci cleanup, dependency update
2020-11-06 13:14:54 +00:00
]
[[package]]
name = "tracy-client"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.12.6"
ci cleanup, dependency update
2020-11-06 13:14:54 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "62c0e37fbf87980abd5c35c3d86fd150c5ed349c3ae90959ba1877c799388203"
ci cleanup, dependency update
2020-11-06 13:14:54 +00:00
dependencies = [
massivly switch clock algorithm. - before we had a Clock that tried to average multiple ticks and predict the next sleep. This system is massivly bugged. a) We know exactly how long the busy time took, so we dont need to predict anything in the first place b) Preduction was totally unrealistic after a single lag spike c) When a very slow tick happens, we dont benefit from 10 fast ticks. - Instead we just try to keep the tick time exact what we expect. If we can't manage a constant tick time because we are to slow, the systems have to "catch" this via the `dt` anyway.
2020-11-10 12:30:01 +00:00
"tracy-client-sys",
Intial setup of tracy
2020-08-25 08:18:41 +00:00
]
ci cleanup, dependency update
2020-11-06 13:14:54 +00:00
[[package]]
name = "tracy-client-sys"
update dependencies
2021-06-04 07:44:30 +00:00
version = "0.16.0"
ci cleanup, dependency update
2020-11-06 13:14:54 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies
2021-06-04 07:44:30 +00:00
checksum = "6226e4e77f0d46ce7ebb0a4b1daa82790035248b75bbf605b932a1d7b3b22b6d"
ci cleanup, dependency update
2020-11-06 13:14:54 +00:00
dependencies = [
"cc",
]
Updating Cargo.lock for sanity.
2020-01-11 22:10:08 +00:00
[[package]]
name = "treeculler"
update deps
2021-04-10 13:53:00 +00:00
version = "0.2.0"
change treeculler crate from git to published version
2020-08-06 22:53:49 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update deps
2021-04-10 13:53:00 +00:00
checksum = "82449b48a3494420dd1b11081f198c542f795a036246da4a9c5845b7d7427226"
Updating Cargo.lock for sanity.
2020-01-11 22:10:08 +00:00
dependencies = [
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"num-traits",
update dependencies
2021-03-21 21:53:44 +00:00
"vek",
Updating Cargo.lock for sanity.
2020-01-11 22:10:08 +00:00
]
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
[[package]]
name = "try-lock"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
[[package]]
name = "ttf-parser"
version = "0.6.2"
Made boulders avoid rivers
2020-08-29 07:53:42 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
checksum = "3e5d7cd7ab3e47dda6e56542f4bbf3824c15234958c6e1bd6aaa347e93499fdc"
Made boulders avoid rivers
2020-08-29 07:53:42 +00:00
Add support for TextInput widget, rename widgets module to widget, update to glyph_brush 0.7.0
2020-05-29 04:40:22 +00:00
[[package]]
name = "ttf-parser"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.13.2"
Add support for TextInput widget, rename widgets module to widget, update to glyph_brush 0.7.0
2020-05-29 04:40:22 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "3e835d06ed78a500d3d0e431a20c18ff5544b3f6e11376e834370cfd35e8948e"
Add support for TextInput widget, rename widgets module to widget, update to glyph_brush 0.7.0
2020-05-29 04:40:22 +00:00
Made the server cli great
2020-07-27 16:26:34 +00:00
[[package]]
name = "tui"
version = "0.10.0"
Fix all the problems with the tui
2020-09-01 14:33:41 +00:00
source = "git+https://github.com/fdehau/tui-rs.git?branch=paragraph-scroll#54b841fab6cfdb38e8dc1382176e965787964b4c"
Made the server cli great
2020-07-27 16:26:34 +00:00
dependencies = [
"bitflags",
"cassowary",
update further crates
2020-12-16 00:07:39 +00:00
"crossterm 0.17.7",
Made the server cli great
2020-07-27 16:26:34 +00:00
"unicode-segmentation",
"unicode-width",
]
first implementation of prometheus in veloren for git hash, tick times, chunks loaded, player online, entity count and light count
2019-09-06 14:21:09 +00:00
[[package]]
switch from hyper http to rouille for http server
2019-09-08 23:59:19 +00:00
name = "tuple_utils"
Upgrade to specs 0.15.1
2019-11-30 06:41:20 +00:00
version = "0.3.0"
first implementation of prometheus in veloren for git hash, tick times, chunks loaded, player online, entity count and light count
2019-09-06 14:21:09 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "44834418e2c5b16f47bedf35c28e148db099187dd5feee6367fb2525863af4f1"
first implementation of prometheus in veloren for git hash, tick times, chunks loaded, player online, entity count and light count
2019-09-06 14:21:09 +00:00
Propper Compression support of network. - Compression is no longer enabled always but can now be enabled per Stream. If a Stream is Compression enabled it will compress and decompress all msg (except for `raw` access) before handling them internally. You need to handle compression yourself for `raw` fn. - added a new feature to the network crate to enable or disable the compression - switched to `lz-fear` instead of `lz4-compression` - use `bitflags` to represent the `Promises` struct
2020-08-25 13:32:42 +00:00
[[package]]
name = "twox-hash"
update crates
2021-09-20 10:05:41 +00:00
version = "1.6.1"
Propper Compression support of network. - Compression is no longer enabled always but can now be enabled per Stream. If a Stream is Compression enabled it will compress and decompress all msg (except for `raw` access) before handling them internally. You need to handle compression yourself for `raw` fn. - added a new feature to the network crate to enable or disable the compression - switched to `lz-fear` instead of `lz4-compression` - use `bitflags` to represent the `Promises` struct
2020-08-25 13:32:42 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "1f559b464de2e2bdabcac6a210d12e9b5a5973c251e102c44c585c71d51bd78e"
Initial setup to use iced
2019-12-15 17:13:52 +00:00
dependencies = [
Make sure ui draw commands are cleared if the renderer's resolution changes
2021-10-04 19:51:36 +00:00
"cfg-if 1.0.0",
update crates
2021-09-20 10:05:41 +00:00
"rand 0.8.4",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"static_assertions",
Initial setup to use iced
2019-12-15 17:13:52 +00:00
]
Propper Compression support of network. - Compression is no longer enabled always but can now be enabled per Stream. If a Stream is Compression enabled it will compress and decompress all msg (except for `raw` access) before handling them internally. You need to handle compression yourself for `raw` fn. - added a new feature to the network crate to enable or disable the compression - switched to `lz-fear` instead of `lz4-compression` - use `bitflags` to represent the `Promises` struct
2020-08-25 13:32:42 +00:00
point to github specs to access PairedStorage type, fix Loadout sync spam
2020-07-06 05:56:02 +00:00
[[package]]
name = "tynm"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
version = "0.1.6"
point to github specs to access PairedStorage type, fix Loadout sync spam
2020-07-06 05:56:02 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "a4df2caa2dc9c3d1f7641ba981f4cd40ab229775aa7aeb834c9ab2850d50623d"
point to github specs to access PairedStorage type, fix Loadout sync spam
2020-07-06 05:56:02 +00:00
dependencies = [
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"nom 5.1.2",
point to github specs to access PairedStorage type, fix Loadout sync spam
2020-07-06 05:56:02 +00:00
]
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
[[package]]
name = "typenum"
update crates
2021-09-20 10:05:41 +00:00
version = "1.14.0"
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec"
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
- add Polaris Lantern, created by Gemu and Uncomfy for Christmas
2021-12-11 23:42:15 +00:00
[[package]]
name = "uncased"
version = "0.9.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5baeed7327e25054889b9bd4f975f32e5f4c5d434042d59ab6cd4142c0a76ed0"
dependencies = [
"version_check 0.9.3",
]
first implementation of prometheus in veloren for git hash, tick times, chunks loaded, player online, entity count and light count
2019-09-06 14:21:09 +00:00
[[package]]
switch from hyper http to rouille for http server
2019-09-08 23:59:19 +00:00
name = "unicode-bidi"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.3.7"
first implementation of prometheus in veloren for git hash, tick times, chunks loaded, player online, entity count and light count
2019-09-06 14:21:09 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f"
first implementation of prometheus in veloren for git hash, tick times, chunks loaded, player online, entity count and light count
2019-09-06 14:21:09 +00:00
[[package]]
switch from hyper http to rouille for http server
2019-09-08 23:59:19 +00:00
name = "unicode-normalization"
update dependencies
2021-06-04 07:44:30 +00:00
version = "0.1.19"
first implementation of prometheus in veloren for git hash, tick times, chunks loaded, player online, entity count and light count
2019-09-06 14:21:09 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies
2021-06-04 07:44:30 +00:00
checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9"
first implementation of prometheus in veloren for git hash, tick times, chunks loaded, player online, entity count and light count
2019-09-06 14:21:09 +00:00
dependencies = [
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"tinyvec",
first implementation of prometheus in veloren for git hash, tick times, chunks loaded, player online, entity count and light count
2019-09-06 14:21:09 +00:00
]
Dis some distance and attack arc tweaking
2020-07-03 00:45:30 +00:00
[[package]]
name = "unicode-segmentation"
update depednencies
2021-07-08 10:21:02 +00:00
version = "1.8.0"
Dis some distance and attack arc tweaking
2020-07-03 00:45:30 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update depednencies
2021-07-08 10:21:02 +00:00
checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b"
Dis some distance and attack arc tweaking
2020-07-03 00:45:30 +00:00
Play random music whenever a track ends To support this, a global_state.maintain() method was added that calls audio.maintain(). Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a
2019-05-18 19:28:12 +00:00
[[package]]
name = "unicode-width"
update crates
2021-09-20 10:05:41 +00:00
version = "0.1.9"
Play random music whenever a track ends To support this, a global_state.maintain() method was added that calls audio.maintain(). Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a
2019-05-18 19:28:12 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
Play random music whenever a track ends To support this, a global_state.maintain() method was added that calls audio.maintain(). Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a
2019-05-18 19:28:12 +00:00
Add Linux support
2019-06-19 19:25:08 +00:00
[[package]]
name = "unicode-xid"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
Remove vek patch, it's on crates.io now
2019-08-26 12:21:04 +00:00
[[package]]
name = "unicode-xid"
update dependencies
2021-06-04 07:44:30 +00:00
version = "0.2.2"
Remove vek patch, it's on crates.io now
2019-08-26 12:21:04 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies
2021-06-04 07:44:30 +00:00
checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
Remove vek patch, it's on crates.io now
2019-08-26 12:21:04 +00:00
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
[[package]]
name = "unidiff"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d8a62719acf1933bfdbeb73a657ecd9ecece70b405125267dd549e2e2edc232c"
dependencies = [
"encoding_rs",
"lazy_static",
"regex",
]
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
[[package]]
name = "untrusted"
fix workspaces and Cargo dependencies
2020-05-27 16:20:16 +00:00
version = "0.7.1"
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
fix workspaces and Cargo dependencies
2020-05-27 16:20:16 +00:00
checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
Began integrating procgen trees
2021-01-03 20:43:07 +00:00
[[package]]
name = "url"
update dependencies
2021-06-04 07:44:30 +00:00
version = "2.2.2"
[i18n] Configurable fonts - Add font configuration in internationalization files - Scale font size using a configurable ratio - Add a script to identify translation item statuses using Git metadata - Execute the i18n script in a new gitlab-ci step (delayed) - Clone haxrcorp_4089_cyrillic_altgr font (haxrcorp_4089_cyrillic_altgr_extended) to add some additional latin characters (mainly for French)
2020-01-26 19:29:46 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies
2021-06-04 07:44:30 +00:00
checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"
[i18n] Configurable fonts - Add font configuration in internationalization files - Scale font size using a configurable ratio - Add a script to identify translation item statuses using Git metadata - Execute the i18n script in a new gitlab-ci step (delayed) - Clone haxrcorp_4089_cyrillic_altgr font (haxrcorp_4089_cyrillic_altgr_extended) to add some additional latin characters (mainly for French)
2020-01-26 19:29:46 +00:00
dependencies = [
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"form_urlencoded",
"idna",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"matches",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"percent-encoding",
[i18n] Configurable fonts - Add font configuration in internationalization files - Scale font size using a configurable ratio - Add a script to identify translation item statuses using Git metadata - Execute the i18n script in a new gitlab-ci step (delayed) - Clone haxrcorp_4089_cyrillic_altgr font (haxrcorp_4089_cyrillic_altgr_extended) to add some additional latin characters (mainly for French)
2020-01-26 19:29:46 +00:00
]
Draft of botclient.
2021-03-10 18:32:45 +00:00
[[package]]
name = "utf8parse"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372"
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
[[package]]
name = "uuid"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
version = "0.8.2"
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
dependencies = [
update dependencies
2021-06-04 07:44:30 +00:00
"getrandom 0.2.3",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"serde",
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
]
[i18n] Configurable fonts - Add font configuration in internationalization files - Scale font size using a configurable ratio - Add a script to identify translation item statuses using Git metadata - Execute the i18n script in a new gitlab-ci step (delayed) - Clone haxrcorp_4089_cyrillic_altgr font (haxrcorp_4089_cyrillic_altgr_extended) to add some additional latin characters (mainly for French)
2020-01-26 19:29:46 +00:00
[[package]]
name = "vcpkg"
update depednencies
2021-07-08 10:21:02 +00:00
version = "0.2.15"
[i18n] Configurable fonts - Add font configuration in internationalization files - Scale font size using a configurable ratio - Add a script to identify translation item statuses using Git metadata - Execute the i18n script in a new gitlab-ci step (delayed) - Clone haxrcorp_4089_cyrillic_altgr font (haxrcorp_4089_cyrillic_altgr_extended) to add some additional latin characters (mainly for French)
2020-01-26 19:29:46 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update depednencies
2021-07-08 10:21:02 +00:00
checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
[i18n] Configurable fonts - Add font configuration in internationalization files - Scale font size using a configurable ratio - Add a script to identify translation item statuses using Git metadata - Execute the i18n script in a new gitlab-ci step (delayed) - Clone haxrcorp_4089_cyrillic_altgr font (haxrcorp_4089_cyrillic_altgr_extended) to add some additional latin characters (mainly for French)
2020-01-26 19:29:46 +00:00
Added Controller support
2020-03-10 21:00:13 +00:00
[[package]]
name = "vec_map"
fix workspaces and Cargo dependencies
2020-05-27 16:20:16 +00:00
version = "0.8.2"
Added Controller support
2020-03-10 21:00:13 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
fix workspaces and Cargo dependencies
2020-05-27 16:20:16 +00:00
checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
Added Controller support
2020-03-10 21:00:13 +00:00
fmt
2021-03-05 01:23:11 +00:00
[[package]]
name = "vek"
version = "0.14.1"
source = "git+https://gitlab.com/veloren/vek.git?branch=fix_intrinsics2#df6842cc874a697dec8896c66851817e744af7e8"
dependencies = [
"approx 0.4.0",
"num-integer",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"num-traits",
update dependencies
2021-06-04 07:44:30 +00:00
"rustc_version 0.2.3",
(See sharp/lod-history) LOD, shadows, greedy meshing, new lighting, perf --- Pretty much a Veloren fork at this point. Here's a high level overview of the changes (will be added to CHANGELOG just before merge). At a high level this MR incorporates roughly two groups of changes. The first group consists of new game features: more flexible map sizes, level of detail terrain, shadow maps, and a new lighting engine. This is "feature work" that (mostly) only adds new things to Veloren, and mostly shouldn't affect old stuff. The second big group of changes are those addressing the fallout from all the new features. These include performance fixes of various sorts: the addition of multiple graphics options and optimization of the cheap ones to avoid work, switching all voxel models to use some variant of greedy meshing, switching over much of our CPU-side vector math to exploit SIMD instructions (coinciding with a fork of `vek`), and a rewrite of how the UI handles text rendering (coinciding with updates to our fork of `conrod`). Making Veloren's hardcoded colors appear correct under the new lighting engine also required considerably changes (TODO: Fill in this section when it's complete). The second category of changes often heavily touches code owned by other people, including frequently modified code "owned" by a handful of people, so I recommend that this code be reviewed particularly carefully. --- At a high level (each will be described in more detail below): - The world map has been refactored. - The world size is no longer hardcoded (@zesterer). - The map generation code was made generic to allow using it outside of the `world` crate (@zesterer). - On world creation, we now compute *horizon maps* (@zesterer). - The way we pass the world from the server to the client has been updated (@xMAC94x). - Artifacts related to image rotation were fixed (@imbris). - Multiflow rivers were enabled (@zesterer). - In the process of making changes related to the world map, various incidental fixes and optimizations were required. - The new *level of detail* feature was added (@zesterer wrote part of this and has checked out the rest). - A new LOD terrain rendering step was added to the pipeline. - The LOD terrain quality was made configurable via a graphics setting. - Horizon maps were used to cast shadows from LOD chunks on both LOD and non-LOD terrain. - A "voxelization" effect was incorporated into rendered LOD terrain to make it blend better into the world. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Veloren's lighting has been completely overhauled (@zesterer has already checked most of this out). - A semi-accurate index of refraction was assigned to our materials. - A new, more realistic, physically based approach to lighting was used using the *Ashikhmin Shirley* BRDF. - We emulate *atmospheric scattering* using equations designed for measuring solar panel light exposure. - We attempt to compute *realistic light attenuation* in water using its real material properties. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Point and directional lights now cast realistic shadows, using *shadow mapping.* (@imbris, @zesterer, @Treeco, @YuriMomo) - Point light shadow maps were added to the rendering pipeline, using geometry shaders and *seamless cube maps*. - Directional light shadows were added to the rendering pipeline, using LISPSM together with disabling *depth clamping*. - "Shadow-only" chunks and NPCs were added to prevent shadows from models behind you from disappearing. - In the process of making changes related to shadow maps, various incidental fixes and optimizations were required. The addition of shadow maps, LOD terrain, and the new lighting all led to significant performance degradation, on top of other changes happening in master. Therefore, a large number of performance improvements were also needed: - The graphics options were made much more flexible and configurable, and shaders were optimize. - New options were provided for how to render lights and shadows (@Pfauenauge, @zesterer). - Graphic setting storage and configuration were overhauled to make adding new features easier (@Pfauenauge, @imbris). - Shaders were rewritten to utilize GLSL's preprocessor to avoid overhead (@zesterer, @YuriMomo). - In the process of making changes related to providing additional rendering options, various incidental fixes and optimizations were required. - Voxel model creation was switched to use *greedy meshing.* - A new voxel meshing method, greedy meshing, was added (@imbris). - Uses of the older meshing methods were migrated to use greedy meshing (@imbris, @jshipsey, @Pfauenauge). - New restrictions were added to terrain, figure, and sprites to future proof them for further optimizations (@jshipsey, @Pfauenauge, @zesterer). - Most positions are now relative to either chunk or player position for better precision (@imbris, @zesterer, @scottc). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - Animation and terrain math were switched to use SIMD where possible. - Fixes were made to vek to make its SIMD feature usable for us (@zesterer, @imbris). - The interface and types used in bone animation were changed in various ways (@jshipsey, @Snowram, @Pfauenauge). - Redundant code generation for body animation is now partly taken care of by a macro (@jshipsey, @Snowram, @Pfauenauge). - Animation code was modified to to use vek's SIMD representation where possible (@jshipsey, @Snowram, @Pfauenauge). - Terrain meshing code and shadow map math were also modified to use vek's SIMD representation (@imbris). - SIMD instruction generation was enabled (@YuriMomo, @jshipsey, @Snowram, @imbris, @Angelonfira, @xMAC94x). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - The way we cache glyphs was completely refactored, fixed, and optimized. - Our fork of `conrod` was optimized in various ways (@imbris). - Our fork of `conrod` now exposes whether a widget was updated during the current frame (@imbris). - Our use of the glyph cache was rewritten for correctness (@imbris). - A *text cache* was introduced that lets us skip remeshing glyphs that have not changed (@imbris). - Various changes were made to reduce pressure on the glyph cache, with more planned (@imbris, @Pfauenauge). - In the process of making changes related to the glyph cache, various incidental fixes and optimizations were required. - Colors were changed to keep Veloren's look consistent with master. - Some older tree models were brought back (@Pfauenauge). - TODO(@Sharp): All hardcoded colors were extracted and made hotloadable. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Hardcoded colors were fixed to conform to Veloren's style. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Color models were fixed to conform to Veloren's style. A detailed description of the involved changes follows. --- - The world size is no longer hardcoded. All functions dependent on world size now take a `WorldSizeLg`, which holds the base 2 logarithm of each actual world dimension and is guaranteed to maintain certain properties (outlined in `common/src/terrain/map.rs`). Additionally, many utility functions that utilize the world size were moved into `common` as well (mostly `common/src/terrain/mod.rs`). Finally, the world map format was updated in order to store its size explicitly, with a migration path from the old format that should work whenever the old formatted map was a square (practically always). See `world/src/sim/mod.rs` for these changes. - The map generation code was made generic to allow using it outside of the `world` crate. The parts of the map generating code that do not need to query the world were moved over to `common/src/terrain/map.rs`, allowing them to be used from the client without creating a dependency on `world`. The rest of it was turned into helper functions in `world/src/sim/map.rs`, which can be passed as closures to the generic map generation code to complete its construction. This also means that colors are now passed in separately to the map generation function. See <https://veloren.net/devblog-78/> for more details. - On world creation, we now compute *horizon maps*. See the function in `world/src/sim/util.rs`. Given a height map and a plane intersecting that height map, our horizon maps allow us to encode enough information to reconstruct shadows for each point on the height map using only the *horizon angle* (the angle at which the sun starts to become visible). As Veloren's sun only covers one plane, this is sufficient for encoding sun shadows for LOD terrain, by encoding two angles per chunk (one for each 90 degrees the sun covers). We can also use this for the moon, if we want, since the moon follows the same path. Additionally, we store the *height* of the furthest occluder, to try to make the shadows volumetric; so this means 4 bytes in total for each chunk. Support for horizon maps has been merged into the map functionality in common as well. - The way we pass the world from the server to the client has been updated. Rather than passing the prerendered map, we instead pass three maps with values for each chunk; one with the color information, a second with altitude information, and a third with horizon map information. We then reconstruct the map on the client, together with some additional information we send from the server (like the sea level and maximum height). See `common/src/msg/server.rs` for a detailed description of the format of `WorldMapMsg`, and `server/src/libr.rs` and `client/src/lib.rs` for details of the map construction and parsing. - Artifacts related to image rotation were fixed. See the commit message for commit SHA `cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e` for a detailed explanation. This involved changes to shaders, the addition of a new type of graphic (also reflected in the graphic cache) that allows specifying a border color (which automatically makes the associated texture immutable), and some related fixes. I reproduce the first two paragraphs of the MR description as well: ``` Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). ``` - Multiflow rivers were enabled. This does not really need to be part of this MR, and would be easy to revert, but since it seemed to provide a nice improvement it's currently packaged with it. We already computed multiple outflows from each chunk for erosion purposes long before this MR. However, we never modified river rendering to be able to handle this case (just a single downhill river flow is complex enough!) so this was not exposed when deciding which chunks were rivers. Now that - In the process of making changes related to the world map, various incidental fixes and optimizations were required. Some examples of fixes include making sure terrain is never lowered to below sea level (to make the shadow maps report correct values), fixing map altitudes and colors to understand things like cliffs and "block level" coloring (that doesn'te xist on the column level), and fixing a crashbug when rendering images for the UI where source pixels are strongly rectangular. Some examples of related performance fixes include avoiding allocating a fresh vector for all the maps (i.e. copying it over to change the format from `[u32; n]` to `DynamicImage` and then copying again to convert to `RgbaImage`), and instead using the `gfx::memory::slice` function to accomplish the same thing. These sorts of changes are spread all arond the code. This includes the additon of a new scene, `voxygen/src/scene/lod.rs`, a new pipeline `voxygen/src/render/pipeline/lod_terrain.rs`, and new shaders `assets/vxygen/shaders/lod-terrain-vert.glsl` and `assets/vxygen/shaders/lod-terrain-frag.glsl`, as well as associated changes to the renderer in `voxygen/src/render/renderer.rs`. The main idea behind our initial approach to LOD was to take the world data we now get from the server (altitude, color, and horizon mapping). - Some previously computed values were turned into shader uniforms for better prediction on weak processors. (@zesterer) - Calls to power or trig functions were removed or replaced with multiplications, where possible. - After some deliberation - To properly handle sprite "waving" for nearby sprites, We explicitly designed the greedy meshing system with figures and sprites in mind. In both cases, we want to be able to *efficiently* pack many different models into the same texture, especially in cases where we know we will either not be removing any of the grouped-together from the models from the texture, or will remove all of them at once (so they can be packed into some specific subtexture). For sprites, since we know every model in advance and never intend to deallocate them, we currently pack them all as efficiently as possible into one giant tetxure atlas. However, in the future we might opt to pack them slightly less efficiently in exchange for shrinking the sprite vertex size. For figures, we pack all the textures for each *model* into the same atlas. is a global texture atlas used for every sprite, and for figures which is why we have the ability to mesh multiple models to the same texture area (using the simple texture atlas allocator) without requiring intermediate vector allocations. This is accomplished by delaying the time when we actually write the color and light data to the texture until *after* all the model vertices have been meshed; then, we can just allocate the whole color/light array at once, making the atlas we use an exact fit. In computer science-y terms, we accomplish this delay by, after we perform the initial greedy meshing (without texture information), not continuing to create the texture data, but instead constructing a *continuation*--that is, a function that, when called, will execute the rest of the computation. We push this continuation (which in Rust terms is a `FnOnce` closure that takes the `ColLightsInfo` that it is supposed to write to as context) onto a onto a vector resizing. To allow for suspended writes to texture data, Rust pointed out to me that the continuation that would eventually write the color and light data to the texture atlas (the one that is shared by all models sharing the same greedy mesher) would have to *own* whatever data it mshed. Because we often generate the model data to mesh as a temporary in `voxygen/src/load.rs`, the - Matrix multiplications in the shader were reduced for figure data (@zesterer). - Vertex "waves" for fluid data were removed. - Terrain "bending" near edges was removed. - Scaling was fixed to make sure empty space was not introduced in a space previously occupied by a block. It was also changed to take ownership of its voxel data, rather than sharing it, to let it be used with meshing. - Rust's nightly version was bumped in order to use the `array_map` function, which lets us reuse more code between the simple map and `FigureModelCache`. - PositionedGlyph::standalone. --- I tried to cite sources in many cases[^realtime],[^lloyd],[^lispsm],[^pbrt],[^greedy],[^tjunctions] where I needed features from elsewhere but I am particularly grateful for the following resources, esepcially where they have accompanying source code. I linked all of them that are accessible to the public (those that are not were obtained through legal means). [^realtime]: Eisemann, Elmar, Michael Schwarz, Ulf Assarsson, Michael Wimmer. Real-Time Shadows. A K Peters/CRC Press (T&F), 20160419. [^lloyd]: Lloyd,B. 2007. [Logarithmic perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). PhD thesis, University of North Carolina. [^lispsm]: Wimmer, M., Scherzer, D., and Purgathofer, W. 2004. [Light space perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). In Proceedings of Eurographics Symposium on Rendering 2004, pp. 143– 152. [^pbrt]: Pharr, Matt, et al. [http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf](Physically Based Rendering: From Theory to Implementation). Third edition, Morgan Kaufmann Publishers/Elsevier, 2017. [^greedy]: mikolalysenko. “Meshing in a Minecraft Game.” 0 FPS, 30 June 2012, <https://0fps.net/2012/06/30/meshing-in-a-minecraft-game/>. [^tjunctions]: blackflux. “Meshing in Voxel Engines – Part 1.” Blackflux.Com, 23 Feb. 2014, <https://blackflux.wordpress.com/2014/02/23/meshing-in-voxel-engines-part-1/>. I am also especially grateful to Khronos, Wikiepdia, and stackoverflow for answering many of my specific questions while writing the MR. --- Squashed commit of the following: commit 300505e7305a2fdac722a808ee8538323f215f39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 18:46:25 2020 +0200 Fixing cargo doc and typo in CHANGELOG. commit ec0aeb18e8499d7d84ef818331b4b65c3d76cea6 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 15:38:50 2020 +0200 Hopefully final commit for the LOD branch. commit 5e8ea0b1eaac02903a02feb2eb038d195de4872f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 10:14:26 2020 +0200 Falling back to power as stopgap. commit e44a1cbf46504ee9931a01bdc9033e145500d557 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 09:25:41 2020 +0200 Address imbris feedback. Temporarily disables shiny water, lowers max VD. These restrictions will be lifted soon after merging. commit 561e25778a108ac3712f5ec2ce3a51234c4430d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 08:31:13 2020 +0200 Tweaking shaders a bit. commit 7d19259078ce0dd7b3742ad7d0cb3fab3ece3fdc Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:59:43 2020 +0200 Fix view example as well. commit 051cd4934e0fad2c0b15db4380a4189fa318679f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:29:06 2020 +0200 Fix meshing benchmark. commit c95e07db3b4dcca285678985e65e31b927cb1c61 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 05:46:22 2020 +0200 Address MR feedback, fix scene clouds. commit 1bfb816cabdb3ffc1e507a009c2d98696b4b573a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:39:36 2020 +0200 Incorporating Pfau's figure color changes. New eyes and new humanoid colors. commit 3f9b89a3ac7b3356b1dba0d1a8f6541357f81469 Merge: e2f5162e4 62c53963a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:29:41 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit e2f5162e4f96f4124aa43488f7245d341b3dcfd4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:28:38 2020 +0200 World colors are all hotloadable. They live in assets/world/style/colors.ron. Only a small handful of hardcoed colors remain in World; they are either part of the map, or difficult to disentangle from the rest of the computation. Comments are made where appropriate. commit 62c53963abe1975009d34a8f9515a355bef24f31 Author: Marcel Märtens <marcel.cochem@googlemail.com> Date: Wed Aug 19 15:59:00 2020 +0200 replace pretty_env_logger with tracing commit 5b1625f99d9586fe80e2232f583ec5af9f953099 Merge: d71003acd 4942b5b39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:15:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit d71003acdabeff970b3928e97c26af6847b5b78e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:14:34 2020 +0200 Hotloading colors, part 1: colors in common. Currently, this just entails humanoid colors. There are only three colors not handled; the light emitter colors in common/src/comp/inventory/item/tool.rs. These don't seem important enough to me to warrant making hotloadable, at least not right now, but if it's needed later we can always add them to the file. commit 63b5e0e553eb2ea49276f192a6fc7dd65254270d Merge: c32b337a4 6d2c4b9c1 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 13:05:37 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c32b337a46e10d9de473d178a94a3ccd61c39bb3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:52:04 2020 +0200 Fixing LOD grid, for real. commit a166ae0360395387e09fb35a1f84210c2ce5ec24 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:28:05 2020 +0200 Addressing imbris's initial feedback. Fixes two minor bugs: explosion particles were no longer spawning randomly, and LOD grids were not perfectly even. commit 4cbad004f44060994252dd3d38647a14a589712f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:27:58 2020 +0200 Bumping nightly per request. commit 548680276aac77c25d43d16b5622f847d474dbef Merge: acc098604 8f8b20c91 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:26:06 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit acc0986040589a3492f88a740bc3c3fc693b26d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:28:32 2020 +0200 Lower resolution due to lying drivers. commit d3b878de2a52c358d2944a6bbd0555dad7fbdb10 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:15:38 2020 +0200 Fix issues msh encountered with Intel 4600. commit 10245e0c1b0cb6fae10d86409435364edc6102ef Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 21:15:02 2020 +0200 Merge more models into one mesh than we did previously. commit 3155c31e663c52ae5c3a53d5fb5665892a1a498a Merge: 7204cc8a7 3c199280e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:35:22 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7204cc8a7a4f74a30306bd205d9834fee4bb944f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:34:43 2020 +0200 Fix not yet done NPC animations. This forces them all to be the idle animation if not specified. This fixes issues where you'd have giant NPCs in water. commit bc83360f2a08918f19d417b5f772e1ff554dba08 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 19:36:37 2020 +0200 Try to fix some bugs: - Z fighting with LOD terrain and water. - Audio SFX not playing. commit 1fd104aa603bf3781b6526a5cada46aeca3049dd Merge: 862df3c99 7c2c392a3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 12:02:31 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 862df3c9976c4da9bd7cfd784f1a85973127968a Merge: 0a4218ed9 75c1d4401 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 05:52:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0a4218ed9d541a2b34c133351bea38a99ddf4ea7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 22:27:14 2020 +0200 Fix particle depth. commit f51dfdeb442d0dd5243dd2f344fa4be295bd0875 Merge: c6251a956 5e6dc0471 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:19:04 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit c6251a956ad376400dca5c23420cf8d213dc8fdf Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:15:46 2020 +0200 Cache figures more intelligently. Cache figures for longer, and don't cache character states for the player except where they actually affect the rendered model. commit 0ed801d5404982c6fb63b1eaa4567d908b294c9d Merge: c11b9bdf0 eea64f78f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 16:32:24 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c11b9bdf0a53bf9884d2f5a48fec9b01d582df1a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 11:47:15 2020 +0200 Remove unneeded Clippy annotation. commit 16aa9ef40af56d69289d00aafb3deadfb8bd4f35 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 8 00:53:02 2020 +0200 Fix hotloading and Clippy. commit 3dc973e0be5b758da1e9805eb764ad401374cd0c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 23:50:27 2020 +0200 Major speedups with SIMD. commit fba64a7d93d5a96077ce87287bbce6ab9b7fbcae Merge: 76429d00e d1e10b178 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:19 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 76429d00eea00d212fbd672a84ee91e75b19b938 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:10 2020 +0200 Add clippy.toml. commit c79f512f84dbb83cb82b7954db68ff241dfd8e41 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 11:55:20 2020 +0200 Fix all clippy issues, clean up Rust code. commit 6f90e010b3fbefb53b0d632e819931350015b6b8 Merge: 77a8c7c26 5929cfa5c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:30 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 77a8c7c267d3f44a1a62bd6b2274359973c5e4d4 Merge: b44e44232 44febaabd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:10 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 5929cfa5c713aa392110bbb62407f76caf53c3df Author: jshipsey <jshipsey18@gmail.com> Date: Thu Aug 6 20:47:27 2020 -0400 fixed in-hand arrow bug commit b44e442325d828f1cd564d66908f89d09e80474b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 6 13:40:35 2020 +0200 Miscellaneous performance improvements. commit be37acf287c1360d8085862526ac3365ffd1d768 Merge: 125d7fc6c c11876547 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 05:49:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 125d7fc6c4dcd8c8c5f27b8268a4d64f409f3644 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 04:55:31 2020 +0200 Abstract over simd vs. repr_c vectors. Also some minor improvements to Event size. commit d4d4956e9252e1241ce110b2aa85076c6b1e2a23 Merge: 5f3b7294a aced5f979 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:56:54 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 5f3b7294af1f8533edc2620b58863c248e2b07af Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:43:52 2020 +0200 Fix formatting issues I missed before. commit a428a3ebba70dcab63dd0f8cd983120c90617271 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:41:51 2020 +0200 Fix clippy warnings, part 1. There aer still a bunch of type too complex and function takes too many arguments warnings that I'll fix later (or ignore, since in the one case I did fix a function takes too many arguments warning I think it made the code *less* readable). commit ba54307540ed8a937ac08209730284fc653af85b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 30 13:22:42 2020 +0200 Fix light animations so they are removed when the light turns off. commit 7e0f4bcbf0f4717145d8beac40d52e3acebbe2aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 21:10:20 2020 +0200 Fix crash in edge case for pixel art. commit 56da06f7a351e2b949e9b014a90b974d511a0924 Merge: cf74d55f2 9f53a4a19 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:56:52 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:29:52 2020 +0200 Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). The first concern was addressed by fixing the dimensions of the map images drawn from the UI (so that we always use a square source rectangle, rather than a rectangular one according to the dimensions of the map). We also fixed the way rotation was done in the fragment shader for north-facing sources to make it properly handle aspect ratio (this was already done for north-facing targets). Together, these fix rendering issues peculiar to rectangular maps. The second and third concerns were jointly addressed by adding an optional border color to every 2D image drawn by the UI. This turns out not to waste extra space even though we hold a full f32 color (to avoid an extra dependency on gfx's PackedColor), since voxel images already take up more space than Optiion<[f32; 4]> requires. This is then implemented automatically using the "border color" wrapping method in the attached sampler. Since this is implemented in graphics hardware, it only works (at least naively) if the actual image bounds match the texture bounds. Therefore, we altered the way the graphics cache stores images with a border color to guarantee that they are always in their own texture, whose size exactly matches their extent. Since the easiest currently exposed way to set a border color is to do so for an immutable texture, we went a bit further and added a new "immutable" texture storage type used for these cases; currently, it is always and automatically used only when there is a specified border color, but in theory there's no reason we couldn't provide immutable-only images that use the default wrapping mdoe (though clamp to border is admittedly not a great default). To fix the maps case specifically, we set the border color to a translucent version of the ocean border color. This may need tweaking going forward, which shouldn't be hard. As part of this process, we had to modify graphics replacement to make sure immutable images are *removed* when invalidated, rather than just having a validity flag unset (this is normally done by the UI to try to reuse allocations in place if images are updated in benign ways, since the texture atlases used for Ui do not support deallocation; currently this is only used for item images, so there should be no overlap with immutable image replacement, so this was purely precautionary). Since we were already touching the relevant code, we also updated the image dependency to a newer version that provides more ways to avoid allocations, and made a few other changes that should hopefully eliminate redundant most of the intermediate buffer allocations we were performing for what should be zero-cost conversions. This may slightly improve performance in some cases. commit ad18ce939940a8c697270f6e9b94db9942fd8295 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 13:21:09 2020 +0200 Fix continent scale hack. commit 36b1cb074f5b195aebd7dbbc3da7f0246a1a18ec Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 12:11:40 2020 +0200 Enable loading different sized maps without a recompile. We may want to tweak the effects of the continent_scale_hack. commit 13b6d4d534cc4814b7cb3294ca41bbfea0a6b186 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 10:55:48 2020 +0200 Removing WORLD_SIZE, part 1. Erased almost every instance of WORLD_SIZE and replaced it with a local power of two, map_size_lg (which respects certain invariants; see common/src/terrain/map.rs for more details about MapSizeLg). This also means we can avoid a dependency on the world crate from client, as desired. Now that the rest of the code is not expecting a fixed WORLD_SIZE, the next step is to arrange for maps to store their world size, and to use that world size as a basis prior to loading the map (as well, probably, as prior to configuring some of the noise functions). commit 30b1d2c6428230a9eaa0d749cdcbbd6f1cbccd78 Merge: 7d56ba31b 1377b369f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:58 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 7d56ba31b445441461b28a07fc495d7d4f047c17 Merge: 2101113b4 598f14b25 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 1377b369f6db2258e910d467a5740f31789e3ded Author: Monty Marz <m.marzouq@gmx.de> Date: Sun Jul 19 23:25:38 2020 +0200 more saturated pumpkins commit ae8d50527f93bb0616c2ad46ce4dacb63bc37c6d Author: Monty Marz <m.marzouq@gmx.de> Date: Sat Jul 18 20:29:56 2020 +0200 acacia models commit 2101113b467e691de787392d7f20f1745f5637bd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 18 18:55:25 2020 +0200 Higher detail LOD. commit add2cfae04b4385fa5590e11e2bd5229d9dee0aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 16 01:57:39 2020 +0200 Revert some irrelevant stuff. commit 2e2ab3dc1eaa59a4aef7f8d34a53d8aae4c8553a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 15 13:30:49 2020 +0200 Fixing various things about shadows. * Correcting optimal LISPSM parameter. * Figure shadows are cast when they're not visible. * Chunk shadows stay cast until you look away. * Seamless cubemaps for point lights. * Etc. commit 6c31e6b56217274285b597af297036691ea5d897 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 19:50:26 2020 +0200 Fix shadow creation. commit 6332cbe006115ae205597529cd8bbccd146c2cca Merge: be438657c 930e0028b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:47:00 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit be438657c33d7b5bfb0a9582c3ed3fd366637323 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:28:08 2020 +0200 Tweaks to shadows. Added shadow map resolution configuration, added seamless cubemaps, documented all existing rendering options, and fixed a few Clippy errors. commit 23b4058906013c7d2a40c286e20e32c5fbd897ed Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 10:11:19 2020 +0200 Fix moon, use nonlinear noise for terrain. Note that the latter has a bit of performance cost. commit 7fbe5cbfbb9dc29607957b8e62f432a4deed193d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:23:02 2020 +0200 Address lies about max texture size. commit bcfc62b5e13a1cdd83f57535fde4694720bebfd9 Merge: 75e3626a7 18a08e8fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:22:08 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 75e3626a785919f43fdcf2127c2b10e3e4df2f9f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:21:52 2020 +0200 OpenGL 3.3 minimum. commit 18a08e8fe2739f02af99a5d2cb4e7c38c49e858b Author: Monty Marz <m.marzouq@gmx.de> Date: Tue Jul 7 23:57:52 2020 +0200 settings localization commit 90c5d1ca3620092bc3ae10b2211489eb1cf6f5e8 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 21:11:48 2020 +0200 Lower near distance. commit 0e66f02b25aaddaa2dfddbbc89cd67de54a9a7b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 20:09:01 2020 +0200 All sprites sway in the wind now. commit db1401a6910bf42dcf502462c90038752ff5fbdb Merge: 69e508d8c e8b4b29d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 19:34:17 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 69e508d8c94d8973033817ca86f357e466fc7c4d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 18:41:37 2020 +0200 Make it easy to switch to SIMD for math. commit ffe0f5928c7a7e87d00cb5426b3b1d831d7e02fd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 21:21:12 2020 +0200 Fix some issues with underwater rendering. commit bfda6da42f38fd02c31ee92c81ab785a3e50c2a0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 19:17:59 2020 +0200 Fix some minor display issues. commit 0ed752e087968cf901301884aaeae698e32ef8a5 Merge: ccc6a06a8 518edcb85 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:14:21 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit ccc6a06a8d4504d6b9f7af7905a414d2ee06ab76 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:04:34 2020 +0200 Some minor changes. commit 4e020246702889269efe1a191788992164c508d6 Merge: 50a64d927 e05c9267a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 16:17:40 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 50a64d927e6c4f4b0e4688e4cbfca694bc3f922a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 13:07:03 2020 +0200 Fix far plane. commit 7dd06da34cae8f9ea3b6c889fe965181f3fd3949 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:25:35 2020 +0200 Add shadows.glsl. commit 618a18c998778bf871b905a74657440fcc384c80 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:10:22 2020 +0200 Adding shadows, greedy meshing, and more. commit eaea83fe6a5cb1cb0ba8beef888183c718258496 Merge: 267018495 2f89b863e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 22:47:07 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 2670184954a13e4a9e7a4e35ba79aac0c5fac2f7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 21:20:01 2020 +0200 Make civsim and sites deterministic. For anything in worldgen where you use a HashMap, *please* think carefully about which hasher you are going to use! This is especially true if (for some reason) you are depending on hashmap iteration order remaining stable for some aspect of worldgen. commit f8376fd5dc72b4a9c2f51a6b4570d59c8b8e9343 Merge: 654f7e049 cdee191dd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 17:53:57 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 654f7e049258d9da27c09608bbe6a46ffa8787e5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed May 20 21:22:30 2020 +0200 Correct backface culling. commit 560501df05ca725409b0f2e4eb31bdfdc15fd0c7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue May 19 17:22:06 2020 +0200 Greedy messhing for shadows. commit a4d87e1875ca543436e6bbbeb20348facc5a52d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun May 17 05:59:00 2020 +0200 Shadow maps work for lantern. commit 243d0837b8a3b08172c9a3c348d964d7ddc2a0a8 Merge: 04382dc28 71dd520cd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:53:13 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 04382dc28632b6c66e8821f6870c0daaa1c1901a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:22:17 2020 +0200 WIP: better graphics config, better LOD, shadow maps. commit 22ddbad3eb32bfa70f0932176022208fe67ded81 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 18:54:09 2020 +0200 Minor shader fixes. commit 746a10e8d01ac235f994b0cde78fa48998602a1f Merge: 0f4a0e763 40ab94673 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 04:02:09 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0f4a0e763db3afbdc4fb0558611f38326ca87151 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 23:03:24 2020 +0200 Switch back to pop-in terrain. commit dd74fa7e4a53667b38811d7aec58d7f6a68889bb Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 22:58:55 2020 +0200 LOD shading closer to voxel shading. commit ef67bd58ba0bdaf622b078892d768263b6cba268 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 28 20:49:03 2020 +0200 Experimental underwater lighting. commit 2c5ad9d07605e80d5fd5679dd3a5d70c605b86a9 Merge: 748279835 303967a6f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 22:35:24 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7482798354eda18c8207950080fc24d443a369de Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 21:59:55 2020 +0200 Replace discard in figure-frag. commit d83b4ae69be4912f69bf7835f509c68a1c7770a4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:45:57 2020 +0200 Fix sprite lighting, HDR from focus_pos. commit 0594238004f116274905fa0ed7c2b6c417ed1d29 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:14:10 2020 +0200 Proper HDR from point lights. commit 48c93d2b41ce5743103d18e76cc228f5ac766492 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 14:01:43 2020 +0200 Brighter ambiance, darker LOD shadows. commit e0452e895ccfa8a43f368cae3b8b8aedc24dad93 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 13:13:23 2020 +0200 More proper HDR. commit 4c6da3ed16cfeebb455e40da5f557b4af9a499d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 00:13:10 2020 +0200 Trying LOD noise. commit 682a3d74c85df5503ffe1fc1cc891bce789df1ad Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 23:11:08 2020 +0200 Fix LOD heights in towns. commit cc39e5734e8b18f9077bf42e66337c1319dd6b6e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 21:01:23 2020 +0200 More LOD fixes. commit 8116b21c2e51c836e77894e309ac273caf2917b3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:54:43 2020 +0200 I like this coloring. commit bc2560ea90b36f4b46190005344232d993043ac3 Merge: 14effdd5d e690efe71 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:48:33 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 14effdd5db8747fcf3eb34f03b46b7792e92d1c5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:24:35 2020 +0200 Re-saturate. commit 48a643955d4435b78179acba0beb4a979905cc31 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:23:57 2020 +0200 Various fixes. commit f7b497a0c25f4ad4682c71dd1ed6f608052feb9b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 03:22:49 2020 +0200 Render figures again. commit 44e4aad48deba8266b9f8bdfd3db096b381f5327 Merge: e6f0a5a98 9ec319a18 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 02:01:04 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit e6f0a5a981a82533ba188fff0a54ce98577bb152 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 24 16:12:20 2020 +0200 Add atmospheric scattering. commit f2953087f691a8edbc001cb98ebf5059fc6f8ac0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 23 00:01:20 2020 +0200 Fix shadowing for specular reflections. commit ddd4a67a9799b8d08c7dc0c2bec90621c2bed0e3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Apr 22 22:56:12 2020 +0200 HDR fixes. commit 1015e60deef3c447381996277df7496707a63bd0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 21 18:25:19 2020 +0200 More lighting changes. commit 80c264abd111fb237e57843efcb5c071d4f84613 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 13 00:29:59 2020 +0200 Lighting experiments. commit 8414987e589dd5102bad89762a3adaccc0bfe957 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 9 02:38:40 2020 +0200 WIP -- lighting changes and soft shadows. commit 9cd2b3fb0d6b49776c6dfe463e4169637250b11a Merge: c7ea687eb 8b149ad11 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:29 2020 +0200 Merge branch 'sharp/new-lighting' into sharp/small-fixes commit c7ea687ebbc5aace1b455f134a5bf49ce2c7434a Merge: 476441531 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:02 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 8b149ad11ad4bb75018fcf9519baec27d1c95951 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:32:39 2020 +0200 Trying out a new lighting model. commit b0ac9f36f755dd06f7c17c46150568064790864f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 07:56:11 2020 +0200 Use bicubic interpolation for terrain. commit f6fc9307a121514b614bc50ef8eb055953e7da8a Merge: 33140a295 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 05:01:41 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 4764415312aae6e9ac2d00e86e84577cb958f1ab Merge: ed2d0111d 13388ee6a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 04:54:48 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 13388ee6a42943f3f79a9cb488346cef18e272fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 20:30:08 2020 +0200 Various fixes (to coloring and to soft shadows). commit fbd084a94a067082a87cd6d28b82054709bc9265 Merge: 5a089863b 4fdf6896a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 18:50:38 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/map-colors commit ed2d0111d994262ae836d84d1fe5a45e4de72a0b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 06:49:27 2020 +0200 Combining colors and LOD. commit 88342640c6b835114d01c797b89fdede3b0a2108 Merge: 33140a295 5a089863b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:49:20 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 33140a2951b8212725f42c758b277aaec4d888f7 Merge: 4c65a5aed f34d4b379 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:36:21 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 5a089863beb01d4794bbe3580ada47b278715ea2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 03:17:49 2020 +0200 Making maps brighter. This is probably not the right way to do it, but oh well! commit 32b2c99109dd486aa922886081068f9c550c83f2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 02:46:36 2020 +0200 Horizon mapping and "layered" map generation. Horizon mapping is a method of shadow mapping specific to height maps. It can handle any angle between 0 and 90 degrees from the ground, as long as know the horizontal direction in advance, by remembering only a single angle (the "horizon angle" of the shadow map). More is explained in common/src/msg/server.rs. We also remember the approximate height of the largest occluder, to try to be able to generate soft shadows and create a vertical position where the shadows can't go higher. Additionally, map generation has been reworked. Instead of computing everything from explicit samples, we pass in sampling functions that return exactly what the map generator needs. This allows us to cleanly separate the way we sample things like altitudes and colors from the map generation process. We exploit this to generate maps *partially* on the server (with colors and rivers, but not shading). We can then send the partially completed map to the client, which can combine it with shadow information to generate the final map. This is useful for two reasons: first, it makes sure the client can apply shadow information by itself, and second, it lets us pass the unshaded map for use with level of detail functionality. For similar reasons, river generation is split out into its own layer, but for now we opt to still generate rivers on the server (since the river wire format is more complicated to compress and may require some extra work to make sure we have enough precision to draw rivers well enough for LoD). Finally, the mostly ad-hoc lighting we were performing has been (mostly) replaced with explicit Phong reflection shading (including specular highlights). Regularizing this seems useful and helps clarify the "meaning" of the various light intensities, and helps us keep a more physically plausible basis. However, its interaction with soft shadows is still imperfect, and it's not yet clear to me what we need to do to turn this into something useful for LoD. commit f8926a5737ddc51f3d585c651a64c43677aae0f4 Merge: a1aee931e 875ae6ced Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Mar 13 13:32:42 2020 +0100 Merge remote-tracking branch 'origin/master' into sharp/map-colors commit 4c65a5aed353b119aea65a2aaeb94549b67beb42 Author: Treeco <5021038-Treeco@users.noreply.gitlab.com> Date: Mon Feb 24 16:48:05 2020 +0000 Made LOD setting slider exponential commit 2fa7b2d20d7233dc8bfd64f9f7f54617575248f1 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 17:49:53 2020 +0000 Added mist to LoD commit aab059a450b5f635777129ff82cc15b662965c3c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 15:14:06 2020 +0000 Added LoD slider commit 779c36b538121c5ade3633ae5cb67bb14c8c3877 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:54:55 2020 +0000 Reduced cost of vertex pushing commit 9fea150473906b166365b738ebcea07c697daf3d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:38:53 2020 +0000 Fixed maths, improved LoD resolution commit 5481df38fea5bf183ff376a3337179cfaa5233dc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 11:22:50 2020 +0000 Dynamically relocate LoD vertices to enhance details commit a3e36a50ababd615da7db1b26158c7906a5def01 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 18:13:51 2020 +0000 Simpler terrain spiral rendering commit 255f450ae9ac8763db4bede075fb409161ed57cc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:53:17 2020 +0000 Better LoD precision commit 3d027aebe812a5b8658a4eb8123dc9f61b3776d2 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:04:03 2020 +0000 Better falloff commit be775c9484b457b2c0b1a494aec03392d0c70e76 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 15:30:45 2020 +0000 Applied good ideas from experimental branch commit 58587b68545a23c5c04ab4574a4b94b3bc982246 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 16:15:13 2020 +0000 Minor fixes to LoD merging commit 7b42aebd709c14df2db766aad61d9280ad24d84d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 15:04:44 2020 +0000 Capped LoD dragging commit 8aafc559f87124e1ea5ca6e3ddc2aa0c242d793c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:54:37 2020 +0000 Better blending between LoD and terrain border commit edd3455d5161792d87ddc8eadc0ecbad5532b284 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:40:19 2020 +0000 Fixed LoD z depth, added sea level offset commit b9b06744620114dd5556e73f64fa93c145503a7c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:27:43 2020 +0000 Better LoD smoothing commit a1aee931e790431560cd2d953ad61d9497072afd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Feb 21 14:52:17 2020 +0100 Adding shadows. commit 2400786c13dd891c131ed86d48d05df516a8a778 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 13:48:40 2020 +0000 Use world map as LoD source commit dbf650f504a4c25fbbc2096ac3616c736bf52d23 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Jan 20 00:48:14 2020 +0000 Better clouds at distance commit 5e6f81b86cdb9730b9b056877b19257075fd5fa8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Jan 19 23:59:02 2020 +0000 sync commit 745e7540ddb000cc645f612767b337c2ddc3f7c0 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 12:40:48 2019 +0000 Improved cloud falloff mist, faster noise sampling commit f6a200d0cb866196ba57697466755f9e0c7ea5d8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 10:09:00 2019 +0000 Improved long-range depth precision, removed unnecessary LoD polygons commit 63d1b2bb2292898d59fb4f4e502201103dfeb86f Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 20:57:46 2019 +0000 Working LoD shader commit f13d98ee3e58f881e8b978861a67663b59ed91ec Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 11:03:40 2019 +0000 LoD first attempt (stack overflow issue)
2020-08-20 18:34:59 +00:00
"serde",
"static_assertions",
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "veloren-client"
Change the version number to 0.12
2022-02-18 21:36:53 +00:00
version = "0.12.0"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
handle ticks in a seperate thread that tui on botclient
2021-03-12 10:08:24 +00:00
"async-channel",
Add timeout's to group invites, and configurable limit to group size Fix a few group bugs, enable invite timeout and group limits in ui
2020-08-07 01:59:28 +00:00
"authc",
Propper Compression support of network. - Compression is no longer enabled always but can now be enabled per Stream. If a Stream is Compression enabled it will compress and decompress all msg (except for `raw` access) before handling them internally. You need to handle compression yourself for `raw` fn. - added a new feature to the network crate to enable or disable the compression - switched to `lz-fear` instead of `lz4-compression` - use `bitflags` to represent the `Promises` struct
2020-08-25 13:32:42 +00:00
"byteorder",
move botclient to client/src/bin/bot start it with: - (cd client && RUST_BACKTRACE=full RUST_LOG=trace VELOREN_USERDATA_STRATEGY=executable cargo run --bin bot --features="bin_bot")
2021-03-12 00:29:35 +00:00
"clap",
switch to hashbrown 0.11 and specs 0.16.2
2021-06-07 11:01:01 +00:00
"hashbrown 0.11.2",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"image",
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
"num 0.4.0",
Revert "Merge branch 'sharp/revert-quinn' into 'master'" This reverts merge request !2315
2021-05-17 17:32:26 +00:00
"quinn",
(See sharp/lod-history) LOD, shadows, greedy meshing, new lighting, perf --- Pretty much a Veloren fork at this point. Here's a high level overview of the changes (will be added to CHANGELOG just before merge). At a high level this MR incorporates roughly two groups of changes. The first group consists of new game features: more flexible map sizes, level of detail terrain, shadow maps, and a new lighting engine. This is "feature work" that (mostly) only adds new things to Veloren, and mostly shouldn't affect old stuff. The second big group of changes are those addressing the fallout from all the new features. These include performance fixes of various sorts: the addition of multiple graphics options and optimization of the cheap ones to avoid work, switching all voxel models to use some variant of greedy meshing, switching over much of our CPU-side vector math to exploit SIMD instructions (coinciding with a fork of `vek`), and a rewrite of how the UI handles text rendering (coinciding with updates to our fork of `conrod`). Making Veloren's hardcoded colors appear correct under the new lighting engine also required considerably changes (TODO: Fill in this section when it's complete). The second category of changes often heavily touches code owned by other people, including frequently modified code "owned" by a handful of people, so I recommend that this code be reviewed particularly carefully. --- At a high level (each will be described in more detail below): - The world map has been refactored. - The world size is no longer hardcoded (@zesterer). - The map generation code was made generic to allow using it outside of the `world` crate (@zesterer). - On world creation, we now compute *horizon maps* (@zesterer). - The way we pass the world from the server to the client has been updated (@xMAC94x). - Artifacts related to image rotation were fixed (@imbris). - Multiflow rivers were enabled (@zesterer). - In the process of making changes related to the world map, various incidental fixes and optimizations were required. - The new *level of detail* feature was added (@zesterer wrote part of this and has checked out the rest). - A new LOD terrain rendering step was added to the pipeline. - The LOD terrain quality was made configurable via a graphics setting. - Horizon maps were used to cast shadows from LOD chunks on both LOD and non-LOD terrain. - A "voxelization" effect was incorporated into rendered LOD terrain to make it blend better into the world. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Veloren's lighting has been completely overhauled (@zesterer has already checked most of this out). - A semi-accurate index of refraction was assigned to our materials. - A new, more realistic, physically based approach to lighting was used using the *Ashikhmin Shirley* BRDF. - We emulate *atmospheric scattering* using equations designed for measuring solar panel light exposure. - We attempt to compute *realistic light attenuation* in water using its real material properties. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Point and directional lights now cast realistic shadows, using *shadow mapping.* (@imbris, @zesterer, @Treeco, @YuriMomo) - Point light shadow maps were added to the rendering pipeline, using geometry shaders and *seamless cube maps*. - Directional light shadows were added to the rendering pipeline, using LISPSM together with disabling *depth clamping*. - "Shadow-only" chunks and NPCs were added to prevent shadows from models behind you from disappearing. - In the process of making changes related to shadow maps, various incidental fixes and optimizations were required. The addition of shadow maps, LOD terrain, and the new lighting all led to significant performance degradation, on top of other changes happening in master. Therefore, a large number of performance improvements were also needed: - The graphics options were made much more flexible and configurable, and shaders were optimize. - New options were provided for how to render lights and shadows (@Pfauenauge, @zesterer). - Graphic setting storage and configuration were overhauled to make adding new features easier (@Pfauenauge, @imbris). - Shaders were rewritten to utilize GLSL's preprocessor to avoid overhead (@zesterer, @YuriMomo). - In the process of making changes related to providing additional rendering options, various incidental fixes and optimizations were required. - Voxel model creation was switched to use *greedy meshing.* - A new voxel meshing method, greedy meshing, was added (@imbris). - Uses of the older meshing methods were migrated to use greedy meshing (@imbris, @jshipsey, @Pfauenauge). - New restrictions were added to terrain, figure, and sprites to future proof them for further optimizations (@jshipsey, @Pfauenauge, @zesterer). - Most positions are now relative to either chunk or player position for better precision (@imbris, @zesterer, @scottc). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - Animation and terrain math were switched to use SIMD where possible. - Fixes were made to vek to make its SIMD feature usable for us (@zesterer, @imbris). - The interface and types used in bone animation were changed in various ways (@jshipsey, @Snowram, @Pfauenauge). - Redundant code generation for body animation is now partly taken care of by a macro (@jshipsey, @Snowram, @Pfauenauge). - Animation code was modified to to use vek's SIMD representation where possible (@jshipsey, @Snowram, @Pfauenauge). - Terrain meshing code and shadow map math were also modified to use vek's SIMD representation (@imbris). - SIMD instruction generation was enabled (@YuriMomo, @jshipsey, @Snowram, @imbris, @Angelonfira, @xMAC94x). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - The way we cache glyphs was completely refactored, fixed, and optimized. - Our fork of `conrod` was optimized in various ways (@imbris). - Our fork of `conrod` now exposes whether a widget was updated during the current frame (@imbris). - Our use of the glyph cache was rewritten for correctness (@imbris). - A *text cache* was introduced that lets us skip remeshing glyphs that have not changed (@imbris). - Various changes were made to reduce pressure on the glyph cache, with more planned (@imbris, @Pfauenauge). - In the process of making changes related to the glyph cache, various incidental fixes and optimizations were required. - Colors were changed to keep Veloren's look consistent with master. - Some older tree models were brought back (@Pfauenauge). - TODO(@Sharp): All hardcoded colors were extracted and made hotloadable. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Hardcoded colors were fixed to conform to Veloren's style. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Color models were fixed to conform to Veloren's style. A detailed description of the involved changes follows. --- - The world size is no longer hardcoded. All functions dependent on world size now take a `WorldSizeLg`, which holds the base 2 logarithm of each actual world dimension and is guaranteed to maintain certain properties (outlined in `common/src/terrain/map.rs`). Additionally, many utility functions that utilize the world size were moved into `common` as well (mostly `common/src/terrain/mod.rs`). Finally, the world map format was updated in order to store its size explicitly, with a migration path from the old format that should work whenever the old formatted map was a square (practically always). See `world/src/sim/mod.rs` for these changes. - The map generation code was made generic to allow using it outside of the `world` crate. The parts of the map generating code that do not need to query the world were moved over to `common/src/terrain/map.rs`, allowing them to be used from the client without creating a dependency on `world`. The rest of it was turned into helper functions in `world/src/sim/map.rs`, which can be passed as closures to the generic map generation code to complete its construction. This also means that colors are now passed in separately to the map generation function. See <https://veloren.net/devblog-78/> for more details. - On world creation, we now compute *horizon maps*. See the function in `world/src/sim/util.rs`. Given a height map and a plane intersecting that height map, our horizon maps allow us to encode enough information to reconstruct shadows for each point on the height map using only the *horizon angle* (the angle at which the sun starts to become visible). As Veloren's sun only covers one plane, this is sufficient for encoding sun shadows for LOD terrain, by encoding two angles per chunk (one for each 90 degrees the sun covers). We can also use this for the moon, if we want, since the moon follows the same path. Additionally, we store the *height* of the furthest occluder, to try to make the shadows volumetric; so this means 4 bytes in total for each chunk. Support for horizon maps has been merged into the map functionality in common as well. - The way we pass the world from the server to the client has been updated. Rather than passing the prerendered map, we instead pass three maps with values for each chunk; one with the color information, a second with altitude information, and a third with horizon map information. We then reconstruct the map on the client, together with some additional information we send from the server (like the sea level and maximum height). See `common/src/msg/server.rs` for a detailed description of the format of `WorldMapMsg`, and `server/src/libr.rs` and `client/src/lib.rs` for details of the map construction and parsing. - Artifacts related to image rotation were fixed. See the commit message for commit SHA `cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e` for a detailed explanation. This involved changes to shaders, the addition of a new type of graphic (also reflected in the graphic cache) that allows specifying a border color (which automatically makes the associated texture immutable), and some related fixes. I reproduce the first two paragraphs of the MR description as well: ``` Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). ``` - Multiflow rivers were enabled. This does not really need to be part of this MR, and would be easy to revert, but since it seemed to provide a nice improvement it's currently packaged with it. We already computed multiple outflows from each chunk for erosion purposes long before this MR. However, we never modified river rendering to be able to handle this case (just a single downhill river flow is complex enough!) so this was not exposed when deciding which chunks were rivers. Now that - In the process of making changes related to the world map, various incidental fixes and optimizations were required. Some examples of fixes include making sure terrain is never lowered to below sea level (to make the shadow maps report correct values), fixing map altitudes and colors to understand things like cliffs and "block level" coloring (that doesn'te xist on the column level), and fixing a crashbug when rendering images for the UI where source pixels are strongly rectangular. Some examples of related performance fixes include avoiding allocating a fresh vector for all the maps (i.e. copying it over to change the format from `[u32; n]` to `DynamicImage` and then copying again to convert to `RgbaImage`), and instead using the `gfx::memory::slice` function to accomplish the same thing. These sorts of changes are spread all arond the code. This includes the additon of a new scene, `voxygen/src/scene/lod.rs`, a new pipeline `voxygen/src/render/pipeline/lod_terrain.rs`, and new shaders `assets/vxygen/shaders/lod-terrain-vert.glsl` and `assets/vxygen/shaders/lod-terrain-frag.glsl`, as well as associated changes to the renderer in `voxygen/src/render/renderer.rs`. The main idea behind our initial approach to LOD was to take the world data we now get from the server (altitude, color, and horizon mapping). - Some previously computed values were turned into shader uniforms for better prediction on weak processors. (@zesterer) - Calls to power or trig functions were removed or replaced with multiplications, where possible. - After some deliberation - To properly handle sprite "waving" for nearby sprites, We explicitly designed the greedy meshing system with figures and sprites in mind. In both cases, we want to be able to *efficiently* pack many different models into the same texture, especially in cases where we know we will either not be removing any of the grouped-together from the models from the texture, or will remove all of them at once (so they can be packed into some specific subtexture). For sprites, since we know every model in advance and never intend to deallocate them, we currently pack them all as efficiently as possible into one giant tetxure atlas. However, in the future we might opt to pack them slightly less efficiently in exchange for shrinking the sprite vertex size. For figures, we pack all the textures for each *model* into the same atlas. is a global texture atlas used for every sprite, and for figures which is why we have the ability to mesh multiple models to the same texture area (using the simple texture atlas allocator) without requiring intermediate vector allocations. This is accomplished by delaying the time when we actually write the color and light data to the texture until *after* all the model vertices have been meshed; then, we can just allocate the whole color/light array at once, making the atlas we use an exact fit. In computer science-y terms, we accomplish this delay by, after we perform the initial greedy meshing (without texture information), not continuing to create the texture data, but instead constructing a *continuation*--that is, a function that, when called, will execute the rest of the computation. We push this continuation (which in Rust terms is a `FnOnce` closure that takes the `ColLightsInfo` that it is supposed to write to as context) onto a onto a vector resizing. To allow for suspended writes to texture data, Rust pointed out to me that the continuation that would eventually write the color and light data to the texture atlas (the one that is shared by all models sharing the same greedy mesher) would have to *own* whatever data it mshed. Because we often generate the model data to mesh as a temporary in `voxygen/src/load.rs`, the - Matrix multiplications in the shader were reduced for figure data (@zesterer). - Vertex "waves" for fluid data were removed. - Terrain "bending" near edges was removed. - Scaling was fixed to make sure empty space was not introduced in a space previously occupied by a block. It was also changed to take ownership of its voxel data, rather than sharing it, to let it be used with meshing. - Rust's nightly version was bumped in order to use the `array_map` function, which lets us reuse more code between the simple map and `FigureModelCache`. - PositionedGlyph::standalone. --- I tried to cite sources in many cases[^realtime],[^lloyd],[^lispsm],[^pbrt],[^greedy],[^tjunctions] where I needed features from elsewhere but I am particularly grateful for the following resources, esepcially where they have accompanying source code. I linked all of them that are accessible to the public (those that are not were obtained through legal means). [^realtime]: Eisemann, Elmar, Michael Schwarz, Ulf Assarsson, Michael Wimmer. Real-Time Shadows. A K Peters/CRC Press (T&F), 20160419. [^lloyd]: Lloyd,B. 2007. [Logarithmic perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). PhD thesis, University of North Carolina. [^lispsm]: Wimmer, M., Scherzer, D., and Purgathofer, W. 2004. [Light space perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). In Proceedings of Eurographics Symposium on Rendering 2004, pp. 143– 152. [^pbrt]: Pharr, Matt, et al. [http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf](Physically Based Rendering: From Theory to Implementation). Third edition, Morgan Kaufmann Publishers/Elsevier, 2017. [^greedy]: mikolalysenko. “Meshing in a Minecraft Game.” 0 FPS, 30 June 2012, <https://0fps.net/2012/06/30/meshing-in-a-minecraft-game/>. [^tjunctions]: blackflux. “Meshing in Voxel Engines – Part 1.” Blackflux.Com, 23 Feb. 2014, <https://blackflux.wordpress.com/2014/02/23/meshing-in-voxel-engines-part-1/>. I am also especially grateful to Khronos, Wikiepdia, and stackoverflow for answering many of my specific questions while writing the MR. --- Squashed commit of the following: commit 300505e7305a2fdac722a808ee8538323f215f39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 18:46:25 2020 +0200 Fixing cargo doc and typo in CHANGELOG. commit ec0aeb18e8499d7d84ef818331b4b65c3d76cea6 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 15:38:50 2020 +0200 Hopefully final commit for the LOD branch. commit 5e8ea0b1eaac02903a02feb2eb038d195de4872f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 10:14:26 2020 +0200 Falling back to power as stopgap. commit e44a1cbf46504ee9931a01bdc9033e145500d557 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 09:25:41 2020 +0200 Address imbris feedback. Temporarily disables shiny water, lowers max VD. These restrictions will be lifted soon after merging. commit 561e25778a108ac3712f5ec2ce3a51234c4430d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 08:31:13 2020 +0200 Tweaking shaders a bit. commit 7d19259078ce0dd7b3742ad7d0cb3fab3ece3fdc Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:59:43 2020 +0200 Fix view example as well. commit 051cd4934e0fad2c0b15db4380a4189fa318679f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:29:06 2020 +0200 Fix meshing benchmark. commit c95e07db3b4dcca285678985e65e31b927cb1c61 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 05:46:22 2020 +0200 Address MR feedback, fix scene clouds. commit 1bfb816cabdb3ffc1e507a009c2d98696b4b573a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:39:36 2020 +0200 Incorporating Pfau's figure color changes. New eyes and new humanoid colors. commit 3f9b89a3ac7b3356b1dba0d1a8f6541357f81469 Merge: e2f5162e4 62c53963a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:29:41 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit e2f5162e4f96f4124aa43488f7245d341b3dcfd4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:28:38 2020 +0200 World colors are all hotloadable. They live in assets/world/style/colors.ron. Only a small handful of hardcoed colors remain in World; they are either part of the map, or difficult to disentangle from the rest of the computation. Comments are made where appropriate. commit 62c53963abe1975009d34a8f9515a355bef24f31 Author: Marcel Märtens <marcel.cochem@googlemail.com> Date: Wed Aug 19 15:59:00 2020 +0200 replace pretty_env_logger with tracing commit 5b1625f99d9586fe80e2232f583ec5af9f953099 Merge: d71003acd 4942b5b39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:15:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit d71003acdabeff970b3928e97c26af6847b5b78e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:14:34 2020 +0200 Hotloading colors, part 1: colors in common. Currently, this just entails humanoid colors. There are only three colors not handled; the light emitter colors in common/src/comp/inventory/item/tool.rs. These don't seem important enough to me to warrant making hotloadable, at least not right now, but if it's needed later we can always add them to the file. commit 63b5e0e553eb2ea49276f192a6fc7dd65254270d Merge: c32b337a4 6d2c4b9c1 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 13:05:37 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c32b337a46e10d9de473d178a94a3ccd61c39bb3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:52:04 2020 +0200 Fixing LOD grid, for real. commit a166ae0360395387e09fb35a1f84210c2ce5ec24 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:28:05 2020 +0200 Addressing imbris's initial feedback. Fixes two minor bugs: explosion particles were no longer spawning randomly, and LOD grids were not perfectly even. commit 4cbad004f44060994252dd3d38647a14a589712f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:27:58 2020 +0200 Bumping nightly per request. commit 548680276aac77c25d43d16b5622f847d474dbef Merge: acc098604 8f8b20c91 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:26:06 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit acc0986040589a3492f88a740bc3c3fc693b26d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:28:32 2020 +0200 Lower resolution due to lying drivers. commit d3b878de2a52c358d2944a6bbd0555dad7fbdb10 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:15:38 2020 +0200 Fix issues msh encountered with Intel 4600. commit 10245e0c1b0cb6fae10d86409435364edc6102ef Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 21:15:02 2020 +0200 Merge more models into one mesh than we did previously. commit 3155c31e663c52ae5c3a53d5fb5665892a1a498a Merge: 7204cc8a7 3c199280e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:35:22 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7204cc8a7a4f74a30306bd205d9834fee4bb944f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:34:43 2020 +0200 Fix not yet done NPC animations. This forces them all to be the idle animation if not specified. This fixes issues where you'd have giant NPCs in water. commit bc83360f2a08918f19d417b5f772e1ff554dba08 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 19:36:37 2020 +0200 Try to fix some bugs: - Z fighting with LOD terrain and water. - Audio SFX not playing. commit 1fd104aa603bf3781b6526a5cada46aeca3049dd Merge: 862df3c99 7c2c392a3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 12:02:31 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 862df3c9976c4da9bd7cfd784f1a85973127968a Merge: 0a4218ed9 75c1d4401 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 05:52:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0a4218ed9d541a2b34c133351bea38a99ddf4ea7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 22:27:14 2020 +0200 Fix particle depth. commit f51dfdeb442d0dd5243dd2f344fa4be295bd0875 Merge: c6251a956 5e6dc0471 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:19:04 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit c6251a956ad376400dca5c23420cf8d213dc8fdf Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:15:46 2020 +0200 Cache figures more intelligently. Cache figures for longer, and don't cache character states for the player except where they actually affect the rendered model. commit 0ed801d5404982c6fb63b1eaa4567d908b294c9d Merge: c11b9bdf0 eea64f78f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 16:32:24 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c11b9bdf0a53bf9884d2f5a48fec9b01d582df1a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 11:47:15 2020 +0200 Remove unneeded Clippy annotation. commit 16aa9ef40af56d69289d00aafb3deadfb8bd4f35 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 8 00:53:02 2020 +0200 Fix hotloading and Clippy. commit 3dc973e0be5b758da1e9805eb764ad401374cd0c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 23:50:27 2020 +0200 Major speedups with SIMD. commit fba64a7d93d5a96077ce87287bbce6ab9b7fbcae Merge: 76429d00e d1e10b178 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:19 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 76429d00eea00d212fbd672a84ee91e75b19b938 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:10 2020 +0200 Add clippy.toml. commit c79f512f84dbb83cb82b7954db68ff241dfd8e41 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 11:55:20 2020 +0200 Fix all clippy issues, clean up Rust code. commit 6f90e010b3fbefb53b0d632e819931350015b6b8 Merge: 77a8c7c26 5929cfa5c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:30 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 77a8c7c267d3f44a1a62bd6b2274359973c5e4d4 Merge: b44e44232 44febaabd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:10 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 5929cfa5c713aa392110bbb62407f76caf53c3df Author: jshipsey <jshipsey18@gmail.com> Date: Thu Aug 6 20:47:27 2020 -0400 fixed in-hand arrow bug commit b44e442325d828f1cd564d66908f89d09e80474b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 6 13:40:35 2020 +0200 Miscellaneous performance improvements. commit be37acf287c1360d8085862526ac3365ffd1d768 Merge: 125d7fc6c c11876547 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 05:49:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 125d7fc6c4dcd8c8c5f27b8268a4d64f409f3644 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 04:55:31 2020 +0200 Abstract over simd vs. repr_c vectors. Also some minor improvements to Event size. commit d4d4956e9252e1241ce110b2aa85076c6b1e2a23 Merge: 5f3b7294a aced5f979 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:56:54 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 5f3b7294af1f8533edc2620b58863c248e2b07af Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:43:52 2020 +0200 Fix formatting issues I missed before. commit a428a3ebba70dcab63dd0f8cd983120c90617271 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:41:51 2020 +0200 Fix clippy warnings, part 1. There aer still a bunch of type too complex and function takes too many arguments warnings that I'll fix later (or ignore, since in the one case I did fix a function takes too many arguments warning I think it made the code *less* readable). commit ba54307540ed8a937ac08209730284fc653af85b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 30 13:22:42 2020 +0200 Fix light animations so they are removed when the light turns off. commit 7e0f4bcbf0f4717145d8beac40d52e3acebbe2aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 21:10:20 2020 +0200 Fix crash in edge case for pixel art. commit 56da06f7a351e2b949e9b014a90b974d511a0924 Merge: cf74d55f2 9f53a4a19 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:56:52 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:29:52 2020 +0200 Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). The first concern was addressed by fixing the dimensions of the map images drawn from the UI (so that we always use a square source rectangle, rather than a rectangular one according to the dimensions of the map). We also fixed the way rotation was done in the fragment shader for north-facing sources to make it properly handle aspect ratio (this was already done for north-facing targets). Together, these fix rendering issues peculiar to rectangular maps. The second and third concerns were jointly addressed by adding an optional border color to every 2D image drawn by the UI. This turns out not to waste extra space even though we hold a full f32 color (to avoid an extra dependency on gfx's PackedColor), since voxel images already take up more space than Optiion<[f32; 4]> requires. This is then implemented automatically using the "border color" wrapping method in the attached sampler. Since this is implemented in graphics hardware, it only works (at least naively) if the actual image bounds match the texture bounds. Therefore, we altered the way the graphics cache stores images with a border color to guarantee that they are always in their own texture, whose size exactly matches their extent. Since the easiest currently exposed way to set a border color is to do so for an immutable texture, we went a bit further and added a new "immutable" texture storage type used for these cases; currently, it is always and automatically used only when there is a specified border color, but in theory there's no reason we couldn't provide immutable-only images that use the default wrapping mdoe (though clamp to border is admittedly not a great default). To fix the maps case specifically, we set the border color to a translucent version of the ocean border color. This may need tweaking going forward, which shouldn't be hard. As part of this process, we had to modify graphics replacement to make sure immutable images are *removed* when invalidated, rather than just having a validity flag unset (this is normally done by the UI to try to reuse allocations in place if images are updated in benign ways, since the texture atlases used for Ui do not support deallocation; currently this is only used for item images, so there should be no overlap with immutable image replacement, so this was purely precautionary). Since we were already touching the relevant code, we also updated the image dependency to a newer version that provides more ways to avoid allocations, and made a few other changes that should hopefully eliminate redundant most of the intermediate buffer allocations we were performing for what should be zero-cost conversions. This may slightly improve performance in some cases. commit ad18ce939940a8c697270f6e9b94db9942fd8295 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 13:21:09 2020 +0200 Fix continent scale hack. commit 36b1cb074f5b195aebd7dbbc3da7f0246a1a18ec Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 12:11:40 2020 +0200 Enable loading different sized maps without a recompile. We may want to tweak the effects of the continent_scale_hack. commit 13b6d4d534cc4814b7cb3294ca41bbfea0a6b186 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 10:55:48 2020 +0200 Removing WORLD_SIZE, part 1. Erased almost every instance of WORLD_SIZE and replaced it with a local power of two, map_size_lg (which respects certain invariants; see common/src/terrain/map.rs for more details about MapSizeLg). This also means we can avoid a dependency on the world crate from client, as desired. Now that the rest of the code is not expecting a fixed WORLD_SIZE, the next step is to arrange for maps to store their world size, and to use that world size as a basis prior to loading the map (as well, probably, as prior to configuring some of the noise functions). commit 30b1d2c6428230a9eaa0d749cdcbbd6f1cbccd78 Merge: 7d56ba31b 1377b369f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:58 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 7d56ba31b445441461b28a07fc495d7d4f047c17 Merge: 2101113b4 598f14b25 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 1377b369f6db2258e910d467a5740f31789e3ded Author: Monty Marz <m.marzouq@gmx.de> Date: Sun Jul 19 23:25:38 2020 +0200 more saturated pumpkins commit ae8d50527f93bb0616c2ad46ce4dacb63bc37c6d Author: Monty Marz <m.marzouq@gmx.de> Date: Sat Jul 18 20:29:56 2020 +0200 acacia models commit 2101113b467e691de787392d7f20f1745f5637bd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 18 18:55:25 2020 +0200 Higher detail LOD. commit add2cfae04b4385fa5590e11e2bd5229d9dee0aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 16 01:57:39 2020 +0200 Revert some irrelevant stuff. commit 2e2ab3dc1eaa59a4aef7f8d34a53d8aae4c8553a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 15 13:30:49 2020 +0200 Fixing various things about shadows. * Correcting optimal LISPSM parameter. * Figure shadows are cast when they're not visible. * Chunk shadows stay cast until you look away. * Seamless cubemaps for point lights. * Etc. commit 6c31e6b56217274285b597af297036691ea5d897 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 19:50:26 2020 +0200 Fix shadow creation. commit 6332cbe006115ae205597529cd8bbccd146c2cca Merge: be438657c 930e0028b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:47:00 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit be438657c33d7b5bfb0a9582c3ed3fd366637323 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:28:08 2020 +0200 Tweaks to shadows. Added shadow map resolution configuration, added seamless cubemaps, documented all existing rendering options, and fixed a few Clippy errors. commit 23b4058906013c7d2a40c286e20e32c5fbd897ed Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 10:11:19 2020 +0200 Fix moon, use nonlinear noise for terrain. Note that the latter has a bit of performance cost. commit 7fbe5cbfbb9dc29607957b8e62f432a4deed193d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:23:02 2020 +0200 Address lies about max texture size. commit bcfc62b5e13a1cdd83f57535fde4694720bebfd9 Merge: 75e3626a7 18a08e8fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:22:08 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 75e3626a785919f43fdcf2127c2b10e3e4df2f9f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:21:52 2020 +0200 OpenGL 3.3 minimum. commit 18a08e8fe2739f02af99a5d2cb4e7c38c49e858b Author: Monty Marz <m.marzouq@gmx.de> Date: Tue Jul 7 23:57:52 2020 +0200 settings localization commit 90c5d1ca3620092bc3ae10b2211489eb1cf6f5e8 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 21:11:48 2020 +0200 Lower near distance. commit 0e66f02b25aaddaa2dfddbbc89cd67de54a9a7b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 20:09:01 2020 +0200 All sprites sway in the wind now. commit db1401a6910bf42dcf502462c90038752ff5fbdb Merge: 69e508d8c e8b4b29d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 19:34:17 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 69e508d8c94d8973033817ca86f357e466fc7c4d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 18:41:37 2020 +0200 Make it easy to switch to SIMD for math. commit ffe0f5928c7a7e87d00cb5426b3b1d831d7e02fd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 21:21:12 2020 +0200 Fix some issues with underwater rendering. commit bfda6da42f38fd02c31ee92c81ab785a3e50c2a0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 19:17:59 2020 +0200 Fix some minor display issues. commit 0ed752e087968cf901301884aaeae698e32ef8a5 Merge: ccc6a06a8 518edcb85 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:14:21 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit ccc6a06a8d4504d6b9f7af7905a414d2ee06ab76 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:04:34 2020 +0200 Some minor changes. commit 4e020246702889269efe1a191788992164c508d6 Merge: 50a64d927 e05c9267a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 16:17:40 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 50a64d927e6c4f4b0e4688e4cbfca694bc3f922a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 13:07:03 2020 +0200 Fix far plane. commit 7dd06da34cae8f9ea3b6c889fe965181f3fd3949 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:25:35 2020 +0200 Add shadows.glsl. commit 618a18c998778bf871b905a74657440fcc384c80 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:10:22 2020 +0200 Adding shadows, greedy meshing, and more. commit eaea83fe6a5cb1cb0ba8beef888183c718258496 Merge: 267018495 2f89b863e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 22:47:07 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 2670184954a13e4a9e7a4e35ba79aac0c5fac2f7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 21:20:01 2020 +0200 Make civsim and sites deterministic. For anything in worldgen where you use a HashMap, *please* think carefully about which hasher you are going to use! This is especially true if (for some reason) you are depending on hashmap iteration order remaining stable for some aspect of worldgen. commit f8376fd5dc72b4a9c2f51a6b4570d59c8b8e9343 Merge: 654f7e049 cdee191dd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 17:53:57 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 654f7e049258d9da27c09608bbe6a46ffa8787e5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed May 20 21:22:30 2020 +0200 Correct backface culling. commit 560501df05ca725409b0f2e4eb31bdfdc15fd0c7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue May 19 17:22:06 2020 +0200 Greedy messhing for shadows. commit a4d87e1875ca543436e6bbbeb20348facc5a52d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun May 17 05:59:00 2020 +0200 Shadow maps work for lantern. commit 243d0837b8a3b08172c9a3c348d964d7ddc2a0a8 Merge: 04382dc28 71dd520cd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:53:13 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 04382dc28632b6c66e8821f6870c0daaa1c1901a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:22:17 2020 +0200 WIP: better graphics config, better LOD, shadow maps. commit 22ddbad3eb32bfa70f0932176022208fe67ded81 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 18:54:09 2020 +0200 Minor shader fixes. commit 746a10e8d01ac235f994b0cde78fa48998602a1f Merge: 0f4a0e763 40ab94673 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 04:02:09 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0f4a0e763db3afbdc4fb0558611f38326ca87151 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 23:03:24 2020 +0200 Switch back to pop-in terrain. commit dd74fa7e4a53667b38811d7aec58d7f6a68889bb Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 22:58:55 2020 +0200 LOD shading closer to voxel shading. commit ef67bd58ba0bdaf622b078892d768263b6cba268 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 28 20:49:03 2020 +0200 Experimental underwater lighting. commit 2c5ad9d07605e80d5fd5679dd3a5d70c605b86a9 Merge: 748279835 303967a6f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 22:35:24 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7482798354eda18c8207950080fc24d443a369de Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 21:59:55 2020 +0200 Replace discard in figure-frag. commit d83b4ae69be4912f69bf7835f509c68a1c7770a4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:45:57 2020 +0200 Fix sprite lighting, HDR from focus_pos. commit 0594238004f116274905fa0ed7c2b6c417ed1d29 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:14:10 2020 +0200 Proper HDR from point lights. commit 48c93d2b41ce5743103d18e76cc228f5ac766492 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 14:01:43 2020 +0200 Brighter ambiance, darker LOD shadows. commit e0452e895ccfa8a43f368cae3b8b8aedc24dad93 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 13:13:23 2020 +0200 More proper HDR. commit 4c6da3ed16cfeebb455e40da5f557b4af9a499d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 00:13:10 2020 +0200 Trying LOD noise. commit 682a3d74c85df5503ffe1fc1cc891bce789df1ad Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 23:11:08 2020 +0200 Fix LOD heights in towns. commit cc39e5734e8b18f9077bf42e66337c1319dd6b6e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 21:01:23 2020 +0200 More LOD fixes. commit 8116b21c2e51c836e77894e309ac273caf2917b3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:54:43 2020 +0200 I like this coloring. commit bc2560ea90b36f4b46190005344232d993043ac3 Merge: 14effdd5d e690efe71 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:48:33 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 14effdd5db8747fcf3eb34f03b46b7792e92d1c5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:24:35 2020 +0200 Re-saturate. commit 48a643955d4435b78179acba0beb4a979905cc31 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:23:57 2020 +0200 Various fixes. commit f7b497a0c25f4ad4682c71dd1ed6f608052feb9b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 03:22:49 2020 +0200 Render figures again. commit 44e4aad48deba8266b9f8bdfd3db096b381f5327 Merge: e6f0a5a98 9ec319a18 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 02:01:04 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit e6f0a5a981a82533ba188fff0a54ce98577bb152 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 24 16:12:20 2020 +0200 Add atmospheric scattering. commit f2953087f691a8edbc001cb98ebf5059fc6f8ac0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 23 00:01:20 2020 +0200 Fix shadowing for specular reflections. commit ddd4a67a9799b8d08c7dc0c2bec90621c2bed0e3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Apr 22 22:56:12 2020 +0200 HDR fixes. commit 1015e60deef3c447381996277df7496707a63bd0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 21 18:25:19 2020 +0200 More lighting changes. commit 80c264abd111fb237e57843efcb5c071d4f84613 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 13 00:29:59 2020 +0200 Lighting experiments. commit 8414987e589dd5102bad89762a3adaccc0bfe957 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 9 02:38:40 2020 +0200 WIP -- lighting changes and soft shadows. commit 9cd2b3fb0d6b49776c6dfe463e4169637250b11a Merge: c7ea687eb 8b149ad11 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:29 2020 +0200 Merge branch 'sharp/new-lighting' into sharp/small-fixes commit c7ea687ebbc5aace1b455f134a5bf49ce2c7434a Merge: 476441531 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:02 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 8b149ad11ad4bb75018fcf9519baec27d1c95951 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:32:39 2020 +0200 Trying out a new lighting model. commit b0ac9f36f755dd06f7c17c46150568064790864f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 07:56:11 2020 +0200 Use bicubic interpolation for terrain. commit f6fc9307a121514b614bc50ef8eb055953e7da8a Merge: 33140a295 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 05:01:41 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 4764415312aae6e9ac2d00e86e84577cb958f1ab Merge: ed2d0111d 13388ee6a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 04:54:48 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 13388ee6a42943f3f79a9cb488346cef18e272fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 20:30:08 2020 +0200 Various fixes (to coloring and to soft shadows). commit fbd084a94a067082a87cd6d28b82054709bc9265 Merge: 5a089863b 4fdf6896a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 18:50:38 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/map-colors commit ed2d0111d994262ae836d84d1fe5a45e4de72a0b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 06:49:27 2020 +0200 Combining colors and LOD. commit 88342640c6b835114d01c797b89fdede3b0a2108 Merge: 33140a295 5a089863b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:49:20 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 33140a2951b8212725f42c758b277aaec4d888f7 Merge: 4c65a5aed f34d4b379 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:36:21 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 5a089863beb01d4794bbe3580ada47b278715ea2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 03:17:49 2020 +0200 Making maps brighter. This is probably not the right way to do it, but oh well! commit 32b2c99109dd486aa922886081068f9c550c83f2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 02:46:36 2020 +0200 Horizon mapping and "layered" map generation. Horizon mapping is a method of shadow mapping specific to height maps. It can handle any angle between 0 and 90 degrees from the ground, as long as know the horizontal direction in advance, by remembering only a single angle (the "horizon angle" of the shadow map). More is explained in common/src/msg/server.rs. We also remember the approximate height of the largest occluder, to try to be able to generate soft shadows and create a vertical position where the shadows can't go higher. Additionally, map generation has been reworked. Instead of computing everything from explicit samples, we pass in sampling functions that return exactly what the map generator needs. This allows us to cleanly separate the way we sample things like altitudes and colors from the map generation process. We exploit this to generate maps *partially* on the server (with colors and rivers, but not shading). We can then send the partially completed map to the client, which can combine it with shadow information to generate the final map. This is useful for two reasons: first, it makes sure the client can apply shadow information by itself, and second, it lets us pass the unshaded map for use with level of detail functionality. For similar reasons, river generation is split out into its own layer, but for now we opt to still generate rivers on the server (since the river wire format is more complicated to compress and may require some extra work to make sure we have enough precision to draw rivers well enough for LoD). Finally, the mostly ad-hoc lighting we were performing has been (mostly) replaced with explicit Phong reflection shading (including specular highlights). Regularizing this seems useful and helps clarify the "meaning" of the various light intensities, and helps us keep a more physically plausible basis. However, its interaction with soft shadows is still imperfect, and it's not yet clear to me what we need to do to turn this into something useful for LoD. commit f8926a5737ddc51f3d585c651a64c43677aae0f4 Merge: a1aee931e 875ae6ced Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Mar 13 13:32:42 2020 +0100 Merge remote-tracking branch 'origin/master' into sharp/map-colors commit 4c65a5aed353b119aea65a2aaeb94549b67beb42 Author: Treeco <5021038-Treeco@users.noreply.gitlab.com> Date: Mon Feb 24 16:48:05 2020 +0000 Made LOD setting slider exponential commit 2fa7b2d20d7233dc8bfd64f9f7f54617575248f1 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 17:49:53 2020 +0000 Added mist to LoD commit aab059a450b5f635777129ff82cc15b662965c3c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 15:14:06 2020 +0000 Added LoD slider commit 779c36b538121c5ade3633ae5cb67bb14c8c3877 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:54:55 2020 +0000 Reduced cost of vertex pushing commit 9fea150473906b166365b738ebcea07c697daf3d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:38:53 2020 +0000 Fixed maths, improved LoD resolution commit 5481df38fea5bf183ff376a3337179cfaa5233dc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 11:22:50 2020 +0000 Dynamically relocate LoD vertices to enhance details commit a3e36a50ababd615da7db1b26158c7906a5def01 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 18:13:51 2020 +0000 Simpler terrain spiral rendering commit 255f450ae9ac8763db4bede075fb409161ed57cc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:53:17 2020 +0000 Better LoD precision commit 3d027aebe812a5b8658a4eb8123dc9f61b3776d2 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:04:03 2020 +0000 Better falloff commit be775c9484b457b2c0b1a494aec03392d0c70e76 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 15:30:45 2020 +0000 Applied good ideas from experimental branch commit 58587b68545a23c5c04ab4574a4b94b3bc982246 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 16:15:13 2020 +0000 Minor fixes to LoD merging commit 7b42aebd709c14df2db766aad61d9280ad24d84d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 15:04:44 2020 +0000 Capped LoD dragging commit 8aafc559f87124e1ea5ca6e3ddc2aa0c242d793c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:54:37 2020 +0000 Better blending between LoD and terrain border commit edd3455d5161792d87ddc8eadc0ecbad5532b284 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:40:19 2020 +0000 Fixed LoD z depth, added sea level offset commit b9b06744620114dd5556e73f64fa93c145503a7c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:27:43 2020 +0000 Better LoD smoothing commit a1aee931e790431560cd2d953ad61d9497072afd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Feb 21 14:52:17 2020 +0100 Adding shadows. commit 2400786c13dd891c131ed86d48d05df516a8a778 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 13:48:40 2020 +0000 Use world map as LoD source commit dbf650f504a4c25fbbc2096ac3616c736bf52d23 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Jan 20 00:48:14 2020 +0000 Better clouds at distance commit 5e6f81b86cdb9730b9b056877b19257075fd5fa8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Jan 19 23:59:02 2020 +0000 sync commit 745e7540ddb000cc645f612767b337c2ddc3f7c0 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 12:40:48 2019 +0000 Improved cloud falloff mist, faster noise sampling commit f6a200d0cb866196ba57697466755f9e0c7ea5d8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 10:09:00 2019 +0000 Improved long-range depth precision, removed unnecessary LoD polygons commit 63d1b2bb2292898d59fb4f4e502201103dfeb86f Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 20:57:46 2019 +0000 Working LoD shader commit f13d98ee3e58f881e8b978861a67663b59ed91ec Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 11:03:40 2019 +0000 LoD first attempt (stack overflow issue)
2020-08-20 18:34:59 +00:00
"rayon",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"ron 0.7.0",
move botclient to client/src/bin/bot start it with: - (cd client && RUST_BACKTRACE=full RUST_LOG=trace VELOREN_USERDATA_STRATEGY=executable cargo run --bin bot --features="bin_bot")
2021-03-12 00:29:35 +00:00
"rustyline",
"serde",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"specs",
Setup client binary that connects to the server with a group of clients positioned and moving in a few different patterns for profiling the server under network load.
2021-12-21 16:35:49 +00:00
"structopt",
move botclient to client/src/bin/bot start it with: - (cd client && RUST_BACKTRACE=full RUST_LOG=trace VELOREN_USERDATA_STRATEGY=executable cargo run --bin bot --features="bin_bot")
2021-03-12 00:29:35 +00:00
"termcolor",
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
"tokio",
Convert all other veloren crates to use tracing - Completely removed both `log` and `pretty_env_logger` and replaced with `tracing` and `tracing_subscriber` where necessary. - Converted all `log::info!(...)` et al. statements to just use the shorthand macro i.e. `info!`. This was mostly to make renaming easier.
2020-06-21 14:26:06 +00:00
"tracing",
update dependencies
2021-03-21 21:53:44 +00:00
"vek",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"veloren-common",
Move Specs code to own common_ecs create, put tracy and macros into common_base
2021-03-08 22:40:02 +00:00
"veloren-common-base",
move botclient to client/src/bin/bot start it with: - (cd client && RUST_BACKTRACE=full RUST_LOG=trace VELOREN_USERDATA_STRATEGY=executable cargo run --bin bot --features="bin_bot")
2021-03-12 00:29:35 +00:00
"veloren-common-ecs",
move tracing code to own crate
2021-03-28 23:40:53 +00:00
"veloren-common-frontend",
Moved common networking code to common/net, clippy fixes
2020-12-13 17:11:55 +00:00
"veloren-common-net",
seperate sys/state
2021-04-06 15:47:03 +00:00
"veloren-common-state",
Rename common-sys to common-systems and rearrange common-state slightly
2021-03-29 02:35:13 +00:00
"veloren-common-systems",
fmt
2021-03-05 01:23:11 +00:00
"veloren-network",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
[[package]]
name = "veloren-common"
Change the version number to 0.10
2021-06-12 08:14:07 +00:00
version = "0.10.0"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
fmt
2021-03-05 01:23:11 +00:00
"approx 0.4.0",
use bitflags instead of HashSet
2021-04-06 17:18:40 +00:00
"bitflags",
- add Polaris Lantern, created by Gemu and Uncomfy for Christmas
2021-12-11 23:42:15 +00:00
"chrono",
"chrono-tz",
Added non-admin moderators and timed bans. The security model has been updated to reflect this change (for example, moderators cannot revert a ban by an administrator). Ban history is also now recorded in the ban file, and much more information about the ban is stored (whitelists and administrators also have extra information). To support the new information without losing important information, this commit also introduces a new migration path for editable settings (both from legacy to the new format, and between versions). Examples of how to do this correctly, and migrate to new versions of a settings file, are in the settings/ subdirectory. As part of this effort, editable settings have been revamped to guarantee atomic saves (due to the increased amount of information in each file), some latent bugs in networking were fixed, and server-cli has been updated to go through StructOpt for both calls through TUI and argv, greatly simplifying parsing logic.
2021-05-08 18:22:21 +00:00
"clap",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"criterion",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"crossbeam-channel",
update dependencies
2021-06-04 07:44:30 +00:00
"crossbeam-utils 0.8.5",
move tools and chat-cli in src/bin and examples
2020-12-12 01:12:00 +00:00
"csv",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"dot_vox",
Added make_block command
2020-06-27 18:39:16 +00:00
"enum-iterator",
Sprite interaction now uses pathfinding to check that it can be picked up.
2021-08-30 01:50:26 +00:00
"fxhash",
switch to hashbrown 0.11 and specs 0.16.2
2021-06-07 11:01:01 +00:00
"hashbrown 0.11.2",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"indexmap",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"kiddo 0.1.7",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"lazy_static",
Updated lockfile
2020-09-20 09:14:29 +00:00
"num-derive",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"num-traits",
update crates
2021-09-20 10:05:41 +00:00
"ordered-float 2.8.0",
Add graphviz diagram generator for crafting recipes.
2021-06-08 18:42:51 +00:00
"petgraph 0.5.1",
update depednencies
2021-07-08 10:21:02 +00:00
"rand 0.8.4",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"rayon",
Update `assets_manager` to 0.7
2021-12-12 19:01:52 +00:00
"ron 0.7.0",
(See sharp/lod-history) LOD, shadows, greedy meshing, new lighting, perf --- Pretty much a Veloren fork at this point. Here's a high level overview of the changes (will be added to CHANGELOG just before merge). At a high level this MR incorporates roughly two groups of changes. The first group consists of new game features: more flexible map sizes, level of detail terrain, shadow maps, and a new lighting engine. This is "feature work" that (mostly) only adds new things to Veloren, and mostly shouldn't affect old stuff. The second big group of changes are those addressing the fallout from all the new features. These include performance fixes of various sorts: the addition of multiple graphics options and optimization of the cheap ones to avoid work, switching all voxel models to use some variant of greedy meshing, switching over much of our CPU-side vector math to exploit SIMD instructions (coinciding with a fork of `vek`), and a rewrite of how the UI handles text rendering (coinciding with updates to our fork of `conrod`). Making Veloren's hardcoded colors appear correct under the new lighting engine also required considerably changes (TODO: Fill in this section when it's complete). The second category of changes often heavily touches code owned by other people, including frequently modified code "owned" by a handful of people, so I recommend that this code be reviewed particularly carefully. --- At a high level (each will be described in more detail below): - The world map has been refactored. - The world size is no longer hardcoded (@zesterer). - The map generation code was made generic to allow using it outside of the `world` crate (@zesterer). - On world creation, we now compute *horizon maps* (@zesterer). - The way we pass the world from the server to the client has been updated (@xMAC94x). - Artifacts related to image rotation were fixed (@imbris). - Multiflow rivers were enabled (@zesterer). - In the process of making changes related to the world map, various incidental fixes and optimizations were required. - The new *level of detail* feature was added (@zesterer wrote part of this and has checked out the rest). - A new LOD terrain rendering step was added to the pipeline. - The LOD terrain quality was made configurable via a graphics setting. - Horizon maps were used to cast shadows from LOD chunks on both LOD and non-LOD terrain. - A "voxelization" effect was incorporated into rendered LOD terrain to make it blend better into the world. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Veloren's lighting has been completely overhauled (@zesterer has already checked most of this out). - A semi-accurate index of refraction was assigned to our materials. - A new, more realistic, physically based approach to lighting was used using the *Ashikhmin Shirley* BRDF. - We emulate *atmospheric scattering* using equations designed for measuring solar panel light exposure. - We attempt to compute *realistic light attenuation* in water using its real material properties. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Point and directional lights now cast realistic shadows, using *shadow mapping.* (@imbris, @zesterer, @Treeco, @YuriMomo) - Point light shadow maps were added to the rendering pipeline, using geometry shaders and *seamless cube maps*. - Directional light shadows were added to the rendering pipeline, using LISPSM together with disabling *depth clamping*. - "Shadow-only" chunks and NPCs were added to prevent shadows from models behind you from disappearing. - In the process of making changes related to shadow maps, various incidental fixes and optimizations were required. The addition of shadow maps, LOD terrain, and the new lighting all led to significant performance degradation, on top of other changes happening in master. Therefore, a large number of performance improvements were also needed: - The graphics options were made much more flexible and configurable, and shaders were optimize. - New options were provided for how to render lights and shadows (@Pfauenauge, @zesterer). - Graphic setting storage and configuration were overhauled to make adding new features easier (@Pfauenauge, @imbris). - Shaders were rewritten to utilize GLSL's preprocessor to avoid overhead (@zesterer, @YuriMomo). - In the process of making changes related to providing additional rendering options, various incidental fixes and optimizations were required. - Voxel model creation was switched to use *greedy meshing.* - A new voxel meshing method, greedy meshing, was added (@imbris). - Uses of the older meshing methods were migrated to use greedy meshing (@imbris, @jshipsey, @Pfauenauge). - New restrictions were added to terrain, figure, and sprites to future proof them for further optimizations (@jshipsey, @Pfauenauge, @zesterer). - Most positions are now relative to either chunk or player position for better precision (@imbris, @zesterer, @scottc). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - Animation and terrain math were switched to use SIMD where possible. - Fixes were made to vek to make its SIMD feature usable for us (@zesterer, @imbris). - The interface and types used in bone animation were changed in various ways (@jshipsey, @Snowram, @Pfauenauge). - Redundant code generation for body animation is now partly taken care of by a macro (@jshipsey, @Snowram, @Pfauenauge). - Animation code was modified to to use vek's SIMD representation where possible (@jshipsey, @Snowram, @Pfauenauge). - Terrain meshing code and shadow map math were also modified to use vek's SIMD representation (@imbris). - SIMD instruction generation was enabled (@YuriMomo, @jshipsey, @Snowram, @imbris, @Angelonfira, @xMAC94x). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - The way we cache glyphs was completely refactored, fixed, and optimized. - Our fork of `conrod` was optimized in various ways (@imbris). - Our fork of `conrod` now exposes whether a widget was updated during the current frame (@imbris). - Our use of the glyph cache was rewritten for correctness (@imbris). - A *text cache* was introduced that lets us skip remeshing glyphs that have not changed (@imbris). - Various changes were made to reduce pressure on the glyph cache, with more planned (@imbris, @Pfauenauge). - In the process of making changes related to the glyph cache, various incidental fixes and optimizations were required. - Colors were changed to keep Veloren's look consistent with master. - Some older tree models were brought back (@Pfauenauge). - TODO(@Sharp): All hardcoded colors were extracted and made hotloadable. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Hardcoded colors were fixed to conform to Veloren's style. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Color models were fixed to conform to Veloren's style. A detailed description of the involved changes follows. --- - The world size is no longer hardcoded. All functions dependent on world size now take a `WorldSizeLg`, which holds the base 2 logarithm of each actual world dimension and is guaranteed to maintain certain properties (outlined in `common/src/terrain/map.rs`). Additionally, many utility functions that utilize the world size were moved into `common` as well (mostly `common/src/terrain/mod.rs`). Finally, the world map format was updated in order to store its size explicitly, with a migration path from the old format that should work whenever the old formatted map was a square (practically always). See `world/src/sim/mod.rs` for these changes. - The map generation code was made generic to allow using it outside of the `world` crate. The parts of the map generating code that do not need to query the world were moved over to `common/src/terrain/map.rs`, allowing them to be used from the client without creating a dependency on `world`. The rest of it was turned into helper functions in `world/src/sim/map.rs`, which can be passed as closures to the generic map generation code to complete its construction. This also means that colors are now passed in separately to the map generation function. See <https://veloren.net/devblog-78/> for more details. - On world creation, we now compute *horizon maps*. See the function in `world/src/sim/util.rs`. Given a height map and a plane intersecting that height map, our horizon maps allow us to encode enough information to reconstruct shadows for each point on the height map using only the *horizon angle* (the angle at which the sun starts to become visible). As Veloren's sun only covers one plane, this is sufficient for encoding sun shadows for LOD terrain, by encoding two angles per chunk (one for each 90 degrees the sun covers). We can also use this for the moon, if we want, since the moon follows the same path. Additionally, we store the *height* of the furthest occluder, to try to make the shadows volumetric; so this means 4 bytes in total for each chunk. Support for horizon maps has been merged into the map functionality in common as well. - The way we pass the world from the server to the client has been updated. Rather than passing the prerendered map, we instead pass three maps with values for each chunk; one with the color information, a second with altitude information, and a third with horizon map information. We then reconstruct the map on the client, together with some additional information we send from the server (like the sea level and maximum height). See `common/src/msg/server.rs` for a detailed description of the format of `WorldMapMsg`, and `server/src/libr.rs` and `client/src/lib.rs` for details of the map construction and parsing. - Artifacts related to image rotation were fixed. See the commit message for commit SHA `cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e` for a detailed explanation. This involved changes to shaders, the addition of a new type of graphic (also reflected in the graphic cache) that allows specifying a border color (which automatically makes the associated texture immutable), and some related fixes. I reproduce the first two paragraphs of the MR description as well: ``` Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). ``` - Multiflow rivers were enabled. This does not really need to be part of this MR, and would be easy to revert, but since it seemed to provide a nice improvement it's currently packaged with it. We already computed multiple outflows from each chunk for erosion purposes long before this MR. However, we never modified river rendering to be able to handle this case (just a single downhill river flow is complex enough!) so this was not exposed when deciding which chunks were rivers. Now that - In the process of making changes related to the world map, various incidental fixes and optimizations were required. Some examples of fixes include making sure terrain is never lowered to below sea level (to make the shadow maps report correct values), fixing map altitudes and colors to understand things like cliffs and "block level" coloring (that doesn'te xist on the column level), and fixing a crashbug when rendering images for the UI where source pixels are strongly rectangular. Some examples of related performance fixes include avoiding allocating a fresh vector for all the maps (i.e. copying it over to change the format from `[u32; n]` to `DynamicImage` and then copying again to convert to `RgbaImage`), and instead using the `gfx::memory::slice` function to accomplish the same thing. These sorts of changes are spread all arond the code. This includes the additon of a new scene, `voxygen/src/scene/lod.rs`, a new pipeline `voxygen/src/render/pipeline/lod_terrain.rs`, and new shaders `assets/vxygen/shaders/lod-terrain-vert.glsl` and `assets/vxygen/shaders/lod-terrain-frag.glsl`, as well as associated changes to the renderer in `voxygen/src/render/renderer.rs`. The main idea behind our initial approach to LOD was to take the world data we now get from the server (altitude, color, and horizon mapping). - Some previously computed values were turned into shader uniforms for better prediction on weak processors. (@zesterer) - Calls to power or trig functions were removed or replaced with multiplications, where possible. - After some deliberation - To properly handle sprite "waving" for nearby sprites, We explicitly designed the greedy meshing system with figures and sprites in mind. In both cases, we want to be able to *efficiently* pack many different models into the same texture, especially in cases where we know we will either not be removing any of the grouped-together from the models from the texture, or will remove all of them at once (so they can be packed into some specific subtexture). For sprites, since we know every model in advance and never intend to deallocate them, we currently pack them all as efficiently as possible into one giant tetxure atlas. However, in the future we might opt to pack them slightly less efficiently in exchange for shrinking the sprite vertex size. For figures, we pack all the textures for each *model* into the same atlas. is a global texture atlas used for every sprite, and for figures which is why we have the ability to mesh multiple models to the same texture area (using the simple texture atlas allocator) without requiring intermediate vector allocations. This is accomplished by delaying the time when we actually write the color and light data to the texture until *after* all the model vertices have been meshed; then, we can just allocate the whole color/light array at once, making the atlas we use an exact fit. In computer science-y terms, we accomplish this delay by, after we perform the initial greedy meshing (without texture information), not continuing to create the texture data, but instead constructing a *continuation*--that is, a function that, when called, will execute the rest of the computation. We push this continuation (which in Rust terms is a `FnOnce` closure that takes the `ColLightsInfo` that it is supposed to write to as context) onto a onto a vector resizing. To allow for suspended writes to texture data, Rust pointed out to me that the continuation that would eventually write the color and light data to the texture atlas (the one that is shared by all models sharing the same greedy mesher) would have to *own* whatever data it mshed. Because we often generate the model data to mesh as a temporary in `voxygen/src/load.rs`, the - Matrix multiplications in the shader were reduced for figure data (@zesterer). - Vertex "waves" for fluid data were removed. - Terrain "bending" near edges was removed. - Scaling was fixed to make sure empty space was not introduced in a space previously occupied by a block. It was also changed to take ownership of its voxel data, rather than sharing it, to let it be used with meshing. - Rust's nightly version was bumped in order to use the `array_map` function, which lets us reuse more code between the simple map and `FigureModelCache`. - PositionedGlyph::standalone. --- I tried to cite sources in many cases[^realtime],[^lloyd],[^lispsm],[^pbrt],[^greedy],[^tjunctions] where I needed features from elsewhere but I am particularly grateful for the following resources, esepcially where they have accompanying source code. I linked all of them that are accessible to the public (those that are not were obtained through legal means). [^realtime]: Eisemann, Elmar, Michael Schwarz, Ulf Assarsson, Michael Wimmer. Real-Time Shadows. A K Peters/CRC Press (T&F), 20160419. [^lloyd]: Lloyd,B. 2007. [Logarithmic perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). PhD thesis, University of North Carolina. [^lispsm]: Wimmer, M., Scherzer, D., and Purgathofer, W. 2004. [Light space perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). In Proceedings of Eurographics Symposium on Rendering 2004, pp. 143– 152. [^pbrt]: Pharr, Matt, et al. [http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf](Physically Based Rendering: From Theory to Implementation). Third edition, Morgan Kaufmann Publishers/Elsevier, 2017. [^greedy]: mikolalysenko. “Meshing in a Minecraft Game.” 0 FPS, 30 June 2012, <https://0fps.net/2012/06/30/meshing-in-a-minecraft-game/>. [^tjunctions]: blackflux. “Meshing in Voxel Engines – Part 1.” Blackflux.Com, 23 Feb. 2014, <https://blackflux.wordpress.com/2014/02/23/meshing-in-voxel-engines-part-1/>. I am also especially grateful to Khronos, Wikiepdia, and stackoverflow for answering many of my specific questions while writing the MR. --- Squashed commit of the following: commit 300505e7305a2fdac722a808ee8538323f215f39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 18:46:25 2020 +0200 Fixing cargo doc and typo in CHANGELOG. commit ec0aeb18e8499d7d84ef818331b4b65c3d76cea6 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 15:38:50 2020 +0200 Hopefully final commit for the LOD branch. commit 5e8ea0b1eaac02903a02feb2eb038d195de4872f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 10:14:26 2020 +0200 Falling back to power as stopgap. commit e44a1cbf46504ee9931a01bdc9033e145500d557 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 09:25:41 2020 +0200 Address imbris feedback. Temporarily disables shiny water, lowers max VD. These restrictions will be lifted soon after merging. commit 561e25778a108ac3712f5ec2ce3a51234c4430d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 08:31:13 2020 +0200 Tweaking shaders a bit. commit 7d19259078ce0dd7b3742ad7d0cb3fab3ece3fdc Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:59:43 2020 +0200 Fix view example as well. commit 051cd4934e0fad2c0b15db4380a4189fa318679f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:29:06 2020 +0200 Fix meshing benchmark. commit c95e07db3b4dcca285678985e65e31b927cb1c61 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 05:46:22 2020 +0200 Address MR feedback, fix scene clouds. commit 1bfb816cabdb3ffc1e507a009c2d98696b4b573a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:39:36 2020 +0200 Incorporating Pfau's figure color changes. New eyes and new humanoid colors. commit 3f9b89a3ac7b3356b1dba0d1a8f6541357f81469 Merge: e2f5162e4 62c53963a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:29:41 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit e2f5162e4f96f4124aa43488f7245d341b3dcfd4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:28:38 2020 +0200 World colors are all hotloadable. They live in assets/world/style/colors.ron. Only a small handful of hardcoed colors remain in World; they are either part of the map, or difficult to disentangle from the rest of the computation. Comments are made where appropriate. commit 62c53963abe1975009d34a8f9515a355bef24f31 Author: Marcel Märtens <marcel.cochem@googlemail.com> Date: Wed Aug 19 15:59:00 2020 +0200 replace pretty_env_logger with tracing commit 5b1625f99d9586fe80e2232f583ec5af9f953099 Merge: d71003acd 4942b5b39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:15:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit d71003acdabeff970b3928e97c26af6847b5b78e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:14:34 2020 +0200 Hotloading colors, part 1: colors in common. Currently, this just entails humanoid colors. There are only three colors not handled; the light emitter colors in common/src/comp/inventory/item/tool.rs. These don't seem important enough to me to warrant making hotloadable, at least not right now, but if it's needed later we can always add them to the file. commit 63b5e0e553eb2ea49276f192a6fc7dd65254270d Merge: c32b337a4 6d2c4b9c1 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 13:05:37 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c32b337a46e10d9de473d178a94a3ccd61c39bb3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:52:04 2020 +0200 Fixing LOD grid, for real. commit a166ae0360395387e09fb35a1f84210c2ce5ec24 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:28:05 2020 +0200 Addressing imbris's initial feedback. Fixes two minor bugs: explosion particles were no longer spawning randomly, and LOD grids were not perfectly even. commit 4cbad004f44060994252dd3d38647a14a589712f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:27:58 2020 +0200 Bumping nightly per request. commit 548680276aac77c25d43d16b5622f847d474dbef Merge: acc098604 8f8b20c91 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:26:06 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit acc0986040589a3492f88a740bc3c3fc693b26d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:28:32 2020 +0200 Lower resolution due to lying drivers. commit d3b878de2a52c358d2944a6bbd0555dad7fbdb10 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:15:38 2020 +0200 Fix issues msh encountered with Intel 4600. commit 10245e0c1b0cb6fae10d86409435364edc6102ef Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 21:15:02 2020 +0200 Merge more models into one mesh than we did previously. commit 3155c31e663c52ae5c3a53d5fb5665892a1a498a Merge: 7204cc8a7 3c199280e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:35:22 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7204cc8a7a4f74a30306bd205d9834fee4bb944f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:34:43 2020 +0200 Fix not yet done NPC animations. This forces them all to be the idle animation if not specified. This fixes issues where you'd have giant NPCs in water. commit bc83360f2a08918f19d417b5f772e1ff554dba08 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 19:36:37 2020 +0200 Try to fix some bugs: - Z fighting with LOD terrain and water. - Audio SFX not playing. commit 1fd104aa603bf3781b6526a5cada46aeca3049dd Merge: 862df3c99 7c2c392a3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 12:02:31 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 862df3c9976c4da9bd7cfd784f1a85973127968a Merge: 0a4218ed9 75c1d4401 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 05:52:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0a4218ed9d541a2b34c133351bea38a99ddf4ea7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 22:27:14 2020 +0200 Fix particle depth. commit f51dfdeb442d0dd5243dd2f344fa4be295bd0875 Merge: c6251a956 5e6dc0471 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:19:04 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit c6251a956ad376400dca5c23420cf8d213dc8fdf Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:15:46 2020 +0200 Cache figures more intelligently. Cache figures for longer, and don't cache character states for the player except where they actually affect the rendered model. commit 0ed801d5404982c6fb63b1eaa4567d908b294c9d Merge: c11b9bdf0 eea64f78f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 16:32:24 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c11b9bdf0a53bf9884d2f5a48fec9b01d582df1a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 11:47:15 2020 +0200 Remove unneeded Clippy annotation. commit 16aa9ef40af56d69289d00aafb3deadfb8bd4f35 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 8 00:53:02 2020 +0200 Fix hotloading and Clippy. commit 3dc973e0be5b758da1e9805eb764ad401374cd0c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 23:50:27 2020 +0200 Major speedups with SIMD. commit fba64a7d93d5a96077ce87287bbce6ab9b7fbcae Merge: 76429d00e d1e10b178 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:19 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 76429d00eea00d212fbd672a84ee91e75b19b938 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:10 2020 +0200 Add clippy.toml. commit c79f512f84dbb83cb82b7954db68ff241dfd8e41 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 11:55:20 2020 +0200 Fix all clippy issues, clean up Rust code. commit 6f90e010b3fbefb53b0d632e819931350015b6b8 Merge: 77a8c7c26 5929cfa5c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:30 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 77a8c7c267d3f44a1a62bd6b2274359973c5e4d4 Merge: b44e44232 44febaabd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:10 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 5929cfa5c713aa392110bbb62407f76caf53c3df Author: jshipsey <jshipsey18@gmail.com> Date: Thu Aug 6 20:47:27 2020 -0400 fixed in-hand arrow bug commit b44e442325d828f1cd564d66908f89d09e80474b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 6 13:40:35 2020 +0200 Miscellaneous performance improvements. commit be37acf287c1360d8085862526ac3365ffd1d768 Merge: 125d7fc6c c11876547 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 05:49:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 125d7fc6c4dcd8c8c5f27b8268a4d64f409f3644 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 04:55:31 2020 +0200 Abstract over simd vs. repr_c vectors. Also some minor improvements to Event size. commit d4d4956e9252e1241ce110b2aa85076c6b1e2a23 Merge: 5f3b7294a aced5f979 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:56:54 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 5f3b7294af1f8533edc2620b58863c248e2b07af Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:43:52 2020 +0200 Fix formatting issues I missed before. commit a428a3ebba70dcab63dd0f8cd983120c90617271 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:41:51 2020 +0200 Fix clippy warnings, part 1. There aer still a bunch of type too complex and function takes too many arguments warnings that I'll fix later (or ignore, since in the one case I did fix a function takes too many arguments warning I think it made the code *less* readable). commit ba54307540ed8a937ac08209730284fc653af85b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 30 13:22:42 2020 +0200 Fix light animations so they are removed when the light turns off. commit 7e0f4bcbf0f4717145d8beac40d52e3acebbe2aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 21:10:20 2020 +0200 Fix crash in edge case for pixel art. commit 56da06f7a351e2b949e9b014a90b974d511a0924 Merge: cf74d55f2 9f53a4a19 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:56:52 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:29:52 2020 +0200 Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). The first concern was addressed by fixing the dimensions of the map images drawn from the UI (so that we always use a square source rectangle, rather than a rectangular one according to the dimensions of the map). We also fixed the way rotation was done in the fragment shader for north-facing sources to make it properly handle aspect ratio (this was already done for north-facing targets). Together, these fix rendering issues peculiar to rectangular maps. The second and third concerns were jointly addressed by adding an optional border color to every 2D image drawn by the UI. This turns out not to waste extra space even though we hold a full f32 color (to avoid an extra dependency on gfx's PackedColor), since voxel images already take up more space than Optiion<[f32; 4]> requires. This is then implemented automatically using the "border color" wrapping method in the attached sampler. Since this is implemented in graphics hardware, it only works (at least naively) if the actual image bounds match the texture bounds. Therefore, we altered the way the graphics cache stores images with a border color to guarantee that they are always in their own texture, whose size exactly matches their extent. Since the easiest currently exposed way to set a border color is to do so for an immutable texture, we went a bit further and added a new "immutable" texture storage type used for these cases; currently, it is always and automatically used only when there is a specified border color, but in theory there's no reason we couldn't provide immutable-only images that use the default wrapping mdoe (though clamp to border is admittedly not a great default). To fix the maps case specifically, we set the border color to a translucent version of the ocean border color. This may need tweaking going forward, which shouldn't be hard. As part of this process, we had to modify graphics replacement to make sure immutable images are *removed* when invalidated, rather than just having a validity flag unset (this is normally done by the UI to try to reuse allocations in place if images are updated in benign ways, since the texture atlases used for Ui do not support deallocation; currently this is only used for item images, so there should be no overlap with immutable image replacement, so this was purely precautionary). Since we were already touching the relevant code, we also updated the image dependency to a newer version that provides more ways to avoid allocations, and made a few other changes that should hopefully eliminate redundant most of the intermediate buffer allocations we were performing for what should be zero-cost conversions. This may slightly improve performance in some cases. commit ad18ce939940a8c697270f6e9b94db9942fd8295 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 13:21:09 2020 +0200 Fix continent scale hack. commit 36b1cb074f5b195aebd7dbbc3da7f0246a1a18ec Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 12:11:40 2020 +0200 Enable loading different sized maps without a recompile. We may want to tweak the effects of the continent_scale_hack. commit 13b6d4d534cc4814b7cb3294ca41bbfea0a6b186 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 10:55:48 2020 +0200 Removing WORLD_SIZE, part 1. Erased almost every instance of WORLD_SIZE and replaced it with a local power of two, map_size_lg (which respects certain invariants; see common/src/terrain/map.rs for more details about MapSizeLg). This also means we can avoid a dependency on the world crate from client, as desired. Now that the rest of the code is not expecting a fixed WORLD_SIZE, the next step is to arrange for maps to store their world size, and to use that world size as a basis prior to loading the map (as well, probably, as prior to configuring some of the noise functions). commit 30b1d2c6428230a9eaa0d749cdcbbd6f1cbccd78 Merge: 7d56ba31b 1377b369f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:58 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 7d56ba31b445441461b28a07fc495d7d4f047c17 Merge: 2101113b4 598f14b25 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 1377b369f6db2258e910d467a5740f31789e3ded Author: Monty Marz <m.marzouq@gmx.de> Date: Sun Jul 19 23:25:38 2020 +0200 more saturated pumpkins commit ae8d50527f93bb0616c2ad46ce4dacb63bc37c6d Author: Monty Marz <m.marzouq@gmx.de> Date: Sat Jul 18 20:29:56 2020 +0200 acacia models commit 2101113b467e691de787392d7f20f1745f5637bd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 18 18:55:25 2020 +0200 Higher detail LOD. commit add2cfae04b4385fa5590e11e2bd5229d9dee0aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 16 01:57:39 2020 +0200 Revert some irrelevant stuff. commit 2e2ab3dc1eaa59a4aef7f8d34a53d8aae4c8553a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 15 13:30:49 2020 +0200 Fixing various things about shadows. * Correcting optimal LISPSM parameter. * Figure shadows are cast when they're not visible. * Chunk shadows stay cast until you look away. * Seamless cubemaps for point lights. * Etc. commit 6c31e6b56217274285b597af297036691ea5d897 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 19:50:26 2020 +0200 Fix shadow creation. commit 6332cbe006115ae205597529cd8bbccd146c2cca Merge: be438657c 930e0028b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:47:00 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit be438657c33d7b5bfb0a9582c3ed3fd366637323 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:28:08 2020 +0200 Tweaks to shadows. Added shadow map resolution configuration, added seamless cubemaps, documented all existing rendering options, and fixed a few Clippy errors. commit 23b4058906013c7d2a40c286e20e32c5fbd897ed Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 10:11:19 2020 +0200 Fix moon, use nonlinear noise for terrain. Note that the latter has a bit of performance cost. commit 7fbe5cbfbb9dc29607957b8e62f432a4deed193d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:23:02 2020 +0200 Address lies about max texture size. commit bcfc62b5e13a1cdd83f57535fde4694720bebfd9 Merge: 75e3626a7 18a08e8fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:22:08 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 75e3626a785919f43fdcf2127c2b10e3e4df2f9f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:21:52 2020 +0200 OpenGL 3.3 minimum. commit 18a08e8fe2739f02af99a5d2cb4e7c38c49e858b Author: Monty Marz <m.marzouq@gmx.de> Date: Tue Jul 7 23:57:52 2020 +0200 settings localization commit 90c5d1ca3620092bc3ae10b2211489eb1cf6f5e8 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 21:11:48 2020 +0200 Lower near distance. commit 0e66f02b25aaddaa2dfddbbc89cd67de54a9a7b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 20:09:01 2020 +0200 All sprites sway in the wind now. commit db1401a6910bf42dcf502462c90038752ff5fbdb Merge: 69e508d8c e8b4b29d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 19:34:17 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 69e508d8c94d8973033817ca86f357e466fc7c4d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 18:41:37 2020 +0200 Make it easy to switch to SIMD for math. commit ffe0f5928c7a7e87d00cb5426b3b1d831d7e02fd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 21:21:12 2020 +0200 Fix some issues with underwater rendering. commit bfda6da42f38fd02c31ee92c81ab785a3e50c2a0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 19:17:59 2020 +0200 Fix some minor display issues. commit 0ed752e087968cf901301884aaeae698e32ef8a5 Merge: ccc6a06a8 518edcb85 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:14:21 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit ccc6a06a8d4504d6b9f7af7905a414d2ee06ab76 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:04:34 2020 +0200 Some minor changes. commit 4e020246702889269efe1a191788992164c508d6 Merge: 50a64d927 e05c9267a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 16:17:40 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 50a64d927e6c4f4b0e4688e4cbfca694bc3f922a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 13:07:03 2020 +0200 Fix far plane. commit 7dd06da34cae8f9ea3b6c889fe965181f3fd3949 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:25:35 2020 +0200 Add shadows.glsl. commit 618a18c998778bf871b905a74657440fcc384c80 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:10:22 2020 +0200 Adding shadows, greedy meshing, and more. commit eaea83fe6a5cb1cb0ba8beef888183c718258496 Merge: 267018495 2f89b863e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 22:47:07 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 2670184954a13e4a9e7a4e35ba79aac0c5fac2f7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 21:20:01 2020 +0200 Make civsim and sites deterministic. For anything in worldgen where you use a HashMap, *please* think carefully about which hasher you are going to use! This is especially true if (for some reason) you are depending on hashmap iteration order remaining stable for some aspect of worldgen. commit f8376fd5dc72b4a9c2f51a6b4570d59c8b8e9343 Merge: 654f7e049 cdee191dd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 17:53:57 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 654f7e049258d9da27c09608bbe6a46ffa8787e5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed May 20 21:22:30 2020 +0200 Correct backface culling. commit 560501df05ca725409b0f2e4eb31bdfdc15fd0c7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue May 19 17:22:06 2020 +0200 Greedy messhing for shadows. commit a4d87e1875ca543436e6bbbeb20348facc5a52d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun May 17 05:59:00 2020 +0200 Shadow maps work for lantern. commit 243d0837b8a3b08172c9a3c348d964d7ddc2a0a8 Merge: 04382dc28 71dd520cd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:53:13 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 04382dc28632b6c66e8821f6870c0daaa1c1901a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:22:17 2020 +0200 WIP: better graphics config, better LOD, shadow maps. commit 22ddbad3eb32bfa70f0932176022208fe67ded81 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 18:54:09 2020 +0200 Minor shader fixes. commit 746a10e8d01ac235f994b0cde78fa48998602a1f Merge: 0f4a0e763 40ab94673 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 04:02:09 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0f4a0e763db3afbdc4fb0558611f38326ca87151 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 23:03:24 2020 +0200 Switch back to pop-in terrain. commit dd74fa7e4a53667b38811d7aec58d7f6a68889bb Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 22:58:55 2020 +0200 LOD shading closer to voxel shading. commit ef67bd58ba0bdaf622b078892d768263b6cba268 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 28 20:49:03 2020 +0200 Experimental underwater lighting. commit 2c5ad9d07605e80d5fd5679dd3a5d70c605b86a9 Merge: 748279835 303967a6f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 22:35:24 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7482798354eda18c8207950080fc24d443a369de Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 21:59:55 2020 +0200 Replace discard in figure-frag. commit d83b4ae69be4912f69bf7835f509c68a1c7770a4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:45:57 2020 +0200 Fix sprite lighting, HDR from focus_pos. commit 0594238004f116274905fa0ed7c2b6c417ed1d29 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:14:10 2020 +0200 Proper HDR from point lights. commit 48c93d2b41ce5743103d18e76cc228f5ac766492 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 14:01:43 2020 +0200 Brighter ambiance, darker LOD shadows. commit e0452e895ccfa8a43f368cae3b8b8aedc24dad93 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 13:13:23 2020 +0200 More proper HDR. commit 4c6da3ed16cfeebb455e40da5f557b4af9a499d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 00:13:10 2020 +0200 Trying LOD noise. commit 682a3d74c85df5503ffe1fc1cc891bce789df1ad Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 23:11:08 2020 +0200 Fix LOD heights in towns. commit cc39e5734e8b18f9077bf42e66337c1319dd6b6e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 21:01:23 2020 +0200 More LOD fixes. commit 8116b21c2e51c836e77894e309ac273caf2917b3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:54:43 2020 +0200 I like this coloring. commit bc2560ea90b36f4b46190005344232d993043ac3 Merge: 14effdd5d e690efe71 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:48:33 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 14effdd5db8747fcf3eb34f03b46b7792e92d1c5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:24:35 2020 +0200 Re-saturate. commit 48a643955d4435b78179acba0beb4a979905cc31 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:23:57 2020 +0200 Various fixes. commit f7b497a0c25f4ad4682c71dd1ed6f608052feb9b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 03:22:49 2020 +0200 Render figures again. commit 44e4aad48deba8266b9f8bdfd3db096b381f5327 Merge: e6f0a5a98 9ec319a18 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 02:01:04 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit e6f0a5a981a82533ba188fff0a54ce98577bb152 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 24 16:12:20 2020 +0200 Add atmospheric scattering. commit f2953087f691a8edbc001cb98ebf5059fc6f8ac0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 23 00:01:20 2020 +0200 Fix shadowing for specular reflections. commit ddd4a67a9799b8d08c7dc0c2bec90621c2bed0e3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Apr 22 22:56:12 2020 +0200 HDR fixes. commit 1015e60deef3c447381996277df7496707a63bd0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 21 18:25:19 2020 +0200 More lighting changes. commit 80c264abd111fb237e57843efcb5c071d4f84613 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 13 00:29:59 2020 +0200 Lighting experiments. commit 8414987e589dd5102bad89762a3adaccc0bfe957 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 9 02:38:40 2020 +0200 WIP -- lighting changes and soft shadows. commit 9cd2b3fb0d6b49776c6dfe463e4169637250b11a Merge: c7ea687eb 8b149ad11 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:29 2020 +0200 Merge branch 'sharp/new-lighting' into sharp/small-fixes commit c7ea687ebbc5aace1b455f134a5bf49ce2c7434a Merge: 476441531 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:02 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 8b149ad11ad4bb75018fcf9519baec27d1c95951 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:32:39 2020 +0200 Trying out a new lighting model. commit b0ac9f36f755dd06f7c17c46150568064790864f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 07:56:11 2020 +0200 Use bicubic interpolation for terrain. commit f6fc9307a121514b614bc50ef8eb055953e7da8a Merge: 33140a295 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 05:01:41 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 4764415312aae6e9ac2d00e86e84577cb958f1ab Merge: ed2d0111d 13388ee6a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 04:54:48 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 13388ee6a42943f3f79a9cb488346cef18e272fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 20:30:08 2020 +0200 Various fixes (to coloring and to soft shadows). commit fbd084a94a067082a87cd6d28b82054709bc9265 Merge: 5a089863b 4fdf6896a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 18:50:38 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/map-colors commit ed2d0111d994262ae836d84d1fe5a45e4de72a0b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 06:49:27 2020 +0200 Combining colors and LOD. commit 88342640c6b835114d01c797b89fdede3b0a2108 Merge: 33140a295 5a089863b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:49:20 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 33140a2951b8212725f42c758b277aaec4d888f7 Merge: 4c65a5aed f34d4b379 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:36:21 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 5a089863beb01d4794bbe3580ada47b278715ea2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 03:17:49 2020 +0200 Making maps brighter. This is probably not the right way to do it, but oh well! commit 32b2c99109dd486aa922886081068f9c550c83f2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 02:46:36 2020 +0200 Horizon mapping and "layered" map generation. Horizon mapping is a method of shadow mapping specific to height maps. It can handle any angle between 0 and 90 degrees from the ground, as long as know the horizontal direction in advance, by remembering only a single angle (the "horizon angle" of the shadow map). More is explained in common/src/msg/server.rs. We also remember the approximate height of the largest occluder, to try to be able to generate soft shadows and create a vertical position where the shadows can't go higher. Additionally, map generation has been reworked. Instead of computing everything from explicit samples, we pass in sampling functions that return exactly what the map generator needs. This allows us to cleanly separate the way we sample things like altitudes and colors from the map generation process. We exploit this to generate maps *partially* on the server (with colors and rivers, but not shading). We can then send the partially completed map to the client, which can combine it with shadow information to generate the final map. This is useful for two reasons: first, it makes sure the client can apply shadow information by itself, and second, it lets us pass the unshaded map for use with level of detail functionality. For similar reasons, river generation is split out into its own layer, but for now we opt to still generate rivers on the server (since the river wire format is more complicated to compress and may require some extra work to make sure we have enough precision to draw rivers well enough for LoD). Finally, the mostly ad-hoc lighting we were performing has been (mostly) replaced with explicit Phong reflection shading (including specular highlights). Regularizing this seems useful and helps clarify the "meaning" of the various light intensities, and helps us keep a more physically plausible basis. However, its interaction with soft shadows is still imperfect, and it's not yet clear to me what we need to do to turn this into something useful for LoD. commit f8926a5737ddc51f3d585c651a64c43677aae0f4 Merge: a1aee931e 875ae6ced Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Mar 13 13:32:42 2020 +0100 Merge remote-tracking branch 'origin/master' into sharp/map-colors commit 4c65a5aed353b119aea65a2aaeb94549b67beb42 Author: Treeco <5021038-Treeco@users.noreply.gitlab.com> Date: Mon Feb 24 16:48:05 2020 +0000 Made LOD setting slider exponential commit 2fa7b2d20d7233dc8bfd64f9f7f54617575248f1 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 17:49:53 2020 +0000 Added mist to LoD commit aab059a450b5f635777129ff82cc15b662965c3c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 15:14:06 2020 +0000 Added LoD slider commit 779c36b538121c5ade3633ae5cb67bb14c8c3877 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:54:55 2020 +0000 Reduced cost of vertex pushing commit 9fea150473906b166365b738ebcea07c697daf3d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:38:53 2020 +0000 Fixed maths, improved LoD resolution commit 5481df38fea5bf183ff376a3337179cfaa5233dc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 11:22:50 2020 +0000 Dynamically relocate LoD vertices to enhance details commit a3e36a50ababd615da7db1b26158c7906a5def01 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 18:13:51 2020 +0000 Simpler terrain spiral rendering commit 255f450ae9ac8763db4bede075fb409161ed57cc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:53:17 2020 +0000 Better LoD precision commit 3d027aebe812a5b8658a4eb8123dc9f61b3776d2 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:04:03 2020 +0000 Better falloff commit be775c9484b457b2c0b1a494aec03392d0c70e76 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 15:30:45 2020 +0000 Applied good ideas from experimental branch commit 58587b68545a23c5c04ab4574a4b94b3bc982246 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 16:15:13 2020 +0000 Minor fixes to LoD merging commit 7b42aebd709c14df2db766aad61d9280ad24d84d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 15:04:44 2020 +0000 Capped LoD dragging commit 8aafc559f87124e1ea5ca6e3ddc2aa0c242d793c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:54:37 2020 +0000 Better blending between LoD and terrain border commit edd3455d5161792d87ddc8eadc0ecbad5532b284 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:40:19 2020 +0000 Fixed LoD z depth, added sea level offset commit b9b06744620114dd5556e73f64fa93c145503a7c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:27:43 2020 +0000 Better LoD smoothing commit a1aee931e790431560cd2d953ad61d9497072afd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Feb 21 14:52:17 2020 +0100 Adding shadows. commit 2400786c13dd891c131ed86d48d05df516a8a778 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 13:48:40 2020 +0000 Use world map as LoD source commit dbf650f504a4c25fbbc2096ac3616c736bf52d23 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Jan 20 00:48:14 2020 +0000 Better clouds at distance commit 5e6f81b86cdb9730b9b056877b19257075fd5fa8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Jan 19 23:59:02 2020 +0000 sync commit 745e7540ddb000cc645f612767b337c2ddc3f7c0 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 12:40:48 2019 +0000 Improved cloud falloff mist, faster noise sampling commit f6a200d0cb866196ba57697466755f9e0c7ea5d8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 10:09:00 2019 +0000 Improved long-range depth precision, removed unnecessary LoD polygons commit 63d1b2bb2292898d59fb4f4e502201103dfeb86f Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 20:57:46 2019 +0000 Working LoD shader commit f13d98ee3e58f881e8b978861a67663b59ed91ec Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 11:03:40 2019 +0000 LoD first attempt (stack overflow issue)
2020-08-20 18:34:59 +00:00
"roots",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"serde",
Addressed some review.
2021-12-01 04:12:02 +00:00
"serde_json",
(See sharp/lod-history) LOD, shadows, greedy meshing, new lighting, perf --- Pretty much a Veloren fork at this point. Here's a high level overview of the changes (will be added to CHANGELOG just before merge). At a high level this MR incorporates roughly two groups of changes. The first group consists of new game features: more flexible map sizes, level of detail terrain, shadow maps, and a new lighting engine. This is "feature work" that (mostly) only adds new things to Veloren, and mostly shouldn't affect old stuff. The second big group of changes are those addressing the fallout from all the new features. These include performance fixes of various sorts: the addition of multiple graphics options and optimization of the cheap ones to avoid work, switching all voxel models to use some variant of greedy meshing, switching over much of our CPU-side vector math to exploit SIMD instructions (coinciding with a fork of `vek`), and a rewrite of how the UI handles text rendering (coinciding with updates to our fork of `conrod`). Making Veloren's hardcoded colors appear correct under the new lighting engine also required considerably changes (TODO: Fill in this section when it's complete). The second category of changes often heavily touches code owned by other people, including frequently modified code "owned" by a handful of people, so I recommend that this code be reviewed particularly carefully. --- At a high level (each will be described in more detail below): - The world map has been refactored. - The world size is no longer hardcoded (@zesterer). - The map generation code was made generic to allow using it outside of the `world` crate (@zesterer). - On world creation, we now compute *horizon maps* (@zesterer). - The way we pass the world from the server to the client has been updated (@xMAC94x). - Artifacts related to image rotation were fixed (@imbris). - Multiflow rivers were enabled (@zesterer). - In the process of making changes related to the world map, various incidental fixes and optimizations were required. - The new *level of detail* feature was added (@zesterer wrote part of this and has checked out the rest). - A new LOD terrain rendering step was added to the pipeline. - The LOD terrain quality was made configurable via a graphics setting. - Horizon maps were used to cast shadows from LOD chunks on both LOD and non-LOD terrain. - A "voxelization" effect was incorporated into rendered LOD terrain to make it blend better into the world. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Veloren's lighting has been completely overhauled (@zesterer has already checked most of this out). - A semi-accurate index of refraction was assigned to our materials. - A new, more realistic, physically based approach to lighting was used using the *Ashikhmin Shirley* BRDF. - We emulate *atmospheric scattering* using equations designed for measuring solar panel light exposure. - We attempt to compute *realistic light attenuation* in water using its real material properties. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Point and directional lights now cast realistic shadows, using *shadow mapping.* (@imbris, @zesterer, @Treeco, @YuriMomo) - Point light shadow maps were added to the rendering pipeline, using geometry shaders and *seamless cube maps*. - Directional light shadows were added to the rendering pipeline, using LISPSM together with disabling *depth clamping*. - "Shadow-only" chunks and NPCs were added to prevent shadows from models behind you from disappearing. - In the process of making changes related to shadow maps, various incidental fixes and optimizations were required. The addition of shadow maps, LOD terrain, and the new lighting all led to significant performance degradation, on top of other changes happening in master. Therefore, a large number of performance improvements were also needed: - The graphics options were made much more flexible and configurable, and shaders were optimize. - New options were provided for how to render lights and shadows (@Pfauenauge, @zesterer). - Graphic setting storage and configuration were overhauled to make adding new features easier (@Pfauenauge, @imbris). - Shaders were rewritten to utilize GLSL's preprocessor to avoid overhead (@zesterer, @YuriMomo). - In the process of making changes related to providing additional rendering options, various incidental fixes and optimizations were required. - Voxel model creation was switched to use *greedy meshing.* - A new voxel meshing method, greedy meshing, was added (@imbris). - Uses of the older meshing methods were migrated to use greedy meshing (@imbris, @jshipsey, @Pfauenauge). - New restrictions were added to terrain, figure, and sprites to future proof them for further optimizations (@jshipsey, @Pfauenauge, @zesterer). - Most positions are now relative to either chunk or player position for better precision (@imbris, @zesterer, @scottc). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - Animation and terrain math were switched to use SIMD where possible. - Fixes were made to vek to make its SIMD feature usable for us (@zesterer, @imbris). - The interface and types used in bone animation were changed in various ways (@jshipsey, @Snowram, @Pfauenauge). - Redundant code generation for body animation is now partly taken care of by a macro (@jshipsey, @Snowram, @Pfauenauge). - Animation code was modified to to use vek's SIMD representation where possible (@jshipsey, @Snowram, @Pfauenauge). - Terrain meshing code and shadow map math were also modified to use vek's SIMD representation (@imbris). - SIMD instruction generation was enabled (@YuriMomo, @jshipsey, @Snowram, @imbris, @Angelonfira, @xMAC94x). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - The way we cache glyphs was completely refactored, fixed, and optimized. - Our fork of `conrod` was optimized in various ways (@imbris). - Our fork of `conrod` now exposes whether a widget was updated during the current frame (@imbris). - Our use of the glyph cache was rewritten for correctness (@imbris). - A *text cache* was introduced that lets us skip remeshing glyphs that have not changed (@imbris). - Various changes were made to reduce pressure on the glyph cache, with more planned (@imbris, @Pfauenauge). - In the process of making changes related to the glyph cache, various incidental fixes and optimizations were required. - Colors were changed to keep Veloren's look consistent with master. - Some older tree models were brought back (@Pfauenauge). - TODO(@Sharp): All hardcoded colors were extracted and made hotloadable. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Hardcoded colors were fixed to conform to Veloren's style. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Color models were fixed to conform to Veloren's style. A detailed description of the involved changes follows. --- - The world size is no longer hardcoded. All functions dependent on world size now take a `WorldSizeLg`, which holds the base 2 logarithm of each actual world dimension and is guaranteed to maintain certain properties (outlined in `common/src/terrain/map.rs`). Additionally, many utility functions that utilize the world size were moved into `common` as well (mostly `common/src/terrain/mod.rs`). Finally, the world map format was updated in order to store its size explicitly, with a migration path from the old format that should work whenever the old formatted map was a square (practically always). See `world/src/sim/mod.rs` for these changes. - The map generation code was made generic to allow using it outside of the `world` crate. The parts of the map generating code that do not need to query the world were moved over to `common/src/terrain/map.rs`, allowing them to be used from the client without creating a dependency on `world`. The rest of it was turned into helper functions in `world/src/sim/map.rs`, which can be passed as closures to the generic map generation code to complete its construction. This also means that colors are now passed in separately to the map generation function. See <https://veloren.net/devblog-78/> for more details. - On world creation, we now compute *horizon maps*. See the function in `world/src/sim/util.rs`. Given a height map and a plane intersecting that height map, our horizon maps allow us to encode enough information to reconstruct shadows for each point on the height map using only the *horizon angle* (the angle at which the sun starts to become visible). As Veloren's sun only covers one plane, this is sufficient for encoding sun shadows for LOD terrain, by encoding two angles per chunk (one for each 90 degrees the sun covers). We can also use this for the moon, if we want, since the moon follows the same path. Additionally, we store the *height* of the furthest occluder, to try to make the shadows volumetric; so this means 4 bytes in total for each chunk. Support for horizon maps has been merged into the map functionality in common as well. - The way we pass the world from the server to the client has been updated. Rather than passing the prerendered map, we instead pass three maps with values for each chunk; one with the color information, a second with altitude information, and a third with horizon map information. We then reconstruct the map on the client, together with some additional information we send from the server (like the sea level and maximum height). See `common/src/msg/server.rs` for a detailed description of the format of `WorldMapMsg`, and `server/src/libr.rs` and `client/src/lib.rs` for details of the map construction and parsing. - Artifacts related to image rotation were fixed. See the commit message for commit SHA `cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e` for a detailed explanation. This involved changes to shaders, the addition of a new type of graphic (also reflected in the graphic cache) that allows specifying a border color (which automatically makes the associated texture immutable), and some related fixes. I reproduce the first two paragraphs of the MR description as well: ``` Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). ``` - Multiflow rivers were enabled. This does not really need to be part of this MR, and would be easy to revert, but since it seemed to provide a nice improvement it's currently packaged with it. We already computed multiple outflows from each chunk for erosion purposes long before this MR. However, we never modified river rendering to be able to handle this case (just a single downhill river flow is complex enough!) so this was not exposed when deciding which chunks were rivers. Now that - In the process of making changes related to the world map, various incidental fixes and optimizations were required. Some examples of fixes include making sure terrain is never lowered to below sea level (to make the shadow maps report correct values), fixing map altitudes and colors to understand things like cliffs and "block level" coloring (that doesn'te xist on the column level), and fixing a crashbug when rendering images for the UI where source pixels are strongly rectangular. Some examples of related performance fixes include avoiding allocating a fresh vector for all the maps (i.e. copying it over to change the format from `[u32; n]` to `DynamicImage` and then copying again to convert to `RgbaImage`), and instead using the `gfx::memory::slice` function to accomplish the same thing. These sorts of changes are spread all arond the code. This includes the additon of a new scene, `voxygen/src/scene/lod.rs`, a new pipeline `voxygen/src/render/pipeline/lod_terrain.rs`, and new shaders `assets/vxygen/shaders/lod-terrain-vert.glsl` and `assets/vxygen/shaders/lod-terrain-frag.glsl`, as well as associated changes to the renderer in `voxygen/src/render/renderer.rs`. The main idea behind our initial approach to LOD was to take the world data we now get from the server (altitude, color, and horizon mapping). - Some previously computed values were turned into shader uniforms for better prediction on weak processors. (@zesterer) - Calls to power or trig functions were removed or replaced with multiplications, where possible. - After some deliberation - To properly handle sprite "waving" for nearby sprites, We explicitly designed the greedy meshing system with figures and sprites in mind. In both cases, we want to be able to *efficiently* pack many different models into the same texture, especially in cases where we know we will either not be removing any of the grouped-together from the models from the texture, or will remove all of them at once (so they can be packed into some specific subtexture). For sprites, since we know every model in advance and never intend to deallocate them, we currently pack them all as efficiently as possible into one giant tetxure atlas. However, in the future we might opt to pack them slightly less efficiently in exchange for shrinking the sprite vertex size. For figures, we pack all the textures for each *model* into the same atlas. is a global texture atlas used for every sprite, and for figures which is why we have the ability to mesh multiple models to the same texture area (using the simple texture atlas allocator) without requiring intermediate vector allocations. This is accomplished by delaying the time when we actually write the color and light data to the texture until *after* all the model vertices have been meshed; then, we can just allocate the whole color/light array at once, making the atlas we use an exact fit. In computer science-y terms, we accomplish this delay by, after we perform the initial greedy meshing (without texture information), not continuing to create the texture data, but instead constructing a *continuation*--that is, a function that, when called, will execute the rest of the computation. We push this continuation (which in Rust terms is a `FnOnce` closure that takes the `ColLightsInfo` that it is supposed to write to as context) onto a onto a vector resizing. To allow for suspended writes to texture data, Rust pointed out to me that the continuation that would eventually write the color and light data to the texture atlas (the one that is shared by all models sharing the same greedy mesher) would have to *own* whatever data it mshed. Because we often generate the model data to mesh as a temporary in `voxygen/src/load.rs`, the - Matrix multiplications in the shader were reduced for figure data (@zesterer). - Vertex "waves" for fluid data were removed. - Terrain "bending" near edges was removed. - Scaling was fixed to make sure empty space was not introduced in a space previously occupied by a block. It was also changed to take ownership of its voxel data, rather than sharing it, to let it be used with meshing. - Rust's nightly version was bumped in order to use the `array_map` function, which lets us reuse more code between the simple map and `FigureModelCache`. - PositionedGlyph::standalone. --- I tried to cite sources in many cases[^realtime],[^lloyd],[^lispsm],[^pbrt],[^greedy],[^tjunctions] where I needed features from elsewhere but I am particularly grateful for the following resources, esepcially where they have accompanying source code. I linked all of them that are accessible to the public (those that are not were obtained through legal means). [^realtime]: Eisemann, Elmar, Michael Schwarz, Ulf Assarsson, Michael Wimmer. Real-Time Shadows. A K Peters/CRC Press (T&F), 20160419. [^lloyd]: Lloyd,B. 2007. [Logarithmic perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). PhD thesis, University of North Carolina. [^lispsm]: Wimmer, M., Scherzer, D., and Purgathofer, W. 2004. [Light space perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). In Proceedings of Eurographics Symposium on Rendering 2004, pp. 143– 152. [^pbrt]: Pharr, Matt, et al. [http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf](Physically Based Rendering: From Theory to Implementation). Third edition, Morgan Kaufmann Publishers/Elsevier, 2017. [^greedy]: mikolalysenko. “Meshing in a Minecraft Game.” 0 FPS, 30 June 2012, <https://0fps.net/2012/06/30/meshing-in-a-minecraft-game/>. [^tjunctions]: blackflux. “Meshing in Voxel Engines – Part 1.” Blackflux.Com, 23 Feb. 2014, <https://blackflux.wordpress.com/2014/02/23/meshing-in-voxel-engines-part-1/>. I am also especially grateful to Khronos, Wikiepdia, and stackoverflow for answering many of my specific questions while writing the MR. --- Squashed commit of the following: commit 300505e7305a2fdac722a808ee8538323f215f39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 18:46:25 2020 +0200 Fixing cargo doc and typo in CHANGELOG. commit ec0aeb18e8499d7d84ef818331b4b65c3d76cea6 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 15:38:50 2020 +0200 Hopefully final commit for the LOD branch. commit 5e8ea0b1eaac02903a02feb2eb038d195de4872f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 10:14:26 2020 +0200 Falling back to power as stopgap. commit e44a1cbf46504ee9931a01bdc9033e145500d557 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 09:25:41 2020 +0200 Address imbris feedback. Temporarily disables shiny water, lowers max VD. These restrictions will be lifted soon after merging. commit 561e25778a108ac3712f5ec2ce3a51234c4430d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 08:31:13 2020 +0200 Tweaking shaders a bit. commit 7d19259078ce0dd7b3742ad7d0cb3fab3ece3fdc Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:59:43 2020 +0200 Fix view example as well. commit 051cd4934e0fad2c0b15db4380a4189fa318679f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:29:06 2020 +0200 Fix meshing benchmark. commit c95e07db3b4dcca285678985e65e31b927cb1c61 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 05:46:22 2020 +0200 Address MR feedback, fix scene clouds. commit 1bfb816cabdb3ffc1e507a009c2d98696b4b573a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:39:36 2020 +0200 Incorporating Pfau's figure color changes. New eyes and new humanoid colors. commit 3f9b89a3ac7b3356b1dba0d1a8f6541357f81469 Merge: e2f5162e4 62c53963a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:29:41 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit e2f5162e4f96f4124aa43488f7245d341b3dcfd4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:28:38 2020 +0200 World colors are all hotloadable. They live in assets/world/style/colors.ron. Only a small handful of hardcoed colors remain in World; they are either part of the map, or difficult to disentangle from the rest of the computation. Comments are made where appropriate. commit 62c53963abe1975009d34a8f9515a355bef24f31 Author: Marcel Märtens <marcel.cochem@googlemail.com> Date: Wed Aug 19 15:59:00 2020 +0200 replace pretty_env_logger with tracing commit 5b1625f99d9586fe80e2232f583ec5af9f953099 Merge: d71003acd 4942b5b39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:15:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit d71003acdabeff970b3928e97c26af6847b5b78e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:14:34 2020 +0200 Hotloading colors, part 1: colors in common. Currently, this just entails humanoid colors. There are only three colors not handled; the light emitter colors in common/src/comp/inventory/item/tool.rs. These don't seem important enough to me to warrant making hotloadable, at least not right now, but if it's needed later we can always add them to the file. commit 63b5e0e553eb2ea49276f192a6fc7dd65254270d Merge: c32b337a4 6d2c4b9c1 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 13:05:37 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c32b337a46e10d9de473d178a94a3ccd61c39bb3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:52:04 2020 +0200 Fixing LOD grid, for real. commit a166ae0360395387e09fb35a1f84210c2ce5ec24 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:28:05 2020 +0200 Addressing imbris's initial feedback. Fixes two minor bugs: explosion particles were no longer spawning randomly, and LOD grids were not perfectly even. commit 4cbad004f44060994252dd3d38647a14a589712f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:27:58 2020 +0200 Bumping nightly per request. commit 548680276aac77c25d43d16b5622f847d474dbef Merge: acc098604 8f8b20c91 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:26:06 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit acc0986040589a3492f88a740bc3c3fc693b26d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:28:32 2020 +0200 Lower resolution due to lying drivers. commit d3b878de2a52c358d2944a6bbd0555dad7fbdb10 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:15:38 2020 +0200 Fix issues msh encountered with Intel 4600. commit 10245e0c1b0cb6fae10d86409435364edc6102ef Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 21:15:02 2020 +0200 Merge more models into one mesh than we did previously. commit 3155c31e663c52ae5c3a53d5fb5665892a1a498a Merge: 7204cc8a7 3c199280e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:35:22 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7204cc8a7a4f74a30306bd205d9834fee4bb944f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:34:43 2020 +0200 Fix not yet done NPC animations. This forces them all to be the idle animation if not specified. This fixes issues where you'd have giant NPCs in water. commit bc83360f2a08918f19d417b5f772e1ff554dba08 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 19:36:37 2020 +0200 Try to fix some bugs: - Z fighting with LOD terrain and water. - Audio SFX not playing. commit 1fd104aa603bf3781b6526a5cada46aeca3049dd Merge: 862df3c99 7c2c392a3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 12:02:31 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 862df3c9976c4da9bd7cfd784f1a85973127968a Merge: 0a4218ed9 75c1d4401 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 05:52:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0a4218ed9d541a2b34c133351bea38a99ddf4ea7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 22:27:14 2020 +0200 Fix particle depth. commit f51dfdeb442d0dd5243dd2f344fa4be295bd0875 Merge: c6251a956 5e6dc0471 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:19:04 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit c6251a956ad376400dca5c23420cf8d213dc8fdf Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:15:46 2020 +0200 Cache figures more intelligently. Cache figures for longer, and don't cache character states for the player except where they actually affect the rendered model. commit 0ed801d5404982c6fb63b1eaa4567d908b294c9d Merge: c11b9bdf0 eea64f78f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 16:32:24 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c11b9bdf0a53bf9884d2f5a48fec9b01d582df1a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 11:47:15 2020 +0200 Remove unneeded Clippy annotation. commit 16aa9ef40af56d69289d00aafb3deadfb8bd4f35 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 8 00:53:02 2020 +0200 Fix hotloading and Clippy. commit 3dc973e0be5b758da1e9805eb764ad401374cd0c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 23:50:27 2020 +0200 Major speedups with SIMD. commit fba64a7d93d5a96077ce87287bbce6ab9b7fbcae Merge: 76429d00e d1e10b178 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:19 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 76429d00eea00d212fbd672a84ee91e75b19b938 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:10 2020 +0200 Add clippy.toml. commit c79f512f84dbb83cb82b7954db68ff241dfd8e41 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 11:55:20 2020 +0200 Fix all clippy issues, clean up Rust code. commit 6f90e010b3fbefb53b0d632e819931350015b6b8 Merge: 77a8c7c26 5929cfa5c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:30 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 77a8c7c267d3f44a1a62bd6b2274359973c5e4d4 Merge: b44e44232 44febaabd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:10 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 5929cfa5c713aa392110bbb62407f76caf53c3df Author: jshipsey <jshipsey18@gmail.com> Date: Thu Aug 6 20:47:27 2020 -0400 fixed in-hand arrow bug commit b44e442325d828f1cd564d66908f89d09e80474b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 6 13:40:35 2020 +0200 Miscellaneous performance improvements. commit be37acf287c1360d8085862526ac3365ffd1d768 Merge: 125d7fc6c c11876547 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 05:49:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 125d7fc6c4dcd8c8c5f27b8268a4d64f409f3644 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 04:55:31 2020 +0200 Abstract over simd vs. repr_c vectors. Also some minor improvements to Event size. commit d4d4956e9252e1241ce110b2aa85076c6b1e2a23 Merge: 5f3b7294a aced5f979 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:56:54 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 5f3b7294af1f8533edc2620b58863c248e2b07af Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:43:52 2020 +0200 Fix formatting issues I missed before. commit a428a3ebba70dcab63dd0f8cd983120c90617271 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:41:51 2020 +0200 Fix clippy warnings, part 1. There aer still a bunch of type too complex and function takes too many arguments warnings that I'll fix later (or ignore, since in the one case I did fix a function takes too many arguments warning I think it made the code *less* readable). commit ba54307540ed8a937ac08209730284fc653af85b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 30 13:22:42 2020 +0200 Fix light animations so they are removed when the light turns off. commit 7e0f4bcbf0f4717145d8beac40d52e3acebbe2aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 21:10:20 2020 +0200 Fix crash in edge case for pixel art. commit 56da06f7a351e2b949e9b014a90b974d511a0924 Merge: cf74d55f2 9f53a4a19 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:56:52 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:29:52 2020 +0200 Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). The first concern was addressed by fixing the dimensions of the map images drawn from the UI (so that we always use a square source rectangle, rather than a rectangular one according to the dimensions of the map). We also fixed the way rotation was done in the fragment shader for north-facing sources to make it properly handle aspect ratio (this was already done for north-facing targets). Together, these fix rendering issues peculiar to rectangular maps. The second and third concerns were jointly addressed by adding an optional border color to every 2D image drawn by the UI. This turns out not to waste extra space even though we hold a full f32 color (to avoid an extra dependency on gfx's PackedColor), since voxel images already take up more space than Optiion<[f32; 4]> requires. This is then implemented automatically using the "border color" wrapping method in the attached sampler. Since this is implemented in graphics hardware, it only works (at least naively) if the actual image bounds match the texture bounds. Therefore, we altered the way the graphics cache stores images with a border color to guarantee that they are always in their own texture, whose size exactly matches their extent. Since the easiest currently exposed way to set a border color is to do so for an immutable texture, we went a bit further and added a new "immutable" texture storage type used for these cases; currently, it is always and automatically used only when there is a specified border color, but in theory there's no reason we couldn't provide immutable-only images that use the default wrapping mdoe (though clamp to border is admittedly not a great default). To fix the maps case specifically, we set the border color to a translucent version of the ocean border color. This may need tweaking going forward, which shouldn't be hard. As part of this process, we had to modify graphics replacement to make sure immutable images are *removed* when invalidated, rather than just having a validity flag unset (this is normally done by the UI to try to reuse allocations in place if images are updated in benign ways, since the texture atlases used for Ui do not support deallocation; currently this is only used for item images, so there should be no overlap with immutable image replacement, so this was purely precautionary). Since we were already touching the relevant code, we also updated the image dependency to a newer version that provides more ways to avoid allocations, and made a few other changes that should hopefully eliminate redundant most of the intermediate buffer allocations we were performing for what should be zero-cost conversions. This may slightly improve performance in some cases. commit ad18ce939940a8c697270f6e9b94db9942fd8295 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 13:21:09 2020 +0200 Fix continent scale hack. commit 36b1cb074f5b195aebd7dbbc3da7f0246a1a18ec Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 12:11:40 2020 +0200 Enable loading different sized maps without a recompile. We may want to tweak the effects of the continent_scale_hack. commit 13b6d4d534cc4814b7cb3294ca41bbfea0a6b186 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 10:55:48 2020 +0200 Removing WORLD_SIZE, part 1. Erased almost every instance of WORLD_SIZE and replaced it with a local power of two, map_size_lg (which respects certain invariants; see common/src/terrain/map.rs for more details about MapSizeLg). This also means we can avoid a dependency on the world crate from client, as desired. Now that the rest of the code is not expecting a fixed WORLD_SIZE, the next step is to arrange for maps to store their world size, and to use that world size as a basis prior to loading the map (as well, probably, as prior to configuring some of the noise functions). commit 30b1d2c6428230a9eaa0d749cdcbbd6f1cbccd78 Merge: 7d56ba31b 1377b369f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:58 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 7d56ba31b445441461b28a07fc495d7d4f047c17 Merge: 2101113b4 598f14b25 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 1377b369f6db2258e910d467a5740f31789e3ded Author: Monty Marz <m.marzouq@gmx.de> Date: Sun Jul 19 23:25:38 2020 +0200 more saturated pumpkins commit ae8d50527f93bb0616c2ad46ce4dacb63bc37c6d Author: Monty Marz <m.marzouq@gmx.de> Date: Sat Jul 18 20:29:56 2020 +0200 acacia models commit 2101113b467e691de787392d7f20f1745f5637bd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 18 18:55:25 2020 +0200 Higher detail LOD. commit add2cfae04b4385fa5590e11e2bd5229d9dee0aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 16 01:57:39 2020 +0200 Revert some irrelevant stuff. commit 2e2ab3dc1eaa59a4aef7f8d34a53d8aae4c8553a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 15 13:30:49 2020 +0200 Fixing various things about shadows. * Correcting optimal LISPSM parameter. * Figure shadows are cast when they're not visible. * Chunk shadows stay cast until you look away. * Seamless cubemaps for point lights. * Etc. commit 6c31e6b56217274285b597af297036691ea5d897 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 19:50:26 2020 +0200 Fix shadow creation. commit 6332cbe006115ae205597529cd8bbccd146c2cca Merge: be438657c 930e0028b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:47:00 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit be438657c33d7b5bfb0a9582c3ed3fd366637323 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:28:08 2020 +0200 Tweaks to shadows. Added shadow map resolution configuration, added seamless cubemaps, documented all existing rendering options, and fixed a few Clippy errors. commit 23b4058906013c7d2a40c286e20e32c5fbd897ed Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 10:11:19 2020 +0200 Fix moon, use nonlinear noise for terrain. Note that the latter has a bit of performance cost. commit 7fbe5cbfbb9dc29607957b8e62f432a4deed193d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:23:02 2020 +0200 Address lies about max texture size. commit bcfc62b5e13a1cdd83f57535fde4694720bebfd9 Merge: 75e3626a7 18a08e8fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:22:08 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 75e3626a785919f43fdcf2127c2b10e3e4df2f9f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:21:52 2020 +0200 OpenGL 3.3 minimum. commit 18a08e8fe2739f02af99a5d2cb4e7c38c49e858b Author: Monty Marz <m.marzouq@gmx.de> Date: Tue Jul 7 23:57:52 2020 +0200 settings localization commit 90c5d1ca3620092bc3ae10b2211489eb1cf6f5e8 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 21:11:48 2020 +0200 Lower near distance. commit 0e66f02b25aaddaa2dfddbbc89cd67de54a9a7b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 20:09:01 2020 +0200 All sprites sway in the wind now. commit db1401a6910bf42dcf502462c90038752ff5fbdb Merge: 69e508d8c e8b4b29d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 19:34:17 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 69e508d8c94d8973033817ca86f357e466fc7c4d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 18:41:37 2020 +0200 Make it easy to switch to SIMD for math. commit ffe0f5928c7a7e87d00cb5426b3b1d831d7e02fd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 21:21:12 2020 +0200 Fix some issues with underwater rendering. commit bfda6da42f38fd02c31ee92c81ab785a3e50c2a0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 19:17:59 2020 +0200 Fix some minor display issues. commit 0ed752e087968cf901301884aaeae698e32ef8a5 Merge: ccc6a06a8 518edcb85 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:14:21 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit ccc6a06a8d4504d6b9f7af7905a414d2ee06ab76 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:04:34 2020 +0200 Some minor changes. commit 4e020246702889269efe1a191788992164c508d6 Merge: 50a64d927 e05c9267a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 16:17:40 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 50a64d927e6c4f4b0e4688e4cbfca694bc3f922a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 13:07:03 2020 +0200 Fix far plane. commit 7dd06da34cae8f9ea3b6c889fe965181f3fd3949 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:25:35 2020 +0200 Add shadows.glsl. commit 618a18c998778bf871b905a74657440fcc384c80 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:10:22 2020 +0200 Adding shadows, greedy meshing, and more. commit eaea83fe6a5cb1cb0ba8beef888183c718258496 Merge: 267018495 2f89b863e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 22:47:07 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 2670184954a13e4a9e7a4e35ba79aac0c5fac2f7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 21:20:01 2020 +0200 Make civsim and sites deterministic. For anything in worldgen where you use a HashMap, *please* think carefully about which hasher you are going to use! This is especially true if (for some reason) you are depending on hashmap iteration order remaining stable for some aspect of worldgen. commit f8376fd5dc72b4a9c2f51a6b4570d59c8b8e9343 Merge: 654f7e049 cdee191dd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 17:53:57 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 654f7e049258d9da27c09608bbe6a46ffa8787e5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed May 20 21:22:30 2020 +0200 Correct backface culling. commit 560501df05ca725409b0f2e4eb31bdfdc15fd0c7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue May 19 17:22:06 2020 +0200 Greedy messhing for shadows. commit a4d87e1875ca543436e6bbbeb20348facc5a52d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun May 17 05:59:00 2020 +0200 Shadow maps work for lantern. commit 243d0837b8a3b08172c9a3c348d964d7ddc2a0a8 Merge: 04382dc28 71dd520cd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:53:13 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 04382dc28632b6c66e8821f6870c0daaa1c1901a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:22:17 2020 +0200 WIP: better graphics config, better LOD, shadow maps. commit 22ddbad3eb32bfa70f0932176022208fe67ded81 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 18:54:09 2020 +0200 Minor shader fixes. commit 746a10e8d01ac235f994b0cde78fa48998602a1f Merge: 0f4a0e763 40ab94673 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 04:02:09 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0f4a0e763db3afbdc4fb0558611f38326ca87151 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 23:03:24 2020 +0200 Switch back to pop-in terrain. commit dd74fa7e4a53667b38811d7aec58d7f6a68889bb Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 22:58:55 2020 +0200 LOD shading closer to voxel shading. commit ef67bd58ba0bdaf622b078892d768263b6cba268 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 28 20:49:03 2020 +0200 Experimental underwater lighting. commit 2c5ad9d07605e80d5fd5679dd3a5d70c605b86a9 Merge: 748279835 303967a6f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 22:35:24 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7482798354eda18c8207950080fc24d443a369de Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 21:59:55 2020 +0200 Replace discard in figure-frag. commit d83b4ae69be4912f69bf7835f509c68a1c7770a4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:45:57 2020 +0200 Fix sprite lighting, HDR from focus_pos. commit 0594238004f116274905fa0ed7c2b6c417ed1d29 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:14:10 2020 +0200 Proper HDR from point lights. commit 48c93d2b41ce5743103d18e76cc228f5ac766492 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 14:01:43 2020 +0200 Brighter ambiance, darker LOD shadows. commit e0452e895ccfa8a43f368cae3b8b8aedc24dad93 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 13:13:23 2020 +0200 More proper HDR. commit 4c6da3ed16cfeebb455e40da5f557b4af9a499d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 00:13:10 2020 +0200 Trying LOD noise. commit 682a3d74c85df5503ffe1fc1cc891bce789df1ad Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 23:11:08 2020 +0200 Fix LOD heights in towns. commit cc39e5734e8b18f9077bf42e66337c1319dd6b6e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 21:01:23 2020 +0200 More LOD fixes. commit 8116b21c2e51c836e77894e309ac273caf2917b3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:54:43 2020 +0200 I like this coloring. commit bc2560ea90b36f4b46190005344232d993043ac3 Merge: 14effdd5d e690efe71 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:48:33 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 14effdd5db8747fcf3eb34f03b46b7792e92d1c5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:24:35 2020 +0200 Re-saturate. commit 48a643955d4435b78179acba0beb4a979905cc31 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:23:57 2020 +0200 Various fixes. commit f7b497a0c25f4ad4682c71dd1ed6f608052feb9b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 03:22:49 2020 +0200 Render figures again. commit 44e4aad48deba8266b9f8bdfd3db096b381f5327 Merge: e6f0a5a98 9ec319a18 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 02:01:04 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit e6f0a5a981a82533ba188fff0a54ce98577bb152 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 24 16:12:20 2020 +0200 Add atmospheric scattering. commit f2953087f691a8edbc001cb98ebf5059fc6f8ac0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 23 00:01:20 2020 +0200 Fix shadowing for specular reflections. commit ddd4a67a9799b8d08c7dc0c2bec90621c2bed0e3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Apr 22 22:56:12 2020 +0200 HDR fixes. commit 1015e60deef3c447381996277df7496707a63bd0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 21 18:25:19 2020 +0200 More lighting changes. commit 80c264abd111fb237e57843efcb5c071d4f84613 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 13 00:29:59 2020 +0200 Lighting experiments. commit 8414987e589dd5102bad89762a3adaccc0bfe957 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 9 02:38:40 2020 +0200 WIP -- lighting changes and soft shadows. commit 9cd2b3fb0d6b49776c6dfe463e4169637250b11a Merge: c7ea687eb 8b149ad11 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:29 2020 +0200 Merge branch 'sharp/new-lighting' into sharp/small-fixes commit c7ea687ebbc5aace1b455f134a5bf49ce2c7434a Merge: 476441531 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:02 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 8b149ad11ad4bb75018fcf9519baec27d1c95951 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:32:39 2020 +0200 Trying out a new lighting model. commit b0ac9f36f755dd06f7c17c46150568064790864f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 07:56:11 2020 +0200 Use bicubic interpolation for terrain. commit f6fc9307a121514b614bc50ef8eb055953e7da8a Merge: 33140a295 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 05:01:41 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 4764415312aae6e9ac2d00e86e84577cb958f1ab Merge: ed2d0111d 13388ee6a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 04:54:48 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 13388ee6a42943f3f79a9cb488346cef18e272fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 20:30:08 2020 +0200 Various fixes (to coloring and to soft shadows). commit fbd084a94a067082a87cd6d28b82054709bc9265 Merge: 5a089863b 4fdf6896a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 18:50:38 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/map-colors commit ed2d0111d994262ae836d84d1fe5a45e4de72a0b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 06:49:27 2020 +0200 Combining colors and LOD. commit 88342640c6b835114d01c797b89fdede3b0a2108 Merge: 33140a295 5a089863b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:49:20 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 33140a2951b8212725f42c758b277aaec4d888f7 Merge: 4c65a5aed f34d4b379 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:36:21 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 5a089863beb01d4794bbe3580ada47b278715ea2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 03:17:49 2020 +0200 Making maps brighter. This is probably not the right way to do it, but oh well! commit 32b2c99109dd486aa922886081068f9c550c83f2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 02:46:36 2020 +0200 Horizon mapping and "layered" map generation. Horizon mapping is a method of shadow mapping specific to height maps. It can handle any angle between 0 and 90 degrees from the ground, as long as know the horizontal direction in advance, by remembering only a single angle (the "horizon angle" of the shadow map). More is explained in common/src/msg/server.rs. We also remember the approximate height of the largest occluder, to try to be able to generate soft shadows and create a vertical position where the shadows can't go higher. Additionally, map generation has been reworked. Instead of computing everything from explicit samples, we pass in sampling functions that return exactly what the map generator needs. This allows us to cleanly separate the way we sample things like altitudes and colors from the map generation process. We exploit this to generate maps *partially* on the server (with colors and rivers, but not shading). We can then send the partially completed map to the client, which can combine it with shadow information to generate the final map. This is useful for two reasons: first, it makes sure the client can apply shadow information by itself, and second, it lets us pass the unshaded map for use with level of detail functionality. For similar reasons, river generation is split out into its own layer, but for now we opt to still generate rivers on the server (since the river wire format is more complicated to compress and may require some extra work to make sure we have enough precision to draw rivers well enough for LoD). Finally, the mostly ad-hoc lighting we were performing has been (mostly) replaced with explicit Phong reflection shading (including specular highlights). Regularizing this seems useful and helps clarify the "meaning" of the various light intensities, and helps us keep a more physically plausible basis. However, its interaction with soft shadows is still imperfect, and it's not yet clear to me what we need to do to turn this into something useful for LoD. commit f8926a5737ddc51f3d585c651a64c43677aae0f4 Merge: a1aee931e 875ae6ced Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Mar 13 13:32:42 2020 +0100 Merge remote-tracking branch 'origin/master' into sharp/map-colors commit 4c65a5aed353b119aea65a2aaeb94549b67beb42 Author: Treeco <5021038-Treeco@users.noreply.gitlab.com> Date: Mon Feb 24 16:48:05 2020 +0000 Made LOD setting slider exponential commit 2fa7b2d20d7233dc8bfd64f9f7f54617575248f1 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 17:49:53 2020 +0000 Added mist to LoD commit aab059a450b5f635777129ff82cc15b662965c3c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 15:14:06 2020 +0000 Added LoD slider commit 779c36b538121c5ade3633ae5cb67bb14c8c3877 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:54:55 2020 +0000 Reduced cost of vertex pushing commit 9fea150473906b166365b738ebcea07c697daf3d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:38:53 2020 +0000 Fixed maths, improved LoD resolution commit 5481df38fea5bf183ff376a3337179cfaa5233dc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 11:22:50 2020 +0000 Dynamically relocate LoD vertices to enhance details commit a3e36a50ababd615da7db1b26158c7906a5def01 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 18:13:51 2020 +0000 Simpler terrain spiral rendering commit 255f450ae9ac8763db4bede075fb409161ed57cc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:53:17 2020 +0000 Better LoD precision commit 3d027aebe812a5b8658a4eb8123dc9f61b3776d2 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:04:03 2020 +0000 Better falloff commit be775c9484b457b2c0b1a494aec03392d0c70e76 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 15:30:45 2020 +0000 Applied good ideas from experimental branch commit 58587b68545a23c5c04ab4574a4b94b3bc982246 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 16:15:13 2020 +0000 Minor fixes to LoD merging commit 7b42aebd709c14df2db766aad61d9280ad24d84d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 15:04:44 2020 +0000 Capped LoD dragging commit 8aafc559f87124e1ea5ca6e3ddc2aa0c242d793c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:54:37 2020 +0000 Better blending between LoD and terrain border commit edd3455d5161792d87ddc8eadc0ecbad5532b284 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:40:19 2020 +0000 Fixed LoD z depth, added sea level offset commit b9b06744620114dd5556e73f64fa93c145503a7c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:27:43 2020 +0000 Better LoD smoothing commit a1aee931e790431560cd2d953ad61d9497072afd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Feb 21 14:52:17 2020 +0100 Adding shadows. commit 2400786c13dd891c131ed86d48d05df516a8a778 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 13:48:40 2020 +0000 Use world map as LoD source commit dbf650f504a4c25fbbc2096ac3616c736bf52d23 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Jan 20 00:48:14 2020 +0000 Better clouds at distance commit 5e6f81b86cdb9730b9b056877b19257075fd5fa8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Jan 19 23:59:02 2020 +0000 sync commit 745e7540ddb000cc645f612767b337c2ddc3f7c0 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 12:40:48 2019 +0000 Improved cloud falloff mist, faster noise sampling commit f6a200d0cb866196ba57697466755f9e0c7ea5d8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 10:09:00 2019 +0000 Improved long-range depth precision, removed unnecessary LoD polygons commit 63d1b2bb2292898d59fb4f4e502201103dfeb86f Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 20:57:46 2019 +0000 Working LoD shader commit f13d98ee3e58f881e8b978861a67663b59ed91ec Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 11:03:40 2019 +0000 LoD first attempt (stack overflow issue)
2020-08-20 18:34:59 +00:00
"serde_repr",
Added hash value to decide if we should invalidate persited skills and allow a respec.
2021-11-14 18:32:37 +00:00
"sha2",
Add basic group functionality (no voxygen wiring yet)
2020-04-26 17:03:19 +00:00
"slab",
update crates
2021-09-20 10:05:41 +00:00
"slotmap 1.0.6",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"specs",
fix specs
2020-07-07 12:28:00 +00:00
"specs-idvs",
switch to `spin_sleep`
2020-11-10 21:39:10 +00:00
"spin_sleep",
move tools and chat-cli in src/bin and examples
2020-12-12 01:12:00 +00:00
"structopt",
Made buff commands exhaustive
2021-05-04 13:22:10 +00:00
"strum",
"strum_macros",
Moved common networking code to common/net, clippy fixes
2020-12-13 17:11:55 +00:00
"tracing",
Bump tracing-subscriber to 0.3.2 We were pulling two versions of it. Causing some compilation errors
2021-11-26 17:41:51 +00:00
"tracing-subscriber",
Moved common networking code to common/net, clippy fixes
2020-12-13 17:11:55 +00:00
"uuid",
update dependencies
2021-03-21 21:53:44 +00:00
"vek",
Extract common/src/assets.rs to own crate This gives us ability to use assets-related code in i18n without depending on whole veloren-common
2021-05-07 11:24:37 +00:00
"veloren-common-assets",
Move Specs code to own common_ecs create, put tracy and macros into common_base
2021-03-08 22:40:02 +00:00
"veloren-common-base",
]
Extract common/src/assets.rs to own crate This gives us ability to use assets-related code in i18n without depending on whole veloren-common
2021-05-07 11:24:37 +00:00
[[package]]
name = "veloren-common-assets"
Change the version number to 0.10
2021-06-12 08:14:07 +00:00
version = "0.10.0"
Extract common/src/assets.rs to own crate This gives us ability to use assets-related code in i18n without depending on whole veloren-common
2021-05-07 11:24:37 +00:00
dependencies = [
"assets_manager",
"dot_vox",
"image",
"lazy_static",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"ron 0.7.0",
New `tweak_expect` fn to tweak values from .ron - Function to tweak values via temporary hot-reloaded .ron files
2021-05-16 22:05:55 +00:00
"serde",
Extract common/src/assets.rs to own crate This gives us ability to use assets-related code in i18n without depending on whole veloren-common
2021-05-07 11:24:37 +00:00
"tracing",
Fix #1158 - Add a test that all the `.ron` manifests parse
2021-07-03 18:11:04 +00:00
"walkdir 2.3.2",
Extract common/src/assets.rs to own crate This gives us ability to use assets-related code in i18n without depending on whole veloren-common
2021-05-07 11:24:37 +00:00
]
Move Specs code to own common_ecs create, put tracy and macros into common_base
2021-03-08 22:40:02 +00:00
[[package]]
name = "veloren-common-base"
Change the version number to 0.10
2021-06-12 08:14:07 +00:00
version = "0.10.0"
Move Specs code to own common_ecs create, put tracy and macros into common_base
2021-03-08 22:40:02 +00:00
dependencies = [
"directories-next",
"tracing",
"tracy-client",
]
[[package]]
name = "veloren-common-ecs"
Change the version number to 0.10
2021-06-12 08:14:07 +00:00
version = "0.10.0"
Move Specs code to own common_ecs create, put tracy and macros into common_base
2021-03-08 22:40:02 +00:00
dependencies = [
"float-cmp",
"specs",
"tracing",
"veloren-common-base",
Moved common networking code to common/net, clippy fixes
2020-12-13 17:11:55 +00:00
]
move tracing code to own crate
2021-03-28 23:40:53 +00:00
[[package]]
name = "veloren-common-frontend"
Change the version number to 0.10
2021-06-12 08:14:07 +00:00
version = "0.10.0"
move tracing code to own crate
2021-03-28 23:40:53 +00:00
dependencies = [
"termcolor",
"tracing",
"tracing-appender",
"tracing-log",
Bump tracing-subscriber to 0.3.2 We were pulling two versions of it. Causing some compilation errors
2021-11-26 17:41:51 +00:00
"tracing-subscriber",
move tracing code to own crate
2021-03-28 23:40:53 +00:00
"tracing-tracy",
"veloren-common-base",
]
Moved common networking code to common/net, clippy fixes
2020-12-13 17:11:55 +00:00
[[package]]
name = "veloren-common-net"
Change the version number to 0.10
2021-06-12 08:14:07 +00:00
version = "0.10.0"
Moved common networking code to common/net, clippy fixes
2020-12-13 17:11:55 +00:00
dependencies = [
Move terrain compression code to common_net and disable redundant LZ4 compression on the terrain stream.
2021-04-20 23:33:42 +00:00
"bincode",
"flate2",
switch to hashbrown 0.11 and specs 0.16.2
2021-06-07 11:01:01 +00:00
"hashbrown 0.11.2",
Move compression helpers to `common_net::msg::compression` and experiment with more image formats at more site kinds.
2021-04-22 05:00:57 +00:00
"image",
Get PngPngPngJpeg terrain working in the actual game.
2021-04-24 00:18:06 +00:00
"num-traits",
Moved common networking code to common/net, clippy fixes
2020-12-13 17:11:55 +00:00
"serde",
"specs",
Add machinery for storing component buffers for interpolation.
2021-03-13 02:53:19 +00:00
"specs-idvs",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"sum_type",
Convert all other veloren crates to use tracing - Completely removed both `log` and `pretty_env_logger` and replaced with `tracing` and `tracing_subscriber` where necessary. - Converted all `log::info!(...)` et al. statements to just use the shorthand macro i.e. `info!`. This was mostly to make renaming easier.
2020-06-21 14:26:06 +00:00
"tracing",
update dependencies
2021-03-21 21:53:44 +00:00
"vek",
Moved common networking code to common/net, clippy fixes
2020-12-13 17:11:55 +00:00
"veloren-common",
]
[[package]]
seperate sys/state
2021-04-06 15:47:03 +00:00
name = "veloren-common-state"
Change the version number to 0.10
2021-06-12 08:14:07 +00:00
version = "0.10.0"
Moved common networking code to common/net, clippy fixes
2020-12-13 17:11:55 +00:00
dependencies = [
"bincode",
switch to hashbrown 0.11 and specs 0.16.2
2021-06-07 11:01:01 +00:00
"hashbrown 0.11.2",
limit tokio threads to 1/4 of num_cpus make sure that rayon has at least 2 threads even on 1cpu systems to increase stability
2021-05-04 17:42:45 +00:00
"num_cpus",
Moved common networking code to common/net, clippy fixes
2020-12-13 17:11:55 +00:00
"rayon",
Added scopeguard to protect against unwind
2021-02-23 12:12:44 +00:00
"scopeguard",
Moved common networking code to common/net, clippy fixes
2020-12-13 17:11:55 +00:00
"serde",
"specs",
"tar",
"toml",
"tracing",
update dependencies
2021-03-21 21:53:44 +00:00
"vek",
Moved common networking code to common/net, clippy fixes
2020-12-13 17:11:55 +00:00
"veloren-common",
Move Specs code to own common_ecs create, put tracy and macros into common_base
2021-03-08 22:40:02 +00:00
"veloren-common-base",
"veloren-common-ecs",
Moved common networking code to common/net, clippy fixes
2020-12-13 17:11:55 +00:00
"veloren-common-net",
"veloren-plugin-api",
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
"wasmer",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
seperate sys/state
2021-04-06 15:47:03 +00:00
[[package]]
Rename common-sys to common-systems and rearrange common-state slightly
2021-03-29 02:35:13 +00:00
name = "veloren-common-systems"
Change the version number to 0.10
2021-06-12 08:14:07 +00:00
version = "0.10.0"
seperate sys/state
2021-04-06 15:47:03 +00:00
dependencies = [
switch to hashbrown 0.11 and specs 0.16.2
2021-06-07 11:01:01 +00:00
"hashbrown 0.11.2",
seperate sys/state
2021-04-06 15:47:03 +00:00
"indexmap",
update crates
2021-09-20 10:05:41 +00:00
"ordered-float 2.8.0",
update depednencies
2021-07-08 10:21:02 +00:00
"rand 0.8.4",
seperate sys/state
2021-04-06 15:47:03 +00:00
"rayon",
"slab",
"specs",
"tracing",
"vek",
"veloren-common",
"veloren-common-base",
"veloren-common-ecs",
"veloren-common-net",
]
fmt
2021-03-05 01:23:11 +00:00
[[package]]
name = "veloren-network"
version = "0.3.0"
dependencies = [
"async-channel",
"async-trait",
"bincode",
"bitflags",
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
"bytes",
fmt
2021-03-05 01:23:11 +00:00
"clap",
"criterion",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"crossbeam-channel",
fmt
2021-03-05 01:23:11 +00:00
"futures-core",
"futures-util",
update dependencies
2021-06-04 07:44:30 +00:00
"hashbrown 0.11.2",
fmt
2021-03-05 01:23:11 +00:00
"lazy_static",
"lz-fear",
"prometheus",
"prometheus-hyper",
Quic: We had the followuing problem: - locally we open a stream, our local Drain is sending OpenStream - remote Sink will know this and notify remote Drain - remote side sends a message - local sink does not know about the Stream. as there is (and CANT) be a wat to notify local Sink from local Drain (it could introduce race conditions). One of the possible solutions was, that the remote drain will copy the OpenStream Msg ON the Quic::stream before first data is send. This would work but is complicated. Instead we now just mark such streams as "potentially open" and we listen for the first DataHeader to get it's SID. add support for unreliable messages in quic protocol, benchmarks
2021-04-09 11:17:38 +00:00
"quinn",
update depednencies
2021-07-08 10:21:02 +00:00
"rand 0.8.4",
protocoladdr change for listen and connect (remove a loop in quic protocol which wasnt a actual loop)
2021-04-15 08:16:42 +00:00
"rcgen",
update other binaries
2021-11-19 14:40:59 +00:00
"rustls 0.20.1",
fmt
2021-03-05 01:23:11 +00:00
"serde",
"shellexpand",
In case of IPv6 and NON Windows make sure to not listen on dualstack, for that we need to create a socket2 socket and set_only_v6 to true. We need to privude set_nonblocking for tokio to work and we need to set reuseaddr for it to work on linux systems
2022-01-29 18:50:32 +00:00
"socket2",
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
"tokio",
fmt
2021-03-05 01:23:11 +00:00
"tokio-stream",
"tracing",
Bump tracing-subscriber to 0.3.2 We were pulling two versions of it. Causing some compilation errors
2021-11-26 17:41:51 +00:00
"tracing-subscriber",
fmt
2021-03-05 01:23:11 +00:00
"veloren-network-protocol",
]
[[package]]
name = "veloren-network-protocol"
version = "0.6.0"
dependencies = [
"async-channel",
"async-trait",
"bitflags",
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
"bytes",
fmt
2021-03-05 01:23:11 +00:00
"criterion",
update dependencies
2021-06-04 07:44:30 +00:00
"hashbrown 0.11.2",
fmt
2021-03-05 01:23:11 +00:00
"prometheus",
update depednencies
2021-07-08 10:21:02 +00:00
"rand 0.8.4",
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
"tokio",
fmt
2021-03-05 01:23:11 +00:00
"tracing",
]
Began work on plugin API and plugin loading
2020-12-09 20:47:42 +00:00
[[package]]
name = "veloren-plugin-api"
version = "0.1.0"
Reorganised plugin crates
2020-12-12 13:01:54 +00:00
dependencies = [
Finalized Retrieve API
2021-02-17 13:03:20 +00:00
"bincode",
Reorganised plugin crates
2020-12-12 13:01:54 +00:00
"serde",
Retrieves added + New ECS memory layout for plugins
2021-02-16 23:11:05 +00:00
"veloren-common",
Reorganised plugin crates
2020-12-12 13:01:54 +00:00
]
[[package]]
name = "veloren-plugin-derive"
version = "0.1.0"
dependencies = [
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"proc-macro2 1.0.32",
"quote 1.0.10",
"syn 1.0.81",
Reorganised plugin crates
2020-12-12 13:01:54 +00:00
]
[[package]]
name = "veloren-plugin-rt"
version = "0.1.0"
Began work on plugin API and plugin loading
2020-12-09 20:47:42 +00:00
dependencies = [
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
"bincode",
"serde",
Reorganised plugin crates
2020-12-12 13:01:54 +00:00
"veloren-plugin-api",
"veloren-plugin-derive",
Began work on plugin API and plugin loading
2020-12-09 20:47:42 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "veloren-server"
Change the version number to 0.12
2022-02-18 21:36:53 +00:00
version = "0.12.0"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
Added non-admin moderators and timed bans. The security model has been updated to reflect this change (for example, moderators cannot revert a ban by an administrator). Ban history is also now recorded in the ban file, and much more information about the ban is stored (whitelists and administrators also have extra information). To support the new information without losing important information, this commit also introduces a new migration path for editable settings (both from legacy to the new format, and between versions). Examples of how to do this correctly, and migrate to new versions of a settings file, are in the settings/ subdirectory. As part of this effort, editable settings have been revamped to guarantee atomic saves (due to the increased amount of information in each file), some latent bugs in networking were fixed, and server-cli has been updated to go through StructOpt for both calls through TUI and argv, greatly simplifying parsing logic.
2021-05-08 18:22:21 +00:00
"atomicwrites",
Add timeout's to group invites, and configurable limit to group size Fix a few group bugs, enable invite timeout and group limits in ui
2020-08-07 01:59:28 +00:00
"authc",
Added feature flag for terrain persistence
2021-08-12 09:48:00 +00:00
"bincode",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"chrono",
- add Polaris Lantern, created by Gemu and Uncomfy for Christmas
2021-12-11 23:42:15 +00:00
"chrono-tz",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"crossbeam-channel",
doing a simple 1:1 swap out network coding this is the part which prob has less Merge conflics and is easy to rebase the next commit will have prob alot of merge conflics followed by a fmt commit
2020-07-01 07:30:38 +00:00
"futures-util",
switch to hashbrown 0.11 and specs 0.16.2
2021-06-07 11:01:01 +00:00
"hashbrown 0.11.2",
Added non-admin moderators and timed bans. The security model has been updated to reflect this change (for example, moderators cannot revert a ban by an administrator). Ban history is also now recorded in the ban file, and much more information about the ban is stored (whitelists and administrators also have extra information). To support the new information without losing important information, this commit also introduces a new migration path for editable settings (both from legacy to the new format, and between versions). Examples of how to do this correctly, and migrate to new versions of a settings file, are in the settings/ subdirectory. As part of this effort, editable settings have been revamped to guarantee atomic saves (due to the increased amount of information in each file), some latent bugs in networking were fixed, and server-cli has been updated to go through StructOpt for both calls through TUI and argv, greatly simplifying parsing logic.
2021-05-08 18:22:21 +00:00
"humantime",
update crates
2021-09-20 10:05:41 +00:00
"itertools",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"lazy_static",
Move Specs code to own common_ecs create, put tracy and macros into common_base
2021-03-08 22:40:02 +00:00
"num_cpus",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"portpicker",
"prometheus",
fmt
2021-03-05 01:23:11 +00:00
"prometheus-hyper",
Revert "Merge branch 'sharp/revert-quinn' into 'master'" This reverts merge request !2315
2021-05-17 17:32:26 +00:00
"quinn",
update depednencies
2021-07-08 10:21:02 +00:00
"rand 0.8.4",
Add CustomPath to Travel enum Defines a custom path to follow, instead of using one from the World. Airships use this to slightly adjust their course to reduce collisions.
2021-04-04 10:55:15 +00:00
"rand_distr",
Move agent system to server
2021-02-06 06:15:25 +00:00
"rayon",
* Replaced `diesel` with `rusqlite` and `refinery` * Added "migration of migrations" to transfer the data from the __diesel_schema_migrations table to the refinery_schema_history table * Removed all down migrations as refinery does not support down migrations * Changed all diesel up migrations to refinery naming format * Added --sql-log-mode parameter to veloren-server-cli to allow SQL tracing and profiling * Added /disconnect_all_players admin command * Added disconnectall CLI command * Fixes for several potential persistence-related race conditions
2021-04-13 22:05:47 +00:00
"refinery",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"ron 0.7.0",
* Replaced `diesel` with `rusqlite` and `refinery` * Added "migration of migrations" to transfer the data from the __diesel_schema_migrations table to the refinery_schema_history table * Removed all down migrations as refinery does not support down migrations * Changed all diesel up migrations to refinery naming format * Added --sql-log-mode parameter to veloren-server-cli to allow SQL tracing and profiling * Added /disconnect_all_players admin command * Added disconnectall CLI command * Fixes for several potential persistence-related race conditions
2021-04-13 22:05:47 +00:00
"rusqlite",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"rustls 0.20.1",
"rustls-pemfile",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"serde",
Make the persistence system code more generic so that it handles all data associated with a character, rather than individually as we were planning to do with stats/inv/etc... This removes potential for DB locking when we deal with each individually, and we should have plenty of room for additional writes within the transaction.
2020-06-01 21:34:52 +00:00
"serde_json",
Added entity simulation to rtsim, reification, assimilation
2020-11-11 23:59:09 +00:00
"slab",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"specs",
fix specs
2020-07-07 12:28:00 +00:00
"specs-idvs",
Make Rtsim entity config work
2021-09-25 19:30:17 +00:00
"strum",
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
"tokio",
Convert all other veloren crates to use tracing - Completely removed both `log` and `pretty_env_logger` and replaced with `tracing` and `tracing_subscriber` where necessary. - Converted all `log::info!(...)` et al. statements to just use the shorthand macro i.e. `info!`. This was mostly to make renaming easier.
2020-06-21 14:26:06 +00:00
"tracing",
update dependencies
2021-03-21 21:53:44 +00:00
"vek",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"veloren-common",
Move Specs code to own common_ecs create, put tracy and macros into common_base
2021-03-08 22:40:02 +00:00
"veloren-common-base",
"veloren-common-ecs",
Moved common networking code to common/net, clippy fixes
2020-12-13 17:11:55 +00:00
"veloren-common-net",
seperate sys/state
2021-04-06 15:47:03 +00:00
"veloren-common-state",
Rename common-sys to common-systems and rearrange common-state slightly
2021-03-29 02:35:13 +00:00
"veloren-common-systems",
fmt
2021-03-05 01:23:11 +00:00
"veloren-network",
Resolved plugin dependency cycle, allowing more interesting plugin API
2020-12-13 12:27:48 +00:00
"veloren-plugin-api",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"veloren-world",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
[[package]]
name = "veloren-server-cli"
Change the version number to 0.12
2022-02-18 21:36:53 +00:00
version = "0.12.0"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
Escape ansi sequences
2020-07-27 21:09:33 +00:00
"ansi-parser",
Added flags to toggle the tui
2020-07-28 13:47:01 +00:00
"clap",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"crossterm 0.22.1",
Made the server cli great
2020-07-27 16:26:34 +00:00
"lazy_static",
limit tokio threads to 1/4 of num_cpus make sure that rayon has at least 2 threads even on 1cpu systems to increase stability
2021-05-04 17:42:45 +00:00
"num_cpus",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"ron 0.7.0",
Put server-cli specific settings in their own structure, serde_derive -> serde
2020-10-05 08:35:24 +00:00
"serde",
More fixes to stdin input. Adding tty makes sure docker attach won't be accidentally detached by ctrl-C (there are better ways of doing this but this one works for now) shell-words more closely emulates Bash's tokenizer rules (but without doing things like environment variable expansion) which allows us to use multiline strings as reasons, etc. Unfortunately entering newlines still won't work the way we've written things since shell-words does not right now give enough information to incrementally build up a valid string, just says there was a tokenizing error; but maybe in the future we can fix that.
2021-05-11 11:13:22 +00:00
"shell-words",
update crates
2021-09-20 10:05:41 +00:00
"signal-hook 0.3.10",
Added non-admin moderators and timed bans. The security model has been updated to reflect this change (for example, moderators cannot revert a ban by an administrator). Ban history is also now recorded in the ban file, and much more information about the ban is stored (whitelists and administrators also have extra information). To support the new information without losing important information, this commit also introduces a new migration path for editable settings (both from legacy to the new format, and between versions). Examples of how to do this correctly, and migrate to new versions of a settings file, are in the settings/ subdirectory. As part of this effort, editable settings have been revamped to guarantee atomic saves (due to the increased amount of information in each file), some latent bugs in networking were fixed, and server-cli has been updated to go through StructOpt for both calls through TUI and argv, greatly simplifying parsing logic.
2021-05-08 18:22:21 +00:00
"structopt",
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
"tokio",
Convert all other veloren crates to use tracing - Completely removed both `log` and `pretty_env_logger` and replaced with `tracing` and `tracing_subscriber` where necessary. - Converted all `log::info!(...)` et al. statements to just use the shorthand macro i.e. `info!`. This was mostly to make renaming easier.
2020-06-21 14:26:06 +00:00
"tracing",
Made the server cli great
2020-07-27 16:26:34 +00:00
"tui",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"veloren-common",
Move Specs code to own common_ecs create, put tracy and macros into common_base
2021-03-08 22:40:02 +00:00
"veloren-common-base",
move tracing code to own crate
2021-03-28 23:40:53 +00:00
"veloren-common-frontend",
Moved common networking code to common/net, clippy fixes
2020-12-13 17:11:55 +00:00
"veloren-common-net",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"veloren-server",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
[[package]]
name = "veloren-voxygen"
Change the version number to 0.12
2022-02-18 21:36:53 +00:00
version = "0.12.0"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
Update `assets_manager` to 0.7
2021-12-12 19:01:52 +00:00
"assets_manager",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"backtrace",
"bincode",
Implement toggleable gpu profiling that saves the timings from a recent frame with the screenshot key, rebase fixes
2021-02-27 09:21:23 +00:00
"bytemuck",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"chrono",
Properly fixed command parsing
2021-07-23 16:33:31 +00:00
"chumsky",
Pin cmake crate to 0.1.45, since the newer version uses the --parallel argument which is not available on our CI's cmake version
2021-11-21 14:51:39 +00:00
"cmake",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"conrod_core",
"conrod_winit",
Migrate singleplayer save folders to the new location if they have not already been generated
2020-10-10 23:23:41 +00:00
"copy_dir",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"cpal",
"criterion",
Use a threadpool to speed up minimap chunk rendering. Also fix ceiling height calculations and color water blue.
2021-05-13 22:24:11 +00:00
"crossbeam-channel",
update dependencies
2021-06-04 07:44:30 +00:00
"crossbeam-utils 0.8.5",
updated dependencies and fixed stuff - replace serde_derive by feature of serde incl. source code modifications to compile - reduce futures-timer to "2.0" to be same as async_std - update notify - removed mio, bincode and lz4 compress in common as networking is now in own crate btw there is a better lz4 compress crate, which is newer than 2017 - update prometheus to 0.9 - can't update uvth yet due to usues - hashbrown to 7.2 to only need a single version - libsqlite3 update - image didn't change as there is a problem with `image 0.23` - switch old directories with newer directories-next - no num upgrade as we still depend on num 0.2 anyways - rodio and cpal upgrade - const-tewaker update - dispatch (untested) update - git2 update - iterations update
2020-07-06 14:23:08 +00:00
"directories-next",
Update to winit 0.21.0
2020-02-08 02:09:56 +00:00
"dispatch 0.1.4",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"dot_vox",
undo egui upgrade try
2021-11-19 13:19:04 +00:00
"egui",
Added egui debug UI - a 100% rust UI framework (similar to imgui) allowing for rapid development of debug interfaces to aid development. This is feature-gated behind the `egui-ui` feature which is enabled by default but removed for airshipper builds. Included in the initial implementation is an entity browser which lists all entities in the client ECS, an entity component viewer which shows select components belonging to the selected entity including character state information, and a simple frame time graph. This MR also includes an extraction of the animation hot reloading code which has been reused for egui to allow for hot-reloading of the egui interface to allow rapid development of the UI with realtime feedback upon save as is the case with aninmations. This is feature-gated behind the `hot-egui` feature which is not enabled by default due to the extra startup time that it adds.
2021-07-04 09:47:18 +00:00
"egui_wgpu_backend",
"egui_winit_platform",
Move sprite data to a config file.
2020-08-28 07:21:22 +00:00
"enum-iterator",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"euc",
Added Controller support
2020-03-10 21:00:13 +00:00
"gilrs",
Implement text renderering with glyph_brush (lifetime error)
2020-04-22 01:29:59 +00:00
"glyph_brush",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"guillotiere",
switch to hashbrown 0.11 and specs 0.16.2
2021-06-07 11:01:01 +00:00
"hashbrown 0.11.2",
Initial setup to use iced
2019-12-15 17:13:52 +00:00
"iced_native",
Update to latest iced git, rebase fixes
2020-06-27 17:44:43 +00:00
"iced_winit",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"image",
progress
2021-11-27 00:03:10 +00:00
"inline_tweak",
update crates
2021-09-20 10:05:41 +00:00
"itertools",
Display keys based off of scancodes Queries the OS to translate physical keyboard scancodes into Strings that can be shown in the UI. Addresses issues #861 and #354
2021-03-31 12:56:56 +00:00
"keyboard-keynames",
Refactored loadout to have public functions for each slot instead of requiring callers to use the _INDEX consts
2021-01-08 19:12:09 +00:00
"lazy_static",
switch to SharedLink and unset context
2021-08-30 07:24:32 +00:00
"mumble-link",
replace heavy msgbox with light native-dialog
2020-09-08 14:33:06 +00:00
"native-dialog",
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
"num 0.4.0",
fmt
2021-03-05 01:23:11 +00:00
"num_cpus",
update crates
2021-09-20 10:05:41 +00:00
"ordered-float 2.8.0",
Use profling to get spans from wgpu, update wpgu & its deps for various fixes
2021-04-30 02:54:10 +00:00
"profiling",
update depednencies
2021-07-08 10:21:02 +00:00
"rand 0.8.4",
Performance improvements for terrain watcher
2021-07-18 23:10:55 +00:00
"rand_chacha 0.3.1",
rayon::join creates a global threadpool, which is only used in /world instead just use the same threadpool for everything helps with debugging problems with GDB using threadpool.install() to also be used when `into_par_iter()` is called
2021-05-04 15:11:01 +00:00
"rayon",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"rodio",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"ron 0.7.0",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"serde",
Revert "Replace shaderc with naga" This reverts commit 446d93dda0db486d65ec9374946205cc5bf35a59.
2021-09-04 18:59:18 +00:00
"shaderc",
Remove old textures that aren't reused when calling replace_graphic
2021-09-23 01:10:23 +00:00
"slab",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"specs",
fix specs
2020-07-07 12:28:00 +00:00
"specs-idvs",
Crafting Tabs and more item tags
2021-04-04 13:02:27 +00:00
"strum",
"strum_macros",
Auth requests are now done async, the register system is fetching it, via a PendingLogin component The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`
2021-03-11 00:08:12 +00:00
"tokio",
Convert voxygen to use tracing There are several noteable changes in this commit that mean that logging will behave differently to how it did previously. - There are now no separate filter levels for terminal and file output. This is a feature that is lacking in `tracing` but is set to be resolved by https://github.com/tokio-rs/tracing/pull/508. At which point we MAY include it. - The default log level was previously `WARN` - it is now `INFO`.
2020-06-21 10:22:26 +00:00
"tracing",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"treeculler",
update dependencies
2021-03-21 21:53:44 +00:00
"vek",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"veloren-client",
"veloren-common",
Move Specs code to own common_ecs create, put tracy and macros into common_base
2021-03-08 22:40:02 +00:00
"veloren-common-base",
"veloren-common-ecs",
move tracing code to own crate
2021-03-28 23:40:53 +00:00
"veloren-common-frontend",
Moved common networking code to common/net, clippy fixes
2020-12-13 17:11:55 +00:00
"veloren-common-net",
seperate sys/state
2021-04-06 15:47:03 +00:00
"veloren-common-state",
Rename common-sys to common-systems and rearrange common-state slightly
2021-03-29 02:35:13 +00:00
"veloren-common-systems",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"veloren-server",
Hotreload animations using libloading
2020-06-17 07:49:14 +00:00
"veloren-voxygen-anim",
Added egui debug UI - a 100% rust UI framework (similar to imgui) allowing for rapid development of debug interfaces to aid development. This is feature-gated behind the `egui-ui` feature which is enabled by default but removed for airshipper builds. Included in the initial implementation is an entity browser which lists all entities in the client ECS, an entity component viewer which shows select components belonging to the selected entity including character state information, and a simple frame time graph. This MR also includes an extraction of the animation hot reloading code which has been reused for egui to allow for hot-reloading of the egui interface to allow rapid development of the UI with realtime feedback upon save as is the case with aninmations. This is feature-gated behind the `hot-egui` feature which is not enabled by default due to the extra startup time that it adds.
2021-07-04 09:47:18 +00:00
"veloren-voxygen-egui",
remove some reexports
2021-07-29 18:47:45 +00:00
"veloren-voxygen-i18n",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"veloren-world",
Update to the most recent wgpu
2021-03-17 13:56:40 +00:00
"wgpu",
Implement toggleable gpu profiling that saves the timings from a recent frame with the screenshot key, rebase fixes
2021-02-27 09:21:23 +00:00
"wgpu-profiler",
Upgrade to winit 0.25
2021-06-15 08:01:57 +00:00
"window_clipboard",
Temporarily remove voxygen character_renderer example until we move to a more actively maintained rendering backend
2020-07-16 04:37:05 +00:00
"winit",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"winres",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
Hotreload animations using libloading
2020-06-17 07:49:14 +00:00
[[package]]
name = "veloren-voxygen-anim"
Change the version number to 0.10
2021-06-12 08:14:07 +00:00
version = "0.10.0"
Hotreload animations using libloading
2020-06-17 07:49:14 +00:00
dependencies = [
More fixes
2020-09-26 15:43:59 +00:00
"bytemuck",
Hotreload animations using libloading
2020-06-17 07:49:14 +00:00
"lazy_static",
update dependencies
2021-03-21 21:53:44 +00:00
"vek",
Hotreload animations using libloading
2020-06-17 07:49:14 +00:00
"veloren-common",
Added egui debug UI - a 100% rust UI framework (similar to imgui) allowing for rapid development of debug interfaces to aid development. This is feature-gated behind the `egui-ui` feature which is enabled by default but removed for airshipper builds. Included in the initial implementation is an entity browser which lists all entities in the client ECS, an entity component viewer which shows select components belonging to the selected entity including character state information, and a simple frame time graph. This MR also includes an extraction of the animation hot reloading code which has been reused for egui to allow for hot-reloading of the egui interface to allow rapid development of the UI with realtime feedback upon save as is the case with aninmations. This is feature-gated behind the `hot-egui` feature which is not enabled by default due to the extra startup time that it adds.
2021-07-04 09:47:18 +00:00
"veloren-voxygen-dynlib",
Hotreload animations using libloading
2020-06-17 07:49:14 +00:00
]
Use separate crate to compile anim as a cdylib to avoid compiling both all the time and improve voxygen pipelining
2021-04-16 23:22:06 +00:00
[[package]]
name = "veloren-voxygen-anim-dyn"
Change the version number to 0.10
2021-06-12 08:14:07 +00:00
version = "0.10.0"
Use separate crate to compile anim as a cdylib to avoid compiling both all the time and improve voxygen pipelining
2021-04-16 23:22:06 +00:00
dependencies = [
"veloren-voxygen-anim",
]
Added egui debug UI - a 100% rust UI framework (similar to imgui) allowing for rapid development of debug interfaces to aid development. This is feature-gated behind the `egui-ui` feature which is enabled by default but removed for airshipper builds. Included in the initial implementation is an entity browser which lists all entities in the client ECS, an entity component viewer which shows select components belonging to the selected entity including character state information, and a simple frame time graph. This MR also includes an extraction of the animation hot reloading code which has been reused for egui to allow for hot-reloading of the egui interface to allow rapid development of the UI with realtime feedback upon save as is the case with aninmations. This is feature-gated behind the `hot-egui` feature which is not enabled by default due to the extra startup time that it adds.
2021-07-04 09:47:18 +00:00
[[package]]
name = "veloren-voxygen-dynlib"
version = "0.1.0"
dependencies = [
"find_folder",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"libloading 0.7.2",
update crates
2021-09-20 10:05:41 +00:00
"notify 5.0.0-pre.13",
Added egui debug UI - a 100% rust UI framework (similar to imgui) allowing for rapid development of debug interfaces to aid development. This is feature-gated behind the `egui-ui` feature which is enabled by default but removed for airshipper builds. Included in the initial implementation is an entity browser which lists all entities in the client ECS, an entity component viewer which shows select components belonging to the selected entity including character state information, and a simple frame time graph. This MR also includes an extraction of the animation hot reloading code which has been reused for egui to allow for hot-reloading of the egui interface to allow rapid development of the UI with realtime feedback upon save as is the case with aninmations. This is feature-gated behind the `hot-egui` feature which is not enabled by default due to the extra startup time that it adds.
2021-07-04 09:47:18 +00:00
"tracing",
]
[[package]]
name = "veloren-voxygen-egui"
version = "0.9.0"
dependencies = [
undo egui upgrade try
2021-11-19 13:19:04 +00:00
"egui",
Added egui debug UI - a 100% rust UI framework (similar to imgui) allowing for rapid development of debug interfaces to aid development. This is feature-gated behind the `egui-ui` feature which is enabled by default but removed for airshipper builds. Included in the initial implementation is an entity browser which lists all entities in the client ECS, an entity component viewer which shows select components belonging to the selected entity including character state information, and a simple frame time graph. This MR also includes an extraction of the animation hot reloading code which has been reused for egui to allow for hot-reloading of the egui interface to allow rapid development of the UI with realtime feedback upon save as is the case with aninmations. This is feature-gated behind the `hot-egui` feature which is not enabled by default due to the extra startup time that it adds.
2021-07-04 09:47:18 +00:00
"egui_winit_platform",
"lazy_static",
"veloren-client",
"veloren-common",
"veloren-voxygen-dynlib",
]
[[package]]
name = "veloren-voxygen-egui-dyn"
version = "0.9.0"
dependencies = [
"veloren-voxygen-egui",
]
remove some reexports
2021-07-29 18:47:45 +00:00
[[package]]
name = "veloren-voxygen-i18n"
version = "0.10.0"
dependencies = [
"clap",
"deunicode",
"git2",
"hashbrown 0.11.2",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"ron 0.7.0",
remove some reexports
2021-07-29 18:47:45 +00:00
"serde",
"tracing",
"veloren-common-assets",
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "veloren-world"
Change the version number to 0.10
2021-06-12 08:14:07 +00:00
version = "0.10.0"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"arr_macro",
"bincode",
"bitvec",
Generate palette info from block statistics, and benchmark how well it compresses.
2021-06-29 01:26:24 +00:00
"clap",
(See sharp/lod-history) LOD, shadows, greedy meshing, new lighting, perf --- Pretty much a Veloren fork at this point. Here's a high level overview of the changes (will be added to CHANGELOG just before merge). At a high level this MR incorporates roughly two groups of changes. The first group consists of new game features: more flexible map sizes, level of detail terrain, shadow maps, and a new lighting engine. This is "feature work" that (mostly) only adds new things to Veloren, and mostly shouldn't affect old stuff. The second big group of changes are those addressing the fallout from all the new features. These include performance fixes of various sorts: the addition of multiple graphics options and optimization of the cheap ones to avoid work, switching all voxel models to use some variant of greedy meshing, switching over much of our CPU-side vector math to exploit SIMD instructions (coinciding with a fork of `vek`), and a rewrite of how the UI handles text rendering (coinciding with updates to our fork of `conrod`). Making Veloren's hardcoded colors appear correct under the new lighting engine also required considerably changes (TODO: Fill in this section when it's complete). The second category of changes often heavily touches code owned by other people, including frequently modified code "owned" by a handful of people, so I recommend that this code be reviewed particularly carefully. --- At a high level (each will be described in more detail below): - The world map has been refactored. - The world size is no longer hardcoded (@zesterer). - The map generation code was made generic to allow using it outside of the `world` crate (@zesterer). - On world creation, we now compute *horizon maps* (@zesterer). - The way we pass the world from the server to the client has been updated (@xMAC94x). - Artifacts related to image rotation were fixed (@imbris). - Multiflow rivers were enabled (@zesterer). - In the process of making changes related to the world map, various incidental fixes and optimizations were required. - The new *level of detail* feature was added (@zesterer wrote part of this and has checked out the rest). - A new LOD terrain rendering step was added to the pipeline. - The LOD terrain quality was made configurable via a graphics setting. - Horizon maps were used to cast shadows from LOD chunks on both LOD and non-LOD terrain. - A "voxelization" effect was incorporated into rendered LOD terrain to make it blend better into the world. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Veloren's lighting has been completely overhauled (@zesterer has already checked most of this out). - A semi-accurate index of refraction was assigned to our materials. - A new, more realistic, physically based approach to lighting was used using the *Ashikhmin Shirley* BRDF. - We emulate *atmospheric scattering* using equations designed for measuring solar panel light exposure. - We attempt to compute *realistic light attenuation* in water using its real material properties. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Point and directional lights now cast realistic shadows, using *shadow mapping.* (@imbris, @zesterer, @Treeco, @YuriMomo) - Point light shadow maps were added to the rendering pipeline, using geometry shaders and *seamless cube maps*. - Directional light shadows were added to the rendering pipeline, using LISPSM together with disabling *depth clamping*. - "Shadow-only" chunks and NPCs were added to prevent shadows from models behind you from disappearing. - In the process of making changes related to shadow maps, various incidental fixes and optimizations were required. The addition of shadow maps, LOD terrain, and the new lighting all led to significant performance degradation, on top of other changes happening in master. Therefore, a large number of performance improvements were also needed: - The graphics options were made much more flexible and configurable, and shaders were optimize. - New options were provided for how to render lights and shadows (@Pfauenauge, @zesterer). - Graphic setting storage and configuration were overhauled to make adding new features easier (@Pfauenauge, @imbris). - Shaders were rewritten to utilize GLSL's preprocessor to avoid overhead (@zesterer, @YuriMomo). - In the process of making changes related to providing additional rendering options, various incidental fixes and optimizations were required. - Voxel model creation was switched to use *greedy meshing.* - A new voxel meshing method, greedy meshing, was added (@imbris). - Uses of the older meshing methods were migrated to use greedy meshing (@imbris, @jshipsey, @Pfauenauge). - New restrictions were added to terrain, figure, and sprites to future proof them for further optimizations (@jshipsey, @Pfauenauge, @zesterer). - Most positions are now relative to either chunk or player position for better precision (@imbris, @zesterer, @scottc). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - Animation and terrain math were switched to use SIMD where possible. - Fixes were made to vek to make its SIMD feature usable for us (@zesterer, @imbris). - The interface and types used in bone animation were changed in various ways (@jshipsey, @Snowram, @Pfauenauge). - Redundant code generation for body animation is now partly taken care of by a macro (@jshipsey, @Snowram, @Pfauenauge). - Animation code was modified to to use vek's SIMD representation where possible (@jshipsey, @Snowram, @Pfauenauge). - Terrain meshing code and shadow map math were also modified to use vek's SIMD representation (@imbris). - SIMD instruction generation was enabled (@YuriMomo, @jshipsey, @Snowram, @imbris, @Angelonfira, @xMAC94x). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - The way we cache glyphs was completely refactored, fixed, and optimized. - Our fork of `conrod` was optimized in various ways (@imbris). - Our fork of `conrod` now exposes whether a widget was updated during the current frame (@imbris). - Our use of the glyph cache was rewritten for correctness (@imbris). - A *text cache* was introduced that lets us skip remeshing glyphs that have not changed (@imbris). - Various changes were made to reduce pressure on the glyph cache, with more planned (@imbris, @Pfauenauge). - In the process of making changes related to the glyph cache, various incidental fixes and optimizations were required. - Colors were changed to keep Veloren's look consistent with master. - Some older tree models were brought back (@Pfauenauge). - TODO(@Sharp): All hardcoded colors were extracted and made hotloadable. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Hardcoded colors were fixed to conform to Veloren's style. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Color models were fixed to conform to Veloren's style. A detailed description of the involved changes follows. --- - The world size is no longer hardcoded. All functions dependent on world size now take a `WorldSizeLg`, which holds the base 2 logarithm of each actual world dimension and is guaranteed to maintain certain properties (outlined in `common/src/terrain/map.rs`). Additionally, many utility functions that utilize the world size were moved into `common` as well (mostly `common/src/terrain/mod.rs`). Finally, the world map format was updated in order to store its size explicitly, with a migration path from the old format that should work whenever the old formatted map was a square (practically always). See `world/src/sim/mod.rs` for these changes. - The map generation code was made generic to allow using it outside of the `world` crate. The parts of the map generating code that do not need to query the world were moved over to `common/src/terrain/map.rs`, allowing them to be used from the client without creating a dependency on `world`. The rest of it was turned into helper functions in `world/src/sim/map.rs`, which can be passed as closures to the generic map generation code to complete its construction. This also means that colors are now passed in separately to the map generation function. See <https://veloren.net/devblog-78/> for more details. - On world creation, we now compute *horizon maps*. See the function in `world/src/sim/util.rs`. Given a height map and a plane intersecting that height map, our horizon maps allow us to encode enough information to reconstruct shadows for each point on the height map using only the *horizon angle* (the angle at which the sun starts to become visible). As Veloren's sun only covers one plane, this is sufficient for encoding sun shadows for LOD terrain, by encoding two angles per chunk (one for each 90 degrees the sun covers). We can also use this for the moon, if we want, since the moon follows the same path. Additionally, we store the *height* of the furthest occluder, to try to make the shadows volumetric; so this means 4 bytes in total for each chunk. Support for horizon maps has been merged into the map functionality in common as well. - The way we pass the world from the server to the client has been updated. Rather than passing the prerendered map, we instead pass three maps with values for each chunk; one with the color information, a second with altitude information, and a third with horizon map information. We then reconstruct the map on the client, together with some additional information we send from the server (like the sea level and maximum height). See `common/src/msg/server.rs` for a detailed description of the format of `WorldMapMsg`, and `server/src/libr.rs` and `client/src/lib.rs` for details of the map construction and parsing. - Artifacts related to image rotation were fixed. See the commit message for commit SHA `cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e` for a detailed explanation. This involved changes to shaders, the addition of a new type of graphic (also reflected in the graphic cache) that allows specifying a border color (which automatically makes the associated texture immutable), and some related fixes. I reproduce the first two paragraphs of the MR description as well: ``` Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). ``` - Multiflow rivers were enabled. This does not really need to be part of this MR, and would be easy to revert, but since it seemed to provide a nice improvement it's currently packaged with it. We already computed multiple outflows from each chunk for erosion purposes long before this MR. However, we never modified river rendering to be able to handle this case (just a single downhill river flow is complex enough!) so this was not exposed when deciding which chunks were rivers. Now that - In the process of making changes related to the world map, various incidental fixes and optimizations were required. Some examples of fixes include making sure terrain is never lowered to below sea level (to make the shadow maps report correct values), fixing map altitudes and colors to understand things like cliffs and "block level" coloring (that doesn'te xist on the column level), and fixing a crashbug when rendering images for the UI where source pixels are strongly rectangular. Some examples of related performance fixes include avoiding allocating a fresh vector for all the maps (i.e. copying it over to change the format from `[u32; n]` to `DynamicImage` and then copying again to convert to `RgbaImage`), and instead using the `gfx::memory::slice` function to accomplish the same thing. These sorts of changes are spread all arond the code. This includes the additon of a new scene, `voxygen/src/scene/lod.rs`, a new pipeline `voxygen/src/render/pipeline/lod_terrain.rs`, and new shaders `assets/vxygen/shaders/lod-terrain-vert.glsl` and `assets/vxygen/shaders/lod-terrain-frag.glsl`, as well as associated changes to the renderer in `voxygen/src/render/renderer.rs`. The main idea behind our initial approach to LOD was to take the world data we now get from the server (altitude, color, and horizon mapping). - Some previously computed values were turned into shader uniforms for better prediction on weak processors. (@zesterer) - Calls to power or trig functions were removed or replaced with multiplications, where possible. - After some deliberation - To properly handle sprite "waving" for nearby sprites, We explicitly designed the greedy meshing system with figures and sprites in mind. In both cases, we want to be able to *efficiently* pack many different models into the same texture, especially in cases where we know we will either not be removing any of the grouped-together from the models from the texture, or will remove all of them at once (so they can be packed into some specific subtexture). For sprites, since we know every model in advance and never intend to deallocate them, we currently pack them all as efficiently as possible into one giant tetxure atlas. However, in the future we might opt to pack them slightly less efficiently in exchange for shrinking the sprite vertex size. For figures, we pack all the textures for each *model* into the same atlas. is a global texture atlas used for every sprite, and for figures which is why we have the ability to mesh multiple models to the same texture area (using the simple texture atlas allocator) without requiring intermediate vector allocations. This is accomplished by delaying the time when we actually write the color and light data to the texture until *after* all the model vertices have been meshed; then, we can just allocate the whole color/light array at once, making the atlas we use an exact fit. In computer science-y terms, we accomplish this delay by, after we perform the initial greedy meshing (without texture information), not continuing to create the texture data, but instead constructing a *continuation*--that is, a function that, when called, will execute the rest of the computation. We push this continuation (which in Rust terms is a `FnOnce` closure that takes the `ColLightsInfo` that it is supposed to write to as context) onto a onto a vector resizing. To allow for suspended writes to texture data, Rust pointed out to me that the continuation that would eventually write the color and light data to the texture atlas (the one that is shared by all models sharing the same greedy mesher) would have to *own* whatever data it mshed. Because we often generate the model data to mesh as a temporary in `voxygen/src/load.rs`, the - Matrix multiplications in the shader were reduced for figure data (@zesterer). - Vertex "waves" for fluid data were removed. - Terrain "bending" near edges was removed. - Scaling was fixed to make sure empty space was not introduced in a space previously occupied by a block. It was also changed to take ownership of its voxel data, rather than sharing it, to let it be used with meshing. - Rust's nightly version was bumped in order to use the `array_map` function, which lets us reuse more code between the simple map and `FigureModelCache`. - PositionedGlyph::standalone. --- I tried to cite sources in many cases[^realtime],[^lloyd],[^lispsm],[^pbrt],[^greedy],[^tjunctions] where I needed features from elsewhere but I am particularly grateful for the following resources, esepcially where they have accompanying source code. I linked all of them that are accessible to the public (those that are not were obtained through legal means). [^realtime]: Eisemann, Elmar, Michael Schwarz, Ulf Assarsson, Michael Wimmer. Real-Time Shadows. A K Peters/CRC Press (T&F), 20160419. [^lloyd]: Lloyd,B. 2007. [Logarithmic perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). PhD thesis, University of North Carolina. [^lispsm]: Wimmer, M., Scherzer, D., and Purgathofer, W. 2004. [Light space perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). In Proceedings of Eurographics Symposium on Rendering 2004, pp. 143– 152. [^pbrt]: Pharr, Matt, et al. [http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf](Physically Based Rendering: From Theory to Implementation). Third edition, Morgan Kaufmann Publishers/Elsevier, 2017. [^greedy]: mikolalysenko. “Meshing in a Minecraft Game.” 0 FPS, 30 June 2012, <https://0fps.net/2012/06/30/meshing-in-a-minecraft-game/>. [^tjunctions]: blackflux. “Meshing in Voxel Engines – Part 1.” Blackflux.Com, 23 Feb. 2014, <https://blackflux.wordpress.com/2014/02/23/meshing-in-voxel-engines-part-1/>. I am also especially grateful to Khronos, Wikiepdia, and stackoverflow for answering many of my specific questions while writing the MR. --- Squashed commit of the following: commit 300505e7305a2fdac722a808ee8538323f215f39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 18:46:25 2020 +0200 Fixing cargo doc and typo in CHANGELOG. commit ec0aeb18e8499d7d84ef818331b4b65c3d76cea6 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 15:38:50 2020 +0200 Hopefully final commit for the LOD branch. commit 5e8ea0b1eaac02903a02feb2eb038d195de4872f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 10:14:26 2020 +0200 Falling back to power as stopgap. commit e44a1cbf46504ee9931a01bdc9033e145500d557 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 09:25:41 2020 +0200 Address imbris feedback. Temporarily disables shiny water, lowers max VD. These restrictions will be lifted soon after merging. commit 561e25778a108ac3712f5ec2ce3a51234c4430d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 08:31:13 2020 +0200 Tweaking shaders a bit. commit 7d19259078ce0dd7b3742ad7d0cb3fab3ece3fdc Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:59:43 2020 +0200 Fix view example as well. commit 051cd4934e0fad2c0b15db4380a4189fa318679f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:29:06 2020 +0200 Fix meshing benchmark. commit c95e07db3b4dcca285678985e65e31b927cb1c61 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 05:46:22 2020 +0200 Address MR feedback, fix scene clouds. commit 1bfb816cabdb3ffc1e507a009c2d98696b4b573a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:39:36 2020 +0200 Incorporating Pfau's figure color changes. New eyes and new humanoid colors. commit 3f9b89a3ac7b3356b1dba0d1a8f6541357f81469 Merge: e2f5162e4 62c53963a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:29:41 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit e2f5162e4f96f4124aa43488f7245d341b3dcfd4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:28:38 2020 +0200 World colors are all hotloadable. They live in assets/world/style/colors.ron. Only a small handful of hardcoed colors remain in World; they are either part of the map, or difficult to disentangle from the rest of the computation. Comments are made where appropriate. commit 62c53963abe1975009d34a8f9515a355bef24f31 Author: Marcel Märtens <marcel.cochem@googlemail.com> Date: Wed Aug 19 15:59:00 2020 +0200 replace pretty_env_logger with tracing commit 5b1625f99d9586fe80e2232f583ec5af9f953099 Merge: d71003acd 4942b5b39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:15:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit d71003acdabeff970b3928e97c26af6847b5b78e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:14:34 2020 +0200 Hotloading colors, part 1: colors in common. Currently, this just entails humanoid colors. There are only three colors not handled; the light emitter colors in common/src/comp/inventory/item/tool.rs. These don't seem important enough to me to warrant making hotloadable, at least not right now, but if it's needed later we can always add them to the file. commit 63b5e0e553eb2ea49276f192a6fc7dd65254270d Merge: c32b337a4 6d2c4b9c1 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 13:05:37 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c32b337a46e10d9de473d178a94a3ccd61c39bb3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:52:04 2020 +0200 Fixing LOD grid, for real. commit a166ae0360395387e09fb35a1f84210c2ce5ec24 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:28:05 2020 +0200 Addressing imbris's initial feedback. Fixes two minor bugs: explosion particles were no longer spawning randomly, and LOD grids were not perfectly even. commit 4cbad004f44060994252dd3d38647a14a589712f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:27:58 2020 +0200 Bumping nightly per request. commit 548680276aac77c25d43d16b5622f847d474dbef Merge: acc098604 8f8b20c91 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:26:06 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit acc0986040589a3492f88a740bc3c3fc693b26d3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:28:32 2020 +0200 Lower resolution due to lying drivers. commit d3b878de2a52c358d2944a6bbd0555dad7fbdb10 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:15:38 2020 +0200 Fix issues msh encountered with Intel 4600. commit 10245e0c1b0cb6fae10d86409435364edc6102ef Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 21:15:02 2020 +0200 Merge more models into one mesh than we did previously. commit 3155c31e663c52ae5c3a53d5fb5665892a1a498a Merge: 7204cc8a7 3c199280e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:35:22 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7204cc8a7a4f74a30306bd205d9834fee4bb944f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:34:43 2020 +0200 Fix not yet done NPC animations. This forces them all to be the idle animation if not specified. This fixes issues where you'd have giant NPCs in water. commit bc83360f2a08918f19d417b5f772e1ff554dba08 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 19:36:37 2020 +0200 Try to fix some bugs: - Z fighting with LOD terrain and water. - Audio SFX not playing. commit 1fd104aa603bf3781b6526a5cada46aeca3049dd Merge: 862df3c99 7c2c392a3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 12:02:31 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 862df3c9976c4da9bd7cfd784f1a85973127968a Merge: 0a4218ed9 75c1d4401 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 05:52:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0a4218ed9d541a2b34c133351bea38a99ddf4ea7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 22:27:14 2020 +0200 Fix particle depth. commit f51dfdeb442d0dd5243dd2f344fa4be295bd0875 Merge: c6251a956 5e6dc0471 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:19:04 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit c6251a956ad376400dca5c23420cf8d213dc8fdf Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:15:46 2020 +0200 Cache figures more intelligently. Cache figures for longer, and don't cache character states for the player except where they actually affect the rendered model. commit 0ed801d5404982c6fb63b1eaa4567d908b294c9d Merge: c11b9bdf0 eea64f78f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 16:32:24 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c11b9bdf0a53bf9884d2f5a48fec9b01d582df1a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 11:47:15 2020 +0200 Remove unneeded Clippy annotation. commit 16aa9ef40af56d69289d00aafb3deadfb8bd4f35 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 8 00:53:02 2020 +0200 Fix hotloading and Clippy. commit 3dc973e0be5b758da1e9805eb764ad401374cd0c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 23:50:27 2020 +0200 Major speedups with SIMD. commit fba64a7d93d5a96077ce87287bbce6ab9b7fbcae Merge: 76429d00e d1e10b178 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:19 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 76429d00eea00d212fbd672a84ee91e75b19b938 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:10 2020 +0200 Add clippy.toml. commit c79f512f84dbb83cb82b7954db68ff241dfd8e41 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 11:55:20 2020 +0200 Fix all clippy issues, clean up Rust code. commit 6f90e010b3fbefb53b0d632e819931350015b6b8 Merge: 77a8c7c26 5929cfa5c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:30 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 77a8c7c267d3f44a1a62bd6b2274359973c5e4d4 Merge: b44e44232 44febaabd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:10 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 5929cfa5c713aa392110bbb62407f76caf53c3df Author: jshipsey <jshipsey18@gmail.com> Date: Thu Aug 6 20:47:27 2020 -0400 fixed in-hand arrow bug commit b44e442325d828f1cd564d66908f89d09e80474b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 6 13:40:35 2020 +0200 Miscellaneous performance improvements. commit be37acf287c1360d8085862526ac3365ffd1d768 Merge: 125d7fc6c c11876547 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 05:49:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 125d7fc6c4dcd8c8c5f27b8268a4d64f409f3644 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 04:55:31 2020 +0200 Abstract over simd vs. repr_c vectors. Also some minor improvements to Event size. commit d4d4956e9252e1241ce110b2aa85076c6b1e2a23 Merge: 5f3b7294a aced5f979 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:56:54 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 5f3b7294af1f8533edc2620b58863c248e2b07af Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:43:52 2020 +0200 Fix formatting issues I missed before. commit a428a3ebba70dcab63dd0f8cd983120c90617271 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:41:51 2020 +0200 Fix clippy warnings, part 1. There aer still a bunch of type too complex and function takes too many arguments warnings that I'll fix later (or ignore, since in the one case I did fix a function takes too many arguments warning I think it made the code *less* readable). commit ba54307540ed8a937ac08209730284fc653af85b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 30 13:22:42 2020 +0200 Fix light animations so they are removed when the light turns off. commit 7e0f4bcbf0f4717145d8beac40d52e3acebbe2aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 21:10:20 2020 +0200 Fix crash in edge case for pixel art. commit 56da06f7a351e2b949e9b014a90b974d511a0924 Merge: cf74d55f2 9f53a4a19 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:56:52 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:29:52 2020 +0200 Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). The first concern was addressed by fixing the dimensions of the map images drawn from the UI (so that we always use a square source rectangle, rather than a rectangular one according to the dimensions of the map). We also fixed the way rotation was done in the fragment shader for north-facing sources to make it properly handle aspect ratio (this was already done for north-facing targets). Together, these fix rendering issues peculiar to rectangular maps. The second and third concerns were jointly addressed by adding an optional border color to every 2D image drawn by the UI. This turns out not to waste extra space even though we hold a full f32 color (to avoid an extra dependency on gfx's PackedColor), since voxel images already take up more space than Optiion<[f32; 4]> requires. This is then implemented automatically using the "border color" wrapping method in the attached sampler. Since this is implemented in graphics hardware, it only works (at least naively) if the actual image bounds match the texture bounds. Therefore, we altered the way the graphics cache stores images with a border color to guarantee that they are always in their own texture, whose size exactly matches their extent. Since the easiest currently exposed way to set a border color is to do so for an immutable texture, we went a bit further and added a new "immutable" texture storage type used for these cases; currently, it is always and automatically used only when there is a specified border color, but in theory there's no reason we couldn't provide immutable-only images that use the default wrapping mdoe (though clamp to border is admittedly not a great default). To fix the maps case specifically, we set the border color to a translucent version of the ocean border color. This may need tweaking going forward, which shouldn't be hard. As part of this process, we had to modify graphics replacement to make sure immutable images are *removed* when invalidated, rather than just having a validity flag unset (this is normally done by the UI to try to reuse allocations in place if images are updated in benign ways, since the texture atlases used for Ui do not support deallocation; currently this is only used for item images, so there should be no overlap with immutable image replacement, so this was purely precautionary). Since we were already touching the relevant code, we also updated the image dependency to a newer version that provides more ways to avoid allocations, and made a few other changes that should hopefully eliminate redundant most of the intermediate buffer allocations we were performing for what should be zero-cost conversions. This may slightly improve performance in some cases. commit ad18ce939940a8c697270f6e9b94db9942fd8295 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 13:21:09 2020 +0200 Fix continent scale hack. commit 36b1cb074f5b195aebd7dbbc3da7f0246a1a18ec Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 12:11:40 2020 +0200 Enable loading different sized maps without a recompile. We may want to tweak the effects of the continent_scale_hack. commit 13b6d4d534cc4814b7cb3294ca41bbfea0a6b186 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 10:55:48 2020 +0200 Removing WORLD_SIZE, part 1. Erased almost every instance of WORLD_SIZE and replaced it with a local power of two, map_size_lg (which respects certain invariants; see common/src/terrain/map.rs for more details about MapSizeLg). This also means we can avoid a dependency on the world crate from client, as desired. Now that the rest of the code is not expecting a fixed WORLD_SIZE, the next step is to arrange for maps to store their world size, and to use that world size as a basis prior to loading the map (as well, probably, as prior to configuring some of the noise functions). commit 30b1d2c6428230a9eaa0d749cdcbbd6f1cbccd78 Merge: 7d56ba31b 1377b369f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:58 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 7d56ba31b445441461b28a07fc495d7d4f047c17 Merge: 2101113b4 598f14b25 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 1377b369f6db2258e910d467a5740f31789e3ded Author: Monty Marz <m.marzouq@gmx.de> Date: Sun Jul 19 23:25:38 2020 +0200 more saturated pumpkins commit ae8d50527f93bb0616c2ad46ce4dacb63bc37c6d Author: Monty Marz <m.marzouq@gmx.de> Date: Sat Jul 18 20:29:56 2020 +0200 acacia models commit 2101113b467e691de787392d7f20f1745f5637bd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 18 18:55:25 2020 +0200 Higher detail LOD. commit add2cfae04b4385fa5590e11e2bd5229d9dee0aa Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 16 01:57:39 2020 +0200 Revert some irrelevant stuff. commit 2e2ab3dc1eaa59a4aef7f8d34a53d8aae4c8553a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 15 13:30:49 2020 +0200 Fixing various things about shadows. * Correcting optimal LISPSM parameter. * Figure shadows are cast when they're not visible. * Chunk shadows stay cast until you look away. * Seamless cubemaps for point lights. * Etc. commit 6c31e6b56217274285b597af297036691ea5d897 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 19:50:26 2020 +0200 Fix shadow creation. commit 6332cbe006115ae205597529cd8bbccd146c2cca Merge: be438657c 930e0028b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:47:00 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit be438657c33d7b5bfb0a9582c3ed3fd366637323 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:28:08 2020 +0200 Tweaks to shadows. Added shadow map resolution configuration, added seamless cubemaps, documented all existing rendering options, and fixed a few Clippy errors. commit 23b4058906013c7d2a40c286e20e32c5fbd897ed Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 10:11:19 2020 +0200 Fix moon, use nonlinear noise for terrain. Note that the latter has a bit of performance cost. commit 7fbe5cbfbb9dc29607957b8e62f432a4deed193d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:23:02 2020 +0200 Address lies about max texture size. commit bcfc62b5e13a1cdd83f57535fde4694720bebfd9 Merge: 75e3626a7 18a08e8fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:22:08 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 75e3626a785919f43fdcf2127c2b10e3e4df2f9f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:21:52 2020 +0200 OpenGL 3.3 minimum. commit 18a08e8fe2739f02af99a5d2cb4e7c38c49e858b Author: Monty Marz <m.marzouq@gmx.de> Date: Tue Jul 7 23:57:52 2020 +0200 settings localization commit 90c5d1ca3620092bc3ae10b2211489eb1cf6f5e8 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 21:11:48 2020 +0200 Lower near distance. commit 0e66f02b25aaddaa2dfddbbc89cd67de54a9a7b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 20:09:01 2020 +0200 All sprites sway in the wind now. commit db1401a6910bf42dcf502462c90038752ff5fbdb Merge: 69e508d8c e8b4b29d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 19:34:17 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 69e508d8c94d8973033817ca86f357e466fc7c4d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 18:41:37 2020 +0200 Make it easy to switch to SIMD for math. commit ffe0f5928c7a7e87d00cb5426b3b1d831d7e02fd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 21:21:12 2020 +0200 Fix some issues with underwater rendering. commit bfda6da42f38fd02c31ee92c81ab785a3e50c2a0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 19:17:59 2020 +0200 Fix some minor display issues. commit 0ed752e087968cf901301884aaeae698e32ef8a5 Merge: ccc6a06a8 518edcb85 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:14:21 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit ccc6a06a8d4504d6b9f7af7905a414d2ee06ab76 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:04:34 2020 +0200 Some minor changes. commit 4e020246702889269efe1a191788992164c508d6 Merge: 50a64d927 e05c9267a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 16:17:40 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 50a64d927e6c4f4b0e4688e4cbfca694bc3f922a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 13:07:03 2020 +0200 Fix far plane. commit 7dd06da34cae8f9ea3b6c889fe965181f3fd3949 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:25:35 2020 +0200 Add shadows.glsl. commit 618a18c998778bf871b905a74657440fcc384c80 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:10:22 2020 +0200 Adding shadows, greedy meshing, and more. commit eaea83fe6a5cb1cb0ba8beef888183c718258496 Merge: 267018495 2f89b863e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 22:47:07 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 2670184954a13e4a9e7a4e35ba79aac0c5fac2f7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 21:20:01 2020 +0200 Make civsim and sites deterministic. For anything in worldgen where you use a HashMap, *please* think carefully about which hasher you are going to use! This is especially true if (for some reason) you are depending on hashmap iteration order remaining stable for some aspect of worldgen. commit f8376fd5dc72b4a9c2f51a6b4570d59c8b8e9343 Merge: 654f7e049 cdee191dd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 17:53:57 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 654f7e049258d9da27c09608bbe6a46ffa8787e5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed May 20 21:22:30 2020 +0200 Correct backface culling. commit 560501df05ca725409b0f2e4eb31bdfdc15fd0c7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue May 19 17:22:06 2020 +0200 Greedy messhing for shadows. commit a4d87e1875ca543436e6bbbeb20348facc5a52d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun May 17 05:59:00 2020 +0200 Shadow maps work for lantern. commit 243d0837b8a3b08172c9a3c348d964d7ddc2a0a8 Merge: 04382dc28 71dd520cd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:53:13 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 04382dc28632b6c66e8821f6870c0daaa1c1901a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:22:17 2020 +0200 WIP: better graphics config, better LOD, shadow maps. commit 22ddbad3eb32bfa70f0932176022208fe67ded81 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 18:54:09 2020 +0200 Minor shader fixes. commit 746a10e8d01ac235f994b0cde78fa48998602a1f Merge: 0f4a0e763 40ab94673 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 04:02:09 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0f4a0e763db3afbdc4fb0558611f38326ca87151 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 23:03:24 2020 +0200 Switch back to pop-in terrain. commit dd74fa7e4a53667b38811d7aec58d7f6a68889bb Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 22:58:55 2020 +0200 LOD shading closer to voxel shading. commit ef67bd58ba0bdaf622b078892d768263b6cba268 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 28 20:49:03 2020 +0200 Experimental underwater lighting. commit 2c5ad9d07605e80d5fd5679dd3a5d70c605b86a9 Merge: 748279835 303967a6f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 22:35:24 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7482798354eda18c8207950080fc24d443a369de Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 21:59:55 2020 +0200 Replace discard in figure-frag. commit d83b4ae69be4912f69bf7835f509c68a1c7770a4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:45:57 2020 +0200 Fix sprite lighting, HDR from focus_pos. commit 0594238004f116274905fa0ed7c2b6c417ed1d29 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:14:10 2020 +0200 Proper HDR from point lights. commit 48c93d2b41ce5743103d18e76cc228f5ac766492 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 14:01:43 2020 +0200 Brighter ambiance, darker LOD shadows. commit e0452e895ccfa8a43f368cae3b8b8aedc24dad93 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 13:13:23 2020 +0200 More proper HDR. commit 4c6da3ed16cfeebb455e40da5f557b4af9a499d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 00:13:10 2020 +0200 Trying LOD noise. commit 682a3d74c85df5503ffe1fc1cc891bce789df1ad Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 23:11:08 2020 +0200 Fix LOD heights in towns. commit cc39e5734e8b18f9077bf42e66337c1319dd6b6e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 21:01:23 2020 +0200 More LOD fixes. commit 8116b21c2e51c836e77894e309ac273caf2917b3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:54:43 2020 +0200 I like this coloring. commit bc2560ea90b36f4b46190005344232d993043ac3 Merge: 14effdd5d e690efe71 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:48:33 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 14effdd5db8747fcf3eb34f03b46b7792e92d1c5 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:24:35 2020 +0200 Re-saturate. commit 48a643955d4435b78179acba0beb4a979905cc31 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:23:57 2020 +0200 Various fixes. commit f7b497a0c25f4ad4682c71dd1ed6f608052feb9b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 03:22:49 2020 +0200 Render figures again. commit 44e4aad48deba8266b9f8bdfd3db096b381f5327 Merge: e6f0a5a98 9ec319a18 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 02:01:04 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit e6f0a5a981a82533ba188fff0a54ce98577bb152 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 24 16:12:20 2020 +0200 Add atmospheric scattering. commit f2953087f691a8edbc001cb98ebf5059fc6f8ac0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 23 00:01:20 2020 +0200 Fix shadowing for specular reflections. commit ddd4a67a9799b8d08c7dc0c2bec90621c2bed0e3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Apr 22 22:56:12 2020 +0200 HDR fixes. commit 1015e60deef3c447381996277df7496707a63bd0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 21 18:25:19 2020 +0200 More lighting changes. commit 80c264abd111fb237e57843efcb5c071d4f84613 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 13 00:29:59 2020 +0200 Lighting experiments. commit 8414987e589dd5102bad89762a3adaccc0bfe957 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 9 02:38:40 2020 +0200 WIP -- lighting changes and soft shadows. commit 9cd2b3fb0d6b49776c6dfe463e4169637250b11a Merge: c7ea687eb 8b149ad11 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:29 2020 +0200 Merge branch 'sharp/new-lighting' into sharp/small-fixes commit c7ea687ebbc5aace1b455f134a5bf49ce2c7434a Merge: 476441531 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:02 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 8b149ad11ad4bb75018fcf9519baec27d1c95951 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:32:39 2020 +0200 Trying out a new lighting model. commit b0ac9f36f755dd06f7c17c46150568064790864f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 07:56:11 2020 +0200 Use bicubic interpolation for terrain. commit f6fc9307a121514b614bc50ef8eb055953e7da8a Merge: 33140a295 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 05:01:41 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 4764415312aae6e9ac2d00e86e84577cb958f1ab Merge: ed2d0111d 13388ee6a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 04:54:48 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 13388ee6a42943f3f79a9cb488346cef18e272fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 20:30:08 2020 +0200 Various fixes (to coloring and to soft shadows). commit fbd084a94a067082a87cd6d28b82054709bc9265 Merge: 5a089863b 4fdf6896a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 18:50:38 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/map-colors commit ed2d0111d994262ae836d84d1fe5a45e4de72a0b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 06:49:27 2020 +0200 Combining colors and LOD. commit 88342640c6b835114d01c797b89fdede3b0a2108 Merge: 33140a295 5a089863b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:49:20 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 33140a2951b8212725f42c758b277aaec4d888f7 Merge: 4c65a5aed f34d4b379 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:36:21 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 5a089863beb01d4794bbe3580ada47b278715ea2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 03:17:49 2020 +0200 Making maps brighter. This is probably not the right way to do it, but oh well! commit 32b2c99109dd486aa922886081068f9c550c83f2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 02:46:36 2020 +0200 Horizon mapping and "layered" map generation. Horizon mapping is a method of shadow mapping specific to height maps. It can handle any angle between 0 and 90 degrees from the ground, as long as know the horizontal direction in advance, by remembering only a single angle (the "horizon angle" of the shadow map). More is explained in common/src/msg/server.rs. We also remember the approximate height of the largest occluder, to try to be able to generate soft shadows and create a vertical position where the shadows can't go higher. Additionally, map generation has been reworked. Instead of computing everything from explicit samples, we pass in sampling functions that return exactly what the map generator needs. This allows us to cleanly separate the way we sample things like altitudes and colors from the map generation process. We exploit this to generate maps *partially* on the server (with colors and rivers, but not shading). We can then send the partially completed map to the client, which can combine it with shadow information to generate the final map. This is useful for two reasons: first, it makes sure the client can apply shadow information by itself, and second, it lets us pass the unshaded map for use with level of detail functionality. For similar reasons, river generation is split out into its own layer, but for now we opt to still generate rivers on the server (since the river wire format is more complicated to compress and may require some extra work to make sure we have enough precision to draw rivers well enough for LoD). Finally, the mostly ad-hoc lighting we were performing has been (mostly) replaced with explicit Phong reflection shading (including specular highlights). Regularizing this seems useful and helps clarify the "meaning" of the various light intensities, and helps us keep a more physically plausible basis. However, its interaction with soft shadows is still imperfect, and it's not yet clear to me what we need to do to turn this into something useful for LoD. commit f8926a5737ddc51f3d585c651a64c43677aae0f4 Merge: a1aee931e 875ae6ced Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Mar 13 13:32:42 2020 +0100 Merge remote-tracking branch 'origin/master' into sharp/map-colors commit 4c65a5aed353b119aea65a2aaeb94549b67beb42 Author: Treeco <5021038-Treeco@users.noreply.gitlab.com> Date: Mon Feb 24 16:48:05 2020 +0000 Made LOD setting slider exponential commit 2fa7b2d20d7233dc8bfd64f9f7f54617575248f1 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 17:49:53 2020 +0000 Added mist to LoD commit aab059a450b5f635777129ff82cc15b662965c3c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 15:14:06 2020 +0000 Added LoD slider commit 779c36b538121c5ade3633ae5cb67bb14c8c3877 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:54:55 2020 +0000 Reduced cost of vertex pushing commit 9fea150473906b166365b738ebcea07c697daf3d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:38:53 2020 +0000 Fixed maths, improved LoD resolution commit 5481df38fea5bf183ff376a3337179cfaa5233dc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 11:22:50 2020 +0000 Dynamically relocate LoD vertices to enhance details commit a3e36a50ababd615da7db1b26158c7906a5def01 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 18:13:51 2020 +0000 Simpler terrain spiral rendering commit 255f450ae9ac8763db4bede075fb409161ed57cc Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:53:17 2020 +0000 Better LoD precision commit 3d027aebe812a5b8658a4eb8123dc9f61b3776d2 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:04:03 2020 +0000 Better falloff commit be775c9484b457b2c0b1a494aec03392d0c70e76 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 15:30:45 2020 +0000 Applied good ideas from experimental branch commit 58587b68545a23c5c04ab4574a4b94b3bc982246 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 16:15:13 2020 +0000 Minor fixes to LoD merging commit 7b42aebd709c14df2db766aad61d9280ad24d84d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 15:04:44 2020 +0000 Capped LoD dragging commit 8aafc559f87124e1ea5ca6e3ddc2aa0c242d793c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:54:37 2020 +0000 Better blending between LoD and terrain border commit edd3455d5161792d87ddc8eadc0ecbad5532b284 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:40:19 2020 +0000 Fixed LoD z depth, added sea level offset commit b9b06744620114dd5556e73f64fa93c145503a7c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:27:43 2020 +0000 Better LoD smoothing commit a1aee931e790431560cd2d953ad61d9497072afd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Feb 21 14:52:17 2020 +0100 Adding shadows. commit 2400786c13dd891c131ed86d48d05df516a8a778 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 13:48:40 2020 +0000 Use world map as LoD source commit dbf650f504a4c25fbbc2096ac3616c736bf52d23 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Jan 20 00:48:14 2020 +0000 Better clouds at distance commit 5e6f81b86cdb9730b9b056877b19257075fd5fa8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Jan 19 23:59:02 2020 +0000 sync commit 745e7540ddb000cc645f612767b337c2ddc3f7c0 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 12:40:48 2019 +0000 Improved cloud falloff mist, faster noise sampling commit f6a200d0cb866196ba57697466755f9e0c7ea5d8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 10:09:00 2019 +0000 Improved long-range depth precision, removed unnecessary LoD polygons commit 63d1b2bb2292898d59fb4f4e502201103dfeb86f Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 20:57:46 2019 +0000 Working LoD shader commit f13d98ee3e58f881e8b978861a67663b59ed91ec Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 11:03:40 2019 +0000 LoD first attempt (stack overflow issue)
2020-08-20 18:34:59 +00:00
"criterion",
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 18:42:29 +00:00
"csv",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"deflate 1.0.0",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"enum-iterator",
Add block statistics generator to world/examples.
2021-06-28 19:02:57 +00:00
"fallible-iterator",
Compress terrain chunks with deflate. Includes a benchmark showing that this makes them around 70% smaller, and is the same speed as LZ4.
2021-04-20 21:33:46 +00:00
"flate2",
Make civsim and sites deterministic. For anything in worldgen where you use a HashMap, *please* think carefully about which hasher you are going to use! This is especially true if (for some reason) you are depending on hashmap iteration order remaining stable for some aspect of worldgen.
2020-05-21 19:20:01 +00:00
"fxhash",
switch to hashbrown 0.11 and specs 0.16.2
2021-06-07 11:01:01 +00:00
"hashbrown 0.11.2",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"image",
update crates
2021-09-20 10:05:41 +00:00
"itertools",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"kiddo 0.2.1",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"lazy_static",
Compress terrain chunks with deflate. Includes a benchmark showing that this makes them around 70% smaller, and is the same speed as LZ4.
2021-04-20 21:33:46 +00:00
"lz-fear",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"minifb",
"noise",
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
"num 0.4.0",
Optimize `CompressedData` with `Vec::with_capacity`, and move obsolete formats from `common_net` into the compression benchmark.
2021-04-28 23:26:49 +00:00
"num-traits",
update crates
2021-09-20 10:05:41 +00:00
"ordered-float 2.8.0",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"packed_simd_2",
update depednencies
2021-07-08 10:21:02 +00:00
"rand 0.8.4",
"rand_chacha 0.3.1",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"rayon",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"ron 0.7.0",
Add benchmark for color quantization using the rtree crate.
2021-07-01 17:41:37 +00:00
"rstar",
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 18:42:29 +00:00
"rusqlite",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"serde",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"structopt",
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 18:42:29 +00:00
"strum",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"svg_fmt",
Convert all other veloren crates to use tracing - Completely removed both `log` and `pretty_env_logger` and replaced with `tracing` and `tracing_subscriber` where necessary. - Converted all `log::info!(...)` et al. statements to just use the shorthand macro i.e. `info!`. This was mostly to make renaming easier.
2020-06-21 14:26:06 +00:00
"tracing",
Bump tracing-subscriber to 0.3.2 We were pulling two versions of it. Causing some compilation errors
2021-11-26 17:41:51 +00:00
"tracing-subscriber",
update dependencies
2021-03-21 21:53:44 +00:00
"vek",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"veloren-common",
Improve Merchant inventory from UX perspective Changes: - Make it use red bags with 18 slots (2 rows * 9) - Sort items by quality - Stack ingredients, food, potions - Move coins to ingedients bag and put it first - Filter unconsumed good (case when you saw 16 rugged shirts) Refactoring: - Split bag creation to separate functions
2021-07-02 20:07:45 +00:00
"veloren-common-base",
Compress terrain chunks with deflate. Includes a benchmark showing that this makes them around 70% smaller, and is the same speed as LZ4.
2021-04-20 21:33:46 +00:00
"veloren-common-frontend",
Moved common networking code to common/net, clippy fixes
2020-12-13 17:11:55 +00:00
"veloren-common-net",
Move Systems out of common into `common_sys` This requires to move `State` into a own crate called `common_state` which depends on `common` and `common_sys`
2020-12-01 00:28:00 +00:00
]
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
[[package]]
name = "version-compare"
version = "0.0.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d63556a25bae6ea31b52e640d7c41d1ab27faba4ccb600013837a3d0b3994ca1"
Add default keybindings Former-commit-id: c8886a2eb3326ba62e31ef84b93a29ee59f378b3
2019-04-16 08:56:47 +00:00
[[package]]
name = "version_check"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
Add default keybindings Former-commit-id: c8886a2eb3326ba62e31ef84b93a29ee59f378b3
2019-04-16 08:56:47 +00:00
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
[[package]]
name = "version_check"
update dependencies
2021-03-21 21:53:44 +00:00
version = "0.9.3"
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies
2021-03-21 21:53:44 +00:00
checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
Migrate singleplayer save folders to the new location if they have not already been generated
2020-10-10 23:23:41 +00:00
[[package]]
name = "walkdir"
version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c66c0b9792f0a765345452775f3adbd28dde9d33f30d13e5dcc5ae17cf6f3780"
dependencies = [
"kernel32-sys",
"winapi 0.2.8",
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "walkdir"
update dependencies and fix audio issues fixed #1027 fixed #1033 fixed #1020 fixed #1017 fixed #1029 fixed #1025 fixed #807 fixed #816 fixed #1004 fixed #1005
2021-03-29 07:45:00 +00:00
version = "2.3.2"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies and fix audio issues fixed #1027 fixed #1033 fixed #1020 fixed #1017 fixed #1029 fixed #1025 fixed #807 fixed #816 fixed #1004 fixed #1005
2021-03-29 07:45:00 +00:00
checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"same-file",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"winapi 0.3.9",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"winapi-util",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
update authc
2020-12-28 15:17:43 +00:00
[[package]]
name = "want"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
dependencies = [
"log",
"try-lock",
]
Move shaders, start asset reloading system
2019-08-03 05:42:33 +00:00
[[package]]
name = "wasi"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
version = "0.9.0+wasi-snapshot-preview1"
Move shaders, start asset reloading system
2019-08-03 05:42:33 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
Move shaders, start asset reloading system
2019-08-03 05:42:33 +00:00
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
[[package]]
name = "wasi"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.10.0+wasi-snapshot-preview1"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
[[package]]
name = "wasm-bindgen"
update crates
2021-09-20 10:05:41 +00:00
version = "0.2.78"
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce"
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
dependencies = [
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"cfg-if 1.0.0",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"wasm-bindgen-macro",
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
]
[[package]]
name = "wasm-bindgen-backend"
update crates
2021-09-20 10:05:41 +00:00
version = "0.2.78"
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b"
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
dependencies = [
Updated changelog
2020-09-03 18:29:28 +00:00
"bumpalo",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"lazy_static",
dependency reduction: - authc no longer uses reqwest - image only supports PNG - replace routille with tiny_http - several other dependencies - cargo upgrade - following improvement was measured on R7 1700X: before: - cargo build: 3076.73s user / 4:45 total / 589 dependencies - cargo test: 6118.38s user / 7:30 total / 959 dependencies after: - cargo build: 2680.54s user / 4:05 total / 480 dependencies - cargo test: 5351.81s user / 7:04 total / 791 dependencies - added xMAC94x to CODEOWNERS for Cargo.toml, he will protect them from now on and hit people with evil looks ;)
2020-06-01 00:13:35 +00:00
"log",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"proc-macro2 1.0.32",
"quote 1.0.10",
"syn 1.0.81",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"wasm-bindgen-shared",
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
]
Initial setup to use iced
2019-12-15 17:13:52 +00:00
[[package]]
name = "wasm-bindgen-futures"
update crates
2021-09-20 10:05:41 +00:00
version = "0.4.28"
Initial setup to use iced
2019-12-15 17:13:52 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "8e8d7523cb1f2a4c96c1317ca690031b714a51cc14e05f712446691f413f5d39"
Initial setup to use iced
2019-12-15 17:13:52 +00:00
dependencies = [
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"cfg-if 1.0.0",
Initial setup to use iced
2019-12-15 17:13:52 +00:00
"js-sys",
"wasm-bindgen",
"web-sys",
]
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
[[package]]
name = "wasm-bindgen-macro"
update crates
2021-09-20 10:05:41 +00:00
version = "0.2.78"
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9"
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
dependencies = [
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"quote 1.0.10",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"wasm-bindgen-macro-support",
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
]
[[package]]
name = "wasm-bindgen-macro-support"
update crates
2021-09-20 10:05:41 +00:00
version = "0.2.78"
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab"
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
dependencies = [
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"proc-macro2 1.0.32",
"quote 1.0.10",
"syn 1.0.81",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"wasm-bindgen-backend",
"wasm-bindgen-shared",
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
]
[[package]]
name = "wasm-bindgen-shared"
update crates
2021-09-20 10:05:41 +00:00
version = "0.2.78"
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc"
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
[[package]]
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
name = "wasmer"
Update wasmer
2021-07-10 13:02:20 +00:00
version = "2.0.0"
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Update wasmer
2021-07-10 13:02:20 +00:00
checksum = "7f52e455a01d0fac439cd7a96ba9b519bdc84e923a5b96034054697ebb17cd75"
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
dependencies = [
Update wasmer
2021-07-10 13:02:20 +00:00
"cfg-if 1.0.0",
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
"indexmap",
Update wasmer
2021-07-10 13:02:20 +00:00
"loupe",
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
"more-asserts",
"target-lexicon",
"thiserror",
"wasmer-compiler",
"wasmer-compiler-cranelift",
"wasmer-derive",
"wasmer-engine",
Update wasmer
2021-07-10 13:02:20 +00:00
"wasmer-engine-dylib",
"wasmer-engine-universal",
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
"wasmer-types",
"wasmer-vm",
"wat",
"winapi 0.3.9",
]
[[package]]
name = "wasmer-compiler"
Update wasmer
2021-07-10 13:02:20 +00:00
version = "2.0.0"
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Update wasmer
2021-07-10 13:02:20 +00:00
checksum = "cc86dda6f715f03104800be575a38382b35c3962953af9e9d8722dcf0bd2458f"
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
dependencies = [
"enumset",
Update wasmer
2021-07-10 13:02:20 +00:00
"loupe",
"rkyv",
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
"serde",
"serde_bytes",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"smallvec",
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
"target-lexicon",
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
"thiserror",
"wasmer-types",
"wasmer-vm",
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
"wasmparser",
]
[[package]]
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
name = "wasmer-compiler-cranelift"
Update wasmer
2021-07-10 13:02:20 +00:00
version = "2.0.0"
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Update wasmer
2021-07-10 13:02:20 +00:00
checksum = "1a570746cbec434179e2d53357973a34dfdb208043104e8fac3b7b0023015cf6"
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
dependencies = [
"cranelift-codegen",
Update wasmer
2021-07-10 13:02:20 +00:00
"cranelift-entity",
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
"cranelift-frontend",
update crates
2021-09-20 10:05:41 +00:00
"gimli 0.24.0",
Update wasmer
2021-07-10 13:02:20 +00:00
"loupe",
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
"more-asserts",
"rayon",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"smallvec",
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
"tracing",
"wasmer-compiler",
"wasmer-types",
"wasmer-vm",
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
]
[[package]]
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
name = "wasmer-derive"
Update wasmer
2021-07-10 13:02:20 +00:00
version = "2.0.0"
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Update wasmer
2021-07-10 13:02:20 +00:00
checksum = "1ee7b351bcc1e782997c72dc0b5b328f3ddcad4813b8ce3cac3f25ae5a4ab56b"
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
dependencies = [
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
"proc-macro-error",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"proc-macro2 1.0.32",
"quote 1.0.10",
"syn 1.0.81",
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
]
[[package]]
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
name = "wasmer-engine"
Update wasmer
2021-07-10 13:02:20 +00:00
version = "2.0.0"
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Update wasmer
2021-07-10 13:02:20 +00:00
checksum = "8454ead320a4017ba36ddd9ab4fbf7776fceea6ab0b79b5e53664a1682569fc3"
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
dependencies = [
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
"backtrace",
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
"lazy_static",
Update wasmer
2021-07-10 13:02:20 +00:00
"loupe",
update dependencies
2021-06-04 07:44:30 +00:00
"memmap2 0.2.3",
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
"more-asserts",
"rustc-demangle",
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
"serde",
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
"serde_bytes",
"target-lexicon",
"thiserror",
"wasmer-compiler",
"wasmer-types",
"wasmer-vm",
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
]
[[package]]
Update wasmer
2021-07-10 13:02:20 +00:00
name = "wasmer-engine-dylib"
version = "2.0.0"
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Update wasmer
2021-07-10 13:02:20 +00:00
checksum = "6aa390d123ebe23d5315c39f6063fcc18319661d03c8000f23d0fe1c011e8135"
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
dependencies = [
Update wasmer
2021-07-10 13:02:20 +00:00
"cfg-if 1.0.0",
"leb128",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"libloading 0.7.2",
Update wasmer
2021-07-10 13:02:20 +00:00
"loupe",
"rkyv",
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
"serde",
Update wasmer
2021-07-10 13:02:20 +00:00
"tempfile",
"tracing",
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
"wasmer-compiler",
"wasmer-engine",
Update wasmer
2021-07-10 13:02:20 +00:00
"wasmer-object",
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
"wasmer-types",
"wasmer-vm",
update crates
2021-09-20 10:05:41 +00:00
"which 4.2.2",
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
]
[[package]]
Update wasmer
2021-07-10 13:02:20 +00:00
name = "wasmer-engine-universal"
version = "2.0.0"
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Update wasmer
2021-07-10 13:02:20 +00:00
checksum = "0dffe8015f08915eb4939ebc8e521cde8246f272f5197ea60d46214ac5aef285"
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
dependencies = [
Update wasmer
2021-07-10 13:02:20 +00:00
"cfg-if 1.0.0",
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
"leb128",
Update wasmer
2021-07-10 13:02:20 +00:00
"loupe",
"region",
"rkyv",
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
"wasmer-compiler",
"wasmer-engine",
"wasmer-types",
"wasmer-vm",
Update wasmer
2021-07-10 13:02:20 +00:00
"winapi 0.3.9",
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
]
[[package]]
name = "wasmer-object"
Update wasmer
2021-07-10 13:02:20 +00:00
version = "2.0.0"
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Update wasmer
2021-07-10 13:02:20 +00:00
checksum = "c541c985799fc1444702501c15d41becfb066c92d9673defc1c7417fd8739e15"
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
dependencies = [
update crates
2021-09-20 10:05:41 +00:00
"object 0.25.3",
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
"thiserror",
"wasmer-compiler",
"wasmer-types",
]
[[package]]
name = "wasmer-types"
Update wasmer
2021-07-10 13:02:20 +00:00
version = "2.0.0"
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Update wasmer
2021-07-10 13:02:20 +00:00
checksum = "c91f75d3c31f8b1f8d818ff49624fc974220243cbc07a2252f408192e97c6b51"
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
dependencies = [
Update wasmer
2021-07-10 13:02:20 +00:00
"indexmap",
"loupe",
"rkyv",
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
"serde",
"thiserror",
]
[[package]]
name = "wasmer-vm"
Update wasmer
2021-07-10 13:02:20 +00:00
version = "2.0.0"
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Update wasmer
2021-07-10 13:02:20 +00:00
checksum = "469a12346a4831e7dac639b9646d8c9b24c7d2cf0cf458b77f489edb35060c1f"
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
dependencies = [
"backtrace",
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
"cc",
Update wasmer
2021-07-10 13:02:20 +00:00
"cfg-if 1.0.0",
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
"indexmap",
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
"libc",
Update wasmer
2021-07-10 13:02:20 +00:00
"loupe",
update dependencies
2021-06-04 07:44:30 +00:00
"memoffset 0.6.4",
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
"more-asserts",
"region",
Update wasmer
2021-07-10 13:02:20 +00:00
"rkyv",
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
"serde",
"thiserror",
"wasmer-types",
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
"winapi 0.3.9",
]
[[package]]
name = "wasmparser"
Update wasmer
2021-07-10 13:02:20 +00:00
version = "0.78.2"
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Update wasmer
2021-07-10 13:02:20 +00:00
checksum = "52144d4c78e5cf8b055ceab8e5fa22814ce4315d6002ad32cfd914f37c12fd65"
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
[[package]]
name = "wast"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "38.0.1"
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "ae0d7b256bef26c898fa7344a2d627e8499f5a749432ce0a05eae1a64ff0c271"
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
dependencies = [
"leb128",
]
[[package]]
name = "wat"
update crates
2021-09-20 10:05:41 +00:00
version = "1.0.40"
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "adcfaeb27e2578d2c6271a45609f4a055e6d7ba3a12eff35b1fd5ba147bdf046"
Added feature flag changed field name to size
2021-01-08 08:48:30 +00:00
dependencies = [
"wast",
]
Added plugin system Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)
2020-12-11 23:37:22 +00:00
WIP (testing) Update conrod_core This is a `cargo update -p conrod_core` to bring in updates to `veloren/conrod/conrod_core` to add support for copy and paste. Ref: veloren/conrod!2 Fixes #171
2019-10-19 06:12:37 +00:00
[[package]]
name = "wayland-client"
update depednencies
2021-07-08 10:21:02 +00:00
version = "0.28.6"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update depednencies
2021-07-08 10:21:02 +00:00
checksum = "e3ab332350e502f159382201394a78e3cc12d0f04db863429260164ea40e0355"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
dependencies = [
"bitflags",
"downcast-rs",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"nix 0.20.0",
"scoped-tls",
"wayland-commons 0.28.6",
"wayland-scanner 0.28.6",
"wayland-sys 0.28.6",
]
[[package]]
name = "wayland-client"
version = "0.29.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9108ec1c37f4774d0c2937ba1a6c23d1786b2152c4a13bd9fdb20e42d16e8841"
dependencies = [
"bitflags",
"downcast-rs",
"libc",
"nix 0.22.0",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"scoped-tls",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"wayland-commons 0.29.1",
"wayland-scanner 0.29.1",
"wayland-sys 0.29.1",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
]
[[package]]
name = "wayland-commons"
update depednencies
2021-07-08 10:21:02 +00:00
version = "0.28.6"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update depednencies
2021-07-08 10:21:02 +00:00
checksum = "a21817947c7011bbd0a27e11b17b337bfd022e8544b071a2641232047966fbda"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
dependencies = [
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"nix 0.20.0",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"once_cell",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"smallvec",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"wayland-sys 0.28.6",
]
[[package]]
name = "wayland-commons"
version = "0.29.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "265ef51b3b3e5c9ef098f10425c39624663f459c3821dcaacc4748be975f1beb"
dependencies = [
"nix 0.22.0",
"once_cell",
"smallvec",
"wayland-sys 0.29.1",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
]
[[package]]
name = "wayland-cursor"
update depednencies
2021-07-08 10:21:02 +00:00
version = "0.28.6"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update depednencies
2021-07-08 10:21:02 +00:00
checksum = "be610084edd1586d45e7bdd275fe345c7c1873598caa464c4fb835dee70fa65a"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
dependencies = [
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"nix 0.20.0",
"wayland-client 0.28.6",
"xcursor",
]
[[package]]
name = "wayland-cursor"
version = "0.29.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c19bb6628daf4097e58b7911481e8371e13318d5a60894779901bd3267407a7"
dependencies = [
"nix 0.22.0",
"wayland-client 0.29.1",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"xcursor",
]
WIP (testing) Update conrod_core This is a `cargo update -p conrod_core` to bring in updates to `veloren/conrod/conrod_core` to add support for copy and paste. Ref: veloren/conrod!2 Fixes #171
2019-10-19 06:12:37 +00:00
[[package]]
name = "wayland-protocols"
update depednencies
2021-07-08 10:21:02 +00:00
version = "0.28.6"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update depednencies
2021-07-08 10:21:02 +00:00
checksum = "286620ea4d803bacf61fa087a4242ee316693099ee5a140796aaba02b29f861f"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
dependencies = [
"bitflags",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"wayland-client 0.28.6",
"wayland-commons 0.28.6",
"wayland-scanner 0.28.6",
]
[[package]]
name = "wayland-protocols"
version = "0.29.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b3b6f1dc0193072ef4eadcb144da30d58c1f2895516c063804d213310703c8e"
dependencies = [
"bitflags",
"wayland-client 0.29.1",
"wayland-commons 0.29.1",
"wayland-scanner 0.29.1",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
WIP (testing) Update conrod_core This is a `cargo update -p conrod_core` to bring in updates to `veloren/conrod/conrod_core` to add support for copy and paste. Ref: veloren/conrod!2 Fixes #171
2019-10-19 06:12:37 +00:00
[[package]]
name = "wayland-scanner"
update depednencies
2021-07-08 10:21:02 +00:00
version = "0.28.6"
WIP (testing) Update conrod_core This is a `cargo update -p conrod_core` to bring in updates to `veloren/conrod/conrod_core` to add support for copy and paste. Ref: veloren/conrod!2 Fixes #171
2019-10-19 06:12:37 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update depednencies
2021-07-08 10:21:02 +00:00
checksum = "ce923eb2deb61de332d1f356ec7b6bf37094dc5573952e1c8936db03b54c03f1"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
dependencies = [
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"proc-macro2 1.0.32",
"quote 1.0.10",
"xml-rs",
]
[[package]]
name = "wayland-scanner"
version = "0.29.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eaaf2bc85e7b9143159af96bd23d954a5abe391c4376db712320643280fdc6f4"
dependencies = [
"proc-macro2 1.0.32",
"quote 1.0.10",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"xml-rs",
]
[[package]]
name = "wayland-sys"
update depednencies
2021-07-08 10:21:02 +00:00
version = "0.28.6"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update depednencies
2021-07-08 10:21:02 +00:00
checksum = "d841fca9aed7febf9bed2e9796c49bf58d4152ceda8ac949ebe00868d8f0feb8"
WIP (testing) Update conrod_core This is a `cargo update -p conrod_core` to bring in updates to `veloren/conrod/conrod_core` to add support for copy and paste. Ref: veloren/conrod!2 Fixes #171
2019-10-19 06:12:37 +00:00
dependencies = [
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 19:12:57 +00:00
"dlib 0.5.0",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"lazy_static",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"pkg-config",
WIP (testing) Update conrod_core This is a `cargo update -p conrod_core` to bring in updates to `veloren/conrod/conrod_core` to add support for copy and paste. Ref: veloren/conrod!2 Fixes #171
2019-10-19 06:12:37 +00:00
]
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
[[package]]
name = "wayland-sys"
version = "0.29.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba9e06acb775b3007f8d3094438306979e572d1d3b844d7a71557a84b055d959"
dependencies = [
"dlib 0.5.0",
"lazy_static",
"pkg-config",
]
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
[[package]]
name = "web-sys"
Update wgpu to get gfx-hal update that fixes the dx12 depth cube view construction issue
2021-04-08 02:18:31 +00:00
version = "0.3.50"
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Update wgpu to get gfx-hal update that fixes the dx12 depth cube view construction issue
2021-04-08 02:18:31 +00:00
checksum = "a905d57e488fec8861446d3393670fb50d27a262344013181c2cdf9fff5481be"
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"js-sys",
"wasm-bindgen",
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
]
[[package]]
name = "webpki"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
version = "0.21.4"
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea"
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"ring",
"untrusted",
:/ and reactivated the password field
2019-12-21 17:02:39 +00:00
]
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
[[package]]
name = "webpki"
version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd"
dependencies = [
"ring",
"untrusted",
]
replace heavy msgbox with light native-dialog
2020-09-08 14:33:06 +00:00
[[package]]
name = "wfd"
Fix compile error under Windows
2021-02-10 03:38:01 +00:00
version = "0.1.7"
replace heavy msgbox with light native-dialog
2020-09-08 14:33:06 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Fix compile error under Windows
2021-02-10 03:38:01 +00:00
checksum = "e713040b67aae5bf1a0ae3e1ebba8cc29ab2b90da9aa1bff6e09031a8a41d7a8"
replace heavy msgbox with light native-dialog
2020-09-08 14:33:06 +00:00
dependencies = [
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"winapi 0.3.9",
replace heavy msgbox with light native-dialog
2020-09-08 14:33:06 +00:00
]
Implement toggleable gpu profiling that saves the timings from a recent frame with the screenshot key, rebase fixes
2021-02-27 09:21:23 +00:00
[[package]]
name = "wgpu"
Revert "Merge branch 'xvar/wgpu-0.9' into 'master'" This reverts merge request !2566
2021-07-07 22:07:00 +00:00
version = "0.8.0"
source = "git+https://github.com/gfx-rs/wgpu.git?rev=a92b8549a8e2cb9dac781bafc5ed32828f3caf46#a92b8549a8e2cb9dac781bafc5ed32828f3caf46"
Implement toggleable gpu profiling that saves the timings from a recent frame with the screenshot key, rebase fixes
2021-02-27 09:21:23 +00:00
dependencies = [
"arrayvec",
"js-sys",
Update wgpu to get gfx-hal update that fixes the dx12 depth cube view construction issue
2021-04-08 02:18:31 +00:00
"log",
Revert "Replace shaderc with naga" This reverts commit 446d93dda0db486d65ec9374946205cc5bf35a59.
2021-09-04 18:59:18 +00:00
"naga",
update crates
2021-09-20 10:05:41 +00:00
"parking_lot 0.11.2",
Started the report of wgpu
2020-08-21 19:10:56 +00:00
"raw-window-handle",
address/remove TODOs, fix comment typos, enable wgpu/trace feature by default (So no recompile is needed to collect an API trace)
2021-05-13 03:59:51 +00:00
"serde",
Started the report of wgpu
2020-08-21 19:10:56 +00:00
"smallvec",
"wasm-bindgen",
"wasm-bindgen-futures",
"web-sys",
Update to the most recent wgpu
2021-03-17 13:56:40 +00:00
"wgpu-core",
"wgpu-types",
Implement toggleable gpu profiling that saves the timings from a recent frame with the screenshot key, rebase fixes
2021-02-27 09:21:23 +00:00
]
[[package]]
name = "wgpu-core"
Revert "Merge branch 'xvar/wgpu-0.9' into 'master'" This reverts merge request !2566
2021-07-07 22:07:00 +00:00
version = "0.8.0"
source = "git+https://github.com/gfx-rs/wgpu.git?rev=a92b8549a8e2cb9dac781bafc5ed32828f3caf46#a92b8549a8e2cb9dac781bafc5ed32828f3caf46"
Implement toggleable gpu profiling that saves the timings from a recent frame with the screenshot key, rebase fixes
2021-02-27 09:21:23 +00:00
dependencies = [
"arrayvec",
"bitflags",
"cfg_aliases",
"copyless",
"fxhash",
Update to the most recent wgpu
2021-03-17 13:56:40 +00:00
"gfx-backend-dx11",
"gfx-backend-dx12",
"gfx-backend-empty",
"gfx-backend-gl",
"gfx-backend-metal",
"gfx-backend-vulkan",
"gfx-hal",
Implement toggleable gpu profiling that saves the timings from a recent frame with the screenshot key, rebase fixes
2021-02-27 09:21:23 +00:00
"gpu-alloc",
"gpu-descriptor",
Almost implement instance merging for sprites (validation error), rebase fix
2021-01-31 03:50:03 +00:00
"log",
Revert "Replace shaderc with naga" This reverts commit 446d93dda0db486d65ec9374946205cc5bf35a59.
2021-09-04 18:59:18 +00:00
"naga",
update crates
2021-09-20 10:05:41 +00:00
"parking_lot 0.11.2",
Almost implement instance merging for sprites (validation error), rebase fix
2021-01-31 03:50:03 +00:00
"profiling",
Started the report of wgpu
2020-08-21 19:10:56 +00:00
"raw-window-handle",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"ron 0.6.6",
address/remove TODOs, fix comment typos, enable wgpu/trace feature by default (So no recompile is needed to collect an API trace)
2021-05-13 03:59:51 +00:00
"serde",
Started the report of wgpu
2020-08-21 19:10:56 +00:00
"smallvec",
"thiserror",
Update to the most recent wgpu
2021-03-17 13:56:40 +00:00
"wgpu-types",
Implement toggleable gpu profiling that saves the timings from a recent frame with the screenshot key, rebase fixes
2021-02-27 09:21:23 +00:00
]
[[package]]
name = "wgpu-profiler"
Revert "Merge branch 'xvar/wgpu-0.9' into 'master'" This reverts merge request !2566
2021-07-07 22:07:00 +00:00
version = "0.4.0"
source = "git+https://github.com/Imberflur/wgpu-profiler?tag=wgpu-0.8#b156eb145bc223386ef344860d9b33b3c181650c"
Implement toggleable gpu profiling that saves the timings from a recent frame with the screenshot key, rebase fixes
2021-02-27 09:21:23 +00:00
dependencies = [
"futures",
Update to the most recent wgpu
2021-03-17 13:56:40 +00:00
"wgpu",
Implement toggleable gpu profiling that saves the timings from a recent frame with the screenshot key, rebase fixes
2021-02-27 09:21:23 +00:00
]
[[package]]
name = "wgpu-types"
Revert "Merge branch 'xvar/wgpu-0.9' into 'master'" This reverts merge request !2566
2021-07-07 22:07:00 +00:00
version = "0.8.0"
source = "git+https://github.com/gfx-rs/wgpu.git?rev=a92b8549a8e2cb9dac781bafc5ed32828f3caf46#a92b8549a8e2cb9dac781bafc5ed32828f3caf46"
Started the report of wgpu
2020-08-21 19:10:56 +00:00
dependencies = [
"bitflags",
address/remove TODOs, fix comment typos, enable wgpu/trace feature by default (So no recompile is needed to collect an API trace)
2021-05-13 03:59:51 +00:00
"serde",
Started the report of wgpu
2020-08-21 19:10:56 +00:00
]
update depednencies
2021-07-08 10:21:02 +00:00
[[package]]
name = "which"
version = "3.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724"
dependencies = [
"libc",
]
replace heavy msgbox with light native-dialog
2020-09-08 14:33:06 +00:00
[[package]]
name = "which"
update crates
2021-09-20 10:05:41 +00:00
version = "4.2.2"
replace heavy msgbox with light native-dialog
2020-09-08 14:33:06 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "ea187a8ef279bc014ec368c27a920da2024d2a711109bfbe3440585d5cf27ad9"
replace heavy msgbox with light native-dialog
2020-09-08 14:33:06 +00:00
dependencies = [
update dependencies and fix audio issues fixed #1027 fixed #1033 fixed #1020 fixed #1017 fixed #1029 fixed #1025 fixed #807 fixed #816 fixed #1004 fixed #1005
2021-03-29 07:45:00 +00:00
"either",
update crates
2021-09-20 10:05:41 +00:00
"lazy_static",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
replace heavy msgbox with light native-dialog
2020-09-08 14:33:06 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "winapi"
version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "winapi"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
version = "0.3.9"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"winapi-i686-pc-windows-gnu",
"winapi-x86_64-pc-windows-gnu",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
[[package]]
name = "winapi-build"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "winapi-i686-pc-windows-gnu"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "winapi-util"
fix workspaces and Cargo dependencies
2020-05-27 16:20:16 +00:00
version = "0.1.5"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
fix workspaces and Cargo dependencies
2020-05-27 16:20:16 +00:00
checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"winapi 0.3.9",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
[[package]]
name = "winapi-wsapoll"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e"
dependencies = [
"winapi 0.3.9",
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "winapi-x86_64-pc-windows-gnu"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
update deps
2021-04-10 13:53:00 +00:00
[[package]]
name = "window_clipboard"
update dependencies
2021-06-04 07:44:30 +00:00
version = "0.2.1"
update deps
2021-04-10 13:53:00 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies
2021-06-04 07:44:30 +00:00
checksum = "33a4518b538a45ad39d138a8c3bea8f6b4452174aeb38143d1dd643a3a838ccc"
update deps
2021-04-10 13:53:00 +00:00
dependencies = [
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"clipboard-win 4.2.2",
update deps
2021-04-10 13:53:00 +00:00
"clipboard_macos",
Upgrade to winit 0.25
2021-06-15 08:01:57 +00:00
"clipboard_wayland",
"clipboard_x11",
Initial setup to use iced
2019-12-15 17:13:52 +00:00
"raw-window-handle",
]
Update to winit 0.21.0
2020-02-08 02:09:56 +00:00
[[package]]
name = "winit"
Upgrade to winit 0.25
2021-06-15 08:01:57 +00:00
version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "79610794594d5e86be473ef7763f604f2159cbac8c94debd00df8fb41e86c2f8"
Updated to winit 20
2019-10-26 14:50:01 +00:00
dependencies = [
"bitflags",
Finished porting all pipelines
2020-09-13 10:03:42 +00:00
"cocoa",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"core-foundation 0.9.2",
"core-graphics 0.22.3",
Updated to winit 20
2019-10-26 14:50:01 +00:00
"core-video-sys",
Update to winit 0.21.0
2020-02-08 02:09:56 +00:00
"dispatch 0.2.0",
Updated to winit 20
2019-10-26 14:50:01 +00:00
"instant",
"lazy_static",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
Updated to winit 20
2019-10-26 14:50:01 +00:00
"log",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"mio 0.7.14",
Upgrade to winit 0.25
2021-06-15 08:01:57 +00:00
"mio-misc",
update crates
2021-09-20 10:05:41 +00:00
"ndk 0.3.0",
"ndk-glue 0.3.0",
Winit 0.22 released
2020-03-13 04:05:06 +00:00
"ndk-sys",
Updated to winit 20
2019-10-26 14:50:01 +00:00
"objc",
update crates
2021-09-20 10:05:41 +00:00
"parking_lot 0.11.2",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"percent-encoding",
Updated to winit 20
2019-10-26 14:50:01 +00:00
"raw-window-handle",
Upgrade to winit 0.25
2021-06-15 08:01:57 +00:00
"scopeguard",
Updated to winit 20
2019-10-26 14:50:01 +00:00
"serde",
update depednencies
2021-07-08 10:21:02 +00:00
"smithay-client-toolkit 0.12.3",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"wayland-client 0.28.6",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
"winapi 0.3.9",
Updated to winit 20
2019-10-26 14:50:01 +00:00
"x11-dl",
]
feat(voxygen): add logo for windows executable
2019-10-02 14:24:21 +00:00
[[package]]
name = "winres"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.1.12"
feat(voxygen): add logo for windows executable
2019-10-02 14:24:21 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c"
feat(voxygen): add logo for windows executable
2019-10-02 14:24:21 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"toml",
feat(voxygen): add logo for windows executable
2019-10-02 14:24:21 +00:00
]
Started the report of wgpu
2020-08-21 19:10:56 +00:00
[[package]]
name = "wio"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5"
dependencies = [
"winapi 0.3.9",
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "ws2_32-sys"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"winapi 0.2.8",
"winapi-build",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
update further crates
2020-12-16 00:07:39 +00:00
[[package]]
name = "wyz"
update deps
2021-04-10 13:53:00 +00:00
version = "0.4.0"
update further crates
2020-12-16 00:07:39 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update deps
2021-04-10 13:53:00 +00:00
checksum = "129e027ad65ce1453680623c3fb5163cbf7107bfe1aa32257e7d0e63f9ced188"
dependencies = [
"tap",
]
update further crates
2020-12-16 00:07:39 +00:00
WIP (testing) Update conrod_core This is a `cargo update -p conrod_core` to bring in updates to `veloren/conrod/conrod_core` to add support for copy and paste. Ref: veloren/conrod!2 Fixes #171
2019-10-19 06:12:37 +00:00
[[package]]
name = "x11-clipboard"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "0.5.3"
WIP (testing) Update conrod_core This is a `cargo update -p conrod_core` to bring in updates to `veloren/conrod/conrod_core` to add support for copy and paste. Ref: veloren/conrod!2 Fixes #171
2019-10-19 06:12:37 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "473068b7b80ac86a18328824f1054e5e007898c47b5bbc281bd7abe32bc3653c"
WIP (testing) Update conrod_core This is a `cargo update -p conrod_core` to bring in updates to `veloren/conrod/conrod_core` to add support for copy and paste. Ref: veloren/conrod!2 Fixes #171
2019-10-19 06:12:37 +00:00
dependencies = [
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"xcb 0.10.1",
WIP (testing) Update conrod_core This is a `cargo update -p conrod_core` to bring in updates to `veloren/conrod/conrod_core` to add support for copy and paste. Ref: veloren/conrod!2 Fixes #171
2019-10-19 06:12:37 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "x11-dl"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "2.19.1"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "ea26926b4ce81a6f5d9d0f3a0bc401e5a37c6ae14a1bfaa8ff6099ca80038c59"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
dependencies = [
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"lazy_static",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
"pkg-config",
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
]
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
[[package]]
name = "x11rb"
update dependencies
2021-03-21 21:53:44 +00:00
version = "0.8.1"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies
2021-03-21 21:53:44 +00:00
checksum = "6ffb080b3f2f616242a4eb8e7d325035312127901025b0052bc3154a282d0f19"
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
dependencies = [
"gethostname",
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"nix 0.20.0",
Updated lockfile dependencies
2021-03-07 16:55:58 +00:00
"winapi 0.3.9",
"winapi-wsapoll",
]
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
[[package]]
name = "xattr"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "244c3741f4240ef46274860397c7c74e50eb23624996930e484c16679633a54c"
dependencies = [
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
Hackily upgraded rodio and cpal to 0.13
2020-11-05 07:48:06 +00:00
]
WIP (testing) Update conrod_core This is a `cargo update -p conrod_core` to bring in updates to `veloren/conrod/conrod_core` to add support for copy and paste. Ref: veloren/conrod!2 Fixes #171
2019-10-19 06:12:37 +00:00
[[package]]
name = "xcb"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
version = "0.9.0"
WIP (testing) Update conrod_core This is a `cargo update -p conrod_core` to bring in updates to `veloren/conrod/conrod_core` to add support for copy and paste. Ref: veloren/conrod!2 Fixes #171
2019-10-19 06:12:37 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file
2020-03-09 10:49:57 +00:00
checksum = "62056f63138b39116f82a540c983cc11f1c90cd70b3d492a70c25eaa50bd22a6"
WIP (testing) Update conrod_core This is a `cargo update -p conrod_core` to bring in updates to `veloren/conrod/conrod_core` to add support for copy and paste. Ref: veloren/conrod!2 Fixes #171
2019-10-19 06:12:37 +00:00
dependencies = [
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
dependency reduction: - authc no longer uses reqwest - image only supports PNG - replace routille with tiny_http - several other dependencies - cargo upgrade - following improvement was measured on R7 1700X: before: - cargo build: 3076.73s user / 4:45 total / 589 dependencies - cargo test: 6118.38s user / 7:30 total / 959 dependencies after: - cargo build: 2680.54s user / 4:05 total / 480 dependencies - cargo test: 5351.81s user / 7:04 total / 791 dependencies - added xMAC94x to CODEOWNERS for Cargo.toml, he will protect them from now on and hit people with evil looks ;)
2020-06-01 00:13:35 +00:00
"log",
WIP (testing) Update conrod_core This is a `cargo update -p conrod_core` to bring in updates to `veloren/conrod/conrod_core` to add support for copy and paste. Ref: veloren/conrod!2 Fixes #171
2019-10-19 06:12:37 +00:00
]
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
[[package]]
name = "xcb"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "771e2b996df720cd1c6dd9ff90f62d91698fd3610cc078388d0564bdd6622a9c"
dependencies = [
"libc",
"log",
"quick-xml",
]
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
[[package]]
name = "xcursor"
update crates
2021-09-20 10:05:41 +00:00
version = "0.3.4"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7"
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
dependencies = [
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
"nom 7.1.0",
Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-09-29 12:29:18 +00:00
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "xdg"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
version = "2.4.0"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
updating dependencies, cannot update the following dependencies: - vek: Sharps SIMD isnt upstream - tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes, - refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql - equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update - wgpu: cant update due new version doesnt support DX11 Got quinn updated which now require some dependencies to be explicit.
2021-11-19 13:01:08 +00:00
checksum = "3a23fe958c70412687039c86f578938b4a0bb50ec788e96bce4d6ab00ddd5803"
dependencies = [
"dirs",
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
Implement text renderering with glyph_brush (lifetime error)
2020-04-22 01:29:59 +00:00
[[package]]
name = "xi-unicode"
Add support for TextInput widget, rename widgets module to widget, update to glyph_brush 0.7.0
2020-05-29 04:40:22 +00:00
version = "0.3.0"
Implement text renderering with glyph_brush (lifetime error)
2020-04-22 01:29:59 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
Add support for TextInput widget, rename widgets module to widget, update to glyph_brush 0.7.0
2020-05-29 04:40:22 +00:00
checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a"
Implement text renderering with glyph_brush (lifetime error)
2020-04-22 01:29:59 +00:00
update further crates
2020-12-16 00:07:39 +00:00
[[package]]
name = "xkb"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aec02bc5de902aa579f3d2f2c522edaf40fa42963cbaffe645b058ddcc68fdb2"
dependencies = [
"bitflags",
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
build: update keyboard-keynames
2021-08-03 15:16:55 +00:00
"xkbcommon-sys 0.7.5",
update further crates
2020-12-16 00:07:39 +00:00
]
Display keys based off of scancodes Queries the OS to translate physical keyboard scancodes into Strings that can be shown in the UI. Addresses issues #861 and #354
2021-03-31 12:56:56 +00:00
[[package]]
build: use git keyboard-keynames to fix nix build error
2021-04-16 15:09:57 +00:00
name = "xkbcommon-sys"
update depednencies
2021-07-08 10:21:02 +00:00
version = "0.7.5"
Display keys based off of scancodes Queries the OS to translate physical keyboard scancodes into Strings that can be shown in the UI. Addresses issues #861 and #354
2021-03-31 12:56:56 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update depednencies
2021-07-08 10:21:02 +00:00
checksum = "59a001b79d45b0b4541c228a501177f2b35db976bf7ee3f7fce8fa2381554ab5"
Display keys based off of scancodes Queries the OS to translate physical keyboard scancodes into Strings that can be shown in the UI. Addresses issues #861 and #354
2021-03-31 12:56:56 +00:00
dependencies = [
update depednencies
2021-07-08 10:21:02 +00:00
"bindgen",
Display keys based off of scancodes Queries the OS to translate physical keyboard scancodes into Strings that can be shown in the UI. Addresses issues #861 and #354
2021-03-31 12:56:56 +00:00
"libc",
build: use git keyboard-keynames to fix nix build error
2021-04-16 15:09:57 +00:00
"pkg-config",
Display keys based off of scancodes Queries the OS to translate physical keyboard scancodes into Strings that can be shown in the UI. Addresses issues #861 and #354
2021-03-31 12:56:56 +00:00
]
update further crates
2020-12-16 00:07:39 +00:00
[[package]]
name = "xkbcommon-sys"
build: update keyboard-keynames
2021-08-03 15:16:55 +00:00
version = "0.7.6"
source = "git+https://github.com/Frinksy/rust-xkbcommon-sys.git?rev=8f615dd6cd90a4ab77c45627830dde49b592b9b5#8f615dd6cd90a4ab77c45627830dde49b592b9b5"
update further crates
2020-12-16 00:07:39 +00:00
dependencies = [
New town layouts, initial progress
2021-02-17 01:47:16 +00:00
"libc",
update further crates
2020-12-16 00:07:39 +00:00
"pkg-config",
]
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
[[package]]
name = "xml-rs"
update crates
2021-09-20 10:05:41 +00:00
version = "0.8.4"
Added cargo lock, updated sphynx Former-commit-id: b223be3ea12c820dc2e3fc13720b83a51fa1f647
2019-04-14 16:39:32 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update crates
2021-09-20 10:05:41 +00:00
checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3"
protocoladdr change for listen and connect (remove a loop in quic protocol which wasnt a actual loop)
2021-04-15 08:16:42 +00:00
[[package]]
name = "yasna"
update dependencies
2021-06-04 07:44:30 +00:00
version = "0.4.0"
protocoladdr change for listen and connect (remove a loop in quic protocol which wasnt a actual loop)
2021-04-15 08:16:42 +00:00
source = "registry+https://github.com/rust-lang/crates.io-index"
update dependencies
2021-06-04 07:44:30 +00:00
checksum = "e262a29d0e61ccf2b6190d7050d4b237535fc76ce4c1210d9caa316f71dffa75"
protocoladdr change for listen and connect (remove a loop in quic protocol which wasnt a actual loop)
2021-04-15 08:16:42 +00:00
dependencies = [
"chrono",
]
Reference in New Issue Copy Permalink