This commit is contained in:
Daveo 2001-07-10 16:56:47 +00:00
parent 80c2a6da49
commit f163834537
10 changed files with 106 additions and 32 deletions

View file

@ -50,6 +50,8 @@ enum CmdMsg
CmdMsg_ShadeGfxSelect, // 32 CmdMsg_ShadeGfxSelect, // 32
CmdMsg_ShadeGfxGoto, // 33 CmdMsg_ShadeGfxGoto, // 33
CmdMsg_ShadeGfxDelete, // 34 CmdMsg_ShadeGfxDelete, // 34
// Misc
CmdMsg_Report, // 35
}; };
#endif #endif

View file

@ -421,6 +421,10 @@ bool RedrawFlag=false;
DeleteLayer(Param0); DeleteLayer(Param0);
break; break;
case CmdMsg_Report:
GetTileBank()->Report();
break;
// Pass remaining to Active Layer // Pass remaining to Active Layer
default: default:
RedrawFlag=CurrentLayer->Command(CmdMsg,this,Param0,Param1); RedrawFlag=CurrentLayer->Command(CmdMsg,this,Param0,Param1);

View file

@ -73,6 +73,8 @@ int AH=AlignSize(ElemHeight);
TexXOfs=0; TexXOfs=0;
TexYOfs=0; TexYOfs=0;
BlankFlag=true; BlankFlag=true;
ElemName="BLANK";
} }
/*****************************************************************************/ /*****************************************************************************/
@ -100,6 +102,7 @@ GFName Path=Filename;
Build2dDrawList(TexCache,DrawList[ElemType2d]); Build2dDrawList(TexCache,DrawList[ElemType2d]);
BlankFlag=false; BlankFlag=false;
// if (!ValidFlag) SetInvalid(); // if (!ValidFlag) SetInvalid();
ElemName=ThisScene.GetNode(Node).Name;
} }
/*****************************************************************************/ /*****************************************************************************/
@ -605,7 +608,7 @@ int AH=AlignSize(ElemHeight);
RenderElem4Texture(RGBData); RenderElem4Texture(RGBData);
ElemID=TexCache.ProcessTexture(TexName,&RGBData); ElemID=TexCache.ProcessTexture(TexName,&RGBData);
ValidFlag=CheckHasData(RGBData); ValidFlag=CheckHasData(RGBData);
ElemName=TexName;
#ifdef _DEBUG #ifdef _DEBUG
if (0) if (0)
{ {
@ -635,6 +638,34 @@ int Size=RGBData.TexW*RGBData.TexH;
return(false); return(false);
} }
/*****************************************************************************/
void CElem::Report(FILE *File)
{
// Check Mid Geom
int i,ListSize=TriList.size();
bool MidGeom=false;
if (!IsElem3d()) return;
for (i=0; i<ListSize && !MidGeom; i++)
{
sTriFace &Tri=TriList[i];
for (int p=0; p<3; p++)
{
// fprintf(File,"%f\n",Tri.vtx[p].z);
if (Tri.vtx[p].z>-1.0f && Tri.vtx[p].z<+1.0f) MidGeom=true;
}
}
// Basic Stats
fprintf(File,"%s\tT:%i",ElemName,TriList.size());
if (MidGeom)
{
fprintf(File,"\t*** MID GEOM ***");
}
fprintf(File,"\n");
}
/*****************************************************************************/ /*****************************************************************************/
/*****************************************************************************/ /*****************************************************************************/
/*** Elem Set ****************************************************************/ /*** Elem Set ****************************************************************/
@ -778,6 +809,17 @@ int ListSize=ElemList.size();
return(ElemList[No].IsValid()); return(ElemList[No].IsValid());
} }
/*****************************************************************************/
void CElemSet::Report(FILE *File)
{
int i,ListSize=ElemList.size();
for (i=0; i<ListSize; i++)
{
ElemList[i].Report(File);
}
}
/*****************************************************************************/ /*****************************************************************************/
/*****************************************************************************/ /*****************************************************************************/
/*** Elem Bank ***************************************************************/ /*** Elem Bank ***************************************************************/
@ -1092,6 +1134,19 @@ GLuint *HitPtr=SelectBuffer;
CursorPos=TileID; CursorPos=TileID;
} }
/*****************************************************************************/
void CElemBank::Report()
{
FILE *File=fopen("\\Report.txt","wt");
int ListSize=SetList.size();
for (int i=0; i<ListSize; i++)
{
SetList[i].Report(File);
}
fclose(File);
}
/*****************************************************************************/ /*****************************************************************************/
/*** Gui *********************************************************************/ /*** Gui *********************************************************************/
/*****************************************************************************/ /*****************************************************************************/

