Bennydev
/
Benny
4
0
Fork 0
Code Issues Pull Requests Wiki Activity

Deadeye UI tweaks, R/L

This commit is contained in:
Fesiug 2023-11-03 13:20:24 -04:00
parent 1851d32268
commit 29d9a61086
1 changed files with 216 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

316
gamemodes/benny/gamemode/modules/tools/cl_deadeye.lua
View File

@ -19,100 +19,156 @@ end
local function QUICKNIL( self, w, h ) local function QUICKNIL( self, w, h )
end end
local SIDE = { local FIRST = {
["left_cheek_puffer"] = 1, "left_lowerer",
["left_cheek_raiser"] = 1, "left_outer_raiser",
["left_corner_depressor"] = 1, "left_inner_raiser",
["left_corner_puller"] = 1, "left_cheek_puffer",
["left_lid_closer"] = 1, "left_cheek_raiser",
["left_lid_droop"] = 1, "left_lid_closer",
["left_lid_raiser"] = 1, "left_lid_droop",
["left_lid_tightener"] = 1, "left_lid_raiser",
["left_upper_raiser"] = 1, "left_lid_tightener",
["left_outer_raiser"] = 1, "left_mouth_drop",
["left_inner_raiser"] = 1, "left_upper_raiser",
["left_mouth_drop"] = 1, "left_dimpler",
["left_dimpler"] = 1, "left_funneler",
["left_funneler"] = 1, "left_part",
["left_part"] = 1, "left_puckerer",
["left_puckerer"] = 1, "left_stretcher",
["left_stretcher"] = 1, "left_corner_depressor",
["left_lowerer"] = 1, "left_corner_puller",
}
["right_cheek_puffer"] = 2, local SECOND = {
["right_cheek_raiser"] = 2, "jaw_clencher",
["right_corner_depressor"] = 2, "jaw_drop",
["right_corner_puller"] = 2, "jaw_sideways",
["right_lid_closer"] = 2,
["right_lid_droop"] = 2, "lip_bite",
["right_lid_raiser"] = 2, "lower_lip",
["right_lid_tightener"] = 2, "presser",
["right_upper_raiser"] = 2, "tightener",
["right_outer_raiser"] = 2, "wrinkler",
["right_inner_raiser"] = 2, "dilator",
["right_mouth_drop"] = 2,
["right_dimpler"] = 2, "bite",
["right_funneler"] = 2, "blink",
["right_part"] = 2, "half_closed",
["right_puckerer"] = 2, "chin_raiser",
["right_stretcher"] = 2, "mouth_sideways",
["right_lowerer"] = 2, "sneer_left",
"body_rightleft",
"chest_rightleft",
"eyes_rightleft",
"eyes_updown",
"gesture_rightleft",
"gesture_updown",
"head_forwardback",
"head_rightleft",
"head_tilt",
"head_updown",
}
local SIDE_L = {
["left_cheek_puffer"] = "right_cheek_puffer",
["left_cheek_raiser"] = "right_cheek_raiser",
["left_corner_depressor"] = "right_corner_depressor",
["left_corner_puller"] = "right_corner_puller",
["left_lid_closer"] = "right_lid_closer",
["left_lid_droop"] = "right_lid_droop",
["left_lid_raiser"] = "right_lid_raiser",
["left_lid_tightener"] = "right_lid_tightener",
["left_upper_raiser"] = "right_upper_raiser",
["left_outer_raiser"] = "right_outer_raiser",
["left_inner_raiser"] = "right_inner_raiser",
["left_mouth_drop"] = "right_mouth_drop",
["left_dimpler"] = "right_dimpler",
["left_funneler"] = "right_funneler",
["left_part"] = "right_part",
["left_puckerer"] = "right_puckerer",
["left_stretcher"] = "right_stretcher",
["left_lowerer"] = "right_lowerer",
}
local SIDE_R = {
["right_cheek_puffer"] = "left_cheek_puffer",
["right_cheek_raiser"] = "left_cheek_raiser",
["right_corner_depressor"] = "left_corner_depressor",
["right_corner_puller"] = "left_corner_puller",
["right_lid_closer"] = "left_lid_closer",
["right_lid_droop"] = "left_lid_droop",
["right_lid_raiser"] = "left_lid_raiser",
["right_lid_tightener"] = "left_lid_tightener",
["right_upper_raiser"] = "left_upper_raiser",
["right_outer_raiser"] = "left_outer_raiser",
["right_inner_raiser"] = "left_inner_raiser",
["right_mouth_drop"] = "left_mouth_drop",
["right_dimpler"] = "left_dimpler",
["right_funneler"] = "left_funneler",
["right_part"] = "left_part",
["right_puckerer"] = "left_puckerer",
["right_stretcher"] = "left_stretcher",
["right_lowerer"] = "left_lowerer",
} }
local PRETTY = { local PRETTY = {
["left_cheek_puffer"] = "Left Cheek Puffer", ["left_outer_raiser"] = "Brow Outer Raiser",
["left_cheek_raiser"] = "Left Cheek Raiser", ["left_inner_raiser"] = "Brow Inner Raiser",
["left_corner_depressor"] = "Left Corner Depressor", ["left_lowerer"] = "Brow Lowerer",
["left_corner_puller"] = "Left Corner Puller", ["left_cheek_puffer"] = "Cheek Puffer",
["left_lid_closer"] = "Left Lid Closer", ["left_cheek_raiser"] = "Cheek Raiser",
["left_lid_droop"] = "Left Lid Droop", ["left_lid_closer"] = "Lid Closer",
["left_lid_raiser"] = "Left Lid Raiser", ["left_lid_droop"] = "Lid Droop",
["left_lid_tightener"] = "Left Lid Tightener", ["left_lid_raiser"] = "Lid Raiser",
["left_upper_raiser"] = "Left Upper Raiser", ["left_lid_tightener"] = "Lid Tightener",
["left_outer_raiser"] = "Left Outer Raiser", ["left_mouth_drop"] = "Mouth Drop",
["left_inner_raiser"] = "Left Inner Raiser", ["left_upper_raiser"] = "Lip Upper Raiser",
["left_mouth_drop"] = "Left Mouth Drop", ["left_dimpler"] = "Lip Dimpler",
["left_dimpler"] = "Left Dimpler", ["left_funneler"] = "Lip Funneler",
["left_funneler"] = "Left Funneler", ["left_part"] = "Lip Part",
["left_part"] = "Left Part", ["left_puckerer"] = "Lip Puckerer",
["left_puckerer"] = "Left Puckerer", ["left_stretcher"] = "Lip Stretcher",
["left_stretcher"] = "Left Stretcher", ["left_corner_depressor"] = "Lip Corner Depr.",
["left_lowerer"] = "Left Lowerer", ["left_corner_puller"] = "Lip Corner Puller",
["right_cheek_puffer"] = "Right Cheek Puffer", ["right_outer_raiser"] = "Brow Outer Raiser",
["right_cheek_raiser"] = "Right Cheek Raiser", ["right_inner_raiser"] = "Brow Inner Raiser",
["right_corner_depressor"] = "Right Corner Depressor", ["right_lowerer"] = "Brow Lowerer",
["right_corner_puller"] = "Right Corner Puller", ["right_cheek_puffer"] = "Cheek Puffer",
["right_lid_closer"] = "Right Lid Closer", ["right_cheek_raiser"] = "Cheek Raiser",
["right_lid_droop"] = "Right Lid Droop", ["right_lid_closer"] = "Lid Closer",
["right_lid_raiser"] = "Right Lid Raiser", ["right_lid_droop"] = "Lid Droop",
["right_lid_tightener"] = "Right Lid Tightener", ["right_lid_raiser"] = "Lid Raiser",
["right_upper_raiser"] = "Right Upper Raiser", ["right_lid_tightener"] = "Lid Tightener",
["right_outer_raiser"] = "Right Outer Raiser", ["right_mouth_drop"] = "Mouth Drop",
["right_inner_raiser"] = "Right Inner Raiser", ["right_upper_raiser"] = "Lip Upper Raiser",
["right_mouth_drop"] = "Right Mouth Drop", ["right_dimpler"] = "Lip Dimpler",
["right_dimpler"] = "Right Dimpler", ["right_funneler"] = "Lip Funneler",
["right_funneler"] = "Right Funneler", ["right_part"] = "Lip Part",
["right_part"] = "Right Part", ["right_puckerer"] = "Lip Puckerer",
["right_puckerer"] = "Right Puckerer", ["right_stretcher"] = "Lip Stretcher",
["right_stretcher"] = "Right Stretcher", ["right_corner_depressor"] = "Lip Corner Depr.",
["right_lowerer"] = "Right Lowerer", ["right_corner_puller"] = "Lip Corner Puller",
["jaw_clencher"] = "Jaw Clencher",
["jaw_drop"] = "Jaw Drop",
["jaw_sideways"] = "Jaw Sideways",
["lip_bite"] = "Lip Bite",
["lower_lip"] = "Lip Lower Depr.",
["presser"] = "Lip Presser",
["tightener"] = "Lip Tightener",
["wrinkler"] = "Nose Wrinkler",
["dilator"] = "Nose Dilator",
["bite"] = "Bite", ["bite"] = "Bite",
["blink"] = "Blink", ["blink"] = "Blink",
["half_closed"] = "Half Closed", ["half_closed"] = "Half Closed",
["chin_raiser"] = "Chin Raiser", ["chin_raiser"] = "Chin Raiser",
["dilator"] = "Dilator",
["jaw_clencher"] = "Jaw Clencher",
["jaw_drop"] = "Jaw Drop",
["jaw_sideways"] = "Jaw Sideways",
["lip_bite"] = "Lip Bite",
["lower_lip"] = "Lower Lip",
["mouth_sideways"] = "Mouth Sideways", ["mouth_sideways"] = "Mouth Sideways",
["presser"] = "Presser",
["sneer_left"] = "Sneer Left", ["sneer_left"] = "Sneer Left",
["tightener"] = "Tightener",
["wrinkler"] = "Wrinkler",
["body_rightleft"] = "Body Rightleft", ["body_rightleft"] = "Body Rightleft",
["chest_rightleft"] = "Chest Rightleft", ["chest_rightleft"] = "Chest Rightleft",
@ -126,6 +182,35 @@ local PRETTY = {
["head_updown"] = "Head Updown", ["head_updown"] = "Head Updown",
} }
local function makeme( id, parent, ent, no_dock )
local SLIDER = parent:Add( "DNumSlider" )
SLIDER:SetText( PRETTY[ ent:GetFlexName( id ) ] or ent:GetFlexName( id ) )
local min, max = ent:GetFlexBounds( id )
SLIDER:SetMin( min )
SLIDER:SetMax( max )
SLIDER:SetDecimals( 2 )
SLIDER:SetTall( 18 )
if !no_dock then
SLIDER:Dock( TOP )
SLIDER:DockMargin( 10, 0, 10, 0 )
end
SLIDER.Label:SetWide( 90 )
function SLIDER:PerformLayout() return end
function SLIDER:OnValueChanged( val )
if !DEADEYE_MEM.Flex then DEADEYE_MEM.Flex = {} end
DEADEYE_MEM.Flex[ ent:GetFlexName( id ) ] = val
end
function SLIDER:Think()
if DEADEYE_MEM.Flex then
self:SetValue( DEADEYE_MEM.Flex[ ent:GetFlexName( id ) ] )
end
end
return SLIDER
end
DEADEYE_MEM = DEADEYE_MEM or {} DEADEYE_MEM = DEADEYE_MEM or {}
function OpenDeadeye() function OpenDeadeye()
@ -226,26 +311,57 @@ function OpenDeadeye()
flexlist[MODEL.Entity:GetFlexName( i )] = true flexlist[MODEL.Entity:GetFlexName( i )] = true
end end
for i, v in SortedPairs( flexlist ) do local madelist = {}
local MARKF = MODELSETTINGS:Add( "DHorizontalDivider" )
MARKF:Dock( TOP )
MARKF:DockMargin( 130, 0, -140, 0 )
MARKF:SetDividerWidth( 0 )
local LABELR = MODELSETTINGS:Add("DLabel")
LABELR:SetText( "Right" )
local LABELL = MODELSETTINGS:Add("DLabel")
LABELL:SetText( "Left" )
MARKF:SetLeft( LABELR )
MARKF:SetRight( LABELL )
local old = MARKF.PerformLayout
function MARKF:PerformLayout( w, h )
self:SetLeftWidth( w / 2 )
old( self, w, h )
end
for v, i in ipairs( FIRST ) do
local MARK = MODELSETTINGS:Add( "DHorizontalDivider" )
MARK:Dock( TOP )
MARK:DockMargin( 10, -4, 10, -4 )
MARK:SetDividerWidth( 0 )
local SLIDERA = makeme( MODEL.Entity:GetFlexIDByName( SIDE_L[i] ), MODELSETTINGS, MODEL.Entity, true )
local SLIDERB = makeme( MODEL.Entity:GetFlexIDByName( i ), MODELSETTINGS, MODEL.Entity, true )
madelist[SIDE_L[i]] = true
madelist[i] = true
MARK:SetLeft( SLIDERA )
MARK:SetRight( SLIDERB )
local old = MARK.PerformLayout
function MARK:PerformLayout( w, h )
self:SetLeftWidth( w / 2 )
old( self, w, h )
end
end
for v, i in SortedPairs( SECOND ) do
if !madelist[i] then
local id = MODEL.Entity:GetFlexIDByName( i ) local id = MODEL.Entity:GetFlexIDByName( i )
SLIDER = MODELSETTINGS:Add( "DNumSlider" ) makeme( id, MODELSETTINGS, MODEL.Entity )
SLIDER:SetText( PRETTY[ MODEL.Entity:GetFlexName( id ) ] or MODEL.Entity:GetFlexName( id ) ) madelist[i] = true
local min, max = MODEL.Entity:GetFlexBounds( id ) end
SLIDER:SetMin( min )
SLIDER:SetMax( max )
SLIDER:SetDecimals( 2 )
SLIDER:Dock( TOP )
SLIDER:DockMargin( 10, -5, 10, -5 )
function SLIDER:OnValueChanged( val )
if !DEADEYE_MEM.Flex then DEADEYE_MEM.Flex = {} end
DEADEYE_MEM.Flex[ MODEL.Entity:GetFlexName( id ) ] = val
end end
function SLIDER:Think() for i, v in SortedPairs( flexlist ) do
if DEADEYE_MEM.Flex then if !madelist[i] then
self:SetValue( DEADEYE_MEM.Flex[ MODEL.Entity:GetFlexName( id ) ] ) local id = MODEL.Entity:GetFlexIDByName( i )
end makeme( id, MODELSETTINGS, MODEL.Entity )
madelist[i] = true
end end
end end
@ -285,7 +401,7 @@ function OpenDeadeye()
BLINKY:SetPos( 4, 4+4+20 ) BLINKY:SetPos( 4, 4+4+20 )
BLINKY.Paint = QUICKDIRT BLINKY.Paint = QUICKDIRT
function BLINKY:PerformLayout( w, h ) function BLINKY:PerformLayout( w, h )
local par = BLINKY:GetParent() local par = SIDE_CHOREO
BLINKY:SetSize( par:GetWide() - 8, par:GetTall() - 20 - 12 ) BLINKY:SetSize( par:GetWide() - 8, par:GetTall() - 20 - 12 )
end end
end end