From 1b5f0b0249f855a404e21f2f7560018a99e723bd Mon Sep 17 00:00:00 2001 From: Ruben Date: Sat, 17 Sep 2016 18:17:03 +0100 Subject: [PATCH] Add new expression vars --- src/Models/Hit.php | 92 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 91 insertions(+), 1 deletion(-) diff --git a/src/Models/Hit.php b/src/Models/Hit.php index e0bcca7..030cd76 100644 --- a/src/Models/Hit.php +++ b/src/Models/Hit.php @@ -486,7 +486,7 @@ class Expressions { * @JMS\Exclude * @var array */ - public static $EXPRESSIONS = ['roll','pitch','yaw','inter_ocular_distance','mouth_open','lip_press','brow_raise','nose_wrinkler','lip_depressor','brow_furrow','attention','smile','inner_brow_raiser','chin_raiser','smirk','lip_suck','upper_lip_raiser','lip_pucker','eye_closure','engagement','valence']; + public static $EXPRESSIONS = ['roll','pitch','yaw','inter_ocular_distance','mouth_open','lip_press','brow_raise','nose_wrinkler','lip_depressor','brow_furrow','attention','smile','inner_brow_raiser','chin_raiser','smirk','lip_suck','upper_lip_raiser','lip_pucker','eye_closure','engagement','valence','dimpler','cheek_raise','eye_widen','jaw_drop','lid_tighten','lip_stretch']; /** @@ -509,6 +509,12 @@ class Expressions { 'upper_lip_raiser' => 'raise your upper lip', 'lip_pucker' => 'pucker your lip', 'eye_closure' => 'close your eyes', + 'dimpler' => 'pull your lip corners inward', + 'cheek_raise' => 'raise your cheek', + 'eye_widen' => 'widen your eyes', + 'jaw_drop' => 'drop your jaw', + 'lid_tighten' => 'tighten your eye lids', + 'lip_stretch' => 'stretch your lip', ]; @@ -620,6 +626,36 @@ class Expressions { * @ORM\Column(type="float") */ private $valence; + /** + * @var float 'Expression' parameter + * @ORM\Column(type="float") + */ + private $dimpler; + /** + * @var float 'Expression' parameter + * @ORM\Column(type="float") + */ + private $cheek_raise; + /** + * @var float 'Expression' parameter + * @ORM\Column(type="float") + */ + private $eye_widen; + /** + * @var float 'Expression' parameter + * @ORM\Column(type="float") + */ + private $jaw_drop; + /** + * @var float 'Expression' parameter + * @ORM\Column(type="float") + */ + private $lid_tighten; + /** + * @var float 'Expression' parameter + * @ORM\Column(type="float") + */ + private $lip_stretch; /** * Gets the value of roll. @@ -830,6 +866,60 @@ class Expressions { { return $this->valence; } + /** + * Gets the value of dimpler. + * + * @return float 'Expression' parameter + */ + public function getDimpler() + { + return $this->dimpler; + } + /** + * Gets the value of cheek_raise. + * + * @return float 'Expression' parameter + */ + public function getCheekRaise() + { + return $this->cheek_raise; + } + /** + * Gets the value of eye_widen. + * + * @return float 'Expression' parameter + */ + public function getEyeWiden() + { + return $this->eye_widen; + } + /** + * Gets the value of jaw_drop. + * + * @return float 'Expression' parameter + */ + public function getJawDrop() + { + return $this->jaw_drop; + } + /** + * Gets the value of lid_tighten. + * + * @return float 'Expression' parameter + */ + public function getLidTighten() + { + return $this->lid_tighten; + } + /** + * Gets the value of lip_stretch. + * + * @return float 'Expression' parameter + */ + public function getLipStretch() + { + return $this->lip_stretch; + } public function setExpression(string $expression, float $value) { $expressions = static::$EXPRESSIONS;