Text archives Help

---

Author: abe
Date: Tue Jan 24 19:12:58 2006
New Revision: 865

Removed:
   trunk/Model/Materials/NormalMaterial.cc
   trunk/Model/Materials/NormalMaterial.h
Modified:
   trunk/Model/Materials/CMakeLists.txt
   trunk/Model/Textures/CMakeLists.txt
   trunk/scenes/boeing777.cc
   trunk/scenes/cube.cc
   trunk/scenes/objviewer.cc
Log:

Removed NormalMaterial, use: new Flat( new NormalTexture() ); instead.

Updated scenes which used NormalMaterial. Also added WireframeTexture and 
RaySignTexture.

M    scenes/objviewer.cc
M    scenes/cube.cc
M    scenes/boeing777.cc
D    Model/Materials/NormalMaterial.cc
D    Model/Materials/NormalMaterial.h
M    Model/Materials/CMakeLists.txt
M    Model/Textures/CMakeLists.txt


Modified: trunk/Model/Materials/CMakeLists.txt
==============================================================================
--- trunk/Model/Materials/CMakeLists.txt        (original)
+++ trunk/Model/Materials/CMakeLists.txt        Tue Jan 24 19:12:58 2006
@@ -14,8 +14,6 @@
      Materials/LitMaterial.cc
      Materials/MetalMaterial.h
      Materials/MetalMaterial.cc
-     Materials/NormalMaterial.h
-     Materials/NormalMaterial.cc # Shade the material using it's normal.
      Materials/Phong.h
      Materials/Phong.cc
      )

Modified: trunk/Model/Textures/CMakeLists.txt
==============================================================================
--- trunk/Model/Textures/CMakeLists.txt (original)
+++ trunk/Model/Textures/CMakeLists.txt Tue Jan 24 19:12:58 2006
@@ -9,6 +9,8 @@
      Textures/ImageTexture.h
      Textures/MarbleTexture.cc
      Textures/MarbleTexture.h
+     Textures/NormalTexture.cc
+     Textures/NormalTexture.h
      Textures/OakTexture.cc
      Textures/OakTexture.h
      Textures/TexCoordTexture.cc

Modified: trunk/scenes/boeing777.cc
==============================================================================
--- trunk/scenes/boeing777.cc   (original)
+++ trunk/scenes/boeing777.cc   Tue Jan 24 19:12:58 2006
@@ -51,12 +51,12 @@
 #include <Model/Lights/HeadLight.h>
 #include <Model/Materials/Lambertian.h>
 #include <Model/Materials/MetalMaterial.h>
-#include <Model/Materials/NormalMaterial.h>
 #include <Model/Materials/Phong.h>
 #include <Model/Primitives/Parallelogram.h>
 #include <Model/Primitives/Sphere.h>
 #include <Model/Textures/CheckerTexture.h>
 #include <Model/Textures/MarbleTexture.h>
+#include <Model/Textures/NormalTexture.h>
 #include <Model/Cameras/PinholeCamera.h>
 #include <Core/Geometry/AffineTransform.h>
 #include <Core/Util/NotFinished.h>
@@ -214,13 +214,13 @@
     break;
     
   case MTL_NORMAL:
-    kd_material = new NormalMaterial( );
+    kd_material = new Flat( new NormalTexture() );
     break;
   case MTL_RAYDIRECTION:
-    kd_material = new RayDirectionMaterial();
+    kd_material = new Lambertian( new 
WireframeTexture<KDTree::ScratchPadInfo>( new RaySignTexture() ) );
     break;
   case MTL_WIRE:
-    kd_material = new WireFrameMaterial<KDTree::ScratchPadInfo>();
+    kd_material = new Flat( new WireframeTexture<KDTree::ScratchPadInfo>( 
new KDTreeTexture() ) );
     break;
   };
        

Modified: trunk/scenes/cube.cc
==============================================================================
--- trunk/scenes/cube.cc        (original)
+++ trunk/scenes/cube.cc        Tue Jan 24 19:12:58 2006
@@ -13,11 +13,12 @@
 #include <Model/Lights/PointLight.h>
 #include <Model/Materials/Lambertian.h>
 #include <Model/Materials/MetalMaterial.h>
-#include <Model/Materials/NormalMaterial.h>
+#include <Model/Materials/Flat.h>
 #include <Model/Primitives/Parallelogram.h>
 #include <Model/Primitives/Sphere.h>
 #include <Model/Primitives/Cube.h>
 #include <Model/Textures/CheckerTexture.h>
+#include <Model/Textures/NormalTexture.h>
 #include <Core/Geometry/AffineTransform.h>
 #include <Core/Util/NotFinished.h>
 
@@ -115,7 +116,7 @@
 
        // Just make a box....
   Material* matl1=new Lambertian(Color(RGBColor(.2,.4,.2)));
-       NormalMaterial* normal_material = new NormalMaterial();
+       Material* normal_material = new Flat( new NormalTexture() );
        
        // Add a box.
        Point point( 0.5,0,0 );

Modified: trunk/scenes/objviewer.cc
==============================================================================
--- trunk/scenes/objviewer.cc   (original)
+++ trunk/scenes/objviewer.cc   Tue Jan 24 19:12:58 2006
@@ -50,7 +50,6 @@
 #include <Model/Materials/Lambertian.h>
 #include <Model/Materials/Phong.h>
 #include <Model/Materials/Dielectric.h>
-#include <Model/Materials/NormalMaterial.h>
 #include <Model/Materials/Flat.h>
 #include <Model/Groups/Group.h>
 #include <Model/Groups/RealisticBvh.h>
@@ -63,6 +62,7 @@
 #include <Model/Textures/Constant.h>
 #include <Model/Textures/ImageTexture.h>
 #include <Model/Textures/TexCoordTexture.h>
+#include <Model/Textures/NormalTexture.h>
 #include <Model/Cameras/PinholeCamera.h>
 
 #include <Image/TGAFile.h>
@@ -424,7 +424,7 @@
     default_material = new Lambertian( Color(RGB( 1.0, 0.0, 0.0 ) )  );
   }
   else {
-    default_material = new NormalMaterial();
+    default_material = new Flat( new NormalTexture() );
   }
 
   

---

• [MANTA] r865 - in trunk: Model/Materials Model/Textures scenes, abe, 01/24/2006

---

Archive powered by MHonArc 2.6.16.