Miroirs/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad synced 2025-01-17 18:11:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Added option to keep adding pieces if the control key is pressed.

Browse source
This commit is contained in:
leo 2012-08-13 00:38:57 +00:00
parent f6e05e2030
commit 685826c9b5
7 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/defines.h
View file

@ -126,7 +126,7 @@ int stricmp(const char* str1, const char* str2);
#define LC_DRAW_SNAP_Z 0x0020 // Snap Z #define LC_DRAW_SNAP_Z 0x0020 // Snap Z
#define LC_DRAW_SNAP_XYZ (LC_DRAW_SNAP_X | LC_DRAW_SNAP_Y | LC_DRAW_SNAP_Z) #define LC_DRAW_SNAP_XYZ (LC_DRAW_SNAP_X | LC_DRAW_SNAP_Y | LC_DRAW_SNAP_Z)
#define LC_DRAW_GLOBAL_SNAP 0x0040 // Don't allow relative snap. #define LC_DRAW_GLOBAL_SNAP 0x0040 // Don't allow relative snap.
#define LC_DRAW_MOVE 0x0080 // Switch to move after insert //#define LC_DRAW_MOVE 0x0080 // Switch to move after insert
#define LC_DRAW_LOCK_X 0x0100 // Lock X #define LC_DRAW_LOCK_X 0x0100 // Lock X
#define LC_DRAW_LOCK_Y 0x0200 // Lock Y #define LC_DRAW_LOCK_Y 0x0200 // Lock Y
#define LC_DRAW_LOCK_Z 0x0400 // Lock Z #define LC_DRAW_LOCK_Z 0x0400 // Lock Z

5
common/project.cpp
View file

