summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Bergli Heier <snakebite@jvnv.net>2010-05-17 17:12:05 +0200
committerJon Bergli Heier <snakebite@jvnv.net>2010-05-17 17:12:05 +0200
commit8bd8089c1e7ca92401e829d28819a35c3061ebd9 (patch)
tree1f572d4c8e2b1f1f4c4ab9f03798fc35162ac029
parentad649cae2db89696341b55cc83c42c253fcdae77 (diff)
parentee4c9026e88b5251ece5f81b1101507f9408fa8a (diff)
Merge branch 'master' of ssh://git.jvnv.net/srv/git/gardiner
-rw-r--r--main.cpp16
1 files changed, 15 insertions, 1 deletions
diff --git a/main.cpp b/main.cpp
index aeee362..0d3a16a 100644
--- a/main.cpp
+++ b/main.cpp
@@ -180,6 +180,10 @@ int main(int, char**) {
}
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+ glViewport(-10, -10, 660, 740);
+ glScissor(0, 0, 640, 720);
+ glEnable(GL_SCISSOR_TEST);
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
@@ -220,7 +224,7 @@ int main(int, char**) {
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
- glOrtho(0, 100, 0, 100, 0, 10);
+ glOrtho(-10, 110, -10, 110, 0, 10);
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
@@ -243,7 +247,17 @@ int main(int, char**) {
glDisable(GL_TEXTURE_2D);
glUseProgram(0);
+
+ glDisable(GL_SCISSOR_TEST);
+ glViewport(640, 0, 640, 720);
+
+ glMatrixMode(GL_PROJECTION);
+ glLoadIdentity();
+ glOrtho(0, 100, 0, 100, 0, 10);
+ glMatrixMode(GL_MODELVIEW);
+ glLoadIdentity();
+
glColor4f(1, 1, 1, 1);
char s[0xff];