View file

@ -89,6 +89,8 @@ static bool DefTexFlag;
void SetInvalid(); void SetInvalid();
GLint GetTexID() {return(TexID);} GLint GetTexID() {return(TexID);}
void Report(FILE *File);
protected: protected:
void Build3dElem(CTexCache &TexCache,CScene &ThisScene,int Node); void Build3dElem(CTexCache &TexCache,CScene &ThisScene,int Node);
void Build2dElem(CCore *Core,const char *Filename,int TexId); void Build2dElem(CCore *Core,const char *Filename,int TexId);
@ -102,6 +104,7 @@ protected:
GString SetPath; GString SetPath;
std::vector<sTriFace> TriList; std::vector<sTriFace> TriList;
GString ElemName;
Vector3 Ofs; Vector3 Ofs;
@ -145,6 +148,7 @@ const char *GetName() {return(Name);}
bool IsValid(int No); bool IsValid(int No);
bool operator==(CElemSet const &v1) {return (Name==v1.Name);} bool operator==(CElemSet const &v1) {return (Name==v1.Name);}
void Report(FILE *File);
private: private:
void Load2d(CCore *Core); void Load2d(CCore *Core);
@ -190,6 +194,7 @@ virtual void Save(CFile *File);
const char *GetSetName(int Set) {return(SetList[Set].GetName());} const char *GetSetName(int Set) {return(SetList[Set].GetName());}
const char *GetSetFilename(int Set) {return(SetList[Set].GetFilename());} const char *GetSetFilename(int Set) {return(SetList[Set].GetFilename());}
void Report();
// Overloads // Overloads
virtual int GetType() {return(0);} virtual int GetType() {return(0);}

View file

