menu/modelview_matrix_cache: add helper class

Use the new ModelviewMatrixCache to cache the current state of the
opengl MODELVIEW_MATRIX.

3 files changed, 91 insertions, 6 deletions

diff --git a/src/menu/container.cpp b/src/menu/container.cpp
index d4808ee3..d225ef1e 100644
--- a/src/menu/container.cpp
+++ b/src/menu/container.cpp
@@ -22,10 +22,9 @@
  *
  */
 
-#include <GL/gl.h>
-
 #include "container.hpp"
 #include "frame.hpp"
+#include "modelview_matrix_cache.hpp"
 
 namespace usdx
 {
@@ -62,13 +61,11 @@ namespace usdx
 			frame->repaint();
 		}
 
-		GLfloat matrix[16];
-		glGetFloatv(GL_MODELVIEW_MATRIX, matrix);
-
+		ModelviewMatrixCache c;
 		for (std::list<DrawableControl*>::iterator it =
 			     controls.begin(); it != controls.end(); it++) {
 			(*it)->repaint();
-			glLoadMatrixf(matrix);
+			c.restore();
 		}
 	}
 
diff --git a/src/menu/modelview_matrix_cache.cpp b/src/menu/modelview_matrix_cache.cpp
new file mode 100644
index 00000000..180f8af4
--- /dev/null
+++ b/src/menu/modelview_matrix_cache.cpp
@@ -0,0 +1,43 @@
+/*
+ * UltraStar Deluxe - Karaoke Game
+ *
+ * UltraStar Deluxe is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "modelview_matrix_cache.hpp"
+
+namespace usdx
+{
+	ModelviewMatrixCache::ModelviewMatrixCache()
+	{
+		glGetFloatv(GL_MODELVIEW_MATRIX, cache);
+	}
+
+	ModelviewMatrixCache::~ModelviewMatrixCache()
+	{
+		restore();
+	}
+
+	void ModelviewMatrixCache::restore(void) const
+	{
+		glLoadMatrixf(cache);
+	}
+};
diff --git a/src/menu/modelview_matrix_cache.hpp b/src/menu/modelview_matrix_cache.hpp
new file mode 100644
index 00000000..766ac46a
--- /dev/null
+++ b/src/menu/modelview_matrix_cache.hpp
@@ -0,0 +1,45 @@
+/*
+ * UltraStar Deluxe - Karaoke Game
+ *
+ * UltraStar Deluxe is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef MODELVIEW_MATRIX_CACHE_HPP
+#define MODELVIEW_MATRIX_CACHE_HPP
+
+#include <GL/gl.h>
+
+namespace usdx
+{
+    class ModelviewMatrixCache
+	{
+	private:
+		GLfloat cache[16];
+
+	public:
+		ModelviewMatrixCache();
+		virtual ~ModelviewMatrixCache();
+
+		void restore(void) const;
+ 	};
+};
+
+#endif