Gui: Move texture handling to view provider extension

It should be avoided to add all stuff to the base class when it's only needed in one sub-class

src/Mod/Part/Gui/ViewProviderExt.cpp

@@ -125,6 +125,8 @@ const char* ViewProviderPartExt::DrawStyleEnums[]= {"Solid","Dashed","Dotted","D
 
 ViewProviderPartExt::ViewProviderPartExt()
 {
+    texture.initExtension(this);
+
     VisualTouched = true;
     forceUpdateCount = 0;
     NormalsFromUV = true;
@@ -221,14 +223,6 @@ ViewProviderPartExt::ViewProviderPartExt()
     nodeset = new SoBrepPointSet();
     nodeset->ref();
 
-    // Support for textured faces
-    pcShapeTexture3D = new SoTexture3;
-    pcShapeTexture3D->ref();
-    pcShapeCoordinates = new SoCoordinate3;
-    pcShapeCoordinates->ref();
-    pcShapeFaceset = new SoIndexedFaceSet;
-    pcShapeFaceset->ref();
-
     pcFaceBind = new SoMaterialBinding();
     pcFaceBind->ref();
 
@@ -280,10 +274,6 @@ ViewProviderPartExt::~ViewProviderPartExt()
     normb->unref();
     lineset->unref();
     nodeset->unref();
-
-    pcShapeTexture3D->unref();
-    pcShapeCoordinates->unref();
-    pcShapeFaceset->unref();
 }
 
 PyObject* ViewProviderPartExt::getPyObject()
@@ -467,10 +457,8 @@ void ViewProviderPartExt::attach(App::DocumentObject *pcFeat)
     // just faces with no edges or points
     pcFlatRoot->addChild(pShapeHints);
     pcFlatRoot->addChild(pcFaceBind);
-    pcFlatRoot->addChild(pcSwitchAppearance);
-    pcTextureGroup3D->addChild(pcShapeTexture3D);
-    pcTextureGroup3D->addChild(pcShapeCoordinates);
-    pcTextureGroup3D->addChild(pcShapeFaceset);
+    pcFlatRoot->addChild(texture.getAppearance());
+    texture.setup(pcShapeMaterial);
     SoDrawStyle* pcFaceStyle = new SoDrawStyle();
     pcFaceStyle->style = SoDrawStyle::FILLED;
     pcFlatRoot->addChild(pcFaceStyle);
@@ -630,7 +618,7 @@ void ViewProviderPartExt::setHighlightedFaces(const std::vector<App::Material>&
     int size = static_cast<int>(materials.size());
     if (size > 1 && size == this->faceset->partIndex.getNum()) {
         pcFaceBind->value = SoMaterialBinding::PER_PART;
-        activateMaterial();
+        texture.activateMaterial();
 
         pcShapeMaterial->diffuseColor.setNum(size);
         pcShapeMaterial->ambientColor.setNum(size);
@@ -669,7 +657,7 @@ void ViewProviderPartExt::setHighlightedFaces(const App::PropertyMaterialList& a
     int size = static_cast<int>(appearance.getSize());
     if (size > 1 && size == this->faceset->partIndex.getNum()) {
         pcFaceBind->value = SoMaterialBinding::PER_PART;
-        activateMaterial();
+        texture.activateMaterial();
 
         pcShapeMaterial->diffuseColor.setNum(size);
         pcShapeMaterial->ambientColor.setNum(size);

src/Mod/Part/Gui/ViewProviderExt.h

@@ -27,6 +27,7 @@
 
 #include <App/PropertyUnits.h>
 #include <Gui/ViewProviderGeometryObject.h>
+#include <Gui/ViewProviderTextureExtension.h>
 
 #include <Mod/Part/App/PartFeature.h>
 #include <Mod/Part/PartGlobal.h>
@@ -52,7 +53,6 @@ class SoNormal;
 class SoNormalBinding;
 class SoMaterialBinding;
 class SoIndexedLineSet;
-class SoTexture3;
 
 namespace PartGui {
 
@@ -86,8 +86,6 @@ public:
     App::PropertyColor LineColor;
     App::PropertyMaterial LineMaterial;
     App::PropertyColorList LineColorArray;
-    // Faces (Gui::ViewProviderGeometryObject::ShapeAppearance and Gui::ViewProviderGeometryObject::ShapeMaterial apply)
-    // App::PropertyColorList DiffuseColor;
 
     void attach(App::DocumentObject *) override;
     void setDisplayMode(const char* ModeName) override;
@@ -186,15 +184,11 @@ protected:
     SoBrepEdgeSet     * lineset;
     SoBrepPointSet    * nodeset;
 
-    // Used to support per face textures
-    SoTexture3        * pcShapeTexture3D;
-    SoCoordinate3     * pcShapeCoordinates;
-    SoIndexedFaceSet  * pcShapeFaceset;
-
     bool VisualTouched;
     bool NormalsFromUV;
 
 private:
+    Gui::ViewProviderFaceTexture texture;
     // settings stuff
     int forceUpdateCount;
     static App::PropertyFloatConstraint::Constraints sizeRange;