it's actually not a camera demo. call it video-demo

3 years ago · 77ca9c31fa
parent 2690968d08
commit 77ca9c31fa
3 changed files with 3 additions and 13 deletions
--- a/6
+++ b/6
@ -36,15 +36,15 @@ export LIBS

 dirs:
 	${MAKE} -C src/tetra/ ${MAKEFLAGS} CXX=${CXX} ${MAKECMDGOALS}
-	${MAKE} -C src/camera/ ${MAKEFLAGS} CXX=${CXX} ${MAKECMDGOALS}
+	${MAKE} -C src/video/ ${MAKEFLAGS} CXX=${CXX} ${MAKECMDGOALS}

 debian-release:
 	${MAKE} -C src/tetra/ ${MAKEFLAGS} CXX=${CXX} release
-	${MAKE} -C src/camera/ ${MAKEFLAGS} CXX=${CXX} release
+	${MAKE} -C src/video/ ${MAKEFLAGS} CXX=${CXX} release

 debian-clean:
 	${MAKE} -C src/tetra/ ${MAKEFLAGS} CXX=${CXX} clean
-	${MAKE} -C src/camera/ ${MAKEFLAGS} CXX=${CXX} clean
+	${MAKE} -C src/video/ ${MAKEFLAGS} CXX=${CXX} clean

 install: ${TARGET}
 	true
--- a/src/camera/Makefile
+++ b/src/camera/Makefile
--- a/src/camera/camera-demo.cpp
+++ b/src/camera/camera-demo.cpp
@ -57,16 +57,6 @@ void render() {
    glRotatef(1, 0, 1, 0);
    glClearColor(0.0f, 0.0f, 1.0f, 1.0f);

-    glColor3f(1.0, 1.0, 1.0);
-    glBegin(GL_LINES);
-    for (GLfloat i = -2.5; i <= 2.5; i += 0.25) {
-        glVertex3f(i, 0, 2.5);
-        glVertex3f(i, 0, -2.5);
-        glVertex3f(2.5, 0, i);
-        glVertex3f(-2.5, 0, i);
-    }
-    glEnd();
-
    glBegin(GL_TRIANGLE_STRIP);
        glColor3f(1, 1, 1);
        glVertex3f(0, 2, 0);