Commit Graph

2568 Commits

Author SHA1 Message Date
Joshua Barretto
efbab102a5 Make LoD towns glow 2023-04-09 19:25:58 +01:00
flo
1cca6cfa74 fix_salamander tail_front offset 2023-04-09 10:46:57 +00:00
Imbris
54c39c03f7 Merge branch 'imbris/pixel-perfection-v2' into 'master'
Move image scaling into the UI shaders rather than precomputing it on the CPU

Closes #257

See merge request veloren/veloren!3573
2023-04-08 07:06:19 +00:00
Imbris
5881e44e61 Address review on 3573 2023-04-08 02:19:14 -04:00
Imbris
2a9a63a60e Clippy fixes 2023-04-08 00:51:50 -04:00
Imbris
63096b2042 Complete GPU based alpha premultiplication impl and make the CPU version
even faster.

* GPU based version started in previous commit, but this fixes errors
  and bugs and gets it actually compiling and running.
* Add a way to batch together images to use the same render pass for GPU
  premultiplication if they all target the same texture.
* Pending premultiplication uploads are automatically done when calling
  `Drawer::third_pass`.
* `fast-srgb8` dep removed, we no longer convert to `f32`s to do the
  premultiplication. Two `[u16; 256]` tables are combined to compute the
  alpa premultiplied color within the same error bounds used by the
  `fast-srgb8` crate. We also no longer use explicit simd.
* Remove explicit lifetimes from `PlayState::render` since `&self` and
  `Drawer<'_>` don't need to have the same lifetime.
* Fix existing bug where invalidated cache entries were never set to
  valid when reusing them.
* `prepare_graphic` now runs some heuristics to determine whether
  premultiplication should be executed CPU side or GPU side and then
  returns a bool indicating if GPU premultiplication is needed.
2023-04-08 00:28:31 -04:00
Imbris
efd932c71e Progress on GPU premultiplication.
* General progress in setting up code paths to support GPU
  premultiplication.
* Created `PremultiplyUpload` type to represent an initiated image
  upload where the premultiply pass needs to be ran to complete it.
* Converted from compute pass to render pass since current limitations
  make it difficult to write directly to a srgb image from a compute
  shader.
* Replace `CachedDetails::Immutable` with keeping track of the
  parameters used to create the texture (i.e. the border color).
* Create `TextureRequirements`, `TextureParamters`, and `CacheKey` types
  to encode parameters that go into texture creation and image caching
  and to determine when the space in texture memory should be reused
  when replacing a graphic.
* Add custom texture creation logic for the UI textures since those need
  certain usage combinations.
2023-04-08 00:28:31 -04:00
Imbris
1d51aae3b2 Start attempt to premultiply alpha on the GPU. 2023-04-08 00:28:31 -04:00
Imbris
eb6d16b02c Rename draw_graphic -> prepare_graphic since it is no longer always
specifically rendering an image at the provided dimensions. Start
working on alpha premultipication which is necessary for being able to
properly sample colors on the GPU with bilinear filtering. Various
tweaks to comments and misc changes.
2023-04-08 00:28:31 -04:00
Imbris
69a1a661b6 fixes and tweaks (various minor changes related to UI image scaling on
GPU)
2023-04-08 00:28:31 -04:00
Imbris
d62bf8a790 init (scaling UI images during sampling on the GPU instead of on the CPU) 2023-04-08 00:28:28 -04:00
Sam
4ec2798262 Fix velorite sprite offset 2023-04-06 10:57:19 -04:00
Sam
038929d66d New models for ores and repair bench 2023-04-06 10:57:17 -04:00
Monty Marz
29a7520a48 adjusted death message, fixed repair bench text 2023-04-06 10:57:17 -04:00
Sam
a68ef7af30 Tweaks 2023-04-06 10:57:16 -04:00
Sam
e4ebd17363 Addressed feedback 2023-04-06 10:57:12 -04:00
Sam
ca879173be Added a repair equipped and a repair all button. Cleaned up some hacks that used to exist. 2023-04-06 10:56:55 -04:00
Sam
658de93c59 Repairing UI 2023-04-06 10:56:53 -04:00
Sam
011b6c3feb Changed how durability was persisted so that a more general system can be used for future item properties. 2023-04-06 10:54:49 -04:00
Sam
c3f5bc13f1 Equipment can now be repaired at sprites in town. 2023-04-06 10:54:48 -04:00
Sam
a555e08d0b Added durability to item tooltips 2023-04-06 10:54:47 -04:00
Christof Petig
8d2b9b9a9c single file orichalcum armor 2023-04-04 23:46:20 +02:00
Christof Petig
4da41b0dd0 move alchemist set to single file (with reduced hat size) 2023-04-04 23:46:20 +02:00
Christof Petig
e26cbffa0c correct offsets from animation settings 2023-04-04 23:46:20 +02:00
Christof Petig
fb06bb651b a single llama file (smaller) 2023-04-04 23:46:20 +02:00
Christof Petig
b1dc85dc0f llama in one vox file 2023-04-04 23:46:20 +02:00
Joshua Barretto
b3cd1c1e56 Merge branch 'inventory-list' into 'master'
Add a list mode to inventories to make it easier to see item names at merchants.

