Mirrors/SBSPSS
1
0
Fork 0
Code Releases Activity

Browse Source
This commit is contained in:
Daveo 2000-11-10 16:17:00 +00:00
parent 2a01bfdb8d
commit a3faac3eff
7 changed files with 264 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Utils/MapEdit/Core.cpp
View File

@ -74,6 +74,7 @@ Vec &ThisCam=GetCam();
if (TileBank.NeedLoad()) TileBank.LoadTileSets(this);
if (RenderFlag)
{
RenderFlag=FALSE;
@ -167,29 +168,35 @@ Vec &ThisCam=GetCam();
/*****************************************************************************/
void CCore::UpdateParamBar(CMapEditView *View,BOOL ViewFlag)
{
/*
CMainFrame *Frm=(CMainFrame*)AfxGetApp()->GetMainWnd();
CToolBar *ToolBar=Frm->GetToolBar();
CDialogBar *ParamBar=Frm->GetParamBar();
CListBox *Dlg=(CListBox *)ParamBar->GetDlgItem(IDC_PARAMBAR_LAYER_LIST);
CMultiBar *ParamBar=Frm->GetParamBar();
// ParamBar->ReCalc();
//CCheckListBox *Dlg=(CCheckListBox *)ParamBar->GetDlgItem(IDC_PARAMBAR_LAYER_LIST);
/*
ParamViewFlag=ViewFlag;
if (ParamViewFlag)
{
Dlg->ResetContent();
ParamBar->m_ListBox.ResetContent();
// Dlg->ResetContent();
for (int i=0;i<LAYER_TYPE_MAX;i++)
{
CLayer *ThisLayer=GetLayer(i);
Dlg->AddString(ThisLayer->GetName());
ParamBar->m_ListBox.AddString(ThisLayer->GetName());
// Dlg->AddString(ThisLayer->GetName());
}
Dlg->SetCurSel(ActiveLayer);
ParamBar->m_ListBox.SetCurSel(ActiveLayer);
// Dlg->SetCurSel(ActiveLayer);
}
*/
ToolBar->GetToolBarCtrl().PressButton(ID_TOOLBAR_PARAMBAR,ParamViewFlag);
Frm->ShowControlBar(ParamBar, ParamViewFlag, FALSE);
ParamBar->ShowWindow(SW_SHOW);
if (View) UpdateView(View);
*/
}
/*****************************************************************************/

5
Utils/MapEdit/MainFrm.cpp
View File

@ -66,7 +66,10 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
m_wndParamBar.EnableDocking( CBRS_ALIGN_ANY);
m_wndParamBar.SetWindowText("Param");
DockControlBar(&m_wndParamBar);
m_wndParamBar.AddDialog(LayerList,IDD_LAYER_LIST_DIALOG,TRUE);
m_wndParamBar.AddDialog(Test1,IDD_TEST1,TRUE);
m_wndParamBar.AddDialog(Test2,IDD_TEST2,TRUE);
// ToolBar (plus extra code for extra controls!!)
if (!m_wndToolBar.CreateEx(this, TBSTYLE_FLAT, WS_CHILD | WS_VISIBLE | CBRS_TOP | CBRS_GRIPPER | CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC) || !m_wndToolBar.LoadToolBar(IDR_MAINFRAME))

12
Utils/MapEdit/MainFrm.h
View File

@ -5,6 +5,8 @@
#if !defined(AFX_MAINFRM_H__CEC14D79_A1F2_4281_AA53_544F0924E7D8__INCLUDED_)
#define AFX_MAINFRM_H__CEC14D79_A1F2_4281_AA53_544F0924E7D8__INCLUDED_
#include "MultiBar.h"
#if _MSC_VER > 1000
#pragma once
#endif // _MSC_VER > 1000
@ -27,9 +29,9 @@ public:
// Attributes
public:
CMainToolBar *GetToolBar() {return(&m_wndToolBar);}
CDialogBar *GetParamBar() {return(&m_wndParamBar);}
CStatusBar *GetStatusBar() {return(&m_wndStatusBar);}
CMainToolBar *GetToolBar() {return(&m_wndToolBar);}
CMultiBar *GetParamBar() {return(&m_wndParamBar);}
// Operations
public:
@ -50,8 +52,12 @@ public:
protected: // control bar embedded members
CStatusBar m_wndStatusBar;
CMainToolBar m_wndToolBar;
CDialogBar m_wndParamBar;
CMultiBar m_wndParamBar;
// Sub Dialogs
CDialog LayerList;
CDialog Test1;
CDialog Test2;
// Generated message map functions
protected:

170
Utils/MapEdit/MapEdit.clw
View File

@ -2,8 +2,8 @@
[General Info]
Version=1
LastClass=CMainFrame
LastTemplate=CListBox
LastClass=CMultiBar
LastTemplate=CDialog
NewFileInclude1=#include "stdafx.h"
NewFileInclude2=#include "mapedit.h"
LastPage=0
@ -11,37 +11,37 @@ LastPage=0
ClassCount=9
Class1=CChildFrame
Class2=CGLEnabledView
Class3=CParamBar
Class4=CMainFrame
Class5=CMapEditApp
Class6=CAboutDlg
Class7=CMapEditDoc
Class8=CMapEditView
Class3=CMainFrame
Class4=CMapEditApp
Class5=CAboutDlg
Class6=CMapEditDoc
Class7=CMapEditView
ResourceCount=8
Resource1=IDR_MAPEDITYPE (English (U.S.))
Resource2=IDD_TILEBAR (English (U.S.))
Resource3=IDD_LAYERBAR1 (English (U.S.))
Resource4=IDR_MAINFRAME (English (U.S.))
Resource5=IDD_TRASHHEAP
Resource6=IDD_ABOUTBOX (English (U.S.))
Resource7=IDR_TOOLBAR (English (U.S.))
Class9=CCheckList
Resource8=IDD_PARAMBAR (English (U.S.))
ResourceCount=10
Resource1=IDR_TOOLBAR (English (U.S.))
Resource2=IDR_MAPEDITYPE (English (U.S.))
Resource3=IDD_LAYER_LIST_DIALOG
Resource4=IDD_DIALOGBAR (English (U.S.))
Resource5=IDD_TEST1
Class8=CLayerList
Resource6=IDR_MAINFRAME (English (U.S.))
Resource7=IDD_TRASHHEAP
Class9=CMultiBar
Resource8=IDD_MULTIBAR (English (U.S.))
Resource9=IDD_ABOUTBOX (English (U.S.))
Resource10=IDD_TEST2
[CLS:CChildFrame]
Type=0
BaseClass=CMDIChildWnd
HeaderFile=ChildFrm.h
ImplementationFile=ChildFrm.cpp
LastObject=CChildFrame
[CLS:CGLEnabledView]
Type=0
BaseClass=CView
HeaderFile=GLEnabledView.h
ImplementationFile=GLEnabledView.cpp
LastObject=CGLEnabledView
[CLS:CMainFrame]
Type=0
@ -49,8 +49,6 @@ BaseClass=CMDIFrameWnd
HeaderFile=MainFrm.h
ImplementationFile=MainFrm.cpp
LastObject=CMainFrame
Filter=M
VirtualFilter=fWC
[CLS:CMapEditApp]
Type=0
@ -71,23 +69,33 @@ Type=0
BaseClass=CDocument
HeaderFile=MapEditDoc.h
ImplementationFile=MapEditDoc.cpp
LastObject=CMapEditDoc
Filter=N
VirtualFilter=DC
[CLS:CMapEditView]
Type=0
BaseClass=CGLEnabledView
HeaderFile=MapEditView.h
ImplementationFile=MapEditView.cpp
LastObject=ID_NEWMAP_OK
Filter=C
VirtualFilter=VWC
[DLG:IDD_ABOUTBOX]
Type=1
Class=CAboutDlg
[TB:IDR_TOOLBAR (English (U.S.))]
Type=1
Class=?
Command1=ID_FILE_NEW
Command2=ID_FILE_OPEN
Command3=ID_FILE_SAVE
Command4=ID_EDIT_CUT
Command5=ID_EDIT_COPY
Command6=ID_EDIT_PASTE
Command7=ID_FILE_PRINT
Command8=ID_APP_ABOUT
Command9=ID_TOOLBAR_PARAMBAR
Command10=ID_TOOLBAR_TILEPALETTE
Command11=ID_TOOLBAR_COMBO
CommandCount=11
[MNU:IDR_MAINFRAME (English (U.S.))]
Type=1
Class=?
@ -155,60 +163,80 @@ Control2=IDC_STATIC,static,1342308480
Control3=IDC_STATIC,static,1342308352
Control4=IDOK,button,1342373889
[DLG:IDD_TILEBAR (English (U.S.))]
Type=1
Class=?
ControlCount=1
Control1=IDC_TILETOOLBAR_COMBO,combobox,1344340227
[DLG:IDD_LAYERBAR1 (English (U.S.))]
Type=1
Class=?
ControlCount=1
Control1=IDC_LAYERBAR_LIST,listbox,1352728833
[TB:IDR_TOOLBAR (English (U.S.))]
Type=1
Class=?
Command1=ID_FILE_NEW
Command2=ID_FILE_OPEN
Command3=ID_FILE_SAVE
Command4=ID_EDIT_CUT
Command5=ID_EDIT_COPY
Command6=ID_EDIT_PASTE
Command7=ID_FILE_PRINT
Command8=ID_APP_ABOUT
Command9=ID_TOOLBAR_PARAMBAR
Command10=ID_TOOLBAR_TILEPALETTE
Command11=ID_TOOLBAR_COMBO
CommandCount=11
[DLG:IDD_TRASHHEAP]
Type=1
Class=?
ControlCount=1
Control1=IDC_TOOLBAR_COMBO,combobox,1344340226
[DLG:IDD_PARAMBAR (English (U.S.))]
[DLG:IDD_DIALOGBAR (English (U.S.))]
Type=1
Class=?
ControlCount=1
Control1=IDC_PARAMBAR_LAYER_LIST,listbox,1352728833
ControlCount=3
Control1=IDC_STATIC,static,1342308352
Control2=IDC_CHECK1,button,1342242819
Control3=IDC_RADIO1,button,1342177289
[CLS:CParamBar]
[DLG:IDD_LAYER_LIST_DIALOG]
Type=1
Class=CLayerList
ControlCount=1
Control1=IDC_LAYER_LIST,listbox,1352728835
[CLS:CLayerList]
Type=0
HeaderFile=ParamBar.h
ImplementationFile=ParamBar.cpp
BaseClass=CDialogBar
HeaderFile=LayerList.h
ImplementationFile=LayerList.cpp
BaseClass=CDialog
Filter=D
LastObject=CLayerList
[CLS:CMultiBar]
Type=0
HeaderFile=multibar.h
ImplementationFile=multibar.cpp
BaseClass=CDialogBar
LastObject=CMultiBar
Filter=D
LastObject=IDC_PARAMBAR_LAYER_LIST
VirtualFilter=dWC
[CLS:CCheckList]
Type=0
HeaderFile=CheckList.h
ImplementationFile=CheckList.cpp
BaseClass=CListBox
Filter=W
LastObject=CCheckList
[DLG:IDD_MULTIBAR (English (U.S.))]
Type=1
Class=CMultiBar
ControlCount=0
[DLG:IDD_TEST1]
Type=1
Class=?
ControlCount=9
Control1=IDC_STATIC,button,1342177287
Control2=IDC_EDIT1,edit,1350631552
Control3=IDC_EDIT2,edit,1350631552
Control4=IDC_EDIT3,edit,1350631552
Control5=IDC_EDIT4,edit,1350631552
Control6=IDC_COMBO1,combobox,1344340226
Control7=IDC_COMBO2,combobox,1344340226
Control8=IDC_COMBO3,combobox,1344340226
Control9=IDC_COMBO4,combobox,1344340226
[DLG:IDD_TEST2]
Type=1
Class=?
ControlCount=16
Control1=IDC_CHECK1,button,1342242819
Control2=IDC_CHECK2,button,1342242819
Control3=IDC_CHECK3,button,1342242819
Control4=IDC_CHECK4,button,1342242819
Control5=IDC_CHECK5,button,1342242819
Control6=IDC_CHECK6,button,1342242819
Control7=IDC_CHECK7,button,1342242819
Control8=IDC_CHECK8,button,1342242819
Control9=IDC_CHECK9,button,1342242819
Control10=IDC_CHECK10,button,1342242819
Control11=IDC_CHECK11,button,1342242819
Control12=IDC_CHECK12,button,1342242819
Control13=IDC_CHECK13,button,1342242819
Control14=IDC_CHECK14,button,1342242819
Control15=IDC_CHECK15,button,1342242819
Control16=IDC_CHECK16,button,1342242819

22
Utils/MapEdit/MapEdit.dsp
View File

@ -166,10 +166,6 @@ SOURCE=.\utils.h
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=.\CheckList.cpp
# End Source File
# Begin Source File
SOURCE=.\ChildFrm.cpp
# End Source File
# Begin Source File
@ -178,6 +174,10 @@ SOURCE=.\GLEnabledView.cpp
# End Source File
# Begin Source File
SOURCE=.\LayerList.cpp
# End Source File
# Begin Source File
SOURCE=.\MainFrm.cpp
# End Source File
# Begin Source File
@ -198,7 +198,7 @@ SOURCE=.\MapEditView.cpp
# End Source File
# Begin Source File
SOURCE=.\ParamBar.cpp
SOURCE=.\MultiBar.cpp
# End Source File
# Begin Source File
@ -208,11 +208,7 @@ SOURCE=.\StdAfx.cpp
# End Group
# Begin Group "Header Files"
# PROP Default_Filter ""
# Begin Source File
SOURCE=.\CheckList.h
# End Source File
# PROP Default_Filter "*.h"
# Begin Source File
SOURCE=.\ChildFrm.h
@ -227,6 +223,10 @@ SOURCE=.\GLEnabledView.h
# End Source File
# Begin Source File
SOURCE=.\LayerList.h
# End Source File
# Begin Source File
SOURCE=.\MainFrm.h
# End Source File
# Begin Source File
@ -243,7 +243,7 @@ SOURCE=.\MapEditView.h
# End Source File
# Begin Source File
SOURCE=.\ParamBar.h
SOURCE=.\MultiBar.h
# End Source File
# Begin Source File

101
Utils/MapEdit/MapEdit.rc
View File

@ -178,13 +178,11 @@ BEGIN
DEFPUSHBUTTON "OK",IDOK,178,7,50,14,WS_GROUP
END
IDD_PARAMBAR DIALOGEX 0, 0, 92, 246
STYLE DS_MODALFRAME | WS_CHILD
IDD_MULTIBAR DIALOGEX 0, 0, 251, 174
STYLE WS_CHILD
EXSTYLE WS_EX_TOOLWINDOW
FONT 8, "MS Sans Serif"
BEGIN
LISTBOX IDC_PARAMBAR_LAYER_LIST,7,7,80,85,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL | WS_TABSTOP
END
@ -250,12 +248,12 @@ BEGIN
BOTTOMMARGIN, 48
END
IDD_PARAMBAR, DIALOG
IDD_MULTIBAR, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 85
RIGHTMARGIN, 244
TOPMARGIN, 7
BOTTOMMARGIN, 239
BOTTOMMARGIN, 167
END
END
#endif // APSTUDIO_INVOKED
@ -426,6 +424,71 @@ BEGIN
WS_VSCROLL | WS_TABSTOP
END
IDD_LAYER_LIST_DIALOG DIALOG DISCARDABLE 0, 0, 112, 95
STYLE WS_CHILD | WS_BORDER
FONT 8, "MS Sans Serif"
BEGIN
LISTBOX IDC_LAYER_LIST,5,5,100,85,LBS_SORT |
LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
END
IDD_TEST1 DIALOG DISCARDABLE 0, 0, 186, 94
STYLE WS_CHILD | WS_BORDER
FONT 8, "MS Sans Serif"
BEGIN
GROUPBOX "Static",IDC_STATIC,7,7,172,80
EDITTEXT IDC_EDIT1,19,20,53,13,ES_AUTOHSCROLL
EDITTEXT IDC_EDIT2,19,35,53,13,ES_AUTOHSCROLL
EDITTEXT IDC_EDIT3,19,49,53,13,ES_AUTOHSCROLL
EDITTEXT IDC_EDIT4,19,64,53,13,ES_AUTOHSCROLL
COMBOBOX IDC_COMBO1,82,20,89,30,CBS_DROPDOWN | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
COMBOBOX IDC_COMBO2,81,36,89,30,CBS_DROPDOWN | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
COMBOBOX IDC_COMBO3,80,51,89,30,CBS_DROPDOWN | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
COMBOBOX IDC_COMBO4,81,67,89,30,CBS_DROPDOWN | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
END
IDD_TEST2 DIALOG DISCARDABLE 0, 0, 102, 86
STYLE WS_CHILD | WS_BORDER
FONT 8, "MS Sans Serif"
BEGIN
CONTROL "Check1",IDC_CHECK1,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,5,5,41,10
CONTROL "Check1",IDC_CHECK2,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,5,15,41,10
CONTROL "Check1",IDC_CHECK3,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,5,25,41,10
CONTROL "Check1",IDC_CHECK4,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,5,35,41,10
CONTROL "Check1",IDC_CHECK5,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,5,45,41,10
CONTROL "Check1",IDC_CHECK6,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,5,55,41,10
CONTROL "Check1",IDC_CHECK7,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,5,65,41,10
CONTROL "Check1",IDC_CHECK8,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,5,75,41,10
CONTROL "Check1",IDC_CHECK9,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,60,5,41,10
CONTROL "Check1",IDC_CHECK10,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,60,15,41,10
CONTROL "Check1",IDC_CHECK11,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,60,25,41,10
CONTROL "Check1",IDC_CHECK12,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,60,35,41,10
CONTROL "Check1",IDC_CHECK13,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,60,45,41,10
CONTROL "Check1",IDC_CHECK14,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,60,55,41,10
CONTROL "Check1",IDC_CHECK15,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,60,65,41,10
CONTROL "Check1",IDC_CHECK16,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,60,75,41,10
END
/////////////////////////////////////////////////////////////////////////////
//
@ -442,6 +505,30 @@ BEGIN
TOPMARGIN, 7
BOTTOMMARGIN, 88
END
IDD_LAYER_LIST_DIALOG, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 105
TOPMARGIN, 7
BOTTOMMARGIN, 88
END
IDD_TEST1, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 179
TOPMARGIN, 7
BOTTOMMARGIN, 87
END
IDD_TEST2, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 95
TOPMARGIN, 7
BOTTOMMARGIN, 79
END
END
#endif // APSTUDIO_INVOKED

33
Utils/MapEdit/resource.h
View File

@ -4,15 +4,44 @@
//
#define IDD_ABOUTBOX 100
#define IDD_PARAMBAR 103
#define IDD_MULTIBAR 103
#define IDD_TILETOOLBAR 104
#define IDR_MAINFRAME 128
#define IDR_TOOLBAR 128
#define IDR_MAPEDITYPE 129
#define IDD_TRASHHEAP 142
#define IDD_LAYER_LIST_DIALOG 144
#define IDD_TEST1 145
#define IDD_TEST2 146
#define IDC_PARAMBAR_LAYER_LIST 1011
#define IDC_TILETOOLBAR_COMBO 1013
#define IDC_TOOLBAR_COMBO 1018
#define IDC_LIST1 1019
#define IDC_LAYER_LIST 1022
#define IDC_CHECK1 1023
#define IDC_CHECK2 1024
#define IDC_EDIT1 1024
#define IDC_CHECK3 1025
#define IDC_EDIT2 1025
#define IDC_CHECK4 1026
#define IDC_EDIT3 1026
#define IDC_CHECK5 1027
#define IDC_EDIT4 1027
#define IDC_CHECK6 1028
#define IDC_COMBO1 1028
#define IDC_CHECK7 1029
#define IDC_COMBO2 1029
#define IDC_CHECK8 1030
#define IDC_COMBO3 1030
#define IDC_COMBO4 1031
#define IDC_CHECK9 1039
#define IDC_CHECK10 1040
#define IDC_CHECK11 1041
#define IDC_CHECK12 1042
#define IDC_CHECK13 1043
#define IDC_CHECK14 1044
#define IDC_CHECK15 1045
#define IDC_CHECK16 1046
#define ID_TOOLBAR_LAYERBAR 32773
#define ID_TOOLBAR_TILEPALETTE 32774
#define ID_TOOLBAR_COMBO 32777
@ -24,9 +53,9 @@
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 143
#define _APS_NEXT_RESOURCE_VALUE 146
#define _APS_NEXT_COMMAND_VALUE 32784
#define _APS_NEXT_CONTROL_VALUE 1020
#define _APS_NEXT_CONTROL_VALUE 1029
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif