[artoolkit-commits] artoolkit/util/mk_patt mk_patt.c,1.5,1.6
Optical marker tracking and overlay for augmented reality.
Brought to you by:
philip_lamb
From: Philip L. <phi...@us...> - 2005-09-15 00:53:12
|
Update of /cvsroot/artoolkit/artoolkit/util/mk_patt In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18250 Modified Files: mk_patt.c Log Message: Step 1 of cleanup. Index: mk_patt.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/mk_patt/mk_patt.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** mk_patt.c 28 Jul 2005 21:58:50 -0000 1.5 --- mk_patt.c 15 Sep 2005 00:53:03 -0000 1.6 *************** *** 1,13 **** #include <stdio.h> #include <stdlib.h> ! #if defined(_WIN32) ! #include <windows.h> ! #endif #ifndef __APPLE__ ! #include <GL/gl.h> ! #include <GL/glut.h> #else ! #include <OpenGL/gl.h> ! #include <GLUT/glut.h> #endif #include <AR/gsub.h> --- 1,41 ---- + /* + * + * This file is part of ARToolKit. + * + * ARToolKit is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * ARToolKit is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with ARToolKit; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + + // ============================================================================ + // Includes + // ============================================================================ + + #ifdef _WIN32 + # include <windows.h> + #endif + #include <math.h> #include <stdio.h> #include <stdlib.h> ! #include <string.h> #ifndef __APPLE__ ! # include <GL/glut.h> ! # ifdef GL_VERSION_1_2 ! # include <GL/glext.h> ! # endif #else ! # include <GLUT/glut.h> ! # include <OpenGL/glext.h> #endif #include <AR/gsub.h> *************** *** 16,19 **** --- 44,51 ---- #include <AR/ar.h> + // ============================================================================ + // Global variables + // ============================================================================ + /* set up the video format globals */ |