Move filters into their own namespace Inkscape::Filters (from NR::)

(bzr r7058)

1 files changed, 19 insertions, 17 deletions

diff --git a/src/display/nr-light.cpp b/src/display/nr-light.cpp
index 72ed684b0..a3373aadb 100644
--- a/src/display/nr-light.cpp
+++ b/src/display/nr-light.cpp
@@ -20,7 +20,8 @@
 #include "filters/pointlight.h"
 #include "filters/spotlight.h"
 
-namespace NR {
+namespace Inkscape {
+namespace Filters {
    
 DistantLight::DistantLight(SPFeDistantLight *light, guint32 lighting_color) {
     color = lighting_color;
@@ -30,42 +31,42 @@ DistantLight::DistantLight(SPFeDistantLight *light, guint32 lighting_color) {
 
 DistantLight::~DistantLight() {}
 
-void DistantLight::light_vector(Fvector &v) {
+void DistantLight::light_vector(NR::Fvector &v) {
     v[X_3D] = std::cos(azimuth)*std::cos(elevation);
     v[Y_3D] = std::sin(azimuth)*std::cos(elevation);
     v[Z_3D] = std::sin(elevation);
 } 
 
-void DistantLight::light_components(Fvector &lc) {
+void DistantLight::light_components(NR::Fvector &lc) {
     lc[LIGHT_RED] = NR_RGBA32_R(color);
     lc[LIGHT_GREEN] = NR_RGBA32_G(color);
     lc[LIGHT_BLUE] = NR_RGBA32_B(color);
 }
 
-PointLight::PointLight(SPFePointLight *light, guint32 lighting_color, const Matrix &trans) {
+PointLight::PointLight(SPFePointLight *light, guint32 lighting_color, const Geom::Matrix &trans) {
     color = lighting_color;
     l_x = light->x;
     l_y = light->y;
     l_z = light->z;
-    convert_coord(l_x, l_y, l_z, trans);
+    NR::convert_coord(l_x, l_y, l_z, trans);
 }
 
 PointLight::~PointLight() {}
 
-void PointLight::light_vector(Fvector &v, gdouble x, gdouble y, gdouble z) {
+void PointLight::light_vector(NR::Fvector &v, gdouble x, gdouble y, gdouble z) {
     v[X_3D] = l_x - x;
     v[Y_3D] = l_y - y;
     v[Z_3D] = l_z - z;
-    normalize_vector(v);
+    NR::normalize_vector(v);
 } 
 
-void PointLight::light_components(Fvector &lc) {
+void PointLight::light_components(NR::Fvector &lc) {
     lc[LIGHT_RED] = NR_RGBA32_R(color);
     lc[LIGHT_GREEN] = NR_RGBA32_G(color);
     lc[LIGHT_BLUE] = NR_RGBA32_B(color);
 }
 
-SpotLight::SpotLight(SPFeSpotLight *light, guint32 lighting_color, const Matrix &trans) {
+SpotLight::SpotLight(SPFeSpotLight *light, guint32 lighting_color, const Geom::Matrix &trans) {
     gdouble p_x, p_y, p_z;
     color = lighting_color;
     l_x = light->x;
@@ -76,26 +77,26 @@ SpotLight::SpotLight(SPFeSpotLight *light, guint32 lighting_color, const Matrix
     p_z = light->pointsAtZ;
     cos_lca = std::cos(M_PI / 180 * light->limitingConeAngle);
     speExp = light->specularExponent;
-    convert_coord(l_x, l_y, l_z, trans);
-    convert_coord(p_x, p_y, p_z, trans);
+    NR::convert_coord(l_x, l_y, l_z, trans);
+    NR::convert_coord(p_x, p_y, p_z, trans);
     S[X_3D] = p_x - l_x;
     S[Y_3D] = p_y - l_y;
     S[Z_3D] = p_z - l_z;
-    normalize_vector(S);
+    NR::normalize_vector(S);
     
 }
 
 SpotLight::~SpotLight() {}
 
-void SpotLight::light_vector(Fvector &v, gdouble x, gdouble y, gdouble z) {
+void SpotLight::light_vector(NR::Fvector &v, gdouble x, gdouble y, gdouble z) {
     v[X_3D] = l_x - x;
     v[Y_3D] = l_y - y;
     v[Z_3D] = l_z - z;
-    normalize_vector(v);
+    NR::normalize_vector(v);
 } 
 
-void SpotLight::light_components(Fvector &lc, const Fvector &L) {
-    gdouble spmod = (-1) * scalar_product(L, S);
+void SpotLight::light_components(NR::Fvector &lc, const NR::Fvector &L) {
+    gdouble spmod = (-1) * NR::scalar_product(L, S);
     if (spmod <= cos_lca)
         spmod = 0;
     else
@@ -105,7 +106,8 @@ void SpotLight::light_components(Fvector &lc, const Fvector &L) {
     lc[LIGHT_BLUE] = spmod * NR_RGBA32_B(color);
 }
 
-} /* namespace NR */
+} /* namespace Filters */
+} /* namespace Inkscape */
 
 /*
   Local Variables: