add GraphDisplay
This commit is contained in:
Glenn Maynard
@@ -0,0 +1,131 @@
|
||||
#include "global.h"
|
||||
#include "GraphDisplay.h"
|
||||
#include "ThemeManager.h"
|
||||
#include "RageTextureManager.h"
|
||||
#include "RageDisplay.h"
|
||||
#include "RageUtil.h"
|
||||
|
||||
//#define DIVIDE_LINE_WIDTH THEME->GetMetricI(m_sName,"TexturedBottomHalf")
|
||||
|
||||
GraphDisplay::GraphDisplay()
|
||||
{
|
||||
m_pTexture = NULL;
|
||||
}
|
||||
|
||||
|
||||
void GraphDisplay::Load( CString TexturePath, float height )
|
||||
{
|
||||
m_Position = 1;
|
||||
memset( m_CurValues, 0, sizeof(m_CurValues) );
|
||||
memset( m_DestValues, 0, sizeof(m_DestValues) );
|
||||
memset( m_LastValues, 0, sizeof(m_LastValues) );
|
||||
|
||||
Unload();
|
||||
m_pTexture = TEXTUREMAN->LoadTexture( TexturePath );
|
||||
m_size.y = (float) m_pTexture->GetTextureHeight();
|
||||
m_size.x = (float) m_pTexture->GetTextureWidth();
|
||||
|
||||
for( int i = 0; i < VALUE_RESOLUTION; ++i )
|
||||
m_CurValues[i] = height;
|
||||
UpdateVerts();
|
||||
}
|
||||
|
||||
void GraphDisplay::Unload()
|
||||
{
|
||||
if( m_pTexture != NULL )
|
||||
TEXTUREMAN->UnloadTexture( m_pTexture );
|
||||
|
||||
m_pTexture = NULL;
|
||||
}
|
||||
|
||||
void GraphDisplay::LoadFromStageStats( const StageStats &s, PlayerNumber pn )
|
||||
{
|
||||
memcpy( m_LastValues, m_CurValues, sizeof(m_CurValues) );
|
||||
m_Position = 0;
|
||||
s.GetLifeRecord( pn, m_DestValues, VALUE_RESOLUTION );
|
||||
UpdateVerts();
|
||||
}
|
||||
|
||||
void GraphDisplay::UpdateVerts()
|
||||
{
|
||||
RectF quadVertices;
|
||||
|
||||
switch( m_HorizAlign )
|
||||
{
|
||||
case align_left: quadVertices.left = 0; quadVertices.right = m_size.x; break;
|
||||
case align_center: quadVertices.left = -m_size.x/2; quadVertices.right = m_size.x/2; break;
|
||||
case align_right: quadVertices.left = -m_size.x; quadVertices.right = 0; break;
|
||||
default: ASSERT( false );
|
||||
}
|
||||
|
||||
switch( m_VertAlign )
|
||||
{
|
||||
case align_top: quadVertices.top = 0; quadVertices.bottom = m_size.y; break;
|
||||
case align_middle: quadVertices.top = -m_size.y/2; quadVertices.bottom = m_size.y/2; break;
|
||||
case align_bottom: quadVertices.top = -m_size.y; quadVertices.bottom = 0; break;
|
||||
default: ASSERT(0);
|
||||
}
|
||||
|
||||
int NumSlices = VALUE_RESOLUTION-1;
|
||||
|
||||
int i;
|
||||
for( i = 0; i < 4*NumSlices; ++i )
|
||||
Slices[i].c = RageColor(1,1,1,1);
|
||||
|
||||
for( i = 0; i < NumSlices; ++i )
|
||||
{
|
||||
const float Left = SCALE( float(i), 0.0f, float(NumSlices), quadVertices.left, quadVertices.right );
|
||||
const float Right = SCALE( float(i+1), 0.0f, float(NumSlices), quadVertices.left, quadVertices.right );
|
||||
const float LeftTop = SCALE( float(m_CurValues[i]), 0.0f, 1.0f, quadVertices.bottom, quadVertices.top );
|
||||
const float RightTop = SCALE( float(m_CurValues[i+1]), 0.0f, 1.0f, quadVertices.bottom, quadVertices.top );
|
||||
|
||||
Slices[i*4+0].p = RageVector3( Left, LeftTop, 0 ); // top left
|
||||
Slices[i*4+1].p = RageVector3( Left, quadVertices.bottom, 0 ); // bottom left
|
||||
Slices[i*4+2].p = RageVector3( Right, quadVertices.bottom, 0 ); // bottom right
|
||||
Slices[i*4+3].p = RageVector3( Right, RightTop, 0 ); // top right
|
||||
|
||||
// Slices[i*4+0].c = RageColor(.2,.2,.2,1);
|
||||
// Slices[i*4+1].c = RageColor(1,1,1,1);
|
||||
// Slices[i*4+2].c = RageColor(1,1,1,1);
|
||||
// Slices[i*4+3].c = RageColor(.2,.2,.2,1);
|
||||
}
|
||||
|
||||
const RectF *tex = m_pTexture->GetTextureCoordRect( 0 );
|
||||
for( i = 0; i < NumSlices; ++i )
|
||||
{
|
||||
const float Left = SCALE( float(i), 0.0f, float(NumSlices), tex->left, tex->right );
|
||||
const float Right = SCALE( float(i+1), 0.0f, float(NumSlices), tex->left, tex->right );
|
||||
const float LeftTop = SCALE( float(m_CurValues[i]), 0.0f, 1.0f, tex->bottom, tex->top );
|
||||
const float RightTop = SCALE( float(m_CurValues[i+1]), 0.0f, 1.0f, tex->bottom, tex->top );
|
||||
|
||||
Slices[i*4+0].t = RageVector2( Left, LeftTop ); // top left
|
||||
Slices[i*4+1].t = RageVector2( Left, tex->bottom ); // bottom left
|
||||
Slices[i*4+2].t = RageVector2( Right, tex->bottom ); // bottom right
|
||||
Slices[i*4+3].t = RageVector2( Right, RightTop ); // top right
|
||||
}
|
||||
}
|
||||
|
||||
void GraphDisplay::Update( float fDeltaTime )
|
||||
{
|
||||
ActorFrame::Update( fDeltaTime );
|
||||
|
||||
if( m_Position == 1 )
|
||||
return;
|
||||
|
||||
m_Position = clamp( m_Position+fDeltaTime, 0, 1 );
|
||||
for( int i = 0; i < VALUE_RESOLUTION; ++i )
|
||||
m_CurValues[i] = m_DestValues[i]*m_Position + m_LastValues[i]*(1-m_Position);
|
||||
|
||||
UpdateVerts();
|
||||
}
|
||||
|
||||
void GraphDisplay::DrawPrimitives()
|
||||
{
|
||||
DISPLAY->SetTexture( m_pTexture );
|
||||
Actor::SetRenderStates(); // set Actor-specified render states
|
||||
|
||||
DISPLAY->DrawQuads( Slices, ARRAYSIZE(Slices) );
|
||||
DISPLAY->SetTexture( NULL );
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
#ifndef GRAPH_DISPLAY_H
|
||||
#define GRAPH_DISPLAY_H
|
||||
|
||||
#include "ActorFrame.h"
|
||||
#include "PlayerNumber.h"
|
||||
#include "StageStats.h"
|
||||
#include "RageTexture.h"
|
||||
|
||||
class GraphDisplay: public ActorFrame
|
||||
{
|
||||
public:
|
||||
GraphDisplay();
|
||||
~GraphDisplay() { Unload(); }
|
||||
void Load( CString TexturePath, float height );
|
||||
void Unload();
|
||||
|
||||
void LoadFromStageStats( const StageStats &s, PlayerNumber pn );
|
||||
void SetValues( const float *values, int cnt );
|
||||
void SetValue( float value, int cnt ) { SetValues( &value, 1 ); }
|
||||
void Update( float fDeltaTime );
|
||||
void DrawPrimitives();
|
||||
|
||||
private:
|
||||
void UpdateVerts();
|
||||
|
||||
enum { VALUE_RESOLUTION=100 };
|
||||
float m_CurValues[VALUE_RESOLUTION];
|
||||
float m_DestValues[VALUE_RESOLUTION];
|
||||
float m_LastValues[VALUE_RESOLUTION];
|
||||
float m_Position;
|
||||
|
||||
RageSpriteVertex Slices[4*(VALUE_RESOLUTION-1)];
|
||||
|
||||
RageTexture *m_pTexture;
|
||||
};
|
||||
|
||||
#endif
|
||||
+55
-44
@@ -1,5 +1,5 @@
|
||||
# Microsoft Developer Studio Project File - Name="StepMania" - Package Owner=<4>
|
||||
# Microsoft Developer Studio Generated Build File, Format Version 60000
|
||||
# Microsoft Developer Studio Generated Build File, Format Version 6.00
|
||||
# ** DO NOT EDIT **
|
||||
|
||||
# TARGTYPE "Win32 (x86) Application" 0x0101
|
||||
@@ -62,11 +62,11 @@ LINK32=link.exe
|
||||
# SUBTRACT LINK32 /verbose /profile /pdb:none /incremental:no /nodefaultlib
|
||||
# Begin Special Build Tool
|
||||
IntDir=.\../Debug6
|
||||
TargetDir=\stepmania\stepmania
|
||||
TargetDir=\temp\stepmania
|
||||
TargetName=StepMania-debug
|
||||
SOURCE="$(InputPath)"
|
||||
PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp \
|
||||
/Fo$(IntDir)\
|
||||
PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp \
|
||||
/Fo$(IntDir)\
|
||||
PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi
|
||||
# End Special Build Tool
|
||||
|
||||
@@ -83,28 +83,24 @@ PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania
|
||||
# PROP Intermediate_Dir "Debug"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
CPP=cl.exe
|
||||
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_XBOX" /D "_DEBUG" /YX /FD /G6 /Ztmp /c
|
||||
# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "." /I "SDL-1.2.5\include" /I "SDL_image-1.2" /I "plib-1.6.0" /I "SDL_sound-1.0.0" /D "WIN32" /D "_XBOX" /D "_DEBUG" /D "OGG_ONLY" /YX /FD /G6 /Ztmp /c
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 xapilibd.lib d3d8d.lib d3dx8d.lib xgraphicsd.lib dsoundd.lib dmusicd.lib xnetd.lib xboxkrnl.lib /nologo /incremental:no /debug /machine:I386 /subsystem:xbox /fixed:no /TMP
|
||||
# ADD LINK32 xapilibd.lib d3d8d.lib d3dx8d.lib xgraphicsd.lib dsoundd.lib dmusicd.lib xnetd.lib xboxkrnl.lib /nologo /incremental:no /debug /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"../StepManiaXbox-debug.exe" /subsystem:xbox /fixed:no /TMP
|
||||
XBE=imagebld.exe
|
||||
# ADD BASE XBE /nologo /stack:0x10000 /debug
|
||||
# ADD XBE /nologo /stack:0x10000 /debug /out:"../default.xbe"
|
||||
XBCP=xbecopy.exe
|
||||
# ADD BASE XBCP /NOLOGO
|
||||
# ADD XBCP /NOLOGO
|
||||
XBE=imagebld.exe
|
||||
# ADD BASE XBE /nologo /stack:0x10000 /debug
|
||||
# ADD XBE /nologo /stack:0x10000 /debug /out:"../default.xbe"
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 xapilibd.lib d3d8d.lib d3dx8d.lib xgraphicsd.lib dsoundd.lib dmusicd.lib xnetd.lib xboxkrnl.lib /nologo /incremental:no /debug /machine:I386 /subsystem:xbox /fixed:no /TMP
|
||||
# ADD LINK32 xapilibd.lib d3d8d.lib d3dx8d.lib xgraphicsd.lib dsoundd.lib dmusicd.lib xnetd.lib xboxkrnl.lib /nologo /incremental:no /debug /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"../StepManiaXbox-debug.exe" /subsystem:xbox /fixed:no /TMP
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
CPP=cl.exe
|
||||
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_XBOX" /D "_DEBUG" /YX /FD /G6 /Ztmp /c
|
||||
# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "." /I "SDL-1.2.5\include" /I "SDL_image-1.2" /I "plib-1.6.0" /I "SDL_sound-1.0.0" /D "WIN32" /D "_XBOX" /D "_DEBUG" /D "OGG_ONLY" /YX /FD /G6 /Ztmp /c
|
||||
# Begin Special Build Tool
|
||||
IntDir=.\Debug
|
||||
TargetDir=\stepmania\stepmania
|
||||
TargetName=default
|
||||
SOURCE="$(InputPath)"
|
||||
PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp \
|
||||
/Fo$(IntDir)\
|
||||
PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp \
|
||||
/Fo$(IntDir)\
|
||||
PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi
|
||||
# End Special Build Tool
|
||||
|
||||
@@ -141,11 +137,11 @@ LINK32=link.exe
|
||||
# SUBTRACT LINK32 /verbose /pdb:none
|
||||
# Begin Special Build Tool
|
||||
IntDir=.\../Release6
|
||||
TargetDir=\stepmania\stepmania
|
||||
TargetDir=\temp\stepmania
|
||||
TargetName=StepMania
|
||||
SOURCE="$(InputPath)"
|
||||
PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp \
|
||||
/Fo$(IntDir)\
|
||||
PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp \
|
||||
/Fo$(IntDir)\
|
||||
PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi
|
||||
# End Special Build Tool
|
||||
|
||||
@@ -163,31 +159,27 @@ PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania
|
||||
# PROP Intermediate_Dir "StepMania___Xbox_Release"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
CPP=cl.exe
|
||||
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "." /I "SDL-1.2.5\include" /I "SDL_image-1.2" /I "plib-1.6.0" /D "WIN32" /D "_XBOX" /D "_DEBUG" /Fr /YX"global.h" /FD /c
|
||||
# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /I "SDL-1.2.5\include" /I "SDL_image-1.2" /I "plib-1.6.0" /I "SDL_sound-1.0.0" /D "WIN32" /D "_XBOX" /D "NDEBUG" /YX"global.h" /FD /c
|
||||
# SUBTRACT CPP /Fr
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
XBCP=xbecopy.exe
|
||||
# ADD BASE XBCP /NOLOGO
|
||||
# ADD XBCP /NOLOGO
|
||||
XBE=imagebld.exe
|
||||
# ADD BASE XBE /nologo /stack:0x10000 /debug
|
||||
# ADD XBE /nologo /testid:"123456" /stack:0x10000 /debug /out:"../default.xbe"
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 $(intdir)\verstub.obj xapilibd.lib d3d8d.lib d3dx8d.lib xgraphicsd.lib dsoundd.lib dmusicd.lib xnetd.lib xboxkrnl.lib /nologo /pdb:"../debug6/StepMania-debug.pdb" /map /debug /machine:IX86 /nodefaultlib:"libcmtd.lib" /out:"../StepMania-debug.exe"
|
||||
# SUBTRACT BASE LINK32 /verbose /profile /pdb:none /incremental:no /nodefaultlib
|
||||
# ADD LINK32 $(intdir)\verstub.obj xapilib.lib d3d8.lib d3dx8.lib xgraphics.lib dsound.lib dmusic.lib xnet.lib xboxkrnl.lib libcmt.lib /nologo /incremental:no /pdb:"../release6xbox/StepMania.pdb" /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"libcmtd" /out:"../StepManiaXbox.exe" /subsystem:xbox /fixed:no /TMP /OPT:REF
|
||||
# SUBTRACT LINK32 /pdb:none /map /debug
|
||||
XBE=imagebld.exe
|
||||
# ADD BASE XBE /nologo /stack:0x10000 /debug
|
||||
# ADD XBE /nologo /testid:"123456" /stack:0x10000 /debug /out:"../default.xbe"
|
||||
XBCP=xbecopy.exe
|
||||
# ADD BASE XBCP /NOLOGO
|
||||
# ADD XBCP /NOLOGO
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
CPP=cl.exe
|
||||
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "." /I "SDL-1.2.5\include" /I "SDL_image-1.2" /I "plib-1.6.0" /D "WIN32" /D "_XBOX" /D "_DEBUG" /Fr /YX"global.h" /FD /c
|
||||
# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /I "SDL-1.2.5\include" /I "SDL_image-1.2" /I "plib-1.6.0" /I "SDL_sound-1.0.0" /D "WIN32" /D "_XBOX" /D "NDEBUG" /YX"global.h" /FD /c
|
||||
# SUBTRACT CPP /Fr
|
||||
# Begin Special Build Tool
|
||||
IntDir=.\StepMania___Xbox_Release
|
||||
TargetDir=\stepmania\stepmania
|
||||
TargetName=default
|
||||
SOURCE="$(InputPath)"
|
||||
PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp \
|
||||
/Fo$(IntDir)\
|
||||
PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp \
|
||||
/Fo$(IntDir)\
|
||||
PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi
|
||||
# End Special Build Tool
|
||||
|
||||
@@ -3624,6 +3616,25 @@ SOURCE=.\GradeDisplay.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\GraphDisplay.cpp
|
||||
|
||||
!IF "$(CFG)" == "StepMania - Win32 Debug"
|
||||
|
||||
!ELSEIF "$(CFG)" == "StepMania - Xbox Debug"
|
||||
|
||||
!ELSEIF "$(CFG)" == "StepMania - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "StepMania - Xbox Release"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\GraphDisplay.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\GrooveGraph.cpp
|
||||
|
||||
!IF "$(CFG)" == "StepMania - Win32 Debug"
|
||||
|
||||
@@ -1133,6 +1133,12 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\
|
||||
<File
|
||||
RelativePath=".\GradeDisplay.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="GraphDisplay.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="GraphDisplay.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="GrooveGraph.cpp">
|
||||
</File>
|
||||
|
||||
Reference in New Issue
Block a user