Text archives Help
- From: brownlee@sci.utah.edu
- To: manta@sci.utah.edu
- Subject: [MANTA] r1597 - in trunk: Model/Groups/private Model/Textures SwigInterface scenes
- Date: Wed, 1 Aug 2007 01:05:52 -0600 (MDT)
Author: brownlee
Date: Wed Aug 1 01:05:51 2007
New Revision: 1597
Removed:
trunk/Model/Groups/private/ParticleCGT.cc
trunk/Model/Groups/private/ParticleCGT.h
trunk/scenes/pcgt.cc
trunk/scenes/pnrrd.cc
Modified:
trunk/Model/Groups/private/CMakeLists.txt
trunk/Model/Textures/CMakeLists.txt
trunk/SwigInterface/manta.i
trunk/scenes/CMakeLists.txt
Log:
ParticleCGT removed from trunk. Fixed some build problems from missing files
Modified: trunk/Model/Groups/private/CMakeLists.txt
==============================================================================
--- trunk/Model/Groups/private/CMakeLists.txt (original)
+++ trunk/Model/Groups/private/CMakeLists.txt Wed Aug 1 01:05:51 2007
@@ -3,8 +3,6 @@
${Manta_Groups_SRCS}
Groups/private/CGT.h
Groups/private/CGT.cc
- Groups/private/ParticleCGT.h
- Groups/private/ParticleCGT.cc
Groups/private/SIMD.hxx
)
SET(USE_PRIVATE_CODE_DEF "1" CACHE INTERNAL "Enable use of private code")
Modified: trunk/Model/Textures/CMakeLists.txt
==============================================================================
--- trunk/Model/Textures/CMakeLists.txt (original)
+++ trunk/Model/Textures/CMakeLists.txt Wed Aug 1 01:05:51 2007
@@ -3,8 +3,8 @@
SET( Manta_Textures_SRCS
Textures/CheckerTexture.cc
Textures/CheckerTexture.h
- Textures/TileTexture.cc
- Textures/TileTexture.h
+# Textures/TileTexture.cc
+# Textures/TileTexture.h
Textures/ColorMap.cc
Textures/ColorMap.h
Textures/Constant.cc
Modified: trunk/SwigInterface/manta.i
==============================================================================
--- trunk/SwigInterface/manta.i (original)
+++ trunk/SwigInterface/manta.i Wed Aug 1 01:05:51 2007
@@ -177,14 +177,12 @@
%{
#include <Model/Textures/Constant.h>
#include <Model/Textures/CheckerTexture.h>
-#include <Model/Textures/TileTexture.h>
#include <Model/Textures/ImageTexture.h>
#include <Model/Textures/MarbleTexture.h>
%}
%include <Model/Textures/Constant.h>
%include <Model/Textures/CheckerTexture.h>
-%include <Model/Textures/TileTexture.h>
%include <Model/Textures/ImageTexture.h>
%include <Model/Textures/MarbleTexture.h>
@@ -206,9 +204,9 @@
%template(CheckerTexture_Color) CheckerTexture<Color>;
%template(CheckerTexture_Real) CheckerTexture<Manta::Real>;
%template(CheckerTexture_ColorComponent)
CheckerTexture<Manta::ColorComponent>;
- %template(TileTexture_Color) TileTexture<Color>;
- %template(TileTexture_Real) TileTexture<Manta::Real>;
- %template(TileTexture_ColorComponent) TileTexture<Manta::ColorComponent>;
+# %template(TileTexture_Color) TileTexture<Color>;
+# %template(TileTexture_Real) TileTexture<Manta::Real>;
+# %template(TileTexture_ColorComponent) TileTexture<Manta::ColorComponent>;
%template(Constant_Color) Constant<Color>;
%template(ImageTexture_Color) ImageTexture<Manta::Color>;
%template(MarbleTexture_Color) MarbleTexture<Manta::Color>;
Modified: trunk/scenes/CMakeLists.txt
==============================================================================
--- trunk/scenes/CMakeLists.txt (original)
+++ trunk/scenes/CMakeLists.txt Wed Aug 1 01:05:51 2007
@@ -108,18 +108,6 @@
TARGET_LINK_LIBRARIES(scene_perf ${MANTA_SCENE_LINK})
ENDIF(SCENE_PERF)
-IF(BUILD_NRRDPARTICLES)
- # Viewer for NRRD particle datasets
- ADD_LIBRARY(scene_pnrrd pnrrd.cc)
- TARGET_LINK_LIBRARIES(scene_pnrrd ${MANTA_SCENE_LINK})
-
- IF(EXISTS ${PROJECT_SOURCE_DIR}/Model/Groups/private/)
- # Viewer for NRRD particle datasets using PCGT algorithm
- ADD_LIBRARY(scene_pcgt pcgt.cc)
- TARGET_LINK_LIBRARIES(scene_pcgt ${MANTA_SCENE_LINK})
-
- ENDIF(EXISTS ${PROJECT_SOURCE_DIR}/Model/Groups/private/)
-ENDIF(BUILD_NRRDPARTICLES)
# Lazily evaluated LTs for NRRD particle datasets
IF(BUILD_DYNLT)
- [MANTA] r1597 - in trunk: Model/Groups/private Model/Textures SwigInterface scenes, brownlee, 08/01/2007
Archive powered by MHonArc 2.6.16.