@@ -71,10 +71,10 @@ discard block |
||
71 | 71 | ++$x; |
72 | 72 | } |
73 | 73 | // mean value for each color |
74 | - $mean_red = \array_sum($all_red) / 64; |
|
75 | - $mean_green = \array_sum($all_green) / 64; |
|
76 | - $mean_blue = \array_sum($all_blue) / 64; |
|
77 | - $this->meanAlpha = \array_sum($all_alpha) / 64; |
|
74 | + $mean_red = \array_sum($all_red)/64; |
|
75 | + $mean_green = \array_sum($all_green)/64; |
|
76 | + $mean_blue = \array_sum($all_blue)/64; |
|
77 | + $this->meanAlpha = \array_sum($all_alpha)/64; |
|
78 | 78 | // Arrays deviation |
79 | 79 | $devs_red = []; |
80 | 80 | $devs_green = []; |
@@ -87,9 +87,9 @@ discard block |
||
87 | 87 | ++$i; |
88 | 88 | } |
89 | 89 | // stddev for each color |
90 | - $this->redStdDev = \sqrt(\array_sum($devs_red) / 64); |
|
91 | - $this->greenStdDev = \sqrt(\array_sum($devs_green) / 64); |
|
92 | - $this->blueStdDev = \sqrt(\array_sum($devs_blue) / 64); |
|
90 | + $this->redStdDev = \sqrt(\array_sum($devs_red)/64); |
|
91 | + $this->greenStdDev = \sqrt(\array_sum($devs_green)/64); |
|
92 | + $this->blueStdDev = \sqrt(\array_sum($devs_blue)/64); |
|
93 | 93 | } |
94 | 94 | |
95 | 95 | /** |
@@ -45,48 +45,48 @@ discard block |
||
45 | 45 | } |
46 | 46 | |
47 | 47 | $image = \imagecreatefrompng($this->skinPath); |
48 | - $scale = $skin_height / 32; |
|
48 | + $scale = $skin_height/32; |
|
49 | 49 | if ($scale === 0) { |
50 | 50 | $scale = 1; |
51 | 51 | } |
52 | - $this->imgResource = \imagecreatetruecolor(16 * $scale, 32 * $scale); |
|
52 | + $this->imgResource = \imagecreatetruecolor(16*$scale, 32*$scale); |
|
53 | 53 | if ($this->imgResource === false) { |
54 | 54 | throw new ImageResourceCreationFailedException('imagecreatetruecolor() failed'); |
55 | 55 | } |
56 | 56 | \imagealphablending($this->imgResource, false); |
57 | 57 | \imagesavealpha($this->imgResource, true); |
58 | 58 | $transparent = \imagecolorallocatealpha($this->imgResource, 255, 255, 255, 127); |
59 | - \imagefilledrectangle($this->imgResource, 0, 0, 16 * $scale, 32 * $scale, $transparent); |
|
59 | + \imagefilledrectangle($this->imgResource, 0, 0, 16*$scale, 32*$scale, $transparent); |
|
60 | 60 | |
61 | 61 | $tmpAvatar = new Avatar($this->skinPath); |
62 | 62 | $tmpAvatar->renderAvatar(8, $type); |
63 | 63 | // Front |
64 | 64 | if ($type === 'F') { |
65 | 65 | // Head |
66 | - \imagecopyresized($this->imgResource, $tmpAvatar->getResource(), 4 * $scale, 0 * $scale, 0, 0, 8 * $scale, 8 * $scale, 8, 8); |
|
66 | + \imagecopyresized($this->imgResource, $tmpAvatar->getResource(), 4*$scale, 0*$scale, 0, 0, 8*$scale, 8*$scale, 8, 8); |
|
67 | 67 | // Body Front |
68 | - \imagecopyresized($this->imgResource, $image, 4 * $scale, 8 * $scale, 20, 20, 8 * $scale, 12 * $scale, 8, 12); |
|
68 | + \imagecopyresized($this->imgResource, $image, 4*$scale, 8*$scale, 20, 20, 8*$scale, 12*$scale, 8, 12); |
|
69 | 69 | // Right Arm (left on img) |
70 | 70 | $r_arm = \imagecreatetruecolor(4, 12); |
71 | 71 | \imagecopy($r_arm, $image, 0, 0, 44, 20, 4, 12); |
72 | - \imagecopyresized($this->imgResource, $r_arm, 0 * $scale, 8 * $scale, 0, 0, 4 * $scale, 12 * $scale, 4, 12); |
|
72 | + \imagecopyresized($this->imgResource, $r_arm, 0*$scale, 8*$scale, 0, 0, 4*$scale, 12*$scale, 4, 12); |
|
73 | 73 | // Right leg (left on img) |
74 | 74 | $r_leg = \imagecreatetruecolor(4, 20); |
75 | 75 | \imagecopy($r_leg, $image, 0, 0, 4, 20, 4, 12); |
76 | - \imagecopyresized($this->imgResource, $r_leg, 4 * $scale, 20 * $scale, 0, 0, 4 * $scale, 12 * $scale, 4, 12); |
|
76 | + \imagecopyresized($this->imgResource, $r_leg, 4*$scale, 20*$scale, 0, 0, 4*$scale, 12*$scale, 4, 12); |
|
77 | 77 | } else { |
78 | 78 | // Head |
79 | - \imagecopyresized($this->imgResource, $tmpAvatar->getResource(), 4 * $scale, 0 * $scale, 0, 0, 8 * $scale, 8 * $scale, 8, 8); |
|
79 | + \imagecopyresized($this->imgResource, $tmpAvatar->getResource(), 4*$scale, 0*$scale, 0, 0, 8*$scale, 8*$scale, 8, 8); |
|
80 | 80 | // Body Back |
81 | - \imagecopyresized($this->imgResource, $image, 4 * $scale, 8 * $scale, 32, 20, 8 * $scale, 12 * $scale, 8, 12); |
|
81 | + \imagecopyresized($this->imgResource, $image, 4*$scale, 8*$scale, 32, 20, 8*$scale, 12*$scale, 8, 12); |
|
82 | 82 | // Right Arm Back (left on img) |
83 | 83 | $r_arm = \imagecreatetruecolor(4, 12); |
84 | 84 | \imagecopy($r_arm, $image, 0, 0, 52, 20, 4, 12); |
85 | - \imagecopyresized($this->imgResource, $r_arm, 0 * $scale, 8 * $scale, 0, 0, 4 * $scale, 12 * $scale, 4, 12); |
|
85 | + \imagecopyresized($this->imgResource, $r_arm, 0*$scale, 8*$scale, 0, 0, 4*$scale, 12*$scale, 4, 12); |
|
86 | 86 | // Right leg Back (left on img) |
87 | 87 | $r_leg = \imagecreatetruecolor(4, 20); |
88 | 88 | \imagecopy($r_leg, $image, 0, 0, 12, 20, 4, 12); |
89 | - \imagecopyresized($this->imgResource, $r_leg, 4 * $scale, 20 * $scale, 0, 0, 4 * $scale, 12 * $scale, 4, 12); |
|
89 | + \imagecopyresized($this->imgResource, $r_leg, 4*$scale, 20*$scale, 0, 0, 4*$scale, 12*$scale, 4, 12); |
|
90 | 90 | } |
91 | 91 | |
92 | 92 | // Left Arm (right flipped) |
@@ -94,12 +94,12 @@ discard block |
||
94 | 94 | for ($x = 0; $x < 4; ++$x) { |
95 | 95 | \imagecopy($l_arm, $r_arm, $x, 0, 4 - $x - 1, 0, 1, 12); |
96 | 96 | } |
97 | - \imagecopyresized($this->imgResource, $l_arm, 12 * $scale, 8 * $scale, 0, 0, 4 * $scale, 12 * $scale, 4, 12); |
|
97 | + \imagecopyresized($this->imgResource, $l_arm, 12*$scale, 8*$scale, 0, 0, 4*$scale, 12*$scale, 4, 12); |
|
98 | 98 | // Left leg (right flipped) |
99 | 99 | $l_leg = \imagecreatetruecolor(4, 20); |
100 | 100 | for ($x = 0; $x < 4; ++$x) { |
101 | 101 | \imagecopy($l_leg, $r_leg, $x, 0, 4 - $x - 1, 0, 1, 20); |
102 | 102 | } |
103 | - \imagecopyresized($this->imgResource, $l_leg, 8 * $scale, 20 * $scale, 0, 0, 4 * $scale, 12 * $scale, 4, 12); |
|
103 | + \imagecopyresized($this->imgResource, $l_leg, 8*$scale, 20*$scale, 0, 0, 4*$scale, 12*$scale, 4, 12); |
|
104 | 104 | } |
105 | 105 | } |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | /** |
18 | 18 | * Cosine PI/6. |
19 | 19 | */ |
20 | - private const COSINE_PI_6 = M_SQRT3 / 2; |
|
20 | + private const COSINE_PI_6 = M_SQRT3/2; |
|
21 | 21 | |
22 | 22 | /** |
23 | 23 | * Base size (all requests must be <=). |
@@ -133,8 +133,8 @@ discard block |
||
133 | 133 | */ |
134 | 134 | private function getFrontPoints($size = self::HEAD_BASE_SIZE): array |
135 | 135 | { |
136 | - $cosine_result = \round(self::COSINE_PI_6 * $size); |
|
137 | - $half_size = \round($size / 2); |
|
136 | + $cosine_result = \round(self::COSINE_PI_6*$size); |
|
137 | + $half_size = \round($size/2); |
|
138 | 138 | |
139 | 139 | return [ |
140 | 140 | 0, 0, 0, 0, |
@@ -152,8 +152,8 @@ discard block |
||
152 | 152 | */ |
153 | 153 | private function getTopPoints($size = self::HEAD_BASE_SIZE) |
154 | 154 | { |
155 | - $cosine_result = \round(self::COSINE_PI_6 * $size); |
|
156 | - $half_size = \round($size / 2); |
|
155 | + $cosine_result = \round(self::COSINE_PI_6*$size); |
|
156 | + $half_size = \round($size/2); |
|
157 | 157 | |
158 | 158 | return [ |
159 | 159 | 0, $size, 0, 0, |
@@ -171,8 +171,8 @@ discard block |
||
171 | 171 | */ |
172 | 172 | private function getRightPoints($size = self::HEAD_BASE_SIZE) |
173 | 173 | { |
174 | - $cosine_result = \round(self::COSINE_PI_6 * $size); |
|
175 | - $half_size = \round($size / 2); |
|
174 | + $cosine_result = \round(self::COSINE_PI_6*$size); |
|
175 | + $half_size = \round($size/2); |
|
176 | 176 | |
177 | 177 | return [ |
178 | 178 | $size, 0, 0, 0, |
@@ -244,16 +244,16 @@ discard block |
||
244 | 244 | ); |
245 | 245 | |
246 | 246 | // Head image |
247 | - $doubleAvatarSize = self::HEAD_BASE_SIZE * 2; |
|
248 | - $finalImageSize = $doubleAvatarSize + (self::HEAD_MARGIN * 2); |
|
247 | + $doubleAvatarSize = self::HEAD_BASE_SIZE*2; |
|
248 | + $finalImageSize = $doubleAvatarSize + (self::HEAD_MARGIN*2); |
|
249 | 249 | |
250 | 250 | $this->head = new \Imagick(); |
251 | 251 | $this->head->newImage($finalImageSize, $finalImageSize, $this->getImagickPixelTransparent()); |
252 | 252 | |
253 | 253 | // This is weird, but it works |
254 | - $faceX = ((int) \round(($doubleAvatarSize / 2))) - 2 + self::HEAD_MARGIN; |
|
255 | - $faceY = $rightY = ((int) \round($doubleAvatarSize / 4)) - 1 + self::HEAD_MARGIN; |
|
256 | - $topX = $rightX = ((int) \round($doubleAvatarSize / 16)) + self::HEAD_MARGIN; |
|
254 | + $faceX = ((int) \round(($doubleAvatarSize/2))) - 2 + self::HEAD_MARGIN; |
|
255 | + $faceY = $rightY = ((int) \round($doubleAvatarSize/4)) - 1 + self::HEAD_MARGIN; |
|
256 | + $topX = $rightX = ((int) \round($doubleAvatarSize/16)) + self::HEAD_MARGIN; |
|
257 | 257 | $topY = -1 + self::HEAD_MARGIN; |
258 | 258 | |
259 | 259 | // Add Face Section |