Merge pull request #10 from LIHPC-Computational-Geometry/5.9.0-dev

Release 5.9.0. Improvements to the vtkViewCubeActor class: a second click on a face cancels the roll, and the text is pressed as close as possible to the faces. Highlighting of the hovered face.

Author: CharlesPignerol

cmake/version.cmake

@@ -3,7 +3,7 @@
 #
 
 set (VTK_CONTRIB_MAJOR_VERSION "5")
-set (VTK_CONTRIB_MINOR_VERSION "8")
+set (VTK_CONTRIB_MINOR_VERSION "9")
 set (VTK_CONTRIB_RELEASE_VERSION "0")
 set (VTK_CONTRIB_VERSION ${VTK_CONTRIB_MAJOR_VERSION}.${VTK_CONTRIB_MINOR_VERSION}.${VTK_CONTRIB_RELEASE_VERSION})
 

src/VtkContrib/public/VtkContrib/vtkViewCubeActor.h

@@ -8,6 +8,7 @@
 
 #include <vtkPropAssembly.h>
 #include <vtkActor.h>
+#include <vtkDoubleArray.h>
 #include <vtkPolyData.h>
 #include <vtkPolyDataMapper.h>
 #include <vtkCellPicker.h>
@@ -87,6 +88,11 @@ class vtkViewCubeActor : public vtkPropAssembly
 	 */
 	virtual void PickCallback (int x, int y);
 
+	/**
+	 * Regarde si une face du cube est pointée aux coordonnées transmises et, le cas échéant, met cette face en surbrillance. Annule ue éventuelle surbrillance antérieure d'une autre face.
+	 */
+	virtual void HighlightCallback (int x, int y);
+	
 
 	protected:
 
@@ -107,22 +113,28 @@ class vtkViewCubeActor : public vtkPropAssembly
 	vtkViewCubeActor (const vtkViewCubeActor&);
 	vtkViewCubeActor& operator = (const vtkViewCubeActor&);
 
-	vtkRenderer			*Renderer, *DrivenRenderer;
+	vtkRenderer								*Renderer, *DrivenRenderer;
 
 	/** Le "cube". */
-	vtkSmartPointer<vtkPolyData>		CubePolyData;
-	vtkSmartPointer<vtkActor>			CubeActor;
-	vtkSmartPointer<vtkPolyDataMapper>	CubePolyDataMapper;
+	vtkSmartPointer<vtkPolyData>			CubePolyData, HighlightPolyData;
+	vtkSmartPointer<vtkActor>				CubeActor, HighlightActor;
+	vtkSmartPointer<vtkPolyDataMapper>		CubePolyDataMapper, HighlightPolyDataMapper;
 
 	/** Le picking sur les faces du ViewCube. */
-	vtkSmartPointer<vtkCellPicker>		CellPicker;
+	vtkSmartPointer<vtkCellPicker>			CellPicker;
+
+	/** La dernière face pickée, éventuelle face en cours de surbrillance. */
+	unsigned char							LastPickedFace, HighlightedFace;
 
 	/** Les labels. */
-	vtkSmartPointer<vtkVectorText>		XPlusVectorText, XMinusVectorText, YPlusVectorText, YMinusVectorText, ZPlusVectorText, ZMinusVectorText;
-	vtkSmartPointer<vtkActor>			XPlusActor, XMinusActor, YPlusActor, YMinusActor, ZPlusActor, ZMinusActor;
+	vtkSmartPointer<vtkVectorText>			XPlusVectorText, XMinusVectorText, YPlusVectorText, YMinusVectorText, ZPlusVectorText, ZMinusVectorText;
+	vtkSmartPointer<vtkActor>				XPlusActor, XMinusActor, YPlusActor, YMinusActor, ZPlusActor, ZMinusActor;
 
+	/** Les vecteurs "orientation vers le haut". */
+	vtkSmartPointer<vtkDoubleArray>			ViewUpVectors;
+	
 	/** L'éventuelle transformation utilisateur. */
-	vtkTransform	*Transform;
+	vtkTransform							*Transform;
 };	// class vtkViewCubeActor