@ -2,7 +2,7 @@
[General Info] [General Info]
Version=1 Version=1
LastClass=GUILayerCollision LastClass=CMapEditDoc
LastTemplate=CDialog LastTemplate=CDialog
NewFileInclude1=#include "stdafx.h" NewFileInclude1=#include "stdafx.h"
NewFileInclude2=#include "mapedit.h" NewFileInclude2=#include "mapedit.h"
@ -37,26 +37,26 @@ Class25=CMapEditDoc
Class26=CMapEditView Class26=CMapEditView
ResourceCount=21 ResourceCount=21
Resource1=IDD_ELEMLIST Resource1=IDD_LAYER_LIST
Resource2=IDD_LAYER_PLATFORM Resource2=IDD_TILEBANK
Resource3=IDD_LAYER_LIST Resource3=IDD_LAYER_THING_POS
Resource4=IDD_LAYER_THING_POS Resource4=IDD_ADDLAYER
Resource5=IDD_NEWMAP Resource5=IDD_LAYER_TRIGGER
Resource6=IDD_TILEBANK Resource6=IDR_TOOLBAR (English (U.S.))
Resource7=IDD_LAYER_COLLISION Resource7=IDD_MULTIBAR (English (U.S.))
Resource8=IDD_TOOLBAR Resource8=IDR_MAINFRAME (English (U.S.))
Resource9=IDD_ADDLAYER Resource9=IDD_LAYER_FX
Resource10=IDD_LAYER_TRIGGER Resource10=IDD_TOOLBAR
Resource11=IDR_MAPEDITYPE (English (U.S.)) Resource11=IDD_LAYER_COLLISION
Resource12=IDD_LAYER_SHADE Resource12=IDD_ABOUTBOX (English (U.S.))
Resource13=IDD_RESIZE Resource13=IDD_LAYER_PLATFORM
Resource14=IDD_LAYER_THING Resource14=IDD_NEWMAP
Resource15=IDD_MULTIBAR (English (U.S.)) Resource15=IDD_LAYER_THING
Resource16=IDD_LAYER_FX Resource16=IDD_LAYER_SHADE
Resource17=IDR_TOOLBAR (English (U.S.)) Resource17=IDR_MAPEDITYPE (English (U.S.))
Resource18=IDD_LAYER_ACTOR Resource18=IDD_RESIZE
Resource19=IDR_MAINFRAME (English (U.S.)) Resource19=IDD_ELEMLIST
Resource20=IDD_ABOUTBOX (English (U.S.)) Resource20=IDD_LAYER_ACTOR
Resource21=IDD_LAYER_HAZARD Resource21=IDD_LAYER_HAZARD
[CLS:CChildFrame] [CLS:CChildFrame]
@ -94,7 +94,7 @@ Type=0
BaseClass=CDialog BaseClass=CDialog
HeaderFile=GUILayerCollision.h HeaderFile=GUILayerCollision.h
ImplementationFile=GUILayerCollision.cpp ImplementationFile=GUILayerCollision.cpp
LastObject=IDC_LAYERCOLLISION_SB_NOMOVE LastObject=ID_APP_EXIT
Filter=D Filter=D
VirtualFilter=dWC VirtualFilter=dWC
@ -226,7 +226,7 @@ HeaderFile=MapEditDoc.h
ImplementationFile=MapEditDoc.cpp ImplementationFile=MapEditDoc.cpp
Filter=N Filter=N
VirtualFilter=DC VirtualFilter=DC
LastObject=CMapEditDoc LastObject=ID_REPORT
[CLS:CMapEditView] [CLS:CMapEditView]
Type=0 Type=0
@ -557,12 +557,13 @@ Command24=ID_ACTIVEBRUSH_LEFT
Command25=ID_ACTIVEBRUSH_RIGHT Command25=ID_ACTIVEBRUSH_RIGHT
Command26=ID_TOGGLE_SUBVIEW Command26=ID_TOGGLE_SUBVIEW
Command27=ID_2D_3D_TOGGLE Command27=ID_2D_3D_TOGGLE
Command28=ID_WINDOW_NEW Command28=ID_REPORT
Command29=ID_WINDOW_CASCADE Command29=ID_WINDOW_NEW
Command30=ID_WINDOW_TILE_HORZ Command30=ID_WINDOW_CASCADE
Command31=ID_WINDOW_ARRANGE Command31=ID_WINDOW_TILE_HORZ
Command32=ID_APP_ABOUT Command32=ID_WINDOW_ARRANGE
CommandCount=32 Command33=ID_APP_ABOUT
CommandCount=33
[ACL:IDR_MAINFRAME (English (U.S.))] [ACL:IDR_MAINFRAME (English (U.S.))]
Type=1 Type=1

View file

@ -141,6 +141,7 @@ BEGIN
POPUP "Misc" POPUP "Misc"
BEGIN BEGIN
MENUITEM "2d/3d Toggle", ID_2D_3D_TOGGLE MENUITEM "2d/3d Toggle", ID_2D_3D_TOGGLE
MENUITEM "Report", ID_REPORT
END END
POPUP "&Window" POPUP "&Window"
BEGIN BEGIN

View file

