Mirrors/SBSPSS
1
0
Fork 0
Code Releases Activity

Browse Source
This commit is contained in:
Daveo 2000-12-11 21:52:32 +00:00
parent 6d6c4645dd
commit 2f68dceedd
10 changed files with 106 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Utils/MapEdit/Core.cpp
View File

@ -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; Vector3 Ofs;
Ofs.Zero(); Ofs.Zero();
if (zDelta>0) Ofs.z=Dst;
Ofs.z=+1.0f;
else
Ofs.z=-1.0f;
UpdateView(View,Ofs); 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) void CCore::MouseMove(CMapEditView *View,UINT nFlags, CPoint &point)
{ {
@ -726,3 +732,6 @@ GString Path=FullPath.Dir();
return(Path); return(Path);
} }
/*****************************************************************************/

1
Utils/MapEdit/Core.h
View File

@ -44,6 +44,7 @@ public:
void RButtonControl(CMapEditView *View,UINT nFlags, CPoint &point,BOOL DownFlag); void RButtonControl(CMapEditView *View,UINT nFlags, CPoint &point,BOOL DownFlag);
void MouseWheel(CMapEditView *View,UINT nFlags, short zDelta, CPoint &pt); void MouseWheel(CMapEditView *View,UINT nFlags, short zDelta, CPoint &pt);
void MouseMove(CMapEditView *View,UINT nFlags, CPoint &point); void MouseMove(CMapEditView *View,UINT nFlags, CPoint &point);
void Zoom(CMapEditView *View,float Dst);
// TileBank // TileBank
void UpdateTileView(CMapEditView *View,BOOL Toggle=FALSE); void UpdateTileView(CMapEditView *View,BOOL Toggle=FALSE);

98
Utils/MapEdit/MapEdit.clw
View File

