Menu
▾
▴
hgengine-cvs
|
From: <axl...@us...> - 2009-06-23 23:48:44
|
Revision: 367
http://hgengine.svn.sourceforge.net/hgengine/?rev=367&view=rev
Author: axlecrusher
Date: 2009-06-23 23:48:43 +0000 (Tue, 23 Jun 2009)
Log Message:
-----------
fix critical bugs.
initialize variables in contructor.
fix order of setting a pointer in the event of a failure
Modified Paths:
--------------
Mercury2/modules/TextNode.cpp
Modified: Mercury2/modules/TextNode.cpp
===================================================================
--- Mercury2/modules/TextNode.cpp 2009-06-23 13:51:18 UTC (rev 366)
+++ Mercury2/modules/TextNode.cpp 2009-06-23 23:48:43 UTC (rev 367)
@@ -9,7 +9,7 @@
REGISTER_NODE_TYPE(TextNode);
TextNode::TextNode()
- :MercuryNode(),m_fSize(1.),m_bDirty(0), m_kVBO(0), m_kTEX(0)
+ :MercuryNode(),m_fSize(1.),m_bDirty(false),m_pThisFont(NULL),m_kVBO(0), m_kTEX(0)
{
}
@@ -168,13 +168,13 @@
{
if( g_AllFonts.get( sFont ) == 0 )
{
- m_pThisFont = &g_AllFonts[sFont];
if( !m_pThisFont->LoadFromFile( sFont ) )
{
fprintf( stderr, "Error: Could not load font: \"%s\".", sFont.c_str() );
g_AllFonts.remove( sFont );
return false;
}
+ m_pThisFont = &g_AllFonts[sFont];
} else
m_pThisFont = &g_AllFonts[sFont];
SetDirtyText();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <axl...@us...> - 2009-06-24 10:29:07
|
Revision: 372
http://hgengine.svn.sourceforge.net/hgengine/?rev=372&view=rev
Author: axlecrusher
Date: 2009-06-24 10:28:29 +0000 (Wed, 24 Jun 2009)
Log Message:
-----------
Fix again.
It MUST be null if fail
Modified Paths:
--------------
Mercury2/modules/TextNode.cpp
Modified: Mercury2/modules/TextNode.cpp
===================================================================
--- Mercury2/modules/TextNode.cpp 2009-06-24 06:27:59 UTC (rev 371)
+++ Mercury2/modules/TextNode.cpp 2009-06-24 10:28:29 UTC (rev 372)
@@ -173,9 +173,10 @@
{
fprintf( stderr, "Error: Could not load font: \"%s\".", sFont.c_str() );
g_AllFonts.remove( sFont );
+ //This has to be set to null if there is a failure because this is what RenderText uses as a check
+ m_pThisFont = NULL;
return false;
}
- m_pThisFont = &g_AllFonts[sFont];
} else
m_pThisFont = &g_AllFonts[sFont];
SetDirtyText();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <axl...@us...> - 2009-08-16 15:34:41
|
Revision: 481
http://hgengine.svn.sourceforge.net/hgengine/?rev=481&view=rev
Author: axlecrusher
Date: 2009-08-16 15:34:35 +0000 (Sun, 16 Aug 2009)
Log Message:
-----------
Init was used to add assets to pre and post render. Since that is gone, init does nothing. Init will probably be tranformed into a function to recycle assets.
Modified Paths:
--------------
Mercury2/modules/TextNode.cpp
Modified: Mercury2/modules/TextNode.cpp
===================================================================
--- Mercury2/modules/TextNode.cpp 2009-08-16 15:33:55 UTC (rev 480)
+++ Mercury2/modules/TextNode.cpp 2009-08-16 15:34:35 UTC (rev 481)
@@ -69,7 +69,6 @@
fprintf( stderr, "Could not create Texture for text.\n" );
return;
}
- m_kTEX->Init( this );
}
//Setup FBO and Texture
@@ -306,7 +305,6 @@
}
m_bDirty = false;
- m_kVBO->Init( this );
}
bool TextNode::LoadFont( const MString & sFont )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <axl...@us...> - 2009-08-16 16:44:55
|
Revision: 482
http://hgengine.svn.sourceforge.net/hgengine/?rev=482&view=rev
Author: axlecrusher
Date: 2009-08-16 16:44:49 +0000 (Sun, 16 Aug 2009)
Log Message:
-----------
add texture as asset to fix text texture mapping
Modified Paths:
--------------
Mercury2/modules/TextNode.cpp
Modified: Mercury2/modules/TextNode.cpp
===================================================================
--- Mercury2/modules/TextNode.cpp 2009-08-16 15:34:35 UTC (rev 481)
+++ Mercury2/modules/TextNode.cpp 2009-08-16 16:44:49 UTC (rev 482)
@@ -69,6 +69,7 @@
fprintf( stderr, "Could not create Texture for text.\n" );
return;
}
+ AddAsset( m_kTEX );
}
//Setup FBO and Texture
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2009-08-18 22:25:56
|
Revision: 493
http://hgengine.svn.sourceforge.net/hgengine/?rev=493&view=rev
Author: cnlohr
Date: 2009-08-18 22:25:48 +0000 (Tue, 18 Aug 2009)
Log Message:
-----------
permit C formatted text
Modified Paths:
--------------
Mercury2/modules/TextNode.cpp
Modified: Mercury2/modules/TextNode.cpp
===================================================================
--- Mercury2/modules/TextNode.cpp 2009-08-18 22:23:26 UTC (rev 492)
+++ Mercury2/modules/TextNode.cpp 2009-08-18 22:25:48 UTC (rev 493)
@@ -336,7 +336,7 @@
void TextNode::SetText( const MString & sText )
{
- m_sText = sText;
+ m_sText = ConvertToUnformatted( sText );
SetDirtyText();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <axl...@us...> - 2010-04-27 21:39:07
|
Revision: 706
http://hgengine.svn.sourceforge.net/hgengine/?rev=706&view=rev
Author: axlecrusher
Date: 2010-04-27 21:39:01 +0000 (Tue, 27 Apr 2010)
Log Message:
-----------
forgot to commit
Modified Paths:
--------------
Mercury2/modules/TextNode.cpp
Modified: Mercury2/modules/TextNode.cpp
===================================================================
--- Mercury2/modules/TextNode.cpp 2010-04-27 18:20:41 UTC (rev 705)
+++ Mercury2/modules/TextNode.cpp 2010-04-27 21:39:01 UTC (rev 706)
@@ -22,7 +22,7 @@
m_bShiftAbsolute(false)
{
//Disabling saving of children... As, we create many temporary children.
- m_bEnableSaveChildren = false;
+ SetSaveChildren(false);
}
void TextNode::Update(float dTime)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X