Commit: c974a42f23b7092a370d1c594eb1e782da9f61c8 - HotshotOgreIOS (hg)

Commit MetaInfo

• Revision: c974a42f23b7092a370d1c594eb1e782da9f61c8 (tree)
• Time: 2010-04-24 23:47:06
• Author: Steve Streeting <steve@stev...>
• Commiter: Steve Streeting

Log Message

Fix bug 240: TextAreaOverlayElement incorrectly loads Font in background thread (OGRE_THREAD_SUPPORT == 2)

Change Summary

• modified: OgreMain/include/OgreTextAreaOverlayElement.h
• modified: OgreMain/src/OgreTextAreaOverlayElement.cpp

Incremental Difference

diff -r be6cf446fba9 -r c974a42f23b7 OgreMain/include/OgreTextAreaOverlayElement.h
--- a/OgreMain/include/OgreTextAreaOverlayElement.h	Sat Apr 24 14:59:34 2010 +0100
+++ b/OgreMain/include/OgreTextAreaOverlayElement.h	Sat Apr 24 15:47:06 2010 +0100
@@ -70,6 +70,8 @@
         /** See OverlayElement. */
         virtual const String& getTypeName(void) const;
         /** See Renderable. */
+		const MaterialPtr& getMaterial(void) const;
+        /** See Renderable. */
         void getRenderOperation(RenderOperation& op);
         /** Overridden from OverlayElement */
         void setMaterialName(const String& matName);

diff -r be6cf446fba9 -r c974a42f23b7 OgreMain/src/OgreTextAreaOverlayElement.cpp
--- a/OgreMain/src/OgreTextAreaOverlayElement.cpp	Sat Apr 24 14:59:34 2010 +0100
+++ b/OgreMain/src/OgreTextAreaOverlayElement.cpp	Sat Apr 24 15:47:06 2010 +0100
@@ -359,10 +359,6 @@
         if (mpFont.isNull())
 			OGRE_EXCEPT( Exception::ERR_ITEM_NOT_FOUND, "Could not find font " + font,
 				"TextAreaOverlayElement::setFontName" );
-        mpFont->load();
-        mpMaterial = mpFont->getMaterial();
-        mpMaterial->setDepthCheckEnabled(false);
-        mpMaterial->setLightingEnabled(false);
 		
 		mGeomPositionsOutOfDate = true;
 		mGeomUVsOutOfDate = true;
@@ -432,8 +428,23 @@
         return msTypeName;
     }
     //---------------------------------------------------------------------
+    const MaterialPtr& TextAreaOverlayElement::getMaterial(void) const
+    {
+		// On-demand load
+		// Moved from setFontName to avoid issues with background parsing of scripts
+		if (mpMaterial.isNull() && !mpFont.isNull())
+		{
+			mpFont->load();
+			// Ugly hack, but we need to override for lazy-load
+			*const_cast<MaterialPtr*>(&mpMaterial) = mpFont->getMaterial();
+			mpMaterial->setDepthCheckEnabled(false);
+			mpMaterial->setLightingEnabled(false);
+		}
+        return mpMaterial;
+    }
+    //---------------------------------------------------------------------
     void TextAreaOverlayElement::getRenderOperation(RenderOperation& op)
-    {
+    { 
         op = mRenderOp;
     }
     //---------------------------------------------------------------------