@ -2,7 +2,7 @@
[General Info] [General Info]
Version=1 Version=1
LastClass=CAboutDlg LastClass=CMapEditDoc
LastTemplate=CDialog LastTemplate=CDialog
NewFileInclude1=#include "stdafx.h" NewFileInclude1=#include "stdafx.h"
NewFileInclude2=#include "mapedit.h" NewFileInclude2=#include "mapedit.h"
@ -18,21 +18,21 @@ Class6=CMapEditDoc
Class7=CMapEditView Class7=CMapEditView
ResourceCount=11 ResourceCount=11
Resource1=IDD_NEW_LAYER Resource1=IDD_ABOUTBOX (English (U.S.))
Resource2=IDR_MAINFRAME (English (U.S.)) Resource2=IDR_MAPEDITYPE (English (U.S.))
Resource3=IDD_MAPSIZE Resource3=IDR_MAINFRAME (English (U.S.))
Resource4=IDD_DIALOGBAR (English (U.S.)) Resource4=IDD_DIALOGBAR (English (U.S.))
Resource5=IDR_TOOLBAR (English (U.S.)) Resource5=IDD_LAYER_LIST_DIALOG
Class8=CMultiBar Class8=CMultiBar
Resource6=IDD_LAYER_LIST_DIALOG Resource6=IDD_NEW_LAYER
Resource7=IDR_MAPEDITYPE (English (U.S.)) Resource7=IDD_MULTIBAR (English (U.S.))
Class9=CLayerList Class9=CLayerList
Class10=CMapSizeDlg Class10=CMapSizeDlg
Resource8=IDD_ABOUTBOX (English (U.S.)) Resource8=IDD_LAYERTILE_GUI
Class11=CGfxToolBar Class11=CGfxToolBar
Class12=CLayerTileGUI Class12=CLayerTileGUI
Resource9=IDD_LAYERTILE_GUI Resource9=IDR_TOOLBAR (English (U.S.))
Resource10=IDD_MULTIBAR (English (U.S.)) Resource10=IDD_MAPSIZE
Class13=CNewMapGUI Class13=CNewMapGUI
Class14=CProgressDlg Class14=CProgressDlg
Resource11=IDD_NEWMAP Resource11=IDD_NEWMAP
@ -68,7 +68,7 @@ Type=0
BaseClass=CDialog BaseClass=CDialog
HeaderFile=MapEdit.cpp HeaderFile=MapEdit.cpp
ImplementationFile=MapEdit.cpp ImplementationFile=MapEdit.cpp
LastObject=IDC_VERSION_LIST LastObject=ID_ZOOM_IN
Filter=D Filter=D
VirtualFilter=dWC VirtualFilter=dWC
@ -77,7 +77,7 @@ Type=0
BaseClass=CDocument BaseClass=CDocument
HeaderFile=MapEditDoc.h HeaderFile=MapEditDoc.h
ImplementationFile=MapEditDoc.cpp ImplementationFile=MapEditDoc.cpp
LastObject=CMapEditDoc LastObject=ID_ZOOM_OUT
Filter=N Filter=N
VirtualFilter=DC VirtualFilter=DC
@ -86,7 +86,7 @@ Type=0
BaseClass=CGLEnabledView BaseClass=CGLEnabledView
HeaderFile=MapEditView.h HeaderFile=MapEditView.h
ImplementationFile=MapEditView.cpp ImplementationFile=MapEditView.cpp
LastObject=CMapEditView LastObject=ID_TOOLBAR_TILEPALETTE
Filter=C Filter=C
VirtualFilter=VWC VirtualFilter=VWC
@ -139,43 +139,49 @@ Command14=ID_VIEW_TOOLBAR
Command15=ID_VIEW_STATUS_BAR Command15=ID_VIEW_STATUS_BAR
Command16=ID_MAP_SETSIZE Command16=ID_MAP_SETSIZE
Command17=ID_TOGGLE_GRID Command17=ID_TOGGLE_GRID
Command18=ID_MIRRORX Command18=ID_ZOOM_IN
Command19=ID_MIRRORY Command19=ID_ZOOM_OUT
Command20=ID_ACTIVEBRUSH_LEFT Command20=ID_MIRRORX
Command21=ID_ACTIVEBRUSH_RIGHT Command21=ID_MIRRORY
Command22=ID_TOGGLE_TILEVIEW Command22=ID_ACTIVEBRUSH_LEFT
Command23=ID_2D_3D_TOGGLE Command23=ID_ACTIVEBRUSH_RIGHT
Command24=ID_WINDOW_NEW Command24=ID_TOGGLE_TILEVIEW
Command25=ID_WINDOW_CASCADE Command25=ID_2D_3D_TOGGLE
Command26=ID_WINDOW_TILE_HORZ Command26=ID_WINDOW_NEW
Command27=ID_WINDOW_ARRANGE Command27=ID_WINDOW_CASCADE
Command28=ID_APP_ABOUT Command28=ID_WINDOW_TILE_HORZ
CommandCount=28 Command29=ID_WINDOW_ARRANGE
Command30=ID_APP_ABOUT
CommandCount=30
[ACL:IDR_MAINFRAME (English (U.S.))] [ACL:IDR_MAINFRAME (English (U.S.))]
Type=1 Type=1
Class=? Class=?
Command1=ID_ACTIVEBRUSH_LEFT Command1=ID_ZOOM_IN
Command2=ID_ACTIVEBRUSH_RIGHT Command2=ID_ZOOM_OUT
Command3=ID_2D_3D_TOGGLE Command3=ID_ACTIVEBRUSH_LEFT
Command4=ID_EDIT_COPY Command4=ID_ACTIVEBRUSH_RIGHT
Command5=ID_TOGGLE_GRID Command5=ID_2D_3D_TOGGLE
Command6=ID_FILE_NEW Command6=ID_EDIT_COPY
Command7=ID_FILE_OPEN Command7=ID_TOGGLE_GRID
Command8=ID_FILE_SAVE Command8=ID_FILE_NEW
Command9=ID_EDIT_PASTE Command9=ID_FILE_OPEN
Command10=ID_EDIT_UNDO Command10=ID_FILE_SAVE
Command11=ID_EDIT_CUT Command11=ID_EDIT_PASTE
Command12=ID_EDIT_COPY Command12=ID_ZOOM_IN
Command13=ID_EDIT_PASTE Command13=ID_EDIT_UNDO
Command14=ID_TOGGLE_TILEVIEW Command14=ID_EDIT_CUT
Command15=ID_NEXT_PANE Command15=ID_EDIT_COPY
Command16=ID_PREV_PANE Command16=ID_EDIT_PASTE
Command17=ID_MIRRORX Command17=ID_TOGGLE_TILEVIEW
Command18=ID_EDIT_CUT Command18=ID_ZOOM_OUT
Command19=ID_MIRRORY Command19=ID_NEXT_PANE
Command20=ID_EDIT_UNDO Command20=ID_PREV_PANE
CommandCount=20 Command21=ID_MIRRORX
Command22=ID_EDIT_CUT
Command23=ID_MIRRORY
Command24=ID_EDIT_UNDO
CommandCount=24
[DLG:IDD_ABOUTBOX (English (U.S.))] [DLG:IDD_ABOUTBOX (English (U.S.))]
Type=1 Type=1

