Commit a00d6483 authored by Mike Kremer's avatar Mike Kremer
Browse files

Added mipmapping optiuon to state

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@9887 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 0ae5456e
...@@ -77,6 +77,7 @@ GLState::GLState(bool _updateGL) ...@@ -77,6 +77,7 @@ GLState::GLState(bool _updateGL)
max_render_passes_(1), max_render_passes_(1),
multisampling_(false), multisampling_(false),
allow_multisampling_(true), allow_multisampling_(true),
mipmapping_(true),
updateGL_(_updateGL), updateGL_(_updateGL),
blending_(false), blending_(false),
msSinceLastRedraw_ (1) msSinceLastRedraw_ (1)
......
...@@ -439,7 +439,7 @@ public: ...@@ -439,7 +439,7 @@ public:
void set_multisampling( bool _b ); void set_multisampling( bool _b );
/// Get current multisampling state /// Get current multisampling state
bool multisampling(){ return multisampling_; }; bool multisampling() { return multisampling_; };
/// Disable multisampling globally /// Disable multisampling globally
void allow_multisampling( bool _b ) { allow_multisampling_ = _b; }; void allow_multisampling( bool _b ) { allow_multisampling_ = _b; };
...@@ -450,6 +450,20 @@ public: ...@@ -450,6 +450,20 @@ public:
/// Get max number of available texture units /// Get max number of available texture units
int max_texture_units() const { return num_texture_units_; } int max_texture_units() const { return num_texture_units_; }
//--- Mipmapping ------------------------------------------------------------
/** \brief Allow mipmapping globally
*
* Note: This actually does not change the opengl state
* since mipmapping is turned on/off via texture parameters
* To change the behaviour see in TextureNode
*/
void allow_mipmapping(bool _b) { mipmapping_ = _b; }
/// Get current global mipmapping state
bool mipmapping_allowed() const { return mipmapping_; }
//--- picking --------------------------------------------------------------- //--- picking ---------------------------------------------------------------
/** Follows the OpenGL selection buffer implementation (OpenGL Red Book Chapter 13) /** Follows the OpenGL selection buffer implementation (OpenGL Red Book Chapter 13)
...@@ -554,6 +568,9 @@ private: //-------------------------------------------------------------------- ...@@ -554,6 +568,9 @@ private: //--------------------------------------------------------------------
int num_texture_units_; int num_texture_units_;
// Mipmapping settings
bool mipmapping_;
// helper: should GL matrices be updated // helper: should GL matrices be updated
bool updateGL_; bool updateGL_;
......
Supports Markdown
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