@ -36,9 +36,10 @@ BEGIN_MESSAGE_MAP(CMapEditDoc, CDocument)
ON_COMMAND(ID_2D_3D_TOGGLE, On2d3dToggle) ON_COMMAND(ID_2D_3D_TOGGLE, On2d3dToggle)
ON_COMMAND(ID_RESET_VIEW, OnResetView) ON_COMMAND(ID_RESET_VIEW, OnResetView)
ON_COMMAND(ID_RENDER_TO_TGA, OnRenderToTga) ON_COMMAND(ID_RENDER_TO_TGA, OnRenderToTga)
ON_COMMAND(ID_ROTATE, OnRotate)
ON_COMMAND(ID_TOOLBAR_TILEPALETTE, OnToggleSubView) ON_COMMAND(ID_TOOLBAR_TILEPALETTE, OnToggleSubView)
ON_COMMAND(ID_TOGGLE_GRID, OnToggleGrid) ON_COMMAND(ID_TOGGLE_GRID, OnToggleGrid)
ON_COMMAND(ID_ROTATE, OnRotate) ON_COMMAND(ID_REPORT, OnReport)
//}}AFX_MSG_MAP //}}AFX_MSG_MAP
END_MESSAGE_MAP() END_MESSAGE_MAP()
@ -183,6 +184,8 @@ void CMapEditDoc::MouseMove(UINT nFlags, CPoint &point) {Core.MouseMove(nFl
void CMapEditDoc::OnToggleSubView() {Command(CmdMsg_ToggleSubView);} void CMapEditDoc::OnToggleSubView() {Command(CmdMsg_ToggleSubView);}
void CMapEditDoc::OnToggleGrid() {Command(CmdMsg_ToggleGrid);} void CMapEditDoc::OnToggleGrid() {Command(CmdMsg_ToggleGrid);}
void CMapEditDoc::On2d3dToggle() {Command(CmdMsg_Toggle2d);} void CMapEditDoc::On2d3dToggle() {Command(CmdMsg_Toggle2d);}
void CMapEditDoc::OnReport() {Command(CmdMsg_Report);}
void CMapEditDoc::OnZoomIn() {Command(CmdMsg_ZoomIn);} void CMapEditDoc::OnZoomIn() {Command(CmdMsg_ZoomIn);}
void CMapEditDoc::OnZoomOut() {Command(CmdMsg_ZoomOut);} void CMapEditDoc::OnZoomOut() {Command(CmdMsg_ZoomOut);}
@ -301,3 +304,4 @@ void CMapEditDoc::FocusView()
/*********************************************************************************/ /*********************************************************************************/

View file

@ -85,6 +85,7 @@ protected:
afx_msg void OnResetView(); afx_msg void OnResetView();
afx_msg void OnRenderToTga(); afx_msg void OnRenderToTga();
afx_msg void OnRotate(); afx_msg void OnRotate();
afx_msg void OnReport();
//}}AFX_MSG //}}AFX_MSG
DECLARE_MESSAGE_MAP() DECLARE_MESSAGE_MAP()

View file

@ -225,6 +225,7 @@
#define ID_RESET_VIEW 32799 #define ID_RESET_VIEW 32799
#define ID_RENDER_TO_TGA 32800 #define ID_RENDER_TO_TGA 32800
#define ID_ROTATE 32801 #define ID_ROTATE 32801
#define ID_REPORT 32802
#define ID_INDICATOR_CURSORXY 59142 #define ID_INDICATOR_CURSORXY 59142
// Next default values for new objects // Next default values for new objects
@ -233,7 +234,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS #ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1 #define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 180 #define _APS_NEXT_RESOURCE_VALUE 180
#define _APS_NEXT_COMMAND_VALUE 32802 #define _APS_NEXT_COMMAND_VALUE 32803
#define _APS_NEXT_CONTROL_VALUE 1215 #define _APS_NEXT_CONTROL_VALUE 1215
#define _APS_NEXT_SYMED_VALUE 101 #define _APS_NEXT_SYMED_VALUE 101
#endif #endif

Binary file not shown.