X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fmaterials%2Flighting.cpp;h=3bbc01a3fa8e4bd4d51fd0fafc924b95651b492d;hp=b19ebab014c56379fc77fd3abf246d6d1381e215;hb=b9d8d358aab136fb1d1242360fe4f3c3711bde11;hpb=188ae4a4a81c735b6879980c8526497bead580ed

diff --git a/source/materials/lighting.cpp b/source/materials/lighting.cpp
index b19ebab0..3bbc01a3 100644
--- a/source/materials/lighting.cpp
+++ b/source/materials/lighting.cpp
@@ -153,14 +153,14 @@ void Lighting::Loader::init_actions()
 	add("fog_color", &Loader::fog_color);
 	add("fog_density", &Loader::fog_density);
 	add("fog_half_distance", &Loader::fog_half_distance);
-	add("horizon_angle", &Loader::horizon_angle);
 	add("light", &Loader::light);
 	add("light", &Loader::light_inline);
-	add("sky_color", &Loader::sky_color);
-	add("zenith_direction", &Loader::zenith_direction);
 
 	// Deprecated
+	add("horizon_angle", &Loader::horizon_angle);
 	add("light", &Loader::light_inline_index);
+	add("sky_color", &Loader::sky_color);
+	add("zenith_direction", &Loader::zenith_direction);
 }
 
 void Lighting::Loader::ambient(float r, float g, float b)
@@ -183,10 +183,13 @@ void Lighting::Loader::fog_half_distance(float d)
 	obj.set_fog_half_distance(d);
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 void Lighting::Loader::horizon_angle(float a)
 {
 	obj.set_horizon_angle(Geometry::Angle<float>::from_degrees(a));
 }
+#pragma GCC diagnostic pop
 
 void Lighting::Loader::light(const string &name)
 {
@@ -206,6 +209,8 @@ void Lighting::Loader::light_inline_index(unsigned)
 	light_inline();
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 void Lighting::Loader::sky_color(float r, float g, float b)
 {
 	obj.set_sky_color(Color(r, g, b));
@@ -215,6 +220,7 @@ void Lighting::Loader::zenith_direction(float x, float y, float z)
 {
 	obj.set_zenith_direction(Vector3(x, y, z));
 }
+#pragma GCC diagnostic pop
 
 } // namespace GL
 } // namespace Msp