This commit is contained in:
Daveo
parent
425713a3aa
commit
c1309c1c96
44 changed files with 2193 additions and 1452 deletions
|
|
@ -20,7 +20,7 @@
|
|||
#include "MapEditDoc.h"
|
||||
#include "MapEditView.h"
|
||||
#include "MainFrm.h"
|
||||
#include "LayerTileGui.h"
|
||||
#include "GUITileBank.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
const float ElemBrowserGap=0.2f;
|
||||
|
|
@ -33,12 +33,7 @@ const float ElemBrowserY1=1+ElemBrowserGap/2;
|
|||
CElemStore::CElemStore()
|
||||
{
|
||||
LoadFlag=false;
|
||||
CurrentSet=0; LastSet=0;
|
||||
for (int i=0; i<MaxBrush; i++) Brush[i].Delete();
|
||||
LastCursorPos=CursorPos=-1;
|
||||
ActiveBrush=0;
|
||||
SelStart=-1;
|
||||
SelEnd=-1;
|
||||
CurrentSet=0;
|
||||
VisibleFlag=true;
|
||||
}
|
||||
|
||||
|
|
@ -50,67 +45,9 @@ CElemStore::~CElemStore()
|
|||
/*****************************************************************************/
|
||||
void CElemStore::Load(CFile *File,int Version)
|
||||
{
|
||||
if (Version<FileVersion)
|
||||
{
|
||||
int ListSize;
|
||||
GFName RootPath=File->GetFilePath();
|
||||
GString FilePath;
|
||||
char FixPath[1024];
|
||||
|
||||
FilePath=RootPath.Drive();
|
||||
FilePath+=RootPath.Dir();
|
||||
FilePath.Append('\\');
|
||||
FilePath.Upper();
|
||||
|
||||
File->Read(&ListSize,sizeof(int));
|
||||
File->Read(&CurrentSet,sizeof(int));
|
||||
File->Read(&ActiveBrush,sizeof(int));
|
||||
Brush[0].Load(File,Version);
|
||||
Brush[1].Load(File,Version);
|
||||
if (Version<2)
|
||||
{
|
||||
CurrentSet++;
|
||||
}
|
||||
|
||||
// New Style rel storage
|
||||
for (int i=0;i<ListSize;i++)
|
||||
{
|
||||
char c=1;
|
||||
GString FullName;
|
||||
|
||||
while (c)
|
||||
{
|
||||
File->Read(&c,1);
|
||||
FullName.Append(c);
|
||||
}
|
||||
FullName.Upper();
|
||||
GFName::makeabsolute(FilePath,FullName,FixPath);
|
||||
FullName=FixPath;
|
||||
_fullpath( FixPath, FullName, 1024);
|
||||
for (int z=0; z<strlen(FixPath); z++)
|
||||
{// Invalidate any long name short cackness
|
||||
if (FixPath[z]=='~') FixPath[z]='_';
|
||||
}
|
||||
FullName=FixPath;
|
||||
|
||||
CheckFilename(FullName);
|
||||
FullName.Upper();
|
||||
AddSet(FullName);
|
||||
}
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
File->Read(&LayerCam,sizeof(Vector3));
|
||||
File->Read(&CurrentSet,sizeof(int));
|
||||
File->Read(&ActiveBrush,sizeof(int));
|
||||
Brush[0].Load(File,Version);
|
||||
Brush[1].Load(File,Version);
|
||||
|
||||
CElemBank::Load(File,Version);
|
||||
}
|
||||
|
||||
|
||||
// CElemBank::Load(File,Version);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
@ -128,11 +65,7 @@ GString SavePath;
|
|||
|
||||
File->Write(&LayerCam,sizeof(Vector3));
|
||||
File->Write(&CurrentSet,sizeof(int));
|
||||
File->Write(&ActiveBrush,sizeof(int));
|
||||
Brush[0].Save(File);
|
||||
Brush[1].Save(File);
|
||||
|
||||
CElemBank::Save(File);
|
||||
// CElemBank::Save(File);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
@ -148,38 +81,10 @@ void CElemStore::RenderElem(int Set,int Elem,int Flags,bool Is3d)
|
|||
}
|
||||
|
||||
}
|
||||
/*****************************************************************************/
|
||||
void CElemStore::DeleteCurrent()
|
||||
{
|
||||
int ListSize=GetSetCount();
|
||||
// Remap Brushes
|
||||
for (int i=0; i<MaxBrush; i++)
|
||||
{
|
||||
Brush[i].RemoveSet(CurrentSet);
|
||||
}
|
||||
for (int Set=CurrentSet; Set<ListSize; Set++)
|
||||
{
|
||||
for (int i=0; i<MaxBrush; i++)
|
||||
{
|
||||
Brush[i].RemapSet(Set,Set);
|
||||
}
|
||||
}
|
||||
SetList.erase(CurrentSet);
|
||||
if (CurrentSet) CurrentSet--;
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
CPoint CElemStore::GetElemPos(int ID,int Width)
|
||||
{
|
||||
if (ID==0)
|
||||
return(CPoint(-1,-1));
|
||||
else
|
||||
return(IDToPoint(ID-1,Width));
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
void CElemStore::Render(CCore *Core,Vector3 &CamPos,bool Is3d)
|
||||
{
|
||||
/*
|
||||
if (!GetSetCount()) return;
|
||||
CElemSet &ThisSet=SetList[CurrentSet];
|
||||
int ListSize=ThisSet.GetCount();
|
||||
|
|
@ -240,12 +145,13 @@ float Scale=CamPos.z/(float)BrowserWidth/2.0;
|
|||
ElemID++;
|
||||
}
|
||||
glPopMatrix();
|
||||
|
||||
*/
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
void CElemStore::RenderCursor(CCore *Core,Vector3 &CamPos,bool Is3d)
|
||||
{
|
||||
/*
|
||||
if (!GetSetCount()) return;
|
||||
CElemSet &ThisSet=SetList[CurrentSet];
|
||||
int ListSize=ThisSet.GetCount();
|
||||
|
|
@ -297,146 +203,34 @@ float Scale=CamPos.z/(float)BrowserWidth/2.0;
|
|||
}
|
||||
}
|
||||
glPopMatrix();
|
||||
|
||||
*/
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
void CElemStore::RenderGrid(CCore *Core,Vector3 &CamPos,bool Active)
|
||||
{
|
||||
if (!GetSetCount()) return;
|
||||
CElemSet &ThisSet=SetList[CurrentSet];
|
||||
int ListSize=ThisSet.GetCount();
|
||||
int BrowserWidth=ThisSet.GetBrowserWidth();
|
||||
int ElemID=1; // Dont bother with blank, its sorted
|
||||
float Scale=CamPos.z/(float)BrowserWidth/2.0;
|
||||
|
||||
if (!ListSize) return;
|
||||
glMatrixMode(GL_MODELVIEW);
|
||||
glPushMatrix();
|
||||
|
||||
while(ElemID!=ListSize)
|
||||
{
|
||||
CPoint Pos=GetElemPos(ElemID,BrowserWidth);
|
||||
float XPos=(float)Pos.x*(1+ElemBrowserGap);
|
||||
float YPos=(float)Pos.y*(1+ElemBrowserGap);
|
||||
|
||||
glLoadIdentity();
|
||||
glScalef(Scale,Scale,Scale);
|
||||
glTranslatef(-CamPos.x+XPos,CamPos.y-YPos,0);
|
||||
|
||||
glBegin(GL_LINES);
|
||||
glColor3f(1,1,1);
|
||||
|
||||
glVertex3f( ElemBrowserX0,ElemBrowserY0,0);
|
||||
glVertex3f( ElemBrowserX1,ElemBrowserY0,0);
|
||||
|
||||
glVertex3f( ElemBrowserX0,ElemBrowserY1,0);
|
||||
glVertex3f( ElemBrowserX1,ElemBrowserY1,0);
|
||||
|
||||
glVertex3f( ElemBrowserX0,ElemBrowserY0,0);
|
||||
glVertex3f( ElemBrowserX0,ElemBrowserY1,0);
|
||||
|
||||
glVertex3f( ElemBrowserX1,ElemBrowserY0,0);
|
||||
glVertex3f( ElemBrowserX1,ElemBrowserY1,0);
|
||||
|
||||
glEnd();
|
||||
|
||||
ElemID++;
|
||||
}
|
||||
glPopMatrix();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
void CElemStore::FindCursorPos(CCore *Core,Vector3 &CamPos,CPoint &MousePos)
|
||||
{
|
||||
if (!GetSetCount()) return;
|
||||
CElemSet &ThisSet=SetList[CurrentSet];
|
||||
int ListSize=ThisSet.GetCount();
|
||||
int BrowserWidth=ThisSet.GetBrowserWidth();
|
||||
GLint Viewport[4];
|
||||
GLuint SelectBuffer[SELECT_BUFFER_SIZE];
|
||||
int HitCount;
|
||||
int ElemID=0;
|
||||
float Scale=CamPos.z/(float)BrowserWidth/2.0;
|
||||
|
||||
if (!ListSize) return;
|
||||
glGetIntegerv(GL_VIEWPORT, Viewport);
|
||||
glSelectBuffer (SELECT_BUFFER_SIZE, SelectBuffer );
|
||||
glRenderMode (GL_SELECT);
|
||||
|
||||
glInitNames();
|
||||
glPushName(-1);
|
||||
|
||||
glMatrixMode(GL_PROJECTION);
|
||||
glPushMatrix();
|
||||
glLoadIdentity();
|
||||
gluPickMatrix( MousePos.x ,(Viewport[3]-MousePos.y),5.0,5.0,Viewport);
|
||||
Core->GetView()->SetupPersMatrix();
|
||||
|
||||
glMatrixMode(GL_MODELVIEW);
|
||||
glPushMatrix();
|
||||
|
||||
while(ElemID!=ListSize)
|
||||
{
|
||||
CPoint Pos=GetElemPos(ElemID,BrowserWidth);
|
||||
float XPos=(float)Pos.x*(1+ElemBrowserGap);
|
||||
float YPos=(float)Pos.y*(1+ElemBrowserGap);
|
||||
|
||||
glLoadIdentity();
|
||||
glScalef(Scale,Scale,Scale);
|
||||
glTranslatef(-CamPos.x+XPos,CamPos.y-YPos,0);
|
||||
|
||||
glLoadName (ElemID);
|
||||
glBegin (GL_QUADS);
|
||||
BuildGLQuad(ElemBrowserX0,ElemBrowserX1,ElemBrowserY0,ElemBrowserY1,0);
|
||||
glEnd();
|
||||
ElemID++;
|
||||
}
|
||||
|
||||
HitCount= glRenderMode (GL_RENDER);
|
||||
glPopMatrix();
|
||||
glMatrixMode(GL_PROJECTION);
|
||||
glPopMatrix();
|
||||
|
||||
// Process hits
|
||||
|
||||
GLuint *HitPtr=SelectBuffer;
|
||||
|
||||
ElemID=-2;
|
||||
if (HitCount) // Just take 1st
|
||||
{
|
||||
ElemID=HitPtr[3];
|
||||
}
|
||||
glMatrixMode(GL_MODELVIEW); // <-- Prevent arse GL assert
|
||||
|
||||
CursorPos=ElemID;
|
||||
SelEnd=CursorPos;
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
bool CElemStore::LButtonControl(CCore *Core,UINT nFlags, CPoint &CursorPos,bool DownFlag)
|
||||
{
|
||||
if (nFlags & MK_RBUTTON)
|
||||
/* if (nFlags & MK_RBUTTON)
|
||||
{
|
||||
SelectCancel();
|
||||
return(false);
|
||||
}
|
||||
Select(LBrush,DownFlag);
|
||||
|
||||
*/
|
||||
return(true);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
bool CElemStore::RButtonControl(CCore *Core,UINT nFlags, CPoint &CursorPos,bool DownFlag)
|
||||
{
|
||||
if (nFlags & MK_LBUTTON)
|
||||
/* if (nFlags & MK_LBUTTON)
|
||||
{
|
||||
SelectCancel();
|
||||
return(false);
|
||||
}
|
||||
|
||||
Select(RBrush,DownFlag);
|
||||
|
||||
*/
|
||||
return(false);
|
||||
}
|
||||
|
||||
|
|
@ -449,7 +243,7 @@ bool CElemStore::MouseMove(CCore *Core,UINT nFlags, CPoint &CursorPos)
|
|||
/*****************************************************************************/
|
||||
bool CElemStore::Command(int CmdMsg,CCore *Core,int Param0,int Param1)
|
||||
{
|
||||
switch(CmdMsg)
|
||||
/* switch(CmdMsg)
|
||||
{
|
||||
case CmdMsg_SubViewLoad:
|
||||
LoadNewSet(Core);
|
||||
|
|
@ -476,7 +270,7 @@ bool CElemStore::Command(int CmdMsg,CCore *Core,int Param0,int Param1)
|
|||
default:
|
||||
TRACE3("ElemStore-Unhandled Command %i (%i,%i)\n",CmdMsg,Param0,Param1);
|
||||
}
|
||||
return(true);
|
||||
*/ return(true);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
@ -484,13 +278,13 @@ bool CElemStore::Command(int CmdMsg,CCore *Core,int Param0,int Param1)
|
|||
/*****************************************************************************/
|
||||
void CElemStore::GUIInit(CCore *Core)
|
||||
{
|
||||
Core->GUIAdd(ElemStoreGUI,IDD_LAYERTILE_GUI);
|
||||
Core->GUIAdd(GUIElemList,IDD_ELEMLIST);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
void CElemStore::GUIKill(CCore *Core)
|
||||
{
|
||||
Core->GUIRemove(ElemStoreGUI,IDD_LAYERTILE_GUI);
|
||||
Core->GUIRemove(GUIElemList,IDD_ELEMLIST);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
@ -499,22 +293,22 @@ void CElemStore::GUIUpdate(CCore *Core)
|
|||
int ListSize=GetSetCount();
|
||||
bool IsSubView=Core->IsSubView();
|
||||
|
||||
if (ElemStoreGUI.m_List)
|
||||
if (GUIElemList.m_List)
|
||||
{
|
||||
ElemStoreGUI.m_List.ResetContent();
|
||||
GUIElemList.m_List.ResetContent();
|
||||
if (ListSize)
|
||||
{
|
||||
for (int i=0; i<ListSize; i++)
|
||||
{
|
||||
ElemStoreGUI.m_List.AddString(GetSetName(i));
|
||||
GUIElemList.m_List.AddString(GetSetName(i));
|
||||
}
|
||||
ElemStoreGUI.m_List.SetCurSel(CurrentSet);
|
||||
GUIElemList.m_List.SetCurSel(CurrentSet);
|
||||
}
|
||||
else
|
||||
{
|
||||
IsSubView=FALSE;
|
||||
}
|
||||
ElemStoreGUI.m_List.EnableWindow(IsSubView);
|
||||
GUIElemList.m_List.EnableWindow(IsSubView);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -525,114 +319,3 @@ void CElemStore::GUIChanged(CCore *Core)
|
|||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
/*** Functions ***************************************************************/
|
||||
/*****************************************************************************/
|
||||
bool CElemStore::Select(int BrushID,bool DownFlag)
|
||||
{
|
||||
if (DownFlag && SelStart==-1)
|
||||
{
|
||||
if (CursorPos<0) return(FALSE);
|
||||
SelStart=CursorPos;
|
||||
TRACE1("SEL Start %i\n",CursorPos);
|
||||
|
||||
if (CursorPos==0)
|
||||
{
|
||||
SetBrush(GetBrush(BrushID));
|
||||
SelStart=-1;
|
||||
TRACE0("Selected Blank\n");
|
||||
|
||||
}
|
||||
}
|
||||
else
|
||||
if (!DownFlag && SelStart!=-1)
|
||||
{
|
||||
if (CursorPos==-1) return(SelectCancel());
|
||||
|
||||
SetBrush(GetBrush(BrushID));
|
||||
|
||||
SelStart=-1;
|
||||
TRACE1("END SEL %i\n",CursorPos);
|
||||
}
|
||||
|
||||
return(TRUE);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
void CElemStore::SetBrush(CMap &ThisBrush)
|
||||
{
|
||||
int BW=SetList[CurrentSet].GetBrowserWidth();
|
||||
CPoint S=IDToPoint(SelStart-1,BW);
|
||||
CPoint E=IDToPoint(SelEnd-1,BW);
|
||||
|
||||
int Width=abs(E.x-S.x)+1;
|
||||
int Height=abs(E.y-S.y)+1;
|
||||
|
||||
sMapElem ThisElem;
|
||||
int MaxElem=SetList[CurrentSet].GetCount();
|
||||
|
||||
// if (PointToID(End,BW)>=MaxElem) SelectCancel(); // Invalid selection
|
||||
|
||||
ThisElem.Set=CurrentSet;
|
||||
ThisElem.Flags=0;
|
||||
|
||||
ThisBrush.Delete();
|
||||
ThisBrush.SetSize(Width,Height);
|
||||
|
||||
for (int Y=0; Y<Height; Y++)
|
||||
{
|
||||
for (int X=0; X<Width; X++)
|
||||
{
|
||||
ThisElem.Elem=SelStart+X+(Y*BW);
|
||||
if (!IsValid(CurrentSet,ThisElem.Elem))
|
||||
{
|
||||
TRACE2("Not valid %i %i\n",CurrentSet,ThisElem.Elem);
|
||||
ThisElem.Elem=-1;
|
||||
}
|
||||
ThisBrush.Set(X,Y,ThisElem,true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
bool CElemStore::SelectCancel()
|
||||
{
|
||||
SelStart=-1;
|
||||
TRACE0("Select Cancelled\n");
|
||||
return(TRUE);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
void CElemStore::DeleteSet(CCore *Core)
|
||||
{
|
||||
if (Core->Question("Delete Current Elem Bank\n\nAll used Elems in current set will be set to blank\nAre you sure?"))
|
||||
{
|
||||
int SetCount=GetSetCount();
|
||||
int i,ListSize=Core->GetLayerCount();
|
||||
|
||||
for (i=0;i<ListSize;i++)
|
||||
{
|
||||
CLayerTile *ThisLayer=(CLayerTile*)Core->GetLayer(i);
|
||||
if (ThisLayer->GetType()==LAYER_TYPE_TILE)
|
||||
{
|
||||
ThisLayer->RemoveSet(CurrentSet);
|
||||
}
|
||||
}
|
||||
DeleteCurrent();
|
||||
|
||||
for (int Set=CurrentSet+1; Set<SetCount; Set++)
|
||||
{
|
||||
|
||||
for (i=0;i<ListSize;i++)
|
||||
{
|
||||
CLayerTile *ThisLayer=(CLayerTile*)Core->GetLayer(i);
|
||||
if (ThisLayer->GetType()==LAYER_TYPE_TILE)
|
||||
{
|
||||
ThisLayer->RemapSet(Set,Set-1);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
CurrentSet--;
|
||||
GUIUpdate(Core);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue