This commit is contained in:
Steffen Schröder
2014-04-27 14:44:40 +02:00
parent d814f7e983
commit b75946e048
44 changed files with 2461 additions and 1038 deletions

View File

@ -35,7 +35,7 @@ class Mood {
/**
* Create a new Mood Object
*
* @return \FML\Elements\Mood
* @return \FML\Stylesheet\Mood
*/
public static function create() {
$mood = new Mood();
@ -168,7 +168,7 @@ class Mood {
* @return \FML\Stylesheet\Mood
*/
public function setLightBallIntensity($intensity) {
$this->lBall_Intens = (float) $intensity;
$this->lBall_Intensity = (float) $intensity;
return $this;
}
@ -218,7 +218,7 @@ class Mood {
/**
* Set Sky Gradient Scale
*
* @param float $vScale Gradient Scale Scale
* @param float $scale Gradient Scale
* @return \FML\Stylesheet\Mood
*/
public function setSkyGradientScale($scale) {
@ -283,8 +283,8 @@ class Mood {
if ($this->lBall_LinearRgb) {
$moodXml->setAttribute('LBall_LinearRgb', $this->lBall_LinearRgb);
}
if ($this->lBall_Intens) {
$moodXml->setAttribute('LBall_Intens', $this->lBall_Intens);
if ($this->lBall_Intensity) {
$moodXml->setAttribute('LBall_Intens', $this->lBall_Intensity);
}
if ($this->lBall_Radius) {
$moodXml->setAttribute('LBall_Radius', $this->lBall_Radius);

View File

@ -23,27 +23,26 @@ class Style3d {
* Protected Properties
*/
protected $tagName = 'style3d';
protected $id = '';
protected $id = null;
protected $model = self::MODEL_Box;
// TODO: check what happens for negative thickness values + adapt rendering
protected $thickness = null;
protected $color = '';
protected $focusColor = '';
protected $lightColor = '';
protected $focusLightColor = '';
// TODO: check offset value ranges + apapt rendering
protected $yOffset = 0.;
protected $focusYOffset = 0.;
protected $zOffset = 0.;
protected $focusZOffset = 0.;
protected $color = null;
protected $focusColor = null;
protected $lightColor = null;
protected $focusLightColor = null;
protected $yOffset = null;
protected $focusYOffset = null;
protected $zOffset = null;
protected $focusZOffset = null;
/**
* Create a new Style3d Object
*
* @return \FML\Elements\Style3d
* @param string $id (optional) Style Id
* @return \FML\Stylesheet\Style3d
*/
public static function create() {
$style3d = new Style3d();
public static function create($id = null) {
$style3d = new Style3d($id);
return $style3d;
}
@ -159,7 +158,7 @@ class Style3d {
/**
* Set Y-Offset
*
* @param flaot $yOffset Y-Offset
* @param float $yOffset Y-Offset
* @return \FML\Stylesheet\Style3d
*/
public function setYOffset($yOffset) {

View File

@ -20,7 +20,7 @@ class Stylesheet {
/**
* Create a new Stylesheet Object
*
* @return \FML\Elements\Stylesheet
* @return \FML\Stylesheet\Stylesheet
*/
public static function create() {
$stylesheet = new Stylesheet();
@ -37,7 +37,7 @@ class Stylesheet {
* Add a new Style3d
*
* @param Style3d $style3d The Style3d to add
* @return \FML\Stylesheet\Frame3dStyles
* @return \FML\Stylesheet\Stylesheet
*/
public function addStyle3d(Style3d $style3d) {
if (!in_array($style3d, $this->styles3d, true)) {
@ -49,7 +49,7 @@ class Stylesheet {
/**
* Remove all Styles
*
* @return \FML\Stylesheet\Frame3dStyles
* @return \FML\Stylesheet\Stylesheet
*/
public function removeStyles() {
$this->styles3d = array();