See merge request veloren/veloren!3755
2023-04-04 16:54:15 +00:00
Marcel
914f93e18a Merge branch 'tygyh/Update-swedish-translations' into 'master'
Update swedish translations

See merge request veloren/veloren!3847
2023-04-03 21:40:32 +00:00
Avi Weinstock
8facf7b58d Add a list mode to inventories to make it easier to see item names at merchants. 2023-04-03 14:43:14 -04:00
Joshua Barretto
ab5561df61 Removed redundant things 2023-04-02 01:09:12 +01:00
Monty Marz
ca18da8061 UI tweaks 2023-04-01 21:54:48 +02:00
Joshua Barretto
9645172135 Slightly smoother FxUpscale 2023-04-01 18:06:20 +01:00
Joshua Barretto
19db823092 Proper next/prev site buttons 2023-04-01 12:34:58 +01:00
tygyh
dedf93c6ad Fix issue #1758 for Swedish 2023-03-31 21:02:41 +02:00
tygyh
4067990847 Update swedish translations 2023-03-31 17:36:17 +02:00
Joshua Barretto
c28e61383d Added target to starting site map 2023-03-31 16:25:24 +01:00
Joshua Barretto
acec45b756 Initial implementation of starting site choice 2023-03-31 14:24:14 +01:00
Monty Marz
d1a7884ac8 Merge branch 'more_spot_things' into 'master'
grave models, spot fixes, sword overlay

See merge request veloren/veloren!3842
2023-03-31 02:57:39 +00:00
Isse
c34e5ad4ed Small fixes 2023-03-29 23:11:59 +00:00
Monty Marz
e4c5e50fb2 grave models, spot fixes, sword overlay 2023-03-29 13:10:49 +02:00
Samuel Keiffer
a737a1862c Merge branch 'sam/sword-balance-0' into 'master'
Sword Tweaks

See merge request veloren/veloren!3838
2023-03-29 01:26:33 +00:00
Sam
c9af470cc7 Final tweaks 2023-03-28 20:55:21 -04:00
Marcel
864666a73b Merge branch 'tygyh/Update-swedish-translations' into 'master'
Update swedish translations

See merge request veloren/veloren!3835
2023-03-28 23:34:22 +00:00
kinoshi
f0fa766410 Update russian translations 2023-03-28 23:26:11 +00:00
Sam
cdaf9e5c0e Ability changes 2023-03-26 21:41:22 -04:00
Sam
ac115055ac Final icons 2023-03-21 20:18:34 -04:00
Sam
1301fff800 Agility stance ability icons. 2023-03-21 20:18:33 -04:00
Sam
8b0a59c0dd Heavy stance ability icons. 2023-03-21 20:18:33 -04:00
Monty Marz
3e37586ba5 icons 2023-03-21 20:18:32 -04:00
Sam
4d0b192fbd Icons for crippling stance abilities. 2023-03-21 20:18:32 -04:00