From 62f8b0a7c5e71d6dcfc0f7b9b8691e5d6e5264bb Mon Sep 17 00:00:00 2001 From: yuanjiajia <1139393632@qq.com> Date: Sun, 13 Feb 2022 18:05:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=A4=E4=B8=AA=E7=B1=BB=20=E2=80=9CNoiseRed?= =?UTF-8?q?ucerBCD.php=E2=80=9D=E3=80=81=E2=80=9CNoiseReducerOIDN.php?= =?UTF-8?q?=E2=80=9D=E6=96=87=E4=BB=B6=E4=BB=8E=E2=80=9Ceffect=E2=80=9D?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=88=B0=E2=80=9Cscene=E2=80=9D=EF=BC=8C?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E7=B1=BB=E6=96=87=E4=BB=B6=E6=9C=AB=E5=B0=BE?= =?UTF-8?q?=E5=8A=A0=E4=BA=86PHP=E6=96=87=E4=BB=B6=E9=A3=8E=E6=A0=BC?= =?UTF-8?q?=E7=BB=93=E9=80=9F=E6=A0=87=E5=BF=97=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/scene/BaseCfg.php | 2 ++ src/scene/Film.php | 2 ++ src/scene/HybridBackforWard.php | 2 ++ src/scene/ImageSaverBase.php | 1 + src/scene/ImageSaverNumber.php | 10 ++-------- src/scene/LightStrategy.php | 2 ++ src/scene/Native.php | 2 ++ src/{effect => scene}/NoiseReducerBCD.php | 5 +++-- src/{effect => scene}/NoiseReducerOIDN.php | 5 +++-- src/scene/OpenCL.php | 2 ++ src/scene/Path.php | 2 ++ src/scene/PathDepth.php | 2 ++ src/scene/RenderEngine.php | 2 ++ src/scene/Sampler.php | 2 ++ src/scene/Sobol.php | 2 +- src/utils/StringHelper.php | 1 + 16 files changed, 31 insertions(+), 13 deletions(-) rename src/{effect => scene}/NoiseReducerBCD.php (92%) rename src/{effect => scene}/NoiseReducerOIDN.php (86%) diff --git a/src/scene/BaseCfg.php b/src/scene/BaseCfg.php index b6989d2..bf4684f 100644 --- a/src/scene/BaseCfg.php +++ b/src/scene/BaseCfg.php @@ -92,3 +92,5 @@ class BaseCfg extends Base } } + +?> diff --git a/src/scene/Film.php b/src/scene/Film.php index dcf51c4..2e70b36 100644 --- a/src/scene/Film.php +++ b/src/scene/Film.php @@ -136,3 +136,5 @@ class Film extends BaseCfg } } + +?> diff --git a/src/scene/HybridBackforWard.php b/src/scene/HybridBackforWard.php index 7fbcc25..75c6d49 100644 --- a/src/scene/HybridBackforWard.php +++ b/src/scene/HybridBackforWard.php @@ -21,3 +21,5 @@ class HybridBackforWard extends BaseCfg public $glossinessthreshold = 0.45; } + +?> diff --git a/src/scene/ImageSaverBase.php b/src/scene/ImageSaverBase.php index dc43fb0..f125b07 100644 --- a/src/scene/ImageSaverBase.php +++ b/src/scene/ImageSaverBase.php @@ -122,4 +122,5 @@ class ImageSaverBase extends BaseCfg $this->filename = $nameStr; } } + ?> diff --git a/src/scene/ImageSaverNumber.php b/src/scene/ImageSaverNumber.php index ab36b52..f5a9ef5 100644 --- a/src/scene/ImageSaverNumber.php +++ b/src/scene/ImageSaverNumber.php @@ -31,12 +31,6 @@ class ImageSaverNumber extends ImageSaverBase } } - - /** - * 用户自定的图像输出文件名及格式 - */ - public function setFileName($nameStr) - { - $this->filename = $nameStr; - } } + +?> diff --git a/src/scene/LightStrategy.php b/src/scene/LightStrategy.php index 8bc93be..f79091e 100644 --- a/src/scene/LightStrategy.php +++ b/src/scene/LightStrategy.php @@ -14,3 +14,5 @@ class LightStrategy extends BaseCfg */ public $type = self::TYPE_LOG_POWER; } + +?> \ No newline at end of file diff --git a/src/scene/Native.php b/src/scene/Native.php index a8bea54..0661f5c 100644 --- a/src/scene/Native.php +++ b/src/scene/Native.php @@ -11,3 +11,5 @@ class Native extends BaseCfg public $threadsCount = 4; } + +?> diff --git a/src/effect/NoiseReducerBCD.php b/src/scene/NoiseReducerBCD.php similarity index 92% rename from src/effect/NoiseReducerBCD.php rename to src/scene/NoiseReducerBCD.php index 108bf94..340ac08 100644 --- a/src/effect/NoiseReducerBCD.php +++ b/src/scene/NoiseReducerBCD.php @@ -1,7 +1,7 @@ diff --git a/src/effect/NoiseReducerOIDN.php b/src/scene/NoiseReducerOIDN.php similarity index 86% rename from src/effect/NoiseReducerOIDN.php rename to src/scene/NoiseReducerOIDN.php index 7cd3e88..de01ad8 100644 --- a/src/effect/NoiseReducerOIDN.php +++ b/src/scene/NoiseReducerOIDN.php @@ -1,7 +1,7 @@ diff --git a/src/scene/OpenCL.php b/src/scene/OpenCL.php index 76a1d14..6544ca0 100644 --- a/src/scene/OpenCL.php +++ b/src/scene/OpenCL.php @@ -46,3 +46,5 @@ class OpenCL extends BaseCfg } + +?> diff --git a/src/scene/Path.php b/src/scene/Path.php index 1328130..ac84b0f 100644 --- a/src/scene/Path.php +++ b/src/scene/Path.php @@ -38,3 +38,5 @@ class Path extends BaseCfg } } + +?> diff --git a/src/scene/PathDepth.php b/src/scene/PathDepth.php index 59180a9..b7ef2fe 100644 --- a/src/scene/PathDepth.php +++ b/src/scene/PathDepth.php @@ -25,3 +25,5 @@ class PathDepth extends BaseCfg */ public $specular = 6; } + +?> diff --git a/src/scene/RenderEngine.php b/src/scene/RenderEngine.php index b8eddc3..20015bb 100644 --- a/src/scene/RenderEngine.php +++ b/src/scene/RenderEngine.php @@ -19,3 +19,5 @@ class RenderEngine extends BaseCfg public $seed = 1; } + +?> diff --git a/src/scene/Sampler.php b/src/scene/Sampler.php index f84d5b0..c05faaf 100644 --- a/src/scene/Sampler.php +++ b/src/scene/Sampler.php @@ -44,3 +44,5 @@ class Sampler extends BaseCfg } } + +?> diff --git a/src/scene/Sobol.php b/src/scene/Sobol.php index 815b93c..4b1b6b1 100644 --- a/src/scene/Sobol.php +++ b/src/scene/Sobol.php @@ -48,4 +48,4 @@ class Sobol extends BaseCfg public $adaptiveStrength = 0.9; } -?> \ No newline at end of file +?> diff --git a/src/utils/StringHelper.php b/src/utils/StringHelper.php index 8421d2f..67fed09 100644 --- a/src/utils/StringHelper.php +++ b/src/utils/StringHelper.php @@ -63,4 +63,5 @@ class StringHelper return $retStr; } } + ?>