Move noise functions from scene/material to scene/util

diff --git a/projects/VC90/SimGear.vcproj b/projects/VC90/SimGear.vcproj
index f38a9fa369fd8ad651fcc692b9277a1e8d7c9caf..26b7e8741215e5359ac321b4b819089420c9b3ea 100644 (file)
--- a/projects/VC90/SimGear.vcproj
+++ b/projects/VC90/SimGear.vcproj
@@ -1299,14 +1299,6 @@
                                RelativePath="..\..\simgear\scene\material\mipmap.hxx"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\simgear\scene\material\Noise.cxx"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\simgear\scene\material\Noise.hxx"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\simgear\scene\material\Pass.cxx"\r
                                >\r
@@ -1797,6 +1789,14 @@
                                RelativePath="..\..\simgear\scene\util\NodeAndDrawableVisitor.hxx"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\simgear\scene\util\Noise.cxx"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\simgear\scene\util\Noise.hxx"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\simgear\scene\util\PrimitiveUtils.cxx"\r
                                >\r

diff --git a/simgear/scene/util/CMakeLists.txt b/simgear/scene/util/CMakeLists.txt
index 8b9221573f9ef1d644f3ca94afd764552e17d332..670d21af7691f06eb501890d838b53b54226ca96 100644 (file)
--- a/simgear/scene/util/CMakeLists.txt
+++ b/simgear/scene/util/CMakeLists.txt
@@ -3,6 +3,7 @@ include (SimGearComponent)
 set(HEADERS 
     CopyOp.hxx
     NodeAndDrawableVisitor.hxx
+       Noise.hxx
     OsgMath.hxx
     OsgSingleton.hxx
     PrimitiveUtils.hxx
@@ -28,6 +29,7 @@ set(HEADERS
 set(SOURCES 
     CopyOp.cxx
     NodeAndDrawableVisitor.cxx
+       Noise.cxx
     PrimitiveUtils.cxx
     QuadTreeBuilder.cxx
     SGEnlargeBoundingBox.cxx