Skip to content

Commit

Permalink
Remove unused RGBA color window (RgbaWin)
Browse files Browse the repository at this point in the history
It's four sliders and they where added into TextureWindow directly.
  • Loading branch information
zturtleman committed Jul 2, 2019
1 parent 0f41707 commit 6148a65
Show file tree
Hide file tree
Showing 10 changed files with 0 additions and 761 deletions.
4 changes: 0 additions & 4 deletions Makefile.generic
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,6 @@ MM3D_UI= \
${B}/qtui/objprompt.base.h \
${B}/qtui/smdprompt.base.h \
${B}/qtui/pluginwin.base.h \
${B}/qtui/rgbawin.base.h \
${B}/qtui/statusbar.base.h \
${B}/qtui/texturecoord.base.h \
${B}/qtui/textwin.base.h \
Expand Down Expand Up @@ -504,7 +503,6 @@ MM3D_MOC= \
${B}/implui/pluginwin.moc.cc \
${B}/tools/polytoolwidget.moc.cc \
${B}/tools/projtoolwidget.moc.cc \
${B}/implui/rgbawin.moc.cc \
${B}/tools/scaletoolwidget.moc.cc \
${B}/tools/selectfacetoolwidget.moc.cc \
${B}/implui/spherifywin.moc.cc \
Expand Down Expand Up @@ -570,7 +568,6 @@ MM3D_MOC_OBJ= \
${B}/implui/pluginwin.moc.o \
${B}/tools/polytoolwidget.moc.o \
${B}/tools/projtoolwidget.moc.o \
${B}/implui/rgbawin.moc.o \
${B}/tools/scaletoolwidget.moc.o \
${B}/tools/selectfacetoolwidget.moc.o \
${B}/implui/spherifywin.moc.o \
Expand Down Expand Up @@ -685,7 +682,6 @@ MM3D_OBJ= \
${B}/implui/qttex.o \
${B}/tools/rectangletool.o \
${B}/qtui/resources.o \
${B}/implui/rgbawin.o \
${B}/mm3dcore/rotatepoint.o \
${B}/commands/rotatetexcmd.o \
${B}/tools/rotatetool.o \
Expand Down
3 changes: 0 additions & 3 deletions src/implui/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ libimplui_HFILES = \
projectionwin.h \
qtmain.h \
qttex.h \
rgbawin.h \
smdprompt.h \
spherifywin.h \
statusbar.h \
Expand Down Expand Up @@ -98,7 +97,6 @@ libimplui_MOC = \
newanim.moc.cc \
objprompt.moc.cc \
pluginwin.moc.cc \
rgbawin.moc.cc \
smdprompt.moc.cc \
spherifywin.moc.cc \
statusbar.moc.cc \
Expand Down Expand Up @@ -158,7 +156,6 @@ libimplui_a_SOURCES = \
projectionwin.cc \
qtmain.cc \
qttex.cc \
rgbawin.cc \
smdprompt.cc \
spherifywin.cc \
statusbar.cc \
Expand Down
182 changes: 0 additions & 182 deletions src/implui/rgbawin.cc

This file was deleted.

76 changes: 0 additions & 76 deletions src/implui/rgbawin.h

This file was deleted.

32 changes: 0 additions & 32 deletions src/implui/texwin.cc
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@
#include "texture.h"
#include "texmgr.h"
#include "log.h"
#include "rgbawin.h"
#include "valuewin.h"
#include "decalmgr.h"
#include "msg.h"
#include "3dmprefs.h"
Expand Down Expand Up @@ -263,34 +261,6 @@ void TextureWindow::clampTChangedEvent( int index )
}
}

/*
void TextureWindow::shininessClickedEvent()
{
int id = (unsigned) m_textureComboBox->currentIndex() - 1;
float val;
if ( m_model->getTextureShininess( id, val) )
{
ValueWin value;
value.setLabel( "Shininess" );
value.setValue( val );
if ( value.exec() )
{
val = value.getValue();
m_model->setTextureShininess( id, val );
DecalManager::getInstance()->modelUpdated( m_model );
}
}
else
{
log_error( "could not get shininess values for %d\n", id );
}
}
*/

void TextureWindow::textureChangedEvent( int id )
{
m_textureFrame->textureChangedEvent( id );
Expand Down Expand Up @@ -464,8 +434,6 @@ void TextureWindow::lightValueChanged( int index )

if ( haveLighting )
{
RgbaWin rgba;

m_setting = true;
m_redSlider->setValue( (int) (val[0] * 100) );
m_greenSlider->setValue( (int) (val[1] * 100) );
Expand Down
1 change: 0 additions & 1 deletion src/implui/texwin.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
#include <QtWidgets/QDialog>

class Model;
class RgbaWin;

class TextureWindow : public QDialog, public Ui::TextureWindowBase
{
Expand Down
2 changes: 0 additions & 2 deletions src/implui/transformwin.cc
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@
#include "texture.h"
#include "texmgr.h"
#include "log.h"
#include "rgbawin.h"
#include "valuewin.h"
#include "decalmgr.h"
#include "msg.h"
#include "3dmprefs.h"
Expand Down
1 change: 0 additions & 1 deletion src/implui/transformwin.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
#include <QtWidgets/QDialog>

class Model;
class RgbaWin;

class TransformWindow : public QDialog, public Ui::TransformWindowBase
{
Expand Down
Loading

0 comments on commit 6148a65

Please sign in to comment.