From f8c30a02ae0724a5d63451e815276739ecdda319 Mon Sep 17 00:00:00 2001
From: yuanjiajia <1139393632@qq.com>
Date: Wed, 16 Feb 2022 18:04:07 +0800
Subject: [PATCH] =?UTF-8?q?=E2=80=9Cfile=E2=80=9D=E3=80=81=E2=80=9Ceffect?=
 =?UTF-8?q?=E2=80=9D=E4=B8=A4=E4=B8=AA=E7=9B=AE=E5=BD=95=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E5=88=B0=E2=80=9Cscene=E2=80=9D=E7=9B=AE=E5=BD=95=E4=B8=8B?=
 =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E4=BA=86=E2=80=9CPhotonGI=E2=80=9D?=
 =?UTF-8?q?=E3=80=81=E2=80=9CIndirect=E2=80=9D=E3=80=81=E2=80=9CCaustic?=
 =?UTF-8?q?=E2=80=9D=E4=B8=89=E4=B8=AA=E5=85=B3=E4=BA=8E=E5=85=A8=E5=B1=80?=
 =?UTF-8?q?=E5=85=89=E7=BC=93=E5=AD=98=E7=9A=84=E7=B1=BB=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=BA=86=E2=80=9Cpath=E2=80=9D?=
 =?UTF-8?q?=E3=80=81=E2=80=9Cfilm=E2=80=9D=E3=80=81=E2=80=9Cprint=E2=80=9D?=
 =?UTF-8?q?=E4=B8=89=E4=B8=AA=E7=B1=BB=E6=96=87=E4=BB=B6,=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E6=9C=89=E9=83=A8=E5=88=86=E6=96=87=E4=BB=B6=E6=9C=89?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/print.php                            |  2 -
 src/scene/BaseCfg.php                         |  3 +-
 src/scene/Caustic.php                         | 46 +++++++++++++++++
 src/scene/Film.php                            |  2 -
 src/scene/Indirect.php                        | 41 +++++++++++++++
 src/scene/Path.php                            |  8 +++
 src/scene/PhotonGI.php                        | 51 +++++++++++++++++++
 .../effect/AnalogFilmSimulation.php           |  2 +-
 src/{ => scene}/effect/BackgroundImg.php      |  4 +-
 src/{ => scene}/effect/Bloom.php              |  2 +-
 src/{ => scene}/effect/CammaCorrection.php    |  2 +-
 src/{ => scene}/effect/ColorAberration.php    |  2 +-
 src/{ => scene}/effect/ColorLUT.php           |  2 +-
 .../effect/IrradianceContourLines.php         |  6 +--
 src/scene/effect/LightInformation.php         | 41 +++++++++++++++
 src/{ => scene}/effect/Mist.php               |  4 +-
 src/{ => scene}/effect/NoiseReducerBCD.php    |  2 +-
 src/{ => scene}/effect/NoiseReducerOIDN.php   |  2 +-
 src/{ => scene}/effect/Pretreatment.php       |  2 +-
 src/{ => scene}/effect/Synthesis.php          |  2 +-
 src/{ => scene}/effect/ToneMapAutoLinear.php  |  2 +-
 src/{ => scene}/effect/ToneMapCamera.php      |  2 +-
 src/{ => scene}/effect/ToneMapLinear.php      |  2 +-
 src/{ => scene}/effect/ToneMapReinhard.php    |  2 +-
 src/{ => scene}/effect/Vignetting.php         |  2 +-
 src/{ => scene}/effect/WhiteBalance.php       |  2 +-
 src/{ => scene}/file/ImageSaverBase.php       | 44 +++++++++++++++-
 src/{ => scene}/file/ImageSaverNumber.php     |  2 +-
 28 files changed, 254 insertions(+), 30 deletions(-)
 create mode 100644 src/scene/Caustic.php
 create mode 100644 src/scene/Indirect.php
 create mode 100644 src/scene/PhotonGI.php
 rename src/{ => scene}/effect/AnalogFilmSimulation.php (98%)
 rename src/{ => scene}/effect/BackgroundImg.php (79%)
 rename src/{ => scene}/effect/Bloom.php (91%)
 rename src/{ => scene}/effect/CammaCorrection.php (89%)
 rename src/{ => scene}/effect/ColorAberration.php (90%)
 rename src/{ => scene}/effect/ColorLUT.php (91%)
 rename src/{ => scene}/effect/IrradianceContourLines.php (74%)
 create mode 100644 src/scene/effect/LightInformation.php
 rename src/{ => scene}/effect/Mist.php (92%)
 rename src/{ => scene}/effect/NoiseReducerBCD.php (95%)
 rename src/{ => scene}/effect/NoiseReducerOIDN.php (92%)
 rename src/{ => scene}/effect/Pretreatment.php (93%)
 rename src/{ => scene}/effect/Synthesis.php (90%)
 rename src/{ => scene}/effect/ToneMapAutoLinear.php (86%)
 rename src/{ => scene}/effect/ToneMapCamera.php (94%)
 rename src/{ => scene}/effect/ToneMapLinear.php (89%)
 rename src/{ => scene}/effect/ToneMapReinhard.php (94%)
 rename src/{ => scene}/effect/Vignetting.php (89%)
 rename src/{ => scene}/effect/WhiteBalance.php (93%)
 rename src/{ => scene}/file/ImageSaverBase.php (60%)
 rename src/{ => scene}/file/ImageSaverNumber.php (95%)

