Commit c442580b authored by Utkarsh Ayachit's avatar Utkarsh Ayachit Committed by Kitware Robot
Browse files

Merge topic 'pvweb-fix-render-stats-style' into pv-master

d5876d34 Merge topic 'pvweb-fix-render-stats-style-gerrit' into master
79b3e209 Merge topic 'fix_poly_line_source' into master
a786577f Change framerate stats to show two decimals places.  Fix stat table.
43a9b051 Added checking for NULL pointer in a few locations
0c29a735 Merge topic 'depth_peeling_fix' into master
b677b418 Merge topic 'glyph_fix' into master
6ce3fa2c Merge topic '0015217_fix_verdict_aspect_ratio' into master
dae8f850 Merge topic 'add-wrapping-support' into master
4551c40c Allow GetTuple6 to be preperly Wrapped
46e91a5c Merge topic 'AMRVolume_GL_Backend' into master
2100f5e4 Merge topic 'debug-to-bool' into master
40f458e9 Merge topic 'more-header-guards' into master
e8b56036 Merge topic '0014419-SphereWidgetHandle' into master
f32936d0 Merge topic 'SampleFunction' into master
7beb6cc4 Make the AMR Volume mapper available for GL2 backend
4693f392 A couple depth peeling fixes
...
parents d10955f7 d5876d34
......@@ -40,7 +40,13 @@ endif()
if ("${VTK_SMP_IMPLEMENTATION_TYPE}" STREQUAL "TBB")
find_package(TBB REQUIRED)
set(VTK_SMP_IMPLEMENTATION_LIBRARIES ${TBB_LIBRARY})
set(VTK_SMP_IMPLEMENTATION_LIBRARIES "")
if (TBB_LIBRARY)
list(APPEND VTK_SMP_IMPLEMENTATION_LIBRARIES optimized ${TBB_LIBRARY})
endif()
if (TBB_LIBRARY_DEBUG)
list(APPEND VTK_SMP_IMPLEMENTATION_LIBRARIES debug ${TBB_LIBRARY_DEBUG})
endif()
set(VTK_SMP_ATOMIC_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/SMP/TBB")
include_directories(${TBB_INCLUDE_DIRS})
# This needs to be here because all modules that include vtkAtomic.h
......
......@@ -60,9 +60,9 @@ static vtkGarbageCollectorSingleton* vtkGarbageCollectorSingletonInstance;
//----------------------------------------------------------------------------
// Global debug setting. This flag specifies whether a collector
// should print debugging output. This must be default initialized to
// zero by the compiler and is therefore not initialized here. The
// false by the compiler and is therefore not initialized here. The
// ClassInitialize and ClassFinalize methods handle it.
static int vtkGarbageCollectorGlobalDebugFlag;
static bool vtkGarbageCollectorGlobalDebugFlag;
//----------------------------------------------------------------------------
// The thread identifier of the main thread. Delayed garbage
......@@ -93,13 +93,13 @@ void vtkGarbageCollector::PrintSelf(ostream& os, vtkIndent indent)
}
//----------------------------------------------------------------------------
void vtkGarbageCollector::SetGlobalDebugFlag(int flag)
void vtkGarbageCollector::SetGlobalDebugFlag(bool flag)
{
vtkGarbageCollectorGlobalDebugFlag = flag;
}
//----------------------------------------------------------------------------
int vtkGarbageCollector::GetGlobalDebugFlag()
bool vtkGarbageCollector::GetGlobalDebugFlag()
{
return vtkGarbageCollectorGlobalDebugFlag;
}
......@@ -439,7 +439,7 @@ vtkGarbageCollectorImpl::~vtkGarbageCollectorImpl()
this->Visited.clear();
// Disable debugging to avoid destruction message.
this->SetDebug(0);
this->SetDebug(false);
}
//----------------------------------------------------------------------------
......@@ -844,7 +844,7 @@ void vtkGarbageCollectorImpl::FlushEntryReferences(Entry* e)
void vtkGarbageCollector::ClassInitialize()
{
// Set default debugging state.
vtkGarbageCollectorGlobalDebugFlag = 0;
vtkGarbageCollectorGlobalDebugFlag = false;
// Record the id of the main thread.
vtkGarbageCollectorMainThread = vtkMultiThreader::GetCurrentThreadID();
......
......@@ -131,10 +131,10 @@ public:
static void DeferredCollectionPop();
// Description:
// Set/Get global garbage collection debugging flag. When set to 1,
// Set/Get global garbage collection debugging flag. When set to true,
// all garbage collection checks will produce debugging information.
static void SetGlobalDebugFlag(int flag);
static int GetGlobalDebugFlag();
static void SetGlobalDebugFlag(bool flag);
static bool GetGlobalDebugFlag();
protected:
vtkGarbageCollector();
......
......@@ -17,6 +17,10 @@
// vtkIntArray is an array of values of type int. It provides
// methods for insertion and retrieval of values and will
// automatically resize itself to hold new data.
//
// The C++ standard does not define the exact size of the int type, so use
// of this type directly is discouraged. If an array of 32 bit integers is
// needed, prefer vtkTypeInt32Array to this class.
#ifndef vtkIntArray_h
#define vtkIntArray_h
......
......@@ -17,6 +17,11 @@
// vtkLongArray is an array of values of type long. It provides
// methods for insertion and retrieval of values and will
// automatically resize itself to hold new data.
//
// The C++ standard does not define the exact size of the long type, so use
// of this type directly is discouraged. If an array of 32 bit integers is
// needed, prefer vtkTypeInt32Array to this class. If an array of 64 bit
// integers is needed, prefer vtkTypeInt64Array to this class.
#ifndef vtkLongArray_h
#define vtkLongArray_h
......
......@@ -17,6 +17,10 @@
// vtkLongLongArray is an array of values of type long long.
// It provides methods for insertion and retrieval of values and will
// automatically resize itself to hold new data.
//
// This class should not be used directly, as it only exists on systems
// where the long long type is defined. If you need a 64 bit integer
// data array, use vtkTypeInt64Array instead.
#ifndef vtkLongLongArray_h
#define vtkLongLongArray_h
......
......@@ -138,7 +138,7 @@ vtkObject *vtkObject::New()
// to zero.
vtkObject::vtkObject()
{
this->Debug = 0;
this->Debug = false;
this->SubjectHelper = NULL;
this->Modified(); // Insures modified time > than any other time
// initial reference count = 1 and reference counting on.
......@@ -191,26 +191,26 @@ void vtkObject::PrintSelf(ostream& os, vtkIndent indent)
// the modification time when enabling debug output.
void vtkObject::DebugOn()
{
this->Debug = 1;
this->Debug = true;
}
//----------------------------------------------------------------------------
// Turn debugging output off.
void vtkObject::DebugOff()
{
this->Debug = 0;
this->Debug = false;
}
//----------------------------------------------------------------------------
// Get the value of the debug flag.
unsigned char vtkObject::GetDebug()
bool vtkObject::GetDebug()
{
return this->Debug;
}
//----------------------------------------------------------------------------
// Set the value of the debug flag. A non-zero value turns debugging on.
void vtkObject::SetDebug(unsigned char debugFlag)
// Set the value of the debug flag. A true value turns debugging on.
void vtkObject::SetDebug(bool debugFlag)
{
this->Debug = debugFlag;
}
......
......@@ -73,11 +73,11 @@ public:
// Description:
// Get the value of the debug flag.
unsigned char GetDebug();
bool GetDebug();
// Description:
// Set the value of the debug flag. A non-zero value turns debugging on.
void SetDebug(unsigned char debugFlag);
// Set the value of the debug flag. A true value turns debugging on.
void SetDebug(bool debugFlag);
// Description:
// This method is called when vtkErrorMacro executes. It allows
......@@ -223,7 +223,7 @@ protected:
virtual void RegisterInternal(vtkObjectBase*, int check);
virtual void UnRegisterInternal(vtkObjectBase*, int check);
unsigned char Debug; // Enable debug messages
bool Debug; // Enable debug messages
vtkTimeStamp MTime; // Keep track of modification time
vtkSubjectHelper *SubjectHelper; // List of observers on this object
......
......@@ -17,6 +17,10 @@
// vtkShortArray is an array of values of type short. It provides
// methods for insertion and retrieval of values and will
// automatically resize itself to hold new data.
//
// The C++ standard does not define the exact size of the short type,
// so use of this type directly is discouraged. If an array of 16 bit
// integers is needed, prefer vtkTypeInt16Array to this class.
#ifndef vtkShortArray_h
#define vtkShortArray_h
......
......@@ -17,6 +17,11 @@
// vtkType@VTK_TYPE_NAME@Array is an array of values of type vtkType@VTK_TYPE_NAME@. It
// provides methods for insertion and retrieval of values and will
// automatically resize itself to hold new data.
//
// This array should be preferred for data of type @VTK_TYPE_NAME@ as this
// array will use the correct underlying datatype based on the desired number of bits
// and the current platform. The superclass of this type will change depending on the
// machine and compiler in use so that the data contained always uses the proper type.
#ifndef vtkType@VTK_TYPE_NAME@Array_h
#define vtkType@VTK_TYPE_NAME@Array_h
......
......@@ -17,6 +17,10 @@
// vtkUnsignedIntArray is an array of values of type unsigned int. It
// provides methods for insertion and retrieval of values and will
// automatically resize itself to hold new data.
//
// The C++ standard does not define the exact size of the unsigned int type,
// so use of this type directly is discouraged. If an array of 32 bit unsigned
// integers is needed, prefer vtkTypeUInt32Array to this class.
#ifndef vtkUnsignedIntArray_h
#define vtkUnsignedIntArray_h
......
......@@ -17,6 +17,12 @@
// vtkUnsignedLongArray is an array of values of type unsigned long.
// It provides methods for insertion and retrieval of values and will
// automatically resize itself to hold new data.
//
// The C++ standard does not define the exact size of the unsigned long type,
// so use of this type directly is discouraged. If an array of 32 bit
// unsigned integers is needed, prefer vtkTypeUInt32Array to this class.
// If an array of 64 bit unsigned integers is needed, prefer
// vtkUTypeInt64Array to this class.
#ifndef vtkUnsignedLongArray_h
#define vtkUnsignedLongArray_h
......
......@@ -17,6 +17,10 @@
// vtkUnsignedLongLongArray is an array of values of type unsigned long long.
// It provides methods for insertion and retrieval of values and will
// automatically resize itself to hold new data.
//
// This class should not be used directly, as it only exists on systems
// where the unsigned long long type is defined. If you need an unsigned
// 64 bit integer data array, use vtkTypeUInt64Array instead.
#ifndef vtkUnsignedLongLongArray_h
#define vtkUnsignedLongLongArray_h
......
......@@ -17,6 +17,10 @@
// vtkUnsignedShortArray is an array of values of type unsigned short.
// It provides methods for insertion and retrieval of values and will
// automatically resize itself to hold new data.
//
// The C++ standard does not define the exact size of the unsigned short type,
// so use of this type directly is discouraged. If an array of 16 bit
// unsigned integers is needed, prefer vtkTypeUInt16Array to this class.
#ifndef vtkUnsignedShortArray_h
#define vtkUnsignedShortArray_h
......
......@@ -17,6 +17,12 @@
// vtkUnsigned__Int64Array is an array of values of type unsigned __int64.
// It provides methods for insertion and retrieval of values and will
// automatically resize itself to hold new data.
//
// This class is intended to give an array of unsigned 64 bit integers
// on systems where unsigned __int64 is the only unsigned 64 bit integer
// type. If an array of unsigned 64 bit
// integers is needed, prefer vtkTypeUInt64Array, which will always uses
// the system's most appropriate datatype for unsigned 64 bit integers.
#ifndef vtkUnsigned__Int64Array_h
#define vtkUnsigned__Int64Array_h
......
......@@ -17,6 +17,11 @@
// vtk__Int64Array is an array of values of type __int64.
// It provides methods for insertion and retrieval of values and will
// automatically resize itself to hold new data.
//
// This class is intended to give an array of 64 bit integers on systems
// where __int64 is the only 64 bit integer type. If an array of 64 bit
// integers is needed, prefer vtkTypeInt64Array, which will always uses
// the system's most appropriate datatype for 64 bit integers.
#ifndef vtk__Int64Array_h
#define vtk__Int64Array_h
......
......@@ -289,8 +289,8 @@ int vtkThreadedImageAlgorithm::RequestData(
this->Threader->SetSingleMethod(vtkThreadedImageAlgorithmThreadedExecute, &str);
// always shut off debugging to avoid threading problems with GetMacros
int debug = this->Debug;
this->Debug = 0;
bool debug = this->Debug;
this->Debug = false;
this->Threader->SingleMethodExecute();
this->Debug = debug;
......
......@@ -74,12 +74,8 @@ void vtkOpenGLSphereMapper::ReplaceShaderValues(std::string &VSSource,
"uniform float invertedDepth;\n"
"uniform int cameraParallel;\n"
"varying float radiusVC;\n"
"varying vec3 centerVC;\n";
if (lightComplexity < 2)
{
replacement += "uniform mat4 VCDCMatrix;\n";
}
"varying vec3 centerVC;\n"
"uniform mat4 VCDCMatrix;\n";
substitute(FSSource,"//VTK::Normal::Dec",replacement);
substitute(FSSource,"//VTK::Normal::Impl",
......
......@@ -76,12 +76,8 @@ void vtkOpenGLStickMapper::ReplaceShaderValues(std::string &VSSource,
"varying float radiusVC;\n"
"varying vec3 orientVC;\n"
"varying float lengthVC;\n"
"varying vec3 centerVC;\n";
if (lightComplexity < 2)
{
replacement += "uniform mat4 VCDCMatrix;\n";
}
"varying vec3 centerVC;\n"
"uniform mat4 VCDCMatrix;\n";
substitute(FSSource,"//VTK::Normal::Dec",replacement);
......
......@@ -27,14 +27,18 @@ else()
if (NOT vtkRenderingCore_LOADED)
message(STATUS "vtkRenderingCore not found. No examples will be built")
else()
add_subdirectory(AMR/Cxx)
if (vtkTestingCore_LOADED)
add_subdirectory(AMR/Cxx)
add_subdirectory(ImageProcessing/Cxx)
add_subdirectory(IO/Cxx)
add_subdirectory(Medical/Cxx)
add_subdirectory(Modelling/Cxx)
add_subdirectory(MultiBlock/Cxx)
add_subdirectory(VisualizationAlgorithms/Cxx)
add_subdirectory(Widgets/Cxx)
endif()
add_subdirectory(Annotation/Cxx/LabeledMesh)
add_subdirectory(DataManipulation/Cxx)
add_subdirectory(ImageProcessing/Cxx)
add_subdirectory(IO/Cxx)
add_subdirectory(Medical/Cxx)
add_subdirectory(Modelling/Cxx)
add_subdirectory(MultiBlock/Cxx)
add_subdirectory(Rendering/Cxx)
add_subdirectory(Tutorial/Step1/Cxx)
add_subdirectory(Tutorial/Step2/Cxx)
......@@ -42,12 +46,10 @@ else()
add_subdirectory(Tutorial/Step4/Cxx)
add_subdirectory(Tutorial/Step5/Cxx)
add_subdirectory(Tutorial/Step6/Cxx)
add_subdirectory(VisualizationAlgorithms/Cxx)
add_subdirectory(VolumeRendering/Cxx)
add_subdirectory(Widgets/Cxx)
add_subdirectory(ParallelProcessing/SMP)
if(VTK_RENDERING_BACKEND STREQUAL "OpenGL")
if(VTK_RENDERING_BACKEND STREQUAL "OpenGL" AND vtkTestingCore_LOADED)
add_subdirectory(LIC/Cxx)
endif()
# if(vtkParallelCore_LOADED)
......@@ -60,7 +62,7 @@ else()
if(NOT vtkLocalExample_LOADED)
add_subdirectory(Build/vtkLocal)
endif()
if(TARGET vtkGUISupportQt)
if(TARGET vtkGUISupportQt AND vtkTestingCore_LOADED)
add_subdirectory(GUI/Qt)
endif()
endif()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment