From 491f73090a194786aafe9a5c495db61b65e6804a Mon Sep 17 00:00:00 2001
From: yuanjiajia <1139393632@qq.com>
Date: Fri, 18 Feb 2022 14:56:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E2=80=9CBaseCfg.php?=
 =?UTF-8?q?=E2=80=9D=E3=80=81=E2=80=9CBatch.php=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/scene/BaseCfg.php | 93 ++++++++++++++++++++++---------------------
 src/scene/Batch.php   |  3 +-
 2 files changed, 49 insertions(+), 47 deletions(-)

diff --git a/src/scene/BaseCfg.php b/src/scene/BaseCfg.php
index 74ae549..3f6364f 100644
--- a/src/scene/BaseCfg.php
+++ b/src/scene/BaseCfg.php
@@ -51,58 +51,59 @@ class BaseCfg extends Base
             $name = implode(".", array_map('strtolower', StringHelper::camelStrToArray($name)));
             
             $value = $item->getValue($this);
-            if (is_string($value))
+            switch(gettype($value))
             {
-                if( count(explode(" ", $value)) != 3 || in_array(false,array_map('is_numeric',explode(" ", $value))) )
-                {
-                    $ret .= "{$className}.{$name} = \"{$value}\"\n";
-                }
-                else
-                {
-                    $ret .= "{$className}.{$name} = {$value}\n";
-                }
-            } 
-            else if (is_integer($value)) 
-            {
-                $ret .= "{$className}.{$name} = {$value}\n";
-            } 
-            else if (is_bool($value)) 
-            {
-                $value = $value ? 1 : 0;
-                $ret .= "{$className}.{$name} = {$value}\n";
-            }
-            else if (is_object($value) && $value instanceof BaseCfg)
-            {
-                $ret .= $value->toString($className);
-            }
-            else if(is_null($value))
-            {
-                //$ret .= "{$className}.{$name} = \"null\"\n";
-                $ret = $ret;
-            } 
-            else if(is_float($value))
-            {
-                $ret .= "{$className}.{$name} = {$value}\n";
-            }
-            else if(is_array($value))
-            {
-                foreach(StringHelper::arrayToString($value) as $value)
-                {   
-                    if( $name == 'imagepipelines' && $className == 'film' )
+                case 'string':
+                    if( count(explode(" ", $value)) != 3 || in_array(false,array_map('is_numeric',explode(" ", $value))) )
                     {
-                        $value = sprintf("%03d", substr($value,0,strpos($value,'.'))).substr($value,strpos($value,'.'));
-                        $ret .= "{$className}.{$name}.{$value}\n";
+                        $ret .= "{$className}.{$name} = \"{$value}\"\n";
                     }
                     else
                     {
-                        $ret .= "{$className}.{$name}.{$value}\n";
-                    }                  
-                } 
-            }
-            else
-            {            
-                $ret .= "{$className}.{$name} = \"unknow type\"\n";
+                        $ret .= "{$className}.{$name} = {$value}\n";
+                    }
+                    break;
+
+                case 'integer':
+                    $ret .= "{$className}.{$name} = {$value}\n";
+                    break;
+                
+                case 'boolean':
+                    $value = $value ? 1 : 0;
+                    $ret .= "{$className}.{$name} = {$value}\n";
+                    break;
+                
+                case 'object':
+                    $ret .= $value->toString($className);
+                    break;
+
+                case 'NULL':
+                    break;
+                
+                case 'double':
+                    $ret .= "{$className}.{$name} = {$value}\n";
+                    break;
+
+                case 'array':
+                    foreach(StringHelper::arrayToString($value) as $value)
+                    {   
+                        if( $name == 'imagepipelines' && $className == 'film' )
+                        {
+                            $value = sprintf("%03d", substr($value,0,strpos($value,'.'))).substr($value,strpos($value,'.'));
+                            $ret .= "{$className}.{$name}.{$value}\n";
+                        }
+                        else
+                        {
+                            $ret .= "{$className}.{$name}.{$value}\n";
+                        }                  
+                    } 
+                    break;
+
+                default:
+                    $ret .= "{$className}.{$name} = \"unknow type\"\n";
+                    
             }
+
         }
         return $ret;
     }
diff --git a/src/scene/Batch.php b/src/scene/Batch.php
index 10abfd1..cf4ce95 100644
--- a/src/scene/Batch.php
+++ b/src/scene/Batch.php
@@ -19,7 +19,7 @@ class Batch extends BaseCfg
     /**
      * @var float 噪波阈值，（取值：浮点型色值）
      */
-    public $haltthreshold = 0.02;
+    public $haltthreshold;
 
     /**
      * @var object 存储一个 haltThresHold类 对象
@@ -29,6 +29,7 @@ class Batch extends BaseCfg
     public function useNoiseThreshold($config= [])
     {
         $this->haltthresholdcfg = new HaltThresHold($config);
+        $this->haltthreshold = 0.02;
     }
 
 }