caiyu/solvespace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Instead of a "force parallel projection" menu item that's on by

Browse Source 
default, let's do a "use perspective projection" item that's off by
default. Same meaning, but less confusion.

[git-p4: depot-paths = "//depot/solvespace/": change = 2132]
This commit is contained in:
Jonathan Westhues 2010-05-02 21:15:28 -08:00
parent 0246add3e9
commit 01ecb986f4
5 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
confscreen.cpp
View File

@ -346,9 +346,9 @@ bool TextWindow::EditControlDoneForConfiguration(char *s) {
} }
case EDIT_CAMERA_TANGENT: { case EDIT_CAMERA_TANGENT: {
SS.cameraTangent = (min(2, max(0, atof(s))))/1000.0; SS.cameraTangent = (min(2, max(0, atof(s))))/1000.0;
if(SS.forceParallelProj) { if(!SS.usePerspectiveProj) {
Message("The perspective factor will have no effect until you " Message("The perspective factor will have no effect until you "
"disable View -> Force Parallel Projection."); "enable View -> Use Perspective Projection.");
} }
InvalidateGraphics(); InvalidateGraphics();
break; break;

8
graphicswin.cpp
View File

@ -58,7 +58,7 @@ const GraphicsWindow::MenuEntry GraphicsWindow::menu[] = {
{ 1, "&Center View At Point\tF4", MNU_CENTER_VIEW, F(4), mView }, { 1, "&Center View At Point\tF4", MNU_CENTER_VIEW, F(4), mView },
{ 1, NULL, 0, NULL }, { 1, NULL, 0, NULL },
{ 1, "Show Snap &Grid\t>", MNU_SHOW_GRID, '.'|S, mView }, { 1, "Show Snap &Grid\t>", MNU_SHOW_GRID, '.'|S, mView },
{ 1, "Force &Parallel Projection\t`", MNU_PARALLEL_PROJ, '`', mView }, { 1, "Use &Perspective Projection\t`", MNU_PERSPECTIVE_PROJ,'`', mView },
{ 1, NULL, 0, NULL }, { 1, NULL, 0, NULL },
{ 1, "Show Text &Window\tTab", MNU_SHOW_TEXT_WND, '\t', mView }, { 1, "Show Text &Window\tTab", MNU_SHOW_TEXT_WND, '\t', mView },
{ 1, "Show &Toolbar", MNU_SHOW_TOOLBAR, 0, mView }, { 1, "Show &Toolbar", MNU_SHOW_TOOLBAR, 0, mView },
@ -361,8 +361,8 @@ void GraphicsWindow::MenuView(int id) {
InvalidateGraphics(); InvalidateGraphics();
break; break;
case MNU_PARALLEL_PROJ: case MNU_PERSPECTIVE_PROJ:
SS.forceParallelProj = !SS.forceParallelProj; SS.usePerspectiveProj = !SS.usePerspectiveProj;
if(SS.cameraTangent < 1e-6) { if(SS.cameraTangent < 1e-6) {
Error("The perspective factor is set to zero, so the view will " Error("The perspective factor is set to zero, so the view will "
"always be a parallel projection.\n\n" "always be a parallel projection.\n\n"
@ -547,7 +547,7 @@ void GraphicsWindow::EnsureValidActives(void) {
CheckMenuById(MNU_SHOW_TEXT_WND, SS.GW.showTextWindow); CheckMenuById(MNU_SHOW_TEXT_WND, SS.GW.showTextWindow);
CheckMenuById(MNU_SHOW_TOOLBAR, SS.showToolbar); CheckMenuById(MNU_SHOW_TOOLBAR, SS.showToolbar);
CheckMenuById(MNU_PARALLEL_PROJ, SS.forceParallelProj); CheckMenuById(MNU_PERSPECTIVE_PROJ, SS.usePerspectiveProj);
CheckMenuById(MNU_SHOW_GRID, SS.GW.showSnapGrid); CheckMenuById(MNU_SHOW_GRID, SS.GW.showSnapGrid);
if(change) SS.later.showTW = true; if(change) SS.later.showTW = true;

6
solvespace.cpp
View File

@ -114,10 +114,6 @@ void SolveSpace::Init(char *cmdLine) {
// configuration file, but we will automatically load those as we need // configuration file, but we will automatically load those as we need
// them. // them.
// The factory default settings include a non-zero perspective factor,
// but we'll default to that off.
forceParallelProj = true;
// Start with either an empty file, or the file specified on the // Start with either an empty file, or the file specified on the
// command line. // command line.
NewFile(); NewFile();
@ -253,7 +249,7 @@ double SolveSpace::ChordTolMm(void) {
} }
double SolveSpace::CameraTangent(void) { double SolveSpace::CameraTangent(void) {
if(forceParallelProj) { if(!usePerspectiveProj) {
return 0; return 0;
} else { } else {
return cameraTangent; return cameraTangent;

2
solvespace.h
View File

@ -649,7 +649,7 @@ public:
char *UnitName(void); char *UnitName(void);
double MmPerUnit(void); double MmPerUnit(void);
double ChordTolMm(void); double ChordTolMm(void);
bool forceParallelProj; bool usePerspectiveProj;
double CameraTangent(void); double CameraTangent(void);
// The platform-dependent code calls this before entering the msg loop // The platform-dependent code calls this before entering the msg loop

2
ui.h
View File

@ -301,7 +301,7 @@ public:
MNU_ZOOM_OUT, MNU_ZOOM_OUT,
MNU_ZOOM_TO_FIT, MNU_ZOOM_TO_FIT,
MNU_SHOW_GRID, MNU_SHOW_GRID,
MNU_PARALLEL_PROJ, MNU_PERSPECTIVE_PROJ,
MNU_ONTO_WORKPLANE, MNU_ONTO_WORKPLANE,
MNU_NEAREST_ORTHO, MNU_NEAREST_ORTHO,
MNU_NEAREST_ISO, MNU_NEAREST_ISO,