Font : Remove meshGroup() method

This removes the last use of the Group class.

Author: johnhaddon

Changes

@@ -14,6 +14,7 @@ Breaking Changes
 
 - Renderable : Removed `render()` method.
 - CoordinateSystem : Removed transform.
+- Font : Removed `meshGroup()` method.
 - Options : Removed.
 - CurveExtrudeOp, IDXReader : Removed.
 - Renderer, AttributeBlock, EditBlock, MotionBlock, TransformBlock, WorldBlock : Removed.

include/IECoreScene/Font.h

@@ -50,7 +50,6 @@ namespace IECoreScene
 {
 
 IE_CORE_FORWARDDECLARE( MeshPrimitive );
-IE_CORE_FORWARDDECLARE( Group );
 
 /// The Font class allows the loading of fonts and their
 /// conversion to MeshPrimitives.
@@ -91,9 +90,6 @@ class IECORESCENE_API Font : public IECore::RunTimeTyped
 		/// Returns a mesh representing the specified string,
 		/// using the current curve tolerance and kerning.
 		MeshPrimitivePtr mesh( const std::string &text ) const;
-		/// Returns a group representing the specified string,
-		/// using the current curve tolerance and kerning.
-		GroupPtr meshGroup( const std::string &text ) const;
 		/// Returns the necessary appropriate offset between the
 		/// origins of the first and second characters, taking
 		/// into account the current kerning.

src/IECoreScene/Font.cpp

@@ -34,8 +34,6 @@
 
 #include "IECoreScene/Font.h"
 
-#include "IECoreScene/Group.h"
-#include "IECoreScene/MatrixTransform.h"
 #include "IECoreScene/MeshAlgo.h"
 #include "IECoreScene/MeshPrimitive.h"
 #include "IECoreScene/TransformOp.h"
@@ -397,44 +395,6 @@ class Font::Implementation : public IECore::RefCounted
 			return MeshAlgo::merge( meshes );
 		}
 
-		GroupPtr meshGroup( const std::string &text ) const
-		{
-			GroupPtr result = new Group;
-
-			if( !text.size() )
-			{
-				return result;
-			}
-
-			V3f translate( 0.0f );
-			for( unsigned i=0; i<text.size(); i++ )
-			{
-				if( text[i] == '\n' )
-				{
-					translate.x = 0;
-					translate.y -= bound().size().y * m_lineSpacing;
-					continue;
-				}
-
-				const Mesh *character = cachedMesh( text[i] );
-				if( character->primitive->variableSize( PrimitiveVariable::Uniform ) )
-				{
-					GroupPtr g = new Group;
-					g->addChild( character->primitive->copy() );
-					g->setTransform( new MatrixTransform( M44f().setTranslation( translate ) ) );
-					result->addChild( g );
-				}
-
-				if( i<text.size()-1 )
-				{
-					const V2f a = advance( text[i], text[i+1] );
-					translate += V3f( a.x, a.y, 0 );
-				}
-			}
-
-			return result;
-		}
-
 		Imath::V2f advance( char first, char second ) const
 		{
 			V2f a = cachedMesh( first )->advance;
@@ -642,11 +602,6 @@ MeshPrimitivePtr Font::mesh( const std::string &text ) const
 	return m_implementation->mesh( text );
 }
 
-GroupPtr Font::meshGroup( const std::string &text ) const
-{
-	return m_implementation->meshGroup( text );
-}
-
 Imath::V2f Font::advance( char first, char second ) const
 {
 	return m_implementation->advance( first, second );

src/IECoreScene/bindings/FontBinding.cpp

@@ -39,7 +39,6 @@
 #include "FontBinding.h"
 
 #include "IECoreScene/Font.h"
-#include "IECoreScene/Group.h"
 #include "IECoreScene/MeshPrimitive.h"
 
 #include "IECorePython/RunTimeTypedBinding.h"
@@ -89,7 +88,6 @@ void bindFont()
 		.def( "getLineSpacing", &Font::getLineSpacing )
 		.def( "mesh", &mesh1 )
 		.def( "mesh", &mesh2 )
-		.def( "meshGroup", &Font::meshGroup )
 		.def( "advance", &Font::advance )
 		.def( "bound", (Imath::Box2f (Font::*)( )const)&Font::bound )
 		.def( "bound", (Imath::Box2f (Font::*)( char )const)&Font::bound )

test/IECoreScene/FontTest.py

@@ -50,25 +50,9 @@ def testConstructors( self ) :
 	def test( self ) :
 
 		f = IECoreScene.Font( os.path.join( "test", "IECore", "data", "fonts", "Vera.ttf" ) )
-
-		g = f.meshGroup( "hello world" )
 		m = f.mesh( "hello world" )
-
-		self.assertTrue( g.isInstanceOf( IECoreScene.Group.staticTypeId() ) )
 		self.assertTrue( m.isInstanceOf( IECoreScene.MeshPrimitive.staticTypeId() ) )
 
-		v = 0
-		for c in g.children() :
-
-			self.assertTrue( c.isInstanceOf( IECoreScene.Group.staticTypeId() ) )
-			self.assertEqual( len( c.children() ), 1 )
-			self.assertTrue( c.children()[0].isInstanceOf( IECoreScene.MeshPrimitive.staticTypeId() ) )
-			self.assertEqual( c.children()[0]["P"].data.getInterpretation(), IECore.GeometricData.Interpretation.Point )
-
-			v += c.children()[0]["P"].data.size()
-
-		self.assertEqual( v, m["P"].data.size() )
-
 	def testCharBound( self ) :
 
 		f = IECoreScene.Font( os.path.join( "test", "IECore", "data", "fonts", "Vera.ttf" ) )