From 77d057fa1ed7149598c4edb378f775eca381c624 Mon Sep 17 00:00:00 2001 From: yuanjiajia <1139393632@qq.com> Date: Fri, 18 Feb 2022 19:03:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=B2=E6=9F=93=E9=85=8D=E7=BD=AE=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E7=B1=BB=E5=85=A8=E9=83=A8=E7=A7=BB=E5=88=B0=E2=80=9C?= =?UTF-8?q?render=E2=80=9D=E7=9B=AE=E5=BD=95=E4=B8=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.json | 1 + examples/print.php | 9 ++++++++- src/scene/BaseCfg.php | 4 +--- src/scene/{ => render}/Batch.php | 3 ++- src/scene/{ => render}/FileSaver.php | 3 ++- src/scene/{ => render}/Film.php | 12 +++++++----- src/scene/{ => render}/Filter.php | 3 ++- src/scene/{ => render}/HaltThresHold.php | 3 ++- src/scene/{ => render}/HybridBackforWard.php | 3 ++- src/scene/{ => render}/LightStrategy.php | 3 ++- src/scene/{ => render}/Metropolis.php | 3 ++- src/scene/{ => render}/Native.php | 3 ++- src/scene/{ => render}/NoiseEstimation.php | 3 ++- src/scene/{ => render}/OpenCL.php | 3 ++- src/scene/{ => render}/Path.php | 3 ++- src/scene/{ => render}/PathDepth.php | 3 ++- src/scene/{ => render}/Random.php | 3 ++- src/scene/{ => render}/RenderEngine.php | 3 ++- src/scene/{ => render}/Sampler.php | 3 ++- src/scene/{ => render}/Scene.php | 3 ++- src/scene/{ => render}/Sobol.php | 3 ++- src/scene/{ => render}/cache/Caustic.php | 2 +- src/scene/{ => render}/cache/Entry.php | 2 +- src/scene/{ => render}/cache/Indirect.php | 2 +- src/scene/{ => render}/cache/LightStrategy.php | 6 +++--- src/scene/{ => render}/cache/PhotonGI.php | 2 +- .../{ => render}/effect/AnalogFilmSimulation.php | 2 +- src/scene/{ => render}/effect/BackgroundImg.php | 2 +- src/scene/{ => render}/effect/Bloom.php | 2 +- src/scene/{ => render}/effect/CammaCorrection.php | 2 +- src/scene/{ => render}/effect/ColorAberration.php | 2 +- src/scene/{ => render}/effect/ColorLUT.php | 2 +- .../{ => render}/effect/IrradianceContourLines.php | 2 +- src/scene/{ => render}/effect/LightInformation.php | 2 +- src/scene/{ => render}/effect/Mist.php | 2 +- src/scene/{ => render}/effect/NoiseReducerBCD.php | 2 +- src/scene/{ => render}/effect/NoiseReducerOIDN.php | 2 +- src/scene/{ => render}/effect/Pretreatment.php | 2 +- src/scene/{ => render}/effect/Synthesis.php | 2 +- src/scene/{ => render}/effect/ToneMapAutoLinear.php | 2 +- src/scene/{ => render}/effect/ToneMapCamera.php | 2 +- src/scene/{ => render}/effect/ToneMapLinear.php | 2 +- src/scene/{ => render}/effect/ToneMapReinhard.php | 2 +- src/scene/{ => render}/effect/Vignetting.php | 2 +- src/scene/{ => render}/effect/WhiteBalance.php | 2 +- 45 files changed, 77 insertions(+), 52 deletions(-) rename src/scene/{ => render}/Batch.php (90%) rename src/scene/{ => render}/FileSaver.php (83%) rename src/scene/{ => render}/Film.php (81%) rename src/scene/{ => render}/Filter.php (92%) rename src/scene/{ => render}/HaltThresHold.php (89%) rename src/scene/{ => render}/HybridBackforWard.php (86%) rename src/scene/{ => render}/LightStrategy.php (86%) rename src/scene/{ => render}/Metropolis.php (86%) rename src/scene/{ => render}/Native.php (72%) rename src/scene/{ => render}/NoiseEstimation.php (81%) rename src/scene/{ => render}/OpenCL.php (92%) rename src/scene/{ => render}/Path.php (93%) rename src/scene/{ => render}/PathDepth.php (90%) rename src/scene/{ => render}/Random.php (95%) rename src/scene/{ => render}/RenderEngine.php (84%) rename src/scene/{ => render}/Sampler.php (92%) rename src/scene/{ => render}/Scene.php (85%) rename src/scene/{ => render}/Sobol.php (95%) rename src/scene/{ => render}/cache/Caustic.php (96%) rename src/scene/{ => render}/cache/Entry.php (95%) rename src/scene/{ => render}/cache/Indirect.php (95%) rename src/scene/{ => render}/cache/LightStrategy.php (88%) rename src/scene/{ => render}/cache/PhotonGI.php (96%) rename src/scene/{ => render}/effect/AnalogFilmSimulation.php (98%) rename src/scene/{ => render}/effect/BackgroundImg.php (93%) rename src/scene/{ => render}/effect/Bloom.php (90%) rename src/scene/{ => render}/effect/CammaCorrection.php (88%) rename src/scene/{ => render}/effect/ColorAberration.php (88%) rename src/scene/{ => render}/effect/ColorLUT.php (89%) rename src/scene/{ => render}/effect/IrradianceContourLines.php (94%) rename src/scene/{ => render}/effect/LightInformation.php (96%) rename src/scene/{ => render}/effect/Mist.php (94%) rename src/scene/{ => render}/effect/NoiseReducerBCD.php (95%) rename src/scene/{ => render}/effect/NoiseReducerOIDN.php (91%) rename src/scene/{ => render}/effect/Pretreatment.php (92%) rename src/scene/{ => render}/effect/Synthesis.php (89%) rename src/scene/{ => render}/effect/ToneMapAutoLinear.php (84%) rename src/scene/{ => render}/effect/ToneMapCamera.php (93%) rename src/scene/{ => render}/effect/ToneMapLinear.php (88%) rename src/scene/{ => render}/effect/ToneMapReinhard.php (93%) rename src/scene/{ => render}/effect/Vignetting.php (88%) rename src/scene/{ => render}/effect/WhiteBalance.php (92%) 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 @@