Skip to content

Commit

Permalink
Improvements for GUI Editore
Browse files Browse the repository at this point in the history 
Plus more formatting changes
  • Loading branch information
@FriskTheFallenHuman
FriskTheFallenHuman committed Oct 29, 2024
1 parent 72c60ca commit e07c61f
Show file tree
Hide file tree
Showing 175 changed files with 2,515 additions and 1,643 deletions.
30 changes: 19 additions & 11 deletions neo/sys/win32/rc/prey_tools.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -838,8 +838,9 @@ BEGIN
CONTROL "",IDC_TREE_MEDIA,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | TVS_NOTOOLTIPS | WS_BORDER | WS_HSCROLL | WS_TABSTOP,10,10,320,359
CONTROL "",IDC_PREVIEW,"Static",SS_BLACKFRAME | SS_NOTIFY | SS_SUNKEN,341,10,201,171
EDITTEXT IDC_EDIT_INFO,341,221,200,117,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY
PUSHBUTTON "Reload",IDC_BUTTON_RELOAD,466,191,40,20
PUSHBUTTON "Play",IDC_BUTTON_PLAY,378,191,40,20
PUSHBUTTON "Reload",IDC_BUTTON_RELOAD,483,193,48,16
PUSHBUTTON "Play",IDC_BUTTON_PLAY,361,194,45,15
CONTROL "Gui Only",IDC_PREVIEW_GUI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,421,195,51,14
END

IDD_DIALOG_CONSOLE DIALOGEX 0, 0, 295, 292
Expand Down Expand Up @@ -1734,13 +1735,14 @@ BEGIN
CONTROL "&Backcolor:",IDC_GUIED_USEBACKCOLOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,22,49,10
CONTROL "Button1",IDC_GUIED_ITEMBACKCOLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,68,20,32,14
CONTROL "Button1",IDC_GUIED_ITEMBACKCOLORALPHA,"Button",BS_OWNERDRAW | WS_TABSTOP,100,20,19,14
CONTROL "&Material:",IDC_GUIED_USEMATERIAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,44,44,10
EDITTEXT IDC_GUIED_ITEMBACKGROUND,77,42,152,14,ES_AUTOHSCROLL
LTEXT "&X Scale:",IDC_GUIED_XSCALE_STATIC,78,62,26,8
EDITTEXT IDC_GUIED_ITEMMATSCALEX,105,60,42,13,ES_AUTOHSCROLL
LTEXT "&Y Scale:",IDC_GUIED_YSCALE_STATIC,160,62,26,8
EDITTEXT IDC_GUIED_ITEMMATSCALEY,187,60,42,13,ES_AUTOHSCROLL
CONTROL "&Disable Cache",IDC_GUIED_ITEMVARIABLEBACKGROUND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,77,79,61,10
CONTROL "&Material:",IDC_GUIED_USEMATERIAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,53,44,10
CONTROL "Pick",ID_GUIED_CHOOSE_MATERIAL,"Button",BS_OWNERDRAW | WS_GROUP | WS_TABSTOP,65,51,29,14
EDITTEXT IDC_GUIED_ITEMBACKGROUND,97,51,129,14,ES_AUTOHSCROLL
LTEXT "&X Scale:",IDC_GUIED_XSCALE_STATIC,22,73,26,8
EDITTEXT IDC_GUIED_ITEMMATSCALEX,49,71,42,13,ES_AUTOHSCROLL
LTEXT "&Y Scale:",IDC_GUIED_YSCALE_STATIC,100,73,26,8
EDITTEXT IDC_GUIED_ITEMMATSCALEY,127,71,42,13,ES_AUTOHSCROLL
CONTROL "No Cache",IDC_GUIED_ITEMVARIABLEBACKGROUND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,179,72,45,10
GROUPBOX "Border",IDC_STATIC,7,105,229,78
LTEXT "&Size:",IDC_STATIC,19,119,16,8
EDITTEXT IDC_GUIED_ITEMBORDERSIZE,38,118,39,13,ES_AUTOHSCROLL
Expand All @@ -1753,9 +1755,10 @@ BEGIN
LTEXT "Ma&tcolor:",IDC_GUIED_ITEMMATCOLORSTATIC,19,205,31,8
CONTROL "Button1",IDC_GUIED_ITEMMATCOLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,55,202,32,14
CONTROL "Button1",IDC_GUIED_ITEMMATCOLORALPHA,"Button",BS_OWNERDRAW | WS_TABSTOP,87,202,19,14
GROUPBOX "Material",IDC_STATIC,13,37,220,57
END

