Text archives Help

---

Author: leenak
Date: Tue Jul 31 21:50:25 2007
New Revision: 1596

Modified:
   trunk/Model/Materials/CMakeLists.txt
   trunk/Model/Materials/Lambertian.cc
   trunk/Model/Materials/Lambertian.h
   trunk/Model/Textures/MarbleTexture.h
Log:
Unwantted Comments have been removed

Modified: trunk/Model/Materials/CMakeLists.txt
==============================================================================
--- trunk/Model/Materials/CMakeLists.txt        (original)
+++ trunk/Model/Materials/CMakeLists.txt        Tue Jul 31 21:50:25 2007
@@ -4,8 +4,6 @@
      Materials/AmbientOcclusion.cc
      Materials/Checker.h
      Materials/Checker.cc
-     Materials/Tile.h
-     Materials/Tile.cc
      Materials/CopyTextureMaterial.cc
      Materials/CopyTextureMaterial.h
      Materials/Dielectric.h

Modified: trunk/Model/Materials/Lambertian.cc
==============================================================================
--- trunk/Model/Materials/Lambertian.cc (original)
+++ trunk/Model/Materials/Lambertian.cc Tue Jul 31 21:50:25 2007
@@ -48,14 +48,7 @@
   : colortex(colortex)
 {
 }
-/*
-Lambertian::Lambertian(const Color& color, const Texture<Color>* colortex_)
- 
-{
-colortex = new Constant<Color>(color);
-colortex = colortex+colortex_;
-}
-*/ 
+
 Lambertian::~Lambertian()
 {
 }

Modified: trunk/Model/Materials/Lambertian.h
==============================================================================
--- trunk/Model/Materials/Lambertian.h  (original)
+++ trunk/Model/Materials/Lambertian.h  Tue Jul 31 21:50:25 2007
@@ -41,7 +41,6 @@
   public:
     Lambertian(const Color& color);
     Lambertian(const Texture<Color>* colorfn);
-       //Lambertian(const Color& color, const Texture<Color>* colorfn);
        Lambertian() {  };
     virtual ~Lambertian();
 

Modified: trunk/Model/Textures/MarbleTexture.h
==============================================================================
--- trunk/Model/Textures/MarbleTexture.h        (original)
+++ trunk/Model/Textures/MarbleTexture.h        Tue Jul 31 21:50:25 2007
@@ -80,7 +80,7 @@
     for( int i = rays.begin(); i < rays.end(); i++ ) {
       Vector T = rays.getTexCoords(i) * (scale * fscale);
       ColorComponent value = (Real)0.25 *
-        Cos( rays.getTexCoords(i).z() * scale + tscale *
+        Cos( rays.getTexCoords(i).x() * scale + tscale *
              (Real)Turbulence( T, octaves, lacunarity, gain ) );
       results.set(i, SCIRun::Interpolate( value1, value2, value ));
     }

---

• [MANTA] r1596 - in trunk/Model: Materials Textures, leenak, 07/31/2007

---

Archive powered by MHonArc 2.6.16.