actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

expose fractional alignment

Browse Source
This commit is contained in:
Glenn Maynard
2007-03-01 08:14:33 +00:00
parent ee304290ec
commit 495f80962b
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Actor.cpp
+4
View File
@@ -1273,6 +1273,8 @@ public:
static int shadowlength( T* p, lua_State *L ) { p->SetShadowLength(FArg(1)); return 0; } static int shadowlength( T* p, lua_State *L ) { p->SetShadowLength(FArg(1)); return 0; }
static int horizalign( T* p, lua_State *L ) { p->SetHorizAlign(Enum::Check<HorizAlign>(L, 1)); return 0; } static int horizalign( T* p, lua_State *L ) { p->SetHorizAlign(Enum::Check<HorizAlign>(L, 1)); return 0; }
static int vertalign( T* p, lua_State *L ) { p->SetVertAlign(Enum::Check<VertAlign>(L, 1)); return 0; } static int vertalign( T* p, lua_State *L ) { p->SetVertAlign(Enum::Check<VertAlign>(L, 1)); return 0; }
static int halign( T* p, lua_State *L ) { p->SetHorizAlign(FArg(1)); return 0; }
static int valign( T* p, lua_State *L ) { p->SetVertAlign(FArg(1)); return 0; }
static int diffuseblink( T* p, lua_State *L ) { p->SetEffectDiffuseBlink(); return 0; } static int diffuseblink( T* p, lua_State *L ) { p->SetEffectDiffuseBlink(); return 0; }
static int diffuseshift( T* p, lua_State *L ) { p->SetEffectDiffuseShift(); return 0; } static int diffuseshift( T* p, lua_State *L ) { p->SetEffectDiffuseShift(); return 0; }
static int diffuseramp( T* p, lua_State *L ) { p->SetEffectDiffuseRamp(); return 0; } static int diffuseramp( T* p, lua_State *L ) { p->SetEffectDiffuseRamp(); return 0; }
@@ -1466,6 +1468,8 @@ public:
ADD_METHOD( shadowlength ); ADD_METHOD( shadowlength );
ADD_METHOD( horizalign ); ADD_METHOD( horizalign );
ADD_METHOD( vertalign ); ADD_METHOD( vertalign );
ADD_METHOD( halign );
ADD_METHOD( valign );
ADD_METHOD( diffuseblink ); ADD_METHOD( diffuseblink );
ADD_METHOD( diffuseshift ); ADD_METHOD( diffuseshift );
ADD_METHOD( diffuseramp ); ADD_METHOD( diffuseramp );
stepmania/src/Actor.h
+4 -2
View File
@@ -251,8 +251,10 @@ public:
// //
// Alignment settings. These need to be virtual for BitmapText // Alignment settings. These need to be virtual for BitmapText
// //
virtual void SetHorizAlign( HorizAlign ha ) { m_fHorizAlign = (ha == HorizAlign_Left)? 0.0f: (ha == HorizAlign_Center)? 0.5f: +1.0f; } virtual void SetHorizAlign( float f ) { m_fHorizAlign = f; }
virtual void SetVertAlign( VertAlign va ) { m_fVertAlign = (va == VertAlign_Top)? 0.0f: (va == VertAlign_Middle)? 0.5f: +1.0f; } virtual void SetVertAlign( float f ) { m_fVertAlign = f; }
void SetHorizAlign( HorizAlign ha ) { SetHorizAlign( (ha == HorizAlign_Left)? 0.0f: (ha == HorizAlign_Center)? 0.5f: +1.0f ); }
void SetVertAlign( VertAlign va ) { SetVertAlign( (va == VertAlign_Top)? 0.0f: (va == VertAlign_Middle)? 0.5f: +1.0f ); }
// //
stepmania/src/BitmapText.cpp
+2 -2
View File
@@ -599,10 +599,10 @@ void BitmapText::DrawPrimitives()
} }
/* Rebuild when these change. */ /* Rebuild when these change. */
void BitmapText::SetHorizAlign( HorizAlign ha ) void BitmapText::SetHorizAlign( float f )
{ {
float fHorizAlign = m_fHorizAlign; float fHorizAlign = m_fHorizAlign;
Actor::SetHorizAlign(ha); Actor::SetHorizAlign(f);
if( fHorizAlign == m_fHorizAlign ) if( fHorizAlign == m_fHorizAlign )
return; return;
BuildChars(); BuildChars();
stepmania/src/BitmapText.h
+1 -1
View File
@@ -34,7 +34,7 @@ public:
void SetRainbowScroll( bool b ) { m_bRainbowScroll = b; } void SetRainbowScroll( bool b ) { m_bRainbowScroll = b; }
void SetJitter( bool b ) { m_bJitter = b; } void SetJitter( bool b ) { m_bJitter = b; }
void SetHorizAlign( HorizAlign ha ); void SetHorizAlign( float f );
void GetLines( vector<wstring> &wTextLines ) { wTextLines = m_wTextLines; } void GetLines( vector<wstring> &wTextLines ) { wTextLines = m_wTextLines; }