FML Update

2014-07-03 22:34:47 +02:00
parent edd62f0eb4
commit 8b3667b252
75 changed files with 392 additions and 370 deletions
--- a/application/core/Libs/FML/Stylesheet/Mood.php
+++ b/application/core/Libs/FML/Stylesheet/Mood.php
@ -35,7 +35,7 @@ class Mood {
 	/**
 	 * Create a new Mood object
 	 *
-	 * @return \FML\Stylesheet\Mood|static
+	 * @return static
 	 */
 	public static function create() {
 		return new static();
@ -47,7 +47,7 @@ class Mood {
 	 * @param float $red   Red color value
 	 * @param float $green Green color value
 	 * @param float $blue  Blue color value
-	 * @return \FML\Stylesheet\Mood|static
+	 * @return static
 	 */
 	public function setLightAmbientColor($red, $green, $blue) {
 		$this->lAmbient_LinearRgb = floatval($red) . ' ' . floatval($green) . ' ' . floatval($blue);
@ -60,7 +60,7 @@ class Mood {
 	 * @param float $red   Red color value
 	 * @param float $green Green color value
 	 * @param float $blue  Blue color value
-	 * @return \FML\Stylesheet\Mood|static
+	 * @return static
 	 */
 	public function setCloudsColorMin($red, $green, $blue) {
 		$this->cloudsRgbMinLinear = floatval($red) . ' ' . floatval($green) . ' ' . floatval($blue);
@ -73,7 +73,7 @@ class Mood {
 	 * @param float $red   Red color value
 	 * @param float $green Green color value
 	 * @param float $blue  Blue color value
-	 * @return \FML\Stylesheet\Mood|static
+	 * @return static
 	 */
 	public function setCloudsColorMax($red, $green, $blue) {
 		$this->cloudsRgbMaxLinear = floatval($red) . ' ' . floatval($green) . ' ' . floatval($blue);
@ -86,7 +86,7 @@ class Mood {
 	 * @param float $red   Red color value
 	 * @param float $green Green color value
 	 * @param float $blue  Blue color value
-	 * @return \FML\Stylesheet\Mood|static
+	 * @return static
 	 */
 	public function setLight0Color($red, $green, $blue) {
 		$this->lDir0_LinearRgb = floatval($red) . ' ' . floatval($green) . ' ' . floatval($blue);
@ -97,7 +97,7 @@ class Mood {
 	 * Set intensity of light source 0
 	 *
 	 * @param float $intensity Light intensity
-	 * @return \FML\Stylesheet\Mood|static
+	 * @return static
 	 */
 	public function setLight0Intensity($intensity) {
 		$this->lDir0_Intens = (float)$intensity;
@ -108,7 +108,7 @@ class Mood {
 	 * Set phi angle of light source 0
 	 *
 	 * @param float $phiAngle Phi angle
-	 * @return \FML\Stylesheet\Mood|static
+	 * @return static
 	 */
 	public function setLight0PhiAngle($phiAngle) {
 		$this->lDir0_DirPhi = (float)$phiAngle;
@ -119,7 +119,7 @@ class Mood {
 	 * Set theta angle of light source 0
 	 *
 	 * @param float $thetaAngle Theta angle
-	 * @return \FML\Stylesheet\Mood|static
+	 * @return static
 	 */
 	public function setLight0ThetaAngle($thetaAngle) {
 		$this->lDir0_DirTheta = (float)$thetaAngle;
@ -132,7 +132,7 @@ class Mood {
 	 * @param float $red   Red color value
 	 * @param float $green Green color value
 	 * @param float $blue  Blue color value
-	 * @return \FML\Stylesheet\Mood|static
+	 * @return static
 	 */
 	public function setLightBallColor($red, $green, $blue) {
 		$this->lBall_LinearRgb = floatval($red) . ' ' . floatval($green) . ' ' . floatval($blue);
@ -143,7 +143,7 @@ class Mood {
 	 * Set light ball intensity
 	 *
 	 * @param float $intensity Light ball intensity
-	 * @return \FML\Stylesheet\Mood|static
+	 * @return static
 	 */
 	public function setLightBallIntensity($intensity) {
 		$this->lBall_Intensity = (float)$intensity;
@ -154,7 +154,7 @@ class Mood {
 	 * Set light ball radius
 	 *
 	 * @param float $radius Light ball radius
-	 * @return \FML\Stylesheet\Mood|static
+	 * @return static
 	 */
 	public function setLightBallRadius($radius) {
 		$this->lBall_Radius = (float)$radius;
@ -167,7 +167,7 @@ class Mood {
 	 * @param float $red   Red color value
 	 * @param float $green Green color value
 	 * @param float $blue  Blue color value
-	 * @return \FML\Stylesheet\Mood|static
+	 * @return static
 	 */
 	public function setFogColor($red, $green, $blue) {
 		$this->fogColorSrgb = floatval($red) . ' ' . floatval($green) . ' ' . floatval($blue);
@ -180,7 +180,7 @@ class Mood {
 	 * @param float $red   Red color value
 	 * @param float $green Green color value
 	 * @param float $blue  Blue color value
-	 * @return \FML\Stylesheet\Mood|static
+	 * @return static
 	 */
 	public function setSelfIllumColor($red, $green, $blue) {
 		$this->selfIllumColor = floatval($red) . ' ' . floatval($green) . ' ' . floatval($blue);
@ -191,7 +191,7 @@ class Mood {
 	 * Set sky gradient scale
 	 *
 	 * @param float $scale Gradient scale
-	 * @return \FML\Stylesheet\Mood|static
+	 * @return static
 	 */
 	public function setSkyGradientScale($scale) {
 		$this->skyGradientV_Scale = (float)$scale;
@ -203,7 +203,7 @@ class Mood {
 	 *
 	 * @param float  $gradientX Scale value
 	 * @param string $color     Gradient color
-	 * @return \FML\Stylesheet\Mood|static
+	 * @return static
 	 */
 	public function addSkyGradientKey($gradientX, $color) {
 		$gradientX   = (float)$gradientX;
@ -216,7 +216,7 @@ class Mood {
 	/**
 	 * Remove all sky gradient keys
 	 *
-	 * @return \FML\Stylesheet\Mood|static
+	 * @return static
 	 */
 	public function removeSkyGradientKeys() {
 		$this->skyGradientKeys = array();
--- a/application/core/Libs/FML/Stylesheet/Style3d.php
+++ b/application/core/Libs/FML/Stylesheet/Style3d.php
@ -41,7 +41,7 @@ class Style3d {
 	 * Create a new Style3d object
 	 *
 	 * @param string $styleId (optional) Style id
-	 * @return \FML\Stylesheet\Style3d|static
+	 * @return static
 	 */
 	public static function create($styleId = null) {
 		return new static($styleId);
@ -62,7 +62,7 @@ class Style3d {
 	 * Set style id
 	 *
 	 * @param string $styleId Style id
-	 * @return \FML\Stylesheet\Style3d|static
+	 * @return static
 	 */
 	public function setId($styleId) {
 		$this->styleId = (string)$styleId;
@ -72,7 +72,7 @@ class Style3d {
 	/**
 	 * Check for id and assign one if necessary
 	 *
-	 * @return \FML\Stylesheet\Style3d|static
+	 * @return static
 	 */
 	public function checkId() {
 		if (!$this->styleId) {
@ -94,7 +94,7 @@ class Style3d {
 	 * Set model
 	 *
 	 * @param string $model Style model
-	 * @return \FML\Stylesheet\Style3d|static
+	 * @return static
 	 */
 	public function setModel($model) {
 		$this->model = (string)$model;
@ -105,7 +105,7 @@ class Style3d {
 	 * Set thickness
 	 *
 	 * @param float $thickness Style thickness
-	 * @return \FML\Stylesheet\Style3d|static
+	 * @return static
 	 */
 	public function setThickness($thickness) {
 		$this->thickness = (float)$thickness;
@ -116,7 +116,7 @@ class Style3d {
 	 * Set color
 	 *
 	 * @param string $color Style color
-	 * @return \FML\Stylesheet\Style3d|static
+	 * @return static
 	 */
 	public function setColor($color) {
 		$this->color = (string)$color;
@ -127,7 +127,7 @@ class Style3d {
 	 * Set focus color
 	 *
 	 * @param string $focusColor Style focus color
-	 * @return \FML\Stylesheet\Style3d|static
+	 * @return static
 	 */
 	public function setFocusColor($focusColor) {
 		$this->focusColor = (string)$focusColor;
@ -138,7 +138,7 @@ class Style3d {
 	 * Set light color
 	 *
 	 * @param string $lightColor Light color
-	 * @return \FML\Stylesheet\Style3d|static
+	 * @return static
 	 */
 	public function setLightColor($lightColor) {
 		$this->lightColor = (string)$lightColor;
@ -149,7 +149,7 @@ class Style3d {
 	 * Set focus light color
 	 *
 	 * @param string $focusLightColor Focus light color
-	 * @return \FML\Stylesheet\Style3d|static
+	 * @return static
 	 */
 	public function setFocusLightColor($focusLightColor) {
 		$this->focusLightColor = (string)$focusLightColor;
@ -160,7 +160,7 @@ class Style3d {
 	 * Set Y-offset
 	 *
 	 * @param float $yOffset Y-offset
-	 * @return \FML\Stylesheet\Style3d|static
+	 * @return static
 	 */
 	public function setYOffset($yOffset) {
 		$this->yOffset = (float)$yOffset;
@ -171,7 +171,7 @@ class Style3d {
 	 * Set focus Y-offset
 	 *
 	 * @param float $focusYOffset Focus Y-offset
-	 * @return \FML\Stylesheet\Style3d|static
+	 * @return static
 	 */
 	public function setFocusYOffset($focusYOffset) {
 		$this->focusYOffset = (float)$focusYOffset;
@ -182,7 +182,7 @@ class Style3d {
 	 * Set Z-offset
 	 *
 	 * @param float $zOffset Z-offset
-	 * @return \FML\Stylesheet\Style3d|static
+	 * @return static
 	 */
 	public function setZOffset($zOffset) {
 		$this->zOffset = (float)$zOffset;
@ -193,7 +193,7 @@ class Style3d {
 	 * Set focus Z-offset
 	 *
 	 * @param float $focusZOffset Focus Z-offset
-	 * @return \FML\Stylesheet\Style3d|static
+	 * @return static
 	 */
 	public function setFocusZOffset($focusZOffset) {
 		$this->focusZOffset = (float)$focusZOffset;
--- a/application/core/Libs/FML/Stylesheet/Stylesheet.php
+++ b/application/core/Libs/FML/Stylesheet/Stylesheet.php
@ -22,7 +22,7 @@ class Stylesheet {
 	/**
 	 * Create a new Stylesheet object
 	 *
-	 * @return \FML\Stylesheet\Stylesheet|static
+	 * @return static
 	 */
 	public static function create() {
 		return new static();
@ -32,7 +32,7 @@ class Stylesheet {
 	 * Add a new Style3d
 	 *
 	 * @param Style3d $style3d Style3d object
-	 * @return \FML\Stylesheet\Stylesheet|static
+	 * @return static
 	 */
 	public function addStyle3d(Style3d $style3d) {
 		if (!in_array($style3d, $this->styles3d, true)) {
@ -44,7 +44,7 @@ class Stylesheet {
 	/**
 	 * Remove all Style3ds
 	 *
-	 * @return \FML\Stylesheet\Stylesheet|static
+	 * @return static
 	 */
 	public function removeStyles() {
 		$this->styles3d = array();
@ -55,7 +55,7 @@ class Stylesheet {
 	 * Set the Mood object of the Stylesheet
 	 *
 	 * @param Mood $mood Mood object
-	 * @return \FML\Stylesheet\Stylesheet|static
+	 * @return static
 	 */
 	public function setMood(Mood $mood) {
 		$this->mood = $mood;