This commit is contained in:
parent
2ba61e595c
commit
73c60fbd11
23 changed files with 471 additions and 84 deletions
|
@ -73,10 +73,10 @@ int Width,Height;
|
|||
|
||||
// Create Tile Layers
|
||||
// Type Width Height Scale 3d? Resizable?
|
||||
if (Dlg.m_Back) Layer.push_back(new CLayerTile( CLayerTile::Back, 32, 32, 4.0f, FALSE, FALSE));
|
||||
if (Dlg.m_Mid) Layer.push_back(new CLayerTile( CLayerTile::Mid, Width, Height, 2.0f, FALSE, TRUE));
|
||||
Layer.push_back(new CLayerTile( CLayerTile::Action, Width, Height, 1.0f, TRUE, TRUE));
|
||||
if (Dlg.m_Fore) Layer.push_back(new CLayerTile( CLayerTile::Fore, Width, Height, 0.5f, FALSE, TRUE));
|
||||
if (Dlg.m_Back) Layer.push_back(new CLayerTile( LAYERTILE_BACK, 32, 32, 4.0f, FALSE, FALSE));
|
||||
if (Dlg.m_Mid) Layer.push_back(new CLayerTile( LAYERTILE_MID, Width, Height, 2.0f, FALSE, TRUE));
|
||||
Layer.push_back(new CLayerTile( LAYERTILE_ACTION, Width, Height, 1.0f, TRUE, TRUE));
|
||||
if (Dlg.m_Fore) Layer.push_back(new CLayerTile( LAYERTILE_FORE, Width, Height, 0.5f, FALSE, TRUE));
|
||||
|
||||
Vector3 CamOfs;
|
||||
CamOfs.Zero();
|
||||
|
@ -631,7 +631,7 @@ int ListSize=Layer.size();
|
|||
/*****************************************************************************/
|
||||
int CCore::FindActionLayer()
|
||||
{
|
||||
int Idx=FindLayer(LAYER_TYPE_TILE,CLayerTile::Action);
|
||||
int Idx=FindLayer(LAYER_TYPE_TILE,LAYERTILE_ACTION);
|
||||
|
||||
return(Idx);
|
||||
}
|
||||
|
@ -676,7 +676,8 @@ char ExportName[256];
|
|||
|
||||
SetFileExt(Filename,ExportName,"PME");
|
||||
|
||||
CExportPSX Exp(ExportName);
|
||||
LayerCount=1;
|
||||
CExportPSX Exp(ExportName,LayerCount);
|
||||
|
||||
/* for (int i=0;i<LayerCount;i++)
|
||||
{
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
//#include "gl3d.h"
|
||||
#include <Vector3.h>
|
||||
#include "Map.h"
|
||||
#include "LayerDef.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
enum LAYER_ENUMS
|
||||
|
@ -16,13 +17,6 @@ enum LAYER_ENUMS
|
|||
SELECT_BUFFER_SIZE=16,
|
||||
};
|
||||
|
||||
/*****************************************************************************/
|
||||
enum LAYER_TYPE
|
||||
{
|
||||
LAYER_TYPE_TILE=0,
|
||||
LAYER_TYPE_MAX
|
||||
};
|
||||
|
||||
enum
|
||||
{
|
||||
SCREEN_WIDTH_TILE=30,
|
||||
|
|
31
Utils/MapEdit/LayerDef.h
Normal file
31
Utils/MapEdit/LayerDef.h
Normal file
|
@ -0,0 +1,31 @@
|
|||
/*** Layer Defs ***/
|
||||
/******************/
|
||||
|
||||
#ifndef __LAYER_DEFS_HEADER__
|
||||
#define __LAYER_DEFS_HEADER__
|
||||
|
||||
/*****************************************************************************/
|
||||
enum LAYER_TYPE
|
||||
{
|
||||
LAYER_TYPE_TILE=0,
|
||||
LAYER_TYPE_MAX
|
||||
};
|
||||
|
||||
enum LAYER_SUBTYPE
|
||||
{
|
||||
LAYERTILE_BACK=0,
|
||||
LAYERTILE_MID,
|
||||
LAYERTILE_ACTION,
|
||||
LAYERTILE_FORE,
|
||||
};
|
||||
|
||||
enum TILE_FLAG
|
||||
{
|
||||
TILE_FLAG_MIRROR_X=1<<0,
|
||||
TILE_FLAG_MIRROR_Y=1<<1,
|
||||
TILE_FLAG_MIRROR_XY=TILE_FLAG_MIRROR_X|TILE_FLAG_MIRROR_Y,
|
||||
};
|
||||
|
||||
|
||||
/*****************************************************************************/
|
||||
#endif
|
|
@ -473,8 +473,8 @@ CTileBank &TileBank=Core->GetTileBank();
|
|||
CMap &LBrush=TileBank.GetLBrush();
|
||||
CMap &RBrush=TileBank.GetRBrush();
|
||||
|
||||
LBrush.MirrorX(MouseFlagMirrorX);
|
||||
RBrush.MirrorX(MouseFlagMirrorX);
|
||||
LBrush.MirrorX(TILE_FLAG_MIRROR_X);
|
||||
RBrush.MirrorX(TILE_FLAG_MIRROR_X);
|
||||
|
||||
return(TRUE);
|
||||
}
|
||||
|
@ -486,8 +486,8 @@ CTileBank &TileBank=Core->GetTileBank();
|
|||
CMap &LBrush=TileBank.GetLBrush();
|
||||
CMap &RBrush=TileBank.GetRBrush();
|
||||
|
||||
LBrush.MirrorY(MouseFlagMirrorY);
|
||||
RBrush.MirrorY(MouseFlagMirrorY);
|
||||
LBrush.MirrorY(TILE_FLAG_MIRROR_Y);
|
||||
RBrush.MirrorY(TILE_FLAG_MIRROR_Y);
|
||||
|
||||
return(TRUE);
|
||||
}
|
||||
|
|
|
@ -26,19 +26,6 @@ public:
|
|||
MouseModePaint=0,
|
||||
MouseModeSelect,
|
||||
};
|
||||
enum MouseFlag
|
||||
{
|
||||
MouseFlagMirrorX=1<<0,
|
||||
MouseFlagMirrorY=1<<1,
|
||||
MouseFlagMirrorXY=MouseFlagMirrorX|MouseFlagMirrorY,
|
||||
};
|
||||
enum SubType
|
||||
{
|
||||
Back=0,
|
||||
Mid,
|
||||
Action,
|
||||
Fore,
|
||||
};
|
||||
|
||||
CLayerTile(int SubType,int Width,int Height,float Scale,BOOL Is3d,BOOL Resizable); // New Layer
|
||||
CLayerTile(CFile *File,int Version); // Load Layer
|
||||
|
|
|
@ -27,6 +27,8 @@ enum
|
|||
};
|
||||
|
||||
/*****************************************************************************/
|
||||
class CFile;
|
||||
class CPoint;
|
||||
class CMap
|
||||
{
|
||||
public:
|
||||
|
|
|
@ -18,24 +18,24 @@ Class6=CMapEditDoc
|
|||
Class7=CMapEditView
|
||||
|
||||
ResourceCount=11
|
||||
Resource1=IDD_MULTIBAR (English (U.S.))
|
||||
Resource2=IDD_NEWMAP
|
||||
Resource3=IDD_LAYERTILE_GUI
|
||||
Resource1=IDD_NEW_LAYER
|
||||
Resource2=IDD_LAYER_LIST_DIALOG
|
||||
Resource3=IDR_MAINFRAME (English (U.S.))
|
||||
Resource4=IDD_DIALOGBAR (English (U.S.))
|
||||
Resource5=IDD_NEW_LAYER
|
||||
Resource5=IDD_MULTIBAR (English (U.S.))
|
||||
Class8=CMultiBar
|
||||
Resource6=IDR_MAINFRAME (English (U.S.))
|
||||
Resource6=IDD_LAYERTILE_GUI
|
||||
Resource7=IDR_MAPEDITYPE (English (U.S.))
|
||||
Class9=CLayerList
|
||||
Class10=CMapSizeDlg
|
||||
Resource8=IDD_MAPSIZE
|
||||
Resource8=IDD_ABOUTBOX (English (U.S.))
|
||||
Class11=CGfxToolBar
|
||||
Class12=CLayerTileGUI
|
||||
Resource9=IDD_LAYER_LIST_DIALOG
|
||||
Resource10=IDR_TOOLBAR (English (U.S.))
|
||||
Resource9=IDD_NEWMAP
|
||||
Resource10=IDD_MAPSIZE
|
||||
Class13=CNewMapGUI
|
||||
Class14=CProgressDlg
|
||||
Resource11=IDD_ABOUTBOX (English (U.S.))
|
||||
Resource11=IDR_TOOLBAR (English (U.S.))
|
||||
|
||||
[CLS:CChildFrame]
|
||||
Type=0
|
||||
|
@ -218,7 +218,7 @@ ImplementationFile=LayerList.cpp
|
|||
BaseClass=CDialog
|
||||
Filter=D
|
||||
VirtualFilter=dWC
|
||||
LastObject=IDC_LAYER_LIST
|
||||
LastObject=CLayerList
|
||||
|
||||
[CLS:CGfxToolBar]
|
||||
Type=0
|
||||
|
|
|
@ -69,7 +69,7 @@ LINK32=link.exe
|
|||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I "..\libs\glib" /I "..\libs\maths" /I "..\libs\davelib" /I "..\libs\ginlib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /FR /Yu"stdafx.h" /FD /GZ /c
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I "..\libs\glib" /I "..\libs\maths" /I "..\libs\davelib" /I "..\libs\ginlib" /I "..\libs\psxlib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /FR /Yu"stdafx.h" /FD /GZ /c
|
||||
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
|
||||
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
|
||||
# ADD BASE RSC /l 0x809 /d "_DEBUG" /d "_AFXDLL"
|
||||
|
@ -103,6 +103,10 @@ SOURCE=.\Layer.h
|
|||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\LayerDef.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\LayerTile.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
|
|
@ -3,6 +3,18 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
|
|||
|
||||
###############################################################################
|
||||
|
||||
Project: "DaveLib"=..\LIBS\DaveLib\DaveLib.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<4>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "GLib"=..\Libs\GLib\Glib.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
|
@ -68,6 +80,12 @@ Package=<4>
|
|||
Begin Project Dependency
|
||||
Project_Dep_Name TexGrab
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name maths
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name DaveLib
|
||||
End Project Dependency
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
@ -108,18 +126,6 @@ Package=<4>
|
|||
|
||||
###############################################################################
|
||||
|
||||
Project: "mem"=..\Libs\mem\mem.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<4>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Global:
|
||||
|
||||
Package=<5>
|
||||
|
|
|
@ -75,6 +75,7 @@ GString FilePath=RootPath.Dir();
|
|||
|
||||
File->Read(Filename,256+64);
|
||||
AddTileSet(Filename);
|
||||
TRACE1("%s\n",Filename);
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue