Property naming consistency

begla · May 21, 2017 · 6eb6ea0 · 6eb6ea0
1 parent e91af5d
commit 6eb6ea0
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 36 deletions.
diff --git a/IntrinsicCore/src/IntrinsicCoreResourcesPostEffect.h b/IntrinsicCore/src/IntrinsicCoreResourcesPostEffect.h
@@ -98,35 +98,35 @@ struct PostEffectManager
                                                          p_Document);
 
     p_Properties.AddMember(
-        "Scattering",
+        "scattering",
         _INTR_CREATE_PROP(p_Document, p_GenerateDesc, _N(VolumetricLighting),
                           _N(float), _descVolumetricLightingScattering(p_Ref),
                           false, false),
         p_Document.GetAllocator());
 
     p_Properties.AddMember(
-        "MainLightIntensity",
+        "mainLightIntensity",
         _INTR_CREATE_PROP(p_Document, p_GenerateDesc, _N(Lighting), _N(float),
                           _descMainLightIntens(p_Ref), false, false),
         p_Document.GetAllocator());
     p_Properties.AddMember(
-        "MainLightTemperature",
+        "mainLightTemperature",
         _INTR_CREATE_PROP(p_Document, p_GenerateDesc, _N(Lighting), _N(float),
                           _descMainLightTemp(p_Ref), false, false),
         p_Document.GetAllocator());
-    p_Properties.AddMember("MainLightOrientation",
+    p_Properties.AddMember("mainLightOrientation",
                            _INTR_CREATE_PROP(p_Document, p_GenerateDesc,
                                              _N(Lighting), _N(rotation),
                                              _descMainLightOrientation(p_Ref),
                                              false, false),
                            p_Document.GetAllocator());
     p_Properties.AddMember(
-        "MainLightColor",
+        "mainLightColor",
         _INTR_CREATE_PROP(p_Document, p_GenerateDesc, _N(Lighting), _N(vec3),
                           _descMainLightColor(p_Ref), false, false),
         p_Document.GetAllocator());
     p_Properties.AddMember(
-        "AmbientFactor",
+        "ambientFactor",
         _INTR_CREATE_PROP(p_Document, p_GenerateDesc, _N(Lighting), _N(float),
                           _descAmbientFactor(p_Ref), false, false),
         p_Document.GetAllocator());
@@ -141,25 +141,25 @@ struct PostEffectManager
         PostEffectData,
         _INTR_MAX_POST_EFFECT_COUNT>::_initFromDescriptor(p_Ref, p_Properties);
 
-    if (p_Properties.HasMember("Scattering"))
+    if (p_Properties.HasMember("scattering"))
       _descVolumetricLightingScattering(p_Ref) =
-          JsonHelper::readPropertyFloat(p_Properties["Scattering"]);
+          JsonHelper::readPropertyFloat(p_Properties["scattering"]);
 
-    if (p_Properties.HasMember("MainLightIntensity"))
+    if (p_Properties.HasMember("mainLightIntensity"))
       _descMainLightIntens(p_Ref) =
-          JsonHelper::readPropertyFloat(p_Properties["MainLightIntensity"]);
-    if (p_Properties.HasMember("MainLightTemperature"))
+          JsonHelper::readPropertyFloat(p_Properties["mainLightIntensity"]);
+    if (p_Properties.HasMember("mainLightTemperature"))
       _descMainLightTemp(p_Ref) =
-          JsonHelper::readPropertyFloat(p_Properties["MainLightTemperature"]);
-    if (p_Properties.HasMember("MainLightOrientation"))
+          JsonHelper::readPropertyFloat(p_Properties["mainLightTemperature"]);
+    if (p_Properties.HasMember("mainLightOrientation"))
       _descMainLightOrientation(p_Ref) =
-          JsonHelper::readPropertyQuat(p_Properties["MainLightOrientation"]);
-    if (p_Properties.HasMember("MainLightColor"))
+          JsonHelper::readPropertyQuat(p_Properties["mainLightOrientation"]);
+    if (p_Properties.HasMember("mainLightColor"))
       _descMainLightColor(p_Ref) =
-          JsonHelper::readPropertyVec3(p_Properties["MainLightColor"]);
-    if (p_Properties.HasMember("AmbientFactor"))
+          JsonHelper::readPropertyVec3(p_Properties["mainLightColor"]);
+    if (p_Properties.HasMember("ambientFactor"))
       _descAmbientFactor(p_Ref) =
-          JsonHelper::readPropertyFloat(p_Properties["AmbientFactor"]);
+          JsonHelper::readPropertyFloat(p_Properties["ambientFactor"]);
   }
 
   // <-

diff --git a/app/managers/post_effects/Default.post_effect.json b/app/managers/post_effects/Default.post_effect.json
@@ -2,20 +2,20 @@
     "name": "Default",
     "properties": {
         "name": "Default",
-        "Scattering": 0.0,
-        "MainLightIntensity": 10.0,
-        "MainLightTemperature": 2200.0,
-        "MainLightOrientation": [
+        "scattering": 0.0,
+        "mainLightIntensity": 10.0,
+        "mainLightTemperature": 2200.0,
+        "mainLightOrientation": [
             -0.2032211720943451,
             0.6494189500808716,
             0.18621788918972016,
             0.7087164521217346
         ],
-        "MainLightColor": [
+        "mainLightColor": [
             1.0,
             1.0,
             1.0
         ],
-        "AmbientFactor": 1.0
+        "ambientFactor": 1.0
     }
 }
diff --git a/app/managers/post_effects/Foggy.post_effect.json b/app/managers/post_effects/Foggy.post_effect.json
@@ -2,20 +2,20 @@
     "name": "Foggy",
     "properties": {
         "name": "Foggy",
-        "Scattering": 0.029999999329447748,
-        "MainLightIntensity": 10.0,
-        "MainLightTemperature": 2200.0,
-        "MainLightOrientation": [
+        "scattering": 0.029999999329447748,
+        "mainLightIntensity": 10.0,
+        "mainLightTemperature": 2200.0,
+        "mainLightOrientation": [
             -0.2032211720943451,
             0.6494189500808716,
             0.18621788918972016,
             0.7087164521217346
         ],
-        "MainLightColor": [
+        "mainLightColor": [
             1.0,
             1.0,
             1.0
         ],
-        "AmbientFactor": 1.0
+        "ambientFactor": 1.0
     }
 }
diff --git a/app/managers/post_effects/Town.post_effect.json b/app/managers/post_effects/Town.post_effect.json
@@ -2,20 +2,20 @@
     "name": "Town",
     "properties": {
         "name": "Town",
-        "Scattering": 0.05000000074505806,
-        "MainLightIntensity": 0.05000000074505806,
-        "MainLightTemperature": 6500.0,
-        "MainLightOrientation": [
+        "scattering": 0.05000000074505806,
+        "mainLightIntensity": 0.05000000074505806,
+        "mainLightTemperature": 6500.0,
+        "mainLightOrientation": [
             -0.2391381859779358,
             -0.6718127727508545,
             -0.2674969732761383,
             0.6480169892311096
         ],
-        "MainLightColor": [
+        "mainLightColor": [
             1.0,
             1.0,
             1.0
         ],
-        "AmbientFactor": 0.029999999329447748
+        "ambientFactor": 0.029999999329447748
     }
 }