Text archives Help

---

Author: abe
Date: Wed Aug 15 19:06:04 2007
New Revision: 1646

Removed:
   trunk/Model/Groups/FrustumKDTree.cc
   trunk/Model/Groups/FrustumKDTree.h
   trunk/Model/Groups/KDTree.cc
   trunk/Model/Groups/KDTree.h
   trunk/Model/Groups/KDTree2.cc
   trunk/Model/Groups/KDTree2.h
   trunk/Model/Groups/KDTreeLoader.cc
   trunk/Model/Groups/KDTreeLoader.h
   trunk/Model/Groups/KDTreeLoaderIW.cc
   trunk/Model/Groups/KDTreeLoaderIW.h
   trunk/Model/Groups/KdtreeParameters.h.CMakeTemplate
   trunk/Model/Groups/Load_IW_KDTreeDyn.cc
   trunk/Model/Groups/SSEKDTree-stub.cc
   trunk/Model/Groups/SSEKDTree.cc
   trunk/Model/Groups/SSEKDTree.h
   trunk/Model/Groups/TransparentKDTree.cc
   trunk/Model/Groups/TransparentKDTree.h
   trunk/Model/Groups/VerticalKDTree-stub.cc
   trunk/Model/Groups/VerticalKDTree.cc
   trunk/Model/Groups/VerticalKDTree.h
   trunk/Model/Materials/CopyColorMaterial.cc
   trunk/Model/Materials/CopyColorMaterial.h
   trunk/scenes/boeing777.cc
Modified:
   trunk/Model/Groups/CMakeLists.txt
   trunk/Model/Materials/CMakeLists.txt
   trunk/Model/Textures/NormalTexture.cc
   trunk/Model/Textures/NormalTexture.h
   trunk/SwigInterface/manta.i
   trunk/scenes/CMakeLists.txt
Log:

Moved Boeing777 demo related code to external Manta-project:

https://code.sci.utah.edu/svn/people/abe/code/Manta-Fox


D    scenes/boeing777.cc
M    scenes/CMakeLists.txt
M    SwigInterface/manta.i
D    Model/Groups/SSEKDTree.h
D    Model/Groups/KDTree2.h
D    Model/Groups/TransparentKDTree.h
D    Model/Groups/FrustumKDTree.cc
D    Model/Groups/SSEKDTree-stub.cc
D    Model/Groups/KDTreeLoaderIW.cc
D    Model/Groups/KDTreeLoader.cc
D    Model/Groups/KDTreeLoaderIW.h
D    Model/Groups/KDTreeLoader.h
D    Model/Groups/VerticalKDTree.cc
D    Model/Groups/KDTree.cc
D    Model/Groups/Load_IW_KDTreeDyn.cc
M    Model/Groups/CMakeLists.txt
D    Model/Groups/KDTree2.cc
D    Model/Groups/TransparentKDTree.cc
D    Model/Groups/FrustumKDTree.h
D    Model/Groups/VerticalKDTree.h
D    Model/Groups/KdtreeParameters.h.CMakeTemplate
D    Model/Groups/KDTree.h
D    Model/Groups/VerticalKDTree-stub.cc
D    Model/Groups/SSEKDTree.cc
M    Model/Materials/CMakeLists.txt
D    Model/Materials/CopyColorMaterial.h
D    Model/Materials/CopyColorMaterial.cc
M    Model/Textures/NormalTexture.cc
M    Model/Textures/NormalTexture.h


Modified: trunk/Model/Groups/CMakeLists.txt
==============================================================================
--- trunk/Model/Groups/CMakeLists.txt   (original)
+++ trunk/Model/Groups/CMakeLists.txt   Wed Aug 15 19:06:04 2007
@@ -1,10 +1,4 @@
 
-# Configure the parameters for the KDTrees
-SET(MANTA_TRAVERSALPACKET_SIZE 4 CACHE STRING "Size to use for vertical 
kdtree traversal packets.")
-CONFIGURE_FILE(
-  ${CMAKE_CURRENT_SOURCE_DIR}/Groups/KdtreeParameters.h.CMakeTemplate
-  ${CMAKE_BINARY_DIR}/include/KdtreeParameters.h
-  )
   
 
 SET (Manta_Groups_SRCS
@@ -16,45 +10,14 @@
      Groups/GriddedGroup.h
      Groups/Group.cc
      Groups/Group.h
-     Groups/KDTree.cc
-     Groups/KDTree.h
-     Groups/KDTreeLoader.cc
-     Groups/KDTreeLoader.h
-     Groups/KDTreeLoaderIW.cc
-     Groups/KDTreeLoaderIW.h
-     Groups/KDTree2.cc
-     Groups/KDTree2.h
      Groups/Mesh.cc
      Groups/Mesh.h
      Groups/RealisticBvh.cc
      Groups/RealisticBvh.h
-     Groups/TransparentKDTree.cc
-     Groups/TransparentKDTree.h
      Groups/VolumeGrid.h
      Groups/ObjGroup.h
      Groups/ObjGroup.cc
 )
-
-# Determine if VerticalKDTree can be included
-IF(MANTA_SSE)
-  SET(Manta_Groups_SRCS
-    ${Manta_Groups_SRCS}
-    Groups/SSEKDTree.cc
-    Groups/SSEKDTree.h
-    Groups/VerticalKDTree.h
-    Groups/VerticalKDTree.cc
-    )
-
-# Otherwise include a stub implementation.
-ELSE(MANTA_SSE)
-  SET(Manta_Groups_SRCS
-    ${Manta_Groups_SRCS}
-    Groups/SSEKDTree-stub.cc
-    Groups/SSEKDTree.h
-    Groups/VerticalKDTree.h
-    Groups/VerticalKDTree-stub.cc
-    )
-ENDIF(MANTA_SSE)
 
 # Include private code if available
 IF (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Groups/private )

Modified: trunk/Model/Materials/CMakeLists.txt
==============================================================================
--- trunk/Model/Materials/CMakeLists.txt        (original)
+++ trunk/Model/Materials/CMakeLists.txt        Wed Aug 15 19:06:04 2007
@@ -31,6 +31,4 @@
      Materials/ThinDielectric.cc
      Materials/Transparent.cc
      Materials/Transparent.h
-     Materials/CopyColorMaterial.cc
-     Materials/CopyColorMaterial.h
      )

