kindred/create
1
1
Fork 0
Code Issues 44 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Gui: by default radial gradient is off

Browse Source
This commit is contained in:
wmayer
2023-04-04 14:48:19 +02:00
committed by wwmayer
parent d870201e3b
commit 6ac0de86d2
4 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/Gui/SoFCBackgroundGradient.cpp
View File

@@ -96,27 +96,28 @@ void SoFCBackgroundGradient::GLRender (SoGLRenderAction * /*action*/)
glDisable(GL_LIGHTING);
glDisable(GL_TEXTURE_2D);
if(!radial){ // linear gradient
glBegin(GL_TRIANGLE_STRIP);
if (mCol[0] < 0) {
glColor3f(fCol[0],fCol[1],fCol[2]); glVertex2f(-1, 1);
glColor3f(tCol[0],tCol[1],tCol[2]); glVertex2f(-1,-1);
glColor3f(fCol[0],fCol[1],fCol[2]); glVertex2f( 1, 1);
glColor3f(tCol[0],tCol[1],tCol[2]); glVertex2f( 1,-1);
}
else {
glColor3f(fCol[0],fCol[1],fCol[2]); glVertex2f(-1, 1);
glColor3f(mCol[0],mCol[1],mCol[2]); glVertex2f(-1, 0);
glColor3f(fCol[0],fCol[1],fCol[2]); glVertex2f( 1, 1);
glColor3f(mCol[0],mCol[1],mCol[2]); glVertex2f( 1, 0);
glEnd();
if (!radial) { // linear gradient
glBegin(GL_TRIANGLE_STRIP);
glColor3f(mCol[0],mCol[1],mCol[2]); glVertex2f(-1, 0);
glColor3f(tCol[0],tCol[1],tCol[2]); glVertex2f(-1,-1);
glColor3f(mCol[0],mCol[1],mCol[2]); glVertex2f( 1, 0);
glColor3f(tCol[0],tCol[1],tCol[2]); glVertex2f( 1,-1);
if (mCol[0] < 0) {
glColor3f(fCol[0],fCol[1],fCol[2]); glVertex2f(-1, 1);
glColor3f(tCol[0],tCol[1],tCol[2]); glVertex2f(-1,-1);
glColor3f(fCol[0],fCol[1],fCol[2]); glVertex2f( 1, 1);
glColor3f(tCol[0],tCol[1],tCol[2]); glVertex2f( 1,-1);
}
else {
glColor3f(fCol[0],fCol[1],fCol[2]); glVertex2f(-1, 1);
glColor3f(mCol[0],mCol[1],mCol[2]); glVertex2f(-1, 0);
glColor3f(fCol[0],fCol[1],fCol[2]); glVertex2f( 1, 1);
glColor3f(mCol[0],mCol[1],mCol[2]); glVertex2f( 1, 0);
glEnd();
glBegin(GL_TRIANGLE_STRIP);
glColor3f(mCol[0],mCol[1],mCol[2]); glVertex2f(-1, 0);
glColor3f(tCol[0],tCol[1],tCol[2]); glVertex2f(-1,-1);
glColor3f(mCol[0],mCol[1],mCol[2]); glVertex2f( 1, 0);
glColor3f(tCol[0],tCol[1],tCol[2]); glVertex2f( 1,-1);
}
}
} else { // radial gradient
else { // radial gradient
glBegin(GL_TRIANGLE_FAN);
glColor3f(fCol[0], fCol[1], fCol[2]); glVertex2f(0.0f, 0.0f);
@@ -133,9 +134,10 @@ void SoFCBackgroundGradient::GLRender (SoGLRenderAction * /*action*/)
glEnd();
glBegin(GL_TRIANGLE_STRIP);
for (std::size_t i = 0; i < small_oval.size(); i++){
for (std::size_t i = 0; i < small_oval.size(); i++) {
glColor3f(mCol[0], mCol[1], mCol[2]); glVertex2fv( small_oval[i] );
glColor3f(tCol[0], tCol[1], tCol[2]); glVertex2fv( big_circle[i] ); }
glColor3f(tCol[0], tCol[1], tCol[2]); glVertex2fv( big_circle[i] );
}
glColor3f(mCol[0], mCol[1], mCol[2]); glVertex2fv( small_oval.front() );
glColor3f(tCol[0], tCol[1], tCol[2]); glVertex2fv( big_circle.front() );

10
src/Gui/SoFCBackgroundGradient.h
View File

@@ -26,6 +26,7 @@
#include <Inventor/SbColor.h>
#include <Inventor/nodes/SoNode.h>
#include <Inventor/nodes/SoSubNode.h>
#include <FCGlobal.h>
class SbColor;
@@ -44,8 +45,13 @@ public:
SoFCBackgroundGradient();
void GLRender (SoGLRenderAction *action);
void setColorGradient(const SbColor& fromColor, const SbColor& toColor, bool isRadial);
void setColorGradient(const SbColor& fromColor, const SbColor& toColor, const SbColor& midColor, bool isRadial);
void setColorGradient(const SbColor& fromColor,
const SbColor& toColor,
bool isRadial);
void setColorGradient(const SbColor& fromColor,
const SbColor& toColor,
const SbColor& midColor,
bool isRadial);
private:
bool radial;

2
src/Gui/SplitView3DInventor.cpp
View File

@@ -266,7 +266,7 @@ void AbstractSplitView::OnChange(ParameterGrp::SubjectType &rCaller,ParameterGrp
}
else if ( strcmp(Reason,"Gradient") == 0 || strcmp(Reason, "RadialGradient") == 0 ) {
for (std::vector<View3DInventorViewer*>::iterator it = _viewer.begin(); it != _viewer.end(); ++it)
(*it)->setGradientBackground(rGrp.GetBool("Gradient", true) || rGrp.GetBool("RadialGradient", true));
(*it)->setGradientBackground(rGrp.GetBool("Gradient", true) || rGrp.GetBool("RadialGradient", false));
}
else if (strcmp(Reason,"ShowFPS") == 0) {
for (std::vector<View3DInventorViewer*>::iterator it = _viewer.begin(); it != _viewer.end(); ++it)

2
src/Gui/View3DSettings.cpp
View File

@@ -235,7 +235,7 @@ void View3DSettings::OnChange(ParameterGrp::SubjectType &rCaller,ParameterGrp::M
_viewer->setAnimationEnabled(rGrp.GetBool("UseAutoRotation", false));
}
else if (strcmp(Reason,"Gradient") == 0 || strcmp(Reason,"RadialGradient") == 0) {
_viewer->setGradientBackground(rGrp.GetBool("Gradient", true) || rGrp.GetBool("RadialGradient", true));
_viewer->setGradientBackground(rGrp.GetBool("Gradient", true) || rGrp.GetBool("RadialGradient", false));
}
else if (strcmp(Reason,"ShowFPS") == 0) {
_viewer->setEnabledFPSCounter(rGrp.GetBool("ShowFPS", false));