diff --git a/Utils/MapEdit/Core.cpp b/Utils/MapEdit/Core.cpp index 24b77bcc8..d38b53381 100644 --- a/Utils/MapEdit/Core.cpp +++ b/Utils/MapEdit/Core.cpp @@ -309,18 +309,24 @@ BOOL RedrawFlag=FALSE; } /*****************************************************************************/ -void CCore::MouseWheel(CMapEditView *View,UINT nFlags, short zDelta, CPoint &pt) +void CCore::Zoom(CMapEditView *View,float Dst) { Vector3 Ofs; Ofs.Zero(); - if (zDelta>0) - Ofs.z=+1.0f; - else - Ofs.z=-1.0f; - + Ofs.z=Dst; UpdateView(View,Ofs); } + +/*****************************************************************************/ +void CCore::MouseWheel(CMapEditView *View,UINT nFlags, short zDelta, CPoint &pt) +{ + if (zDelta>0) + Zoom(View,+1.0f); + else + Zoom(View,+1.0f); +} + /*****************************************************************************/ void CCore::MouseMove(CMapEditView *View,UINT nFlags, CPoint &point) { @@ -726,3 +732,6 @@ GString Path=FullPath.Dir(); return(Path); } + + +/*****************************************************************************/ diff --git a/Utils/MapEdit/Core.h b/Utils/MapEdit/Core.h index 642f1b79b..8f1cf68ff 100644 --- a/Utils/MapEdit/Core.h +++ b/Utils/MapEdit/Core.h @@ -44,6 +44,7 @@ public: void RButtonControl(CMapEditView *View,UINT nFlags, CPoint &point,BOOL DownFlag); void MouseWheel(CMapEditView *View,UINT nFlags, short zDelta, CPoint &pt); void MouseMove(CMapEditView *View,UINT nFlags, CPoint &point); + void Zoom(CMapEditView *View,float Dst); // TileBank void UpdateTileView(CMapEditView *View,BOOL Toggle=FALSE); diff --git a/Utils/MapEdit/MapEdit.clw b/Utils/MapEdit/MapEdit.clw index 4b32f01db..fc84056a4 100644 --- a/Utils/MapEdit/MapEdit.clw +++ b/Utils/MapEdit/MapEdit.clw @@ -2,7 +2,7 @@ [General Info] Version=1 -LastClass=CAboutDlg +LastClass=CMapEditDoc LastTemplate=CDialog NewFileInclude1=#include "stdafx.h" NewFileInclude2=#include "mapedit.h" @@ -18,21 +18,21 @@ Class6=CMapEditDoc Class7=CMapEditView ResourceCount=11 -Resource1=IDD_NEW_LAYER -Resource2=IDR_MAINFRAME (English (U.S.)) -Resource3=IDD_MAPSIZE +Resource1=IDD_ABOUTBOX (English (U.S.)) +Resource2=IDR_MAPEDITYPE (English (U.S.)) +Resource3=IDR_MAINFRAME (English (U.S.)) Resource4=IDD_DIALOGBAR (English (U.S.)) -Resource5=IDR_TOOLBAR (English (U.S.)) +Resource5=IDD_LAYER_LIST_DIALOG Class8=CMultiBar -Resource6=IDD_LAYER_LIST_DIALOG -Resource7=IDR_MAPEDITYPE (English (U.S.)) +Resource6=IDD_NEW_LAYER +Resource7=IDD_MULTIBAR (English (U.S.)) Class9=CLayerList Class10=CMapSizeDlg -Resource8=IDD_ABOUTBOX (English (U.S.)) +Resource8=IDD_LAYERTILE_GUI Class11=CGfxToolBar Class12=CLayerTileGUI -Resource9=IDD_LAYERTILE_GUI -Resource10=IDD_MULTIBAR (English (U.S.)) +Resource9=IDR_TOOLBAR (English (U.S.)) +Resource10=IDD_MAPSIZE Class13=CNewMapGUI Class14=CProgressDlg Resource11=IDD_NEWMAP @@ -68,7 +68,7 @@ Type=0 BaseClass=CDialog HeaderFile=MapEdit.cpp ImplementationFile=MapEdit.cpp -LastObject=IDC_VERSION_LIST +LastObject=ID_ZOOM_IN Filter=D VirtualFilter=dWC @@ -77,7 +77,7 @@ Type=0 BaseClass=CDocument HeaderFile=MapEditDoc.h ImplementationFile=MapEditDoc.cpp -LastObject=CMapEditDoc +LastObject=ID_ZOOM_OUT Filter=N VirtualFilter=DC @@ -86,7 +86,7 @@ Type=0 BaseClass=CGLEnabledView HeaderFile=MapEditView.h ImplementationFile=MapEditView.cpp -LastObject=CMapEditView +LastObject=ID_TOOLBAR_TILEPALETTE Filter=C VirtualFilter=VWC @@ -139,43 +139,49 @@ Command14=ID_VIEW_TOOLBAR Command15=ID_VIEW_STATUS_BAR Command16=ID_MAP_SETSIZE Command17=ID_TOGGLE_GRID -Command18=ID_MIRRORX -Command19=ID_MIRRORY -Command20=ID_ACTIVEBRUSH_LEFT -Command21=ID_ACTIVEBRUSH_RIGHT -Command22=ID_TOGGLE_TILEVIEW -Command23=ID_2D_3D_TOGGLE -Command24=ID_WINDOW_NEW -Command25=ID_WINDOW_CASCADE -Command26=ID_WINDOW_TILE_HORZ -Command27=ID_WINDOW_ARRANGE -Command28=ID_APP_ABOUT -CommandCount=28 +Command18=ID_ZOOM_IN +Command19=ID_ZOOM_OUT +Command20=ID_MIRRORX +Command21=ID_MIRRORY +Command22=ID_ACTIVEBRUSH_LEFT +Command23=ID_ACTIVEBRUSH_RIGHT +Command24=ID_TOGGLE_TILEVIEW +Command25=ID_2D_3D_TOGGLE +Command26=ID_WINDOW_NEW +Command27=ID_WINDOW_CASCADE +Command28=ID_WINDOW_TILE_HORZ +Command29=ID_WINDOW_ARRANGE +Command30=ID_APP_ABOUT +CommandCount=30 [ACL:IDR_MAINFRAME (English (U.S.))] Type=1 Class=? -Command1=ID_ACTIVEBRUSH_LEFT -Command2=ID_ACTIVEBRUSH_RIGHT -Command3=ID_2D_3D_TOGGLE -Command4=ID_EDIT_COPY -Command5=ID_TOGGLE_GRID -Command6=ID_FILE_NEW -Command7=ID_FILE_OPEN -Command8=ID_FILE_SAVE -Command9=ID_EDIT_PASTE -Command10=ID_EDIT_UNDO -Command11=ID_EDIT_CUT -Command12=ID_EDIT_COPY -Command13=ID_EDIT_PASTE -Command14=ID_TOGGLE_TILEVIEW -Command15=ID_NEXT_PANE -Command16=ID_PREV_PANE -Command17=ID_MIRRORX -Command18=ID_EDIT_CUT -Command19=ID_MIRRORY -Command20=ID_EDIT_UNDO -CommandCount=20 +Command1=ID_ZOOM_IN +Command2=ID_ZOOM_OUT +Command3=ID_ACTIVEBRUSH_LEFT +Command4=ID_ACTIVEBRUSH_RIGHT +Command5=ID_2D_3D_TOGGLE +Command6=ID_EDIT_COPY +Command7=ID_TOGGLE_GRID +Command8=ID_FILE_NEW +Command9=ID_FILE_OPEN +Command10=ID_FILE_SAVE +Command11=ID_EDIT_PASTE +Command12=ID_ZOOM_IN +Command13=ID_EDIT_UNDO +Command14=ID_EDIT_CUT +Command15=ID_EDIT_COPY +Command16=ID_EDIT_PASTE +Command17=ID_TOGGLE_TILEVIEW +Command18=ID_ZOOM_OUT +Command19=ID_NEXT_PANE +Command20=ID_PREV_PANE +Command21=ID_MIRRORX +Command22=ID_EDIT_CUT +Command23=ID_MIRRORY +Command24=ID_EDIT_UNDO +CommandCount=24 [DLG:IDD_ABOUTBOX (English (U.S.))] Type=1 diff --git a/Utils/MapEdit/MapEdit.rc b/Utils/MapEdit/MapEdit.rc index ad4235170..07b0a1f10 100644 --- a/Utils/MapEdit/MapEdit.rc +++ b/Utils/MapEdit/MapEdit.rc @@ -120,6 +120,10 @@ BEGIN MENUITEM "Set Size", ID_MAP_SETSIZE MENUITEM SEPARATOR MENUITEM "&Toggle Grid", ID_TOGGLE_GRID + MENUITEM SEPARATOR + MENUITEM "Zoom In", ID_ZOOM_IN + MENUITEM "Zoom Out", ID_ZOOM_OUT + MENUITEM SEPARATOR END POPUP "&TileBank" BEGIN @@ -157,6 +161,8 @@ END IDR_MAINFRAME ACCELERATORS PRELOAD MOVEABLE PURE BEGIN + 187, ID_ZOOM_IN, VIRTKEY, NOINVERT + 189, ID_ZOOM_OUT, VIRTKEY, NOINVERT 219, ID_ACTIVEBRUSH_LEFT, VIRTKEY, NOINVERT 221, ID_ACTIVEBRUSH_RIGHT, VIRTKEY, NOINVERT 222, ID_2D_3D_TOGGLE, VIRTKEY, NOINVERT @@ -166,11 +172,13 @@ BEGIN "O", ID_FILE_OPEN, VIRTKEY, CONTROL, NOINVERT "S", ID_FILE_SAVE, VIRTKEY, CONTROL, NOINVERT "V", ID_EDIT_PASTE, VIRTKEY, CONTROL, NOINVERT + VK_ADD, ID_ZOOM_IN, VIRTKEY, NOINVERT VK_BACK, ID_EDIT_UNDO, VIRTKEY, ALT, NOINVERT VK_DELETE, ID_EDIT_CUT, VIRTKEY, SHIFT, NOINVERT VK_INSERT, ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT VK_INSERT, ID_EDIT_PASTE, VIRTKEY, SHIFT, NOINVERT VK_SPACE, ID_TOGGLE_TILEVIEW, VIRTKEY, NOINVERT + VK_SUBTRACT, ID_ZOOM_OUT, VIRTKEY, NOINVERT VK_TAB, ID_NEXT_PANE, VIRTKEY, CONTROL, NOINVERT VK_TAB, ID_PREV_PANE, VIRTKEY, SHIFT, CONTROL, NOINVERT diff --git a/Utils/MapEdit/MapEditDoc.cpp b/Utils/MapEdit/MapEditDoc.cpp index d5a129d23..081698ba7 100644 --- a/Utils/MapEdit/MapEditDoc.cpp +++ b/Utils/MapEdit/MapEditDoc.cpp @@ -23,6 +23,8 @@ BEGIN_MESSAGE_MAP(CMapEditDoc, CDocument) ON_UPDATE_COMMAND_UI(ID_INDICATOR_CURSORXY, OnStatusCursorXY) ON_COMMAND(ID_EXPORT_AGB, OnExportAgb) ON_COMMAND(ID_EXPORT_PSX, OnExportPsx) + ON_COMMAND(ID_ZOOM_IN, OnZoomIn) + ON_COMMAND(ID_ZOOM_OUT, OnZoomOut) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -300,6 +302,20 @@ CMapSizeDlg Dlg; Core.SetMapSize(View,Dlg.m_Width,Dlg.m_Height); } +/*********************************************************************************/ +void CMapEditDoc::OnZoomIn() +{ + Core.Zoom(NULL,+1.0f); + UpdateAllViews(NULL); +} + +/*********************************************************************************/ +void CMapEditDoc::OnZoomOut() +{ + Core.Zoom(NULL,-1.0f); + UpdateAllViews(NULL); +} + /*********************************************************************************/ void CMapEditDoc::Toggle2d3d(CMapEditView *View) { @@ -311,4 +327,5 @@ void CMapEditDoc::FocusView() { theApp.GetMainWnd()->SetFocus(); // Put control back to Window :o) -} \ No newline at end of file +} + diff --git a/Utils/MapEdit/MapEditDoc.h b/Utils/MapEdit/MapEditDoc.h index f50b8df12..615f5ec6d 100644 --- a/Utils/MapEdit/MapEditDoc.h +++ b/Utils/MapEdit/MapEditDoc.h @@ -77,6 +77,8 @@ protected: afx_msg void OnStatusCursorXY(CCmdUI *pCmdUI); afx_msg void OnExportAgb(); afx_msg void OnExportPsx(); + afx_msg void OnZoomIn(); + afx_msg void OnZoomOut(); //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/Utils/MapEdit/MapEditView.cpp b/Utils/MapEdit/MapEditView.cpp index 0cbb5bea2..966a556b9 100644 --- a/Utils/MapEdit/MapEditView.cpp +++ b/Utils/MapEdit/MapEditView.cpp @@ -42,9 +42,9 @@ BEGIN_MESSAGE_MAP(CMapEditView, CGLEnabledView) ON_COMMAND(ID_ACTIVEBRUSH_LEFT, OnActivebrushLeft) ON_COMMAND(ID_ACTIVEBRUSH_RIGHT, OnActivebrushRight) ON_COMMAND(ID_MAP_SETSIZE, OnMapSetSize) + ON_COMMAND(ID_2D_3D_TOGGLE, On2d3dToggle) ON_COMMAND(ID_TOOLBAR_TILEPALETTE, OnToggleTileview) ON_COMMAND(ID_TOGGLE_GRID, OnToggleGrid) - ON_COMMAND(ID_2D_3D_TOGGLE, On2d3dToggle) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -180,3 +180,4 @@ void CMapEditView::OnActivebrushRight() {GetDocument()->ActiveBrushRight void CMapEditView::OnMapSetSize() {GetDocument()->MapSetSize(this);} void CMapEditView::On2d3dToggle() {GetDocument()->Toggle2d3d(this);} + diff --git a/Utils/MapEdit/resource.h b/Utils/MapEdit/resource.h index 9893ab8b4..48c81a410 100644 --- a/Utils/MapEdit/resource.h +++ b/Utils/MapEdit/resource.h @@ -41,7 +41,6 @@ #define IDC_NEWMAP_FORE_CHECK 1051 #define IDC_NEW_LAYER_WIDTH_NAME2 1052 #define IDC_NEW_LAYER_WIDTH_EDIT2 1053 -#define IDC_VERSION_LIST 1055 #define ID_TOOLBAR_LAYERBAR 32773 #define ID_TOOLBAR_TILEPALETTE 32774 #define ID_TOOLBAR_COMBO 32777 @@ -58,6 +57,8 @@ #define ID_2D_3D_TOGGLE 32794 #define ID_EXPORT_AGB 32795 #define ID_EXPORT_PSX 32796 +#define ID_ZOOM_IN 32797 +#define ID_ZOOM_OUT 32798 #define ID_INDICATOR_CURSORXY 59142 // Next default values for new objects @@ -66,7 +67,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 172 -#define _APS_NEXT_COMMAND_VALUE 32797 +#define _APS_NEXT_COMMAND_VALUE 32799 #define _APS_NEXT_CONTROL_VALUE 1056 #define _APS_NEXT_SYMED_VALUE 101 #endif diff --git a/source/level/layertile.cpp b/source/level/layertile.cpp index 4e2adf65a..366a6a157 100644 --- a/source/level/layertile.cpp +++ b/source/level/layertile.cpp @@ -83,7 +83,6 @@ int MapHeight=GetWidth(); } /*****************************************************************************/ - void CLayerTile::RenderTileMap2d(int MapX,int MapY) { sTileMap2dElem *Table=TileMap2d[FrameFlipFlag].List; @@ -99,7 +98,7 @@ const u32 YInc=16<<16; MapX>>=4; MapY>>=4; -// Calc Start pos (fully wrapping) +// Calc (wrapped) Start pos /**/ MapX=MapX % TileMapWidth; /**/ MapY=MapY % TileMapHeight; @@ -115,7 +114,6 @@ const u32 YInc=16<<16; { TSPRT_16 *TileData=&Table->Tile; *(u32*)&TileData->x0=XYPos; -/**/ //AddPrimToList(TileData,0); /**/ AddPrim(OtPtr,TileData); Table=Table->Right; XYPos+=XInc; diff --git a/source/level/level.cpp b/source/level/level.cpp index d348b2679..f498aeab1 100644 --- a/source/level/level.cpp +++ b/source/level/level.cpp @@ -39,8 +39,10 @@ CLevel::~CLevel() /*****************************************************************************/ void CLevel::init() { - LevelHdr=(sLvlHdr *)CFileIO::loadFile(CHAPTER01_LEVEL01_LVL,"Level Data"); - TPLoadTex(CHAPTER01_LEVEL01_TEX); +// LevelHdr=(sLvlHdr *)CFileIO::loadFile(CHAPTER01_LEVEL01_LVL,"Level Data"); +// TPLoadTex(CHAPTER01_LEVEL01_TEX); + LevelHdr=(sLvlHdr *)CFileIO::loadFile(LEVEL01_LEVEL01_LVL,"Level Data"); + TPLoadTex(LEVEL01_LEVEL01_TEX); initLayers(); }