Mirrors/SBSPSS
1
0
Fork 0
Code Releases Activity

Browse Source
This commit is contained in:
Daveo 2001-01-03 22:11:13 +00:00
parent 8ee1f94da5
commit 7cceaaac22
6 changed files with 50 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Utils/MapEdit/Core.cpp
View File

@ -313,9 +313,9 @@ Vector3 Ofs;
void CCore::MouseWheel(CMapEditView *View,UINT nFlags, short zDelta, CPoint &pt)
{
if (zDelta>0)
Zoom(View,+0.1f);
else
Zoom(View,-0.1f);
else
Zoom(View,+0.1f);
}
/*****************************************************************************/
@ -634,8 +634,11 @@ Vector3 &ThisCam=GetCam();
ThisCam.x+=Ofs.x;
ThisCam.y+=Ofs.y;
ThisCam.z-=Ofs.z;
if (ThisCam.x<0) ThisCam.x=0;
if (ThisCam.y<0) ThisCam.y=0;
if (!TileViewFlag)
{
if (ThisCam.x<0) ThisCam.x=0;
if (ThisCam.y<0) ThisCam.y=0;
}
if (ThisCam.z<0.1) ThisCam.z=0.1f;
TRACE1("ZoomVal %f\n",ThisCam.z);

18
Utils/MapEdit/MapEdit.clw
View File

@ -18,21 +18,21 @@ Class6=CMapEditDoc
Class7=CMapEditView
ResourceCount=11
Resource1=IDR_TOOLBAR (English (U.S.))
Resource1=IDD_LAYER_LIST_DIALOG
Resource2=IDR_MAPEDITYPE (English (U.S.))
Resource3=IDD_ABOUTBOX (English (U.S.))
Resource3=IDD_NEW_LAYER
Resource4=IDD_DIALOGBAR (English (U.S.))
Resource5=IDD_LAYERTILE_GUI
Resource5=IDR_MAINFRAME (English (U.S.))
Class8=CMultiBar
Resource6=IDD_MULTIBAR (English (U.S.))
Resource7=IDD_LAYER_LIST_DIALOG
Resource6=IDD_MAPSIZE
Resource7=IDR_TOOLBAR (English (U.S.))
Class9=CLayerList
Class10=CMapSizeDlg
Resource8=IDD_MAPSIZE
Resource8=IDD_ABOUTBOX (English (U.S.))
Class11=CGfxToolBar
Class12=CLayerTileGUI
Resource9=IDR_MAINFRAME (English (U.S.))
Resource10=IDD_NEW_LAYER
Resource9=IDD_LAYERTILE_GUI
Resource10=IDD_MULTIBAR (English (U.S.))
Class13=CNewMapGUI
Class14=CProgressDlg
Resource11=IDD_NEWMAP
@ -86,7 +86,7 @@ Type=0
BaseClass=CGLEnabledView
HeaderFile=MapEditView.h
ImplementationFile=MapEditView.cpp
LastObject=ID_EDIT_PASTE
LastObject=ID_ZOOM_IN
Filter=C
VirtualFilter=VWC

4
Utils/MapEdit/MapEditDoc.cpp
View File

@ -319,14 +319,14 @@ CMapSizeDlg Dlg;
/*********************************************************************************/
void CMapEditDoc::OnZoomIn()
{
Core.Zoom(NULL,+1.0f);
Core.Zoom(NULL,-0.1f);
UpdateAllViews(NULL);
}
/*********************************************************************************/
void CMapEditDoc::OnZoomOut()
{
Core.Zoom(NULL,-1.0f);
Core.Zoom(NULL,+0.1f);
UpdateAllViews(NULL);
}

27
Utils/MapEdit/TexCache.cpp
View File

