Melchior FRANZ:

gui colors and material animation use "red", "green", "blue".
Would be nice if these light colors would use the same standard.

diff --git a/docs-mini/README.properties b/docs-mini/README.properties
index 2271bb424d09bb6e2365ce7ee5b730459d5d4507..134b7458446f8f009f51f9766c6886dacb1c5817 100644 (file)
--- a/docs-mini/README.properties
+++ b/docs-mini/README.properties
@@ -239,12 +239,12 @@ propeller:
 LIGHT
 ================================================================================
 /sim/time/sun-angle-rad
-/rendering/scene/ambient-r
-/rendering/scene/ambient-g
-/rendering/scene/ambient-b
-/rendering/scene/diffuse-r
-/rendering/scene/diffuse-g
-/rendering/scene/diffuse-b
-/rendering/scene/specular-r
-/rendering/scene/specular-g
-/rendering/scene/specular-b
+/rendering/scene/ambient/red
+/rendering/scene/ambient/ggreen
+/rendering/scene/ambient/blue
+/rendering/scene/diffuse/red
+/rendering/scene/diffuse/green
+/rendering/scene/diffuse/blue
+/rendering/scene/specular/red
+/rendering/scene/specular/green
+/rendering/scene/specular/blue

diff --git a/src/Time/light.cxx b/src/Time/light.cxx
index be7fabbcf9b424a2bb9bec3cb7df9ba85a9852fc..e47bc37769fc6b53314a130556b1b18f2d2b9d43 100644 (file)
--- a/src/Time/light.cxx
+++ b/src/Time/light.cxx
@@ -132,29 +132,29 @@ void FGLight::reinit () {
 void FGLight::bind () {
     SGPropertyNode *prop = globals->get_props();
     prop->tie("/sim/time/sun-angle-rad",SGRawValuePointer<double>(&_sun_angle));
-    prop->tie("/rendering/scene/ambient-r",SGRawValuePointer<float>(&_scene_ambient[0]));
-    prop->tie("/rendering/scene/ambient-g",SGRawValuePointer<float>(&_scene_ambient[1]));
-    prop->tie("/rendering/scene/ambient-b",SGRawValuePointer<float>(&_scene_ambient[2]));
-    prop->tie("/rendering/scene/diffuse-r",SGRawValuePointer<float>(&_scene_diffuse[0]));
-    prop->tie("/rendering/scene/diffuse-g",SGRawValuePointer<float>(&_scene_diffuse[1]));
-    prop->tie("/rendering/scene/diffuse-b",SGRawValuePointer<float>(&_scene_diffuse[2]));
-    prop->tie("/rendering/scene/specular-r",SGRawValuePointer<float>(&_scene_specular[0]));
-    prop->tie("/rendering/scene/specular-g",SGRawValuePointer<float>(&_scene_specular[1]));
-    prop->tie("/rendering/scene/specular-b",SGRawValuePointer<float>(&_scene_specular[2]));
+    prop->tie("/rendering/scene/ambient/red",SGRawValuePointer<float>(&_scene_ambient[0]));
+    prop->tie("/rendering/scene/ambient/green",SGRawValuePointer<float>(&_scene_ambient[1]));
+    prop->tie("/rendering/scene/ambient/blue",SGRawValuePointer<float>(&_scene_ambient[2]));
+    prop->tie("/rendering/scene/diffuse/red",SGRawValuePointer<float>(&_scene_diffuse[0]));
+    prop->tie("/rendering/scene/diffuse/green",SGRawValuePointer<float>(&_scene_diffuse[1]));
+    prop->tie("/rendering/scene/diffuse/blue",SGRawValuePointer<float>(&_scene_diffuse[2]));
+    prop->tie("/rendering/scene/specular/red",SGRawValuePointer<float>(&_scene_specular[0]));
+    prop->tie("/rendering/scene/specular/green",SGRawValuePointer<float>(&_scene_specular[1]));
+    prop->tie("/rendering/scene/specular/blue",SGRawValuePointer<float>(&_scene_specular[2]));
 }
 
 void FGLight::unbind () {
     SGPropertyNode *prop = globals->get_props();
     prop->untie("/sim/time/sun-angle-rad");
-    prop->untie("/rendering/scene/ambient-r");
-    prop->untie("/rendering/scene/ambient-g");
-    prop->untie("/rendering/scene/ambient-b");
-    prop->untie("/rendering/scene/diffuse-r");
-    prop->untie("/rendering/scene/diffuse-g");
-    prop->untie("/rendering/scene/diffuse-b");
-    prop->untie("/rendering/scene/specular-r");
-    prop->untie("/rendering/scene/specular-g");
-    prop->untie("/rendering/scene/specular-b");
+    prop->untie("/rendering/scene/ambient/red");
+    prop->untie("/rendering/scene/ambient/green");
+    prop->untie("/rendering/scene/ambient/blue");
+    prop->untie("/rendering/scene/diffuse/red");
+    prop->untie("/rendering/scene/diffuse/green");
+    prop->untie("/rendering/scene/diffuse/blue");
+    prop->untie("/rendering/scene/specular/red");
+    prop->untie("/rendering/scene/specular/green");
+    prop->untie("/rendering/scene/specular/blue");
 }