@ -266,7 +266,7 @@ void Project::LoadDefaults(bool cameras)
m_nDetail = Sys_ProfileLoadInt ("Default", "Detail", LC_DET_BRICKEDGES); m_nDetail = Sys_ProfileLoadInt ("Default", "Detail", LC_DET_BRICKEDGES);
SystemUpdateRenderingMode((m_nDetail & LC_DET_FAST) != 0); SystemUpdateRenderingMode((m_nDetail & LC_DET_FAST) != 0);
m_nAngleSnap = (unsigned short)Sys_ProfileLoadInt ("Default", "Angle", 30); m_nAngleSnap = (unsigned short)Sys_ProfileLoadInt ("Default", "Angle", 30);
m_nSnap = Sys_ProfileLoadInt ("Default", "Snap", LC_DRAW_SNAP_A | LC_DRAW_SNAP_X | LC_DRAW_SNAP_Y | LC_DRAW_SNAP_Z | LC_DRAW_MOVE); m_nSnap = Sys_ProfileLoadInt ("Default", "Snap", LC_DRAW_SNAP_A | LC_DRAW_SNAP_X | LC_DRAW_SNAP_Y | LC_DRAW_SNAP_Z);
SystemUpdateSnap(m_nSnap); SystemUpdateSnap(m_nSnap);
m_nMoveSnap = 0x0304; m_nMoveSnap = 0x0304;
SystemUpdateSnap(m_nMoveSnap, m_nAngleSnap); SystemUpdateSnap(m_nMoveSnap, m_nAngleSnap);
@ -7771,7 +7771,8 @@ void Project::OnLeftButtonDown(View* view, int x, int y, bool bControl, bool bSh
SystemPieceComboAdd(m_pCurPiece->m_strDescription); SystemPieceComboAdd(m_pCurPiece->m_strDescription);
SystemUpdateFocus(pPiece); SystemUpdateFocus(pPiece);
SetAction(LC_ACTION_SELECT); if (!bControl)
SetAction(LC_ACTION_SELECT);
} }
else if (Action == LC_ACTION_LIGHT) else if (Action == LC_ACTION_LIGHT)
{ {

2
version.mk
View file

@ -1,5 +1,5 @@
MAJOR := 0 MAJOR := 0
MINOR := 77 MINOR := 78
PATCHLVL := 0 PATCHLVL := 0
VERSIONTAG := VERSIONTAG :=
VERSION := $(MAJOR).$(MINOR).$(PATCHLVL) VERSION := $(MAJOR).$(MINOR).$(PATCHLVL)

5
win/LeoCAD.rc
View file

@ -856,8 +856,7 @@ BEGIN
EDITTEXT IDC_AIDDLG_ANGLE,63,105,24,12,ES_AUTOHSCROLL EDITTEXT IDC_AIDDLG_ANGLE,63,105,24,12,ES_AUTOHSCROLL
LTEXT "degrees",IDC_STATIC,91,107,27,8 LTEXT "degrees",IDC_STATIC,91,107,27,8
CONTROL "Don't allow relative snap",IDC_AIDDLG_GLOBAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,145,11,130,8 CONTROL "Don't allow relative snap",IDC_AIDDLG_GLOBAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,145,11,130,8
CONTROL "Switch to move after inserting",IDC_AIDDLG_MOVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,145,27,130,8 CONTROL "Fixed direction keys",IDC_AIDDLG_FIXEDKEYS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,145,27,130,8
CONTROL "Fixed direction keys",IDC_AIDDLG_FIXEDKEYS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,145,43,130,8
CONTROL "Lock X",IDC_AIDDLG_LOCKX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,145,59,130,8 CONTROL "Lock X",IDC_AIDDLG_LOCKX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,145,59,130,8
CONTROL "Lock Y",IDC_AIDDLG_LOCKY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,145,75,130,8 CONTROL "Lock Y",IDC_AIDDLG_LOCKY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,145,75,130,8
CONTROL "Lock Z",IDC_AIDDLG_LOCKZ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,145,91,130,8 CONTROL "Lock Z",IDC_AIDDLG_LOCKZ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,145,91,130,8
@ -1733,7 +1732,7 @@ END
STRINGTABLE STRINGTABLE
BEGIN BEGIN
ID_ACTION_SELECT "Select objects (hold CTRL down or drag the mouse to select multiple objects)\nSelect" ID_ACTION_SELECT "Select objects (hold CTRL down or drag the mouse to select multiple objects)\nSelect"
ID_ACTION_INSERT "Add pieces to the project\nInsert" ID_ACTION_INSERT "Add pieces to the project (hold CTRL down to keep adding pieces)\nInsert"
ID_ACTION_LIGHT "Add a positional light source\nPositional Light" ID_ACTION_LIGHT "Add a positional light source\nPositional Light"
ID_ACTION_SPOTLIGHT "Add a spotlight\nSpotlight" ID_ACTION_SPOTLIGHT "Add a spotlight\nSpotlight"
ID_ACTION_CAMERA "Create a camera\nCamera" ID_ACTION_CAMERA "Create a camera\nCamera"

4
win/Prefpage.cpp
View file

@ -201,7 +201,6 @@ CPreferencesDrawing::CPreferencesDrawing() : CPropertyPage(CPreferencesDrawing::
m_bLockX = FALSE; m_bLockX = FALSE;
m_bLockY = FALSE; m_bLockY = FALSE;
m_bLockZ = FALSE; m_bLockZ = FALSE;
m_bMove = FALSE;
m_bSnapA = FALSE; m_bSnapA = FALSE;
m_bSnapX = FALSE; m_bSnapX = FALSE;
m_bSnapY = FALSE; m_bSnapY = FALSE;
@ -228,7 +227,6 @@ void CPreferencesDrawing::DoDataExchange(CDataExchange* pDX)
DDX_Check(pDX, IDC_AIDDLG_LOCKX, m_bLockX); DDX_Check(pDX, IDC_AIDDLG_LOCKX, m_bLockX);
DDX_Check(pDX, IDC_AIDDLG_LOCKY, m_bLockY); DDX_Check(pDX, IDC_AIDDLG_LOCKY, m_bLockY);
DDX_Check(pDX, IDC_AIDDLG_LOCKZ, m_bLockZ); DDX_Check(pDX, IDC_AIDDLG_LOCKZ, m_bLockZ);
DDX_Check(pDX, IDC_AIDDLG_MOVE, m_bMove);
DDX_Check(pDX, IDC_AIDDLG_SNAPA, m_bSnapA); DDX_Check(pDX, IDC_AIDDLG_SNAPA, m_bSnapA);
DDX_Check(pDX, IDC_AIDDLG_SNAPX, m_bSnapX); DDX_Check(pDX, IDC_AIDDLG_SNAPX, m_bSnapX);
DDX_Check(pDX, IDC_AIDDLG_SNAPY, m_bSnapY); DDX_Check(pDX, IDC_AIDDLG_SNAPY, m_bSnapY);
@ -256,7 +254,6 @@ void CPreferencesDrawing::SetOptions(unsigned long dwSnap, unsigned short nAngle
m_bLockX = (dwSnap & LC_DRAW_LOCK_X) != 0; m_bLockX = (dwSnap & LC_DRAW_LOCK_X) != 0;
m_bLockY = (dwSnap & LC_DRAW_LOCK_Y) != 0; m_bLockY = (dwSnap & LC_DRAW_LOCK_Y) != 0;
m_bLockZ = (dwSnap & LC_DRAW_LOCK_Z) != 0; m_bLockZ = (dwSnap & LC_DRAW_LOCK_Z) != 0;
m_bMove = (dwSnap & LC_DRAW_MOVE) != 0;
m_bSnapA = (dwSnap & LC_DRAW_SNAP_A) != 0; m_bSnapA = (dwSnap & LC_DRAW_SNAP_A) != 0;
m_bSnapX = (dwSnap & LC_DRAW_SNAP_X) != 0; m_bSnapX = (dwSnap & LC_DRAW_SNAP_X) != 0;
m_bSnapY = (dwSnap & LC_DRAW_SNAP_Y) != 0; m_bSnapY = (dwSnap & LC_DRAW_SNAP_Y) != 0;
@ -277,7 +274,6 @@ void CPreferencesDrawing::GetOptions(unsigned long* dwSnap, unsigned short* nAng
if (m_bLockX) *dwSnap |= LC_DRAW_LOCK_X; if (m_bLockX) *dwSnap |= LC_DRAW_LOCK_X;
if (m_bLockY) *dwSnap |= LC_DRAW_LOCK_Y; if (m_bLockY) *dwSnap |= LC_DRAW_LOCK_Y;
if (m_bLockZ) *dwSnap |= LC_DRAW_LOCK_Z; if (m_bLockZ) *dwSnap |= LC_DRAW_LOCK_Z;
if (m_bMove) *dwSnap |= LC_DRAW_MOVE;
if (m_bSnapA) *dwSnap |= LC_DRAW_SNAP_A; if (m_bSnapA) *dwSnap |= LC_DRAW_SNAP_A;
if (m_bSnapX) *dwSnap |= LC_DRAW_SNAP_X; if (m_bSnapX) *dwSnap |= LC_DRAW_SNAP_X;
if (m_bSnapY) *dwSnap |= LC_DRAW_SNAP_Y; if (m_bSnapY) *dwSnap |= LC_DRAW_SNAP_Y;

1
win/Prefpage.h
View file

@ -125,7 +125,6 @@ public:
BOOL m_bLockX; BOOL m_bLockX;
BOOL m_bLockY; BOOL m_bLockY;
BOOL m_bLockZ; BOOL m_bLockZ;
BOOL m_bMove;
BOOL m_bSnapA; BOOL m_bSnapA;
BOOL m_bSnapX; BOOL m_bSnapX;
BOOL m_bSnapY; BOOL m_bSnapY;

4
win/config.h
View file

@ -6,10 +6,10 @@
#define _CONFIG_H_ #define _CONFIG_H_
#define LC_VERSION_MAJOR 0 #define LC_VERSION_MAJOR 0
#define LC_VERSION_MINOR 77 #define LC_VERSION_MINOR 78
#define LC_VERSION_PATCH 0 #define LC_VERSION_PATCH 0
#define LC_VERSION_OSNAME "Windows" #define LC_VERSION_OSNAME "Windows"
#define LC_VERSION_TEXT "0.77" #define LC_VERSION_TEXT "0.78"
#define LC_VERSION_TAG "" #define LC_VERSION_TAG ""
#define LC_INSTALL_PREFIX "C:\\leocad" #define LC_INSTALL_PREFIX "C:\\leocad"
#define LC_POINTER_TO_INT(p) ((lcint32)(p)) #define LC_POINTER_TO_INT(p) ((lcint32)(p))