branchrust_reboot/main/tattooscancel
39 Commits over 1,553 Days - 0.00cph!
merge from tattoos/art_pass
set up tattoo gun prefabs/anims in tools folder
tattoo shader fixes
- fix player looking hella dead
- fix tattoos cappe at 65% opacity
also lowered brush max size again, 0.5-3
fix tattoos not showing on first-person legs
switch head tattoos to uv0 with shader fix for more consistent resolutions
fix ReadOnly attributes
first pass on painting/tattoo stencils
- stencils can be stamped onto the body as tattoos
- stencils are in full RGB colour, tintable, and can be greyscaled
first pass on restore tool
- old tattoos that are faded can be painted with this tool to restore their colour to full without needing to be fully redrawn
tattoo fixes
- clamp tattoo brush size 1.0-5.0, doesnt use painting convar
- zoom scaling clamp, so you cant get as far out but can also go closer than usual for fine detail
- brushes now scale independent of zoom in tattooing, this does make performance a little worse, but fixes when the paint stamp doesnt cover enough of the uv and becomes spotty. WIP still
- uv buffer now samples some of the uv pixels around the current target to try to smooth out and match seams where the uv resolutions dont match (like where the head meets torso etc..)
first pass on tattoo layering
- 2 layers, 1 "base" layer which is fixed onto the player model, 1 which is edited during a painting session
- tattoo compositor merges the editing layer onto the base layer when exiting the menu or saving
- fade is applied to base layer, and baked into the png when merging downwards
- rads add fade to the base layer visually with a parameter, which is only baked in during a merge
- reworked to accomodate a separate player sending the tattoo edits to the other for saving (bc tattoo chair eventually)
- moved more code to serverside to allow for direct painting communication between 2 clients
fix tattoos not saving between client-server properly
merge from tattoos_revived -> tattoos
▌▌▄▉▊ ▆▍▇▇ ▇▉▄ ▇▍█ ▆▋▇▌▊▇▊▅█▌▌▄▊▉▋ ▅▌▄ ▆▅▊▉▌▍▆▅▋▍▉▍▋█ ▋▇▋▆▍▌ ▍▊ ▅▊▉ ▊▌▆ ▆▌▊▆▊▍▅ ▋▋▋ ▌▇▉█▉▋▉ ▉▄ ▇▇▇▌ ▉▆▄▅▉▄▄▍▆▅▄▍▍▆▇ ▆▌▇▄ ▉▍ ▇▉ ▆█▄▇▅▄▉█▌ ▌▍▅▄▊▌ ▉▊▋▋▊▆█▉▊█▆▆
▌▄█▋▍▇▉▅█ ▍▋▇ ▌▅ ▌▆ ▋▋█ ▉▊▄▆ ▊▆▆ █▅ ▆▌▊ ▊▋▍█ ▌▊▍▍▇▊▇▉▊▉▆▉▇
▄▊▇▇▆ ▇▌ ▅▆▄▆▊█▄ ▇▇ ▅▆▊ ▋█▇▇▅█▆ ▍▋ █▅▊ ▄▄▌▍▋██▆▋▅▄▊▌▅▄▍▆▍▅ ▆▋ ▊▌▍▋▇▅▍▄▇▅ ▊▅█ ▆▉▉▄ ▉▌▊▄▌▊ █▋▉▍▇▆▋▌▇▌▌▇▆ ▌▆█ ▆█▆█▄ ▇██▍█▇▆
▆▆▌▅█▆ ▅▊█▉ ▆▌▄▆▌▍▋▍▆▍█▊▌▍ ▍▉▄ █▇▄▅▅ ▍█▋▅▍ ▅▊▆▊ ▌▄▅▆ ▌▌▄█▅█▄▋▋▍▉ █▍▆ ▌▅▊▇██ ▅▍▊█▋ ▍▊▇▍▇▊▊▊ ▊▄▋▄▍ ▅▉▅▇ ▆█▅▋ ▄▍ ▋▅ ▍▉▊▋▅▍ ▆▉▋▅▌▋▋█▇▍▋▆▅▅ ▅▊▅▌▇▋▊▅▇▄▌▊ ▉▌█▄▍▍ █▄▉▉▆▍
▍ ▆▇▆▇█▌▊ ▋▋█ ▋▅▇▍▆▅ ▋█▉▉▄█▄▉ ▄▊ ▇▍▋▊ ▍█▋ ▊▅▋█▍ ▊█ ▅▆█ ▌▊█ █▌▋▄█▆▉▇ ▌▋
▊ ▅▉▆▄▅ ▉▊▄▊ ▅▌█▄▅ ▉▆▄▄▄▊▊▅ ▅▅▄ ▊▊▄▉█▆▌█
▍ ▆▊▋█▄▉▊▍ ▄▅█▋▍▄▆▆▅█▉▄▊▌ ▋▊ ▄▇▋▌ ▋ ▌▌▇▄ ▊▉▅▍▍ ▇▄▉▇ ▋▊▅▍▊▄ ▅▄▉▋▄ ▋▆ ▇▍▄▇▊▌▌▆▆▇ ▄ ▊▇█ ▅▆▆▄▉█ ▇▄▄▉▅▋ ▊▊▊ ▇▄▇▆▇▅ ▆▌▊▊▆▋▅ ▉▇▄▆▆ ▉▄▋ ▆▊█▆▌▆▌▉▅▍▅▅▉ ▌▇▋█▍▆▌█▊█ ▇▋▆█▋▉▌█▅▊▌▄█▌▄ █▍▇▇█▋▄ ▊▉▊▍ ▇▌▆▆▅▇ ▊▆▅▉▊▌▅
▍ █▉▌▄▍ ▆▅▅ ▊▆█▍▄▍▍▉▍▌ ▊▄ ▄▍▊█▇▊██ ▅▇▋▅█▉▉ ▅▆ ▄▆▇ ▅▆▅▉ ▌▅▆▋ ▅▇▅▄▇▅▌
▍ ▇▍▇▉▉▌ ▊▉▌▋▄█ ▄▆▌▋ ▍▆▉▆▍ █▇▇▋▉ █▊▆▊▆▊▍▆
▌ ▅▅▉▋ ▅▄▉▄▇▌▍ ▋▄█▇▄█▅ ▍▊▍▋ ▍▍▆ ▅▍▉▄▅▅▄▌ ▌█
▋ ▍▇▊▍▊ ▆▉ ▉▍▌ ▌▍▍▊▌▇▍ ▄█▅▍▄▉▉ ▊▊ ▉█ ▌▊▅ █▋█▇▄▉ ▄▌▄▅▊▍▆
▊ ▋▉▌ ▅▅█▉▄█▍▋▆ ▌▌▇▋█▍▌ ▊▍▇ ▅▅▄▆▄▇▊
▅ █▌▊▊ ▆▍▄▍▄▆▍▉▇▅▊ ▆▌ ▌▉▉▋▆▌▄█▇█▅▌▌▋ █▊ ▋▄▍▅▅ ▍ ▆▋▋▇ ▊▍ ▉▋█▊█▌▇█▇█ ▆▄▉▆▌▉▍ ▅▆ ██▍▊▄▋▅ ▊▍▆▋ ▍▌ ▅▅▌▊▍█▇▍█▄▆▆ ▌▍▊ ▍▅▊ ▋▊▅▆█▊▅█▌▆▅▇ ▅▉█▇▌▇▇▆▊█▋ ▆▍ █▊▇ ▆▋▉▋▌▉ ▍▇▋▍▋▆▉ ▉▉ ▅▋▄▌▊▋ █▅ ▆▉ ▌▄▆▍ ▌▇▍▍▋ ▅▅▋█▉▊▉▅▊▌
▊ ▅▅▇▆ ▇▉▉▋▊█ ▅▌▋█ ▄▌▆▌▅▇█▄█ ▍▋ ▉▋▌ ▄█▉▄▉▇ ▄▅█▄▇ ██ ▅▆▅▄▆▋▇ █▇ █▉▆▅ ▅▅▊
▋ ▋▄▍▋▇▇ ▍▍█▄▍▉▄▇▋▇▅ ▅▋ ▍▄█ █▌▆▇▋ █▆▅ ▍▋ ▍▇ ▇▍▉ ▆▊▅▍▅ ▅▌ ▉▌▋ ▆▅▍▄▌█▉▋▇ ▊▅ ▉▍▉▉▋▆▅▆ ▉▊▄ ▋▌▍▉▊▄▌ ▇▉▆ █▊ ▉▆▆▅▅▇█▊▄ ▇▇▋▊▉██▌▋▇▆▄▅▇▅▄ ▆▋█▌▍▄▌▄▇ ▄▆ █▄▍ ▍ ▄▄▄██▆ ▌▄▊█ █▋▍▆ ▉▇▌ ▅▅▌▉▍▌▄▆▉▊▇ ▉ ▅▍▋▌▇▅▄▅▍▊▌█▋▌▇▉▆ ▌▌▋▊█▇▍ ▅▇ ▄▅▄▆ ▍▉▉ ▉█▉▋▍▉ ▄█▆▍▉▇█▋ ▅██
▇ ██▅▊▉▆▍ ▋▌▋▍▅▊▋█ ▌▄▊ ▋▊▉▇ ▅▄▊▌▉█▋▉▅█ ▉▄▉▄▆▅ █▇▍ ▌▄█ ▊▊██▋▍▌ ▋▋▍▋▄▇▄▍ ▊▊ █▍▆ ▉█▊▉▆ █▉▌ ▆█▊▋ ▆▋▇▄ █▅ ▊▌▊ █▋▊▇█▊▅ ▅▋▊█▌▋▌
▄ ▍▅▉▆ ▄▌▍▆▇▍▉▍█▇▍▋▉▇▅▄▊▇▍ ▌▍▉▅▅▅▅ ▄▊▆▌▄▄▄▄ ▉▄▊▍▋▄▅ ▉▆▆▆▉ █▄▆▉▇▉▅▊▆ ▉▋ ▋▅▆▍▌▊ ▉▇▌▋ █▋ ▄▇▊▊▌▋▇▆▌▍▉▊ ▄▇▋ ██▍▇▌▄▇▌ ▋█ ▅▆▍ ▋▍▇▌▄▆▆▅▋▍ ▆▍ ▌▆▌▌ ▉▊▌▉ ▍▄ ▍▍▇▊ ▊▊▉▌▅▋ ▉█▉▍ ▊▋▊▋▅▊▋█▋█▍▌▉▄▆ ▋▆▋ ▍▊▄ ▇█▇▉▊▊ ▌▋▉ ██ ▊▍▆▋▄▄█▇▆
▉ ▊█▇ ▋▆██▅▄ ▆▋▆▌▊ ▇▇▍▇ ▋▌█▅ ▊▋▇▋▉▌▇▋▋▆ ▆▉▍ ▆▇▍▄▇ ▇▇▉ ▉▆▆▆▅▄ ▇▄▆▄▇▅█▋ ▉█ ▉▌▉ ▌▆█▉ ▄▇▊▅
█ █▊█▍▋▊█▊ ▉▆▊█▌▌▌ ▊█▆ ▅▇██▆▇ ▋▆▄▋ ▄▆▋▊▅▅▋▍▊ ▆▋ ▆▆▅ ▅█
▌ ▄▇▄▌▍▊▌▊█▅▇ ▌▇▉▆▄▄▌▆▌█▆▅▉▆▅▋▆▊▅ ▌▍ ▌▄ ▊▇▆ ▌▍▊▊ ▄▉▊ ▉▆█▄ ▄▆ ▅▋▆▊ █▌▆█▊▋▍▊▍▇▇ █▍▆ ▌▍▌▆▍▉ ▆▇▊█▄▄
▆ ▌▋▄ ▆█▅▋▅▅▉ ▉▉▋▍▋▆ ▋▅▇▅▉█ ▇▌ ▆▄▇█▄▌█▊▅▆█▅▅▄ ▄▅▌▄█ ▌▍▋▍▆▇▍▉ █▉▄▊ ▇█▅▍ ▇▋▆▄▇▅▌▇▉ ▉▊▅▊▄ ▆▆█▄█ ▍▉▄
▊ ▌▄▍▇█▇▋▅ ▇▌▋▄▆▅ ▋▆▌ █▄▍▊█▍█ ▋█ █▌▋▍▅▄ ▉▌ █▆ ▌▍█ ▋▅▇▋ ▅▋▉▊▍▅▅ ▋▍ ▊▆ ▄▇▄ █▉▄▌▌█▇▋ ▋█▇ ▋▉▇▍▄▇▋▇▋ ▋▋▆ ▌▉▊▉ ▆▅▇▇▌ ▄▆ ▇▇▇ ▌▇▌▇█▄
▇ ▅▍▅ ▄ █▋▍▌▌▋▍█▆ ▍▉ ▊▉▄ ▉▊▆▌ ▉▄▇▋▉▌ ▅▄▄ ▇▇▊▇▊▋ ▍▋▍█▍▌▊█▄▉▌▊ ▄ ▆▋█▌▅▆▇▄▋ ▊▆ ▄▊▋▋▊▅▊▊ ▌▍ ▉▇▉▅▆▄ ▍▊▆▅▋ ▆▄ ▌▇▌▉▉▄▇ ▊▅ ▄▋█▆▄▍▋▍▍▆▋▄▊ █▌ ▊▌▆██ ▉▉█▋ ▊▍▇▋▉▄▉▉▇▇▆▋▋▍▄ ▄▌▇▅ ▉█▄ ▅▍▄ ▌▊▌▍▆▊▉▇▊ ▊▄ ▉▄▇ ▍▊▆▊ ▆▅▅ ▍▍ ▅▇▉▆█▍ ▇▉▌█▋▋ ▇▊▊▅▋▊█▄ ▆▍█▋▍▆▌▅▇ ▌▋ ▌▌▋▋▉▊█▅█▇▅▆▅▇▊▉▍▊▉▉ ▉▊▍▊▅▍▌ ▆▅▄▅▅▍▊ ▌▌ ▉▍▄ █▆ ▉▍▋▅▋▇█ ▇▊ ▍▉ ▋▇▆ ▅▍▅▉▊▌▆▍█▅▍ ▆█▉ ▋▄ ▄▉ ▅▆▍▊▅█▇▉ █▌▉▄▊ █▊█▊ ▌▇ ██▊▄▊▉▉ ▆▉ ▌▌▉▊▍ ▍▊▄▆▉ ▋▋▅ ▄█▇▇▇▉▉▉▄