diff --git a/examples/print.php b/examples/print.php
index 43098d1..cf206de 100644
--- a/examples/print.php
+++ b/examples/print.php
@@ -4,8 +4,6 @@
 
 namespace Blobt\Luxcore\scene;
 include dirname(dirname(__FILE__)) . "/vendor/autoload.php";
-use Blobt\Luxcore\file;
-use Blobt\Luxcore\effect;
 
 
 //设置打印 渲染引擎 的配置参数
diff --git a/src/scene/BaseCfg.php b/src/scene/BaseCfg.php
index 18fa600..10f413f 100644
--- a/src/scene/BaseCfg.php
+++ b/src/scene/BaseCfg.php
@@ -53,7 +53,8 @@ class BaseCfg extends Base
             $value = $item->getValue($this);
             if (is_string($value))
             {
-                if( count(explode(" ", $value)) != 3  || in_array(false,array_map('is_numeric',explode(" ", $value))) )
+                if( count(explode(" ", $value)) != 3  
+                || in_array(false,array_map('is_numeric',explode(" ", $value))) )
                 {
                     $ret .= "{$className}.{$name} = \"{$value}\"\n";
                 }
diff --git a/src/scene/Caustic.php b/src/scene/Caustic.php
new file mode 100644
index 0000000..a784a91
--- /dev/null
+++ b/src/scene/Caustic.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Blobt\Luxcore\scene;
+use Blobt\Luxcore\core\Base;
+
+class Caustic extends BaseCfg
+{
+
+    /**
+     * @var bool 是否打开本类的参数控制（默认：false）
+     */
+    public $enabled = false;
+
+    /**
+     * @var integer TODO：最大尺寸（百万）,具体作用尚未明确（默认取值：100000）
+     */
+    public $maxsize = 100000;
+
+    /**
+     * @var float 查找半径大小，单位跟系统，取值为0表是自动给出查找半径，大于0的值表示查找半径大小，（取值：大于0的小数）
+     */
+    public $lookupRadius = 0.075;
+
+    /**
+     * @var float 弧度，（取值：0-90的小数）
+     */
+    public $lookupNormalangle = 90;
+    
+    /**
+     * @var integer TODO:样本步骤，具体作用尚未明确，当取值为0时，将关闭本身及其下面两个参数控制（取值：大于等于0的整数）
+     */
+    public $updatespp = 8;
+
+    /**
+     * @var float TODO:半径缩减百分比,具体作用尚未明确，（取值：0.7-0.99的小数）
+     */
+    public $updatesppRadiusreduction = 0.96;
+    
+    /**
+     * @var float TODO:最小半径,具体作用尚未明确，（取值：大于0的小数）
+     */
+    public $updatesppMinradius = 0.003;
+
+}
+
+?>
diff --git a/src/scene/Film.php b/src/scene/Film.php
index e93eb13..9518384 100644
--- a/src/scene/Film.php
+++ b/src/scene/Film.php
@@ -2,8 +2,6 @@
 
 namespace Blobt\Luxcore\scene;
 use Blobt\Luxcore\core\Base;
-use Blobt\Luxcore\file;
-use Blobt\Luxcore\effect;
 
 class Film extends BaseCfg
 {
diff --git a/src/scene/Indirect.php b/src/scene/Indirect.php
new file mode 100644
index 0000000..18b99c6
--- /dev/null
+++ b/src/scene/Indirect.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Blobt\Luxcore\scene;
+use Blobt\Luxcore\core\Base;
+
+class Indirect extends BaseCfg
+{
+
+    /**
+     * @var bool 是否打开本类的参数控制（默认：false）
+     */
+    public $enabled = false;
+
+    /**
+     * @var integer TODO：最大尺寸（百万）,具体作用尚未明确（固定取值：0）
+     */
+    public $maxsize = 0;
+
+    /**
+     * @var float 查找半径大小，单位跟系统，取值为0表是自动给出查找半径，大于0的值表示查找半径大小，（取值：大于0的小数）
+     */
+    public $lookupRadius = 0.15;
+
+    /**
+     * @var float 终止阈值（取值：0-1的小数）
+     */
+    public $haltthreshold = 0.05;
+
+    /**
+     * @var float 采用蛮力计算的距离范围，单位跟随系统（取值：大于0的小数）
+     */
+    public $usagethresholdscale = 10;
+
+    /**
+     * @var float 弧度，（取值：0-90的小数）
+     */
+    public $lookupNormalangle = 90;
+
+}
+
+?>
diff --git a/src/scene/Path.php b/src/scene/Path.php
index 5cb6cd0..a156993 100644
--- a/src/scene/Path.php
+++ b/src/scene/Path.php
@@ -16,6 +16,11 @@ class Path extends BaseCfg
      */
     public $hybridBackforWard;
 
+    /**
+     * @var object 存储一个 GhotonGI类 对象
+     */
+    public $photonGI;
+
 
     
 
@@ -30,6 +35,9 @@ class Path extends BaseCfg
     public $clampingVarianceMaxvalue = 1000;
 
 
+
+    
+
     /**
      * 实例 PathDepth类、HybridBackforWard类的两个对象
      */
diff --git a/src/scene/PhotonGI.php b/src/scene/PhotonGI.php
new file mode 100644
index 0000000..ab1c4c3
--- /dev/null
+++ b/src/scene/PhotonGI.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Blobt\Luxcore\scene;
+use Blobt\Luxcore\core\Base;
+
+class PhotonGI extends BaseCfg
+{
+
+    /**
+     * @var float 最大光子计数，（取值：大于等于1百万）
+     */
+    public $photonMaxcount = 4.7e+07;
+
+    /**
+     * @var integer 光子深度,(取值：3-64的整数)
+     */
+    public $photonMaxdepth = 8;
+
+    /**
+     * @var float 光泽度阈值,(取值：0-1的小数)
+     */
+    public $glossinessusagethreshold = 0.05;
+    
+    /**
+     * @var string 储存光子缓存文件的路径及文件名，如果字符串为空，则表示不储存光子缓存文件
+     */
+    public $persistentFile = '';
+
+    /**
+     * @var object 存储一个 Indirect类 对象
+     */
+    public $indirect;
+
+    /**
+     * @var object 存储一个 Caustic类 对象
+     */    
+    public $caustic;
+
+    /**
+     * 实例 PathDepth类、HybridBackforWard类的两个对象
+     */
+    public function __construct($config = [])
+    {
+        $this->indirect = new Indirect($config);
+        $this->caustic = new Caustic($config);
+        Base::__construct($config);
+    }
+
+}
+
+?>
diff --git a/src/effect/AnalogFilmSimulation.php b/src/scene/effect/AnalogFilmSimulation.php
similarity index 98%
rename from src/effect/AnalogFilmSimulation.php
rename to src/scene/effect/AnalogFilmSimulation.php
index c8ee527..91a4f0e 100644
--- a/src/effect/AnalogFilmSimulation.php
+++ b/src/scene/effect/AnalogFilmSimulation.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Blobt\Luxcore\effect;
+namespace Blobt\Luxcore\scene\effect;
 use Blobt\Luxcore\scene\BaseCfg;
 
 class AnalogFilmSimulation extends BaseCfg
diff --git a/src/effect/BackgroundImg.php b/src/scene/effect/BackgroundImg.php
similarity index 79%
rename from src/effect/BackgroundImg.php
rename to src/scene/effect/BackgroundImg.php
index 43014e3..9be86c5 100644
--- a/src/effect/BackgroundImg.php
+++ b/src/scene/effect/BackgroundImg.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Blobt\Luxcore\effect;
+namespace Blobt\Luxcore\scene\effect;
 use Blobt\Luxcore\scene\BaseCfg;
 
 class BackgroundImg extends BaseCfg
@@ -10,7 +10,7 @@ class BackgroundImg extends BaseCfg
     const TYPE_FLOAT = 'float';
 
     /**
-     * @var string 一种模拟照相机曝光参数的颜色映射，（固定取值：BACKGROUND_IMG）
+     * @var string 添加背景图时的配置参数，（固定取值：BACKGROUND_IMG）
      */
     public $type = "BACKGROUND_IMG";
 
diff --git a/src/effect/Bloom.php b/src/scene/effect/Bloom.php
similarity index 91%
rename from src/effect/Bloom.php
rename to src/scene/effect/Bloom.php
index 4b79e4c..de0e35f 100644
--- a/src/effect/Bloom.php
+++ b/src/scene/effect/Bloom.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Blobt\Luxcore\effect;
+namespace Blobt\Luxcore\scene\effect;
 use Blobt\Luxcore\scene\BaseCfg;
 
 
diff --git a/src/effect/CammaCorrection.php b/src/scene/effect/CammaCorrection.php
similarity index 89%
rename from src/effect/CammaCorrection.php
rename to src/scene/effect/CammaCorrection.php
index 0533e02..20284c6 100644
--- a/src/effect/CammaCorrection.php
+++ b/src/scene/effect/CammaCorrection.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Blobt\Luxcore\effect;
+namespace Blobt\Luxcore\scene\effect;
 use Blobt\Luxcore\scene\BaseCfg;
 
 class CammaCorrection extends BaseCfg
diff --git a/src/effect/ColorAberration.php b/src/scene/effect/ColorAberration.php
similarity index 90%
rename from src/effect/ColorAberration.php
rename to src/scene/effect/ColorAberration.php
index 63bfd03..891f0f2 100644
--- a/src/effect/ColorAberration.php
+++ b/src/scene/effect/ColorAberration.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Blobt\Luxcore\effect;
+namespace Blobt\Luxcore\scene\effect;
 use Blobt\Luxcore\scene\BaseCfg;
 
 class ColorAberration extends BaseCfg
diff --git a/src/effect/ColorLUT.php b/src/scene/effect/ColorLUT.php
similarity index 91%
rename from src/effect/ColorLUT.php
rename to src/scene/effect/ColorLUT.php
index 4dac840..1b2aba5 100644
--- a/src/effect/ColorLUT.php
+++ b/src/scene/effect/ColorLUT.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Blobt\Luxcore\effect;
+namespace Blobt\Luxcore\scene\effect;
 use Blobt\Luxcore\scene\BaseCfg;
 
 class ColorLUT extends BaseCfg
diff --git a/src/effect/IrradianceContourLines.php b/src/scene/effect/IrradianceContourLines.php
similarity index 74%
rename from src/effect/IrradianceContourLines.php
rename to src/scene/effect/IrradianceContourLines.php
index acf9cd9..1d9c429 100644
--- a/src/effect/IrradianceContourLines.php
+++ b/src/scene/effect/IrradianceContourLines.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Blobt\Luxcore\effect;
+namespace Blobt\Luxcore\scene\effect;
 use Blobt\Luxcore\scene\BaseCfg;
 
 class IrradianceContourLines extends BaseCfg
@@ -23,12 +23,12 @@ class IrradianceContourLines extends BaseCfg
     public $scale = 179;
 
     /**
-     * TODO: 具体作用尚未明确，（取值：2-50的整数）
+     * @var integer TODO: 具体作用尚未明确，（取值：2-50的整数）
      */
     public $steps = 8;
 
     /**
-     * TODO: 具体作用尚未明确，（取值：-1-20的整数）
+     * @var integer TODO: 具体作用尚未明确，（取值：-1-20的整数）
      */
     public $zerogridsize = 8;
 }
diff --git a/src/scene/effect/LightInformation.php b/src/scene/effect/LightInformation.php
new file mode 100644
index 0000000..365887f
--- /dev/null
+++ b/src/scene/effect/LightInformation.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Blobt\Luxcore\scene\file;
+use Blobt\Luxcore\scene\BaseCfg;
+
+class LightInformation extends BaseCfg
+{
+
+    /**
+     * 与Light Information(灯光信息)类型图像中的每个类型对应，
+     */
+    const TYPE_EMISSION = 'EMISSION';
+    const TYPE_DIRECT_DIFFUSE = 'DIRECT_DIFFUSE';
+    const TYPE_DIRECT_DIFFUSE_REFLECT = 'DIRECT_DIFFUSE_REFLECT';
+    const TYPE_DIRECT_DIFFUSE_TRANSMIT = 'DIRECT_DIFFUSE_TRANSMIT';
+    const TYPE_DIRECT_GLOSSY = 'DIRECT_GLOSSY';
+    const TYPE_DIRECT_GLOSSY_REFLECT = 'DIRECT_GLOSSY_REFLECT';
+    const TYPE_DIRECT_GLOSSY_TRANSMIT = 'DIRECT_GLOSSY_TRANSMIT';
+    const TYPE_INDIRECT_DIFFUSE = 'INDIRECT_DIFFUSE';
+    const TYPE_INDIRECT_DIFFUSE_REFLECT = 'INDIRECT_DIFFUSE_REFLECT';
+    const TYPE_INDIRECT_DIFFUSE_TRANSMIT = 'INDIRECT_DIFFUSE_TRANSMIT';
+    const TYPE_INDIRECT_GLOSSY = 'INDIRECT_GLOSSY';
+    const TYPE_INDIRECT_GLOSSY_REFLECT = 'INDIRECT_GLOSSY_REFLECT';
+    const TYPE_INDIRECT_GLOSSY_TRANSMIT = 'INDIRECT_GLOSSY_TRANSMIT';
+    const TYPE_INDIRECT_SPECULAR = 'INDIRECT_SPECULAR';
+    const TYPE_INDIRECT_SPECULAR_REFLECT = 'INDIRECT_SPECULAR_REFLECT';
+    const TYPE_INDIRECT_SPECULAR_TRANSMIT = 'INDIRECT_SPECULAR_TRANSMIT';
+    const TYPE_CAUSTIC = 'CAUSTIC';
+
+    /**
+     * @var string 此类参数的开关打开
+     */
+    public $type = 'OUTPUT_SWITCHER';
+    /**
+     * @var string   与Light Information(灯光信息)类型图像中的每个类型对应，
+     */
+    public $channel;
+
+}
+
+?>
diff --git a/src/effect/Mist.php b/src/scene/effect/Mist.php
similarity index 92%
rename from src/effect/Mist.php
rename to src/scene/effect/Mist.php
index 301576a..3e864e0 100644
--- a/src/effect/Mist.php
+++ b/src/scene/effect/Mist.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Blobt\Luxcore\effect;
+namespace Blobt\Luxcore\scene\effect;
 use Blobt\Luxcore\scene\BaseCfg;
 
 class Mist extends BaseCfg
 {
 
     /**
-     * @var string 一种名为 MIST（薄雾） 的特效，（固定取值：BLOOM）
+     * @var string 一种名为 MIST（薄雾） 的特效，（固定取值：MIST）
      */
     public $type = "MIST";
 
diff --git a/src/effect/NoiseReducerBCD.php b/src/scene/effect/NoiseReducerBCD.php
similarity index 95%
rename from src/effect/NoiseReducerBCD.php
rename to src/scene/effect/NoiseReducerBCD.php
index 2c985d7..d917eda 100644
--- a/src/effect/NoiseReducerBCD.php
+++ b/src/scene/effect/NoiseReducerBCD.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Blobt\Luxcore\effect;
+namespace Blobt\Luxcore\scene\effect;
 use Blobt\Luxcore\scene\BaseCfg;
 
 class NoiseReducerBCD extends BaseCfg
diff --git a/src/effect/NoiseReducerOIDN.php b/src/scene/effect/NoiseReducerOIDN.php
similarity index 92%
rename from src/effect/NoiseReducerOIDN.php
rename to src/scene/effect/NoiseReducerOIDN.php
index 8a4d4fa..ba21157 100644
--- a/src/effect/NoiseReducerOIDN.php
+++ b/src/scene/effect/NoiseReducerOIDN.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Blobt\Luxcore\effect;
+namespace Blobt\Luxcore\scene\effect;
 use Blobt\Luxcore\scene\BaseCfg;
 
 class NoiseReducerOIDN extends BaseCfg
diff --git a/src/effect/Pretreatment.php b/src/scene/effect/Pretreatment.php
similarity index 93%
rename from src/effect/Pretreatment.php
rename to src/scene/effect/Pretreatment.php
index 1a1bfe6..813cfe8 100644
--- a/src/effect/Pretreatment.php
+++ b/src/scene/effect/Pretreatment.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Blobt\Luxcore\effect;
+namespace Blobt\Luxcore\scene\effect;
 use Blobt\Luxcore\scene\BaseCfg;
 
 class Pretreatment extends BaseCfg
diff --git a/src/effect/Synthesis.php b/src/scene/effect/Synthesis.php
similarity index 90%
rename from src/effect/Synthesis.php
rename to src/scene/effect/Synthesis.php
index 9f0e944..4ad1fb3 100644
--- a/src/effect/Synthesis.php
+++ b/src/scene/effect/Synthesis.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Blobt\Luxcore\effect;
+namespace Blobt\Luxcore\scene\effect;
 use Blobt\Luxcore\scene\BaseCfg;
 
 class Synthesis extends BaseCfg
diff --git a/src/effect/ToneMapAutoLinear.php b/src/scene/effect/ToneMapAutoLinear.php
similarity index 86%
rename from src/effect/ToneMapAutoLinear.php
rename to src/scene/effect/ToneMapAutoLinear.php
index a6acfc5..e023fb6 100644
--- a/src/effect/ToneMapAutoLinear.php
+++ b/src/scene/effect/ToneMapAutoLinear.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Blobt\Luxcore\effect;
+namespace Blobt\Luxcore\scene\effect;
 use Blobt\Luxcore\scene\BaseCfg;
 
 class ToneMapAutoLinear extends BaseCfg
diff --git a/src/effect/ToneMapCamera.php b/src/scene/effect/ToneMapCamera.php
similarity index 94%
rename from src/effect/ToneMapCamera.php
rename to src/scene/effect/ToneMapCamera.php
index ca59054..c05fc86 100644
--- a/src/effect/ToneMapCamera.php
+++ b/src/scene/effect/ToneMapCamera.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Blobt\Luxcore\effect;
+namespace Blobt\Luxcore\scene\effect;
 use Blobt\Luxcore\scene\BaseCfg;
 
 class ToneMapCamera extends BaseCfg
diff --git a/src/effect/ToneMapLinear.php b/src/scene/effect/ToneMapLinear.php
similarity index 89%
rename from src/effect/ToneMapLinear.php
rename to src/scene/effect/ToneMapLinear.php
index b739cbf..a62acaa 100644
--- a/src/effect/ToneMapLinear.php
+++ b/src/scene/effect/ToneMapLinear.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Blobt\Luxcore\effect;
+namespace Blobt\Luxcore\scene\effect;
 use Blobt\Luxcore\scene\BaseCfg;
 
 class ToneMapLinear extends BaseCfg
diff --git a/src/effect/ToneMapReinhard.php b/src/scene/effect/ToneMapReinhard.php
similarity index 94%
rename from src/effect/ToneMapReinhard.php
rename to src/scene/effect/ToneMapReinhard.php
index 5856442..58b7821 100644
--- a/src/effect/ToneMapReinhard.php
+++ b/src/scene/effect/ToneMapReinhard.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Blobt\Luxcore\effect;
+namespace Blobt\Luxcore\scene\effect;
 use Blobt\Luxcore\scene\BaseCfg;
 
 class ToneMapReinhard extends BaseCfg
diff --git a/src/effect/Vignetting.php b/src/scene/effect/Vignetting.php
similarity index 89%
rename from src/effect/Vignetting.php
rename to src/scene/effect/Vignetting.php
index ae587a1..da75caa 100644
--- a/src/effect/Vignetting.php
+++ b/src/scene/effect/Vignetting.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Blobt\Luxcore\effect;
+namespace Blobt\Luxcore\scene\effect;
 use Blobt\Luxcore\scene\BaseCfg;
 
 class Vignetting extends BaseCfg
diff --git a/src/effect/WhiteBalance.php b/src/scene/effect/WhiteBalance.php
similarity index 93%
rename from src/effect/WhiteBalance.php
rename to src/scene/effect/WhiteBalance.php
index 810dd51..191486d 100644
--- a/src/effect/WhiteBalance.php
+++ b/src/scene/effect/WhiteBalance.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Blobt\Luxcore\effect;
+namespace Blobt\Luxcore\scene\effect;
 use Blobt\Luxcore\scene\BaseCfg;
 
 class WhiteBalance extends BaseCfg
diff --git a/src/file/ImageSaverBase.php b/src/scene/file/ImageSaverBase.php
similarity index 60%
rename from src/file/ImageSaverBase.php
rename to src/scene/file/ImageSaverBase.php
index c4032c6..60ddb1a 100644
--- a/src/file/ImageSaverBase.php
+++ b/src/scene/file/ImageSaverBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Blobt\Luxcore\file;
+namespace Blobt\Luxcore\scene\file;
 use Blobt\Luxcore\core\Base;
 use Blobt\Luxcore\scene\BaseCfg;
 
@@ -52,9 +52,32 @@ class ImageSaverBase extends BaseCfg
     const TYPE_SAMPLECOUNT = 'SAMPLECOUNT';
     const TYPE_CONVERGENCE = 'CONVERGENCE';
     const TYPE_NOISE = 'NOISE';
+
+    /**
+     * Light Information(灯光信息)，不需要管线处理，文件保存格式：exr,当输出其中某个类型的图像时，同时会输出一幅"RGB_IMAGEPIPELINE"类型的序列图像，
+     * 并在这张"RGB_IMAGEPIPELINE"类型的序列图像，添加LightInformation类的效果器,并将LightInformation类的效果器的“channel”属性设置为与之对应的值。
+     */
+    const TYPE_EMISSION = 'EMISSION';
+    const TYPE_DIRECT_DIFFUSE = 'DIRECT_DIFFUSE';
+    const TYPE_DIRECT_DIFFUSE_REFLECT = 'DIRECT_DIFFUSE_REFLECT';
+    const TYPE_DIRECT_DIFFUSE_TRANSMIT = 'DIRECT_DIFFUSE_TRANSMIT';
+    const TYPE_DIRECT_GLOSSY = 'DIRECT_GLOSSY';
+    const TYPE_DIRECT_GLOSSY_REFLECT = 'DIRECT_GLOSSY_REFLECT';
+    const TYPE_DIRECT_GLOSSY_TRANSMIT = 'DIRECT_GLOSSY_TRANSMIT';
+    const TYPE_INDIRECT_DIFFUSE = 'INDIRECT_DIFFUSE';
+    const TYPE_INDIRECT_DIFFUSE_REFLECT = 'INDIRECT_DIFFUSE_REFLECT';
+    const TYPE_INDIRECT_DIFFUSE_TRANSMIT = 'INDIRECT_DIFFUSE_TRANSMIT';
+    const TYPE_INDIRECT_GLOSSY = 'INDIRECT_GLOSSY';
+    const TYPE_INDIRECT_GLOSSY_REFLECT = 'INDIRECT_GLOSSY_REFLECT';
+    const TYPE_INDIRECT_GLOSSY_TRANSMIT = 'INDIRECT_GLOSSY_TRANSMIT';
+    const TYPE_INDIRECT_SPECULAR = 'INDIRECT_SPECULAR';
+    const TYPE_INDIRECT_SPECULAR_REFLECT = 'INDIRECT_SPECULAR_REFLECT';
+    const TYPE_INDIRECT_SPECULAR_TRANSMIT = 'INDIRECT_SPECULAR_TRANSMIT';
+    const TYPE_CAUSTIC = 'CAUSTIC';
     
 
 
+
     const PNG = [
         self::TYPE_RGB_IMAGEPIPELINE,
         self::TYPE_MATERIAL_ID,
@@ -79,7 +102,24 @@ class ImageSaverBase extends BaseCfg
         self::TYPE_RAYCOUNT,
         self::TYPE_SAMPLECOUNT,
         self::TYPE_CONVERGENCE,
-        self::TYPE_NOISE
+        self::TYPE_NOISE,
+        self::TYPE_EMISSION,
+        self::TYPE_DIRECT_DIFFUSE,
+        self::TYPE_DIRECT_DIFFUSE_REFLECT,
+        self::TYPE_DIRECT_DIFFUSE_TRANSMIT,
+        self::TYPE_DIRECT_GLOSSY,
+        self::TYPE_DIRECT_GLOSSY_REFLECT,
+        self::TYPE_DIRECT_GLOSSY_TRANSMIT,
+        self::TYPE_INDIRECT_DIFFUSE,
+        self::TYPE_INDIRECT_DIFFUSE_REFLECT,
+        self::TYPE_INDIRECT_DIFFUSE_TRANSMIT,
+        self::TYPE_INDIRECT_GLOSSY,
+        self::TYPE_INDIRECT_GLOSSY_REFLECT,
+        self::TYPE_INDIRECT_GLOSSY_TRANSMIT,
+        self::TYPE_INDIRECT_SPECULAR,
+        self::TYPE_INDIRECT_SPECULAR_REFLECT,
+        self::TYPE_INDIRECT_SPECULAR_TRANSMIT,
+        self::TYPE_CAUSTIC
     ];
 
     /**
diff --git a/src/file/ImageSaverNumber.php b/src/scene/file/ImageSaverNumber.php
similarity index 95%
rename from src/file/ImageSaverNumber.php
rename to src/scene/file/ImageSaverNumber.php
index 9edb5fa..9358ef0 100644
--- a/src/file/ImageSaverNumber.php
+++ b/src/scene/file/ImageSaverNumber.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Blobt\Luxcore\file;
+namespace Blobt\Luxcore\scene\file;
 use Blobt\Luxcore\core\Base;
 
 class ImageSaverNumber extends ImageSaverBase