@ -42,7 +42,12 @@ sRGBData ThisRGB;
if (Idx!=-1) return(Idx);
// TRACE1("Loading Texture %s\n",NewTex.Filename);
LoadBMP(NewTex.Filename,ThisRGB);
if (!LoadBMP(NewTex.Filename,ThisRGB))
{
exit(-1);
return(ListSize);
}
RGBData=&ThisRGB;
LoadTex(NewTex,RGBData);
FreeBMP(ThisRGB);
@ -76,17 +81,31 @@ int CTexCache::AlignSize(int Size)
/**************************************************************************************/
void CTexCache::LoadBMP(char *Filename,sRGBData &RGBData)
bool CTexCache::LoadBMP(char *Filename,sRGBData &RGBData)
{
Frame ThisFrame;
ThisFrame.LoadBMP(Filename);
FILE *File;
// Check File exists
File=fopen(Filename,"r");
if (!File)
{
CString mexstr;
mexstr.Format("%s Not Found\n", Filename);
AfxMessageBox(mexstr,MB_OK | MB_ICONEXCLAMATION);
exit(EXIT_FAILURE );
return(false);
}
fclose(File);
ThisFrame.LoadBMP(Filename);
RGBData.Width=ThisFrame.GetWidth();
RGBData.Height=ThisFrame.GetHeight();
RGBData.RGB=(u8*)malloc(RGBData.Width*RGBData.Height*3);
ThisFrame.FlipY();
ThisFrame.MakeRGB(RGBData.RGB);
return(true);
}
/**************************************************************************************/

2
Utils/MapEdit/TexCache.h
View File

@ -46,7 +46,7 @@ public:
int ProcessTexture(char *Path,int Flags,sRGBData *RGBData=0);
void Purge();
void LoadBMP(char *Filename,sRGBData &RGBData);
bool LoadBMP(char *Filename,sRGBData &RGBData);
void FreeBMP(sRGBData &RGBData);
void FixBMP(sRGBData &RGBData);
bool IsSizeOk(int Size);

12
Utils/MapEdit/TileSet.cpp
View File

@ -490,7 +490,8 @@ int TileID=0;
sMapElem ThisElem;
int SelFlag;
BOOL ValidTile=TRUE;
float Scale=1.0f/(float)TileBrowserWidth/CamPos.z;
//float Scale=1.0f/(float)TileBrowserWidth/CamPos.z;
float Scale=CamPos.z/(float)TileBrowserWidth/2.0;
ThisElem.Flags=0;
ThisElem.Set=SetNumber;
@ -594,7 +595,8 @@ void CTileSet::RenderCursor(Vector3 &CamPos,int CursorPos,int SelStart,int SelEn
int ListSize=Tile.size();
CPoint Start,End;
int MaxTile=Tile.size();
float Scale=1.0f/(float)TileBrowserWidth/CamPos.z;
//float Scale=1.0f/(float)TileBrowserWidth/CamPos.z;
float Scale=CamPos.z/(float)TileBrowserWidth/2.0;
if (CursorPos<-1 || CursorPos>ListSize) return;
@ -644,7 +646,8 @@ void CTileSet::RenderGrid(Vector3 &CamPos)
{
int ListSize=Tile.size();
int TileID=1; // Dont bother with blank, its sorted
float Scale=1.0f/(float)TileBrowserWidth/CamPos.z;
//float Scale=1.0f/(float)TileBrowserWidth/CamPos.z;
float Scale=CamPos.z/(float)TileBrowserWidth/2.0;
glMatrixMode(GL_MODELVIEW);
glPushMatrix();
@ -690,7 +693,8 @@ GLint Viewport[4];
GLuint SelectBuffer[SELECT_BUFFER_SIZE];
int HitCount;
int TileID=0;
float Scale=1.0f/(float)TileBrowserWidth/CamPos.z;
//float Scale=1.0f/(float)TileBrowserWidth/CamPos.z;
float Scale=CamPos.z/(float)TileBrowserWidth/2.0;
glGetIntegerv(GL_VIEWPORT, Viewport);
glSelectBuffer (SELECT_BUFFER_SIZE, SelectBuffer );