Modified: trunk/Model/Textures/NormalTexture.cc
==============================================================================
--- trunk/Model/Textures/NormalTexture.cc       (original)
+++ trunk/Model/Textures/NormalTexture.cc       Wed Aug 15 19:06:04 2007
@@ -124,30 +124,5 @@
     c = ((Real)1.0 - th.a - th.b);
   }
 
-  template<>
-  void WireframeTexture<Kdtree::KDTree::ScratchPadInfo,Color>::
-  getBarycentricCoords( RayPacket &rays, int which, Real &a, Real &b, Real 
&c ) const
-  {
-
-    Kdtree::KDTree::ScratchPadInfo &info =
-      rays.scratchpad<Kdtree::KDTree::ScratchPadInfo>(which);
-
-    a = info.a;
-    b = info.b;
-    c = ((Real)1.0 - info.a - info.b);
-  }
-
-  template<>
-  void WireframeTexture<Kdtree::KDTree::ScratchPadInfo,ColorComponent>::
-  getBarycentricCoords( RayPacket &rays, int which, Real &a, Real &b, Real 
&c ) const
-  {
-
-    Kdtree::KDTree::ScratchPadInfo &info =
-      rays.scratchpad<Kdtree::KDTree::ScratchPadInfo>(which);
-
-    a = info.a;
-    b = info.b;
-    c = ((Real)1.0 - info.a - info.b);
-  }
 } // end namespace Manta
 

Modified: trunk/Model/Textures/NormalTexture.h
==============================================================================
--- trunk/Model/Textures/NormalTexture.h        (original)
+++ trunk/Model/Textures/NormalTexture.h        Wed Aug 15 19:06:04 2007
@@ -34,7 +34,6 @@
 #include <Interface/RayPacket.h>
 #include <Model/Textures/Constant.h>
 #include <Model/Primitives/HeavyTriangle.h>
-#include <Model/Groups/KDTree.h>
 
 // Abe Stephens
 
@@ -99,10 +98,6 @@
   // Specialized versions of functions
   template<>
   void 
WireframeTexture<HeavyTriangle::TriangleHit,Color>::getBarycentricCoords( 
RayPacket &rays, int which, Real &a, Real &b, Real &c ) const;
-  template<>
-  void 
WireframeTexture<Kdtree::KDTree::ScratchPadInfo,Color>::getBarycentricCoords( 
RayPacket &rays, int which, Real &a, Real &b, Real &c ) const;
-  template<>
-  void 
WireframeTexture<Kdtree::KDTree::ScratchPadInfo,ColorComponent>::getBarycentricCoords(
 RayPacket &rays, int which, Real &a, Real &b, Real &c ) const;
   
 
   // Non specialized template functions

Modified: trunk/SwigInterface/manta.i
==============================================================================
--- trunk/SwigInterface/manta.i (original)
+++ trunk/SwigInterface/manta.i Wed Aug 15 19:06:04 2007
@@ -266,16 +266,10 @@
 %{
 #include <Model/Groups/Group.h>
 #include <Model/Textures/NormalTexture.h>
-#include <Model/Groups/KDTree.h>
 %}
 
 %include <Model/Groups/Group.h>
 %include <Model/Textures/NormalTexture.h>
-
-namespace Manta {
-  %template(WireframeTexture_Color) 
WireframeTexture<Manta::Kdtree::KDTree::ScratchPadInfo,Color>;
-  %template(WireframeTexture_ColorComponent) 
WireframeTexture<Manta::Kdtree::KDTree::ScratchPadInfo,Manta::ColorComponent>;
-}
 
 %{
 #include <Model/Groups/DynBVH.h>

Modified: trunk/scenes/CMakeLists.txt
==============================================================================
--- trunk/scenes/CMakeLists.txt (original)
+++ trunk/scenes/CMakeLists.txt Wed Aug 15 19:06:04 2007
@@ -33,13 +33,6 @@
    TARGET_LINK_LIBRARIES(scene_ParticleBVHTest ${MANTA_SCENE_LINK})
 ENDIF(SCENE_PARTICLEBVHTEST)
 
-# Boeing 777 Test Scene.
-SET(SCENE_BOEING777 0 CACHE BOOL "Boeing 777 Test Scene")
-IF(SCENE_BOEING777)
-   ADD_LIBRARY(scene_boeing777 boeing777.cc)
-   TARGET_LINK_LIBRARIES(scene_boeing777 ${MANTA_SCENE_LINK})
-ENDIF(SCENE_BOEING777)
-
 # volume
 SET(SCENE_VOLUME 0 CACHE BOOL "volume rendering")
 IF(SCENE_VOLUME)

---

• [Manta] r1646 - in trunk: Model/Groups Model/Materials Model/Textures SwigInterface scenes, abe, 08/15/2007

---

Archive powered by MHonArc 2.6.16.