This commit is contained in:
parent
c33e2a4acd
commit
25ffde600e
9 changed files with 92 additions and 38 deletions
|
@ -113,7 +113,7 @@ void CTexGrab::Process()
|
|||
Purpose: Add bitmaps to file list
|
||||
Params: Name = Filename
|
||||
---------------------------------------------------------------------- */
|
||||
void CTexGrab::AddFile(char *Name)
|
||||
void CTexGrab::AddFile(const char *Name)
|
||||
{
|
||||
GString UpperName(Name);
|
||||
|
||||
|
@ -127,7 +127,7 @@ GString UpperName(Name);
|
|||
Purpose:
|
||||
Params:
|
||||
---------------------------------------------------------------------- */
|
||||
void CTexGrab::AddMemFrame(char *Name,Frame &Frame)
|
||||
void CTexGrab::AddMemFrame(const char *Name,Frame &Frame)
|
||||
{
|
||||
GString UpperName(Name);
|
||||
|
||||
|
|
|
@ -55,8 +55,8 @@ public:
|
|||
CTexGrab();
|
||||
~CTexGrab();
|
||||
|
||||
void AddFile(char *Name);
|
||||
void AddMemFrame(char *Name,Frame &Frame);
|
||||
void AddFile(const char *Name);
|
||||
void AddMemFrame(const char *Name,Frame &Frame);
|
||||
|
||||
void Process();
|
||||
|
||||
|
@ -78,12 +78,12 @@ public:
|
|||
void MoveUVs(bool f) {MyFiles.SetMoveUVs(f);}
|
||||
void ShrinkToFit(bool f) {MyFiles.SetShrinkToFit(f);}
|
||||
|
||||
void SetOutFile(char *Name) {m_OutFile=Name;}
|
||||
void SetSprFile(char *Name) {m_SprFile=Name;}
|
||||
void SetDebugOut(char *Name) {m_OutLbm=Name;}
|
||||
void SetRepFile(char *Name) {m_ReportFile=Name;}
|
||||
void SetIncFile(char *Name) {m_IncOutFile=Name;}
|
||||
void SetRawTPageFile(char *Name) {m_rawTpageFile=Name;}
|
||||
void SetOutFile(const char *Name) {m_OutFile=Name;}
|
||||
void SetSprFile(const char *Name) {m_SprFile=Name;}
|
||||
void SetDebugOut(const char *Name) {m_OutLbm=Name;}
|
||||
void SetRepFile(const char *Name) {m_ReportFile=Name;}
|
||||
void SetIncFile(const char *Name) {m_IncOutFile=Name;}
|
||||
void SetRawTPageFile(const char *Name) {m_rawTpageFile=Name;}
|
||||
|
||||
void MaxSize(int Size) {MyFiles.SetMaxSize(Size);}
|
||||
void SetTPage(int Base,int W,int H) {m_PageBase=Base; m_WidthPages=W; m_HeightPages=H; m_PagePlacements=true;}
|
||||
|
|
|
@ -63,6 +63,7 @@ class FileInfo
|
|||
{
|
||||
CrossHair=false;
|
||||
ForceOffsets=false;
|
||||
MemFrame=NULL;
|
||||
}
|
||||
|
||||
FileInfo(FileInfo const & Fi)
|
||||
|
@ -120,7 +121,7 @@ class FileInfo
|
|||
return out;
|
||||
}
|
||||
|
||||
void SetInfo(const char * NewFileName,bool NewCrossHair,bool NewZeroColZero, bool NewMoveUVs,bool NewAllowRotate,bool NewShrinkToFit,bool allocateAs16Bit,Frame *NewMemFrame=0)
|
||||
void SetInfo(const char * NewFileName,bool NewCrossHair,bool NewZeroColZero, bool NewMoveUVs,bool NewAllowRotate,bool NewShrinkToFit,bool allocateAs16Bit,Frame *NewMemFrame=NULL)
|
||||
{
|
||||
CrossHair=NewCrossHair;
|
||||
ZeroColZero=NewZeroColZero;
|
||||
|
@ -132,7 +133,8 @@ class FileInfo
|
|||
m_allocateAs16Bit=allocateAs16Bit;
|
||||
if (NewMemFrame)
|
||||
{
|
||||
MemFrame=*NewMemFrame;
|
||||
MemFrame=new Frame;
|
||||
*MemFrame=*NewMemFrame;
|
||||
}
|
||||
/*
|
||||
if we're allocating on a 16 bit pixel boundary then
|
||||
|
@ -189,10 +191,11 @@ class FileInfo
|
|||
{return(m_allocateAs16Bit);}
|
||||
|
||||
bool getHasMemFrame(void) const
|
||||
{return(MemFrame.SeeData()!=NULL);}
|
||||
{return(MemFrame!=NULL);}
|
||||
// {return(MemFrame.SeeData()!=NULL);}
|
||||
|
||||
Frame const &getMemFrame() const
|
||||
{return(MemFrame);}
|
||||
{return(*MemFrame);}
|
||||
|
||||
char const * GetActualName(void) const
|
||||
{return(ActualFileName);}
|
||||
|
@ -215,7 +218,7 @@ class FileInfo
|
|||
|
||||
int XOff,YOff;
|
||||
|
||||
Frame MemFrame;
|
||||
Frame *MemFrame;
|
||||
};
|
||||
|
||||
typedef std::vector<FileInfo> FIVec;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue