[GEM-cvs] SF.net SVN: pd-gem:[3127] trunk/Gem/src/Pixes
Brought to you by:
zmoelnig
From: <zmo...@us...> - 2010-01-28 18:40:45
|
Revision: 3127 http://pd-gem.svn.sourceforge.net/pd-gem/?rev=3127&view=rev Author: zmoelnig Date: 2010-01-28 18:40:39 +0000 (Thu, 28 Jan 2010) Log Message: ----------- enhanced the setModified() to call rebuildList() Modified Paths: -------------- trunk/Gem/src/Pixes/pix_texture.cpp trunk/Gem/src/Pixes/pix_texture.h Modified: trunk/Gem/src/Pixes/pix_texture.cpp =================================================================== --- trunk/Gem/src/Pixes/pix_texture.cpp 2010-01-28 18:39:21 UTC (rev 3126) +++ trunk/Gem/src/Pixes/pix_texture.cpp 2010-01-28 18:40:39 UTC (rev 3127) @@ -46,7 +46,7 @@ pix_texture :: pix_texture() : m_textureOnOff(1), m_textureQuality(GL_LINEAR), m_repeat(GL_REPEAT), - m_didTexture(false), m_rebuildList(0), + m_didTexture(false), m_rebuildList(false), m_textureObj(0), m_extTextureObj(0), m_extWidth(1.), m_extHeight(1.), m_extType(GL_TEXTURE_2D), m_extUpsidedown(false), @@ -223,7 +223,7 @@ // ///////////////////////////////////////////////////////// void pix_texture :: render(GemState *state) { - m_didTexture=0; + m_didTexture=false; pushTexCoords(state); if(!m_textureOnOff)return; @@ -521,8 +521,8 @@ glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, m_env); /* cleanup */ - m_rebuildList = 0; - m_didTexture=1; + m_rebuildList = false; + m_didTexture=true; state->multiTexUnits = m_numTexUnits; state->texture = 1; @@ -604,7 +604,18 @@ } + //////////////////////////////////////////////////////// +// textureQuality +// +///////////////////////////////////////////////////////// +void pix_texture :: setModified() +{ + m_rebuildList=true; + GemBase::setModified(); +} + +//////////////////////////////////////////////////////// // textureOnOff // ///////////////////////////////////////////////////////// @@ -648,7 +659,7 @@ else post("using mode 0: TEXTURE_2D"); - m_rebuildList=1; + setModified(); } //////////////////////////////////////////////////////// @@ -728,7 +739,7 @@ } m_numPbo=num; - m_rebuildList=1; + setModified(); } Modified: trunk/Gem/src/Pixes/pix_texture.h =================================================================== --- trunk/Gem/src/Pixes/pix_texture.h 2010-01-28 18:39:21 UTC (rev 3126) +++ trunk/Gem/src/Pixes/pix_texture.h 2010-01-28 18:40:39 UTC (rev 3127) @@ -73,8 +73,12 @@ ////////// // Delete texture object virtual void stopRendering(); - + ////////// + // if we need to rebuild the list + virtual void setModified(); + + ////////// // Turn on/off texture mapping void textureOnOff(int on); int m_textureOnOff; @@ -102,7 +106,7 @@ ////////// // Do we need to rebuild the display List - int m_rebuildList; + GemContextData<GLboolean> m_rebuildList; ////////// // The size of the texture (so we can use sub image) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |