diff --git a/composer.json b/composer.json index 5da1a01..6e6f5a4 100644 --- a/composer.json +++ b/composer.json @@ -6,6 +6,7 @@ "autoload": { "psr-4": { "Blobt\\Luxcore\\": "src/" + } }, "authors": [ diff --git a/examples/print.php b/examples/print.php index 426a787..769efd0 100644 --- a/examples/print.php +++ b/examples/print.php @@ -2,10 +2,15 @@ -namespace Blobt\Luxcore\scene; +namespace Blobt\Luxcore\scene\render; +use Blobt\Luxcore\scene\file; + include dirname(dirname(__FILE__)) . "/vendor/autoload.php"; + + + //设置打印 渲染引擎 的配置参数 $renderEngine = new RenderEngine(); echo $renderEngine; @@ -51,4 +56,6 @@ $film->imagepipelines[5] = [new effect\NoiseReducerOIDN(),new effect\Pretreatmen echo $film; + + ?> diff --git a/src/scene/BaseCfg.php b/src/scene/BaseCfg.php index 3f6364f..c08a1c8 100644 --- a/src/scene/BaseCfg.php +++ b/src/scene/BaseCfg.php @@ -100,10 +100,8 @@ class BaseCfg extends Base break; default: - $ret .= "{$className}.{$name} = \"unknow type\"\n"; - + $ret .= "{$className}.{$name} = \"unknow type\"\n"; } - } return $ret; } diff --git a/src/scene/Batch.php b/src/scene/render/Batch.php similarity index 90% rename from src/scene/Batch.php rename to src/scene/render/Batch.php index cf4ce95..702bd5f 100644 --- a/src/scene/Batch.php +++ b/src/scene/render/Batch.php @@ -1,6 +1,7 @@ noiseEstimation = new NoiseEstimation($config); $this->filter = new Filter($config); - $this->outputs[] = new file\ImageSaver(['index' => 0]); + $this->outputs[] = new ImageSaver(['index' => 0]); $this->imagepipelines[0] = [new effect\Pretreatment(),new effect\ToneMapLinear(),new effect\CammaCorrection()]; - $this->outputs[] = new file\ImageSaver(['type' => 'ALBEDO']); - $this->outputs[] = new file\ImageSaver(['type' => 'AVG_SHADING_NORMAL']); + $this->outputs[] = new ImageSaver(['type' => 'ALBEDO']); + $this->outputs[] = new ImageSaver(['type' => 'AVG_SHADING_NORMAL']); - $this->outputs[] = new file\ImageSaver(['index' => 1]); + $this->outputs[] = new ImageSaver(['index' => 1]); $this->imagepipelines[1] = [new effect\NoiseReducerOIDN(),new effect\Pretreatment(),new effect\ToneMapLinear(),new effect\CammaCorrection()]; Base::__construct($config); diff --git a/src/scene/Filter.php b/src/scene/render/Filter.php similarity index 92% rename from src/scene/Filter.php rename to src/scene/render/Filter.php index 07a094d..2583702 100644 --- a/src/scene/Filter.php +++ b/src/scene/render/Filter.php @@ -1,6 +1,7 @@