IDD_GUIED_TRANSFORMER DIALOGEX 0, 0, 124, 32
IDD_GUIED_TRANSFORMER DIALOGEX 0, 0, 124, 48
STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
FONT 8, "MS Shell Dlg", 400, 0, 0x0
BEGIN
Expand All @@ -1767,6 +1770,7 @@ BEGIN
EDITTEXT IDC_GUIED_ITEMRECTW,73,2,43,12,ES_AUTOHSCROLL | NOT WS_BORDER,WS_EX_STATICEDGE
LTEXT "H:",IDC_STATIC,65,19,8,8
EDITTEXT IDC_GUIED_ITEMRECTH,73,17,43,12,ES_AUTOHSCROLL | NOT WS_BORDER,WS_EX_STATICEDGE
CONTROL "Lock Aspect",IDC_GUIED_LOCK_ASPECT,"Button",BS_AUTOCHECKBOX,35,34,55,10
END

IDD_DBG_QUICKWATCH DIALOGEX 0, 0, 306, 174
Expand Down Expand Up @@ -2189,6 +2193,7 @@ BEGIN

IDD_GUIED_TRANSFORMER, DIALOG
BEGIN
BOTTOMMARGIN, 32
END

IDD_DBG_QUICKWATCH, DIALOG
Expand Down Expand Up @@ -2944,7 +2949,9 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Show &Navigator", ID_GUIED_WINDOW_SHOWNAVIGATOR
MENUITEM "Show &Transformer", ID_GUIED_WINDOW_SHOWTRANSFORMER
MENUITEM "Show &Properties", ID_GUIED_WINDOW_SHOWPROPERTIES
MENUITEM "Show &Properties", ID_GUIED_WINDOW_SHOWPROPERTIES
MENUITEM "Show &Item Properties", ID_GUIED_WINDOW_SHOWITEMPROPERTIES
MENUITEM "Show &Scripts", ID_GUIED_WINDOW_SHOWSCRIPTS
END
POPUP "&Help"
BEGIN
Expand Down Expand Up @@ -3244,6 +3251,7 @@ IDR_GUIED_ACCELERATORS ACCELERATORS
BEGIN
"C", ID_GUIED_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT
VK_DELETE, ID_GUIED_EDIT_DELETE, VIRTKEY, NOINVERT
VK_SPACE, ID_GUIED_EDIT_DUPLICATE, VIRTKEY, CONTROL, NOINVERT
"V", ID_GUIED_EDIT_PASTE, VIRTKEY, CONTROL, NOINVERT
"Y", ID_GUIED_EDIT_REDO, VIRTKEY, CONTROL, NOINVERT
"Z", ID_GUIED_EDIT_UNDO, VIRTKEY, CONTROL, NOINVERT
Expand Down
7 changes: 7 additions & 0 deletions neo/sys/win32/rc/resource.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1583,6 +1583,13 @@
#define IDD_WAITDLG_PROGRESS 45016
#define IDC_ABOUT_TEXT 45017
#define IDC_ABOUT_BITMAP 45018
#define IDC_GUIED_LOCK_ASPECT 45019
#define ID_GUIED_CHOOSE_MATERIAL 45020
#define ID_GUIED_APPLY_ITEM_PROPS 45021
#define ID_GUIED_EDIT_DUPLICATE 45022
#define ID_GUIED_WINDOW_SHOWITEMPROPERTIES 45023
#define ID_GUIED_WINDOW_SHOWSCRIPTS 45024
#define IDC_PREVIEW_GUI 45025

