Commit dc81130f authored by Jan Möbius's avatar Jan Möbius

More documentation

Removed unused variable

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@5644 383ad7c9-94d9-4d36-a494-682f7c89f535
parent d1c1caa1
......@@ -590,19 +590,6 @@ void TextureControlPlugin::updateDialog() {
// if ( textures_.size() == 0 )
// return;
//
// int textureid = -1;
// for ( int i = 0 ; i < (int)textures_.size() ; ++i ) {
// if ( textures_[i].name == activeTexture_ ) {
// textureid = i;
// break;
// }
// }
//
// if ( textureid == -1 ) {
// emit log(LOGERR,"Active Texture not found");
// return;
// }
//
// settingsDialog_->repeatBox->setChecked(textures_[textureid].repeat);
// settingsDialog_->clampBox->setChecked(textures_[textureid].clamp);
// settingsDialog_->centerBox->setChecked(textures_[textureid].center);
......
......@@ -124,6 +124,8 @@ class TextureControlPlugin : public QObject, BaseInterface, TextureInterface, Me
// LoadSaveInterface
void fileOpened( int _id );
// TODO: Empty object added has to create textures as well!
private slots:
/// Called when an action in the TextureMenu is triggered
void slotTextureMenu(QAction* _action);
......@@ -147,18 +149,11 @@ class TextureControlPlugin : public QObject, BaseInterface, TextureInterface, Me
QString description( ) { return (QString("Handles Textures which are written to mesh properties")); };
private :
QMenu *textureMenu_;
QActionGroup* actionGroup_;
QAction* AC_Texture_Settings;
QString activeTexture_;
TextureData globalTextures_;
std::vector<QAction*> textureActions_;
texturePropertiesWidget* settingsDialog_;
/// Set the active texture values to the values in the dialog box.
......@@ -167,7 +162,6 @@ class TextureControlPlugin : public QObject, BaseInterface, TextureInterface, Me
/// Update the values in the Dialog box to the current ones
void updateDialog();
/// Take a scalar value and return a clamped,... depending on texture settings
inline
void computeValue(Texture& _texture, double _min, double _max, double& _value);
......@@ -223,7 +217,24 @@ class TextureControlPlugin : public QObject, BaseInterface, TextureInterface, Me
/** @} */
//===========================================================================
/** @name Context Menu stuff
/** @name Global texture menu
* @{ */
//===========================================================================
private:
// Global Texture menu
QMenu *textureMenu_;
// Action group for global texture menu
QActionGroup* actionGroup_;
// All actions in the global texture menu
std::vector<QAction*> textureActions_;
/** @} */
//===========================================================================
/** @name Context Menu
* @{ */
//===========================================================================
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment