forked from FreeCAD/FreeCAD
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Gui: From textture handling to ViewProviderTextureExtension
It should be avoided to add all stuff to the ViewProviderGeometryObject base class when it's only needed in one or more sub-classes
- Loading branch information
Showing
6 changed files
with
230 additions
and
91 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,141 @@ | ||
| // SPDX-License-Identifier: LGPL-2.1-or-later | ||
|
|
||
| /*************************************************************************** | ||
| * Copyright (c) 2024 David Carter <dcarter@david.carter.ca> * | ||
| * * | ||
| * This file is part of FreeCAD. * | ||
| * * | ||
| * FreeCAD is free software: you can redistribute it and/or modify it * | ||
| * under the terms of the GNU Lesser General Public License as * | ||
| * published by the Free Software Foundation, either version 2.1 of the * | ||
| * License, or (at your option) any later version. * | ||
| * * | ||
| * FreeCAD is distributed in the hope that it will be useful, but * | ||
| * WITHOUT ANY WARRANTY; without even the implied warranty of * | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * | ||
| * Lesser General Public License for more details. * | ||
| * * | ||
| * You should have received a copy of the GNU Lesser General Public * | ||
| * License along with FreeCAD. If not, see * | ||
| * <https://www.gnu.org/licenses/>. * | ||
| * * | ||
| **************************************************************************/ | ||
|
|
||
| #include "PreCompiled.h" | ||
| #ifndef _PreComp_ | ||
| #include <Inventor/nodes/SoMaterial.h> | ||
| #include <Inventor/nodes/SoSwitch.h> | ||
| #include <Inventor/nodes/SoTexture2.h> | ||
| #endif | ||
|
|
||
| #include "ViewProviderTextureExtension.h" | ||
| #include <Gui/BitmapFactory.h> | ||
| #include <App/Material.h> | ||
|
|
||
|
|
||
| using namespace Gui; | ||
|
|
||
|
|
||
| EXTENSION_PROPERTY_SOURCE(Gui::ViewProviderTextureExtension, Gui::ViewProviderExtension) | ||
|
|
||
|
|
||
| ViewProviderTextureExtension::ViewProviderTextureExtension() | ||
| { | ||
| initExtensionType(ViewProviderTextureExtension::getExtensionClassTypeId()); | ||
| } | ||
|
|
||
| void ViewProviderTextureExtension::setup(SoMaterial* pcShapeMaterial) | ||
| { | ||
| pcSwitchAppearance = new SoSwitch; | ||
| pcSwitchAppearance->ref(); | ||
| pcSwitchTexture = new SoSwitch; | ||
| pcSwitchTexture->ref(); | ||
|
|
||
| pcShapeTexture2D = new SoTexture2; | ||
| pcShapeTexture2D->ref(); | ||
|
|
||
| pcTextureGroup3D = new SoGroup; | ||
| pcTextureGroup3D->ref(); | ||
|
|
||
| // Materials go first, with textured faces drawing over them | ||
| pcSwitchAppearance->addChild(pcShapeMaterial); | ||
| pcSwitchAppearance->addChild(pcSwitchTexture); | ||
| pcSwitchTexture->addChild(pcShapeTexture2D); | ||
| pcSwitchTexture->addChild(pcTextureGroup3D); | ||
| pcSwitchAppearance->whichChild.setValue(0); | ||
| pcSwitchTexture->whichChild.setValue(SO_SWITCH_NONE); | ||
| } | ||
|
|
||
| ViewProviderTextureExtension::~ViewProviderTextureExtension() | ||
| { | ||
| pcSwitchAppearance->unref(); | ||
| pcSwitchTexture->unref(); | ||
| pcShapeTexture2D->unref(); | ||
| pcTextureGroup3D->unref(); | ||
| } | ||
|
|
||
| SoSwitch* ViewProviderTextureExtension::getAppearance() const | ||
| { | ||
| return pcSwitchAppearance; | ||
| } | ||
|
|
||
| void ViewProviderTextureExtension::setCoinAppearance(SoMaterial* pcShapeMaterial, const App::Material& source) | ||
| { | ||
| #if 0 | ||
| if (!source.image.empty()) { | ||
| Base::Console().Log("setCoinAppearance(Texture)\n"); | ||
| activateTexture2D(); | ||
|
|
||
| QByteArray by = QByteArray::fromBase64(QString::fromStdString(source.image).toUtf8()); | ||
| auto image = QImage::fromData(by, "PNG"); //.scaled(64, 64, Qt::KeepAspectRatio); | ||
|
|
||
| SoSFImage texture; | ||
| Gui::BitmapFactory().convert(image, texture); | ||
| pcShapeTexture2D->image = texture; | ||
| } else { | ||
| Base::Console().Log("setCoinAppearance(Material)\n"); | ||
| activateMaterial(); | ||
| } | ||
| #endif | ||
| activateMaterial(); | ||
|
|
||
| // Always set the material for items such as lines that don't support textures | ||
| pcShapeMaterial->ambientColor.setValue(source.ambientColor.r, | ||
| source.ambientColor.g, | ||
| source.ambientColor.b); | ||
| pcShapeMaterial->diffuseColor.setValue(source.diffuseColor.r, | ||
| source.diffuseColor.g, | ||
| source.diffuseColor.b); | ||
| pcShapeMaterial->specularColor.setValue(source.specularColor.r, | ||
| source.specularColor.g, | ||
| source.specularColor.b); | ||
| pcShapeMaterial->emissiveColor.setValue(source.emissiveColor.r, | ||
| source.emissiveColor.g, | ||
| source.emissiveColor.b); | ||
| pcShapeMaterial->shininess.setValue(source.shininess); | ||
| pcShapeMaterial->transparency.setValue(source.transparency); | ||
| } | ||
|
|
||
| void ViewProviderTextureExtension::activateMaterial() | ||
| { | ||
| pcSwitchAppearance->whichChild.setValue(0); | ||
| pcSwitchTexture->whichChild.setValue(SO_SWITCH_NONE); | ||
| } | ||
|
|
||
| void ViewProviderTextureExtension::activateTexture2D() | ||
| { | ||
| pcSwitchAppearance->whichChild.setValue(1); | ||
| pcSwitchTexture->whichChild.setValue(0); | ||
| } | ||
|
|
||
| void ViewProviderTextureExtension::activateTexture3D() | ||
| { | ||
| pcSwitchAppearance->whichChild.setValue(1); | ||
| pcSwitchTexture->whichChild.setValue(1); | ||
| } | ||
|
|
||
| void ViewProviderTextureExtension::activateMixed3D() | ||
| { | ||
| pcSwitchAppearance->whichChild.setValue(SO_SWITCH_ALL); | ||
| pcSwitchTexture->whichChild.setValue(1); | ||
| } |
Oops, something went wrong.