// Next default values for new objects
//
Expand Down
18 changes: 9 additions & 9 deletions neo/tools/af/DialogAF.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ void DialogAF::LoadFile( idDeclAF* af )
DialogAF::LoadFile
================
*/
void DialogAF::SaveFile( void )
void DialogAF::SaveFile()
{
if( !file )
{
Expand All @@ -159,7 +159,7 @@ void DialogAF::SaveFile( void )
DialogAF::SetFileModified
================
*/
void DialogAF::SetFileModified( void )
void DialogAF::SetFileModified()
{
if( file )
{
Expand All @@ -173,7 +173,7 @@ void DialogAF::SetFileModified( void )
DialogAF::ReloadFile
================
*/
void DialogAF::ReloadFile( void )
void DialogAF::ReloadFile()
{
LoadFile( file );
}
Expand All @@ -183,7 +183,7 @@ void DialogAF::ReloadFile( void )
DialogAF::InitAFList
================
*/
void DialogAF::InitAFList( void )
void DialogAF::InitAFList()
{
int i, c;

Expand Down Expand Up @@ -238,7 +238,7 @@ DialogAF::SetTabChildPos
position the child dialog box
================
*/
void DialogAF::SetTabChildPos( void )
void DialogAF::SetTabChildPos()
{
if( wndTabDisplay )
{
Expand Down Expand Up @@ -372,7 +372,7 @@ void AFEditorInit( const idDict* spawnArgs )
AFEditorRun
================
*/
void AFEditorRun( void )
void AFEditorRun()
{
#if _MSC_VER >= 1300
MSG* msg = AfxGetCurrentMessage(); // TODO Robert fix me!!
Expand All @@ -394,7 +394,7 @@ void AFEditorRun( void )
AFEditorShutdown
================
*/
void AFEditorShutdown( void )
void AFEditorShutdown()
{
delete g_AFDialog;
g_AFDialog = NULL;
Expand Down Expand Up @@ -674,7 +674,7 @@ void DialogAF::OnBnClickedCancel()
AFDialogSetFileModified
================
*/
void AFDialogSetFileModified( void )
void AFDialogSetFileModified()
{
if( g_AFDialog )
{
Expand All @@ -687,7 +687,7 @@ void AFDialogSetFileModified( void )
AFDialogReloadFile
================
*/
void AFDialogReloadFile( void )
void AFDialogReloadFile()
{
if( g_AFDialog )
{
Expand Down
14 changes: 7 additions & 7 deletions neo/tools/af/DialogAF.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ class DialogAF : public CDialog
DialogAF( CWnd* pParent = NULL ); // standard constructor
virtual ~DialogAF();
void LoadFile( idDeclAF* af );
void SaveFile( void );
void ReloadFile( void );
void SetFileModified( void );
void SaveFile();
void ReloadFile();
void SetFileModified();

enum { IDD = IDD_DIALOG_AF };

Expand Down Expand Up @@ -89,11 +89,11 @@ class DialogAF : public CDialog
static toolTip_t toolTips[];

private:
void InitAFList( void );
void InitAFList();
void AddTabItem( int id, const char* name );
void SetTab( int id );
void SetTabChildPos( void );
void SetTabChildPos();
};

void AFDialogSetFileModified( void );
void AFDialogReloadFile( void );
void AFDialogSetFileModified();
void AFDialogReloadFile();
16 changes: 8 additions & 8 deletions neo/tools/af/DialogAFBody.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ void DialogAFBody::DoDataExchange( CDataExchange* pDX )
DialogAFBody::InitBodyList
================
*/
void DialogAFBody::InitBodyList( void )
void DialogAFBody::InitBodyList()
{
CString str;

Expand Down Expand Up @@ -243,7 +243,7 @@ DialogAFBody::InitJointLists
initialize the joint lists for bone collision models
================
*/
void DialogAFBody::InitJointLists( void )
void DialogAFBody::InitJointLists()
{
idStrList joints;

Expand Down Expand Up @@ -282,7 +282,7 @@ void DialogAFBody::InitJointLists( void )
DialogAFBody::InitCollisionModelType
================
*/
void DialogAFBody::InitCollisionModelType( void )
void DialogAFBody::InitCollisionModelType()
{
int showBone, showOther;
bool enableOther;
Expand Down Expand Up @@ -362,7 +362,7 @@ void DialogAFBody::InitCollisionModelType( void )
DialogAFBody::InitModifiedJointList
================
*/
void DialogAFBody::InitModifiedJointList( void )
void DialogAFBody::InitModifiedJointList()
{
int i, j, numJoints;
CString str;
Expand Down Expand Up @@ -447,7 +447,7 @@ void DialogAFBody::InitModifiedJointList( void )
DialogAFBody::InitNewRenameDeleteButtons
================
*/
void DialogAFBody::InitNewRenameDeleteButtons( void )
void DialogAFBody::InitNewRenameDeleteButtons()
{
if( file && numJoints > file->bodies.Num() )
{
Expand Down Expand Up @@ -489,7 +489,7 @@ void DialogAFBody::LoadFile( idDeclAF* af )
DialogAFBody::SaveFile
================
*/
void DialogAFBody::SaveFile( void )
void DialogAFBody::SaveFile()
{
SaveBody();
}
Expand Down Expand Up @@ -643,7 +643,7 @@ void DialogAFBody::LoadBody( const char* name )
DialogAFBody::SaveBody
================
*/
void DialogAFBody::SaveBody( void )
void DialogAFBody::SaveBody()
{
int s1, s2;
CString str;
Expand Down Expand Up @@ -760,7 +760,7 @@ void DialogAFBody::SaveBody( void )
DialogAFBody::UpdateFile
================
*/
void DialogAFBody::UpdateFile( void )
void DialogAFBody::UpdateFile()
{
SaveBody();
if( file )
Expand Down
16 changes: 8 additions & 8 deletions neo/tools/af/DialogAFBody.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ class DialogAFBody : public CDialog
DialogAFBody( CWnd* pParent = NULL ); // standard constructor
virtual ~DialogAFBody();
void LoadFile( idDeclAF* af );
void SaveFile( void );
void SaveFile();
void LoadBody( const char* name );
void SaveBody( void );
void UpdateFile( void );
void SaveBody();
void UpdateFile();

DialogAFConstraint* constraintDlg;

Expand Down Expand Up @@ -148,11 +148,11 @@ class DialogAFBody : public CDialog
static toolTip_t toolTips[];

private:
void InitBodyList( void );
void InitJointLists( void );
void InitCollisionModelType( void );
void InitModifiedJointList( void );
void InitNewRenameDeleteButtons( void );
void InitBodyList();
void InitJointLists();
void InitCollisionModelType();
void InitModifiedJointList();
void InitNewRenameDeleteButtons();
void ValidateCollisionModelLength( bool update );
void ValidateCollisionModelHeight( bool update );
void ValidateCollisionModelWidth( bool update );
Expand Down
14 changes: 7 additions & 7 deletions neo/tools/af/DialogAFConstraint.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ void DialogAFConstraint::DoDataExchange( CDataExchange* pDX )
DialogAFConstraint::InitConstraintList
================
*/
void DialogAFConstraint::InitConstraintList( void )
void DialogAFConstraint::InitConstraintList()
{
CString str;

Expand All @@ -182,7 +182,7 @@ void DialogAFConstraint::InitConstraintList( void )
DialogAFConstraint::InitConstraintTypeDlg
================
*/
void DialogAFConstraint::InitConstraintTypeDlg( void )
void DialogAFConstraint::InitConstraintTypeDlg()
{
CString str;
RECT rect;
Expand Down Expand Up @@ -241,7 +241,7 @@ void DialogAFConstraint::InitConstraintTypeDlg( void )
DialogAFConstraint::InitBodyLists
================
*/
void DialogAFConstraint::InitBodyLists( void )
void DialogAFConstraint::InitBodyLists()
{
m_comboBody1List.ResetContent();
m_comboBody2List.ResetContent();
Expand All @@ -263,7 +263,7 @@ void DialogAFConstraint::InitBodyLists( void )
DialogAFConstraint::InitNewRenameDeleteButtons
================
*/
void DialogAFConstraint::InitNewRenameDeleteButtons( void )
void DialogAFConstraint::InitNewRenameDeleteButtons()
{
if( file && file->bodies.Num() >= 1 )
{
Expand Down Expand Up @@ -310,7 +310,7 @@ void DialogAFConstraint::LoadFile( idDeclAF* af )
DialogAFConstraint::SaveFile
================
*/
void DialogAFConstraint::SaveFile( void )
void DialogAFConstraint::SaveFile()
{
SaveConstraint();
}
Expand Down Expand Up @@ -368,7 +368,7 @@ void DialogAFConstraint::LoadConstraint( const char* name )
DialogAFConstraint::SaveConstraint
================
*/
void DialogAFConstraint::SaveConstraint( void )
void DialogAFConstraint::SaveConstraint()
{
int s1, s2;
CString str;
Expand Down Expand Up @@ -400,7 +400,7 @@ void DialogAFConstraint::SaveConstraint( void )
DialogAFConstraint::UpdateFile
================
*/
void DialogAFConstraint::UpdateFile( void )
void DialogAFConstraint::UpdateFile()
{
SaveConstraint();
if( file )
Expand Down
14 changes: 7 additions & 7 deletions neo/tools/af/DialogAFConstraint.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ class DialogAFConstraint : public CDialog
DialogAFConstraint( CWnd* pParent = NULL ); // standard constructor
virtual ~DialogAFConstraint();
void LoadFile( idDeclAF* af );
void SaveFile( void );
void SaveFile();
void LoadConstraint( const char* name );
void SaveConstraint( void );
void UpdateFile( void );
void SaveConstraint();
void UpdateFile();

enum { IDD = IDD_DIALOG_AF_CONSTRAINT };

Expand Down Expand Up @@ -92,8 +92,8 @@ class DialogAFConstraint : public CDialog
static toolTip_t toolTips[];

private:
void InitConstraintList( void );
void InitConstraintTypeDlg( void );
void InitBodyLists( void );
void InitNewRenameDeleteButtons( void );
void InitConstraintList();
void InitConstraintTypeDlg();
void InitBodyLists();
void InitNewRenameDeleteButtons();
};
Loading

0 comments on commit e07c61f

Please sign in to comment.