OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 02:27:40 -04:00
Code Releases Activity

Refactor plPlates CreateResource function names.

Browse Source 
Add support for external resource Cursors.
Add support for external resource Progress Linking Book.
Add support for external resource Voice Chat indicators.
This commit is contained in:
Joseph Davies
2011-06-16 22:16:50 -07:00
parent 1bdbf0a790
commit 3027e0605c
11 changed files with 71 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Sources/Plasma/PubUtilLib/plPipeline/plDTProgressMgr.cpp
View File

@ -40,8 +40,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plDebugText.h"
#include "plPlates.h"
#include "../../Apps/plClient/res/resource.h"
#include "hsTimer.h"
@ -81,7 +79,7 @@ void plDTProgressMgr::Activate()
{
plPlateManager::Instance().CreatePlate( &fActivePlate );
fActivePlate->CreateFromJPEGResource( MAKEINTRESOURCE( plProgressMgr::GetLoadingFrameID(fCurrentImage) ), 0 );
fActivePlate->CreateFromResource(plProgressMgr::GetLoadingFrameID(fCurrentImage));
fActivePlate->SetVisible(true);
fActivePlate->SetOpacity(1.0f);
fActivePlate->SetSize(0.6, 0.6, true);
@ -143,7 +141,7 @@ void plDTProgressMgr::Draw( plPipeline *p )
fLastDraw = currentMs;
fActivePlate->ReloadFromJPEGResource(MAKEINTRESOURCE(plProgressMgr::GetInstance()->GetLoadingFrameID(fCurrentImage)), 0);
fActivePlate->ReloadFromResource(plProgressMgr::GetLoadingFrameID(fCurrentImage));
fActivePlate->SetVisible(true);
fActivePlate->SetOpacity(1.0f);
fActivePlate->SetSize(0.6, 0.6, true);

8
Sources/Plasma/PubUtilLib/plPipeline/plPlates.cpp
View File

@ -295,7 +295,7 @@ void plPlate::ISetResourceAlphas(UInt32 colorKey)
}
}
void plPlate::CreateFromResource( const char *resName, UInt32 colorKey )
void plPlate::CreateFromBMPResource( const char *resName, UInt32 colorKey )
{
/*
Someday the following might actually work, once we get a plugin that
@ -374,7 +374,7 @@ void plPlate::CreateFromResource( const char *resName, UInt32 colorKey )
//// ReloadFromResource //////////////////////////////////////////////////////
// Creates a plate's material from a resource of the given name.
void plPlate::ReloadFromResource( const char *resName, UInt32 colorKey )
void plPlate::ReloadFromBMPResource( const char *resName, UInt32 colorKey )
{
UInt32 width, height;
@ -528,7 +528,7 @@ void plPlate::ReloadFromJPEGResource( const char *resName, UInt32 colorKey )
}
}
void plPlate::CreateFromResourceDat(const char *resName)
void plPlate::CreateFromResource(const char *resName)
{
if (resName)
{
@ -547,7 +547,7 @@ void plPlate::CreateFromResourceDat(const char *resName)
}
}
void plPlate::ReloadFromResourceDat(const char *resName)
void plPlate::ReloadFromResource(const char *resName)
{
if (resName)
{

8
Sources/Plasma/PubUtilLib/plPipeline/plPlates.h
View File

@ -127,12 +127,12 @@ class plPlate
void SetSize( hsScalar width, hsScalar height, bool adjustByAspectRatio = false );
plMipmap *CreateMaterial( UInt32 width, UInt32 height, hsBool withAlpha, plMipmap* texture = NULL );
void CreateFromResource( const char *resName, UInt32 colorKey = 0x00ff00ff );
void ReloadFromResource( const char *resName, UInt32 colorKey = 0x00ff00ff );
void CreateFromBMPResource( const char *resName, UInt32 colorKey = 0x00ff00ff );
void ReloadFromBMPResource( const char *resName, UInt32 colorKey = 0x00ff00ff );
void CreateFromJPEGResource( const char *resName, UInt32 colorKey = 0x00ff00ff );
void ReloadFromJPEGResource( const char *resName, UInt32 colorKey = 0x00ff00ff );
void CreateFromResourceDat( const char *resName );
void ReloadFromResourceDat( const char *resName );
void CreateFromResource( const char *resName );
void ReloadFromResource( const char *resName );
};
//// plGraphPlate Class Definition ///////////////////////////////////////////