Mirrors/SBSPSS
1
0
Fork 0
Code Releases Activity

Browse Source
This commit is contained in:
Daveo 2000-11-08 19:53:57 +00:00
parent 087d87f4be
commit 500f5f6776
7 changed files with 47 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Utils/MapEdit/Core.cpp
View File

@ -27,6 +27,15 @@ BOOL Test3dFlag=TRUE;
CCore::CCore()
{
for (int i=0; i<LAYER_TYPE_MAX; i++) Layers[i]=0;
RenderFlag=TRUE;
TileViewFlag=FALSE;
ParamViewFlag=TRUE;
CurrentMousePos=CPoint(0,0);
ActiveLayer=0;
MapCam=Vec(0,0,0);
TileCam=Vec(0,0,0);
}
/*****************************************************************************/
@ -38,18 +47,12 @@ CCore::~CCore()
/*****************************************************************************/
void CCore::NewMap()
{
RenderFlag=TRUE;
// To be loaded/created
Layers[LAYER_TYPE_BACK]= new CLayerTile("Back", 32, 32, 4.0f, FALSE);
Layers[LAYER_TYPE_MID]= new CLayerTile("Mid", TileLayerDefaultWidth/2.0f, TileLayerDefaultHeight/2.0f, 2.0f, FALSE);
Layers[LAYER_TYPE_ACTION]= new CLayerTile("Action",TileLayerDefaultWidth/1.0f, TileLayerDefaultHeight/1.0f, 1.0f, TRUE);
Layers[LAYER_TYPE_FORE]= new CLayerTile("Fore", TileLayerDefaultWidth/0.5f, TileLayerDefaultHeight/0.5f, 0.5f, FALSE);
TileViewFlag=0;
ParamViewFlag=1;
ActiveLayer=LAYER_TYPE_ACTION;
MapCam=Vec(0,0,0);
TileCam=Vec(0,0,0);
@ -164,12 +167,12 @@ Vec &ThisCam=GetCam();
/*****************************************************************************/
void CCore::UpdateParamBar(CMapEditView *View,BOOL ViewFlag)
{
/*
CMainFrame *Frm=(CMainFrame*)AfxGetApp()->GetMainWnd();
CToolBar *ToolBar=Frm->GetToolBar();
CParamBar *ParamBar=Frm->GetParamBar();
CCheckListBox *Dlg=(CCheckListBox *)ParamBar->GetDlgItem(IDC_PARAMBAR_LAYER_LIST);
CDialogBar *ParamBar=Frm->GetParamBar();
CListBox *Dlg=(CListBox *)ParamBar->GetDlgItem(IDC_PARAMBAR_LAYER_LIST);
Dlg->SetCheck(1,1);
ParamViewFlag=ViewFlag;
if (ParamViewFlag)
{
@ -186,7 +189,7 @@ CCheckListBox *Dlg=(CCheckListBox *)ParamBar->GetDlgItem(IDC_PARAMBAR_LAYER_LIST
ToolBar->GetToolBarCtrl().PressButton(ID_TOOLBAR_PARAMBAR,ParamViewFlag);
Frm->ShowControlBar(ParamBar, ParamViewFlag, FALSE);
if (View) UpdateView(View);
*/
}
/*****************************************************************************/

2
Utils/MapEdit/LayerTile.cpp
View File

@ -63,6 +63,7 @@ void CLayerTile::Render(CCore *Core,Vec &MapPos,BOOL Is3d)
/*****************************************************************************/
void CLayerTile::Render2d(CCore *Core,Vec &MapPos)
{
return;
float XYDiv=GetLayerZPosDiv();
int MapW=Map.GetWidth();
int MapH=Map.GetHeight();
@ -171,6 +172,7 @@ int MapH=Map.GetHeight();
float StartX=MapPos.x/XYDiv;
float StartY=MapPos.y/XYDiv;
glGetIntegerv(GL_VIEWPORT, Viewport);
glSelectBuffer (SELECT_BUFFER_SIZE, SelectBuffer );
glRenderMode (GL_SELECT);

2
Utils/MapEdit/MainFrm.cpp
View File

@ -66,6 +66,7 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
m_wndParamBar.EnableDocking( CBRS_ALIGN_ANY);
m_wndParamBar.SetWindowText("Param");
DockControlBar(&m_wndParamBar);
// 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))
@ -95,6 +96,7 @@ RECT rect;
rect.bottom += 200;
// then .Create the combo box and show it
if (!m_wndToolBar.m_Combo.Create(WS_CHILD|WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS ,rect, &m_wndToolBar, IDC_TOOLBAR_COMBO))
{
TRACE0("Failed to create combo-box\n");

13
Utils/MapEdit/MainFrm.h
View File

@ -9,12 +9,12 @@
#pragma once
#endif // _MSC_VER > 1000
#include "ParamBar.h"
/////////////////////////////////////////////////////////////////////////////
class CMainToolBar : public CToolBar
{
public:
CMainToolBar(){};
~CMainToolBar(){};
CComboBox m_Combo;
};
@ -27,10 +27,9 @@ public:
// Attributes
public:
CToolBar *GetToolBar() {return(&m_wndToolBar);}
CParamBar *GetParamBar() {return(&m_wndParamBar);}
// CDialogBar *GetTileBar() {return(&m_wndTileBar);}
CStatusBar *GetStatusBar() {return(&m_wndStatusBar);}
CMainToolBar *GetToolBar() {return(&m_wndToolBar);}
CDialogBar *GetParamBar() {return(&m_wndParamBar);}
CStatusBar *GetStatusBar() {return(&m_wndStatusBar);}
// Operations
public:
@ -51,7 +50,7 @@ public:
protected: // control bar embedded members
CStatusBar m_wndStatusBar;
CMainToolBar m_wndToolBar;
CParamBar m_wndParamBar;
CDialogBar m_wndParamBar;
// Generated message map functions

35
Utils/MapEdit/MapEdit.clw
View File

@ -2,8 +2,8 @@
[General Info]
Version=1
LastClass=CAboutDlg
LastTemplate=CToolBarCtrl
LastClass=CMainFrame
LastTemplate=CListBox
NewFileInclude1=#include "stdafx.h"
NewFileInclude2=#include "mapedit.h"
LastPage=0
@ -22,12 +22,12 @@ ResourceCount=8
Resource1=IDR_MAPEDITYPE (English (U.S.))
Resource2=IDD_TILEBAR (English (U.S.))
Resource3=IDD_LAYERBAR1 (English (U.S.))
Resource4=IDD_ABOUTBOX (English (U.S.))
Resource5=IDD_PARAMBAR (English (U.S.))
Class9=CExToolBar
Resource6=IDR_TOOLBAR (English (U.S.))
Resource7=IDR_MAINFRAME (English (U.S.))
Resource8=IDD_TRASHHEAP
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.))
[CLS:CChildFrame]
Type=0
@ -189,16 +189,9 @@ Class=?
ControlCount=1
Control1=IDC_TOOLBAR_COMBO,combobox,1344340226
[CLS:CExToolBar]
Type=0
HeaderFile=extoolbar.h
ImplementationFile=extoolbar.cpp
BaseClass=CToolBar
LastObject=IDC_LAYERBAR_LIST
[DLG:IDD_PARAMBAR (English (U.S.))]
Type=1
Class=CParamBar
Class=?
ControlCount=1
Control1=IDC_PARAMBAR_LAYER_LIST,listbox,1352728833
@ -208,6 +201,14 @@ HeaderFile=ParamBar.h
ImplementationFile=ParamBar.cpp
BaseClass=CDialogBar
Filter=D
LastObject=CParamBar
LastObject=IDC_PARAMBAR_LAYER_LIST
VirtualFilter=dWC
[CLS:CCheckList]
Type=0
HeaderFile=CheckList.h
ImplementationFile=CheckList.cpp
BaseClass=CListBox
Filter=W
LastObject=CCheckList

8
Utils/MapEdit/MapEdit.dsp
View File

@ -166,11 +166,11 @@ SOURCE=.\utils.h
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=.\ChildFrm.cpp
SOURCE=.\CheckList.cpp
# End Source File
# Begin Source File
SOURCE=.\ExToolbar.cpp
SOURCE=.\ChildFrm.cpp
# End Source File
# Begin Source File
@ -211,11 +211,11 @@ SOURCE=.\StdAfx.cpp
# PROP Default_Filter ""
# Begin Source File
SOURCE=.\ChildFrm.h
SOURCE=.\CheckList.h
# End Source File
# Begin Source File
SOURCE=.\ExToolbar.h
SOURCE=.\ChildFrm.h
# End Source File
# Begin Source File

4
Utils/MapEdit/MapEdit.rc
View File

@ -181,9 +181,9 @@ END
IDD_PARAMBAR DIALOGEX 0, 0, 92, 246
STYLE DS_MODALFRAME | WS_CHILD
EXSTYLE WS_EX_TOOLWINDOW
FONT 8, "MS Sans Serif", 0, 0, 0x1
FONT 8, "MS Sans Serif"
BEGIN
LISTBOX IDC_PARAMBAR_LAYER_LIST,7,82,80,85,LBS_NOINTEGRALHEIGHT |
LISTBOX IDC_PARAMBAR_LAYER_LIST,7,7,80,85,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL | WS_TABSTOP
END