summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorleo2001-03-15 22:14:26 +0000
committerleo2001-03-15 22:14:26 +0000
commitb2d36aead724b2065c53e97dec396da2063eb4ac (patch)
tree47eb9c2a39cdb4992bcb9c79bf0f5a6ce6adf8b8
parent27d3c7f14501e648278d13996f75b2b8f0be5787 (diff)
Fixed drawing area borders not being drawn correctly.
git-svn-id: http://svn.leocad.org/trunk@254 c7d43263-9d01-0410-8a33-9dba5d9f93d6
-rw-r--r--common/project.cpp14
-rw-r--r--docs/CHANGES.txt3
2 files changed, 10 insertions, 7 deletions
diff --git a/common/project.cpp b/common/project.cpp
index e6751da..bc8baf9 100644
--- a/common/project.cpp
+++ b/common/project.cpp
@@ -2425,7 +2425,7 @@ void Project::RenderViewports(bool bBackground, bool bLines)
glOrtho(0, m_nViewX, 0, m_nViewY, -1, 1);
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
-// glTranslatef(0.375, 0.375, 0.0);
+ glTranslatef(0.375, 0.375, 0.0);
if (bBackground)
{
@@ -2513,8 +2513,8 @@ void Project::RenderViewports(bool bBackground, bool bLines)
{
x = viewports[m_nViewportMode].dim[vp][0] * (float)m_nViewX;
y = viewports[m_nViewportMode].dim[vp][1] * (float)m_nViewY;
- w = viewports[m_nViewportMode].dim[vp][2] * (float)m_nViewX;
- h = viewports[m_nViewportMode].dim[vp][3] * (float)m_nViewY;
+ w = viewports[m_nViewportMode].dim[vp][2] * (float)(m_nViewX - 1);
+ h = viewports[m_nViewportMode].dim[vp][3] * (float)(m_nViewY - 1);
float l = x+3, t = y+h-6;
for (const char* p = m_pViewCameras[vp]->GetName(); *p; p++)
@@ -2551,8 +2551,8 @@ void Project::RenderViewports(bool bBackground, bool bLines)
x = viewports[m_nViewportMode].dim[vp][0] * (float)m_nViewX;
y = viewports[m_nViewportMode].dim[vp][1] * (float)m_nViewY;
- w = viewports[m_nViewportMode].dim[vp][2] * (float)m_nViewX;
- h = viewports[m_nViewportMode].dim[vp][3] * (float)m_nViewY;
+ w = viewports[m_nViewportMode].dim[vp][2] * (float)(m_nViewX - 1);
+ h = viewports[m_nViewportMode].dim[vp][3] * (float)(m_nViewY - 1);
glBegin(GL_LINE_LOOP);
glVertex2f(x, y);
@@ -2564,8 +2564,8 @@ void Project::RenderViewports(bool bBackground, bool bLines)
x = viewports[m_nViewportMode].dim[m_nActiveViewport][0] * (float)m_nViewX;
y = viewports[m_nViewportMode].dim[m_nActiveViewport][1] * (float)m_nViewY;
- w = viewports[m_nViewportMode].dim[m_nActiveViewport][2] * (float)m_nViewX;
- h = viewports[m_nViewportMode].dim[m_nActiveViewport][3] * (float)m_nViewY;
+ w = viewports[m_nViewportMode].dim[m_nActiveViewport][2] * (float)(m_nViewX - 1);
+ h = viewports[m_nViewportMode].dim[m_nActiveViewport][3] * (float)(m_nViewY - 1);
glColor3f(1.0f, 0, 0);
glBegin(GL_LINE_LOOP);
diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index f133920..937d8f2 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -1,5 +1,8 @@
This is a changelog for developers only, not for ordinary users.
+15/03/2001
+ - Fixed drawing area border not being drawn correctly.
+
13/03/2001
- Fixed texture font not visible on some video cards.