8
Utils/MapEdit/MapEdit.rc
View File

@ -120,6 +120,10 @@ BEGIN
MENUITEM "Set Size", ID_MAP_SETSIZE MENUITEM "Set Size", ID_MAP_SETSIZE
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Toggle Grid", ID_TOGGLE_GRID MENUITEM "&Toggle Grid", ID_TOGGLE_GRID
MENUITEM SEPARATOR
MENUITEM "Zoom In", ID_ZOOM_IN
MENUITEM "Zoom Out", ID_ZOOM_OUT
MENUITEM SEPARATOR
END END
POPUP "&TileBank" POPUP "&TileBank"
BEGIN BEGIN
@ -157,6 +161,8 @@ END
IDR_MAINFRAME ACCELERATORS PRELOAD MOVEABLE PURE IDR_MAINFRAME ACCELERATORS PRELOAD MOVEABLE PURE
BEGIN BEGIN
187, ID_ZOOM_IN, VIRTKEY, NOINVERT
189, ID_ZOOM_OUT, VIRTKEY, NOINVERT
219, ID_ACTIVEBRUSH_LEFT, VIRTKEY, NOINVERT 219, ID_ACTIVEBRUSH_LEFT, VIRTKEY, NOINVERT
221, ID_ACTIVEBRUSH_RIGHT, VIRTKEY, NOINVERT 221, ID_ACTIVEBRUSH_RIGHT, VIRTKEY, NOINVERT
222, ID_2D_3D_TOGGLE, VIRTKEY, NOINVERT 222, ID_2D_3D_TOGGLE, VIRTKEY, NOINVERT
@ -166,11 +172,13 @@ BEGIN
"O", ID_FILE_OPEN, VIRTKEY, CONTROL, NOINVERT "O", ID_FILE_OPEN, VIRTKEY, CONTROL, NOINVERT
"S", ID_FILE_SAVE, VIRTKEY, CONTROL, NOINVERT "S", ID_FILE_SAVE, VIRTKEY, CONTROL, NOINVERT
"V", ID_EDIT_PASTE, 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_BACK, ID_EDIT_UNDO, VIRTKEY, ALT, NOINVERT
VK_DELETE, ID_EDIT_CUT, VIRTKEY, SHIFT, NOINVERT VK_DELETE, ID_EDIT_CUT, VIRTKEY, SHIFT, NOINVERT
VK_INSERT, ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT VK_INSERT, ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT
VK_INSERT, ID_EDIT_PASTE, VIRTKEY, SHIFT, NOINVERT VK_INSERT, ID_EDIT_PASTE, VIRTKEY, SHIFT, NOINVERT
VK_SPACE, ID_TOGGLE_TILEVIEW, VIRTKEY, 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_NEXT_PANE, VIRTKEY, CONTROL, NOINVERT
VK_TAB, ID_PREV_PANE, VIRTKEY, SHIFT, CONTROL, VK_TAB, ID_PREV_PANE, VIRTKEY, SHIFT, CONTROL,
NOINVERT NOINVERT

