From 5fa3d9e80212271231dd539867688fb4b74cd62f Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Wed, 8 Jul 2009 17:51:17 +0000 Subject: Rename GL_Drawer to GL_Writer for consistency. --- libdimensionxx/dimensionxx/gl.hpp | 14 +++++++------- libdimensionxx/gl.cpp | 22 +++++++++++----------- 2 files changed, 18 insertions(+), 18 deletions(-) (limited to 'libdimensionxx') diff --git a/libdimensionxx/dimensionxx/gl.hpp b/libdimensionxx/dimensionxx/gl.hpp index d52ade5..dcf02f2 100644 --- a/libdimensionxx/dimensionxx/gl.hpp +++ b/libdimensionxx/dimensionxx/gl.hpp @@ -28,21 +28,21 @@ namespace Dimension { - class GL_Drawer + class GL_Writer { public: - GL_Drawer(Canvas& canvas); - ~GL_Drawer(); + GL_Writer(Canvas& canvas); + ~GL_Writer(); - void draw(); + void write(); private: // Copying prohibited - GL_Drawer(const GL_Drawer&); - GL_Drawer& operator=(const GL_Drawer&); + GL_Writer(const GL_Writer&); + GL_Writer& operator=(const GL_Writer&); Canvas* m_canvas; - bool m_drawn; + bool m_written; }; class GL_Reader diff --git a/libdimensionxx/gl.cpp b/libdimensionxx/gl.cpp index aa54aed..7d0c0a3 100644 --- a/libdimensionxx/gl.cpp +++ b/libdimensionxx/gl.cpp @@ -23,36 +23,36 @@ namespace Dimension { - GL_Drawer::GL_Drawer(Canvas& canvas) - : m_canvas(&canvas), m_drawn(false) + GL_Writer::GL_Writer(Canvas& canvas) + : m_canvas(&canvas), m_written(false) { - // Optimize the canvas for GL drawing + // Optimize the canvas for GL writeing dmnsn_gl_optimize_canvas(m_canvas->dmnsn()); } - // Draw the canvas if it hasn't been drawn yet - GL_Drawer::~GL_Drawer() + // Draw the canvas if it hasn't been writen yet + GL_Writer::~GL_Writer() { - if (!m_drawn) { + if (!m_written) { try { - draw(); + write(); } catch (...) { dmnsn_error(SEVERITY_MEDIUM, - "Drawing canvas to GL failed in GL_Drawer destructor."); + "Drawing canvas to GL failed in GL_Writer destructor."); } } } // Draw the canvas to the current openGL buffer - void GL_Drawer::draw() + void GL_Writer::write() { // Draw to the GL buffer if (dmnsn_gl_write_canvas(m_canvas->dmnsn()) != 0) { - // The drawing operation failed + // The writeing operation failed throw Dimension_Error("Drawing canvas to GL failed."); } - m_drawn = true; // Don't draw again in destructor + m_written = true; // Don't write again in destructor } // No-op -- cgit v1.2.3