Skip to content

Translate N3ME, resolution based on screen size #221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Translate N3ME, resolution based on screen size #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d8f6f9
Translate N3ME
xGuTeK May 17, 2024
90f6476
Change render resolution based on screen size
xGuTeK May 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/tool/N3ME/DTex.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ void CDTex::Init() {

//
// SetAttr...
// Ÿ���ϳ��� �Ӽ� ���� �ֱ�..
// Inserting properties into one tile...
//
void CDTex::SetAttr(int x, int y, DTEXATTR attr) {
m_Attr[x][y] = attr;
Expand Down
8 changes: 4 additions & 4 deletions src/tool/N3ME/DTexGroup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,12 @@ void CDTexGroup::DelAttr(int attr, DTEXTILEATTR tile) {
void CDTexGroup::DelAttrByDTexID(int DTexID) {
it_DTexTileAttr it;
for (int i = DTEX_FULL; i < DTEX_MAX; i++) {
//����Ʈ ���鼭 DTexIndx�� ������ ������ �� ���ֹ���...
//Go through the list and if something like DTexIndx comes up, get rid of it...
it = m_Attributes[i].begin();
while (it != m_Attributes[i].end()) {
DTEXTILEATTR * pTile = *it;
if (pTile->TexID == DTexID) {
//������...
//Let's erase...
Comment on lines -95 to +100
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know if these were auto translated, but normally we should add two spaces after a comment operator:
// my comment

The same should apply for all other comments, at least the ones that are not aligned.

delete (*it);
it = m_Attributes[i].erase(it);
} else {
Expand All @@ -108,8 +108,8 @@ void CDTexGroup::DelAttrByDTexID(int DTexID) {
}

//
// DTexMng�� �ִ� ������ û��...
// DTex�� ����Ǿ� �ִ� ���� �׷� ������ NONE���� ����..
// Clean the information in DTexMng...
// Set the current group information stored in DTex to NONE..
//
void CDTexGroup::ClearDTex() {
CMainFrame * pFrm = (CMainFrame *)AfxGetMainWnd();
Expand Down
12 changes: 6 additions & 6 deletions src/tool/N3ME/DTexGroupMng.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ int CDTexGroupMng::GetBrushSize() {
//
void CDTexGroupMng::SetGroup(const char * pName) {
//^^
//�����Ϸ��� �׷��� ������ �� �����ع���..
//If there is a group to set, just return it.
it_DTexGroup it = m_Groups.begin();
int iSize = m_Groups.size();
for (int i = 0; i < iSize; i++, it++) {
Expand All @@ -100,7 +100,7 @@ void CDTexGroupMng::SetGroup(const char * pName) {

wsprintf(pGroup->m_Name, pName);

//���ο� idx�� �����ϱ� ���ؼ� �ϴ� ������ ����..
//Let�s sort first to specify a new idx.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same comment as here: #221 (comment)

it = m_Groups.begin();
iSize = m_Groups.size();
int * ArrayIdx = new int[iSize];
Expand All @@ -127,7 +127,7 @@ void CDTexGroupMng::SetGroup(const char * pName) {

//
// SetGroupID..
// ID�� �׷� �ֱ�..
// Insert group by ID..
//
void CDTexGroupMng::SetGroupID(const char * pName, int id) {
CDTexGroup * pGroup = new CDTexGroup;
Expand All @@ -142,7 +142,7 @@ void CDTexGroupMng::SetGroupID(const char * pName, int id) {
}

//
// qsort�� ���� �����ϴ� �Լ�...
// Sorting function for qsort...
//
int CDTexGroupMng::CompareIdx(const void * arg1, const void * arg2) {
int a, b;
Expand All @@ -159,7 +159,7 @@ int CDTexGroupMng::CompareIdx(const void * arg1, const void * arg2) {
}

//
// �׷� �����..
// Delete group...
//
void CDTexGroupMng::DelGroup(int ID) {
it_DTexGroup it = m_Groups.begin();
Expand All @@ -179,7 +179,7 @@ void CDTexGroupMng::DelGroup(int ID) {
}

//
// �׷�ȿ� Ÿ�� �ֱ�..
// Putting tiles into a group...
//
void CDTexGroupMng::SetTile(int ID, int attr, __DTexTileAttr tile) {
it_DTexGroup it = m_Groups.begin();
Expand Down
8 changes: 4 additions & 4 deletions src/tool/N3ME/DTexGroupMng.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ typedef typename std::list<CDTexGroup *>::iterator it_DTexGroup;

class CDTexGroupMng : public CN3Base {
public:
std::list<CDTexGroup *> m_Groups; //�׷� �����͵��� ������ �ִ� ����Ʈ.
CDlgDTexGroupView * m_pGroupView; //���� �۾��Ҷ� �׷���� �����ִ� â.
std::list<CDTexGroup *> m_Groups; //List containing group data.
CDlgDTexGroupView * m_pGroupView; //A window that shows groups during actual work.

DTEXATTR m_SelectedDTex; //�۾��� �׷�â���� ������ �׷�� �Ӽ�.
DTEXTILEATTR m_SelectedDTexTile; //�۾��� ������ ���� �ؽ��� Ÿ��.
DTEXATTR m_SelectedDTex; //Group and properties selected in the group window when working.
DTEXTILEATTR m_SelectedDTexTile; //The actual texture tile selected during operation.

CMainFrame * m_pMainFrm;

Expand Down
24 changes: 12 additions & 12 deletions src/tool/N3ME/DTexMng.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ void CDTexMng::DelDTexByID(int id) {

//
// Load..
// DTex������� ���� �ؽ��� �ҽ����� �о���δ�.
// Read DTex information and actual texture sources.
//
void CDTexMng::LoadFromFile(CString RealFileName) {
Init(m_pMainFrm);
Expand Down Expand Up @@ -151,13 +151,13 @@ void CDTexMng::LoadFromFile(CString RealFileName) {

ProgressBar.StepIt();

// ���� �ؽ��� �ҽ��� �а�..
// Read the actual texture source...
CDTex * pDTex = new CDTex;
pDTex->Init();
pDTex->m_ID = i;
pDTex->m_pTex->LoadFromFile(szDTexFileName);

// �׿� ���� Ÿ�� �������� �а�..
// Read the tile information about it...
char szDir[_MAX_DIR], szFName[_MAX_FNAME];
_splitpath(szDTexFileName, NULL, szDir, szFName, NULL);
wsprintf(szDTexInfoFileName, "%s%s%s.dif", s_szPath.c_str(), szDir, szFName); // Texture Information file
Expand Down Expand Up @@ -209,7 +209,7 @@ void CDTexMng::LoadFromFile(CString RealFileName) {
m_NextID = id + 1;
}

// ���� �ؽ��� �ҽ��� �а�..
// Read the actual texture source...
CDTex * pDTex = new CDTex;
pDTex->Init();
pDTex->m_ID = id;
Expand All @@ -234,7 +234,7 @@ void CDTexMng::LoadFromFile(CString RealFileName) {
}

if (version == 1) {
// �׿� ���� Ÿ�� �������� �а�..
// Read the tile information about it...
char szDir[_MAX_DIR], szFName[_MAX_FNAME];
_splitpath(szDTexFileName, NULL, szDir, szFName, NULL);
wsprintf(szDTexInfoFileName, "%s%s%s.dif", s_szPath.c_str(), szDir,
Expand Down Expand Up @@ -269,7 +269,7 @@ void CDTexMng::LoadFromFile(CString RealFileName) {
void CDTexMng::SaveToFile(CString RealFileName) {
char szDTexDir[_MAX_PATH];
wsprintf(szDTexDir, "%sDTex", s_szPath.c_str());
CreateDirectory("dtex", NULL); // ��� �����..
CreateDirectory("dtex", NULL); // Create a path...

char szDTexInfoFileName[_MAX_PATH];
wsprintf(szDTexInfoFileName, "%sDTEX\\%s.dtx", s_szPath.c_str(), (LPCTSTR)RealFileName);
Expand Down Expand Up @@ -304,15 +304,15 @@ void CDTexMng::SaveToFile(CString RealFileName) {

/*
//
// version1 ������...
// dif���ϸ����...
// version1 storage method...
// Create dif file...
//
char szDir[_MAX_DIR], szFName[_MAX_FNAME];

_splitpath(szDTexFileName, NULL, szDir, szFName, NULL);
wsprintf(szDTexInfoFileName, "%s%s%s.dif", s_szPath.c_str(), szDir, szFName); // Texture Information file

// �׿� ���� Ÿ�� �������� �а�..
// Read the tile information about it...
HANDLE hFile = CreateFile(szDTexInfoFileName, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);

if(hFile != INVALID_HANDLE_VALUE)
Expand All @@ -332,11 +332,11 @@ void CDTexMng::SaveToFile(CString RealFileName) {
}

//
// ���ӿ��� ���� �ִ� Ÿ�� �ؽ��� �������� ��ȯ�� ����..
// Convert to a tile texture format that can be used in the game and save it.
//
void CDTexMng::SaveGameTile() {
D3DFORMAT Format;
int Size = DTEX_SIZE / NUM_DTEXTILE; //�����ؽ����� ����..
int Size = DTEX_SIZE / NUM_DTEXTILE; //Length of unit texture...
D3DLOCKED_RECT d3dlr;

HANDLE hFile;
Expand Down Expand Up @@ -381,7 +381,7 @@ void CDTexMng::SaveGameTile() {
CreateFile(szDTexGameFileName, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);

for (ix = 0; ix < NUM_DTEXTILE; ix++) {
//�ؽ��� �����̽� �����, �ؽ��� ä���, ���� ��ȯ�ϰ�, ����.
//Create a texture surface, fill the texture, convert format, and save.
TileTex.Create(Size, Size, Format, TRUE);
TileTex.Get()->LockRect(0, &d3dlrTarget, 0, 0);
pSourceImg = (char *)((char *)d3dlr.pBits + (ix * Size * Bits) + (iz * Size * d3dlr.Pitch));
Expand Down
2 changes: 1 addition & 1 deletion src/tool/N3ME/DTexMng.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class CDTexMng : public CN3Base {
public:
std::list<CDTex *> m_pDTex;
CMainFrame * m_pMainFrm;
//int m_NumDTex; //dtex�� ��� �ִ� ������ �迭 + 1...^^
//int m_NumDTex; //last array containing dtex + 1...^^
//CDTex* m_pDTex[MAX_TILETEXTURE];

public:
Expand Down
18 changes: 9 additions & 9 deletions src/tool/N3ME/DlgAddSoundGroup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ BOOL CDlgAddSoundGroup::OnInitDialog() {

void CDlgAddSoundGroup::OnBtnBgeName1() {
DWORD dwFlags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_LONGNAMES | OFN_HIDEREADONLY;
CFileDialog dlg(TRUE, "wav", NULL, dwFlags, "Wave����(*.wav)|*.wav||", NULL);
CFileDialog dlg(TRUE, "wav", NULL, dwFlags, "Wave file(*.wav)|*.wav||", NULL);

if (dlg.DoModal() == IDCANCEL) {
return;
Expand All @@ -125,7 +125,7 @@ void CDlgAddSoundGroup::OnBtnBgeName1() {

void CDlgAddSoundGroup::OnBtnBgeName2() {
DWORD dwFlags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_LONGNAMES | OFN_HIDEREADONLY;
CFileDialog dlg(TRUE, "wav", NULL, dwFlags, "Wave����(*.wav)|*.wav||", NULL);
CFileDialog dlg(TRUE, "wav", NULL, dwFlags, "Wave file(*.wav)|*.wav||", NULL);

if (dlg.DoModal() == IDCANCEL) {
return;
Expand All @@ -138,7 +138,7 @@ void CDlgAddSoundGroup::OnBtnBgeName2() {

void CDlgAddSoundGroup::OnBtnBgeName3() {
DWORD dwFlags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_LONGNAMES | OFN_HIDEREADONLY;
CFileDialog dlg(TRUE, "wav", NULL, dwFlags, "Wave����(*.wav)|*.wav||", NULL);
CFileDialog dlg(TRUE, "wav", NULL, dwFlags, "Wave file(*.wav)|*.wav||", NULL);

if (dlg.DoModal() == IDCANCEL) {
return;
Expand All @@ -151,7 +151,7 @@ void CDlgAddSoundGroup::OnBtnBgeName3() {

void CDlgAddSoundGroup::OnBtnBgeName4() {
DWORD dwFlags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_LONGNAMES | OFN_HIDEREADONLY;
CFileDialog dlg(TRUE, "wav", NULL, dwFlags, "Wave����(*.wav)|*.wav||", NULL);
CFileDialog dlg(TRUE, "wav", NULL, dwFlags, "Wave file(*.wav)|*.wav||", NULL);

if (dlg.DoModal() == IDCANCEL) {
return;
Expand All @@ -164,7 +164,7 @@ void CDlgAddSoundGroup::OnBtnBgeName4() {

void CDlgAddSoundGroup::OnBtnBgmName1() {
DWORD dwFlags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_LONGNAMES | OFN_HIDEREADONLY;
CFileDialog dlg(TRUE, "wav", NULL, dwFlags, "Wave����(*.wav)|*.wav||", NULL);
CFileDialog dlg(TRUE, "wav", NULL, dwFlags, "Wave file(*.wav)|*.wav||", NULL);

if (dlg.DoModal() == IDCANCEL) {
return;
Expand All @@ -177,7 +177,7 @@ void CDlgAddSoundGroup::OnBtnBgmName1() {

void CDlgAddSoundGroup::OnBtnBgmName2() {
DWORD dwFlags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_LONGNAMES | OFN_HIDEREADONLY;
CFileDialog dlg(TRUE, "wav", NULL, dwFlags, "Wave����(*.wav)|*.wav||", NULL);
CFileDialog dlg(TRUE, "wav", NULL, dwFlags, "Wave file(*.wav)|*.wav||", NULL);

if (dlg.DoModal() == IDCANCEL) {
return;
Expand All @@ -190,7 +190,7 @@ void CDlgAddSoundGroup::OnBtnBgmName2() {

void CDlgAddSoundGroup::OnBtnBgmName3() {
DWORD dwFlags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_LONGNAMES | OFN_HIDEREADONLY;
CFileDialog dlg(TRUE, "wav", NULL, dwFlags, "Wave����(*.wav)|*.wav||", NULL);
CFileDialog dlg(TRUE, "wav", NULL, dwFlags, "Wave file(*.wav)|*.wav||", NULL);

if (dlg.DoModal() == IDCANCEL) {
return;
Expand All @@ -203,7 +203,7 @@ void CDlgAddSoundGroup::OnBtnBgmName3() {

void CDlgAddSoundGroup::OnBtnBgmName4() {
DWORD dwFlags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_LONGNAMES | OFN_HIDEREADONLY;
CFileDialog dlg(TRUE, "wav", NULL, dwFlags, "Wave����(*.wav)|*.wav||", NULL);
CFileDialog dlg(TRUE, "wav", NULL, dwFlags, "Wave file(*.wav)|*.wav||", NULL);

if (dlg.DoModal() == IDCANCEL) {
return;
Expand All @@ -219,7 +219,7 @@ void CDlgAddSoundGroup::OnOK() {

GetDlgItemText(IDC_EDT_GROUPNAME, m_SndInfo.szName, 256);
if (m_SndInfo.szName[0] == 0) {
AfxMessageBox("�����̸��� �Է��ϼž� �ؿ�.\n�ոӸ��� ���� �ϸ� �ȵǴ°� ����?^^");
AfxMessageBox("You must enter the bundle name.\nYou know you shouldn't use spaces at the beginning, right?^^");
return;
}

Expand Down
Loading