19
Utils/MapEdit/MapEditDoc.cpp
View File

@ -23,6 +23,8 @@ BEGIN_MESSAGE_MAP(CMapEditDoc, CDocument)
ON_UPDATE_COMMAND_UI(ID_INDICATOR_CURSORXY, OnStatusCursorXY) ON_UPDATE_COMMAND_UI(ID_INDICATOR_CURSORXY, OnStatusCursorXY)
ON_COMMAND(ID_EXPORT_AGB, OnExportAgb) ON_COMMAND(ID_EXPORT_AGB, OnExportAgb)
ON_COMMAND(ID_EXPORT_PSX, OnExportPsx) ON_COMMAND(ID_EXPORT_PSX, OnExportPsx)
ON_COMMAND(ID_ZOOM_IN, OnZoomIn)
ON_COMMAND(ID_ZOOM_OUT, OnZoomOut)
//}}AFX_MSG_MAP //}}AFX_MSG_MAP
END_MESSAGE_MAP() END_MESSAGE_MAP()
@ -300,6 +302,20 @@ CMapSizeDlg Dlg;
Core.SetMapSize(View,Dlg.m_Width,Dlg.m_Height); 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) void CMapEditDoc::Toggle2d3d(CMapEditView *View)
{ {
@ -311,4 +327,5 @@ void CMapEditDoc::FocusView()
{ {
theApp.GetMainWnd()->SetFocus(); // Put control back to Window :o) theApp.GetMainWnd()->SetFocus(); // Put control back to Window :o)
} }

2
Utils/MapEdit/MapEditDoc.h
View File

@ -77,6 +77,8 @@ protected:
afx_msg void OnStatusCursorXY(CCmdUI *pCmdUI); afx_msg void OnStatusCursorXY(CCmdUI *pCmdUI);
afx_msg void OnExportAgb(); afx_msg void OnExportAgb();
afx_msg void OnExportPsx(); afx_msg void OnExportPsx();
afx_msg void OnZoomIn();
afx_msg void OnZoomOut();
//}}AFX_MSG //}}AFX_MSG
DECLARE_MESSAGE_MAP() DECLARE_MESSAGE_MAP()

3
Utils/MapEdit/MapEditView.cpp
View File

@ -42,9 +42,9 @@ BEGIN_MESSAGE_MAP(CMapEditView, CGLEnabledView)
ON_COMMAND(ID_ACTIVEBRUSH_LEFT, OnActivebrushLeft) ON_COMMAND(ID_ACTIVEBRUSH_LEFT, OnActivebrushLeft)
ON_COMMAND(ID_ACTIVEBRUSH_RIGHT, OnActivebrushRight) ON_COMMAND(ID_ACTIVEBRUSH_RIGHT, OnActivebrushRight)
ON_COMMAND(ID_MAP_SETSIZE, OnMapSetSize) ON_COMMAND(ID_MAP_SETSIZE, OnMapSetSize)
ON_COMMAND(ID_2D_3D_TOGGLE, On2d3dToggle)
ON_COMMAND(ID_TOOLBAR_TILEPALETTE, OnToggleTileview) ON_COMMAND(ID_TOOLBAR_TILEPALETTE, OnToggleTileview)
ON_COMMAND(ID_TOGGLE_GRID, OnToggleGrid) ON_COMMAND(ID_TOGGLE_GRID, OnToggleGrid)
ON_COMMAND(ID_2D_3D_TOGGLE, On2d3dToggle)
//}}AFX_MSG_MAP //}}AFX_MSG_MAP
END_MESSAGE_MAP() END_MESSAGE_MAP()
@ -180,3 +180,4 @@ void CMapEditView::OnActivebrushRight() {GetDocument()->ActiveBrushRight
void CMapEditView::OnMapSetSize() {GetDocument()->MapSetSize(this);} void CMapEditView::OnMapSetSize() {GetDocument()->MapSetSize(this);}
void CMapEditView::On2d3dToggle() {GetDocument()->Toggle2d3d(this);} void CMapEditView::On2d3dToggle() {GetDocument()->Toggle2d3d(this);}

5
Utils/MapEdit/resource.h
View File

@ -41,7 +41,6 @@
#define IDC_NEWMAP_FORE_CHECK 1051 #define IDC_NEWMAP_FORE_CHECK 1051
#define IDC_NEW_LAYER_WIDTH_NAME2 1052 #define IDC_NEW_LAYER_WIDTH_NAME2 1052
#define IDC_NEW_LAYER_WIDTH_EDIT2 1053 #define IDC_NEW_LAYER_WIDTH_EDIT2 1053
#define IDC_VERSION_LIST 1055
#define ID_TOOLBAR_LAYERBAR 32773 #define ID_TOOLBAR_LAYERBAR 32773
#define ID_TOOLBAR_TILEPALETTE 32774 #define ID_TOOLBAR_TILEPALETTE 32774
#define ID_TOOLBAR_COMBO 32777 #define ID_TOOLBAR_COMBO 32777
@ -58,6 +57,8 @@
#define ID_2D_3D_TOGGLE 32794 #define ID_2D_3D_TOGGLE 32794
#define ID_EXPORT_AGB 32795 #define ID_EXPORT_AGB 32795
#define ID_EXPORT_PSX 32796 #define ID_EXPORT_PSX 32796
#define ID_ZOOM_IN 32797
#define ID_ZOOM_OUT 32798
#define ID_INDICATOR_CURSORXY 59142 #define ID_INDICATOR_CURSORXY 59142
// Next default values for new objects // Next default values for new objects
@ -66,7 +67,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS #ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1 #define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 172 #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_CONTROL_VALUE 1056
#define _APS_NEXT_SYMED_VALUE 101 #define _APS_NEXT_SYMED_VALUE 101
#endif #endif

4
source/level/layertile.cpp
View File

@ -83,7 +83,6 @@ int MapHeight=GetWidth();
} }
/*****************************************************************************/ /*****************************************************************************/
void CLayerTile::RenderTileMap2d(int MapX,int MapY) void CLayerTile::RenderTileMap2d(int MapX,int MapY)
{ {
sTileMap2dElem *Table=TileMap2d[FrameFlipFlag].List; sTileMap2dElem *Table=TileMap2d[FrameFlipFlag].List;
@ -99,7 +98,7 @@ const u32 YInc=16<<16;
MapX>>=4; MapX>>=4;
MapY>>=4; MapY>>=4;
// Calc Start pos (fully wrapping) // Calc (wrapped) Start pos
/**/ MapX=MapX % TileMapWidth; /**/ MapX=MapX % TileMapWidth;
/**/ MapY=MapY % TileMapHeight; /**/ MapY=MapY % TileMapHeight;
@ -115,7 +114,6 @@ const u32 YInc=16<<16;
{ {
TSPRT_16 *TileData=&Table->Tile; TSPRT_16 *TileData=&Table->Tile;
*(u32*)&TileData->x0=XYPos; *(u32*)&TileData->x0=XYPos;
/**/ //AddPrimToList(TileData,0);
/**/ AddPrim(OtPtr,TileData); /**/ AddPrim(OtPtr,TileData);
Table=Table->Right; Table=Table->Right;
XYPos+=XInc; XYPos+=XInc;

6
source/level/level.cpp
View File

@ -39,8 +39,10 @@ CLevel::~CLevel()
/*****************************************************************************/ /*****************************************************************************/
void CLevel::init() void CLevel::init()
{ {
LevelHdr=(sLvlHdr *)CFileIO::loadFile(CHAPTER01_LEVEL01_LVL,"Level Data"); // LevelHdr=(sLvlHdr *)CFileIO::loadFile(CHAPTER01_LEVEL01_LVL,"Level Data");
TPLoadTex(CHAPTER01_LEVEL01_TEX); // TPLoadTex(CHAPTER01_LEVEL01_TEX);
LevelHdr=(sLvlHdr *)CFileIO::loadFile(LEVEL01_LEVEL01_LVL,"Level Data");
TPLoadTex(LEVEL01_LEVEL01_TEX);
initLayers(); initLayers();
} }