artoolkit-commits Mailing List for ARToolKit
Optical marker tracking and overlay for augmented reality.
Brought to you by:
philip_lamb
Menu
▾
▴
artoolkit-commits — Log of code commits to the ARToolKit repository
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(65) |
Dec
(32) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
|
Feb
(5) |
Mar
(15) |
Apr
(22) |
May
|
Jun
(9) |
Jul
(108) |
Aug
(42) |
Sep
(62) |
Oct
(5) |
Nov
|
Dec
(4) |
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
(38) |
May
(27) |
Jun
(58) |
Jul
(8) |
Aug
(11) |
Sep
(51) |
Oct
(15) |
Nov
(12) |
Dec
(3) |
| 2007 |
Jan
(25) |
Feb
(6) |
Mar
(8) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(13) |
Sep
(1) |
Oct
(1) |
Nov
(2) |
Dec
|
| 2008 |
Jan
(2) |
Feb
(3) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
(20) |
Sep
(5) |
Oct
|
Nov
|
Dec
(2) |
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
|
From: <ret...@us...> - 2012-09-26 14:41:23
|
Revision: 314
http://artoolkit.svn.sourceforge.net/artoolkit/?rev=314&view=rev
Author: retrakker
Date: 2012-09-26 14:41:13 +0000 (Wed, 26 Sep 2012)
Log Message:
-----------
set default video format to RGB on OSX
Modified Paths:
--------------
branches/hartmut-pre-2_8/artoolkit/include/AR/config.h.in
branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoGStreamer/video.c
Modified: branches/hartmut-pre-2_8/artoolkit/include/AR/config.h.in
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/include/AR/config.h.in 2012-09-26 13:20:05 UTC (rev 313)
+++ branches/hartmut-pre-2_8/artoolkit/include/AR/config.h.in 2012-09-26 14:41:13 UTC (rev 314)
@@ -138,7 +138,7 @@
# undef AR_BIG_ENDIAN // Least significant Byte has greatest address in memory (i386).
# define AR_LITTLE_ENDIAN
# endif
-# define AR_DEFAULT_PIXEL_FORMAT AR_PIXEL_FORMAT_ARGB
+# define AR_DEFAULT_PIXEL_FORMAT AR_PIXEL_FORMAT_RGB
#endif
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoGStreamer/video.c
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoGStreamer/video.c 2012-09-26 13:20:05 UTC (rev 313)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoGStreamer/video.c 2012-09-26 14:41:13 UTC (rev 314)
@@ -196,7 +196,7 @@
} else {
config = NULL;
- g_printf ("Warning: no video config string supplied, using default!.\n");
+ g_printf ("Warning: no video config string supplied and ARTOOLKIT_CONFIG not set. Using default!.\n");
/* setting up defaults - we fall back to the TV test signal simulator */
config = GSTREAMER_TEST_LAUNCH_CFG;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ret...@us...> - 2012-09-26 13:20:16
|
Revision: 313
http://artoolkit.svn.sourceforge.net/artoolkit/?rev=313&view=rev
Author: retrakker
Date: 2012-09-26 13:20:05 +0000 (Wed, 26 Sep 2012)
Log Message:
-----------
quick fix to get ARToolKit working on newer versions of OSX which dont have Carbon and the respective capture in there anymore. GStreamer is mature enough on OSX and more flexible than running our own QtKit QtMovie mixture.
Modified Paths:
--------------
branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindGStreamer.cmake
branches/hartmut-pre-2_8/artoolkit/lib/SRC/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoGStreamer/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoGStreamer/video.c
Added Paths:
-----------
branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindGlib2.cmake
Modified: branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt 2010-11-16 22:33:10 UTC (rev 312)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt 2012-09-26 13:20:05 UTC (rev 313)
@@ -4,13 +4,8 @@
# (c) Copyright 2007-2008, HITLabNZ, Hartmut Seichter #
##############################################################################
-cmake_minimum_required(VERSION 2.4)
+cmake_minimum_required(VERSION 2.8)
-if(COMMAND cmake_policy)
- cmake_policy(SET CMP0003 NEW)
- cmake_policy(SET CMP0006 OLD)
-endif(COMMAND cmake_policy)
-
project(ARToolKit)
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeModules" ${CMAKE_MODULE_PATH})
@@ -65,8 +60,8 @@
# Apple presets
#
if (APPLE)
- set(CMAKE_OSX_ARCHITECTURES ppc;i386)
- set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.4u.sdk CACHE PATH "SDK to link against")
+# set(CMAKE_OSX_ARCHITECTURES i386)
+# set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.4u.sdk CACHE PATH "SDK to link against")
endif(APPLE)
#
Modified: branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindGStreamer.cmake
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindGStreamer.cmake 2010-11-16 22:33:10 UTC (rev 312)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindGStreamer.cmake 2012-09-26 13:20:05 UTC (rev 313)
@@ -5,44 +5,55 @@
# GSTREAMER_INCLUDE_DIR - the GStreamer include directory
# GSTREAMER_LIBRARIES - the libraries needed to use GStreamer
# GSTREAMER_DEFINITIONS - Compiler switches required for using GStreamer
+
+# Copyright (c) 2006, Tim Beaulen <tb...@gm...>
#
-# (c)2006, Tim Beaulen <tb...@gm...>
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
# TODO: Other versions --> GSTREAMER_X_Y_FOUND (Example: GSTREAMER_0_8_FOUND and GSTREAMER_0_10_FOUND etc)
-IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_INTERFACE_LIBRARY)
+IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)
# in cache already
SET(GStreamer_FIND_QUIETLY TRUE)
-ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_INTERFACE_LIBRARY)
+ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)
SET(GStreamer_FIND_QUIETLY FALSE)
-ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_INTERFACE_LIBRARY)
+ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)
IF (NOT WIN32)
# use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls
- INCLUDE(UsePkgConfig)
- PKGCONFIG(gstreamer-0.10 _GStreamerIncDir _GStreamerLinkDir _GStreamerLinkFlags _GStreamerCflags)
- #MESSAGE(STATUS "DEBUG: GStreamer include directory = ${_GStreamerIncDir}")
- #MESSAGE(STATUS "DEBUG: GStreamer link directory = ${_GStreamerLinkDir}")
- #MESSAGE(STATUS "DEBUG: GStreamer link flags = ${_GStreamerLinkFlags}")
- #MESSAGE(STATUS "DEBUG: GStreamer CFlags = ${_GStreamerCflags}")
- SET(GSTREAMER_DEFINITIONS ${_GStreamerCflags})
+ FIND_PACKAGE(PkgConfig)
+ PKG_CHECK_MODULES(PC_GSTREAMER QUIET gstreamer-0.10)
+ #MESSAGE(STATUS "DEBUG: GStreamer include directory = ${GSTREAMER_INCLUDE_DIRS}")
+ #MESSAGE(STATUS "DEBUG: GStreamer link directory = ${GSTREAMER_LIBRARY_DIRS}")
+ #MESSAGE(STATUS "DEBUG: GStreamer CFlags = ${GSTREAMER_CFLAGS_OTHER}")
+ SET(GSTREAMER_DEFINITIONS ${PC_GSTREAMER_CFLAGS_OTHER})
ENDIF (NOT WIN32)
FIND_PATH(GSTREAMER_INCLUDE_DIR gst/gst.h
PATHS
- ${_GStreamerIncDir}
+ ${PC_GSTREAMER_INCLUDEDIR}
+ ${PC_GSTREAMER_INCLUDE_DIRS}
#PATH_SUFFIXES gst
)
FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-0.10
PATHS
- ${_GStreamerLinkDir}
+ ${PC_GSTREAMER_LIBDIR}
+ ${PC_GSTREAMER_LIBRARY_DIRS}
)
+FIND_LIBRARY(GSTREAMER_BASE_LIBRARY NAMES gstbase-0.10
+ PATHS
+ ${PC_GSTREAMER_LIBDIR}
+ ${PC_GSTREAMER_LIBRARY_DIRS}
+ )
+
FIND_LIBRARY(GSTREAMER_INTERFACE_LIBRARY NAMES gstinterfaces-0.10
PATHS
- ${_GStreamerLinkDir}
+ ${PC_GSTREAMER_LIBDIR}
+ ${PC_GSTREAMER_LIBRARY_DIRS}
)
IF (GSTREAMER_INCLUDE_DIR)
@@ -63,21 +74,13 @@
MESSAGE(STATUS "GStreamer: WARNING: interface library not found")
ENDIF (GSTREAMER_INTERFACE_LIBRARY)
-IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_INTERFACE_LIBRARY)
- SET(GSTREAMER_FOUND TRUE)
-ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_INTERFACE_LIBRARY)
- SET(GSTREAMER_FOUND FALSE)
-ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_INTERFACE_LIBRARY)
+#INCLUDE(FindPackageHandleStandardArgs)
+#FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer DEFAULT_MSG GSTREAMER_LIBRARIES GSTREAMER_INCLUDE_DIR GSTREAMER_BASE_LIBRARY GSTREAMER_INTERFACE_LIBRARY)
-IF (GSTREAMER_FOUND)
- IF (NOT GStreamer_FIND_QUIETLY)
- MESSAGE(STATUS "Found GStreamer: ${GSTREAMER_LIBRARIES}")
- ENDIF (NOT GStreamer_FIND_QUIETLY)
-ELSE (GSTREAMER_FOUND)
- IF (GStreamer_FIND_REQUIRED)
- MESSAGE(SEND_ERROR "Could NOT find GStreamer")
- ENDIF (GStreamer_FIND_REQUIRED)
-ENDIF (GSTREAMER_FOUND)
+#MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIR GSTREAMER_LIBRARIES GSTREAMER_BASE_LIBRARY GSTREAMER_INTERFACE_LIBRARY)
-MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIR GSTREAMER_LIBRARIES GSTREAMER_INTERFACE_LIBRARY)
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer DEFAULT_MSG GSTREAMER_LIBRARIES GSTREAMER_INCLUDE_DIR GSTREAMER_BASE_LIBRARY)
+MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIR GSTREAMER_LIBRARIES GSTREAMER_BASE_LIBRARY)
+
Added: branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindGlib2.cmake
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindGlib2.cmake (rev 0)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindGlib2.cmake 2012-09-26 13:20:05 UTC (rev 313)
@@ -0,0 +1,48 @@
+# - Try to find the GLIB2 libraries
+# Once done this will define
+#
+# GLIB2_FOUND - system has glib2
+# GLIB2_INCLUDE_DIR - the glib2 include directory
+# GLIB2_LIBRARIES - glib2 library
+
+# Copyright (c) 2008 Laurent Montel, <mo...@kd...>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+
+if(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES)
+ # Already in cache, be silent
+ set(GLIB2_FIND_QUIETLY TRUE)
+endif(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES)
+
+if (NOT WIN32)
+ find_package(PkgConfig REQUIRED)
+ pkg_check_modules(PKG_GLIB REQUIRED glib-2.0)
+endif(NOT WIN32)
+
+find_path(GLIB2_MAIN_INCLUDE_DIR glib.h
+ PATH_SUFFIXES glib-2.0
+ PATHS ${PKG_GLIB_INCLUDE_DIRS} )
+
+# search the glibconfig.h include dir under the same root where the library is found
+find_library(GLIB2_LIBRARIES
+ NAMES glib-2.0
+ PATHS ${PKG_GLIB_LIBRARY_DIRS} )
+
+find_path(GLIB2_INTERNAL_INCLUDE_DIR glibconfig.h
+ PATH_SUFFIXES glib-2.0/include ../lib/glib-2.0/include
+ PATHS ${PKG_GLIB_INCLUDE_DIRS} ${PKG_GLIB_LIBRARIES} ${CMAKE_SYSTEM_LIBRARY_PATH})
+
+set(GLIB2_INCLUDE_DIR ${GLIB2_MAIN_INCLUDE_DIR})
+
+# not sure if this include dir is optional or required
+# for now it is optional
+if(GLIB2_INTERNAL_INCLUDE_DIR)
+ set(GLIB2_INCLUDE_DIR ${GLIB2_INCLUDE_DIR} ${GLIB2_INTERNAL_INCLUDE_DIR})
+endif(GLIB2_INTERNAL_INCLUDE_DIR)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(GLIB2 DEFAULT_MSG GLIB2_LIBRARIES GLIB2_MAIN_INCLUDE_DIR)
+
+mark_as_advanced(GLIB2_INCLUDE_DIR GLIB2_LIBRARIES)
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/CMakeLists.txt 2010-11-16 22:33:10 UTC (rev 312)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/CMakeLists.txt 2012-09-26 13:20:05 UTC (rev 313)
@@ -42,19 +42,22 @@
# Video
-if(APPLE)
- add_subdirectory(VideoMacOSX)
-endif(APPLE)
+# the old capture code doesnt work with OSX 10.6 and upwards
+
+#if(APPLE)
+# add_subdirectory(VideoMacOSX)
+#endif(APPLE)
+
if(WIN32)
add_subdirectory(VideoWin32DirectShow)
endif(WIN32)
-if(UNIX)
+if(UNIX OR APPLE)
if(USE_GSTREAMER)
add_subdirectory(VideoGStreamer)
endif(USE_GSTREAMER)
-endif(UNIX)
+endif()
if(OPENVRML_FOUND)
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoGStreamer/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoGStreamer/CMakeLists.txt 2010-11-16 22:33:10 UTC (rev 312)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoGStreamer/CMakeLists.txt 2012-09-26 13:20:05 UTC (rev 313)
@@ -1,21 +1,30 @@
SET(LIB_NAME ARvideo)
+find_package(Glib2)
+find_package(LibXml2)
+
INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/include
${GSTREAMER_INCLUDE_DIR}
+ ${GLIB2_INCLUDE_DIR}
+ ${LIBXML2_INCLUDE_DIR}
)
+
SET(HDRS ${CMAKE_SOURCE_DIR}/include/AR/video.h)
SET(SRCS video.c)
-ADD_DEFINITIONS(${GSTREAMER_DEFINITIONS})
+ADD_DEFINITIONS(${GSTREAMER_DEFINITIONS} ${LIBXML2_DEFINITIONS} )
ADD_LIBRARY(${LIB_NAME} SHARED ${HDRS} ${SRCS})
TARGET_LINK_LIBRARIES(${LIB_NAME}
AR
${GSTREAMER_LIBRARIES}
+ ${GSTREAMER_BASE_LIBRARY}
+ ${GLIB2_LIBRARIES}
+ ${LIBXML2_LIBRARIES}
)
set_target_properties(${LIB_NAME} PROPERTIES
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoGStreamer/video.c
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoGStreamer/video.c 2010-11-16 22:33:10 UTC (rev 312)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoGStreamer/video.c 2012-09-26 13:20:05 UTC (rev 313)
@@ -11,7 +11,7 @@
#include <AR/config.h>
#include <AR/ar.h>
#include <AR/video.h>
-
+
/* include GLib for GStreamer */
#include <glib.h>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jul...@us...> - 2010-11-16 22:33:19
|
Revision: 312
http://artoolkit.svn.sourceforge.net/artoolkit/?rev=312&view=rev
Author: julianlooser
Date: 2010-11-16 22:33:10 +0000 (Tue, 16 Nov 2010)
Log Message:
-----------
Modified Paths:
--------------
branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/src/DSVL_GraphManager.cpp
branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/src/DSVL_Helpers.cpp
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/src/DSVL_GraphManager.cpp
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/src/DSVL_GraphManager.cpp 2009-06-16 04:54:44 UTC (rev 311)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/src/DSVL_GraphManager.cpp 2010-11-16 22:33:10 UTC (rev 312)
@@ -1,218 +1,218 @@
-/* ========================================================================
-* PROJECT: DirectShow Video Processing Library (DSVL)
-* Version: 0.0.8c (10/26/2005)
-* ========================================================================
-* Author: Thomas Pintaric, Vienna University of Technology
-* Contact: pin...@im... http://ims.tuwien.ac.at/~thomas
-* =======================================================================
-*
-* Copyright (C) 2005 Vienna University of Technology
-*
-* This library 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.
-*
-* This program 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 this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*
-* For further information please contact Thomas Pintaric under
-* <pin...@im...> or write to Thomas Pintaric,
-* Vienna University of Technology, Favoritenstr. 9-11/E188/2, A-1040
-* Vienna, Austria.
-* ========================================================================*/
-
-
-#include "DSVL_GraphManager.h"
-
-#include "dshow.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include <objbase.h>
-#include <comutil.h>
-#include <atlbase.h>
-#include <process.h>
-
-#include "tinyxml.h"
-#include "DSVL_Helpers.h"
-
-//HANDLE g_ESync = CreateEvent(NULL,0,0,_T("global sync event"));
-//CCritSec g_CSec;
-
-#define MAX_GUID_STRING_LENGTH 72
-
-#ifdef _DEBUG
-#define DsVideoLibFileName "DSVLd.dll"
-#else
-#define DsVideoLibFileName "DSVL.dll"
-#endif
-
-
-BOOL APIENTRY DllMain( HANDLE hModule,
- DWORD ul_reason_for_call,
- LPVOID lpReserved
- )
-{
- switch (ul_reason_for_call)
- {
- case DLL_PROCESS_ATTACH:
- case DLL_THREAD_ATTACH:
- case DLL_THREAD_DETACH:
- case DLL_PROCESS_DETACH:
- break;
- }
- return TRUE;
-}
-
-// -----------------------------------------------------------------------------------------------------------------
-DS_MEDIA_FORMAT default_DS_MEDIA_FORMAT()
-{
- DS_MEDIA_FORMAT mf;
- ZeroMemory(&mf, sizeof(DS_MEDIA_FORMAT));
- mf.inputDevice = default_VIDEO_INPUT_DEVICE;
- mf.pixel_format = default_PIXELFORMAT;
- mf.inputFlags = 0; // clear flags
- mf.defaultInputFlags = true;
- return(mf);
-}
-
-// -----------------------------------------------------------------------------------------------------------------
-HRESULT MatchMediaTypes(IPin *pin, DS_MEDIA_FORMAT *mf, AM_MEDIA_TYPE *req_mt)
-// will overwrite req_mt with best match
-{
- HRESULT hr;
- CComPtr<IEnumMediaTypes> enum_mt;
- pin->EnumMediaTypes(&enum_mt);
- enum_mt->Reset();
- AM_MEDIA_TYPE *p_mt = NULL;
- while(S_OK == (hr = enum_mt->Next(1,&p_mt,NULL)))
- {
- VIDEOINFOHEADER *pvi = (VIDEOINFOHEADER *) p_mt->pbFormat;
- if( ((p_mt->subtype == mf->subtype) || (mf->subtype == GUID_NULL)) &&
- ((pvi->bmiHeader.biHeight == mf->biHeight) || (mf->biHeight == 0)) &&
- ((pvi->bmiHeader.biWidth == mf->biWidth) || (mf->biWidth == 0)) /*&&
- // jcl64: Don't try to match frame rate. Set it explicitly (see below)
- ((avg2fps(pvi->AvgTimePerFrame,3) == RoundDouble(mf->frameRate,3)) || (mf->frameRate == 0.0))*/
- )
- {
- // found a match!
- CopyMediaType(req_mt,p_mt);
-
- // ------------------
- // jcl64: Set the frame rate we want
- if (VIDEOINFOHEADER *pvi_req = (VIDEOINFOHEADER *) req_mt->pbFormat) {
- pvi_req->AvgTimePerFrame = fps2avg(RoundDouble(mf->frameRate,3));
- }
- // jcl64
- // ------------------
-
- DeleteMediaType(p_mt);
- return(S_OK);
- }
- else DeleteMediaType(p_mt);
- }
-
- return(E_FAIL);
-}
-
-// -----------------------------------------------------------------------------------------------------------------
-const char* VideoInputDeviceToString(VIDEO_INPUT_DEVICE device)
-{
- if(device > INVALID_INPUT_FILTER) return(NULL);
- else return(VIDEO_INPUT_DEVICE_names[device]);
-}
-
-// -----------------------------------------------------------------------------------------------------------------
-VIDEO_INPUT_DEVICE StringVideoInputDevice(char *device_str)
-{
- for(unsigned int i=0; i<INVALID_INPUT_FILTER; i++)
- if(strcmp(device_str,VIDEO_INPUT_DEVICE_names[i]) == 0) return((VIDEO_INPUT_DEVICE)i);
- return(INVALID_INPUT_FILTER);
-}
-
-
-// -----------------------------------------------------------------------------------------------------------------
-
-
-
-
-//###############################################################################################
-
-DSVL_GraphManager::DSVL_GraphManager() :
- captureGraphBuilder(NULL),
- graphBuilder(NULL),
- mediaControl(NULL),
- mediaEvent(NULL),
- mediaSeeking(NULL),
- cameraControl(NULL),
- droppedFrames(NULL),
- videoControl(NULL),
- videoProcAmp(NULL),
- sourceFilter(NULL),
- decoderFilter(NULL),
- rendererFilter(NULL),
- grabberFilter(NULL),
- capturePin(NULL),
- m_ESync(NULL),
- m_ESyncName("SyncEvent")
-{
-
- m_ESync = CreateEvent(NULL,TRUE,0,_T("SyncEvent"));
-
- media_format = default_DS_MEDIA_FORMAT();
- media_format.subtype = GUID_NULL;
-
- current_timestamp = 0;
+/* ========================================================================
+* PROJECT: DirectShow Video Processing Library (DSVL)
+* Version: 0.0.8c (10/26/2005)
+* ========================================================================
+* Author: Thomas Pintaric, Vienna University of Technology
+* Contact: pin...@im... http://ims.tuwien.ac.at/~thomas
+* =======================================================================
+*
+* Copyright (C) 2005 Vienna University of Technology
+*
+* This library 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.
+*
+* This program 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 this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+*
+* For further information please contact Thomas Pintaric under
+* <pin...@im...> or write to Thomas Pintaric,
+* Vienna University of Technology, Favoritenstr. 9-11/E188/2, A-1040
+* Vienna, Austria.
+* ========================================================================*/
+
+
+#include "DSVL_GraphManager.h"
+
+#include "dshow.h"
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include <objbase.h>
+#include <comutil.h>
+#include <atlbase.h>
+#include <process.h>
+
+#include "tinyxml.h"
+#include "DSVL_Helpers.h"
+
+//HANDLE g_ESync = CreateEvent(NULL,0,0,_T("global sync event"));
+//CCritSec g_CSec;
+
+#define MAX_GUID_STRING_LENGTH 72
+
+#ifdef _DEBUG
+#define DsVideoLibFileName "DSVLd.dll"
+#else
+#define DsVideoLibFileName "DSVL.dll"
+#endif
+
+
+BOOL APIENTRY DllMain( HANDLE hModule,
+ DWORD ul_reason_for_call,
+ LPVOID lpReserved
+ )
+{
+ switch (ul_reason_for_call)
+ {
+ case DLL_PROCESS_ATTACH:
+ case DLL_THREAD_ATTACH:
+ case DLL_THREAD_DETACH:
+ case DLL_PROCESS_DETACH:
+ break;
+ }
+ return TRUE;
+}
+
+// -----------------------------------------------------------------------------------------------------------------
+DS_MEDIA_FORMAT default_DS_MEDIA_FORMAT()
+{
+ DS_MEDIA_FORMAT mf;
+ ZeroMemory(&mf, sizeof(DS_MEDIA_FORMAT));
+ mf.inputDevice = default_VIDEO_INPUT_DEVICE;
+ mf.pixel_format = default_PIXELFORMAT;
+ mf.inputFlags = 0; // clear flags
+ mf.defaultInputFlags = true;
+ return(mf);
+}
+
+// -----------------------------------------------------------------------------------------------------------------
+HRESULT MatchMediaTypes(IPin *pin, DS_MEDIA_FORMAT *mf, AM_MEDIA_TYPE *req_mt)
+// will overwrite req_mt with best match
+{
+ HRESULT hr;
+ CComPtr<IEnumMediaTypes> enum_mt;
+ pin->EnumMediaTypes(&enum_mt);
+ enum_mt->Reset();
+ AM_MEDIA_TYPE *p_mt = NULL;
+ while(S_OK == (hr = enum_mt->Next(1,&p_mt,NULL)))
+ {
+ VIDEOINFOHEADER *pvi = (VIDEOINFOHEADER *) p_mt->pbFormat;
+ if( ((p_mt->subtype == mf->subtype) || (mf->subtype == GUID_NULL)) &&
+ ((pvi->bmiHeader.biHeight == mf->biHeight) || (mf->biHeight == 0)) &&
+ ((pvi->bmiHeader.biWidth == mf->biWidth) || (mf->biWidth == 0)) /*&&
+ // jcl64: Don't try to match frame rate. Set it explicitly (see below)
+ ((avg2fps(pvi->AvgTimePerFrame,3) == RoundDouble(mf->frameRate,3)) || (mf->frameRate == 0.0))*/
+ )
+ {
+ // found a match!
+ CopyMediaType(req_mt,p_mt);
+
+ // ------------------
+ // jcl64: Set the frame rate we want
+ if (VIDEOINFOHEADER *pvi_req = (VIDEOINFOHEADER *) req_mt->pbFormat) {
+ pvi_req->AvgTimePerFrame = fps2avg(RoundDouble(mf->frameRate,3));
+ }
+ // jcl64
+ // ------------------
+
+ DeleteMediaType(p_mt);
+ return(S_OK);
+ }
+ else DeleteMediaType(p_mt);
+ }
+
+ return(E_FAIL);
+}
+
+// -----------------------------------------------------------------------------------------------------------------
+const char* VideoInputDeviceToString(VIDEO_INPUT_DEVICE device)
+{
+ if(device > INVALID_INPUT_FILTER) return(NULL);
+ else return(VIDEO_INPUT_DEVICE_names[device]);
+}
+
+// -----------------------------------------------------------------------------------------------------------------
+VIDEO_INPUT_DEVICE StringVideoInputDevice(char *device_str)
+{
+ for(unsigned int i=0; i<INVALID_INPUT_FILTER; i++)
+ if(strcmp(device_str,VIDEO_INPUT_DEVICE_names[i]) == 0) return((VIDEO_INPUT_DEVICE)i);
+ return(INVALID_INPUT_FILTER);
+}
+
+
+// -----------------------------------------------------------------------------------------------------------------
+
+
+
+
+//###############################################################################################
+
+DSVL_GraphManager::DSVL_GraphManager() :
+ captureGraphBuilder(NULL),
+ graphBuilder(NULL),
+ mediaControl(NULL),
+ mediaEvent(NULL),
+ mediaSeeking(NULL),
+ cameraControl(NULL),
+ droppedFrames(NULL),
+ videoControl(NULL),
+ videoProcAmp(NULL),
+ sourceFilter(NULL),
+ decoderFilter(NULL),
+ rendererFilter(NULL),
+ grabberFilter(NULL),
+ capturePin(NULL),
+ m_ESync(NULL),
+ m_ESyncName("SyncEvent")
+{
+
+ m_ESync = CreateEvent(NULL,TRUE,0,_T("SyncEvent"));
+
+ media_format = default_DS_MEDIA_FORMAT();
+ media_format.subtype = GUID_NULL;
+
+ current_timestamp = 0;
sample_counter = 0;
-
-#ifdef _DEBUG
- /*
- DbgInitialise((struct HINSTANCE__ *) GetModuleHandle(DsVideoLibFileName));
- DbgSetModuleLevel(LOG_TRACE,5);
- DbgSetModuleLevel(LOG_MEMORY,5);
- DbgSetModuleLevel(LOG_ERROR,5);
- DbgSetModuleLevel(LOG_TIMING,5);
- DbgSetModuleLevel(LOG_LOCKING,5);
- */
-#endif
-
- m_bGraphIsInitialized = false;
-}
-
-// -----------------------------------------------------------------------------------------------------------------
-DSVL_GraphManager::~DSVL_GraphManager()
-{
- HRESULT hr;
- hr = ReleaseGraph();
-
- #ifdef _DEBUG
- //DbgOutString("*** DbgDumpObjectRegister:\n");
- //DbgDumpObjectRegister();
- #endif
-}
-
-// ----------------------------------------------------------------------------------------------------------
-HRESULT DSVL_GraphManager::GetCurrentMediaFormatEx(DS_MEDIA_FORMAT *mf)
-{
- CopyMemory(mf,&media_format,sizeof(DS_MEDIA_FORMAT));
- return(S_OK);
-}
-
-// ----------------------------------------------------------------------------------------------------------
-HRESULT DSVL_GraphManager::GetCurrentMediaFormat(LONG* frame_width,
- LONG *frame_height,
- double* frames_per_second,
- PIXELFORMAT* pixel_format)
+
+#ifdef _DEBUG
+ /*
+ DbgInitialise((struct HINSTANCE__ *) GetModuleHandle(DsVideoLibFileName));
+ DbgSetModuleLevel(LOG_TRACE,5);
+ DbgSetModuleLevel(LOG_MEMORY,5);
+ DbgSetModuleLevel(LOG_ERROR,5);
+ DbgSetModuleLevel(LOG_TIMING,5);
+ DbgSetModuleLevel(LOG_LOCKING,5);
+ */
+#endif
+
+ m_bGraphIsInitialized = false;
+}
+
+// -----------------------------------------------------------------------------------------------------------------
+DSVL_GraphManager::~DSVL_GraphManager()
{
+ HRESULT hr;
+ hr = ReleaseGraph();
+
+ #ifdef _DEBUG
+ //DbgOutString("*** DbgDumpObjectRegister:\n");
+ //DbgDumpObjectRegister();
+ #endif
+}
+
+// ----------------------------------------------------------------------------------------------------------
+HRESULT DSVL_GraphManager::GetCurrentMediaFormatEx(DS_MEDIA_FORMAT *mf)
+{
+ CopyMemory(mf,&media_format,sizeof(DS_MEDIA_FORMAT));
+ return(S_OK);
+}
+
+// ----------------------------------------------------------------------------------------------------------
+HRESULT DSVL_GraphManager::GetCurrentMediaFormat(LONG* frame_width,
+ LONG *frame_height,
+ double* frames_per_second,
+ PIXELFORMAT* pixel_format)
+{
DS_MEDIA_FORMAT mf;
HRESULT hr = GetCurrentMediaFormatEx(&mf);
if(FAILED(hr)) return(hr);
@@ -221,12 +221,12 @@
if(frames_per_second != NULL) *frames_per_second = mf.frameRate;
if(pixel_format != NULL) *pixel_format = mf.pixel_format;
return(S_OK);
-}
-
-// ----------------------------------------------------------------------------------------------------------
-HRESULT DSVL_GraphManager::EnableMemoryBuffer(unsigned int _maxConcurrentClients,
- unsigned int _allocatorBuffersPerClient)
-{
+}
+
+// ----------------------------------------------------------------------------------------------------------
+HRESULT DSVL_GraphManager::EnableMemoryBuffer(unsigned int _maxConcurrentClients,
+ unsigned int _allocatorBuffersPerClient)
+{
CAutoLock cObjectLock(&m_CSec);
HRESULT hr;
@@ -237,311 +237,311 @@
m_currentAllocatorBuffers = _maxConcurrentClients * _allocatorBuffersPerClient;
// ------
- CComPtr<IPin> sgPin = NULL;
- if(FAILED(hr=getPin(grabberFilter,PINDIR_INPUT,1,sgPin))) return(hr);
- CComPtr<IMemAllocator> pAllocator = NULL;
-
- CComPtr<IMemInputPin> sgmiPin = NULL;
- hr = sgPin->QueryInterface(IID_IMemInputPin, (void**)&sgmiPin);
- if (FAILED(hr)) return(hr);
-
- if(FAILED(hr = sgmiPin->GetAllocator(&pAllocator))) return(hr);
- if(FAILED(hr = pAllocator->Decommit())) return(hr);
- ALLOCATOR_PROPERTIES requestedProperties;
- ALLOCATOR_PROPERTIES actualProperties;
- pAllocator->GetProperties(&requestedProperties);
- if(requestedProperties.cBuffers != m_currentAllocatorBuffers)
- requestedProperties.cBuffers = m_currentAllocatorBuffers;
- hr = pAllocator->SetProperties(&requestedProperties,&actualProperties);
+ CComPtr<IPin> sgPin = NULL;
+ if(FAILED(hr=getPin(grabberFilter,PINDIR_INPUT,1,sgPin))) return(hr);
+ CComPtr<IMemAllocator> pAllocator = NULL;
+
+ CComPtr<IMemInputPin> sgmiPin = NULL;
+ hr = sgPin->QueryInterface(IID_IMemInputPin, (void**)&sgmiPin);
+ if (FAILED(hr)) return(hr);
+
+ if(FAILED(hr = sgmiPin->GetAllocator(&pAllocator))) return(hr);
+ if(FAILED(hr = pAllocator->Decommit())) return(hr);
+ ALLOCATOR_PROPERTIES requestedProperties;
+ ALLOCATOR_PROPERTIES actualProperties;
+ pAllocator->GetProperties(&requestedProperties);
+ if(requestedProperties.cBuffers != m_currentAllocatorBuffers)
+ requestedProperties.cBuffers = m_currentAllocatorBuffers;
+ hr = pAllocator->SetProperties(&requestedProperties,&actualProperties);
// ------
- sampleGrabber->SetBufferSamples(FALSE);
- sampleGrabber->SetOneShot(FALSE);
-
- CComPtr<ISampleGrabberCB> custom_sgCB;
- hr = QueryInterface(IID_ISampleGrabberCB, (void**)&custom_sgCB);
- if(FAILED(hr)) return(hr);
- hr = sampleGrabber->SetCallback(custom_sgCB,0);
- return(hr);
-}
-// ----------------------------------------------------------------------------------------------------------
-HRESULT DSVL_GraphManager::DisableMemoryBuffer()
-{
+ sampleGrabber->SetBufferSamples(FALSE);
+ sampleGrabber->SetOneShot(FALSE);
+
+ CComPtr<ISampleGrabberCB> custom_sgCB;
+ hr = QueryInterface(IID_ISampleGrabberCB, (void**)&custom_sgCB);
+ if(FAILED(hr)) return(hr);
+ hr = sampleGrabber->SetCallback(custom_sgCB,0);
+ return(hr);
+}
+// ----------------------------------------------------------------------------------------------------------
+HRESULT DSVL_GraphManager::DisableMemoryBuffer()
+{
CAutoLock cObjectLock(&m_CSec);
- if(mb.size() > 0)
- {
- std::map<unsigned long, MemoryBufferEntry>::iterator iter = mb.begin();
- while(iter != mb.end())
- {
- // ignore use_count
- (*iter).second.media_sample->Release();
- std::map<unsigned long, MemoryBufferEntry>::iterator iter2 =
- mb.erase(iter);
- iter = iter2;
- }
- }
+ if(mb.size() > 0)
+ {
+ std::map<unsigned long, MemoryBufferEntry>::iterator iter = mb.begin();
+ while(iter != mb.end())
+ {
+ // ignore use_count
+ (*iter).second.media_sample->Release();
+ std::map<unsigned long, MemoryBufferEntry>::iterator iter2 =
+ mb.erase(iter);
+ iter = iter2;
+ }
+ }
m_currentAllocatorBuffers = 0;
- return(sampleGrabber->SetCallback(NULL,0));
-}
-// ----------------------------------------------------------------------------------------------------------
-
-DWORD WINAPI TShowFilterProperties(LPVOID lpParameter)
-{
- return(DisplayFilterProperties((IBaseFilter*)lpParameter));
-}
-// ----------------------------------------------------------------------------------------------------------
-DWORD WINAPI TShowPinProperties(LPVOID lpParameter)
-{
- return(DisplayPinProperties((IPin*)lpParameter));
-}
-// ----------------------------------------------------------------------------------------------------------
-HRESULT DSVL_GraphManager::ShowFilterProperties(HWND hWnd)
-{
- DWORD dwThreadID;
- HANDLE hFPropThread = CreateThread(NULL,0,TShowFilterProperties,(LPVOID)sourceFilter,0,&dwThreadID);
- if(hFPropThread == NULL) return(E_FAIL);
- else return(S_OK);
-}
-// ----------------------------------------------------------------------------------------------------------
-HRESULT DSVL_GraphManager::ShowPinProperties(HWND hWnd)
-{
- DWORD dwThreadID;
- HANDLE hPPropThread = CreateThread(NULL,0,TShowPinProperties,(LPVOID)capturePin,0,&dwThreadID);
- if(hPPropThread == NULL) return(E_FAIL);
- else return(S_OK);
-}
-// ----------------------------------------------------------------------------------------------------------
-HRESULT DSVL_GraphManager::GetCameraParameterRange(CP_INTERFACE interface_type,
- long property,
- long *pMin,
- long *pMax,
- long *pSteppingDelta,
- long *pDefault,
- long *pCapsFlags)
-{
- switch(interface_type)
- {
- case(CP_CameraControl): if(!cameraControl) return(E_INVALIDARG);
- return(cameraControl->GetRange(property,pMin,pMax,pSteppingDelta,pDefault,pCapsFlags));
- break;
- case(CP_VideoProcAmp): if(!videoProcAmp) return(E_INVALIDARG);
- return(videoProcAmp->GetRange(property,pMin,pMax,pSteppingDelta,pDefault,pCapsFlags));
- break;
- }
-
- // unknown interface_type
- return(E_INVALIDARG);
-}
-
-// ----------------------------------------------------------------------------------------------------------
-HRESULT DSVL_GraphManager::GetCameraParameter(CP_INTERFACE interface_type, long Property, long *lValue, bool *bAuto)
-{
- HRESULT hr;
- long Flags = 0;
- hr = GetCameraParameter(interface_type,Property,lValue,&Flags);
- (*bAuto) = (Flags == GetCameraPropertyAUTOFlag(interface_type, true));
- return(hr);
-}
-
-HRESULT DSVL_GraphManager::GetCameraParameter(CP_INTERFACE interface_type, long Property, long *lValue, long *Flags)
-{
- switch(interface_type)
- {
- case(CP_CameraControl): if(!cameraControl) return(E_INVALIDARG);
- return(cameraControl->Get(Property,lValue,Flags));
- break;
- case(CP_VideoProcAmp): if(!videoProcAmp) return(E_INVALIDARG);
- return(videoProcAmp->Get(Property,lValue,Flags));
- break;
- }
-
- // unknown interface_type
- return(E_INVALIDARG);
-}
-
-// ----------------------------------------------------------------------------------------------------------
-HRESULT DSVL_GraphManager::SetCameraParameter(CP_INTERFACE interface_type, long Property, long lValue, bool bAuto)
-{
- return(SetCameraParameter(interface_type,Property,lValue,GetCameraPropertyAUTOFlag(interface_type, bAuto)));
-}
-
-// ----------------------------------------------------------------------------------------------------------
-HRESULT DSVL_GraphManager::SetCameraParameter(CP_INTERFACE interface_type, long Property, long lValue, long Flags)
-{
- switch(interface_type)
- {
- case(CP_CameraControl): if(!cameraControl) return(E_INVALIDARG);
- return(cameraControl->Set(Property,lValue,Flags));
- break;
- case(CP_VideoProcAmp): if(!videoProcAmp) return(E_INVALIDARG);
- return(videoProcAmp->Set(Property,lValue,Flags));
- break;
- }
-
- // unknown interface_type
- return(E_INVALIDARG);
-}
-// ----------------------------------------------------------------------------------------------------------
-
-long DSVL_GraphManager::GetCameraPropertyAUTOFlag(CP_INTERFACE interface_type, bool bAUTO)
-{
- switch(interface_type)
- {
- case(CP_CameraControl): return(bAUTO ? CameraControl_Flags_Auto : CameraControl_Flags_Manual);
- break;
- case(CP_VideoProcAmp): return(bAUTO ? VideoProcAmp_Flags_Auto : VideoProcAmp_Flags_Manual);
- break;
- }
-#ifdef _DEBUG
- ASSERT(false);
-#endif
- return(0x01);
-}
-
-// ----------------------------------------------------------------------------------------------------------
-HRESULT DSVL_GraphManager::SetCameraParameterToDefault(CP_INTERFACE interface_type, long Property, bool bAuto)
-{
- long min;
- long max;
- long steppingDelta;
- long defaultValue;
- long capsFlags;
-
- HRESULT hr;
- if(FAILED(hr = GetCameraParameterRange(interface_type,Property,&min,&max,&steppingDelta,&defaultValue,&capsFlags)))
- return(hr);
- if(FAILED(hr = SetCameraParameter(interface_type,Property,defaultValue,GetCameraPropertyAUTOFlag(interface_type,bAuto))))
- return(hr);
-
- return(S_OK);
-}
-
-// ----------------------------------------------------------------------------------------------------------
-HRESULT DSVL_GraphManager::ResetCameraParameters(bool bAuto)
-// bAuto: indicates if the property should be controlled automatically
-{
- int s = 0;
- if(cameraControl)
- {
- s += (int)SUCCEEDED(SetCameraParameterToDefault(CP_CameraControl, CameraControl_Pan, bAuto));
- s += (int)SUCCEEDED(SetCameraParameterToDefault(CP_CameraControl, CameraControl_Roll, bAuto));
- s += (int)SUCCEEDED(SetCameraParameterToDefault(CP_CameraControl, CameraControl_Tilt, bAuto));
- s += (int)SUCCEEDED(SetCameraParameterToDefault(CP_CameraControl, CameraControl_Zoom, bAuto));
- s += (int)SUCCEEDED(SetCameraParameterToDefault(CP_CameraControl, CameraControl_Exposure, bAuto));
- s += (int)SUCCEEDED(SetCameraParameterToDefault(CP_CameraControl, CameraControl_Iris, bAuto));
- s += (int)SUCCEEDED(SetCameraParameterToDefault(CP_CameraControl, CameraControl_Focus, bAuto));
- // impressive, but show me a camera that supports all of these options! :(
- }
- if(videoProcAmp)
- {
- s += (int)SUCCEEDED(SetCameraParameterToDefault(CP_VideoProcAmp, VideoProcAmp_Brightness, bAuto));
- s += (int)SUCCEEDED(SetCameraParameterToDefault(CP_VideoProcAmp, VideoProcAmp_Contrast, bAuto));
- s += (int)SUCCEEDED(SetCameraParameterToDefault(CP_VideoProcAmp, VideoProcAmp_Hue, bAuto));
- s += (int)SUCCEEDED(SetCameraParameterToDefault(CP_VideoProcAmp, VideoProcAmp_Saturation, bAuto));
- s += (int)SUCCEEDED(SetCameraParameterToDefault(CP_VideoProcAmp, VideoProcAmp_Sharpness, bAuto));
- s += (int)SUCCEEDED(SetCameraParameterToDefault(CP_VideoProcAmp, VideoProcAmp_Gamma, bAuto));
- s += (int)SUCCEEDED(SetCameraParameterToDefault(CP_VideoProcAmp, VideoProcAmp_ColorEnable, bAuto));
- s += (int)SUCCEEDED(SetCameraParameterToDefault(CP_VideoProcAmp, VideoProcAmp_WhiteBalance, bAuto));
- s += (int)SUCCEEDED(SetCameraParameterToDefault(CP_VideoProcAmp, VideoProcAmp_BacklightCompensation, bAuto));
- s += (int)SUCCEEDED(SetCameraParameterToDefault(CP_VideoProcAmp, VideoProcAmp_Gain, bAuto));
- }
-
- if(s==0) return(E_FAIL);
- else return(S_OK);
-}
-// ----------------------------------------------------------------------------------------------------------
-
-HRESULT DSVL_GraphManager::GetCameraParameterN(CP_INTERFACE interface_type, long Property, double *dValue)
-{
- HRESULT hr;
- long oldValue;
- long oldFlags;
- long min;
- long max;
- long steppingDelta;
- long defaultValue;
- long capsFlags;
-
- if(FAILED(hr = GetCameraParameter(interface_type,Property,&oldValue, &oldFlags))) return(hr);
- if(FAILED(hr = GetCameraParameterRange(interface_type,Property,&min,&max,&steppingDelta,&defaultValue,&capsFlags)))
- return(hr);
-
- (*dValue) = ((double)(oldValue-min))/((double)(max-min));
- return(S_OK);
-}
-// ----------------------------------------------------------------------------------------------------------
-HRESULT DSVL_GraphManager::SetCameraParameterN(CP_INTERFACE interface_type, long Property, double dValue)
-{
- HRESULT hr;
- long oldValue;
- long oldFlags;
- long min;
- long max;
- long steppingDelta;
- long defaultValue;
- long capsFlags;
-
- if(FAILED(hr = GetCameraParameter(interface_type,Property,&oldValue, &oldFlags))) return(hr);
- if(FAILED(hr = GetCameraParameterRange(interface_type,Property,&min,&max,&steppingDelta,&defaultValue,&capsFlags)))
- return(hr);
-
- long newValue = min + (long)((dValue*((double)(max-min))) / (double)steppingDelta) * steppingDelta;
- if(newValue == oldValue) return(S_FALSE);
- return(SetCameraParameter(interface_type,Property,newValue,GetCameraPropertyAUTOFlag(interface_type,false)));
-}
-
-// ----------------------------------------------------------------------------------------------------------
-HRESULT DSVL_GraphManager::Run()
-{
- HRESULT hr;
- if(FAILED(hr = mediaControl->Run())) return(hr);
- else return(S_OK);
-}
-
-// ----------------------------------------------------------------------------------------------------------
-
-HRESULT DSVL_GraphManager::Stop(bool forcedStop)
-{
- HRESULT hr;
-
- if(FAILED(hr = (forcedStop ? mediaControl->Stop() : mediaControl->StopWhenReady()))) return(hr);
- else return(S_OK);
-}
-
-// ----------------------------------------------------------------------------------------------------------
-
-HRESULT DSVL_GraphManager::Pause()
-{
- HRESULT hr;
- if(FAILED(hr = mediaControl->Pause())) return(hr);
- else return(S_OK);
-}
-
-// ----------------------------------------------------------------------------------------------------------
-
-HRESULT DSVL_GraphManager::GetCurrentTimestamp(REFERENCE_TIME *Timestamp)
-{
+ return(sampleGrabber->SetCallback(NULL,0));
+}
+// ----------------------------------------------------------------------------------------------------------
+
+DWORD WINAPI TShowFilterProperties(LPVOID lpParameter)
+{
+ return(DisplayFilterProperties((IBaseFilter*)lpParameter));
+}
+// ----------------------------------------------------------------------------------------------------------
+DWORD WINAPI TShowPinProperties(LPVOID lpParameter)
+{
+ return(DisplayPinProperties((IPin*)lpParameter));
+}
+// ----------------------------------------------------------------------------------------------------------
+HRESULT DSVL_GraphManager::ShowFilterProperties(HWND hWnd)
+{
+ DWORD dwThreadID;
+ HANDLE hFPropThread = CreateThread(NULL,0,TShowFilterProperties,(LPVOID)sourceFilter,0,&dwThreadID);
+ if(hFPropThread == NULL) return(E_FAIL);
+ else return(S_OK);
+}
+// ----------------------------------------------------------------------------------------------------------
+HRESULT DSVL_GraphManager::ShowPinProperties(HWND hWnd)
+{
+ DWORD dwThreadID;
+ HANDLE hPPropThread = CreateThread(NULL,0,TShowPinProperties,(LPVOID)capturePin,0,&dwThreadID);
+ if(hPPropThread == NULL) return(E_FAIL);
+ else return(S_OK);
+}
+// ----------------------------------------------------------------------------------------------------------
+HRESULT DSVL_GraphManager::GetCameraParameterRange(CP_INTERFACE interface_type,
+ long property,
+ long *pMin,
+ long *pMax,
+ long *pSteppingDelta,
+ long *pDefault,
+ long *pCapsFlags)
+{
+ switch(interface_type)
+ {
+ case(CP_CameraControl): if(!cameraControl) return(E_INVALIDARG);
+ return(cameraControl->GetRange(property,pMin,pMax,pSteppingDelta,pDefault,pCapsFlags));
+ break;
+ case(CP_VideoProcAmp): if(!videoProcAmp) return(E_INVALIDARG);
+ return(videoProcAmp->GetRange(property,pMin,pMax,pSteppingDelta,pDefault,pCapsFlags));
+ break;
+ }
+
+ // unknown interface_type
+ return(E_INVALIDARG);
+}
+
+// ----------------------------------------------------------------------------------------------------------
+HRESULT DSVL_GraphManager::GetCameraParameter(CP_INTERFACE interface_type, long Property, long *lValue, bool *bAuto)
+{
+ HRESULT hr;
+ long Flags = 0;
+ hr = GetCameraParameter(interface_type,Property,lValue,&Flags);
+ (*bAuto) = (Flags == GetCameraPropertyAUTOFlag(interface_type, true));
+ return(hr);
+}
+
+HRESULT DSVL_GraphManager::GetCameraParameter(CP_INTERFACE interface_type, long Property, long *lValue, long *Flags)
+{
+ switch(interface_type)
+ {
+ case(CP_CameraControl): if(!cameraControl) return(E_INVALIDARG);
+ return(cameraControl->Get(Property,lValue,Flags));
+ break;
+ case(CP_VideoProcAmp): if(!videoProcAmp) return(E_INVALIDARG);
+ return(videoProcAmp->Get(Property,lValue,Flags));
+ break;
+ }
+
+ // unknown interface_type
+ return(E_INVALIDARG);
+}
+
+// ----------------------------------------------------------------------------------------------------------
+HRESULT DSVL_GraphManager::SetCameraParameter(CP_INTERFACE interface_type, long Property, long lValue, bool bAuto)
+{
+ return(SetCameraParameter(interface_type,Property,lValue,GetCameraPropertyAUTOFlag(interface_type, bAuto)));
+}
+
+// ----------------------------------------------------------------------------------------------------------
+HRESULT DSVL_GraphManager::SetCameraParameter(CP_INTERFACE interface_type, long Property, long lValue, long Flags)
+{
+ switch(interface_type)
+ {
+ case(CP_CameraControl): if(!cameraControl) return(E_INVALIDARG);
+ return(cameraControl->Set(Property,lValue,Flags));
+ break;
+ case(CP_VideoProcAmp): if(!videoProcAmp) return(E_INVALIDARG);
+ return(videoProcAmp->Set(Property,lValue,Flags));
+ break;
+ }
+
+ // unknown interface_type
+ return(E_INVALIDARG);
+}
+// ----------------------------------------------------------------------------------------------------------
+
+long DSVL_GraphManager::GetCameraPropertyAUTOFlag(CP_INTERFACE interface_type, bool bAUTO)
+{
+ switch(interface_type)
+ {
+ case(CP_CameraControl): return(bAUTO ? CameraControl_Flags_Auto : CameraControl_Flags_Manual);
+ break;
+ case(CP_VideoProcAmp): return(bAUTO ? VideoProcAmp_Flags_Auto : VideoProcAmp_Flags_Manual);
+ break;
+ }
+#ifdef _DEBUG
+ ASSERT(false);
+#endif
+ return(0x01);
+}
+
+// ----------------------------------------------------------------------------------------------------------
+HRESULT DSVL_GraphManager::SetCameraParameterToDefault(CP_INTERFACE interface_type, long Property, bool bAuto)
+{
+ long min;
+ long max;
+ long steppingDelta;
+ long defaultValue;
+ long capsFlags;
+
+ HRESULT hr;
+ if(FAILED(hr = GetCameraParameterRange(interface_type,Property,&min,&max,&steppingDelta,&defaultValue,&capsFlags)))
+ return(hr);
+ if(FAILED(hr = SetCameraParameter(interface_type,Property,defaultValue,GetCameraPropertyAUTOFlag(interface_type,bAuto))))
+ return(hr);
+
+ return(S_OK);
+}
+
+// ----------------------------------------------------------------------------------------------------------
+HRESULT DSVL_GraphManager::ResetCameraParameters(bool bAuto)
+// bAuto: indicates if the property should be controlled automatically
+{
+ int s = 0;
+ if(cameraControl)
+ {
+ s += (int)SUCCEEDED(SetCameraParameterToDefault(CP_CameraControl, CameraControl_Pan, bAuto));
+ s += (int)SUCCEEDED(SetCameraParameterToDefault(CP_CameraControl, CameraControl_Roll, bAuto));
+ s += (int)SUCCEEDED(SetCameraParameterToDefault(CP_CameraControl, CameraControl_Tilt, bAuto));
+ s += (int)SUCCEEDED(SetCameraParameterToDefault(CP_CameraControl, CameraControl_Zoom, bAuto));
+ s += (int)SUCCEEDED(SetCameraParameterToDefault(CP_CameraControl, CameraControl_Exposure, bAuto));
+ s += (int)SUCCEEDED(SetCameraParameterToDefault(CP_CameraControl, CameraControl_Iris, bAuto));
+ s += (int)SUCCEEDED(SetCameraParameterToDefault(CP_CameraControl, CameraControl_Focus, bAuto));
+ // impressive, but show me a camera that supports all of these options! :(
+ }
+ if(videoProcAmp)
+ {
+ s += (int)SUCCEEDED(SetCameraParameterToDefault(CP_VideoProcAmp, VideoProcAmp_Brightness, bAuto));
+ s += (int)SUCCEEDED(SetCameraParameterToDefault(CP_VideoProcAmp, VideoProcAmp_Contrast, bAuto));
+ s += (int)SUCCEEDED(SetCameraParameterToDefault(CP_VideoProcAmp, VideoProcAmp_Hue, bAuto));
+ s += (int)SUCCEEDED(SetCameraParameterToDefault(CP_VideoProcAmp, VideoProcAmp_Saturation, bAuto));
+ s += (int)SUCCEEDED(SetCameraParameterToDefault(CP_VideoProcAmp, VideoProcAmp_Sharpness, bAuto));
+ s += (int)SUCCEEDED(SetCameraParameterToDefault(CP_VideoProcAmp, VideoProcAmp_Gamma, bAuto));
+ s += (int)SUCCEEDED(SetCameraParameterToDefault(CP_VideoProcAmp, VideoProcAmp_ColorEnable, bAuto));
+ s += (int)SUCCEEDED(SetCameraParameterToDefault(CP_VideoProcAmp, VideoProcAmp_WhiteBalance, bAuto));
+ s += (int)SUCCEEDED(SetCameraParameterToDefault(CP_VideoProcAmp, VideoProcAmp_BacklightCompensation, bAuto));
+ s += (int)SUCCEEDED(SetCameraParameterToDefault(CP_VideoProcAmp, VideoProcAmp_Gain, bAuto));
+ }
+
+ if(s==0) return(E_FAIL);
+ else return(S_OK);
+}
+// ----------------------------------------------------------------------------------------------------------
+
+HRESULT DSVL_GraphManager::GetCameraParameterN(CP_INTERFACE interface_type, long Property, double *dValue)
+{
+ HRESULT hr;
+ long oldValue;
+ long oldFlags;
+ long min;
+ long max;
+ long steppingDelta;
+ long defaultValue;
+ long capsFlags;
+
+ if(FAILED(hr = GetCameraParameter(interface_type,Property,&oldValue, &oldFlags))) return(hr);
+ if(FAILED(hr = GetCameraParameterRange(interface_type,Property,&min,&max,&steppingDelta,&defaultValue,&capsFlags)))
+ return(hr);
+
+ (*dValue) = ((double)(oldValue-min))/((double)(max-min));
+ return(S_OK);
+}
+// ----------------------------------------------------------------------------------------------------------
+HRESULT DSVL_GraphManager::SetCameraParameterN(CP_INTERFACE interface_type, long Property, double dValue)
+{
+ HRESULT hr;
+ long oldValue;
+ long oldFlags;
+ long min;
+ long max;
+ long steppingDelta;
+ long defaultValue;
+ long capsFlags;
+
+ if(FAILED(hr = GetCameraParameter(interface_type,Property,&oldValue, &oldFlags))) return(hr);
+ if(FAILED(hr = GetCameraParameterRange(interface_type,Property,&min,&max,&steppingDelta,&defaultValue,&capsFlags)))
+ return(hr);
+
+ long newValue = min + (long)((dValue*((double)(max-min))) / (double)steppingDelta) * steppingDelta;
+ if(newValue == oldValue) return(S_FALSE);
+ return(SetCameraParameter(interface_type,Property,newValue,GetCameraPropertyAUTOFlag(interface_type,false)));
+}
+
+// ----------------------------------------------------------------------------------------------------------
+HRESULT DSVL_GraphManager::Run()
+{
+ HRESULT hr;
+ if(FAILED(hr = mediaControl->Run())) return(hr);
+ else return(S_OK);
+}
+
+// ----------------------------------------------------------------------------------------------------------
+
+HRESULT DSVL_GraphManager::Stop(bool forcedStop)
+{
+ HRESULT hr;
+
+ if(FAILED(hr = (forcedStop ? mediaControl->Stop() : mediaControl->StopWhenReady()))) return(hr);
+ else return(S_OK);
+}
+
+// ----------------------------------------------------------------------------------------------------------
+
+HRESULT DSVL_GraphManager::Pause()
+{
+ HRESULT hr;
+ if(FAILED(hr = mediaControl->Pause())) return(hr);
+ else return(S_OK);
+}
+
+// ----------------------------------------------------------------------------------------------------------
+
+HRESULT DSVL_GraphManager::GetCurrentTimestamp(REFERENCE_TIME *Timestamp)
+{
CAutoLock cObjectLock(&m_CSec);
- *Timestamp = current_timestamp;
- return(S_OK);
-}
-
-REFERENCE_TIME DSVL_GraphManager::GetCurrentTimestamp()
-{
+ *Timestamp = current_timestamp;
+ return(S_OK);
+}
+
+REFERENCE_TIME DSVL_GraphManager::GetCurrentTimestamp()
+{
CAutoLock cObjectLock(&m_CSec);
- return(current_timestamp);
-}
-
-// ----------------------------------------------------------------------------------------------------------
-
-DWORD DSVL_GraphManager::WaitForNextSample(long dwMilliseconds)
-{
+ return(current_timestamp);
+}
+
+// ----------------------------------------------------------------------------------------------------------
+
+DWORD DSVL_GraphManager::WaitForNextSample(long dwMilliseconds)
+{
MSG uMsg;
memset(&uMsg,0,sizeof(uMsg));
bool b_ExitMainLoop = false;
-
+
do
{
DWORD dw = MsgWaitForMultipleObjectsEx(1,&m_ESync,dwMilliseconds,QS_ALLEVENTS,0);
@@ -562,38 +562,38 @@
DispatchMessage(&uMsg);
}
}
- } while(!b_ExitMainLoop);
-
+ } while(!b_ExitMainLoop);
+
return(WAIT_TIMEOUT); // ...whatever
-}
-
-
-HRESULT WINAPI DSVL_GraphManager::SampleCB(double SampleTime, IMediaSample *pSample)
-{
+}
+
+
+HRESULT WINAPI DSVL_GraphManager::SampleCB(double SampleTime, IMediaSample *pSample)
+{
CAutoLock cObjectLock(&m_CSec);
- if(mb.size() > 0) // constantly clean up (mb)
- {
- std::map<unsigned long, MemoryBufferEntry>::iterator iter = mb.begin();
- while(iter != mb.end())
- {
- if((*iter).second.use_count == 0)
- {
- (*iter).second.media_sample->Release();
- std::map<unsigned long, MemoryBufferEntry>::iterator iter2 =
- mb.erase(iter);
- iter = iter2;
- }
- else
+ if(mb.size() > 0) // constantly clean up (mb)
+ {
+ std::map<unsigned long, MemoryBufferEntry>::iterator iter = mb.begin();
+ while(iter != mb.end())
+ {
+ if((*iter).second.use_count == 0)
{
+ (*iter).second.media_sample->Release();
+ std::map<unsigned long, MemoryBufferEntry>::iterator iter2 =
+ mb.erase(iter);
+ iter = iter2;
+ }
+ else
+ {
iter++;
- }
- }
- }
-
- HRESULT hr;
- REFERENCE_TIME t_start, t_end;
- hr = pSample->GetMediaTime(&t_start,&t_end); // we just care about the start
- current_timestamp = t_start;
+ }
+ }
+ }
+
+ HRESULT hr;
+ REFERENCE_TIME t_start, t_end;
+ hr = pSample->GetMediaTime(&t_start,&t_end); // we just care about the start
+ current_timestamp = t_start;
sample_counter++;
MemoryBufferEntry mb_entry;
mb_entry.use_count = 0;
@@ -604,26 +604,26 @@
mb.insert(pair<unsigned long, MemoryBufferEntry>
(unsigned long(sample_counter),mb_entry));
-
- // flipping
- if(media_format.flipH || media_format.flipV)
- {
- BYTE *pBuffer;
- if(SUCCEEDED(pSample->GetPointer(&pBuffer)))
+
+ // flipping
+ if(media_format.flipH || media_format.flipV)
+ {
+ BYTE *pBuffer;
+ if(SUCCEEDED(pSample->GetPointer(&pBuffer)))
FlipImageRGB32(pBuffer,media_format.biWidth,media_format.biHeight,media_format.flipH,media_format.flipV);
}
- // --------
- SetEvent(m_ESync);
-
- return(S_OK);
-}
-
-HRESULT WINAPI DSVL_GraphManager::BufferCB(double sampleTimeSec, BYTE* bufferPtr, long bufferLength)
-{
- return(E_NOTIMPL);
-}
+ // --------
+ SetEvent(m_ESync);
+ return(S_OK);
+}
+HRESULT WINAPI DSVL_GraphManager::BufferCB(double sampleTimeSec, BYTE* bufferPtr, long bufferLength)
+{
+ return(E_NOTIMPL);
+}
+
+
HRESULT WINAPI DSVL_GraphManager::QueryInterface(REFIID iid, void** ppvObject )
{
// Return requested interface
@@ -660,61 +660,61 @@
}
-HRESULT DSVL_GraphManager::CheckoutMemoryBuffer(MemoryBufferHandle* pHandle,
- BYTE** Buffer,
- unsigned int *Width,
- unsigned int *Height,
- PIXELFORMAT* PixelFormat,
- REFERENCE_TIME* Timestamp)
-{
+HRESULT DSVL_GraphManager::CheckoutMemoryBuffer(MemoryBufferHandle* pHandle,
+ BYTE** Buffer,
+ unsigned int *Width,
+ unsigned int *Height,
+ PIXELFORMAT* PixelFormat,
+ REFERENCE_TIME* Timestamp)
+{
CAutoLock cObjectLock(&m_CSec);
HRESULT hr;
- std::map<unsigned long, MemoryBufferEntry>::iterator iter;
- iter = mb.find(sample_counter);
-
- if(iter == mb.end()) // i.e. (sample_counter == 0)
- return(E_INVALIDARG); // no buffer in memory
-
-
- (*iter).second.use_count++;
- if(Buffer != NULL)
- (*iter).second.media_sample->GetPointer(Buffer);
- if(Width != NULL)
- *Width = media_format.biWidth;
- if(Height != NULL)
- *Height = media_format.biHeight;
- if(PixelFormat != NULL)
- *PixelFormat = media_format.pixel_format;
- if(Timestamp != NULL)
- *Timestamp = (*iter).second.timestamp;
-
- pHandle->n = (*iter).first;
- pHandle->t = (*iter).second.timestamp;
- return(S_OK);
-}
-
-// ----------------------------------------------------------------------------------------------------------
-HRESULT DSVL_GraphManager::CheckinMemoryBuffer(MemoryBufferHandle Handle, bool ForceRelease)
-{
+ std::map<unsigned long, MemoryBufferEntry>::iterator iter;
+ iter = mb.find(sample_counter);
+
+ if(iter == mb.end()) // i.e. (sample_counter == 0)
+ return(E_INVALIDARG); // no buffer in memory
+
+
+ (*iter).second.use_count++;
+ if(Buffer != NULL)
+ (*iter).second.media_sample->GetPointer(Buffer);
+ if(Width != NULL)
+ *Width = media_format.biWidth;
+ if(Height != NULL)
+ *Height = media_format.biHeight;
+ if(PixelFormat != NULL)
+ *PixelFormat = media_format.pixel_format;
+ if(Timestamp != NULL)
+ *Timestamp = (*iter).second.timestamp;
+
+ pHandle->n = (*iter).first;
+ pHandle->t = (*iter).second.timestamp;
+ return(S_OK);
+}
+
+// ----------------------------------------------------------------------------------------------------------
+HRESULT DSVL_GraphManager::CheckinMemoryBuffer(MemoryBufferHandle Handle, bool ForceRelease)
+{
CAutoLock cObjectLock(&m_CSec);
- std::map<unsigned long, MemoryBufferEntry>::iterator iter;
- iter = mb.find(Handle.n);
- ASSERT(iter != mb.end());
+ std::map<unsigned long, MemoryBufferEntry>::iterator iter;
+ iter = mb.find(Handle.n);
+ ASSERT(iter != mb.end());
- if(ForceRelease) (*iter).second.use_count = 0;
+ if(ForceRelease) (*iter).second.use_count = 0;
else
{
if((*iter).second.use_count > 0)
(*iter).second.use_count--;
}
- return(S_OK);
-}
-
-
-HRESULT DSVL_GraphManager::ReleaseGraph()
+ return(S_OK);
+}
+
+
+HRESULT DSVL_GraphManager::ReleaseGraph()
{
CAutoLock cObjectLock(&m_CSec);
- if(!m_bGraphIsInitialized) return(E_FAIL); // call BuildGraph() first!
+ if(!m_bGraphIsInitialized) return(E_FAIL); // call BuildGraph() first!
HRESULT hr = mediaControl->Stop();
// Enumerate the filters in the graph.
@@ -754,22 +754,22 @@
mediaControl.Release();
graphBuilder.Release();
-
- if(captureGraphBuilder!=NULL) captureGraphBuilder.Release();
- if(mediaEvent!=NULL) mediaEvent.Release();
- if(mediaSeeking!=NULL) mediaSeeking.Release();
- if(cameraControl!=NULL) cameraControl.Release();
- if(droppedFrames!=NULL) droppedFrames.Release();
- if(videoControl!=NULL) videoControl.Release();
- if(videoProcAmp!=NULL) videoProcAmp.Release();
- if(sourceFilter!=NULL) sourceFilter.Release();
- if(capturePin!=NULL) capturePin.Release();
- if(decoderFilter!=NULL) decoderFilter.Release();
- if(rendererFilter!=NULL) rendererFilter.Release();
- if(grabberFilter!=NULL) grabberFilter.Release();
- if(sampleGrabber!=NULL) sampleGrabber.Release();
-
+ if(captureGraphBuilder!=NULL) captureGraphBuilder.Release();
+ if(mediaEvent!=NULL) mediaEvent.Release();
+ if(mediaSeeking!=NULL) mediaSeeking.Release();
+ if(cameraControl!=NULL) cameraControl.Release();
+ if(droppedFrames!=NULL) droppedFrames.Release();
+ if(videoControl!=NULL) videoControl.Release();
+ if(videoProcAmp!=NULL) videoProcAmp.Release();
+ if(sourceFilter!=NULL) sourceFilter.Release();
+ if(capturePin!=NULL) capturePin.Release();
+ if(decoderFilter!=NULL) decoderFilter.Release();
+ if(rendererFilter!=NULL) rendererFilter.Release();
+ if(grabberFilter!=NULL) grabberFilter.Release();
+ if(sampleGrabber!=NULL) sampleGrabber.Release();
+
+
#ifdef _DEBUG
RemoveFromRot(dwRegisterROT);
dwRegisterROT = 0;
@@ -781,101 +781,101 @@
}
-HRESULT DSVL_GraphManager::BuildGraphFromXMLString(char* xml_string)
+HRESULT DSVL_GraphManager::BuildGraphFromXMLString(char* xml_string)
{
TiXmlDocument xmlDoc;
xmlDoc.Parse(xml_string);
- if(xmlDoc.Error()) return(E_INVALIDARG);
+ if(xmlDoc.Error()) return(E_INVALIDARG);
TiXmlHandle xmlHandle(&xmlDoc);
return(BuildGraphFromXMLHandle(xmlHandle));
-}
-
-HRESULT DSVL_GraphManager::BuildGraphFromXMLFile(char* xml_filename)
+}
+
+HRESULT DSVL_GraphManager::BuildGraphFromXMLFile(char* xml_filename)
{
- TiXmlDocument xmlDoc(xml_filename);
+ TiXmlDocument xmlDoc(xml_filename);
if(!xmlDoc.LoadFile())
{
- char path[MAX_PATH];
- char* path_offset = NULL;
- if(SearchPath(NULL,_bstr_t(xml_filename),NULL,MAX_PATH,path,&path_offset) > 0)
- {
+ char path[MAX_PATH];
+ char* path_offset = NULL;
+ if(SearchPath(NULL,_bstr_t(xml_filename),NULL,MAX_PATH,path,&path_offset) > 0)
+ {
if(!xmlDoc.LoadFile(_bstr_t(path))) return(E_INVALIDARG);
}
- }
+ }
TiXmlHandle xmlHandle(&xmlDoc);
return(BuildGraphFromXMLHandle(xmlHandle));
-}
-
-
-
-
-
-HRESULT DSVL_GraphManager::BuildGraphFromXMLHandle(TiXmlHandle xml_h)
+}
+
+
+
+
+
+HRESULT DSVL_GraphManager::BuildGraphFromXMLHandle(TiXmlHandle xml_h)
{
- if(m_bGraphIsInitialized) return(E_FAIL); // call ReleaseGraph() first!
-
- DS_MEDIA_FORMAT mf = default_DS_MEDIA_FORMAT();
- mf.defaultInputFlags = false;
- mf.sourceFilterName = (LPWSTR) CoTaskMemAlloc(sizeof(wchar_t) * MAX_PATH);
- swprintf(mf.sourceFilterName, sizeof(wchar_t) * MAX_PATH,L"");
- //mf.ieee1394_id = (char*) CoTaskMemAlloc(sizeof(char) * MAX_PATH);
- //swprintf(mf.ieee1394_id, sizeof(wchar_t) * MAX_PATH,L"");
-
+ if(m_bGraphIsInitialized) return(E_FAIL); // call ReleaseGraph() first!
+
+ DS_MEDIA_FORMAT mf = default_DS_MEDIA_FORMAT();
+ mf.defaultInputFlags = false;
+ mf.sourceFilterName = (LPWSTR) CoTaskMemAlloc(sizeof(wchar_t) * MAX_PATH);
+ swprintf(mf.sourceFilterName, sizeof(wchar_t) * MAX_PATH,L"");
+ //mf.ieee1394_id = (char*) CoTaskMemAlloc(sizeof(char) * MAX_PATH);
+ //swprintf(mf.ieee1394_id, sizeof(wchar_t) * MAX_PATH,L"");
+
TiXmlHandle doc_handle(xml_h);
TiXmlElement* e_avi = doc_handle.FirstChild("dsvl_input").FirstChild("avi_file").Element();
TiXmlElement* e_camera = doc_handle.FirstChild("dsvl_input").FirstChild("camera").Element();
TiXmlElement* e_pixel_format = NULL;
- if(e_camera)
+ if(e_camera)
{
- mf.inputDevice = WDM_VIDEO_CAPTURE_FILTER;
+ mf.inputDevice = WDM_VIDEO_CAPTURE_FILTER;
- if(e_camera->Attribute("device_name") != NULL)
- {
- swprintf(mf.sourceFilterName, sizeof(wchar_t) * MAX_PATH,_bstr_t(e_camera->Attribute("device_name")));
- mf.isDeviceName = true;
+ if(e_camera->Attribute("device_name") != NULL)
+ {
+ swprintf(mf.sourceFilterName, sizeof(wchar_t) * MAX_PATH,_bstr_t(e_camera->Attribute("device_name")));
+ mf.isDeviceName = true;
mf.inputFlags |= WDM_MATCH_FILTER_NAME;
- }
- else if(e_camera->Attribute("friendly_name") != NULL)
+ }
+ else if(e_camera->Attribute("friendly_name") != NULL)
{
- swprintf(mf.sourceFilterName, sizeof(wchar_t) * MAX_PATH,_bstr_t(e_camera->Attribute("friendly_name")));
- mf.isDeviceName = false;
+ swprintf(mf.sourceFilterName, sizeof(wchar_t) * MAX_PATH,_bstr_t(e_camera->Attribute("friendly_name")));
+ mf.isDeviceName = false;
mf.inputFlags |= WDM_MATCH_FILTER_NAME;
- }
-
- if((e_camera->Attribute("show_format_dialog") != NULL) &&
- (_strnicmp("true",_bstr_t(e_camera->Attribute("show_format_dialog")),strlen("true")) == 0))
- mf.inputFlags |= WDM_SHOW_FORMAT_DIALOG;
+ }
+
+ if((e_camera->Attribute("show_format_dialog") != NULL) &&
+ (_strnicmp("true",_bstr_t(e_camera->Attribute("show_format_dialog")),strlen("true")) == 0))
+ mf.inputFlags |= WDM_SHOW_FORMAT_DIALOG;
- if(e_camera->Attribute("ieee1394id") != NULL)
- {
- mf.ieee1394_id = (char*) CoTaskMemAlloc(MAX_PATH);
- sprintf(mf.ieee1394_id, _bstr_t(e_camera->Attribute("ieee1394id")));
- mf.inputFlags |= WDM_MATCH_IEEE1394_ID;
- }
+ if(e_camera->Attribute("ieee1394id") != NULL)
+ {
+ mf.ieee1394_id = (char*) CoTaskMemAlloc(MAX_PATH);
+ sprintf(mf.ieee1394_id, _bstr_t(e_camera->Attribute("ieee1394id")));
+ mf.inputFlags |= WDM_MATCH_IEEE1394_ID;
+ }
- if(e_camera->Attribute("frame_width") != NULL)
- {
- mf.biWidth = strtol(_bstr_t(e_camera->Attribute("frame_width")),NULL,10);
- if(mf.biWidth < 0) return(E_INVALIDARG);
- mf.inputFlags |= WDM_MATCH_FORMAT;
- }
+ if(e_camera->Attribute("frame_width") != NULL)
+ {
+ mf.biWidth = strtol(_bstr_t(e_camera->Attribute("frame_width")),NULL,10);
+ if(mf.biWidth < 0) return(E_INVALIDARG);
+ mf.inputFlags |= WDM_MATCH_FORMAT;
+ }
- if(e_camera->Attribute("frame_height") != NULL)
- {
- mf.biHeight = strtol(_bstr_t(e_camera->Attribute("frame_height")),NULL,10);
- if(mf.biHeight < 0) return(E_INVALIDARG);
- mf.inputFlags |= WDM_MATCH_FORMAT;
- }
+ if(e_camera->Attribute("frame_height") != NULL)
+ {
+ mf.biHeight = strtol(_bstr_t(e_camera->Attribute("frame_height")),NULL,10);
+ if(mf.biHeight < 0) return(E_INVALIDARG);
+ mf.inputFlags |= WDM_MATCH_FORMAT;
+ }
- if(e_camera->Attribute("frame_rate") != NULL)
- {
- char* end_ptr = NULL;
- mf.frameRate = strtod(_bstr_t(e_camera->Attribute("frame_rate")),&end_ptr);
- if(mf.frameRate <= 0) return(E_INVALIDARG);
- mf.inputFlags |= WDM_MATCH_FORMAT;
- }
+ if(e_camera->Attribute("frame_rate") != NULL)
+ {
+ char* end_ptr = NULL;
+ mf.frameRate = strtod(_bstr_t(e_camera->Attribute("frame_rate")),&end_ptr);
+ if(mf.frameRate <= 0) return(E_INVALIDARG);
+ mf.inputFlags |= WDM_MATCH_FORMAT;
+ }
e_pixel_format = doc_handle.FirstChild("dsvl_input").FirstChild("camera").FirstChild("pixel_format").FirstChild().Element();
if(!e_pixel_format) return(E_INVALIDARG);
@@ -885,31 +885,31 @@
if(mf.pixel_format == PIXELFORMAT_RGB32)
{
- if((e_pixel_format->Attribute("flip_h") != NULL) &&
- (_strnicmp("true",_bstr_t(e_pixel_format->Attribute("flip_h")),strlen("true")) == 0))
+ if((e_pixel_format->Attribute("flip_h") != NULL) &&
+ (_strnicmp("true",_bstr_t(e_pixel_format->Attribute("flip_h")),strlen("true")) == 0))
media_format.flipH = true;
- if((e_pixel_format->Attribute("flip_v") != NULL) &&
- (_strnicmp("true",_bstr_t(e_pixel_format->Attribute("flip_v")),strlen("true")) == 0))
+ if((e_pixel_format->Attribute("flip_v") != NULL) &&
+ (_strnicmp("true",_bstr_t(e_pixel_format->Attribute("flip_v")),strlen("true")) == 0))
media_format.flipV = true;
}
- }
- else if(e_avi)
- {
- mf.inputDevice = ASYNC_FILE_INPUT_FILTER;
- swprintf(mf.sourceFilterName, sizeof(wchar_t) * MAX_PATH,_bstr_t(e_avi->Attribute("file_name")));
-
- if((e_avi->Attribute("use_reference_clock") != NULL) &&
- (_strnicmp("false",_bstr_t(e_avi->Attribute("use_reference_clock")),strlen("false")) == 0))
- mf.inputFlags |= ASYNC_INPUT_DO_NOT_USE_CLOCK;
-
- if((e_avi->Attribute("loop_avi") != NULL) &&
- (_strnicmp("true",_bstr_t(e_avi->Attribute("loop_avi")),strlen("true")) == 0))
- mf.inputFlags |= ASYNC_LOOP_VIDEO;
-
- if((e_avi->Attribute("render_secondary") != NULL) &&
- (_strnicmp("true",_bstr_t(e_avi->Attribute("render_secondary")),strlen("true")) == 0))
- mf.inputFlags |= ASYNC_RENDER_SECONDARY_STREAMS;
+ }
+ else if(e_avi)
+ {
+ mf.inputDevice = ASYNC_FILE_INPUT_FILTER;
+ swprintf(mf.sourceFilterName, sizeof(wchar_t) * MAX_PATH,_bstr_t(e_avi->Attribute("file_name")));
+ if((e_avi->Attribute("use_reference_clock") != NULL) &&
+ (_strnicmp("false",_bstr_t(e_avi->Attribute("use_reference_clock")),strlen("false")) == 0))
+ mf.inputFlags |= ASYNC_INPUT_DO_NOT_USE_CLOCK;
+
+ if((e_avi->Attribute("loop_avi") != NULL) &&
+ (_strnicmp("true",_bstr_t(e_avi->Attribute("loop_avi")),strlen("true")) == 0))
+ mf.inputFlags |= ASYNC_LOOP_VIDEO;
+
+ if((e_avi->Attribute("render_secondary") != NULL) &&
+ (_strnicmp("true",_bstr_t(e_avi->Attribute("render_secondary")),strlen("true")) == 0))
+ mf.inputFlags |= ASYNC_RENDER_SECONDARY_STREAMS;
+
e_pixel_format = doc_handle.FirstChild("dsvl_input").FirstChild("avi_file").FirstChild("pixel_format").FirstChild().Element();
if(!e_pixel_format) return(E_INVALIDARG);
char px_temp[MAX_PATH];
@@ -918,401 +918,401 @@
if(mf.pixel_format == PIXELFORMAT_RGB32)
{
- if((e_pixel_format->Attribute("flip_h") != NULL) &&
- (_strnicmp("true",_bstr_t(e_pixel_format->Attribute("flip_h")),strlen("true")) == 0))
+ if((e_pixel_format->Attribute("flip_h") != NULL) &&
+ (_strnicmp("true",_bstr_t(e_pixel_format->Attribute("flip_h")),strlen("true")) == 0))
media_format.flipH = true;
- if((e_pixel_format->Attribute("flip_v") != NULL) &&
- (_strnicmp("true",_bstr_t(e_pixel_format->Attribute("flip_v")),strlen("true")) == 0))
+ if((e_pixel_format->Attribute("flip_v") != NULL) &&
+ (_strnicmp("true",_bstr_t(e_pixel_format->Attribute("flip_v")),strlen("true")) == 0))
media_format.flipV = true;
}
- }
- else return(E_INVALIDARG);
-
-
- // check for mf.defaultInputFlags and set default flags if necessary
- if(mf.defaultInputFlags)
- {
- switch(mf.inputDevice)
- {
- case(WDM_VIDEO_CAPTURE_FILTER): mf.inputFlags = default_VIDEO_INPUT_FLAGS;
- break;
- case(ASYNC_FILE_INPUT_FILTER): mf.inputFlags = default_ASYNC_INPUT_FLAGS;
- break;
- default: return(E_INVALIDARG);
- break;
- };
- }
-
-
- HRESULT hr;
-
- CComPtr <IBaseFilter> pVideoSource = NULL;
- CComPtr <IBaseFilter> pStreamSplitter = NULL; // used in conjunction with the Async File Source filter
- CComPtr <IBaseFilter> pVideoDecoder = NULL; // used for changing DV resolution
- CComPtr <IBaseFilter> pVideoRenderer = NULL;
- CComPtr <IAMStreamConfig> pStreamConfig = NULL;
-
- // OT-FIX 11/22/04 [thp]
- CComPtr <IBaseFilter> pSampleGrabber = NULL;
-
- FILTER_INFO filter_info;
-
- hr = CoCreateInstance (CLSID_FilterGraph, NULL, CLSCTX_INPROC,
- IID_IGraphBuilder, (void **) &graphBuilder);
- if (FAILED(hr)) return hr;
-
-#ifdef _DEBUG
- hr = AddToRot(graphBuilder, &dwRegisterROT);
-#endif
-
- // Create the capture graph builder
- hr = CoCreateInstance (CLSID_CaptureGraphBuilder2 , NULL, CLSCTX_INPROC,
- IID_ICaptureGraphBuilder2, (void **) &captureGraphBuilder);
- if (FAILED(hr))
- return hr;
-
-
- // OT-FIX 11/22/04 [thp]
- hr = CoCreateInstance(CLSID_NullRenderer, NULL, CLSCTX_INPROC_SERVER, IID_IBaseFilter, (void**)&(pVideoRenderer));
- if (FAILED(hr))
- return hr;
- hr = CoCreateInstance(CLSID_SampleGrabber, NULL, CLSCTX_INPROC_SERVER, IID_IBaseFilter, (void**)&(pSampleGrabber));
- if (FAILED(hr))
- return hr;
- if(FAILED(pSampleGrabber->QueryInterface(IID_ISampleGrabber,(void**)&sampleGrabber))) return(hr);
-
- AM_MEDIA_TYPE _mt;
- ZeroMemory(&_mt,sizeof(AM_MEDIA_TYPE));
- _mt.majortype = MEDIATYPE_Video;
- _mt.formattype = GUID_NULL;
- _mt.subtype = PXtoMEDIASUBTYPE(mf.pixel_format);
- hr = sampleGrabber->SetMediaType(&_mt);
- if (FAILED(hr))
- return hr;
-
- // Obtain interfaces for media control
- hr = graphBuilder->QueryInterface(IID_IMediaControl,(LPVOID *) &mediaControl);
- if (FAILED(hr))
- return hr;
-
- hr = graphBuilder->QueryInterface(IID_IMediaEvent, (LPVOID *) &mediaEvent);
- if (FAILED(hr))
- return hr;
-
- hr = captureGraphBuilder->SetFiltergraph(graphBuilder);
- if (FAILED(hr))
- return hr;
-
- // ###########################################################################################
- if (mf.inputDevice == WDM_VIDEO_CAPTURE_FILTER) {
- // ###########################################################################################
-
- hr = FindCaptureDevice(&pVideoSource,
- (mf.inputFlags & WDM_MATCH_FILTER_NAME ? mf.sourceFilterName : NULL),
- (mf.isDeviceName),
- (mf.inputFlags & WDM_MATCH_IEEE1394_ID ? mf.ieee1394_id : 0));
- if (FAILED(hr))
- {
- // Don't display a message because FindCaptureDevice will handle it
- return hr;
- }
-
- hr = graphBuilder->AddFilter(pVideoSource, L"Video Source");
-
- if (FAILED(hr))
- {
- AMErrorMessage(hr,"Couldn't add capture filter to graph!");
- return hr;
- }
-
- sourceFilter = pVideoSource;
- //capturePin = getPin(pVideoSource,PINDIR_OUTPUT,1);
- if(FAILED(hr = getPin(pVideoSource,PINDIR_OUTPUT,1,capturePin))) return(hr);
-
- // -------------
- hr = captureGraphBuilder->FindInterface(&PIN_CATEGORY_CAPTURE,NULL,pVideoSource,IID_IAMStreamConfig,(void**)&pStreamConfig);
- if (FAILED(hr))
- {
- AMErrorMessage(hr,"Couldn't find IAMStreamConfig interface.");
- return hr;
- }
-
- // ---------------------------------------------------------------------------------
- // Unfortunately, WDM DV Video Capture Devices (such as consumer miniDV camcorders)
- // require special handling. Since the WDM source will only offer DVRESOLUTION_FULL,
- // any changes must be made through IIPDVDec on the DV Decoder filter.
- bool pinSupportsDV = CanDeliverDV(capturePin);
-
- // ---------------------------------------------------------------------------------
- if(pinSupportsDV)
- {
- CComPtr<IIPDVDec> pDVDec;
- // insert a DV decoder (CLSID_DVVideoCodec) into our graph.
- if(FAILED(hr = CoCreateInstance(CLSID_DVVideoCodec, NULL, CLSCTX_INPROC_SERVER, IID_IBaseFilter, (void**)&(pVideoDecoder)))) return(hr);
- decoderFilter = pVideoDecoder;
-
- hr = graphBuilder->AddFilter(pVideoDecoder, L"Video Decoder");
-
- if(mf.inputFlags & WDM_MATCH_FORMAT)
- // since we're dealing with DV, there's only a limited range of possible resolutions:
- //
- // DVDECODERRESOLUTION_720x480 (PAL: 720x576) = DVRESOLUTION_FULL
- // DVDECODERRESOLUTION_360x240 (PAL: 360x288) = DVRESOLUTION_HALF
- // DVDECODERRESOLUTION_180x120 (PAL: 180x144) = DVRESOLUTION_QUARTER
- // DVDECODERRESOLUTION_88x60 (PAL: 88x72) = DVRESOLUTION_DC
-
- {
- if(FAILED(pVideoDecoder->QueryInterface(IID_IIPDVDec,(void**)&pDVDec))) return(hr);
-
- int dvRes;
- if(FAILED(hr = pDVDec->get_IPDisplay(&dvRes))) return(hr); // get default resolution
-
- if((mf.biWidth == 720) && ((mf.biHeight == 480) || (mf.biHeight == 576))) dvRes = DVRESOLUTION_FULL;
- else if((mf.biWidth == 360) && ((mf.biHeight == 240) || (mf.biHeight == 288))) dvRes = DVRESOLUTION_HALF;
- else if((mf.biWidth == 180) && ((mf.biHeight == 120) || (mf.biHeight == 144))) dvRes = DVRESOLUTION_QUARTER;
- else if((mf.biWidth == 88) && ((mf.biHeight == 60) || (mf.biHeight == 72))) dvRes = DVRESOLUTION_DC;
-
- if(FAILED(hr = pDVDec->put_IPDisplay(dvRes))) return(hr);
- }
-
- if((mf.inputFlags & WDM_SHOW_FORMAT_DIALOG)) // displaying the DV decoder's FILTER property page amounts to
- // the same as showing the WDM capture PIN property page.
- {
- if(FAILED...
[truncated message content] |
|
From: <ret...@us...> - 2009-06-16 04:54:58
|
Revision: 311
http://artoolkit.svn.sourceforge.net/artoolkit/?rev=311&view=rev
Author: retrakker
Date: 2009-06-16 04:54:44 +0000 (Tue, 16 Jun 2009)
Log Message:
-----------
small fix for preset config string if GStreamer is being used
Modified Paths:
--------------
trunk/artoolkit/util/calib_cparam/calib_cparam.c
trunk/artoolkit/util/calib_distortion/calib_dist.c
Modified: trunk/artoolkit/util/calib_cparam/calib_cparam.c
===================================================================
--- trunk/artoolkit/util/calib_cparam/calib_cparam.c 2009-04-30 22:44:08 UTC (rev 310)
+++ trunk/artoolkit/util/calib_cparam/calib_cparam.c 2009-06-16 04:54:44 UTC (rev 311)
@@ -61,7 +61,7 @@
char *vconf = "-size=FULL";
#elif defined(__linux)
# if defined(AR_INPUT_GSTREAMER)
-char *vconf = "videotestsrc";
+char *vconf = "";
# elif defined(AR_INPUT_V4L)
char *vconf = "-width=640 -height=480";
# elif defined(AR_INPUT_1394CAM)
Modified: trunk/artoolkit/util/calib_distortion/calib_dist.c
===================================================================
--- trunk/artoolkit/util/calib_distortion/calib_dist.c 2009-04-30 22:44:08 UTC (rev 310)
+++ trunk/artoolkit/util/calib_distortion/calib_dist.c 2009-06-16 04:54:44 UTC (rev 311)
@@ -61,7 +61,7 @@
char *vconf = "-size=FULL";
#elif defined(__linux)
# if defined(AR_INPUT_GSTREAMER)
-char *vconf = "videotestsrc";
+char *vconf = "";
# elif defined(AR_INPUT_V4L)
char *vconf = "-width=640 -height=480";
# elif defined(AR_INPUT_1394CAM)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jul...@us...> - 2009-04-30 22:44:25
|
Revision: 310
http://artoolkit.svn.sourceforge.net/artoolkit/?rev=310&view=rev
Author: julianlooser
Date: 2009-04-30 22:44:08 +0000 (Thu, 30 Apr 2009)
Log Message:
-----------
- Changed the way MatchMediaTypes operates. Rather than trying to find a media type with the requested FPS, it will match the resolution, and then set the AvgTimePerFrame field to suit the requested rate. DirectShow will then try to provide that rate if it can.
Modified Paths:
--------------
branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/src/DSVL_GraphManager.cpp
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/src/DSVL_GraphManager.cpp
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/src/DSVL_GraphManager.cpp 2008-12-12 01:19:15 UTC (rev 309)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/src/DSVL_GraphManager.cpp 2009-04-30 22:44:08 UTC (rev 310)
@@ -99,12 +99,22 @@
VIDEOINFOHEADER *pvi = (VIDEOINFOHEADER *) p_mt->pbFormat;
if( ((p_mt->subtype == mf->subtype) || (mf->subtype == GUID_NULL)) &&
((pvi->bmiHeader.biHeight == mf->biHeight) || (mf->biHeight == 0)) &&
- ((pvi->bmiHeader.biWidth == mf->biWidth) || (mf->biWidth == 0)) &&
- ((avg2fps(pvi->AvgTimePerFrame,3) == RoundDouble(mf->frameRate,3)) || (mf->frameRate == 0.0))
+ ((pvi->bmiHeader.biWidth == mf->biWidth) || (mf->biWidth == 0)) /*&&
+ // jcl64: Don't try to match frame rate. Set it explicitly (see below)
+ ((avg2fps(pvi->AvgTimePerFrame,3) == RoundDouble(mf->frameRate,3)) || (mf->frameRate == 0.0))*/
)
{
// found a match!
CopyMediaType(req_mt,p_mt);
+
+ // ------------------
+ // jcl64: Set the frame rate we want
+ if (VIDEOINFOHEADER *pvi_req = (VIDEOINFOHEADER *) req_mt->pbFormat) {
+ pvi_req->AvgTimePerFrame = fps2avg(RoundDouble(mf->frameRate,3));
+ }
+ // jcl64
+ // ------------------
+
DeleteMediaType(p_mt);
return(S_OK);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ret...@us...> - 2008-12-12 01:19:20
|
Revision: 309
http://artoolkit.svn.sourceforge.net/artoolkit/?rev=309&view=rev
Author: retrakker
Date: 2008-12-12 01:19:15 +0000 (Fri, 12 Dec 2008)
Log Message:
-----------
- openvrml on Windows working again - using Philips' binary package for VS 2005
- polished the CPack part a bit
Modified Paths:
--------------
branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake
branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindOpenVRML.cmake
branches/hartmut-pre-2_8/artoolkit/examples/simpleVRML/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARvrml/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/src/CMakeLists.txt
Added Paths:
-----------
branches/hartmut-pre-2_8/artoolkit/share/ARToolKit.ico
branches/hartmut-pre-2_8/artoolkit/share/ARToolKit.rc.in
Modified: branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt 2008-12-12 00:13:54 UTC (rev 308)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt 2008-12-12 01:19:15 UTC (rev 309)
@@ -17,8 +17,8 @@
set(ARTOOLKIT_VERSION_MAJOR 2)
set(ARTOOLKIT_VERSION_MINOR 72)
-set(ARTOOLKIT_VERSION_TINY 3)
-set(ARTOOLKIT_VERSION_REV 99)
+set(ARTOOLKIT_VERSION_TINY 4)
+set(ARTOOLKIT_VERSION_REV 1212)
set(ARTOOLKIT_VERSION_SHORT "${ARTOOLKIT_VERSION_MAJOR}.${ARTOOLKIT_VERSION_MINOR}")
set(ARTOOLKIT_VERSION_FULL
@@ -157,7 +157,7 @@
configure_file(
${CMAKE_SOURCE_DIR}/CMakeModules/Packaging.cmake.in
${CMAKE_BINARY_DIR}/.cpack/ARTKPackaging.cmake
- @ONLY
+ IMMEDIATE @ONLY
)
include(${CMAKE_BINARY_DIR}/.cpack/ARTKPackaging.cmake)
endif (ARTOOLKIT_BUILD_PACKAGE)
Modified: branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake 2008-12-12 00:13:54 UTC (rev 308)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake 2008-12-12 01:19:15 UTC (rev 309)
@@ -84,7 +84,15 @@
)
else(APPLE)
- add_executable(${EXE_NAME} ${${SRCS}})
+ set(TEMP_RC_NAME ${CMAKE_BINARY_DIR}/.rc/${EXE_NAME}_temp.rc)
+
+ configure_file(
+ ${CMAKE_SOURCE_DIR}/share/ARToolKit.rc.in
+ ${TEMP_RC_NAME}
+ IMMEDIATE @ONLY
+ )
+
+ add_executable(${EXE_NAME} ${${SRCS}} ${TEMP_RC_NAME})
endif(APPLE)
endmacro(artoolkit_executable)
Modified: branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindOpenVRML.cmake
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindOpenVRML.cmake 2008-12-12 00:13:54 UTC (rev 308)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindOpenVRML.cmake 2008-12-12 01:19:15 UTC (rev 309)
@@ -9,27 +9,13 @@
#
# Created by Robert Osfield.
# Modified for the debug library by Jean-S?stien Guay.
+# Modified by Hartmut Seichter for inclusion into ARToolKit
+#
-set(OPENVRML_LIB_SEARCH_PATHS
- ${CMAKE_SOURCE_DIR}/../openvrml-0.16.6-bin-macosx/lib
- $ENV{OPENVRML_DIR}/lib
- $ENV{OPENVRML_DIR}
- $ENV{OSGDIR}/lib
- $ENV{OSGDIR}
- $ENV{OSG_ROOT}/lib
- ~/Library/Frameworks
- /Library/Frameworks
- /usr/local/lib
- /usr/lib
- /sw/lib
- /opt/local/lib
- /opt/csw/lib
- /opt/lib
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
- /usr/freeware/lib64
- )
-
+set(OPENVRML_ROOT_DIR CACHE PATH "OpenVRML Binary root directory")
+
+
FIND_PATH(OPENVRML_INCLUDE_DIR openvrml/system.h
${CMAKE_SOURCE_DIR}/../openvrml-0.16.6-bin-macosx/include
$ENV{OPENVRML_DIR}/include
@@ -49,54 +35,99 @@
/usr/freeware/include
)
-FIND_LIBRARY(OPENVRML_jpeg_LIBRARY
- NAMES jpeg
- PATHS
- ${OPENVRML_LIB_SEARCH_PATHS}
-)
-FIND_LIBRARY(OPENVRML_png_LIBRARY
- NAMES png
- PATHS
- ${OPENVRML_LIB_SEARCH_PATHS}
-)
+if(OPENVRML_INCLUDE_DIR)
+ set(OPENVRML_ROOT_DIR ${OPENVRML_INCLUDE_DIR}/../)
+endif(OPENVRML_INCLUDE_DIR)
+set(OPENVRML_LIB_SEARCH_PATHS
+ ${CMAKE_SOURCE_DIR}/../openvrml-0.16.6-bin-macosx/lib
+ $ENV{OPENVRML_DIR}/lib
+ $ENV{OPENVRML_DIR}
+ $ENV{OSGDIR}/lib
+ $ENV{OSGDIR}
+ $ENV{OSG_ROOT}/lib
+ ${OPENVRML_ROOT_DIR}/lib
+ ~/Library/Frameworks
+ /Library/Frameworks
+ /usr/local/lib
+ /usr/lib
+ /sw/lib
+ /opt/local/lib
+ /opt/csw/lib
+ /opt/lib
+ [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
+ /usr/freeware/lib64
+ )
+
+
FIND_LIBRARY(OPENVRML_gl_LIBRARY
- NAMES openvrml-gl
- PATHS
+ NAMES openvrml-gl
+ PATHS
${OPENVRML_LIB_SEARCH_PATHS}
)
-FIND_LIBRARY(OPENVRML_js_LIBRARY
- NAMES js
- PATHS
+FIND_LIBRARY(OPENVRML_openvrml_LIBRARY
+ NAMES openvrml
+ PATHS
${OPENVRML_LIB_SEARCH_PATHS}
)
-FIND_LIBRARY(OPENVRML_boost_LIBRARY
- NAMES boost_thread-1_33_1
- PATHS
- ${OPENVRML_LIB_SEARCH_PATHS}
-)
+IF(APPLE)
+ FIND_LIBRARY(OPENVRML_jpeg_LIBRARY
+ NAMES jpeg
+ PATHS
+ ${OPENVRML_LIB_SEARCH_PATHS}
+ )
-FIND_LIBRARY(OPENVRML_plds4_LIBRARY
- NAMES plds4
- PATHS
- ${OPENVRML_LIB_SEARCH_PATHS}
-)
+ FIND_LIBRARY(OPENVRML_png_LIBRARY
+ NAMES png
+ PATHS
+ ${OPENVRML_LIB_SEARCH_PATHS}
+ )
-FIND_LIBRARY(OPENVRML_nspr4_LIBRARY
- NAMES nspr4
- PATHS
- ${OPENVRML_LIB_SEARCH_PATHS}
-)
-FIND_LIBRARY(OPENVRML_plc4_LIBRARY
- NAMES plc4
- PATHS
- ${OPENVRML_LIB_SEARCH_PATHS}
-)
+ FIND_LIBRARY(OPENVRML_js_LIBRARY
+ NAMES js
+ PATHS
+ ${OPENVRML_LIB_SEARCH_PATHS}
+ )
+ FIND_LIBRARY(OPENVRML_boost_LIBRARY
+ NAMES boost_thread-1_33_1
+ PATHS
+ ${OPENVRML_LIB_SEARCH_PATHS}
+ )
+
+ FIND_LIBRARY(OPENVRML_plds4_LIBRARY
+ NAMES plds4
+ PATHS
+ ${OPENVRML_LIB_SEARCH_PATHS}
+ )
+
+ FIND_LIBRARY(OPENVRML_nspr4_LIBRARY
+ NAMES nspr4
+ PATHS
+ ${OPENVRML_LIB_SEARCH_PATHS}
+ )
+
+ FIND_LIBRARY(OPENVRML_plc4_LIBRARY
+ NAMES plc4
+ PATHS
+ ${OPENVRML_LIB_SEARCH_PATHS}
+ )
+ENDIF(APPLE)
+
+IF(WIN32)
+ FIND_LIBRARY(OPENVRML_boost_LIBRARY
+ NAMES
+ boost_thread-1_34_1
+ libboost_thread-vc80-mt-1_34_1
+ PATHS
+ ${OPENVRML_LIB_SEARCH_PATHS}
+ )
+ENDIF(WIN32)
+
FIND_LIBRARY(OPENVRML_LIBRARY_DEBUG
NAMES openvrmld
PATHS
@@ -123,11 +154,11 @@
SET(OPENVRML_LIBRARIES
${OPENVRML_openvrml_LIBRARY}
${OPENVRML_gl_LIBRARY}
+ ${OPENVRML_boost_LIBRARY}
)
if(APPLE)
list(APPEND
${OPENVRML_jpeg_LIBRARY}
- ${OPENVRML_boost_LIBRARY}
${OPENVRML_js_LIBRARY}
${OPENVRML_png_LIBRARY}
${OPENVRML_plc4_LIBRARY}
@@ -142,12 +173,14 @@
#-------------- next part --------------
IF (WIN32)
INCLUDE_DIRECTORIES( ${OPENVRML_INCLUDE_DIR} ${OPENVRML_INCLUDE_DIR}/openvrml ${JPEG_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
- SET(OPENVRML_ANTLR_LIBRARY antlr.lib)
- SET(OPENVRML_ANTLR_LIBRARY_DEBUG antlrd.lib)
- SET(OPENVRML_REGEX_LIBRARY regex.lib)
- SET(OPENVRML_REGEX_LIBRARY_DEBUG regexd.lib)
- SET(TARGET_LIBRARIES_VARS OPENVRML_ANTLR_LIBRARY OPENVRML_REGEX_LIBRARY OPENVRML_LIBRARY JPEG_LIBRARY PNG_LIBRARY ZLIB_LIBRARY)
+
+# SET(OPENVRML_ANTLR_LIBRARY antlr.lib)
+# SET(OPENVRML_ANTLR_LIBRARY_DEBUG antlrd.lib)
+# SET(OPENVRML_REGEX_LIBRARY regex.lib)
+# SET(OPENVRML_REGEX_LIBRARY_DEBUG regexd.lib)
+# SET(TARGET_LIBRARIES_VARS OPENVRML_ANTLR_LIBRARY OPENVRML_REGEX_LIBRARY OPENVRML_LIBRARY JPEG_LIBRARY PNG_LIBRARY ZLIB_LIBRARY)
SET(TARGET_EXTERNAL_LIBRARIES Ws2_32.lib)
+
ELSE(WIN32)
INCLUDE_DIRECTORIES( ${OPENVRML_INCLUDE_DIR} ${OPENVRML_INCLUDE_DIR}/openvrml)
ENDIF(WIN32)
Modified: branches/hartmut-pre-2_8/artoolkit/examples/simpleVRML/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/examples/simpleVRML/CMakeLists.txt 2008-12-12 00:13:54 UTC (rev 308)
+++ branches/hartmut-pre-2_8/artoolkit/examples/simpleVRML/CMakeLists.txt 2008-12-12 01:19:15 UTC (rev 309)
@@ -1,6 +1,9 @@
set(EXE_NAME simpleVRML)
+
+include_directories(${GLUT_INCLUDE_DIR})
+
set(SRCS
object.h
object.c
@@ -56,22 +59,83 @@
MACOSX_PACKAGE_LOCATION "MacOS"
)
- add_executable(${EXE_NAME} MACOSX_BUNDLE
- ${SRCS} ${CMAKE_SOURCE_DIR}/share/ARToolKit.icns
+ list(APPEND
+ ${SRCS}
+ ${CMAKE_SOURCE_DIR}/share/ARToolKit.icns
${ARTOOLKIT_FILES_VRML_TEXTURES}
${ARTOOLKIT_FILES_VRML}
- ${ARTOOLKIT_FILES_DATA}
+ ${ARTOOLKIT_FILES_DATA}
)
else(APPLE)
- add_executable(${EXE_NAME} ${SRCS})
+ ## add_executable(${EXE_NAME} ${SRCS})
endif(APPLE)
+artoolkit_example_glut(${EXE_NAME} SRCS)
+
target_link_libraries(${EXE_NAME}
${GLUT_LIBRARIES} ${OPENGL_LIBRARIES} ${OPENVRML_LIBRARIES}
AR ARgsub ARgsub_lite ARgsubUtil ARvrml ARvideo
- stdc++
)
+
+if (CMAKE_COMPILER_IS_GNUCC)
+ target_link_libraries(${EXE_NAME}
+ stdc++
+ )
+endif (CMAKE_COMPILER_IS_GNUCC)
+set(target ${EXE_NAME})
+
+if (cmake_version_short GREATER "2.5")
+ install(TARGETS ${target}
+ BUNDLE DESTINATION "/Applications/ARToolKit-${ARTOOLKIT_VERSION_FULL}"
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION ${lib_dest}
+ ARCHIVE DESTINATION lib
+ PUBLIC_HEADER DESTINATION include/AR
+ PERMISSIONS
+ OWNER_EXECUTE OWNER_WRITE OWNER_READ
+ GROUP_EXECUTE GROUP_READ
+ WORLD_EXECUTE WORLD_READ
+ )
+else(cmake_version_short GREATER "2.5")
+ install(TARGETS ${target}
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION ${lib_dest}
+ ARCHIVE DESTINATION lib
+ PERMISSIONS
+ OWNER_EXECUTE OWNER_WRITE OWNER_READ
+ GROUP_EXECUTE GROUP_READ
+ WORLD_EXECUTE WORLD_READ
+ )
+endif(cmake_version_short GREATER "2.5")
+
+if(WIN32)
+
+ get_filename_component(OPENVRML_LIB_PATH ${OPENVRML_openvrml_LIBRARY} PATH)
+ file(GLOB OPENVRML_DLLS ${OPENVRML_LIB_PATH}/../bin/*${CMAKE_SHARED_LIBRARY_SUFFIX})
+
+
+ install(FILES ${ARTOOLKIT_FILES_VRML_TEXTURES}
+ DESTINATION bin/Wrl/textures
+ )
+ install(FILES ${ARTOOLKIT_FILES_VRML}
+ DESTINATION bin/Wrl
+ )
+
+ install(
+ FILES ${OPENVRML_LIBRARIES}
+ DESTINATION lib
+ )
+
+ install(FILES ${OPENVRML_DLLS}
+ DESTINATION bin
+ )
+
+endif(WIN32)
+
+
+
+
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARvrml/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARvrml/CMakeLists.txt 2008-12-12 00:13:54 UTC (rev 308)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARvrml/CMakeLists.txt 2008-12-12 01:19:15 UTC (rev 309)
@@ -50,6 +50,11 @@
include_directories(${CMAKE_SOURCE_DIR}/include ${GLUT_INCLUDE_DIR} ${OPENVRML_INCLUDE_DIR})
+if(WIN32)
+ add_definitions(-DOPENVRML_USE_DLL -DOPENVRML_GL_USE_DLL)
+endif(WIN32)
+
+
add_library(${lib_name} ${hdrs_public} ${srcs_openvrml})
target_link_libraries(${lib_name}
@@ -61,6 +66,7 @@
artoolkit_install(${lib_name})
+
install(FILES ${hdrs_public}
DESTINATION include/AR
)
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/src/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/src/CMakeLists.txt 2008-12-12 00:13:54 UTC (rev 308)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/src/CMakeLists.txt 2008-12-12 01:19:15 UTC (rev 309)
@@ -1,5 +1,5 @@
#
-# CMake build system for DSVL 0.0.8c
+# CMake build system for DSVL 0.0.8h
# (c) Copyrights 2007-2008 Hartmut Seichter, HIT Lab NZ
#
Added: branches/hartmut-pre-2_8/artoolkit/share/ARToolKit.ico
===================================================================
(Binary files differ)
Property changes on: branches/hartmut-pre-2_8/artoolkit/share/ARToolKit.ico
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/hartmut-pre-2_8/artoolkit/share/ARToolKit.rc.in
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/share/ARToolKit.rc.in (rev 0)
+++ branches/hartmut-pre-2_8/artoolkit/share/ARToolKit.rc.in 2008-12-12 01:19:15 UTC (rev 309)
@@ -0,0 +1,27 @@
+#include <winver.h>
+
+
+1 VERSIONINFO
+FILEVERSION @ARTOOLKIT_VERSION_MAJOR@,@ARTOOLKIT_VERSION_MINOR@,@ARTOOLKIT_VERSION_TINY@,0
+PRODUCTVERSION @ARTOOLKIT_VERSION_MAJOR@,@ARTOOLKIT_VERSION_MINOR@,@ARTOOLKIT_VERSION_TINY@,0
+FILEFLAGSMASK 0
+FILEOS VOS__WINDOWS32
+FILETYPE VFT_APP
+{
+ BLOCK "StringFileInfo"
+ {
+ BLOCK "040904E4"
+ {
+ VALUE "FileVersion", "@ARTOOLKIT_VERSION_MAJOR@,@ARTOOLKIT_VERSION_MINOR@,@ARTOOLKIT_VERSION_TINY@"
+ VALUE "ProductVersion", "@ARTOOLKIT_VERSION_MAJOR@,@ARTOOLKIT_VERSION_MINOR@,@ARTOOLKIT_VERSION_TINY@"
+ VALUE "FileDescription", "@EXE_NAME@"
+ VALUE "InternalName", "@EXE_NAME@"
+ VALUE "ProductName", "@EXE_NAME@"
+ VALUE "OriginalFilename", "@EXE_NAME@.exe"
+ VALUE "CompanyName", "HITLabNZ"
+ VALUE "LegalCopyright", "Copyright (C) 2007-2008 HIT Lab NZ, ARToolworks"
+ }
+ }
+}
+
+IDI_APPICON ICON "@CMAKE_SOURCE_DIR@/share/ARToolKit.ico"
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ret...@us...> - 2008-12-12 00:13:59
|
Revision: 308
http://artoolkit.svn.sourceforge.net/artoolkit/?rev=308&view=rev
Author: retrakker
Date: 2008-12-12 00:13:54 +0000 (Fri, 12 Dec 2008)
Log Message:
-----------
added missing icons
Added Paths:
-----------
branches/hartmut-pre-2_8/artoolkit/share/ARToolKit_16x16.png
branches/hartmut-pre-2_8/artoolkit/share/ARToolKit_32x32.png
branches/hartmut-pre-2_8/artoolkit/share/ARToolKit_64x64.png
Added: branches/hartmut-pre-2_8/artoolkit/share/ARToolKit_16x16.png
===================================================================
(Binary files differ)
Property changes on: branches/hartmut-pre-2_8/artoolkit/share/ARToolKit_16x16.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/hartmut-pre-2_8/artoolkit/share/ARToolKit_32x32.png
===================================================================
(Binary files differ)
Property changes on: branches/hartmut-pre-2_8/artoolkit/share/ARToolKit_32x32.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/hartmut-pre-2_8/artoolkit/share/ARToolKit_64x64.png
===================================================================
(Binary files differ)
Property changes on: branches/hartmut-pre-2_8/artoolkit/share/ARToolKit_64x64.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ret...@us...> - 2008-09-22 11:27:58
|
Revision: 307
http://artoolkit.svn.sourceforge.net/artoolkit/?rev=307&view=rev
Author: retrakker
Date: 2008-09-22 11:27:53 +0000 (Mon, 22 Sep 2008)
Log Message:
-----------
minor fix for Mac to bundle datafiles
Modified Paths:
--------------
branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake
Modified: branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt 2008-09-10 05:07:07 UTC (rev 306)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt 2008-09-22 11:27:53 UTC (rev 307)
@@ -7,7 +7,8 @@
cmake_minimum_required(VERSION 2.4)
if(COMMAND cmake_policy)
- cmake_policy(SET CMP0003 NEW)
+ cmake_policy(SET CMP0003 NEW)
+ cmake_policy(SET CMP0006 OLD)
endif(COMMAND cmake_policy)
project(ARToolKit)
Modified: branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake 2008-09-10 05:07:07 UTC (rev 306)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake 2008-09-22 11:27:53 UTC (rev 307)
@@ -69,6 +69,7 @@
HEADER_FILE_ONLY TRUE
MACOSX_PACKAGE_LOCATION "Resources/Data"
)
+
set_source_files_properties(
${ARTOOLKIT_FILES_DATA_MULTI}
PROPERTIES
@@ -78,6 +79,8 @@
add_executable(${EXE_NAME} MACOSX_BUNDLE
${${SRCS}} ${CMAKE_SOURCE_DIR}/share/ARToolKit.icns
+ ${ARTOOLKIT_FILES_DATA}
+ ${ARTOOLKIT_FILES_DATA_MULTI}
)
else(APPLE)
@@ -93,9 +96,12 @@
else (WIN32)
set(lib_dest lib)
endif(WIN32)
+
+ set(cmake_version_short "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}")
- if (CMAKE_VERSION MATCHES 2.6)
+ if (cmake_version_short GREATER "2.5")
install(TARGETS ${target}
+ BUNDLE DESTINATION "/Applications/ARToolKit-${ARTOOLKIT_VERSION_FULL}"
RUNTIME DESTINATION bin
LIBRARY DESTINATION ${lib_dest}
ARCHIVE DESTINATION lib
@@ -105,7 +111,7 @@
GROUP_EXECUTE GROUP_READ
WORLD_EXECUTE WORLD_READ
)
- else(CMAKE_VERSION MATCHES 2.6)
+ else(cmake_version_short GREATER "2.5")
install(TARGETS ${target}
RUNTIME DESTINATION bin
LIBRARY DESTINATION ${lib_dest}
@@ -115,7 +121,7 @@
GROUP_EXECUTE GROUP_READ
WORLD_EXECUTE WORLD_READ
)
- endif(CMAKE_VERSION MATCHES 2.6)
+ endif(cmake_version_short GREATER "2.5")
endmacro(artoolkit_install target)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ret...@us...> - 2008-09-10 05:06:57
|
Revision: 306
http://artoolkit.svn.sourceforge.net/artoolkit/?rev=306&view=rev
Author: retrakker
Date: 2008-09-10 05:07:07 +0000 (Wed, 10 Sep 2008)
Log Message:
-----------
removed additional buildsystems to hopefully avoid confusion
Removed Paths:
-------------
branches/hartmut-pre-2_8/artoolkit/ARToolKit.dsw
branches/hartmut-pre-2_8/artoolkit/ARToolKit.sln
branches/hartmut-pre-2_8/artoolkit/ARToolKit.xcodeproj/
branches/hartmut-pre-2_8/artoolkit/Configure
branches/hartmut-pre-2_8/artoolkit/Configure.win32.bat
branches/hartmut-pre-2_8/artoolkit/Makefile.in
Deleted: branches/hartmut-pre-2_8/artoolkit/ARToolKit.dsw
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/ARToolKit.dsw 2008-09-10 05:06:00 UTC (rev 305)
+++ branches/hartmut-pre-2_8/artoolkit/ARToolKit.dsw 2008-09-10 05:07:07 UTC (rev 306)
@@ -1,558 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "calib_camera2"=.\util\calib_camera2\calib_camera2.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libAR
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARgsub_lite
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARvideo
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "calib_cparam"=.\util\calib_cparam\calib_cparam.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libAR
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARgsub_lite
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARvideo
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "calib_distortion"=.\util\calib_distortion\calib_distortion.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libAR
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARgsub_lite
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARvideo
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "collide"=.\examples\collide\collideTest.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libAR
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARgsub
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARvideo
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "exview"=.\examples\exview\exview.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libAR
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARgsub
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARvideo
- End Project Dependency
-}}}
-
-
-###############################################################################
-
-Project: "graphicsTest"=.\util\graphicsTest\graphicsTest.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libAR
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARgsub
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARvideo
- End Project Dependency
-}}}
-
-
-###############################################################################
-
-Project: "libAR"=.\lib\SRC\AR\libAR.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "libARgsub"=.\lib\SRC\Gl\libARgsub.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "libARgsubUtil"=.\LIB\SRC\GL\libARgsubUtil.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "libARgsub_lite"=.\LIB\SRC\GL\libARgsub_lite.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "libARmulti"=.\lib\SRC\ARMulti\libARmulti.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "libARvideo"=.\LIB\SRC\VIDEOWIN32DIRECTSHOW\libARvideo.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-
-###############################################################################
-
-Project: "loadMultiple"=.\examples\loadMultiple\loadMultiple.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libAR
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARgsub
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARvideo
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "mkpatt"=.\util\mk_patt\mkpatt.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libAR
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARgsub
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARvideo
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "modeTest"=.\examples\modeTest\modeTest.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libAR
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARgsub
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARvideo
- End Project Dependency
-}}}
-
-
-###############################################################################
-
-Project: "multi"=.\examples\multi\multiTest.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libAR
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARgsub
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARmulti
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARvideo
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "optical"=.\examples\optical\optical.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libAR
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARgsub
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARgsubUtil
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARvideo
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "paddle"=.\examples\paddle\paddleTest.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libAR
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARgsub
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARgsubUtil
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARvideo
- End Project Dependency
-}}}
-
-
-###############################################################################
-
-Project: "paddleDemo"=.\examples\paddleDemo\paddleDemo.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libAR
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARgsub
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARgsubUtil
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARvideo
- End Project Dependency
-}}}
-
-
-###############################################################################
-
-Project: "paddleInteraction"=.\examples\paddleInteraction\paddleInteractionTest.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libAR
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARgsub
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARgsubUtil
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARvideo
- End Project Dependency
-}}}
-
-
-###############################################################################
-
-Project: "range"=.\examples\range\rangeTest.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libAR
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARgsub
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARgsubUtil
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARvideo
- End Project Dependency
-}}}
-###############################################################################
-
-Project: "relation"=.\examples\relation\relationTest.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libAR
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARgsub
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARvideo
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "simple"=.\examples\simple\simpleTest.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libAR
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARgsub
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARvideo
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "simple2"=.\examples\simple2\simpleTest2.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libAR
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARgsub
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARvideo
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "simpleLite"=.\examples\simpleLite\simpleLite.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libAR
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARgsub_lite
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARvideo
- End Project Dependency
-}}}
-
-###############################################################################
-
-
-###############################################################################
-
-Project: "twoView"=.\examples\twoView\twoView.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libAR
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARgsub_lite
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARvideo
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "videoTest"=.\util\videoTest\videoTest.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libAR
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARgsub_lite
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libARvideo
- End Project Dependency
-}}}
-
-###############################################################################
-
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
Deleted: branches/hartmut-pre-2_8/artoolkit/ARToolKit.sln
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/ARToolKit.sln 2008-09-10 05:06:00 UTC (rev 305)
+++ branches/hartmut-pre-2_8/artoolkit/ARToolKit.sln 2008-09-10 05:07:07 UTC (rev 306)
@@ -1,331 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libAR", "lib\SRC\AR\libAR.vcproj", "{191F78D2-7A53-4EAF-94E9-433DF5496E6E}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libARMulti", "lib\SRC\ARMulti\libARMulti.vcproj", "{6BB655FE-B823-4BE4-BDC9-FD3738FF82BC}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libARgsub", "lib\SRC\Gl\libARgsub.vcproj", "{1CB7F08A-A8E5-457B-A589-9878F126601D}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libARgsubUtil", "lib\SRC\Gl\libARgsubUtil.vcproj", "{81A146C4-A7ED-462D-ADF3-FE93E82F2B9B}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simpleTest", "examples\simple\simpleTest.vcproj", "{89E3CB14-46DF-46BB-B87F-CC653045B14C}"
- ProjectSection(ProjectDependencies) = postProject
- {B5E62882-360E-46B2-A97F-50443BB795E3} = {B5E62882-360E-46B2-A97F-50443BB795E3}
- {1CB7F08A-A8E5-457B-A589-9878F126601D} = {1CB7F08A-A8E5-457B-A589-9878F126601D}
- {191F78D2-7A53-4EAF-94E9-433DF5496E6E} = {191F78D2-7A53-4EAF-94E9-433DF5496E6E}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simpleTest2", "examples\simple2\simpleTest2.vcproj", "{591A24EE-AE23-7439-B131-D7A75370BFE8}"
- ProjectSection(ProjectDependencies) = postProject
- {B5E62882-360E-46B2-A97F-50443BB795E3} = {B5E62882-360E-46B2-A97F-50443BB795E3}
- {1CB7F08A-A8E5-457B-A589-9878F126601D} = {1CB7F08A-A8E5-457B-A589-9878F126601D}
- {191F78D2-7A53-4EAF-94E9-433DF5496E6E} = {191F78D2-7A53-4EAF-94E9-433DF5496E6E}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "relationTest", "examples\relation\relationTest.vcproj", "{1E69B126-6965-4DEC-5FED-5A392CCDD2B5}"
- ProjectSection(ProjectDependencies) = postProject
- {B5E62882-360E-46B2-A97F-50443BB795E3} = {B5E62882-360E-46B2-A97F-50443BB795E3}
- {1CB7F08A-A8E5-457B-A589-9878F126601D} = {1CB7F08A-A8E5-457B-A589-9878F126601D}
- {191F78D2-7A53-4EAF-94E9-433DF5496E6E} = {191F78D2-7A53-4EAF-94E9-433DF5496E6E}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "optical", "examples\optical\optical.vcproj", "{E50769E3-0646-8D8C-3318-308E7D1A9149}"
- ProjectSection(ProjectDependencies) = postProject
- {B5E62882-360E-46B2-A97F-50443BB795E3} = {B5E62882-360E-46B2-A97F-50443BB795E3}
- {1CB7F08A-A8E5-457B-A589-9878F126601D} = {1CB7F08A-A8E5-457B-A589-9878F126601D}
- {81A146C4-A7ED-462D-ADF3-FE93E82F2B9B} = {81A146C4-A7ED-462D-ADF3-FE93E82F2B9B}
- {191F78D2-7A53-4EAF-94E9-433DF5496E6E} = {191F78D2-7A53-4EAF-94E9-433DF5496E6E}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "multiTest", "examples\multi\multiTest.vcproj", "{AAE4C85D-5090-725A-1213-96DA1C47FA86}"
- ProjectSection(ProjectDependencies) = postProject
- {B5E62882-360E-46B2-A97F-50443BB795E3} = {B5E62882-360E-46B2-A97F-50443BB795E3}
- {1CB7F08A-A8E5-457B-A589-9878F126601D} = {1CB7F08A-A8E5-457B-A589-9878F126601D}
- {191F78D2-7A53-4EAF-94E9-433DF5496E6E} = {191F78D2-7A53-4EAF-94E9-433DF5496E6E}
- {6BB655FE-B823-4BE4-BDC9-FD3738FF82BC} = {6BB655FE-B823-4BE4-BDC9-FD3738FF82BC}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "exview", "examples\exview\exview.vcproj", "{470DFC62-B400-2B24-4FF1-B2AAA5936303}"
- ProjectSection(ProjectDependencies) = postProject
- {B5E62882-360E-46B2-A97F-50443BB795E3} = {B5E62882-360E-46B2-A97F-50443BB795E3}
- {1CB7F08A-A8E5-457B-A589-9878F126601D} = {1CB7F08A-A8E5-457B-A589-9878F126601D}
- {191F78D2-7A53-4EAF-94E9-433DF5496E6E} = {191F78D2-7A53-4EAF-94E9-433DF5496E6E}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "calib_camera2", "util\calib_camera2\calib_camera2.vcproj", "{7218026D-600A-2D4D-C387-44E5B226FA6A}"
- ProjectSection(ProjectDependencies) = postProject
- {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF} = {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF}
- {B5E62882-360E-46B2-A97F-50443BB795E3} = {B5E62882-360E-46B2-A97F-50443BB795E3}
- {191F78D2-7A53-4EAF-94E9-433DF5496E6E} = {191F78D2-7A53-4EAF-94E9-433DF5496E6E}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "calib_cparam", "util\calib_cparam\calib_cparam.vcproj", "{C5DDBA06-F8CF-0191-E0BB-3D92CD5C1538}"
- ProjectSection(ProjectDependencies) = postProject
- {B5E62882-360E-46B2-A97F-50443BB795E3} = {B5E62882-360E-46B2-A97F-50443BB795E3}
- {191F78D2-7A53-4EAF-94E9-433DF5496E6E} = {191F78D2-7A53-4EAF-94E9-433DF5496E6E}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "calib_dist", "util\calib_distortion\calib_dist.vcproj", "{0304C918-FB5D-5047-11BF-7DCB5020DFF4}"
- ProjectSection(ProjectDependencies) = postProject
- {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF} = {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF}
- {B5E62882-360E-46B2-A97F-50443BB795E3} = {B5E62882-360E-46B2-A97F-50443BB795E3}
- {191F78D2-7A53-4EAF-94E9-433DF5496E6E} = {191F78D2-7A53-4EAF-94E9-433DF5496E6E}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mk_patt", "util\mk_patt\mk_patt.vcproj", "{92E9C84C-BADB-EF76-FA80-740BA0F532DF}"
- ProjectSection(ProjectDependencies) = postProject
- {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF} = {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF}
- {B5E62882-360E-46B2-A97F-50443BB795E3} = {B5E62882-360E-46B2-A97F-50443BB795E3}
- {191F78D2-7A53-4EAF-94E9-433DF5496E6E} = {191F78D2-7A53-4EAF-94E9-433DF5496E6E}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libARgsub_lite", "lib\SRC\Gl\libARgsub_lite.vcproj", "{8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simpleLite", "examples\simpleLite\simpleLite.vcproj", "{A1BB0AD4-A5E7-4C0F-9FE8-D584F6B2FBF2}"
- ProjectSection(ProjectDependencies) = postProject
- {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF} = {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF}
- {B5E62882-360E-46B2-A97F-50443BB795E3} = {B5E62882-360E-46B2-A97F-50443BB795E3}
- {191F78D2-7A53-4EAF-94E9-433DF5496E6E} = {191F78D2-7A53-4EAF-94E9-433DF5496E6E}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libARvideo", "lib\SRC\VideoWin32DirectShow\libARvideo.vcproj", "{B5E62882-360E-46B2-A97F-50443BB795E3}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "collideTest", "examples\collide\collideTest.vcproj", "{5FA7A8DD-5430-4644-91A9-51626083BB97}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "loadMultiple", "examples\loadMultiple\loadMultiple.vcproj", "{783FACE5-1839-4EEF-9BA6-363214268B2E}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modeTest", "examples\modeTest\modeTest.vcproj", "{84700F48-BA9E-4465-AFEE-D31B15157A69}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "paddleTest", "examples\paddle\paddleTest.vcproj", "{FDE263E5-1713-4E16-8199-663CAECA981E}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "paddleDemo", "examples\paddleDemo\paddleDemo.vcproj", "{A363668A-A9B7-4CB4-89C6-67911CE040E0}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "paddleInteractionTest", "examples\paddleInteraction\paddleInteractionTest.vcproj", "{6057A7AF-B6DF-4535-8453-E27EDDDDDD02}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rangeTest", "examples\range\rangeTest.vcproj", "{43965D43-1F96-4C4C-AB04-912B388A779C}"
- ProjectSection(ProjectDependencies) = postProject
- {B5E62882-360E-46B2-A97F-50443BB795E3} = {B5E62882-360E-46B2-A97F-50443BB795E3}
- {1CB7F08A-A8E5-457B-A589-9878F126601D} = {1CB7F08A-A8E5-457B-A589-9878F126601D}
- {191F78D2-7A53-4EAF-94E9-433DF5496E6E} = {191F78D2-7A53-4EAF-94E9-433DF5496E6E}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "twoView", "examples\twoView\twoView.vcproj", "{AE939D29-D571-404E-A9DC-15B532FDA41D}"
- ProjectSection(ProjectDependencies) = postProject
- {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF} = {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF}
- {B5E62882-360E-46B2-A97F-50443BB795E3} = {B5E62882-360E-46B2-A97F-50443BB795E3}
- {191F78D2-7A53-4EAF-94E9-433DF5496E6E} = {191F78D2-7A53-4EAF-94E9-433DF5496E6E}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphicsTest", "util\graphicsTest\graphicsTest.vcproj", "{8C93A102-ABC7-4848-A183-BD1F3471159C}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "videoTest", "util\videoTest\videoTest.vcproj", "{401D60F6-AF80-481B-A6EB-9FB03130AB1F}"
- ProjectSection(ProjectDependencies) = postProject
- {B5E62882-360E-46B2-A97F-50443BB795E3} = {B5E62882-360E-46B2-A97F-50443BB795E3}
- {1CB7F08A-A8E5-457B-A589-9878F126601D} = {1CB7F08A-A8E5-457B-A589-9878F126601D}
- {191F78D2-7A53-4EAF-94E9-433DF5496E6E} = {191F78D2-7A53-4EAF-94E9-433DF5496E6E}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libARvrml", "lib\SRC\ARvrml\libarvrml.vcproj", "{C90F035F-437C-4285-BBCA-8DDC70582356}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simpleVRML", "examples\simpleVRML\simpleVRML.vcproj", "{7B5EFC13-7883-82CC-7D72-732240F68F29}"
- ProjectSection(ProjectDependencies) = postProject
- {C90F035F-437C-4285-BBCA-8DDC70582356} = {C90F035F-437C-4285-BBCA-8DDC70582356}
- {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF} = {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF}
- {B5E62882-360E-46B2-A97F-50443BB795E3} = {B5E62882-360E-46B2-A97F-50443BB795E3}
- {191F78D2-7A53-4EAF-94E9-433DF5496E6E} = {191F78D2-7A53-4EAF-94E9-433DF5496E6E}
- EndProjectSection
-EndProject
-Global
- GlobalSection(SolutionConfiguration) = preSolution
- Debug = Debug
- Release = Release
- Release (Intel) = Release (Intel)
- EndGlobalSection
- GlobalSection(ProjectConfiguration) = postSolution
- {191F78D2-7A53-4EAF-94E9-433DF5496E6E}.Debug.ActiveCfg = Debug|Win32
- {191F78D2-7A53-4EAF-94E9-433DF5496E6E}.Debug.Build.0 = Debug|Win32
- {191F78D2-7A53-4EAF-94E9-433DF5496E6E}.Release.ActiveCfg = Release|Win32
- {191F78D2-7A53-4EAF-94E9-433DF5496E6E}.Release.Build.0 = Release|Win32
- {191F78D2-7A53-4EAF-94E9-433DF5496E6E}.Release (Intel).ActiveCfg = Release|Win32
- {6BB655FE-B823-4BE4-BDC9-FD3738FF82BC}.Debug.ActiveCfg = Debug|Win32
- {6BB655FE-B823-4BE4-BDC9-FD3738FF82BC}.Debug.Build.0 = Debug|Win32
- {6BB655FE-B823-4BE4-BDC9-FD3738FF82BC}.Release.ActiveCfg = Release|Win32
- {6BB655FE-B823-4BE4-BDC9-FD3738FF82BC}.Release.Build.0 = Release|Win32
- {6BB655FE-B823-4BE4-BDC9-FD3738FF82BC}.Release (Intel).ActiveCfg = Release|Win32
- {1CB7F08A-A8E5-457B-A589-9878F126601D}.Debug.ActiveCfg = Debug|Win32
- {1CB7F08A-A8E5-457B-A589-9878F126601D}.Debug.Build.0 = Debug|Win32
- {1CB7F08A-A8E5-457B-A589-9878F126601D}.Release.ActiveCfg = Release|Win32
- {1CB7F08A-A8E5-457B-A589-9878F126601D}.Release.Build.0 = Release|Win32
- {1CB7F08A-A8E5-457B-A589-9878F126601D}.Release (Intel).ActiveCfg = Release|Win32
- {81A146C4-A7ED-462D-ADF3-FE93E82F2B9B}.Debug.ActiveCfg = Debug|Win32
- {81A146C4-A7ED-462D-ADF3-FE93E82F2B9B}.Debug.Build.0 = Debug|Win32
- {81A146C4-A7ED-462D-ADF3-FE93E82F2B9B}.Release.ActiveCfg = Release|Win32
- {81A146C4-A7ED-462D-ADF3-FE93E82F2B9B}.Release.Build.0 = Release|Win32
- {81A146C4-A7ED-462D-ADF3-FE93E82F2B9B}.Release (Intel).ActiveCfg = Release|Win32
- {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Debug.ActiveCfg = Debug|Win32
- {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Debug.Build.0 = Debug|Win32
- {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release.ActiveCfg = Release|Win32
- {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release.Build.0 = Release|Win32
- {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release (Intel).ActiveCfg = Release|Win32
- {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release (Intel).Build.0 = Release|Win32
- {591A24EE-AE23-7439-B131-D7A75370BFE8}.Debug.ActiveCfg = Debug|Win32
- {591A24EE-AE23-7439-B131-D7A75370BFE8}.Debug.Build.0 = Debug|Win32
- {591A24EE-AE23-7439-B131-D7A75370BFE8}.Release.ActiveCfg = Release|Win32
- {591A24EE-AE23-7439-B131-D7A75370BFE8}.Release.Build.0 = Release|Win32
- {591A24EE-AE23-7439-B131-D7A75370BFE8}.Release (Intel).ActiveCfg = Release|Win32
- {1E69B126-6965-4DEC-5FED-5A392CCDD2B5}.Debug.ActiveCfg = Debug|Win32
- {1E69B126-6965-4DEC-5FED-5A392CCDD2B5}.Debug.Build.0 = Debug|Win32
- {1E69B126-6965-4DEC-5FED-5A392CCDD2B5}.Release.ActiveCfg = Release|Win32
- {1E69B126-6965-4DEC-5FED-5A392CCDD2B5}.Release.Build.0 = Release|Win32
- {1E69B126-6965-4DEC-5FED-5A392CCDD2B5}.Release (Intel).ActiveCfg = Release|Win32
- {E50769E3-0646-8D8C-3318-308E7D1A9149}.Debug.ActiveCfg = Debug|Win32
- {E50769E3-0646-8D8C-3318-308E7D1A9149}.Debug.Build.0 = Debug|Win32
- {E50769E3-0646-8D8C-3318-308E7D1A9149}.Release.ActiveCfg = Release|Win32
- {E50769E3-0646-8D8C-3318-308E7D1A9149}.Release.Build.0 = Release|Win32
- {E50769E3-0646-8D8C-3318-308E7D1A9149}.Release (Intel).ActiveCfg = Release|Win32
- {AAE4C85D-5090-725A-1213-96DA1C47FA86}.Debug.ActiveCfg = Debug|Win32
- {AAE4C85D-5090-725A-1213-96DA1C47FA86}.Debug.Build.0 = Debug|Win32
- {AAE4C85D-5090-725A-1213-96DA1C47FA86}.Release.ActiveCfg = Release|Win32
- {AAE4C85D-5090-725A-1213-96DA1C47FA86}.Release.Build.0 = Release|Win32
- {AAE4C85D-5090-725A-1213-96DA1C47FA86}.Release (Intel).ActiveCfg = Release|Win32
- {470DFC62-B400-2B24-4FF1-B2AAA5936303}.Debug.ActiveCfg = Debug|Win32
- {470DFC62-B400-2B24-4FF1-B2AAA5936303}.Debug.Build.0 = Debug|Win32
- {470DFC62-B400-2B24-4FF1-B2AAA5936303}.Release.ActiveCfg = Release|Win32
- {470DFC62-B400-2B24-4FF1-B2AAA5936303}.Release.Build.0 = Release|Win32
- {470DFC62-B400-2B24-4FF1-B2AAA5936303}.Release (Intel).ActiveCfg = Release|Win32
- {7218026D-600A-2D4D-C387-44E5B226FA6A}.Debug.ActiveCfg = Debug|Win32
- {7218026D-600A-2D4D-C387-44E5B226FA6A}.Debug.Build.0 = Debug|Win32
- {7218026D-600A-2D4D-C387-44E5B226FA6A}.Release.ActiveCfg = Release|Win32
- {7218026D-600A-2D4D-C387-44E5B226FA6A}.Release.Build.0 = Release|Win32
- {7218026D-600A-2D4D-C387-44E5B226FA6A}.Release (Intel).ActiveCfg = Release|Win32
- {C5DDBA06-F8CF-0191-E0BB-3D92CD5C1538}.Debug.ActiveCfg = Debug|Win32
- {C5DDBA06-F8CF-0191-E0BB-3D92CD5C1538}.Debug.Build.0 = Debug|Win32
- {C5DDBA06-F8CF-0191-E0BB-3D92CD5C1538}.Release.ActiveCfg = Release|Win32
- {C5DDBA06-F8CF-0191-E0BB-3D92CD5C1538}.Release.Build.0 = Release|Win32
- {C5DDBA06-F8CF-0191-E0BB-3D92CD5C1538}.Release (Intel).ActiveCfg = Release|Win32
- {0304C918-FB5D-5047-11BF-7DCB5020DFF4}.Debug.ActiveCfg = Debug|Win32
- {0304C918-FB5D-5047-11BF-7DCB5020DFF4}.Debug.Build.0 = Debug|Win32
- {0304C918-FB5D-5047-11BF-7DCB5020DFF4}.Release.ActiveCfg = Release|Win32
- {0304C918-FB5D-5047-11BF-7DCB5020DFF4}.Release.Build.0 = Release|Win32
- {0304C918-FB5D-5047-11BF-7DCB5020DFF4}.Release (Intel).ActiveCfg = Release|Win32
- {92E9C84C-BADB-EF76-FA80-740BA0F532DF}.Debug.ActiveCfg = Debug|Win32
- {92E9C84C-BADB-EF76-FA80-740BA0F532DF}.Debug.Build.0 = Debug|Win32
- {92E9C84C-BADB-EF76-FA80-740BA0F532DF}.Release.ActiveCfg = Release|Win32
- {92E9C84C-BADB-EF76-FA80-740BA0F532DF}.Release.Build.0 = Release|Win32
- {92E9C84C-BADB-EF76-FA80-740BA0F532DF}.Release (Intel).ActiveCfg = Release|Win32
- {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF}.Debug.ActiveCfg = Debug|Win32
- {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF}.Debug.Build.0 = Debug|Win32
- {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF}.Release.ActiveCfg = Release|Win32
- {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF}.Release.Build.0 = Release|Win32
- {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF}.Release (Intel).ActiveCfg = Release|Win32
- {A1BB0AD4-A5E7-4C0F-9FE8-D584F6B2FBF2}.Debug.ActiveCfg = Debug|Win32
- {A1BB0AD4-A5E7-4C0F-9FE8-D584F6B2FBF2}.Debug.Build.0 = Debug|Win32
- {A1BB0AD4-A5E7-4C0F-9FE8-D584F6B2FBF2}.Release.ActiveCfg = Release|Win32
- {A1BB0AD4-A5E7-4C0F-9FE8-D584F6B2FBF2}.Release.Build.0 = Release|Win32
- {A1BB0AD4-A5E7-4C0F-9FE8-D584F6B2FBF2}.Release (Intel).ActiveCfg = Release|Win32
- {B5E62882-360E-46B2-A97F-50443BB795E3}.Debug.ActiveCfg = Debug|Win32
- {B5E62882-360E-46B2-A97F-50443BB795E3}.Debug.Build.0 = Debug|Win32
- {B5E62882-360E-46B2-A97F-50443BB795E3}.Release.ActiveCfg = Release|Win32
- {B5E62882-360E-46B2-A97F-50443BB795E3}.Release.Build.0 = Release|Win32
- {B5E62882-360E-46B2-A97F-50443BB795E3}.Release (Intel).ActiveCfg = Release|Win32
- {5FA7A8DD-5430-4644-91A9-51626083BB97}.Debug.ActiveCfg = Debug|Win32
- {5FA7A8DD-5430-4644-91A9-51626083BB97}.Debug.Build.0 = Debug|Win32
- {5FA7A8DD-5430-4644-91A9-51626083BB97}.Release.ActiveCfg = Release|Win32
- {5FA7A8DD-5430-4644-91A9-51626083BB97}.Release.Build.0 = Release|Win32
- {5FA7A8DD-5430-4644-91A9-51626083BB97}.Release (Intel).ActiveCfg = Release|Win32
- {5FA7A8DD-5430-4644-91A9-51626083BB97}.Release (Intel).Build.0 = Release|Win32
- {783FACE5-1839-4EEF-9BA6-363214268B2E}.Debug.ActiveCfg = Debug|Win32
- {783FACE5-1839-4EEF-9BA6-363214268B2E}.Debug.Build.0 = Debug|Win32
- {783FACE5-1839-4EEF-9BA6-363214268B2E}.Release.ActiveCfg = Release|Win32
- {783FACE5-1839-4EEF-9BA6-363214268B2E}.Release.Build.0 = Release|Win32
- {783FACE5-1839-4EEF-9BA6-363214268B2E}.Release (Intel).ActiveCfg = Release|Win32
- {783FACE5-1839-4EEF-9BA6-363214268B2E}.Release (Intel).Build.0 = Release|Win32
- {84700F48-BA9E-4465-AFEE-D31B15157A69}.Debug.ActiveCfg = Debug|Win32
- {84700F48-BA9E-4465-AFEE-D31B15157A69}.Debug.Build.0 = Debug|Win32
- {84700F48-BA9E-4465-AFEE-D31B15157A69}.Release.ActiveCfg = Release|Win32
- {84700F48-BA9E-4465-AFEE-D31B15157A69}.Release.Build.0 = Release|Win32
- {84700F48-BA9E-4465-AFEE-D31B15157A69}.Release (Intel).ActiveCfg = Release|Win32
- {84700F48-BA9E-4465-AFEE-D31B15157A69}.Release (Intel).Build.0 = Release|Win32
- {FDE263E5-1713-4E16-8199-663CAECA981E}.Debug.ActiveCfg = Debug|Win32
- {FDE263E5-1713-4E16-8199-663CAECA981E}.Debug.Build.0 = Debug|Win32
- {FDE263E5-1713-4E16-8199-663CAECA981E}.Release.ActiveCfg = Release|Win32
- {FDE263E5-1713-4E16-8199-663CAECA981E}.Release.Build.0 = Release|Win32
- {FDE263E5-1713-4E16-8199-663CAECA981E}.Release (Intel).ActiveCfg = Release|Win32
- {FDE263E5-1713-4E16-8199-663CAECA981E}.Release (Intel).Build.0 = Release|Win32
- {A363668A-A9B7-4CB4-89C6-67911CE040E0}.Debug.ActiveCfg = Debug|Win32
- {A363668A-A9B7-4CB4-89C6-67911CE040E0}.Debug.Build.0 = Debug|Win32
- {A363668A-A9B7-4CB4-89C6-67911CE040E0}.Release.ActiveCfg = Release|Win32
- {A363668A-A9B7-4CB4-89C6-67911CE040E0}.Release.Build.0 = Release|Win32
- {A363668A-A9B7-4CB4-89C6-67911CE040E0}.Release (Intel).ActiveCfg = Release|Win32
- {A363668A-A9B7-4CB4-89C6-67911CE040E0}.Release (Intel).Build.0 = Release|Win32
- {6057A7AF-B6DF-4535-8453-E27EDDDDDD02}.Debug.ActiveCfg = Debug|Win32
- {6057A7AF-B6DF-4535-8453-E27EDDDDDD02}.Debug.Build.0 = Debug|Win32
- {6057A7AF-B6DF-4535-8453-E27EDDDDDD02}.Release.ActiveCfg = Release|Win32
- {6057A7AF-B6DF-4535-8453-E27EDDDDDD02}.Release.Build.0 = Release|Win32
- {6057A7AF-B6DF-4535-8453-E27EDDDDDD02}.Release (Intel).ActiveCfg = Release|Win32
- {6057A7AF-B6DF-4535-8453-E27EDDDDDD02}.Release (Intel).Build.0 = Release|Win32
- {43965D43-1F96-4C4C-AB04-912B388A779C}.Debug.ActiveCfg = Debug|Win32
- {43965D43-1F96-4C4C-AB04-912B388A779C}.Debug.Build.0 = Debug|Win32
- {43965D43-1F96-4C4C-AB04-912B388A779C}.Release.ActiveCfg = Release|Win32
- {43965D43-1F96-4C4C-AB04-912B388A779C}.Release.Build.0 = Release|Win32
- {43965D43-1F96-4C4C-AB04-912B388A779C}.Release (Intel).ActiveCfg = Release|Win32
- {43965D43-1F96-4C4C-AB04-912B388A779C}.Release (Intel).Build.0 = Release|Win32
- {AE939D29-D571-404E-A9DC-15B532FDA41D}.Debug.ActiveCfg = Debug|Win32
- {AE939D29-D571-404E-A9DC-15B532FDA41D}.Debug.Build.0 = Debug|Win32
- {AE939D29-D571-404E-A9DC-15B532FDA41D}.Release.ActiveCfg = Release|Win32
- {AE939D29-D571-404E-A9DC-15B532FDA41D}.Release.Build.0 = Release|Win32
- {AE939D29-D571-404E-A9DC-15B532FDA41D}.Release (Intel).ActiveCfg = Release|Win32
- {AE939D29-D571-404E-A9DC-15B532FDA41D}.Release (Intel).Build.0 = Release|Win32
- {8C93A102-ABC7-4848-A183-BD1F3471159C}.Debug.ActiveCfg = Debug|Win32
- {8C93A102-ABC7-4848-A183-BD1F3471159C}.Debug.Build.0 = Debug|Win32
- {8C93A102-ABC7-4848-A183-BD1F3471159C}.Release.ActiveCfg = Release|Win32
- {8C93A102-ABC7-4848-A183-BD1F3471159C}.Release.Build.0 = Release|Win32
- {8C93A102-ABC7-4848-A183-BD1F3471159C}.Release (Intel).ActiveCfg = Release|Win32
- {8C93A102-ABC7-4848-A183-BD1F3471159C}.Release (Intel).Build.0 = Release|Win32
- {401D60F6-AF80-481B-A6EB-9FB03130AB1F}.Debug.ActiveCfg = Debug|Win32
- {401D60F6-AF80-481B-A6EB-9FB03130AB1F}.Debug.Build.0 = Debug|Win32
- {401D60F6-AF80-481B-A6EB-9FB03130AB1F}.Release.ActiveCfg = Release|Win32
- {401D60F6-AF80-481B-A6EB-9FB03130AB1F}.Release.Build.0 = Release|Win32
- {401D60F6-AF80-481B-A6EB-9FB03130AB1F}.Release (Intel).ActiveCfg = Release|Win32
- {401D60F6-AF80-481B-A6EB-9FB03130AB1F}.Release (Intel).Build.0 = Release|Win32
- {C90F035F-437C-4285-BBCA-8DDC70582356}.Debug.ActiveCfg = Debug|Win32
- {C90F035F-437C-4285-BBCA-8DDC70582356}.Release.ActiveCfg = Release|Win32
- {C90F035F-437C-4285-BBCA-8DDC70582356}.Release (Intel).ActiveCfg = Release|Win32
- {C90F035F-437C-4285-BBCA-8DDC70582356}.Release (Intel).Build.0 = Release|Win32
- {7B5EFC13-7883-82CC-7D72-732240F68F29}.Debug.ActiveCfg = Debug|Win32
- {7B5EFC13-7883-82CC-7D72-732240F68F29}.Release.ActiveCfg = Release|Win32
- {7B5EFC13-7883-82CC-7D72-732240F68F29}.Release (Intel).ActiveCfg = Release|Win32
- {7B5EFC13-7883-82CC-7D72-732240F68F29}.Release (Intel).Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- EndGlobalSection
- GlobalSection(ExtensibilityAddIns) = postSolution
- EndGlobalSection
-EndGlobal
Deleted: branches/hartmut-pre-2_8/artoolkit/Configure
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/Configure 2008-09-10 05:06:00 UTC (rev 305)
+++ branches/hartmut-pre-2_8/artoolkit/Configure 2008-09-10 05:07:07 UTC (rev 306)
@@ -1,258 +0,0 @@
-#!/bin/sh
-# ARToolKit Configure for Linux Video Devices
-#
-#####################################################
-
-MDIR=". \
- lib/SRC \
- lib/SRC/AR lib/SRC/ARMulti lib/SRC/Gl \
- lib/SRC/VideoLinux1394Cam lib/SRC/VideoLinuxDV \
- lib/SRC/VideoLinuxV4L lib/SRC/VideoSGI \
- lib/SRC/VideoMacOSX \
- lib/SRC/VideoGStreamer \
- lib/SRC/ARvrml \
- util \
- util/calib_camera2 util/calib_cparam util/calib_distortion \
- util/mk_patt util/graphicsTest util/videoTest \
- examples \
- examples/collide examples/exview \
- examples/loadMultiple examples/modeTest examples/multi examples/optical \
- examples/paddle examples/paddleDemo examples/paddleInteraction examples/range \
- examples/relation examples/simple examples/simple2 examples/simpleLite \
- examples/twoView examples/simpleVRML \
- "
-
-SED=/tmp/SED.$$
-trap "rm -f $SED; exit 0" 0 1 2 3 15
-
-
-
-E=`uname`
-if [ "$E" = "Linux" ]
-then
- echo "Select a video capture driver."
- echo " 1: Video4Linux"
- echo " 2: Video4Linux+JPEG Decompression (EyeToy)"
- echo " 3: Digital Video Camcoder through IEEE 1394 (DV Format)"
- echo " 4: Digital Video Camera through IEEE 1394 (VGA NONCOMPRESSED Image Format)"
- echo " 5: GStreamer Media Framework"
- echo -n "Enter : "
- read ANS
- if [ "$ANS" = "1" ]
- then
- echo
- echo "Color conversion should use x86 assembly (choose 'n' for 64bit systems)?"
- echo -n "Enter : "
- read ANS
- if [ "$ANS" = "y" ]
- then
- CCVT_OBJ="ccvt_i386.o"
- elif [ "$ANS" = "n" ]
- then
- CCVT_OBJ="ccvt_c.o"
- else
- echo "Please enter y or n."
- exit 0
- fi
- VIDEO_DRIVER="VideoLinuxV4L"
- CFLAG="-O -I/usr/X11R6/include"
- LDFLAG="-L/usr/X11R6/lib"
- ARFLAG="rs"
- RANLIB=""
- LIBS="-lglut -lGLU -lGL -lXi -lXmu -lX11 -lm"
- CONFIG="AR_INPUT_V4L"
- elif [ "$ANS" = "2" ]
- then
- echo
- echo "Color conversion should use x86 assembly (not working for 64bit)?"
- echo -n "Enter : "
- read ANS
- if [ "$ANS" = "y" ]
- then
- CCVT_OBJ="ccvt_i386.o"
- elif [ "$ANS" = "n" ]
- then
- CCVT_OBJ="ccvt_c.o"
- else
- echo "Please enter y or n."
- exit 0
- fi
- VIDEO_DRIVER="VideoLinuxV4L"
- CFLAG="-O -I/usr/X11R6/include -DUSE_EYETOY"
- LDFLAG="-L/usr/X11R6/lib"
- ARFLAG="rs"
- RANLIB=""
- LIBS="-lglut -lGLU -lGL -lXi -lXmu -lX11 -lm -ljpeg"
- CONFIG="AR_INPUT_V4L"
- elif [ "$ANS" = "3" ]
- then
- VIDEO_DRIVER="VideoLinuxDV"
- CFLAG="-O -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include"
- LDFLAG="-L/usr/X11R6/lib -L/usr/local/lib"
- ARFLAG="rs"
- RANLIB=""
- LIBS="-lraw1394 -ldv -lpthread -lglut -lGLU -lGL -lXi -lXmu -lX11 -lm"
- CONFIG="AR_INPUT_DV"
- elif [ "$ANS" = "4" ]
- then
- VIDEO_DRIVER="VideoLinux1394Cam"
- CFLAG="-O -I/usr/X11R6/include"
- LDFLAG="-L/usr/X11R6/lib"
- ARFLAG="rs"
- RANLIB=""
- LIBS="-lglut -lGLU -lGL -lXi -lXmu -lX11 -lm -lraw1394 -ldc1394_control"
- CONFIG="AR_INPUT_1394CAM"
- elif [ "$ANS" = "5" ]
- then
- VIDEO_DRIVER="VideoGStreamer"
- GST_INCLUDE=`pkg-config --cflags gstreamer-0.10`
- GST_LIBS=`pkg-config --libs gstreamer-0.10`
-
- CFLAG="-O $GST_INCLUDE -I/usr/X11R6/include -fPIC"
- LDFLAG="$GST_LIBS -L/usr/X11R6/lib -L/usr/local/lib"
- ARFLAG="rs"
- RANLIB=""
- LIBS="-lpthread -lglut -lGLU -lGL -lXi -lX11 -lm"
- CONFIG="AR_INPUT_GSTREAMER"
- else
- echo "Please enter 1,2,3,4 or 5."
- exit 0
- fi
- # Asking for debug mode (assumes gcc)
- echo "Do you want to create debug symbols? (y or n)"
- echo -n "Enter : "
- read ANS
- if [ "$ANS" = "y" ]
- then
- CFLAG="$CFLAG -g"
- elif [ "$ANS" = "n" ]
- then
- CFLAG="$CFLAG"
- else
- echo "Please enter y or n."
- exit 0
- fi
-elif [ "$E" = "IRIX" ]
-then
- VIDEO_DRIVER="VideoSGI"
- CFLAG="-O -n32"
- LDFLAG="-n32"
- ARFLAG="rs"
- RANLIB=""
- LIBS="-lglut -lGLU -lGL -lXmu -lX11 -lvl -lm"
-elif [ "$E" = "IRIX64" ]
-then
- VIDEO_DRIVER="VideoSGI"
- CFLAG="-O -n32"
- LDFLAG="-n32"
- ARFLAG="rs"
- RANLIB=""
- LIBS="-lglut -lGLU -lGL -lXmu -lX11 -lvl -lm"
-elif [ "$E" = "Darwin" ]
-then
- VIDEO_DRIVER="VideoMacOSX"
- CFLAG="-O"
- LDFLAG=""
- ARFLAG="-r"
- RANLIB="ranlib \$\@"
- LIBS="-framework Carbon -framework QuickTime -framework GLUT -framework OpenGL -framework AppKit -framework Foundation -lobjc"
-
- echo "Does your Mac have fast texture mapping hardware? (y or n)"
- echo -n "Enter : "
- read ANS
- if [ "$ANS" = "y" ]
- then
- APPLE_FAST_TEX="y"
- elif [ "$ANS" = "n" ]
- then
- APPLE_FAST_TEX="n"
- else
- echo "Please enter y or n."
- exit 0
- fi
-else
- echo "This configure command supports Linux, IRIX and MacOSX."
- exit 0
-fi
-
-echo "Build gsub libraries with texture rectangle support? (y or n)"
-echo "GL_NV_texture_rectangle is supported on most NVidia graphics cards"
-echo "and on ATi Radeon and better graphics cards"
-echo -n "Enter : "
-read ANS
-if ( [ "$ANS" = "y" ] || [ "$ANS" = "Y" ] || [ "$ANS" = "yes" ] || [ "$ANS" = "YES" ])
-then
- NVEXT="y"
-elif ( [ "$ANS" = "n" ] || [ "$ANS" = "N" ] || [ "$ANS" = "no" ] || [ "$ANS" = "NO" ])
-
-then
- NVEXT="n"
-else
- echo "Please enter y or n."
- exit 0
-fi
-
-echo $VIDEO_DRIVER | sed -e 's/\//\\\//g' >$SED
-VIDEO_DRIVER=`cat $SED`
-echo $CFLAG | sed -e 's/\//\\\//g' >$SED
-CFLAG=`cat $SED`
-echo $LDFLAG | sed -e 's/\//\\\//g' >$SED
-LDFLAG=`cat $SED`
-echo $ARFLAG | sed -e 's/\//\\\//g' >$SED
-ARFLAG=`cat $SED`
-echo $RANLIB | sed -e 's/\//\\\//g' >$SED
-RANLIB=`cat $SED`
-echo $LIBS | sed -e 's/\//\\\//g' >$SED
-LIBS=`cat $SED`
-echo $CCVT_OBJ | sed -e 's/\//\\\//g' >$SED
-CCVT_OBJ=`cat $SED`
-
-cat > $SED <<EOF
-s/@VIDEO_DRIVER@/$VIDEO_DRIVER/
-s/@CFLAG@/$CFLAG/
-s/@LDFLAG@/$LDFLAG/
-s/@ARFLAG@/$ARFLAG/
-s/@RANLIB@/$RANLIB/
-s/@LIBS@/$LIBS/
-s/@CCVT_OBJ@/$CCVT_OBJ/
-EOF
-
-
-for i in $MDIR
-do
- echo " create $i/Makefile"
- sed -f $SED <$i/Makefile.in > $i/Makefile
-done
-
-if [ "$NVEXT" = "y" ]
-then
-cat > $SED <<EOF
-s/#undef AR_OPENGL_TEXTURE_RECTANGLE/#define AR_OPENGL_TEXTURE_RECTANGLE/
-EOF
-elif [ "$NVEXT" = "n" ]
-then
-cat > $SED <<EOF
-s/#undef AR_OPENGL_TEXTURE_RECTANGLE/#undef AR_OPENGL_TEXTURE_RECTANGLE/
-EOF
-fi
-
-if [ "$APPLE_FAST_TEX" = "y" ]
-then
-cat >> $SED <<EOF
-s/#undef APPLE_TEXTURE_FAST_TRANSFER/#define APPLE_TEXTURE_FAST_TRANSFER/
-EOF
-fi
-
-if [ $CONFIG ]
-then
-UNDEF="#undef $CONFIG"
-DEF="#define $CONFIG"
-cat >> $SED <<EOF
-s/$UNDEF/$DEF/
-EOF
-fi
-
-echo " create include/AR/config.h"
-sed -f $SED <include/AR/config.h.in > include/AR/config.h
-
-echo "Done."
Deleted: branches/hartmut-pre-2_8/artoolkit/Configure.win32.bat
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/Configure.win32.bat 2008-09-10 05:06:00 UTC (rev 305)
+++ branches/hartmut-pre-2_8/artoolkit/Configure.win32.bat 2008-09-10 05:07:07 UTC (rev 306)
@@ -1,3 +0,0 @@
-echo copying config.h.in to config.h
-copy .\include\AR\config.h.in .\include\AR\config.h
-pause
\ No newline at end of file
Deleted: branches/hartmut-pre-2_8/artoolkit/Makefile.in
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/Makefile.in 2008-09-10 05:06:00 UTC (rev 305)
+++ branches/hartmut-pre-2_8/artoolkit/Makefile.in 2008-09-10 05:07:07 UTC (rev 306)
@@ -1,16 +0,0 @@
-all:
- (cd lib/SRC; make -f Makefile)
- (cd util; make -f Makefile)
- (cd examples; make -f Makefile)
-
-clean:
- (cd lib/SRC; make -f Makefile clean)
- (cd util; make -f Makefile clean)
- (cd examples; make -f Makefile clean)
-
-allclean:
- (cd lib/SRC; make -f Makefile allclean)
- (cd util; make -f Makefile allclean)
- (cd examples; make -f Makefile allclean)
- rm -f Makefile
- rm -f include/AR/config.h
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ret...@us...> - 2008-09-10 05:05:48
|
Revision: 305
http://artoolkit.svn.sourceforge.net/artoolkit/?rev=305&view=rev
Author: retrakker
Date: 2008-09-10 05:06:00 +0000 (Wed, 10 Sep 2008)
Log Message:
-----------
added framecounter to allow external libraries and ARToolKit
Modified Paths:
--------------
branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoGStreamer/video.c
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoGStreamer/video.c
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoGStreamer/video.c 2008-09-09 22:04:18 UTC (rev 304)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoGStreamer/video.c 2008-09-10 05:06:00 UTC (rev 305)
@@ -389,9 +389,10 @@
ar2VideoCapNext(AR2VideoParamT *vid)
{
if (vid && vid->frame != vid->frame_req) {
- vid->frame_req = vid->frame;
+ vid->frame_req = vid->frame;
+ return 0;
}
- return 0;
+ return -1;
}
int
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ret...@us...> - 2008-09-09 22:04:19
|
Revision: 304
http://artoolkit.svn.sourceforge.net/artoolkit/?rev=304&view=rev
Author: retrakker
Date: 2008-09-09 22:04:18 +0000 (Tue, 09 Sep 2008)
Log Message:
-----------
minor addition to debug problems with GStreamer
Modified Paths:
--------------
branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoGStreamer/video.c
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoGStreamer/video.c
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoGStreamer/video.c 2008-09-01 22:21:35 UTC (rev 303)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoGStreamer/video.c 2008-09-09 22:04:18 UTC (rev 304)
@@ -39,6 +39,10 @@
/* GStreamer identity needed for probing */
GstElement *probe;
+ /* give external APIs a hint of progress */
+ unsigned int frame;
+ unsigned int frame_req;
+
};
@@ -69,6 +73,7 @@
if (vid->videoBuffer)
{
+ vid->frame++;
memcpy(vid->videoBuffer, buffer->data, buffer->size);
}
@@ -108,8 +113,6 @@
/* allocate the buffer */
arMalloc(vid->videoBuffer, ARUint8, (vid->width * vid->height * AR_PIX_SIZE_DEFAULT) );
-
-
}
}
@@ -327,8 +330,16 @@
int
ar2VideoClose(AR2VideoParamT *vid) {
+
/* stop the pipeline */
gst_element_set_state (vid->pipeline, GST_STATE_NULL);
+
+ /* wait until it'stops or failed */
+ if (gst_element_get_state (vid->pipeline, NULL, NULL, -1) == GST_STATE_CHANGE_FAILURE) {
+ g_error ("libARvideo: failed to put GStreamer into STOPPED state!\n");
+ } else {
+ g_print ("libARvideo: GStreamer pipeline is STOPPED!\n");
+ }
/* free the pipeline handle */
gst_object_unref (GST_OBJECT (vid->pipeline));
@@ -377,15 +388,21 @@
int
ar2VideoCapNext(AR2VideoParamT *vid)
{
+ if (vid && vid->frame != vid->frame_req) {
+ vid->frame_req = vid->frame;
+ }
return 0;
}
int
ar2VideoInqSize(AR2VideoParamT *vid, int *x, int *y )
{
+ if(vid && x && y) {
- *x = vid->width; // width of your static image
- *y = vid->height; // height of your static image
+ *x = vid->width; // width of your static image
+ *y = vid->height; // height of your static image
+ g_print ("libARvideo: reported size: %dx%d\n", *x, *y);
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ret...@us...> - 2008-09-01 22:21:25
|
Revision: 303
http://artoolkit.svn.sourceforge.net/artoolkit/?rev=303&view=rev
Author: retrakker
Date: 2008-09-01 22:21:35 +0000 (Mon, 01 Sep 2008)
Log Message:
-----------
fix for GStreamer and merge with trunk version using prerolling depending on the type of pipeline
Modified Paths:
--------------
branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoGStreamer/video.c
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoGStreamer/video.c
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoGStreamer/video.c 2008-08-27 01:16:29 UTC (rev 302)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoGStreamer/video.c 2008-09-01 22:21:35 UTC (rev 303)
@@ -22,7 +22,7 @@
#include <string.h>
-#define GSTREAMER_TEST_LAUNCH_CFG "videotestsrc ! capsfilter caps=video/x-raw-rgb,bpp=24 ! identity name=artoolkit ! fakesink"
+#define GSTREAMER_TEST_LAUNCH_CFG "videotestsrc ! ffmpegcolorspace ! capsfilter caps=video/x-raw-rgb,bpp=24 ! identity name=artoolkit ! fakesink"
struct _AR2VideoParamT {
@@ -63,29 +63,8 @@
/* only do initialy for the buffer */
if (vid->videoBuffer == NULL && buffer)
- {
-
- /*
- * Get the capabilities of the frame, we need that in order
- * to extract information about the frame
- */
- caps=gst_pad_get_negotiated_caps(pad);
- str=gst_caps_get_structure(caps,0);
-
- /* Get some data about the frame */
- gst_structure_get_int(str,"width",&width);
- gst_structure_get_int(str,"height",&height);
- gst_structure_get_double(str,"framerate",&rate);
-
- vid->width = width;
- vid->height = height;
-
- g_print("libARvideo: GStreamer negotiated %dx%d (size: %d / expected: %d)\n",width,height,buffer->size, (vid->width * vid->height * AR_PIX_SIZE_DEFAULT) );
-
- /* allocate the buffer */
-
- arMalloc(vid->videoBuffer, ARUint8, (vid->width * vid->height * AR_PIX_SIZE_DEFAULT) );
-
+ {
+ g_print("libARvideo error! Buffer not allocated\n");
}
if (vid->videoBuffer)
@@ -96,18 +75,22 @@
return TRUE;
}
-void
-testing_pad(GstPad *pad)
-{
+
+static
+void video_caps_notify(GObject* obj, GParamSpec* pspec, gpointer data) {
+
const GstCaps *caps;
GstStructure *str;
gint width,height;
gdouble rate;
+
+ AR2VideoParamT *vid = (AR2VideoParamT*)data;
- caps=gst_pad_get_negotiated_caps(pad);
+ caps = gst_pad_get_negotiated_caps((GstPad*)obj);
if (caps) {
+
str=gst_caps_get_structure(caps,0);
/* Get some data about the frame */
@@ -115,13 +98,18 @@
gst_structure_get_int(str,"height",&height);
gst_structure_get_double(str,"framerate",&rate);
- g_print("libARvideo: GStreamer negotiated %dx%d\n",width,height);
- } else {
- return;
-#if 0
- g_print("Nothing yet!");
-#endif
+ g_print("libARvideo: GStreamer negotiated %dx%d @%3.3fps\n", width, height,rate);
+ vid->width = width;
+ vid->height = height;
+
+ g_print("libARvideo: allocating %d bytes\n",(vid->width * vid->height * AR_PIX_SIZE_DEFAULT));
+
+ /* allocate the buffer */
+ arMalloc(vid->videoBuffer, ARUint8, (vid->width * vid->height * AR_PIX_SIZE_DEFAULT) );
+
+
+
}
}
@@ -178,8 +166,7 @@
int arVideoCapNext( void )
{
- ar2VideoCapNext(gVid);
- return 0;
+ return ar2VideoCapNext(gVid);;
}
/*---------------------------------------------------------------------------*/
@@ -193,6 +180,7 @@
GstPad *pad, *peerpad;
GstXML *xml;
GstStateChangeReturn _ret;
+ int is_live;
char *config;
/* If no config string is supplied, we should use the environment variable, otherwise set a sane default */
@@ -258,56 +246,52 @@
g_print("Pipeline has no element named 'artoolkit'!\n");
return 0;
};
-
+
/* get the pad from the probe (the source pad seems to be more flexible) */
pad = gst_element_get_pad (vid->probe, "src");
-
+ /* get the peerpad aka sink */
+ peerpad = gst_pad_get_peer(pad);
+
/* install the probe callback for capturing */
gst_pad_add_buffer_probe (pad, G_CALLBACK (cb_have_data), vid);
-
-
-#if 0
- /* request ready state */
+
+ g_signal_connect(pad, "notify::caps", G_CALLBACK(video_caps_notify), vid);
+
+ /* Needed to fill the information for ARVidInfo */
gst_element_set_state (vid->pipeline, GST_STATE_READY);
-
- /* check if stream is ready */
+
+ /* wait until it's up and running or failed */
if (gst_element_get_state (vid->pipeline, NULL, NULL, -1) == GST_STATE_CHANGE_FAILURE) {
g_error ("libARvideo: failed to put GStreamer into READY state!\n");
} else {
+
+ is_live = (_ret == GST_STATE_CHANGE_NO_PREROLL) ? 1 : 0;
g_print ("libARvideo: GStreamer pipeline is READY!\n");
}
-#endif
/* Needed to fill the information for ARVidInfo */
- gst_element_set_state (vid->pipeline, GST_STATE_PAUSED);
+ _ret = gst_element_set_state (vid->pipeline, GST_STATE_PAUSED);
- peerpad = gst_pad_get_peer(pad);
-
- testing_pad(peerpad);
+ is_live = (_ret == GST_STATE_CHANGE_NO_PREROLL) ? 1 : 0;
+ /* wait until it's up and running or failed */
+ if (gst_element_get_state (vid->pipeline, NULL, NULL, -1) == GST_STATE_CHANGE_FAILURE) {
+ g_error ("libARvideo: failed to put GStreamer into PAUSED state!\n");
+ } else {
+ g_print ("libARvideo: GStreamer pipeline is PAUSED!\n",is_live);
+ }
+
/* dismiss the pad */
gst_object_unref (pad);
/* dismiss the peer-pad */
gst_object_unref (peerpad);
-
- /* wait until it's up and running or failed */
- if (gst_element_get_state (vid->pipeline, NULL, NULL, -1) == GST_STATE_CHANGE_FAILURE) {
- g_error ("libARvideo: failed to put GStreamer into PAUSE state!\n");
- } else {
- g_print ("libARvideo: GStreamer pipeline is PAUSED!\n");
- }
- /* now preroll for V4L v2 interfaces */
- if (
- (strstr(config, "v4l2src") != 0) ||
- (strstr(config, "dv1394src") != 0) ||
- (strstr(config, "rtspsrc") != 0) /* ||
- (strstr(config, "videotestsrc") != 0) */)
- {
+ /* now preroll for live sources */
+ if (is_live) {
- g_print ("libARvdeo: need special prerolling for GStreamer\n");
+ g_print ("libARvdeo: need special prerolling for live sources\n");
/* set playing state of the pipeline */
gst_element_set_state (vid->pipeline, GST_STATE_PLAYING);
@@ -393,8 +377,7 @@
int
ar2VideoCapNext(AR2VideoParamT *vid)
{
- /* gstreamer should */
- return TRUE;
+ return 0;
}
int
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ret...@us...> - 2008-08-27 01:16:19
|
Revision: 302
http://artoolkit.svn.sourceforge.net/artoolkit/?rev=302&view=rev
Author: retrakker
Date: 2008-08-27 01:16:29 +0000 (Wed, 27 Aug 2008)
Log Message:
-----------
- minor fix for Visual Studio 2008 build
Modified Paths:
--------------
branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/lib/SRC/Gl/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/CMakeLists.txt
Modified: branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt 2008-08-25 02:03:29 UTC (rev 301)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt 2008-08-27 01:16:29 UTC (rev 302)
@@ -83,6 +83,7 @@
#
set(GLUT_ROOT_PATH "${CMAKE_SOURCE_DIR}/${FREEGLUT_ROOT_DIR}" CACHE PATH "GLUT root folder")
set(GLUT_LIBRARIES glut)
+ set(GLUT_FOUND TRUE)
endif(MSVC)
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/Gl/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/Gl/CMakeLists.txt 2008-08-25 02:03:29 UTC (rev 301)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/Gl/CMakeLists.txt 2008-08-27 01:16:29 UTC (rev 302)
@@ -1,8 +1,5 @@
-find_package(OpenGL)
-find_package(GLUT)
-
if(GLUT_FOUND)
#
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/CMakeLists.txt 2008-08-25 02:03:29 UTC (rev 301)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/CMakeLists.txt 2008-08-27 01:16:29 UTC (rev 302)
@@ -25,4 +25,4 @@
DSVL
)
-artoolkit_lib_install(${LIB_NAME})
\ No newline at end of file
+artoolkit_install(${LIB_NAME})
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ret...@us...> - 2008-08-25 02:03:19
|
Revision: 301
http://artoolkit.svn.sourceforge.net/artoolkit/?rev=301&view=rev
Author: retrakker
Date: 2008-08-25 02:03:29 +0000 (Mon, 25 Aug 2008)
Log Message:
-----------
- added PIC (position independent code) flag for GCC based compilers
this is necessary for ia64/x86_64 and is recommended for x86
also for static libraries
- added missing headers to the sourcecode packager
- correct issues with rpath setting on Unix
Modified Paths:
--------------
branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake
branches/hartmut-pre-2_8/artoolkit/lib/SRC/AR/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/lib/SRC/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoGStreamer/CMakeLists.txt
Modified: branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt 2008-08-24 22:04:24 UTC (rev 300)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt 2008-08-25 02:03:29 UTC (rev 301)
@@ -26,7 +26,16 @@
set(ARTOOLKIT_SHARE_FOLDER share/artoolkit-${ARTOOLKIT_VERSION_SHORT})
+
#
+# apply the RPATH to be used when installing, necessary to help the
+# dynamic library finding libs on ia64 systems
+#
+if(UNIX AND NOT APPLE)
+ set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+endif(UNIX AND NOT APPLE)
+
+#
# Depending on what is available we work our way through
#
find_package(OpenGL)
Modified: branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake 2008-08-24 22:04:24 UTC (rev 300)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake 2008-08-25 02:03:29 UTC (rev 301)
@@ -100,12 +100,20 @@
LIBRARY DESTINATION ${lib_dest}
ARCHIVE DESTINATION lib
PUBLIC_HEADER DESTINATION include/AR
+ PERMISSIONS
+ OWNER_EXECUTE OWNER_WRITE OWNER_READ
+ GROUP_EXECUTE GROUP_READ
+ WORLD_EXECUTE WORLD_READ
)
else(CMAKE_VERSION MATCHES 2.6)
install(TARGETS ${target}
RUNTIME DESTINATION bin
LIBRARY DESTINATION ${lib_dest}
ARCHIVE DESTINATION lib
+ PERMISSIONS
+ OWNER_EXECUTE OWNER_WRITE OWNER_READ
+ GROUP_EXECUTE GROUP_READ
+ WORLD_EXECUTE WORLD_READ
)
endif(CMAKE_VERSION MATCHES 2.6)
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/AR/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/AR/CMakeLists.txt 2008-08-24 22:04:24 UTC (rev 300)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/AR/CMakeLists.txt 2008-08-25 02:03:29 UTC (rev 301)
@@ -52,14 +52,22 @@
${CMAKE_BINARY_DIR}/include/AR/config.h
)
-set(HDRS ${HDRS} ${CMAKE_SOURCE_DIR}/include/AR/ar.h)
+list(APPEND HDRS
+ ${CMAKE_SOURCE_DIR}/include/AR/ar.h
+ ${CMAKE_SOURCE_DIR}/include/AR/param.h
+ ${CMAKE_SOURCE_DIR}/include/AR/matrix.h
+ )
+if(NOT WIN32)
+ add_definitions(-fPIC)
+endif(NOT WIN32)
+
add_library(${LIB_NAME} ${SRCS} ${HDRS})
artoolkit_install(${LIB_NAME})
install(FILES ${HDRS}
- DESTINATION include/AR
+ DESTINATION include/AR
)
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/CMakeLists.txt 2008-08-24 22:04:24 UTC (rev 300)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/CMakeLists.txt 2008-08-25 02:03:29 UTC (rev 301)
@@ -5,6 +5,15 @@
##############################################################################
+#
+# On gcc we need position independent code for the libraries
+# this is required for x86_64 and recommended for x86
+#
+if(UNIX AND NOT APPLE)
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC" )
+endif(UNIX AND NOT APPLE)
+
+
# Core library
add_subdirectory(AR)
add_subdirectory(ARMulti)
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoGStreamer/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoGStreamer/CMakeLists.txt 2008-08-24 22:04:24 UTC (rev 300)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoGStreamer/CMakeLists.txt 2008-08-25 02:03:29 UTC (rev 301)
@@ -17,3 +17,11 @@
AR
${GSTREAMER_LIBRARIES}
)
+
+set_target_properties(${LIB_NAME} PROPERTIES
+ VERSION ${ARTOOLKIT_VERSION_FULL}
+ SOVERSION ${ARTOOLKIT_VERSION_SHORT}
+ )
+
+artoolkit_install(${LIB_NAME})
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ret...@us...> - 2008-08-24 22:04:14
|
Revision: 300
http://artoolkit.svn.sourceforge.net/artoolkit/?rev=300&view=rev
Author: retrakker
Date: 2008-08-24 22:04:24 +0000 (Sun, 24 Aug 2008)
Log Message:
-----------
fixed typo in macro definition - should install files correctly now
Modified Paths:
--------------
branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake
Modified: branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake 2008-08-24 21:44:24 UTC (rev 299)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake 2008-08-24 22:04:24 UTC (rev 300)
@@ -93,22 +93,20 @@
else (WIN32)
set(lib_dest lib)
endif(WIN32)
-
if (CMAKE_VERSION MATCHES 2.6)
- install(TARGETS ${target}
- ARCHIVE DESTINATION lib
- LIBRARY DESTINATION ${lib_dest}
- RUNTIME DESTINATION bin
- PUBLIC_HEADER DESTINATION include/AR
- )
- elseif(CMAKE_VERSION MATCHES 2.6)
- install(TARGETS ${target}
- ARCHIVE DESTINATION lib
- LIBRARY DESTINATION ${lib_dest}
- RUNTIME DESTINATION bin
- PUBLIC_HEADER DESTINATION include/AR
- )
+ install(TARGETS ${target}
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION ${lib_dest}
+ ARCHIVE DESTINATION lib
+ PUBLIC_HEADER DESTINATION include/AR
+ )
+ else(CMAKE_VERSION MATCHES 2.6)
+ install(TARGETS ${target}
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION ${lib_dest}
+ ARCHIVE DESTINATION lib
+ )
endif(CMAKE_VERSION MATCHES 2.6)
endmacro(artoolkit_install target)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ret...@us...> - 2008-08-24 21:44:13
|
Revision: 299
http://artoolkit.svn.sourceforge.net/artoolkit/?rev=299&view=rev
Author: retrakker
Date: 2008-08-24 21:44:24 +0000 (Sun, 24 Aug 2008)
Log Message:
-----------
minor fix for Linux build
Modified Paths:
--------------
branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindOpenVRML.cmake
branches/hartmut-pre-2_8/artoolkit/bin/Data/object_data_vrml
Modified: branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindOpenVRML.cmake
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindOpenVRML.cmake 2008-08-24 02:24:36 UTC (rev 298)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindOpenVRML.cmake 2008-08-24 21:44:24 UTC (rev 299)
@@ -123,14 +123,18 @@
SET(OPENVRML_LIBRARIES
${OPENVRML_openvrml_LIBRARY}
${OPENVRML_gl_LIBRARY}
- ${OPENVRML_jpeg_LIBRARY}
- ${OPENVRML_boost_LIBRARY}
- ${OPENVRML_js_LIBRARY}
- ${OPENVRML_png_LIBRARY}
- ${OPENVRML_plc4_LIBRARY}
- ${OPENVRML_nspr4_LIBRARY}
- ${OPENVRML_plds4_LIBRARY}
)
+ if(APPLE)
+ list(APPEND
+ ${OPENVRML_jpeg_LIBRARY}
+ ${OPENVRML_boost_LIBRARY}
+ ${OPENVRML_js_LIBRARY}
+ ${OPENVRML_png_LIBRARY}
+ ${OPENVRML_plc4_LIBRARY}
+ ${OPENVRML_nspr4_LIBRARY}
+ ${OPENVRML_plds4_LIBRARY}
+ )
+ endif(APPLE)
ENDIF(OPENVRML_openvrml_LIBRARY AND OPENVRML_INCLUDE_DIR)
Modified: branches/hartmut-pre-2_8/artoolkit/bin/Data/object_data_vrml
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/bin/Data/object_data_vrml 2008-08-24 02:24:36 UTC (rev 298)
+++ branches/hartmut-pre-2_8/artoolkit/bin/Data/object_data_vrml 2008-08-24 21:44:24 UTC (rev 299)
@@ -2,8 +2,7 @@
2
#pattern 1
-#VRML Wrl/bud_B.dat
-VRML Wrl/snoman.dat
+VRML Wrl/bud_B.dat
Data/patt.hiro
80.0
0.0 0.0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ret...@us...> - 2008-08-24 02:24:30
|
Revision: 298
http://artoolkit.svn.sourceforge.net/artoolkit/?rev=298&view=rev
Author: retrakker
Date: 2008-08-24 02:24:36 +0000 (Sun, 24 Aug 2008)
Log Message:
-----------
Modified Paths:
--------------
branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake
branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindOpenVRML.cmake
branches/hartmut-pre-2_8/artoolkit/CMakeModules/Packaging.cmake.in
branches/hartmut-pre-2_8/artoolkit/examples/simpleVRML/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARvrml/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/lib/SRC/CMakeLists.txt
Modified: branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt 2008-08-22 02:22:09 UTC (rev 297)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt 2008-08-24 02:24:36 UTC (rev 298)
@@ -31,11 +31,21 @@
#
find_package(OpenGL)
find_package(GLUT)
-find_package(GStreamer)
-find_package(OpenVRML)
find_package(PkgConfig)
+
+find_package(GStreamer)
+
+
#
+# Optional build with OpenVRML
+#
+option(ARTOOLKIT_USE_OPENVRML "Create VRML based libraries and examples" OFF)
+if (ARTOOLKIT_USE_OPENVRML)
+ find_package(OpenVRML)
+endif(ARTOOLKIT_USE_OPENVRML)
+
+#
# Preset some of the output directories
#
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE PATH "Executable output folder")
@@ -116,15 +126,15 @@
add_subdirectory(patterns)
-#
-# Uninstall
-#
-configure_file(
- "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/cmake_uninstall.cmake.in"
- "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
- IMMEDIATE @ONLY)
-
-add_custom_target(uninstall
+#
+# Uninstall
+#
+configure_file(
+ "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/cmake_uninstall.cmake.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+ IMMEDIATE @ONLY)
+
+add_custom_target(uninstall
"${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
Modified: branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake 2008-08-22 02:22:09 UTC (rev 297)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake 2008-08-24 02:24:36 UTC (rev 298)
@@ -3,6 +3,7 @@
set(ARTOOLKIT_FILES_DATA
${CMAKE_SOURCE_DIR}/bin/Data/camera_para.dat
${CMAKE_SOURCE_DIR}/bin/Data/object_data
+ ${CMAKE_SOURCE_DIR}/bin/Data/object_data_vrml
${CMAKE_SOURCE_DIR}/bin/Data/object_data2
${CMAKE_SOURCE_DIR}/bin/Data/paddle_data
${CMAKE_SOURCE_DIR}/bin/Data/patt.calib
@@ -15,6 +16,21 @@
${CMAKE_SOURCE_DIR}/bin/Data/WDM_camera.xml
)
+set(ARTOOLKIT_FILES_VRML
+ ${CMAKE_SOURCE_DIR}/bin/Wrl/bud_B.dat
+ ${CMAKE_SOURCE_DIR}/bin/Wrl/snoman.dat
+ ${CMAKE_SOURCE_DIR}/bin/Wrl/bud_B.wrl
+ ${CMAKE_SOURCE_DIR}/bin/Wrl/snoman.wrl
+)
+
+set(ARTOOLKIT_FILES_VRML_TEXTURES
+ ${CMAKE_SOURCE_DIR}/bin/Wrl/textures/bud_B_Fractal_2.gif
+ ${CMAKE_SOURCE_DIR}/bin/Wrl/textures/bud_B_Ramp_6.gif
+ ${CMAKE_SOURCE_DIR}/bin/Wrl/textures/bud_B_Ramp_2.gif
+ ${CMAKE_SOURCE_DIR}/bin/Wrl/textures/bud_B_Ramp_4.gif
+ ${CMAKE_SOURCE_DIR}/bin/Wrl/textures/bud_B_Ramp_5.gif
+)
+
set(ARTOOLKIT_FILES_DATA_WIN32
${CMAKE_SOURCE_DIR}/bin/Data/WDM_camera_flipV.xml
${CMAKE_SOURCE_DIR}/bin/Data/WDM_camera.xml
Modified: branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindOpenVRML.cmake
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindOpenVRML.cmake 2008-08-22 02:22:09 UTC (rev 297)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindOpenVRML.cmake 2008-08-24 02:24:36 UTC (rev 298)
@@ -10,7 +10,28 @@
# Created by Robert Osfield.
# Modified for the debug library by Jean-S?stien Guay.
+
+set(OPENVRML_LIB_SEARCH_PATHS
+ ${CMAKE_SOURCE_DIR}/../openvrml-0.16.6-bin-macosx/lib
+ $ENV{OPENVRML_DIR}/lib
+ $ENV{OPENVRML_DIR}
+ $ENV{OSGDIR}/lib
+ $ENV{OSGDIR}
+ $ENV{OSG_ROOT}/lib
+ ~/Library/Frameworks
+ /Library/Frameworks
+ /usr/local/lib
+ /usr/lib
+ /sw/lib
+ /opt/local/lib
+ /opt/csw/lib
+ /opt/lib
+ [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
+ /usr/freeware/lib64
+ )
+
FIND_PATH(OPENVRML_INCLUDE_DIR openvrml/system.h
+ ${CMAKE_SOURCE_DIR}/../openvrml-0.16.6-bin-macosx/include
$ENV{OPENVRML_DIR}/include
$ENV{OPENVRML_DIR}
$ENV{OSGDIR}/include
@@ -28,48 +49,54 @@
/usr/freeware/include
)
-FIND_LIBRARY(OPENVRML_openvrml_LIBRARY
- NAMES openvrml
+FIND_LIBRARY(OPENVRML_jpeg_LIBRARY
+ NAMES jpeg
PATHS
- $ENV{OPENVRML_DIR}/lib
- $ENV{OPENVRML_DIR}
- $ENV{OSGDIR}/lib
- $ENV{OSGDIR}
- $ENV{OSG_ROOT}/lib
- ~/Library/Frameworks
- /Library/Frameworks
- /usr/local/lib
- /usr/lib
- /sw/lib
- /opt/local/lib
- /opt/csw/lib
- /opt/lib
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
- /usr/freeware/lib64
+ ${OPENVRML_LIB_SEARCH_PATHS}
)
+FIND_LIBRARY(OPENVRML_png_LIBRARY
+ NAMES png
+ PATHS
+ ${OPENVRML_LIB_SEARCH_PATHS}
+)
+
FIND_LIBRARY(OPENVRML_gl_LIBRARY
NAMES openvrml-gl
PATHS
- $ENV{OPENVRML_DIR}/lib
- $ENV{OPENVRML_DIR}
- $ENV{OSGDIR}/lib
- $ENV{OSGDIR}
- $ENV{OSG_ROOT}/lib
- ~/Library/Frameworks
- /Library/Frameworks
- /usr/local/lib
- /usr/lib
- /sw/lib
- /opt/local/lib
- /opt/csw/lib
- /opt/lib
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
- /usr/freeware/lib64
+ ${OPENVRML_LIB_SEARCH_PATHS}
)
+FIND_LIBRARY(OPENVRML_js_LIBRARY
+ NAMES js
+ PATHS
+ ${OPENVRML_LIB_SEARCH_PATHS}
+)
+FIND_LIBRARY(OPENVRML_boost_LIBRARY
+ NAMES boost_thread-1_33_1
+ PATHS
+ ${OPENVRML_LIB_SEARCH_PATHS}
+)
+FIND_LIBRARY(OPENVRML_plds4_LIBRARY
+ NAMES plds4
+ PATHS
+ ${OPENVRML_LIB_SEARCH_PATHS}
+)
+
+FIND_LIBRARY(OPENVRML_nspr4_LIBRARY
+ NAMES nspr4
+ PATHS
+ ${OPENVRML_LIB_SEARCH_PATHS}
+)
+
+FIND_LIBRARY(OPENVRML_plc4_LIBRARY
+ NAMES plc4
+ PATHS
+ ${OPENVRML_LIB_SEARCH_PATHS}
+)
+
FIND_LIBRARY(OPENVRML_LIBRARY_DEBUG
NAMES openvrmld
PATHS
@@ -93,10 +120,21 @@
SET(OPENVRML_FOUND "NO")
IF(OPENVRML_openvrml_LIBRARY AND OPENVRML_INCLUDE_DIR)
SET(OPENVRML_FOUND "YES")
+ SET(OPENVRML_LIBRARIES
+ ${OPENVRML_openvrml_LIBRARY}
+ ${OPENVRML_gl_LIBRARY}
+ ${OPENVRML_jpeg_LIBRARY}
+ ${OPENVRML_boost_LIBRARY}
+ ${OPENVRML_js_LIBRARY}
+ ${OPENVRML_png_LIBRARY}
+ ${OPENVRML_plc4_LIBRARY}
+ ${OPENVRML_nspr4_LIBRARY}
+ ${OPENVRML_plds4_LIBRARY}
+ )
ENDIF(OPENVRML_openvrml_LIBRARY AND OPENVRML_INCLUDE_DIR)
-SET(OPENVRML_LIBRARIES ${OPENVRML_openvrml_LIBRARY} ${OPENVRML_gl_LIBRARY})
+
#-------------- next part --------------
IF (WIN32)
INCLUDE_DIRECTORIES( ${OPENVRML_INCLUDE_DIR} ${OPENVRML_INCLUDE_DIR}/openvrml ${JPEG_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
Modified: branches/hartmut-pre-2_8/artoolkit/CMakeModules/Packaging.cmake.in
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeModules/Packaging.cmake.in 2008-08-22 02:22:09 UTC (rev 297)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeModules/Packaging.cmake.in 2008-08-24 02:24:36 UTC (rev 298)
@@ -49,7 +49,7 @@
if (APPLE)
# only use the PackageMaker version on Mac
set(CPACK_GENERATOR "PackageMaker")
- elif(APPLE)
+ else(APPLE)
# use the source and deb package generators if possible
set(CPACK_GENERATOR "STGZ;TGZ;DEB")
Modified: branches/hartmut-pre-2_8/artoolkit/examples/simpleVRML/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/examples/simpleVRML/CMakeLists.txt 2008-08-22 02:22:09 UTC (rev 297)
+++ branches/hartmut-pre-2_8/artoolkit/examples/simpleVRML/CMakeLists.txt 2008-08-24 02:24:36 UTC (rev 298)
@@ -7,8 +7,6 @@
simpleVRML.c
)
-
-
if(APPLE)
set(MACOSX_BUNDLE_BUNDLE_NAME ${EXE_NAME})
@@ -36,8 +34,33 @@
MACOSX_PACKAGE_LOCATION "Resources/Data/multi"
)
+ set_source_files_properties(
+ ${ARTOOLKIT_FILES_VRML}
+ PROPERTIES
+ HEADER_FILE_ONLY TRUE
+ MACOSX_PACKAGE_LOCATION "Resources/Wrl"
+ )
+
+ set_source_files_properties(
+ ${ARTOOLKIT_FILES_VRML_TEXTURES}
+ PROPERTIES
+ HEADER_FILE_ONLY TRUE
+ MACOSX_PACKAGE_LOCATION "Resources/Wrl/textures"
+ )
+
+
+ set_source_files_properties(
+ ${OPENVRML_LIBRARIES}
+ PROPERTIES
+ HEADER_FILE_ONLY TRUE
+ MACOSX_PACKAGE_LOCATION "MacOS"
+ )
+
add_executable(${EXE_NAME} MACOSX_BUNDLE
${SRCS} ${CMAKE_SOURCE_DIR}/share/ARToolKit.icns
+ ${ARTOOLKIT_FILES_VRML_TEXTURES}
+ ${ARTOOLKIT_FILES_VRML}
+ ${ARTOOLKIT_FILES_DATA}
)
else(APPLE)
@@ -46,8 +69,9 @@
target_link_libraries(${EXE_NAME}
+ ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES} ${OPENVRML_LIBRARIES}
AR ARgsub ARgsub_lite ARgsubUtil ARvrml ARvideo
- ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES}
- ${OPENVRML_LIBRARIES})
+ stdc++
+ )
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARvrml/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARvrml/CMakeLists.txt 2008-08-22 02:22:09 UTC (rev 297)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARvrml/CMakeLists.txt 2008-08-24 02:24:36 UTC (rev 298)
@@ -52,7 +52,12 @@
add_library(${lib_name} ${hdrs_public} ${srcs_openvrml})
-target_link_libraries(${lib_name} AR ${OPENGL_LIBRARY} ${GLUT_LIBRARIES})
+target_link_libraries(${lib_name}
+ AR
+ ${OPENVRML_LIBRARIES}
+ ${OPENGL_LIBRARY}
+ ${GLUT_LIBRARIES}
+ )
artoolkit_install(${lib_name})
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/CMakeLists.txt 2008-08-22 02:22:09 UTC (rev 297)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/CMakeLists.txt 2008-08-24 02:24:36 UTC (rev 298)
@@ -47,9 +47,9 @@
endif(USE_GSTREAMER)
endif(UNIX)
-find_package(OpenVRML)
+
if(OPENVRML_FOUND)
- option(ARTOOLKIT_USE_OPENVRML "Create VRML based libraries and examples" ON)
+ find_package(OpenVRML)
if(ARTOOLKIT_USE_OPENVRML)
add_subdirectory(ARvrml)
endif(ARTOOLKIT_USE_OPENVRML)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ret...@us...> - 2008-08-22 02:22:01
|
Revision: 297
http://artoolkit.svn.sourceforge.net/artoolkit/?rev=297&view=rev
Author: retrakker
Date: 2008-08-22 02:22:09 +0000 (Fri, 22 Aug 2008)
Log Message:
-----------
added back OpenVRML support - added implmentation for OpenVRML 0.15.10 which is working on Ubuntu 8.04.1 with OpenVRML 0.15.10
Modified Paths:
--------------
branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/examples/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/lib/SRC/CMakeLists.txt
Added Paths:
-----------
branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindOpenVRML.cmake
branches/hartmut-pre-2_8/artoolkit/examples/simpleVRML/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARvrml/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARvrml/arViewerCapi_openvrml-0.15.10.cpp
branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARvrml/arViewer_openvrml-0.15.10.cpp
branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARvrml/arViewer_openvrml-0.15.10.h
Modified: branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt 2008-08-21 21:51:32 UTC (rev 296)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt 2008-08-22 02:22:09 UTC (rev 297)
@@ -32,6 +32,8 @@
find_package(OpenGL)
find_package(GLUT)
find_package(GStreamer)
+find_package(OpenVRML)
+find_package(PkgConfig)
#
# Preset some of the output directories
Added: branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindOpenVRML.cmake
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindOpenVRML.cmake (rev 0)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindOpenVRML.cmake 2008-08-22 02:22:09 UTC (rev 297)
@@ -0,0 +1,113 @@
+# Locate openvml library
+# This module defines
+# OPENVRML_LIBRARY
+# OPENVRML_FOUND, if false, do not try to link to vrml
+# OPENVRML_INCLUDE_DIR, where to find the headers
+#
+# $OPENVRML_DIR is an environment variable that would
+# correspond to the ./configure --prefix=$OPENVRML_DIR
+#
+# Created by Robert Osfield.
+# Modified for the debug library by Jean-S?stien Guay.
+
+FIND_PATH(OPENVRML_INCLUDE_DIR openvrml/system.h
+ $ENV{OPENVRML_DIR}/include
+ $ENV{OPENVRML_DIR}
+ $ENV{OSGDIR}/include
+ $ENV{OSGDIR}
+ $ENV{OSG_ROOT}/include
+ ~/Library/Frameworks
+ /Library/Frameworks
+ /usr/local/include
+ /usr/include
+ /sw/include # Fink
+ /opt/local/include # DarwinPorts
+ /opt/csw/include # Blastwave
+ /opt/include
+ [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
+ /usr/freeware/include
+)
+
+FIND_LIBRARY(OPENVRML_openvrml_LIBRARY
+ NAMES openvrml
+ PATHS
+ $ENV{OPENVRML_DIR}/lib
+ $ENV{OPENVRML_DIR}
+ $ENV{OSGDIR}/lib
+ $ENV{OSGDIR}
+ $ENV{OSG_ROOT}/lib
+ ~/Library/Frameworks
+ /Library/Frameworks
+ /usr/local/lib
+ /usr/lib
+ /sw/lib
+ /opt/local/lib
+ /opt/csw/lib
+ /opt/lib
+ [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
+ /usr/freeware/lib64
+)
+
+FIND_LIBRARY(OPENVRML_gl_LIBRARY
+ NAMES openvrml-gl
+ PATHS
+ $ENV{OPENVRML_DIR}/lib
+ $ENV{OPENVRML_DIR}
+ $ENV{OSGDIR}/lib
+ $ENV{OSGDIR}
+ $ENV{OSG_ROOT}/lib
+ ~/Library/Frameworks
+ /Library/Frameworks
+ /usr/local/lib
+ /usr/lib
+ /sw/lib
+ /opt/local/lib
+ /opt/csw/lib
+ /opt/lib
+ [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
+ /usr/freeware/lib64
+)
+
+
+
+FIND_LIBRARY(OPENVRML_LIBRARY_DEBUG
+ NAMES openvrmld
+ PATHS
+ $ENV{OPENVRML_DIR}/lib
+ $ENV{OPENVRML_DIR}
+ $ENV{OSGDIR}/lib
+ $ENV{OSGDIR}
+ $ENV{OSG_ROOT}/lib
+ ~/Library/Frameworks
+ /Library/Frameworks
+ /usr/local/lib
+ /usr/lib
+ /sw/lib
+ /opt/local/lib
+ /opt/csw/lib
+ /opt/lib
+ [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
+ /usr/freeware/lib64
+)
+
+SET(OPENVRML_FOUND "NO")
+IF(OPENVRML_openvrml_LIBRARY AND OPENVRML_INCLUDE_DIR)
+ SET(OPENVRML_FOUND "YES")
+ENDIF(OPENVRML_openvrml_LIBRARY AND OPENVRML_INCLUDE_DIR)
+
+SET(OPENVRML_LIBRARIES ${OPENVRML_openvrml_LIBRARY} ${OPENVRML_gl_LIBRARY})
+
+#-------------- next part --------------
+IF (WIN32)
+ INCLUDE_DIRECTORIES( ${OPENVRML_INCLUDE_DIR} ${OPENVRML_INCLUDE_DIR}/openvrml ${JPEG_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
+ SET(OPENVRML_ANTLR_LIBRARY antlr.lib)
+ SET(OPENVRML_ANTLR_LIBRARY_DEBUG antlrd.lib)
+ SET(OPENVRML_REGEX_LIBRARY regex.lib)
+ SET(OPENVRML_REGEX_LIBRARY_DEBUG regexd.lib)
+ SET(TARGET_LIBRARIES_VARS OPENVRML_ANTLR_LIBRARY OPENVRML_REGEX_LIBRARY OPENVRML_LIBRARY JPEG_LIBRARY PNG_LIBRARY ZLIB_LIBRARY)
+ SET(TARGET_EXTERNAL_LIBRARIES Ws2_32.lib)
+ELSE(WIN32)
+ INCLUDE_DIRECTORIES( ${OPENVRML_INCLUDE_DIR} ${OPENVRML_INCLUDE_DIR}/openvrml)
+ENDIF(WIN32)
+
+
Modified: branches/hartmut-pre-2_8/artoolkit/examples/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/examples/CMakeLists.txt 2008-08-21 21:51:32 UTC (rev 296)
+++ branches/hartmut-pre-2_8/artoolkit/examples/CMakeLists.txt 2008-08-22 02:22:09 UTC (rev 297)
@@ -13,3 +13,9 @@
add_subdirectory(simple2)
add_subdirectory(simpleLite)
add_subdirectory(twoView)
+
+
+if(OPENVRML_FOUND)
+ add_subdirectory(simpleVRML)
+endif(OPENVRML_FOUND)
+
Added: branches/hartmut-pre-2_8/artoolkit/examples/simpleVRML/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/examples/simpleVRML/CMakeLists.txt (rev 0)
+++ branches/hartmut-pre-2_8/artoolkit/examples/simpleVRML/CMakeLists.txt 2008-08-22 02:22:09 UTC (rev 297)
@@ -0,0 +1,53 @@
+
+set(EXE_NAME simpleVRML)
+
+set(SRCS
+ object.h
+ object.c
+ simpleVRML.c
+ )
+
+
+
+if(APPLE)
+
+ set(MACOSX_BUNDLE_BUNDLE_NAME ${EXE_NAME})
+ set(MACOSX_BUNDLE_BUNDLE_VERSION ${ARTOOLKIT_VERSION_SHORT})
+ set(MACOSX_BUNDLE_SHORT_VERSION_STRING ${ARTOOLKIT_VERSION_FULL})
+ set(MACOSX_BUNDLE_LONG_VERSION_STRING "ARToolKit ${EXE_NAME} Version ${ARTOOLKIT_VERSION_FULL}")
+ set(MACOSX_BUNDLE_ICON_FILE ARToolKit.icns)
+ set(MACOSX_BUNDLE_COPYRIGHT "(c) 2008 Human Interface Technology Laboratory New Zealand")
+
+ set_source_files_properties(
+ ${CMAKE_SOURCE_DIR}/share/ARToolKit.icns
+ PROPERTIES
+ MACOSX_PACKAGE_LOCATION "Resources"
+ )
+ set_source_files_properties(
+ ${ARTOOLKIT_FILES_DATA}
+ PROPERTIES
+ HEADER_FILE_ONLY TRUE
+ MACOSX_PACKAGE_LOCATION "Resources/Data"
+ )
+ set_source_files_properties(
+ ${ARTOOLKIT_FILES_DATA_MULTI}
+ PROPERTIES
+ HEADER_FILE_ONLY TRUE
+ MACOSX_PACKAGE_LOCATION "Resources/Data/multi"
+ )
+
+ add_executable(${EXE_NAME} MACOSX_BUNDLE
+ ${SRCS} ${CMAKE_SOURCE_DIR}/share/ARToolKit.icns
+ )
+
+else(APPLE)
+ add_executable(${EXE_NAME} ${SRCS})
+endif(APPLE)
+
+
+target_link_libraries(${EXE_NAME}
+ AR ARgsub ARgsub_lite ARgsubUtil ARvrml ARvideo
+ ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES}
+ ${OPENVRML_LIBRARIES})
+
+
Added: branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARvrml/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARvrml/CMakeLists.txt (rev 0)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARvrml/CMakeLists.txt 2008-08-22 02:22:09 UTC (rev 297)
@@ -0,0 +1,64 @@
+#
+# CMake build system for ARToolKit
+#
+# (c) Copyrights 2007-2008 Hartmut Seichter, HIT Lab NZ
+#
+
+set(lib_name ARvrml)
+
+set(OPENVRML_API)
+
+#
+# We have to go through some convoluted hops to
+# determine the correct version.
+# Assumption is: nothing new than 0.16.x
+#
+if(OPENVRML_FOUND AND PKG_CONFIG_FOUND)
+ pkg_search_module(LIBOPENVRML openvrml)
+
+ if (${LIBOPENVRML_VERSION} MATCHES "0.14.")
+ set(OPENVRML_API "_openvrml-0.14.3")
+ endif(${LIBOPENVRML_VERSION} MATCHES "0.14.")
+
+ if (${LIBOPENVRML_VERSION} MATCHES "0.15.")
+ set(OPENVRML_API "_openvrml-0.15.10")
+ endif(${LIBOPENVRML_VERSION} MATCHES "0.15.")
+
+ if (${LIBOPENVRML_VERSION} MATCHES "0.16.")
+ set(OPENVRML_API "")
+ endif(${LIBOPENVRML_VERSION} MATCHES "0.16.")
+
+endif(OPENVRML_FOUND AND PKG_CONFIG_FOUND)
+
+#
+# If we have no pkg-config we only assume 0.16 is supported
+#
+
+set(srcs_openvrml
+ arViewerCapi${OPENVRML_API}.cpp
+ arViewer${OPENVRML_API}.cpp
+ arViewer${OPENVRML_API}.h
+ )
+
+set(srcs_common
+ arViewer.h
+ )
+
+set(hdrs_public
+ ${CMAKE_SOURCE_DIR}/include/AR/arvrml.h
+ )
+
+include_directories(${CMAKE_SOURCE_DIR}/include ${GLUT_INCLUDE_DIR} ${OPENVRML_INCLUDE_DIR})
+
+add_library(${lib_name} ${hdrs_public} ${srcs_openvrml})
+
+target_link_libraries(${lib_name} AR ${OPENGL_LIBRARY} ${GLUT_LIBRARIES})
+
+artoolkit_install(${lib_name})
+
+install(FILES ${hdrs_public}
+ DESTINATION include/AR
+)
+
+
+
Added: branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARvrml/arViewerCapi_openvrml-0.15.10.cpp
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARvrml/arViewerCapi_openvrml-0.15.10.cpp (rev 0)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARvrml/arViewerCapi_openvrml-0.15.10.cpp 2008-08-22 02:22:09 UTC (rev 297)
@@ -0,0 +1,193 @@
+/*
+ *
+ * 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
+ *
+ */
+
+#include <AR/arvrml.h>
+#include "arViewer_openvrml-0.15.10.h"
+#include <iostream>
+#include <vector>
+#include <string>
+#ifdef __APPLE__
+# include <GLUT/glut.h>
+#else
+# include <GL/glut.h>
+#endif
+#include <stdio.h>
+#include <string.h>
+
+//extern "C" {
+
+//}
+
+
+#define AR_VRML_MAX 100
+
+static arVrmlViewer *viewer[AR_VRML_MAX];
+static int init = 1;
+static int vrID = -1;
+
+static char *get_buff( char *buf, int n, FILE *fp );
+
+
+int arVrmlLoadFile(const char *file)
+{
+
+ FILE *fp;
+ openvrml::browser * myBrowser = NULL;
+ char buf[256], buf1[256];
+ char buf2[256];
+ int id;
+ int i;
+
+ if( init ) {
+ for( i = 0; i < AR_VRML_MAX; i++ ) viewer[i] = NULL;
+ init = 0;
+ }
+ for( i = 0; i < AR_VRML_MAX; i++ ) {
+ if( viewer[i] == NULL ) break;
+ }
+ if( i == AR_VRML_MAX ) return -1;
+ id = i;
+
+ if( (fp=fopen(file, "r")) == NULL ) return -1;
+
+ get_buff(buf, 256, fp);
+ if( sscanf(buf, "%s", buf1) != 1 ) {fclose(fp); return -1;}
+ for( i = 0; file[i] != '\0'; i++ ) buf2[i] = file[i];
+ for( ; i >= 0; i-- ) {
+ if( buf2[i] == '/' ) break;
+ }
+ buf2[i+1] = '\0';
+ sprintf(buf, "%s%s", buf2, buf1);
+
+ myBrowser = new arVrmlBrowser;
+ if (!myBrowser) {
+ fclose(fp);
+ return -1;
+ }
+
+ viewer[id] = new arVrmlViewer();
+ if (!viewer[id]) {
+ delete myBrowser;
+ fclose(fp);
+ return -1;
+ }
+ strcpy(viewer[id]->filename, buf); // Save filename in viewer.
+ myBrowser->viewer(viewer[id]);
+
+ std::vector<std::string> uri(1, buf);
+ std::vector<std::string> parameter;
+ myBrowser->load_url(uri, parameter);
+
+
+ get_buff(buf, 256, fp);
+ if( sscanf(buf, "%lf %lf %lf", &viewer[id]->translation[0],
+ &viewer[id]->translation[1], &viewer[id]->translation[2]) != 3 ) {
+ delete viewer[id];
+ viewer[id] = NULL;
+ fclose(fp);
+ return -1;
+ }
+
+ get_buff(buf, 256, fp);
+ if( sscanf(buf, "%lf %lf %lf %lf", &viewer[id]->rotation[0],
+ &viewer[id]->rotation[1], &viewer[id]->rotation[2], &viewer[id]->rotation[3]) != 4 ) {
+ delete viewer[id];
+ viewer[id] = NULL;
+ fclose(fp);
+ return -1;
+ }
+
+ get_buff(buf, 256, fp);
+ if( sscanf(buf, "%lf %lf %lf", &viewer[id]->scale[0], &viewer[id]->scale[1],
+ &viewer[id]->scale[2]) != 3 ) {
+ delete viewer[id];
+ viewer[id] = NULL;
+ fclose(fp);
+ return -1;
+ }
+ fclose(fp);
+
+ return id;
+}
+
+int arVrmlFree( int id )
+{
+ if( viewer[id] == NULL ) return -1;
+
+ delete viewer[id];
+ viewer[id] = NULL;
+
+ if( vrID == id ) {
+ vrID = -1;
+ }
+
+ return 0;
+}
+
+int arVrmlTimerUpdate()
+{
+ int i;
+
+ for( i = 0; i < AR_VRML_MAX; i++ ) {
+ if( viewer[i] == NULL ) continue;
+ viewer[i]->timerUpdate();
+ }
+ return 0;
+}
+
+int arVrmlDraw( int id )
+{
+ if( viewer[id] == NULL ) return -1;
+ viewer[id]->redraw();
+ return 0;
+}
+
+int arVrmlSetInternalLight( int flag )
+{
+ int i;
+
+ if( flag ) {
+ for( i = 0; i < AR_VRML_MAX; i++ ) {
+ if( viewer[i] == NULL ) continue;
+ viewer[i]->setInternalLight(true);
+ }
+ }
+ else {
+ for( i = 0; i < AR_VRML_MAX; i++ ) {
+ if( viewer[i] == NULL ) continue;
+ viewer[i]->setInternalLight(false);
+ }
+ }
+
+ return 0;
+}
+
+static char *get_buff( char *buf, int n, FILE *fp )
+{
+ char *ret, buf1[256];
+
+ for(;;) {
+ ret = fgets( buf, n, fp );
+ if( ret == NULL ) return(NULL);
+ if( sscanf(buf, "%s", buf1) != 1 ) continue;
+
+ if( buf1[0] != '#' ) return(ret);
+ }
+}
Property changes on: branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARvrml/arViewerCapi_openvrml-0.15.10.cpp
___________________________________________________________________
Added: svn:executable
+ *
Added: branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARvrml/arViewer_openvrml-0.15.10.cpp
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARvrml/arViewer_openvrml-0.15.10.cpp (rev 0)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARvrml/arViewer_openvrml-0.15.10.cpp 2008-08-22 02:22:09 UTC (rev 297)
@@ -0,0 +1,330 @@
+/*
+ Original version for VRML97-0.8.7 by Hirokazu Kato.
+
+ Updated for OpenVRML-0.14.3 by Raphael Grasset.
+ -remove vrmlScene since we use reference now.
+ -remove culling pb
+
+ Updated for OpenVRML-0.16.1 by Philip Lamb. 2006-11-15.
+ - add arVrmlBrowser class and Boost dependencies.
+*/
+/*
+ *
+ * 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
+ *
+ */
+
+#include <iostream>
+#include <math.h>
+#ifdef __APPLE__
+# include <GLUT/glut.h>
+#else
+# include <GL/glut.h>
+#endif
+#include "arViewer_openvrml-0.15.10.h"
+
+using namespace openvrml;
+
+arVrmlBrowser::arVrmlBrowser(): openvrml::browser(std::cout, std::cerr)
+{
+}
+
+/*
+std::auto_ptr<openvrml::resource_istream>
+arVrmlBrowser::do_get_resource(const std::string & uri)
+{
+ using std::auto_ptr;
+ using std::invalid_argument;
+ using std::string;
+ using openvrml::resource_istream;
+
+ class file_resource_istream : public resource_istream {
+ std::string url_;
+ std::filebuf buf_;
+
+ public:
+ explicit file_resource_istream(const std::string & path): resource_istream(&this->buf_)
+ {
+ if (!this->buf_.open(path.c_str(), ios_base::in | ios_base::binary)) {
+ this->setstate(ios_base::badbit);
+ }
+ }
+
+ void url(const std::string & str) throw (std::bad_alloc)
+ {
+ this->url_ = str;
+ }
+
+ private:
+ virtual const std::string do_url() const throw ()
+ {
+ return this->url_;
+ }
+
+ virtual const std::string do_type() const throw ()
+ {
+ //
+ // A real application should use OS facilities for this. This
+ // is a crude hack because sdl-viewer uses std::filebuf in
+ // order to remain simple and portable.
+ //
+ using std::find;
+ using std::string;
+ using boost::algorithm::iequals;
+ using boost::next;
+ string media_type = "application/octet-stream";
+ const string::const_reverse_iterator dot_pos =
+ find(this->url_.rbegin(), this->url_.rend(), '.');
+ if (dot_pos == this->url_.rend()
+ || next(dot_pos.base()) == this->url_.end()) {
+ return media_type;
+ }
+ const string::const_iterator hash_pos =
+ find(next(dot_pos.base()), this->url_.end(), '#');
+ const string ext(dot_pos.base(), hash_pos);
+ if (iequals(ext, "wrl")) {
+ media_type = openvrml::vrml_media_type;
+ } else if (iequals(ext, "x3dv")) {
+ media_type = openvrml::x3d_vrml_media_type;
+ } else if (iequals(ext, "png")) {
+ media_type = "image/png";
+ } else if (iequals(ext, "jpg") || iequals(ext, "jpeg")) {
+ media_type = "image/jpeg";
+ }
+ return media_type;
+ }
+
+ virtual bool do_data_available() const throw ()
+ {
+ return !!(*this);
+ }
+ }; // class file_resource_istream
+
+ const string scheme = uri.substr(0, uri.find_first_of(':'));
+ if (scheme != "file") {
+ throw invalid_argument('\"' + scheme + "\" URI scheme not supported");
+ }
+ //
+ // file://
+ // ^
+ // 01234567
+ static const string::size_type authority_start_index = 7;
+
+ //
+ // On Windows we want to start at the drive letter, which is after the
+ // first slash in the path.
+ //
+ // We ignore the content of the authority; a smarter implementation
+ // should confirm that it is localhost, the machine name, or zero
+ // length.
+ //
+ string::size_type path_start_index =
+# ifdef _WIN32
+ uri.find_first_of('/', authority_start_index) + 1;
+# else
+ uri.find_first_of('/', authority_start_index);
+# endif
+ string path = uri.substr(path_start_index);
+
+ auto_ptr<resource_istream> in(new file_resource_istream(path));
+ static_cast<file_resource_istream *>(in.get())->url(uri);
+
+ return in;
+}
+*/
+
+arVrmlViewer::arVrmlViewer()
+{
+ internal_light = true;
+
+ translation[0] = 0.0;
+ translation[1] = 0.0;
+ translation[2] = 0.0;
+
+ rotation[0] = 0.0;
+ rotation[1] = 0.0;
+ rotation[2] = 0.0;
+ rotation[3] = 0.0;
+
+ scale[0] = 1.0;
+ scale[1] = 1.0;
+ scale[2] = 1.0;
+}
+
+arVrmlViewer::~arVrmlViewer() throw()
+{
+
+}
+
+void arVrmlViewer::timerUpdate()
+{
+ this->update(0.0);
+}
+
+
+
+void arVrmlViewer::setInternalLight(bool flag)
+{
+ internal_light = flag;
+}
+
+void arVrmlViewer::redraw()
+{
+ //double start = browser::current_time();
+ glMatrixMode(GL_MODELVIEW);
+ glPushMatrix();
+ glTranslated( translation[0], translation[1], translation[2] );
+ if (rotation[0] != 0.0) {
+ glRotated(rotation[0], rotation[1], rotation[2], rotation[3]);
+ }
+ glScaled(scale[0], scale[1], scale[2]);
+
+#if USE_STENCIL_SHAPE
+ glEnable(GL_STENCIL_TEST);
+ glStencilFunc(GL_ALWAYS, 1, 1);
+ glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
+#endif
+ glEnable(GL_DEPTH_TEST);
+ glDepthFunc(GL_LEQUAL);
+ glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+ glDisable(GL_FOG); // this is a global attribute
+ //glDisable(GL_TEXTURE_2D);
+ glEnable(GL_CULL_FACE);
+ glFrontFace(GL_CCW);
+ glCullFace(GL_BACK);
+
+ if (internal_light) {
+ if (lit) glEnable(GL_LIGHTING);
+ glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, GL_TRUE);
+ glEnable(GL_NORMALIZE);
+ glDisable(GL_COLOR_MATERIAL);
+ glDisable(GL_BLEND);
+ glShadeModel(GL_SMOOTH);
+
+ for (int i = 0; i < max_lights; ++i) {
+ light_info_[i].type = light_unused;
+ GLenum light = (GLenum) (GL_LIGHT0 + i);
+ glDisable(light);
+ }
+ }
+
+ objects = 0;
+ nested_objects = 0;
+ sensitive = 0;
+
+ if (browser()) browser()->render();
+
+ if (internal_light) {
+ if (lit) glDisable(GL_LIGHTING);
+ }
+ glDisable(GL_BLEND);
+ glDisable(GL_CULL_FACE);
+ //glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+
+ glMatrixMode(GL_MODELVIEW);
+ glPopMatrix();
+}
+
+void arVrmlViewer::post_redraw()
+{
+
+}
+void arVrmlViewer::set_cursor(cursor_style c)
+{
+
+}
+
+void arVrmlViewer::swap_buffers()
+{
+
+}
+
+void arVrmlViewer::set_timer(double t)
+{
+
+}
+
+
+void arVrmlViewer::set_viewpoint(const openvrml::vec3f & position,
+ const openvrml::rotation & orientation,
+ float fieldOfView,
+ float avatarSize,
+ float visibilityLimit)
+{
+
+}
+
+viewer::object_t arVrmlViewer::insert_background(const std::vector<float> & groundAngle,
+ const std::vector<color> & groundColor,
+ const std::vector<float> & skyAngle,
+ const std::vector<color> & skyColor,
+ const image & front,
+ const image & back,
+ const image & left,
+ const image & right,
+ const image & top,
+ const image & bottom)
+{
+ return 0;
+}
+
+viewer::object_t arVrmlViewer::insert_dir_light(float ambientIntensity,
+ float intensity,
+ const openvrml::color & color,
+ const openvrml::vec3f & direction)
+{
+ if (internal_light) return gl::viewer::insert_dir_light(ambientIntensity, intensity, color, direction);
+ return 0;
+}
+
+viewer::object_t arVrmlViewer::insert_point_light(float ambientIntensity,
+ const openvrml::vec3f & attenuation,
+ const openvrml::color & color,
+ float intensity,
+ const openvrml::vec3f & location,
+ float radius)
+{
+ if (internal_light) return gl::viewer::insert_point_light(ambientIntensity, attenuation, color, intensity, location, radius);
+
+ return 0;
+}
+
+
+viewer::object_t arVrmlViewer::insert_spot_light(float ambientIntensity,
+ const openvrml::vec3f & attenuation,
+ float beamWidth,
+ const openvrml::color & color,
+ float cutOffAngle,
+ const openvrml::vec3f & direction,
+ float intensity,
+ const openvrml::vec3f & location,
+ float radius)
+{
+ if (internal_light) return gl::viewer::insert_spot_light(ambientIntensity, attenuation, beamWidth, color,cutOffAngle, direction, intensity, location, radius);
+ return 0;
+}
+
+ bounding_volume::intersection
+arVrmlViewer::intersect_view_volume(const bounding_volume & bvolume) const
+{
+ // if( d_cull ) {
+ //return openvrml::viewer::intersect_view_volume(bvolume);
+ // }
+ // else {
+ return bounding_volume::inside;
+ //}
+}
Property changes on: branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARvrml/arViewer_openvrml-0.15.10.cpp
___________________________________________________________________
Added: svn:executable
+ *
Added: branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARvrml/arViewer_openvrml-0.15.10.h
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARvrml/arViewer_openvrml-0.15.10.h (rev 0)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARvrml/arViewer_openvrml-0.15.10.h 2008-08-22 02:22:09 UTC (rev 297)
@@ -0,0 +1,112 @@
+// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4; -*-
+/*
+ *
+ * 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
+ *
+ */
+
+#ifndef AR_VRMLINT_H
+#define AR_VRMLINT_H
+
+#include <iostream>
+#include <fstream>
+#include <boost/algorithm/string/predicate.hpp>
+#include <boost/utility.hpp>
+#include <openvrml/browser.h>
+#include <openvrml/gl/viewer.h>
+#include <openvrml/bounding_volume.h>
+#ifdef _WIN32
+# include <windows.h>
+#endif
+
+class arVrmlBrowser : public openvrml::browser {
+public:
+ arVrmlBrowser();
+
+private:
+ /*
+ virtual std::auto_ptr<openvrml::resource_istream>
+ do_get_resource(const std::string & uri);
+ */
+};
+
+class arVrmlViewer : public openvrml::gl::viewer {
+
+public:
+ explicit arVrmlViewer();
+ virtual ~arVrmlViewer() throw ();
+
+ char filename[512];
+ double translation[3];
+ double rotation[4];
+ double scale[3];
+ bool internal_light;
+
+ void timerUpdate();
+ void redraw();
+ void setInternalLight( bool f );
+
+protected:
+ virtual void post_redraw();
+ virtual void set_cursor(openvrml::gl::viewer::cursor_style c);
+ virtual void swap_buffers();
+ virtual void set_timer(double);
+
+
+ virtual void set_viewpoint(const openvrml::vec3f & position,
+ const openvrml::rotation & orientation,
+ float fieldOfView,
+ float avatarSize,
+ float visibilityLimit);
+
+ virtual viewer::object_t insert_background(const std::vector<float> & groundAngle,
+ const std::vector<openvrml::color> & groundColor,
+ const std::vector<float> & skyAngle,
+ const std::vector<openvrml::color> & skyColor,
+ const openvrml::image & front,
+ const openvrml::image & back,
+ const openvrml::image & left,
+ const openvrml::image & right,
+ const openvrml::image & top,
+ const openvrml::image & bottom);
+
+ virtual viewer::object_t insert_dir_light(float ambientIntensity,
+ float intensity,
+ const openvrml::color & color,
+ const openvrml::vec3f & direction);
+
+ virtual viewer::object_t insert_point_light(float ambientIntensity,
+ const openvrml::vec3f & attenuation,
+ const openvrml::color & color,
+ float intensity,
+ const openvrml::vec3f & location,
+ float radius);
+
+ virtual viewer::object_t insert_spot_light(float ambientIntensity,
+ const openvrml::vec3f & attenuation,
+ float beamWidth,
+ const openvrml::color & color,
+ float cutOffAngle,
+ const openvrml::vec3f & direction,
+ float intensity,
+ const openvrml::vec3f & location,
+ float radius);
+ virtual openvrml::bounding_volume::intersection
+ intersect_view_volume(const openvrml::bounding_volume & bvolume) const;
+};
+
+#endif
Property changes on: branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARvrml/arViewer_openvrml-0.15.10.h
___________________________________________________________________
Added: svn:executable
+ *
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/CMakeLists.txt 2008-08-21 21:51:32 UTC (rev 296)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/CMakeLists.txt 2008-08-22 02:22:09 UTC (rev 297)
@@ -46,3 +46,13 @@
add_subdirectory(VideoGStreamer)
endif(USE_GSTREAMER)
endif(UNIX)
+
+find_package(OpenVRML)
+if(OPENVRML_FOUND)
+ option(ARTOOLKIT_USE_OPENVRML "Create VRML based libraries and examples" ON)
+ if(ARTOOLKIT_USE_OPENVRML)
+ add_subdirectory(ARvrml)
+ endif(ARTOOLKIT_USE_OPENVRML)
+endif(OPENVRML_FOUND)
+
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ret...@us...> - 2008-08-21 21:51:22
|
Revision: 296
http://artoolkit.svn.sourceforge.net/artoolkit/?rev=296&view=rev
Author: retrakker
Date: 2008-08-21 21:51:32 +0000 (Thu, 21 Aug 2008)
Log Message:
-----------
forgotten template for uninstall target in CMake
Added Paths:
-----------
branches/hartmut-pre-2_8/artoolkit/CMakeModules/cmake_uninstall.cmake.in
Added: branches/hartmut-pre-2_8/artoolkit/CMakeModules/cmake_uninstall.cmake.in
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeModules/cmake_uninstall.cmake.in (rev 0)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeModules/cmake_uninstall.cmake.in 2008-08-21 21:51:32 UTC (rev 296)
@@ -0,0 +1,22 @@
+IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+ MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
+ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+
+FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
+STRING(REGEX REPLACE "\n" ";" files "${files}")
+FOREACH(file ${files})
+ MESSAGE(STATUS "Uninstalling \"${file}\"")
+ IF(EXISTS "${file}")
+ EXEC_PROGRAM(
+ "@CMAKE_COMMAND@" ARGS "-E remove \"${file}\""
+ OUTPUT_VARIABLE rm_out
+ RETURN_VALUE rm_retval
+ )
+ IF("${rm_retval}" STREQUAL 0)
+ ELSE("${rm_retval}" STREQUAL 0)
+ MESSAGE(FATAL_ERROR "Problem when removing \"${file}\"")
+ ENDIF("${rm_retval}" STREQUAL 0)
+ ELSE(EXISTS "${file}")
+ MESSAGE(STATUS "File \"${file}\" does not exist.")
+ ENDIF(EXISTS "${file}")
+ENDFOREACH(file)
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ret...@us...> - 2008-08-21 21:33:37
|
Revision: 295
http://artoolkit.svn.sourceforge.net/artoolkit/?rev=295&view=rev
Author: retrakker
Date: 2008-08-21 21:33:47 +0000 (Thu, 21 Aug 2008)
Log Message:
-----------
Updated CMake buildsystem for Linux systems with GStreamer installed
Modified Paths:
--------------
branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake
branches/hartmut-pre-2_8/artoolkit/CMakeModules/Packaging.cmake.in
branches/hartmut-pre-2_8/artoolkit/lib/SRC/AR/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARMulti/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/lib/SRC/Gl/CMakeLists.txt
Modified: branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt 2008-08-21 20:39:35 UTC (rev 294)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt 2008-08-21 21:33:47 UTC (rev 295)
@@ -31,8 +31,8 @@
#
find_package(OpenGL)
find_package(GLUT)
+find_package(GStreamer)
-
#
# Preset some of the output directories
#
@@ -68,12 +68,13 @@
if(WIN32)
install(DIRECTORY ${CMAKE_SOURCE_DIR}/bin/Data
DESTINATION bin
- PATTERN ".svn" EXCLUDE
+ PATTERN ".svn" EXCLUDE
)
else(WIN32)
install(DIRECTORY ${CMAKE_SOURCE_DIR}/bin/Data
DESTINATION ${ARTOOLKIT_SHARE_FOLDER}
- PATTERN ".svn" EXCLUDE
+ PATTERN ".svn" EXCLUDE
+ PATTERN "WDM_camera_*" EXCLUDE
)
endif(WIN32)
@@ -84,14 +85,10 @@
DESTINATION ${ARTOOLKIT_SHARE_FOLDER}
)
-if (UNIX)
- set(USE_GSTREAMER 0)
-
- include(FindGStreamer)
-
- if(GSTREAMER_FOUND)
+if(UNIX)
+ if(GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES)
SET(USE_GSTREAMER 1)
- endif(GSTREAMER_FOUND)
+ endif(GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES)
endif(UNIX)
# right order of include files is important
@@ -116,6 +113,19 @@
#
add_subdirectory(patterns)
+
+#
+# Uninstall
+#
+configure_file(
+ "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/cmake_uninstall.cmake.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+ IMMEDIATE @ONLY)
+
+add_custom_target(uninstall
+ "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+
+
#
# Optional packaging for SDK
#
Modified: branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake 2008-08-21 20:39:35 UTC (rev 294)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake 2008-08-21 21:33:47 UTC (rev 295)
@@ -1,31 +1,38 @@
# some simple macros to inject files into bundles
+set(ARTOOLKIT_FILES_DATA
+ ${CMAKE_SOURCE_DIR}/bin/Data/camera_para.dat
+ ${CMAKE_SOURCE_DIR}/bin/Data/object_data
+ ${CMAKE_SOURCE_DIR}/bin/Data/object_data2
+ ${CMAKE_SOURCE_DIR}/bin/Data/paddle_data
+ ${CMAKE_SOURCE_DIR}/bin/Data/patt.calib
+ ${CMAKE_SOURCE_DIR}/bin/Data/patt.hiro
+ ${CMAKE_SOURCE_DIR}/bin/Data/patt.kanji
+ ${CMAKE_SOURCE_DIR}/bin/Data/patt.sample1
+ ${CMAKE_SOURCE_DIR}/bin/Data/patt.sample2
+ ${CMAKE_SOURCE_DIR}/bin/Data/patt.calib
+ ${CMAKE_SOURCE_DIR}/bin/Data/WDM_camera_flipV.xml
+ ${CMAKE_SOURCE_DIR}/bin/Data/WDM_camera.xml
+)
+
+set(ARTOOLKIT_FILES_DATA_WIN32
+ ${CMAKE_SOURCE_DIR}/bin/Data/WDM_camera_flipV.xml
+ ${CMAKE_SOURCE_DIR}/bin/Data/WDM_camera.xml
+)
+
+set(ARTOOLKIT_FILES_DATA_MULTI
+ ${CMAKE_SOURCE_DIR}/bin/Data/multi/marker.dat
+ ${CMAKE_SOURCE_DIR}/bin/Data/multi/patt.a
+ ${CMAKE_SOURCE_DIR}/bin/Data/multi/patt.b
+ ${CMAKE_SOURCE_DIR}/bin/Data/multi/patt.c
+ ${CMAKE_SOURCE_DIR}/bin/Data/multi/patt.d
+ ${CMAKE_SOURCE_DIR}/bin/Data/multi/patt.f
+ ${CMAKE_SOURCE_DIR}/bin/Data/multi/patt.g
+)
+
+
macro(artoolkit_executable EXE_NAME SRCS)
- set(_datafiles
- ${CMAKE_SOURCE_DIR}/bin/Data/camera_para.dat
- ${CMAKE_SOURCE_DIR}/bin/Data/object_data
- ${CMAKE_SOURCE_DIR}/bin/Data/object_data2
- ${CMAKE_SOURCE_DIR}/bin/Data/paddle_data
- ${CMAKE_SOURCE_DIR}/bin/Data/patt.calib
- ${CMAKE_SOURCE_DIR}/bin/Data/patt.hiro
- ${CMAKE_SOURCE_DIR}/bin/Data/patt.kanji
- ${CMAKE_SOURCE_DIR}/bin/Data/patt.sample1
- ${CMAKE_SOURCE_DIR}/bin/Data/patt.sample2
- ${CMAKE_SOURCE_DIR}/bin/Data/patt.calib
- ${CMAKE_SOURCE_DIR}/bin/Data/WDM_camera_flipV.xml
- ${CMAKE_SOURCE_DIR}/bin/Data/WDM_camera.xml
- )
-
- set(_datafiles_multi
- ${CMAKE_SOURCE_DIR}/bin/Data/multi/marker.dat
- ${CMAKE_SOURCE_DIR}/bin/Data/multi/patt.a
- ${CMAKE_SOURCE_DIR}/bin/Data/multi/patt.b
- ${CMAKE_SOURCE_DIR}/bin/Data/multi/patt.c
- ${CMAKE_SOURCE_DIR}/bin/Data/multi/patt.d
- ${CMAKE_SOURCE_DIR}/bin/Data/multi/patt.f
- ${CMAKE_SOURCE_DIR}/bin/Data/multi/patt.g
- )
-
+
if(APPLE)
set(MACOSX_BUNDLE_BUNDLE_NAME ${EXE_NAME})
@@ -41,30 +48,30 @@
MACOSX_PACKAGE_LOCATION "Resources"
)
set_source_files_properties(
- ${_datafiles}
+ ${ARTOOLKIT_FILES_DATA}
PROPERTIES
HEADER_FILE_ONLY TRUE
MACOSX_PACKAGE_LOCATION "Resources/Data"
)
set_source_files_properties(
- ${_datafiles_multi}
+ ${ARTOOLKIT_FILES_DATA_MULTI}
PROPERTIES
HEADER_FILE_ONLY TRUE
MACOSX_PACKAGE_LOCATION "Resources/Data/multi"
)
add_executable(${EXE_NAME} MACOSX_BUNDLE
- ${${SRCS}} ${_datafiles} ${_datafiles_multi}
- ${CMAKE_SOURCE_DIR}/share/ARToolKit.icns
+ ${${SRCS}} ${CMAKE_SOURCE_DIR}/share/ARToolKit.icns
)
else(APPLE)
- add_executable(${EXE_NAME} ${${SRCS}} ${_datafiles} ${_datafiles_multi})
+ add_executable(${EXE_NAME} ${${SRCS}})
endif(APPLE)
endmacro(artoolkit_executable)
-macro(artoolkit_lib_install target)
+macro(artoolkit_install target)
+
if (WIN32)
set(lib_dest bin)
else (WIN32)
@@ -72,34 +79,35 @@
endif(WIN32)
+ if (CMAKE_VERSION MATCHES 2.6)
install(TARGETS ${target}
ARCHIVE DESTINATION lib
LIBRARY DESTINATION ${lib_dest}
RUNTIME DESTINATION bin
PUBLIC_HEADER DESTINATION include/AR
)
-
-endmacro(artoolkit_lib_install target)
-
-macro(artoolkit_exe_install target)
-
- if (WIN32)
- set(lib_dest bin)
- else (WIN32)
- set(lib_dest lib)
- endif(WIN32)
-
+ elseif(CMAKE_VERSION MATCHES 2.6)
install(TARGETS ${target}
ARCHIVE DESTINATION lib
LIBRARY DESTINATION ${lib_dest}
RUNTIME DESTINATION bin
PUBLIC_HEADER DESTINATION include/AR
- BUNDLE DESTINATION /Applications/ARToolKit-${ARTOOLKIT_VERSION_FULL}
)
+ endif(CMAKE_VERSION MATCHES 2.6)
-endmacro(artoolkit_exe_install target)
+endmacro(artoolkit_install target)
+
+macro(artoolkit_lib_install target)
+
+ artoolkit_install(target)
+
+endmacro(artoolkit_lib_install target)
+
+
+
+
macro(artoolkit_example_lite name source_files)
set(exe_name ${name})
@@ -122,7 +130,7 @@
PROJECT_LABEL "Example ${name}"
)
- artoolkit_exe_install(${exe_name})
+ artoolkit_install(${exe_name})
endmacro(artoolkit_example_lite name source_files)
@@ -149,7 +157,7 @@
PROJECT_LABEL "Example ${name}"
)
- artoolkit_exe_install(${exe_name})
+ artoolkit_install(${exe_name})
endmacro(artoolkit_example_glut name source_files)
@@ -177,7 +185,7 @@
PROJECT_LABEL "Utility ${name}"
)
- artoolkit_exe_install(${exe_name})
+ artoolkit_install(${exe_name})
endmacro(artoolkit_utility_glut name source_files)
Modified: branches/hartmut-pre-2_8/artoolkit/CMakeModules/Packaging.cmake.in
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeModules/Packaging.cmake.in 2008-08-21 20:39:35 UTC (rev 294)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeModules/Packaging.cmake.in 2008-08-21 21:33:47 UTC (rev 295)
@@ -49,7 +49,14 @@
if (APPLE)
# only use the PackageMaker version on Mac
set(CPACK_GENERATOR "PackageMaker")
- endif(APPLE)
+ elif(APPLE)
+ # use the source and deb package generators if possible
+ set(CPACK_GENERATOR "STGZ;TGZ;DEB")
+
+ # need to set proper dependencies
+ # set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.3.1-6), libgcc1 (>= 1:3.4.2-12)")
+
+ endif(APPLE)
endif(WIN32)
#
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/AR/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/AR/CMakeLists.txt 2008-08-21 20:39:35 UTC (rev 294)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/AR/CMakeLists.txt 2008-08-21 21:33:47 UTC (rev 295)
@@ -56,13 +56,8 @@
add_library(${LIB_NAME} ${SRCS} ${HDRS})
-install(TARGETS AR
- ARCHIVE DESTINATION lib
- RUNTIME DESTINATION bin
- PUBLIC_HEADER DESTINATION include/AR
- )
+artoolkit_install(${LIB_NAME})
-
install(FILES ${HDRS}
DESTINATION include/AR
)
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARMulti/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARMulti/CMakeLists.txt 2008-08-21 20:39:35 UTC (rev 294)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARMulti/CMakeLists.txt 2008-08-21 21:33:47 UTC (rev 295)
@@ -14,13 +14,9 @@
add_library(${lib_name} STATIC ${HDRS} ${SRCS})
-install(TARGETS ${lib_name}
- ARCHIVE DESTINATION lib
- RUNTIME DESTINATION bin
- PUBLIC_HEADER DESTINATION include/AR
- )
-
+
+artoolkit_install(${lib_name})
install(FILES ${HDRS}
DESTINATION include/AR
- )
\ No newline at end of file
+ )
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/Gl/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/Gl/CMakeLists.txt 2008-08-21 20:39:35 UTC (rev 294)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/Gl/CMakeLists.txt 2008-08-21 21:33:47 UTC (rev 295)
@@ -20,7 +20,7 @@
target_link_libraries(${LIB_NAME} AR ${OPENGL_LIBRARY} ${GLUT_LIBRARIES})
- artoolkit_lib_install(${LIB_NAME})
+ artoolkit_install(${LIB_NAME})
include_directories(${CMAKE_SOURCE_DIR}/include ${GLUT_INCLUDE_DIR})
@@ -41,7 +41,7 @@
target_link_libraries(${LIB_NAME} AR)
- artoolkit_lib_install(${LIB_NAME})
+ artoolkit_install(${LIB_NAME})
install(FILES ${HDRS}
DESTINATION include/AR
@@ -66,7 +66,7 @@
TARGET_LINK_LIBRARIES(${LIB_NAME} AR)
-artoolkit_lib_install(${LIB_NAME})
+artoolkit_install(${LIB_NAME})
install(FILES ${HDRS}
DESTINATION include/AR
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ret...@us...> - 2008-08-21 20:39:26
|
Revision: 294
http://artoolkit.svn.sourceforge.net/artoolkit/?rev=294&view=rev
Author: retrakker
Date: 2008-08-21 20:39:35 +0000 (Thu, 21 Aug 2008)
Log Message:
-----------
Sync machines
Modified Paths:
--------------
branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake
branches/hartmut-pre-2_8/artoolkit/CMakeModules/Packaging.cmake.in
Modified: branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt 2008-08-21 11:59:07 UTC (rev 293)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt 2008-08-21 20:39:35 UTC (rev 294)
@@ -40,6 +40,14 @@
set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE PATH "Library output folder")
#
+# Apple presets
+#
+if (APPLE)
+ set(CMAKE_OSX_ARCHITECTURES ppc;i386)
+ set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.4u.sdk CACHE PATH "SDK to link against")
+endif(APPLE)
+
+#
# Preset for Visual Studio products
#
if(MSVC)
@@ -76,11 +84,6 @@
DESTINATION ${ARTOOLKIT_SHARE_FOLDER}
)
-if (APPLE)
- set(CMAKE_OSX_ARCHITECTURES ppc;i386)
- set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.4u.sdk)
-endif(APPLE)
-
if (UNIX)
set(USE_GSTREAMER 0)
Modified: branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake 2008-08-21 11:59:07 UTC (rev 293)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake 2008-08-21 20:39:35 UTC (rev 294)
@@ -180,3 +180,11 @@
artoolkit_exe_install(${exe_name})
endmacro(artoolkit_utility_glut name source_files)
+
+
+macro(artoolkit_framework)
+
+
+
+endmacro(artoolkit_framework)
+
Modified: branches/hartmut-pre-2_8/artoolkit/CMakeModules/Packaging.cmake.in
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeModules/Packaging.cmake.in 2008-08-21 11:59:07 UTC (rev 293)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeModules/Packaging.cmake.in 2008-08-21 20:39:35 UTC (rev 294)
@@ -11,8 +11,9 @@
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "ARToolKit for ${CMAKE_GENERATOR} is an All-In-One package for developing AR applications")
-set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.txt")
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING.txt")
+set(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README.txt")
+set(CPACK_PACKAGE_DESCRIPTION_FILE ${CPACK_RESOURCE_FILE_README})
set(CPACK_PACKAGE_VERSION_MAJOR ${ARTOOLKIT_VERSION_MAJOR})
set(CPACK_PACKAGE_VERSION_MINOR ${ARTOOLKIT_VERSION_MINOR})
@@ -24,6 +25,7 @@
if(WIN32)
+ # we focus on using NSIS for Windows - thus add some more icons
set(CPACK_NSIS_MENU_LINKS
"bin" "ARToolKit application folder"
"${ARTOOLKIT_SHARE_FOLDER}/ChangeLog.txt" "ARToolKit ${ARTOOLKIT_VERSION_FULL} ChangeLog"
@@ -45,9 +47,12 @@
else(WIN32)
if (APPLE)
- set(CPACK_GENERATOR "PackageMaker;STGZ")
- INCLUDE(CPack)
+ # only use the PackageMaker version on Mac
+ set(CPACK_GENERATOR "PackageMaker")
endif(APPLE)
-endif(WIN32)
-
+endif(WIN32)
+
+#
+# And finally include CPack
+#
include(CPack)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ret...@us...> - 2008-08-21 11:59:00
|
Revision: 293
http://artoolkit.svn.sourceforge.net/artoolkit/?rev=293&view=rev
Author: retrakker
Date: 2008-08-21 11:59:07 +0000 (Thu, 21 Aug 2008)
Log Message:
-----------
Slightly more polish on the build system, adding an icon for the applications
Modified Paths:
--------------
branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake
Added Paths:
-----------
branches/hartmut-pre-2_8/artoolkit/share/ARToolKit.icns
Modified: branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake 2008-08-21 10:55:22 UTC (rev 292)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake 2008-08-21 11:59:07 UTC (rev 293)
@@ -27,9 +27,23 @@
)
if(APPLE)
+
+ set(MACOSX_BUNDLE_BUNDLE_NAME ${EXE_NAME})
+ set(MACOSX_BUNDLE_BUNDLE_VERSION ${ARTOOLKIT_VERSION_SHORT})
+ set(MACOSX_BUNDLE_SHORT_VERSION_STRING ${ARTOOLKIT_VERSION_FULL})
+ set(MACOSX_BUNDLE_LONG_VERSION_STRING "ARToolKit ${EXE_NAME} Version ${ARTOOLKIT_VERSION_FULL}")
+ set(MACOSX_BUNDLE_ICON_FILE ARToolKit.icns)
+ set(MACOSX_BUNDLE_COPYRIGHT "(c) 2008 Human Interface Technology Laboratory New Zealand")
+
set_source_files_properties(
+ ${CMAKE_SOURCE_DIR}/share/ARToolKit.icns
+ PROPERTIES
+ MACOSX_PACKAGE_LOCATION "Resources"
+ )
+ set_source_files_properties(
${_datafiles}
PROPERTIES
+ HEADER_FILE_ONLY TRUE
MACOSX_PACKAGE_LOCATION "Resources/Data"
)
set_source_files_properties(
@@ -39,7 +53,11 @@
MACOSX_PACKAGE_LOCATION "Resources/Data/multi"
)
- add_executable(${EXE_NAME} MACOSX_BUNDLE ${${SRCS}} ${_datafiles} ${_datafiles_multi})
+ add_executable(${EXE_NAME} MACOSX_BUNDLE
+ ${${SRCS}} ${_datafiles} ${_datafiles_multi}
+ ${CMAKE_SOURCE_DIR}/share/ARToolKit.icns
+ )
+
else(APPLE)
add_executable(${EXE_NAME} ${${SRCS}} ${_datafiles} ${_datafiles_multi})
endif(APPLE)
@@ -70,7 +88,6 @@
else (WIN32)
set(lib_dest lib)
endif(WIN32)
-
install(TARGETS ${target}
ARCHIVE DESTINATION lib
Property changes on: branches/hartmut-pre-2_8/artoolkit/share/ARToolKit.icns
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ret...@us...> - 2008-08-21 10:55:12
|
Revision: 292
http://artoolkit.svn.sourceforge.net/artoolkit/?rev=292&view=rev
Author: retrakker
Date: 2008-08-21 10:55:22 +0000 (Thu, 21 Aug 2008)
Log Message:
-----------
fixed CMake build system for Mac OS X
Modified Paths:
--------------
branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake
branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoMacOSX/CMakeLists.txt
Modified: branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake 2008-08-21 03:48:04 UTC (rev 291)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake 2008-08-21 10:55:22 UTC (rev 292)
@@ -1,9 +1,30 @@
# some simple macros to inject files into bundles
macro(artoolkit_executable EXE_NAME SRCS)
- file(GLOB _datafiles "${CMAKE_SOURCE_DIR}/bin/Data/*.dat")
- file(GLOB _datafiles ${_datafiles} "${CMAKE_SOURCE_DIR}/bin/Data/*.xml")
- file(GLOB _datafiles ${_datafiles} "${CMAKE_SOURCE_DIR}/bin/Data/patt.*")
+ set(_datafiles
+ ${CMAKE_SOURCE_DIR}/bin/Data/camera_para.dat
+ ${CMAKE_SOURCE_DIR}/bin/Data/object_data
+ ${CMAKE_SOURCE_DIR}/bin/Data/object_data2
+ ${CMAKE_SOURCE_DIR}/bin/Data/paddle_data
+ ${CMAKE_SOURCE_DIR}/bin/Data/patt.calib
+ ${CMAKE_SOURCE_DIR}/bin/Data/patt.hiro
+ ${CMAKE_SOURCE_DIR}/bin/Data/patt.kanji
+ ${CMAKE_SOURCE_DIR}/bin/Data/patt.sample1
+ ${CMAKE_SOURCE_DIR}/bin/Data/patt.sample2
+ ${CMAKE_SOURCE_DIR}/bin/Data/patt.calib
+ ${CMAKE_SOURCE_DIR}/bin/Data/WDM_camera_flipV.xml
+ ${CMAKE_SOURCE_DIR}/bin/Data/WDM_camera.xml
+ )
+
+ set(_datafiles_multi
+ ${CMAKE_SOURCE_DIR}/bin/Data/multi/marker.dat
+ ${CMAKE_SOURCE_DIR}/bin/Data/multi/patt.a
+ ${CMAKE_SOURCE_DIR}/bin/Data/multi/patt.b
+ ${CMAKE_SOURCE_DIR}/bin/Data/multi/patt.c
+ ${CMAKE_SOURCE_DIR}/bin/Data/multi/patt.d
+ ${CMAKE_SOURCE_DIR}/bin/Data/multi/patt.f
+ ${CMAKE_SOURCE_DIR}/bin/Data/multi/patt.g
+ )
if(APPLE)
set_source_files_properties(
@@ -11,10 +32,16 @@
PROPERTIES
MACOSX_PACKAGE_LOCATION "Resources/Data"
)
+ set_source_files_properties(
+ ${_datafiles_multi}
+ PROPERTIES
+ HEADER_FILE_ONLY TRUE
+ MACOSX_PACKAGE_LOCATION "Resources/Data/multi"
+ )
- add_executable(${EXE_NAME} MACOSX_BUNDLE ${${SRCS}} ${_datafiles})
+ add_executable(${EXE_NAME} MACOSX_BUNDLE ${${SRCS}} ${_datafiles} ${_datafiles_multi})
else(APPLE)
- add_executable(${EXE_NAME} ${${SRCS}} ${_datafiles})
+ add_executable(${EXE_NAME} ${${SRCS}} ${_datafiles} ${_datafiles_multi})
endif(APPLE)
endmacro(artoolkit_executable)
@@ -50,6 +77,7 @@
LIBRARY DESTINATION ${lib_dest}
RUNTIME DESTINATION bin
PUBLIC_HEADER DESTINATION include/AR
+ BUNDLE DESTINATION /Applications/ARToolKit-${ARTOOLKIT_VERSION_FULL}
)
endmacro(artoolkit_exe_install target)
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoMacOSX/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoMacOSX/CMakeLists.txt 2008-08-21 03:48:04 UTC (rev 291)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoMacOSX/CMakeLists.txt 2008-08-21 10:55:22 UTC (rev 292)
@@ -4,9 +4,14 @@
SET(HDRS ${CMAKE_SOURCE_DIR}/include/AR/video.h)
-SET(SRCS video.c ARVideoSettingsController.m ARVideoSettingsController.h videoInternal.h)
+SET(SRCS
+ video.c
+ ARVideoSettingsController.m
+ ARVideoSettingsController.h
+ videoInternal.h
+ )
-ADD_LIBRARY(${LIB_NAME} SHARED ${HDRS} ${SRCS})
+ADD_LIBRARY(${LIB_NAME} STATIC ${HDRS} ${SRCS})
TARGET_LINK_LIBRARIES(${LIB_NAME}
AR
@@ -15,3 +20,10 @@
"-framework Cocoa"
"-framework Carbon"
)
+
+INSTALL(TARGETS
+ ${LIB_NAME}
+ RUNTIME DESTINATION bin
+ ARCHIVE DESTINATION lib
+ LIBRARY DESTINATION lib
+ PUBLIC_HEADER DESTINATION include/AR)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ret...@us...> - 2008-08-21 03:47:58
|
Revision: 291
http://artoolkit.svn.sourceforge.net/artoolkit/?rev=291&view=rev
Author: retrakker
Date: 2008-08-21 03:48:04 +0000 (Thu, 21 Aug 2008)
Log Message:
-----------
- added utilities
- general cleanup of the buildsystem
- added documentation to the packaging
- added pattern files to the packaging
Modified Paths:
--------------
branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake
branches/hartmut-pre-2_8/artoolkit/CMakeModules/Packaging.cmake.in
branches/hartmut-pre-2_8/artoolkit/lib/SRC/AR/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARMulti/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/lib/SRC/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/lib/SRC/Gl/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/extlib/tinyxml/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/src/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/lib/SRC/_ext/freeglut/src/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/util/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/util/mk_patt/CMakeLists.txt
Added Paths:
-----------
branches/hartmut-pre-2_8/artoolkit/patterns/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/util/calib_camera2/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/util/calib_cparam/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/util/calib_distortion/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/util/graphicsTest/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/util/videoTest/CMakeLists.txt
Modified: branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt 2008-08-21 03:45:42 UTC (rev 290)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt 2008-08-21 03:48:04 UTC (rev 291)
@@ -19,6 +19,13 @@
set(ARTOOLKIT_VERSION_TINY 3)
set(ARTOOLKIT_VERSION_REV 99)
+set(ARTOOLKIT_VERSION_SHORT "${ARTOOLKIT_VERSION_MAJOR}.${ARTOOLKIT_VERSION_MINOR}")
+set(ARTOOLKIT_VERSION_FULL
+ "${ARTOOLKIT_VERSION_MAJOR}.${ARTOOLKIT_VERSION_MINOR}.${ARTOOLKIT_VERSION_TINY}"
+ )
+
+set(ARTOOLKIT_SHARE_FOLDER share/artoolkit-${ARTOOLKIT_VERSION_SHORT})
+
#
# Depending on what is available we work our way through
#
@@ -55,13 +62,18 @@
DESTINATION bin
PATTERN ".svn" EXCLUDE
)
+else(WIN32)
+ install(DIRECTORY ${CMAKE_SOURCE_DIR}/bin/Data
+ DESTINATION ${ARTOOLKIT_SHARE_FOLDER}
+ PATTERN ".svn" EXCLUDE
+ )
endif(WIN32)
install(FILES
ChangeLog.txt
COPYING.txt
README.txt
- DESTINATION share/artoolkit_2
+ DESTINATION ${ARTOOLKIT_SHARE_FOLDER}
)
if (APPLE)
@@ -88,8 +100,20 @@
add_subdirectory(util)
add_subdirectory(examples)
+#
+# Install the documentation
+#
+install(DIRECTORY doc
+ DESTINATION ${ARTOOLKIT_SHARE_FOLDER}
+ PATTERN ".svn" EXCLUDE
+ )
#
+# Install the pattern files
+#
+add_subdirectory(patterns)
+
+#
# Optional packaging for SDK
#
option(ARTOOLKIT_BUILD_PACKAGE "Build distribution packages" OFF)
Modified: branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake 2008-08-21 03:45:42 UTC (rev 290)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake 2008-08-21 03:48:04 UTC (rev 291)
@@ -1,21 +1,22 @@
# some simple macros to inject files into bundles
-MACRO(ARTOOLKIT_EXECUTABLE EXE_NAME SRCS)
- FILE(GLOB _datafiles "${CMAKE_SOURCE_DIR}/bin/Data/*.dat")
- FILE(GLOB _datafiles ${_datafiles} "${CMAKE_SOURCE_DIR}/bin/Data/*.xml")
- FILE(GLOB _datafiles ${_datafiles} "${CMAKE_SOURCE_DIR}/bin/Data/patt.*")
- IF(APPLE)
- SET_SOURCE_FILES_PROPERTIES(
+macro(artoolkit_executable EXE_NAME SRCS)
+ file(GLOB _datafiles "${CMAKE_SOURCE_DIR}/bin/Data/*.dat")
+ file(GLOB _datafiles ${_datafiles} "${CMAKE_SOURCE_DIR}/bin/Data/*.xml")
+ file(GLOB _datafiles ${_datafiles} "${CMAKE_SOURCE_DIR}/bin/Data/patt.*")
+
+ if(APPLE)
+ set_source_files_properties(
${_datafiles}
PROPERTIES
MACOSX_PACKAGE_LOCATION "Resources/Data"
)
- ADD_EXECUTABLE(${EXE_NAME} MACOSX_BUNDLE ${SRCS} ${_datafiles})
- ELSE(APPLE)
- ADD_EXECUTABLE(${EXE_NAME} ${SRCS} ${_datafiles})
- ENDIF(APPLE)
-ENDMACRO(ARTOOLKIT_EXECUTABLE)
+ add_executable(${EXE_NAME} MACOSX_BUNDLE ${${SRCS}} ${_datafiles})
+ else(APPLE)
+ add_executable(${EXE_NAME} ${${SRCS}} ${_datafiles})
+ endif(APPLE)
+endmacro(artoolkit_executable)
macro(artoolkit_lib_install target)
@@ -53,3 +54,84 @@
endmacro(artoolkit_exe_install target)
+
+macro(artoolkit_example_lite name source_files)
+
+ set(exe_name ${name})
+
+ include_directories(${OPENGL_INCLUDE_DIR} ${GLUT_INCLUDE_DIR})
+
+ artoolkit_executable(${exe_name} ${source_files})
+
+ target_link_libraries(${exe_name}
+ AR
+ ARvideo
+ ARMulti
+ ARgsubUtil
+ ARgsub_lite
+ ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES}
+ )
+
+ set_target_properties(${exe_name}
+ PROPERTIES
+ PROJECT_LABEL "Example ${name}"
+ )
+
+ artoolkit_exe_install(${exe_name})
+
+endmacro(artoolkit_example_lite name source_files)
+
+
+macro(artoolkit_example_glut name source_files)
+
+ set(exe_name ${name})
+
+ include_directories(${OPENGL_INCLUDE_DIR} ${GLUT_INCLUDE_DIR})
+
+ artoolkit_executable(${exe_name} ${source_files})
+
+ target_link_libraries(${exe_name}
+ AR
+ ARvideo
+ ARgsub
+ ARgsubUtil
+ ARMulti
+ ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES}
+ )
+
+ set_target_properties(${exe_name}
+ PROPERTIES
+ PROJECT_LABEL "Example ${name}"
+ )
+
+ artoolkit_exe_install(${exe_name})
+
+endmacro(artoolkit_example_glut name source_files)
+
+
+macro(artoolkit_utility_glut name source_files)
+
+ set(exe_name ${name})
+
+ include_directories(${OPENGL_INCLUDE_DIR} ${GLUT_INCLUDE_DIR})
+
+ artoolkit_executable(${exe_name} ${source_files})
+
+ target_link_libraries(${exe_name}
+ AR
+ ARvideo
+ ARMulti
+ ARgsub
+ ARgsub_lite
+ ARgsubUtil
+ ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES}
+ )
+
+ set_target_properties(${exe_name}
+ PROPERTIES
+ PROJECT_LABEL "Utility ${name}"
+ )
+
+ artoolkit_exe_install(${exe_name})
+
+endmacro(artoolkit_utility_glut name source_files)
Modified: branches/hartmut-pre-2_8/artoolkit/CMakeModules/Packaging.cmake.in
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeModules/Packaging.cmake.in 2008-08-21 03:45:42 UTC (rev 290)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeModules/Packaging.cmake.in 2008-08-21 03:48:04 UTC (rev 291)
@@ -18,23 +18,21 @@
set(CPACK_PACKAGE_VERSION_MINOR ${ARTOOLKIT_VERSION_MINOR})
set(CPACK_PACKAGE_VERSION_PATCH ${ARTOOLKIT_VERSION_TINY})
-set(CPACK_PACKAGE_INSTALL_DIRECTORY "ARToolKit2SDK")
+set(CPACK_PACKAGE_INSTALL_DIRECTORY "ARToolKit-${ARTOOLKIT_VERSION_FULL}-SDK")
-set(CPACK_PACKAGE_EXECUTABLES "mk_patt;Make Pattern;simpleLite;Simple Example")
+set(CPACK_PACKAGE_EXECUTABLES "videoTest;Test Video Capture;graphicsTest;Test Graphics Hardware")
if(WIN32)
- #
- # For MSVC compilers (and probably others) we need to copy the runtime
- # to the plugins folder as well
- #
-
set(CPACK_NSIS_MENU_LINKS
- "bin" "ARToolKit application folder"
- "share/osgART/ChangeLog.txt" "ARToolKit 2.0 ChangeLog"
- "share/artoolkit2/README.txt" "ARToolKit ReadMe"
- "share/artoolkit2/COPYING.txt" "ARToolKit GPL2 License"
- "share/osgART/doc/html/index.html" "osgART 2.0 API Documentation"
+ "bin" "ARToolKit application folder"
+ "${ARTOOLKIT_SHARE_FOLDER}/ChangeLog.txt" "ARToolKit ${ARTOOLKIT_VERSION_FULL} ChangeLog"
+ "${ARTOOLKIT_SHARE_FOLDER}/README.txt" "ARToolKit ReadMe"
+ "${ARTOOLKIT_SHARE_FOLDER}/COPYING.txt" "ARToolKit GPL2 License"
+ "${ARTOOLKIT_SHARE_FOLDER}/doc/index.html" "ARToolKit API Documentation"
+ "${ARTOOLKIT_SHARE_FOLDER}/doc/video/index.html" "ARToolKit Video API Documentation"
+ "${ARTOOLKIT_SHARE_FOLDER}/doc/gsub_lite/index.html" "ARToolKit GL Subroutine API Documentation"
+ "${ARTOOLKIT_SHARE_FOLDER}/patterns" "ARToolKit Patterns"
"http://artoolkit.sourceforge.net" "ARToolKit website"
"http://www.hitlabnz.org" "HIT Lab NZ website"
"http://www.artoolworks.com" "ARToolworks website"
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/AR/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/AR/CMakeLists.txt 2008-08-21 03:45:42 UTC (rev 290)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/AR/CMakeLists.txt 2008-08-21 03:48:04 UTC (rev 291)
@@ -1,22 +1,60 @@
-SET(LIB_NAME AR)
+set(LIB_NAME AR)
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+include_directories(${CMAKE_SOURCE_DIR}/include)
-CONFIGURE_FILE(
+configure_file(
${CMAKE_SOURCE_DIR}/include/${LIB_NAME}/config.h.in
${CMAKE_BINARY_DIR}/include/${LIB_NAME}/config.h
)
+
+set(SRCS
+ arDetectMarker.c
+ arDetectMarker2.c
+ arGetCode.c
+ arGetMarkerInfo.c
+ arGetTransMat.c
+ arGetTransMat2.c
+ arGetTransMat3.c
+ arGetTransMatCont.c
+ arLabeling.c
+ arUtil.c
+ mAlloc.c
+ mAllocDup.c
+ mAllocInv.c
+ mAllocMul.c
+ mAllocTrans.c
+ mAllocUnit.c
+ mDet.c
+ mDisp.c
+ mDup.c
+ mFree.c
+ mInv.c
+ mMul.c
+ mPCA.c
+ mSelfInv.c
+ mTrans.c
+ mUnit.c
+ paramChangeSize.c
+ paramDecomp.c
+ paramDisp.c
+ paramDistortion.c
+ paramFile.c
+ paramGet.c
+ vAlloc.c
+ vDisp.c
+ vFree.c
+ vHouse.c
+ vInnerP.c
+ vTridiag.c
+ )
-
-FILE(GLOB SRCS *.c)
-
-SET(HDRS ${HDRS}
+set(HDRS ${HDRS}
${CMAKE_BINARY_DIR}/include/AR/config.h
)
-SET(HDRS ${HDRS} ${CMAKE_SOURCE_DIR}/include/AR/ar.h)
+set(HDRS ${HDRS} ${CMAKE_SOURCE_DIR}/include/AR/ar.h)
-ADD_LIBRARY(${LIB_NAME} ${HDRS} ${SRCS})
+add_library(${LIB_NAME} ${SRCS} ${HDRS})
install(TARGETS AR
ARCHIVE DESTINATION lib
@@ -24,3 +62,10 @@
PUBLIC_HEADER DESTINATION include/AR
)
+
+install(FILES ${HDRS}
+ DESTINATION include/AR
+ )
+
+
+
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARMulti/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARMulti/CMakeLists.txt 2008-08-21 03:45:42 UTC (rev 290)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARMulti/CMakeLists.txt 2008-08-21 03:48:04 UTC (rev 291)
@@ -1,9 +1,26 @@
-SET(LIB_NAME ARMulti)
+set(lib_name ARMulti)
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+set(SRCS
+ arMultiActivate.c
+ arMultiGetTransMat.c
+ arMultiReadConfigFile.c
+ )
+
+include_directories(${CMAKE_SOURCE_DIR}/include)
-SET(HDRS ${CMAKE_SOURCE_DIR}/include/AR/arMulti.h)
+set(HDRS
+ ${CMAKE_SOURCE_DIR}/include/AR/arMulti.h
+ )
-FILE(GLOB SRCS *.c)
+add_library(${lib_name} STATIC ${HDRS} ${SRCS})
-ADD_LIBRARY(${LIB_NAME} ${HDRS} ${SRCS})
\ No newline at end of file
+install(TARGETS ${lib_name}
+ ARCHIVE DESTINATION lib
+ RUNTIME DESTINATION bin
+ PUBLIC_HEADER DESTINATION include/AR
+ )
+
+
+install(FILES ${HDRS}
+ DESTINATION include/AR
+ )
\ No newline at end of file
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/CMakeLists.txt 2008-08-21 03:45:42 UTC (rev 290)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/CMakeLists.txt 2008-08-21 03:48:04 UTC (rev 291)
@@ -12,6 +12,26 @@
# GL utility
add_subdirectory(Gl)
+#
+# ARvideo headers - just install them
+#
+install(FILES
+ ${CMAKE_SOURCE_DIR}/include/AR/sys/videoGStreamer.h
+ ${CMAKE_SOURCE_DIR}/include/AR/sys/videoLinux1394Cam.h
+ ${CMAKE_SOURCE_DIR}/include/AR/sys/videoLinuxDV.h
+ ${CMAKE_SOURCE_DIR}/include/AR/sys/videoLinuxV4L.h
+ ${CMAKE_SOURCE_DIR}/include/AR/sys/videoMacOSX.h
+ ${CMAKE_SOURCE_DIR}/include/AR/sys/videoSGI.h
+ ${CMAKE_SOURCE_DIR}/include/AR/sys/videoWin32DirectShow.h
+ DESTINATION include/AR/sys
+ )
+
+install(FILES
+ ${CMAKE_SOURCE_DIR}/include/AR/video.h
+ DESTINATION include/AR
+ )
+
+
# Video
if(APPLE)
add_subdirectory(VideoMacOSX)
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/Gl/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/Gl/CMakeLists.txt 2008-08-21 03:45:42 UTC (rev 290)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/Gl/CMakeLists.txt 2008-08-21 03:48:04 UTC (rev 291)
@@ -5,6 +5,9 @@
if(GLUT_FOUND)
+ #
+ # ARgsub
+ #
set(LIB_NAME ARgsub)
include_directories(${CMAKE_SOURCE_DIR}/include ${GLUT_INCLUDE_DIR})
@@ -21,6 +24,13 @@
include_directories(${CMAKE_SOURCE_DIR}/include ${GLUT_INCLUDE_DIR})
+ install(FILES ${HDRS}
+ DESTINATION include/AR
+ )
+
+ #
+ # ARgsubUtil
+ #
set(LIB_NAME ARgsubUtil)
set(HDRS ${CMAKE_SOURCE_DIR}/include/AR/gsubUtil.h)
@@ -29,13 +39,21 @@
add_library(${LIB_NAME} ${HDRS} ${SRCS})
- target_link_libraries(${LIB_NAME} AR)
+ target_link_libraries(${LIB_NAME} AR)
-
artoolkit_lib_install(${LIB_NAME})
+ install(FILES ${HDRS}
+ DESTINATION include/AR
+ )
+
endif(GLUT_FOUND)
+
+#
+# ARgsub lite
+#
+
SET(LIB_NAME ARgsub_lite)
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
@@ -50,6 +68,9 @@
artoolkit_lib_install(${LIB_NAME})
+install(FILES ${HDRS}
+ DESTINATION include/AR
+ )
@@ -57,3 +78,6 @@
+
+
+
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/extlib/tinyxml/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/extlib/tinyxml/CMakeLists.txt 2008-08-21 03:45:42 UTC (rev 290)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/extlib/tinyxml/CMakeLists.txt 2008-08-21 03:48:04 UTC (rev 291)
@@ -13,9 +13,16 @@
tinystr.h
tinyxml.h
)
-
+
add_definitions(-DTIXML_USE_STL)
add_library(${lib_name} STATIC
${SRCS}
- )
\ No newline at end of file
+ )
+
+if(NOT CMAKE_PROJECT_NAME MATCHES "tinyxml")
+ set_target_properties(${lib_name}
+ PROPERTIES
+ PROJECT_LABEL "Dependency ${lib_name}"
+ )
+endif(NOT CMAKE_PROJECT_NAME MATCHES "tinyxml")
\ No newline at end of file
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/src/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/src/CMakeLists.txt 2008-08-21 03:45:42 UTC (rev 290)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/src/CMakeLists.txt 2008-08-21 03:48:04 UTC (rev 291)
@@ -30,6 +30,14 @@
add_library(DSVL SHARED ${SRCS})
+if(NOT CMAKE_PROJECT_NAME MATCHES "DSVL")
+ set_target_properties(DSVL
+ PROPERTIES
+ PROJECT_LABEL "Dependency DirectShow Video Library"
+ )
+endif(NOT CMAKE_PROJECT_NAME MATCHES "DSVL")
+
+
target_link_libraries(DSVL tinyxml ${DIRECTSHOW_LIBRARIES})
if (${CMAKE_BUILD_TYPE} MATCHES Debug)
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/_ext/freeglut/src/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/_ext/freeglut/src/CMakeLists.txt 2008-08-21 03:45:42 UTC (rev 290)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/_ext/freeglut/src/CMakeLists.txt 2008-08-21 03:48:04 UTC (rev 291)
@@ -54,6 +54,14 @@
add_library(${lib_name} SHARED ${srcs} ${hdrs} ${public_hdrs})
+
+if(NOT CMAKE_PROJECT_NAME MATCHES "FreeGLUT")
+ set_target_properties(${lib_name}
+ PROPERTIES
+ PROJECT_LABEL "Dependency ${lib_name}"
+ )
+endif(NOT CMAKE_PROJECT_NAME MATCHES "FreeGLUT")
+
target_link_libraries(${lib_name}
${OPENGL_LIBRARIES}
)
@@ -73,5 +81,7 @@
ARCHIVE DESTINATION lib
)
+install(FILES ${public_hdrs} DESTINATION include/GL)
+
\ No newline at end of file
Added: branches/hartmut-pre-2_8/artoolkit/patterns/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/patterns/CMakeLists.txt (rev 0)
+++ branches/hartmut-pre-2_8/artoolkit/patterns/CMakeLists.txt 2008-08-21 03:48:04 UTC (rev 291)
@@ -0,0 +1,21 @@
+##############################################################################
+# CMake build system for ARToolKit 2.7.x #
+# #
+# (c) Copyright 2007-2008, HITLabNZ, Hartmut Seichter #
+##############################################################################
+
+set(pattern_files
+ blankPatt.gif
+ calib_cpara.pdf
+ calib_dist.pdf
+ calibPatt.pdf
+ pattHiro.pdf
+ pattKanji.pdf
+ pattMulti.pdf
+ pattSample1.pdf
+ pattSample2.pdf
+ )
+
+install(FILES ${pattern_files}
+ DESTINATION ${ARTOOLKIT_SHARE_FOLDER}/patterns
+ )
Modified: branches/hartmut-pre-2_8/artoolkit/util/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/util/CMakeLists.txt 2008-08-21 03:45:42 UTC (rev 290)
+++ branches/hartmut-pre-2_8/artoolkit/util/CMakeLists.txt 2008-08-21 03:48:04 UTC (rev 291)
@@ -1 +1,7 @@
-ADD_SUBDIRECTORY(mk_patt)
+add_subdirectory(calib_camera2)
+add_subdirectory(calib_cparam)
+add_subdirectory(calib_distortion)
+add_subdirectory(graphicsTest)
+add_subdirectory(mk_patt)
+add_subdirectory(videoTest)
+
Added: branches/hartmut-pre-2_8/artoolkit/util/calib_camera2/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/util/calib_camera2/CMakeLists.txt (rev 0)
+++ branches/hartmut-pre-2_8/artoolkit/util/calib_camera2/CMakeLists.txt 2008-08-21 03:48:04 UTC (rev 291)
@@ -0,0 +1,8 @@
+set(srcs
+ calib_dist.c
+ calib_inp.c
+ main.c
+ calib_camera.h
+ )
+
+artoolkit_utility_glut(calib_camera2 srcs)
Added: branches/hartmut-pre-2_8/artoolkit/util/calib_cparam/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/util/calib_cparam/CMakeLists.txt (rev 0)
+++ branches/hartmut-pre-2_8/artoolkit/util/calib_cparam/CMakeLists.txt 2008-08-21 03:48:04 UTC (rev 291)
@@ -0,0 +1,7 @@
+set(srcs
+ calib_cparam.c
+ calib_cparam.h
+ calib_cparam_sub.c
+ )
+
+artoolkit_utility_glut(calib_cparam srcs)
Added: branches/hartmut-pre-2_8/artoolkit/util/calib_distortion/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/util/calib_distortion/CMakeLists.txt (rev 0)
+++ branches/hartmut-pre-2_8/artoolkit/util/calib_distortion/CMakeLists.txt 2008-08-21 03:48:04 UTC (rev 291)
@@ -0,0 +1,7 @@
+set(srcs
+ calib_dist.c
+ calib_dist.h
+ check_dist.c
+ )
+
+artoolkit_utility_glut(calib_distortion srcs)
Added: branches/hartmut-pre-2_8/artoolkit/util/graphicsTest/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/util/graphicsTest/CMakeLists.txt (rev 0)
+++ branches/hartmut-pre-2_8/artoolkit/util/graphicsTest/CMakeLists.txt 2008-08-21 03:48:04 UTC (rev 291)
@@ -0,0 +1,5 @@
+set(srcs
+ graphicsTest.c
+ )
+
+artoolkit_utility_glut(graphicsTest srcs)
Modified: branches/hartmut-pre-2_8/artoolkit/util/mk_patt/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/util/mk_patt/CMakeLists.txt 2008-08-21 03:45:42 UTC (rev 290)
+++ branches/hartmut-pre-2_8/artoolkit/util/mk_patt/CMakeLists.txt 2008-08-21 03:48:04 UTC (rev 291)
@@ -1,17 +1,5 @@
-SET(EXE_NAME mk_patt)
+set(srcs
+ mk_patt.c
+ )
-SET(SRCS mk_patt.c)
-
-if(GLUT_FOUND)
-
- add_definitions(${GLUT_DEFS})
-
- include_directories(${GLUT_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
-
- ARTOOLKIT_EXECUTABLE(${EXE_NAME} ${SRCS})
-
- target_link_libraries(${EXE_NAME} AR ARgsub_lite ARvideo ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES})
-
- artoolkit_exe_install(${EXE_NAME})
-
-endif(GLUT_FOUND)
+artoolkit_utility_glut(mk_patt srcs)
Added: branches/hartmut-pre-2_8/artoolkit/util/videoTest/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/util/videoTest/CMakeLists.txt (rev 0)
+++ branches/hartmut-pre-2_8/artoolkit/util/videoTest/CMakeLists.txt 2008-08-21 03:48:04 UTC (rev 291)
@@ -0,0 +1,5 @@
+set(srcs
+ videoTest.c
+ )
+
+artoolkit_utility_glut(videoTest srcs)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ret...@us...> - 2008-08-21 03:45:35
|
Revision: 290
http://artoolkit.svn.sourceforge.net/artoolkit/?rev=290&view=rev
Author: retrakker
Date: 2008-08-21 03:45:42 +0000 (Thu, 21 Aug 2008)
Log Message:
-----------
- added CMake files for examples
Modified Paths:
--------------
branches/hartmut-pre-2_8/artoolkit/examples/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/examples/simpleLite/CMakeLists.txt
Added Paths:
-----------
branches/hartmut-pre-2_8/artoolkit/examples/collide/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/examples/exview/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/examples/loadMultiple/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/examples/modeTest/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/examples/multi/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/examples/optical/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/examples/paddle/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/examples/paddleDemo/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/examples/paddleInteraction/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/examples/range/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/examples/relation/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/examples/simple/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/examples/simple2/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/examples/twoView/CMakeLists.txt
Modified: branches/hartmut-pre-2_8/artoolkit/examples/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/examples/CMakeLists.txt 2008-08-20 04:18:49 UTC (rev 289)
+++ branches/hartmut-pre-2_8/artoolkit/examples/CMakeLists.txt 2008-08-21 03:45:42 UTC (rev 290)
@@ -1,6 +1,15 @@
-ADD_SUBDIRECTORY(simpleLite)
-
-
-
-
-
+add_subdirectory(collide)
+add_subdirectory(exview)
+add_subdirectory(loadMultiple)
+add_subdirectory(modeTest)
+add_subdirectory(multi)
+add_subdirectory(optical)
+add_subdirectory(paddle)
+add_subdirectory(paddleDemo)
+add_subdirectory(paddleInteraction)
+add_subdirectory(range)
+add_subdirectory(relation)
+add_subdirectory(simple)
+add_subdirectory(simple2)
+add_subdirectory(simpleLite)
+add_subdirectory(twoView)
Added: branches/hartmut-pre-2_8/artoolkit/examples/collide/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/examples/collide/CMakeLists.txt (rev 0)
+++ branches/hartmut-pre-2_8/artoolkit/examples/collide/CMakeLists.txt 2008-08-21 03:45:42 UTC (rev 290)
@@ -0,0 +1,7 @@
+
+set(srcs
+ collideTest.c
+ object.c
+ object.h)
+
+artoolkit_example_glut(collide srcs)
\ No newline at end of file
Added: branches/hartmut-pre-2_8/artoolkit/examples/exview/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/examples/exview/CMakeLists.txt (rev 0)
+++ branches/hartmut-pre-2_8/artoolkit/examples/exview/CMakeLists.txt 2008-08-21 03:45:42 UTC (rev 290)
@@ -0,0 +1,8 @@
+
+set(srcs
+ draw_object.c
+ exview.c
+ draw_object.h
+ )
+
+artoolkit_example_glut(exview srcs)
\ No newline at end of file
Added: branches/hartmut-pre-2_8/artoolkit/examples/loadMultiple/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/examples/loadMultiple/CMakeLists.txt (rev 0)
+++ branches/hartmut-pre-2_8/artoolkit/examples/loadMultiple/CMakeLists.txt 2008-08-21 03:45:42 UTC (rev 290)
@@ -0,0 +1,8 @@
+
+set(srcs
+ loadMultiple.c
+ object.c
+ object.h
+ )
+
+artoolkit_example_glut(loadMultiple srcs)
\ No newline at end of file
Added: branches/hartmut-pre-2_8/artoolkit/examples/modeTest/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/examples/modeTest/CMakeLists.txt (rev 0)
+++ branches/hartmut-pre-2_8/artoolkit/examples/modeTest/CMakeLists.txt 2008-08-21 03:45:42 UTC (rev 290)
@@ -0,0 +1,10 @@
+
+set(srcs
+ draw_object.c
+ modeTest.c
+ object.c
+ draw_object.h
+ object.h
+ )
+
+artoolkit_example_glut(modeTest srcs)
\ No newline at end of file
Added: branches/hartmut-pre-2_8/artoolkit/examples/multi/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/examples/multi/CMakeLists.txt (rev 0)
+++ branches/hartmut-pre-2_8/artoolkit/examples/multi/CMakeLists.txt 2008-08-21 03:45:42 UTC (rev 290)
@@ -0,0 +1,6 @@
+
+set(srcs
+ multiTest.c
+ )
+
+artoolkit_example_glut(multiTest srcs)
\ No newline at end of file
Added: branches/hartmut-pre-2_8/artoolkit/examples/optical/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/examples/optical/CMakeLists.txt (rev 0)
+++ branches/hartmut-pre-2_8/artoolkit/examples/optical/CMakeLists.txt 2008-08-21 03:45:42 UTC (rev 290)
@@ -0,0 +1,10 @@
+
+set(srcs
+ draw_object.c
+ object.c
+ optical.c
+ draw_object.h
+ object.h
+ )
+
+artoolkit_example_glut(optical srcs)
\ No newline at end of file
Added: branches/hartmut-pre-2_8/artoolkit/examples/paddle/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/examples/paddle/CMakeLists.txt (rev 0)
+++ branches/hartmut-pre-2_8/artoolkit/examples/paddle/CMakeLists.txt 2008-08-21 03:45:42 UTC (rev 290)
@@ -0,0 +1,8 @@
+
+set(srcs
+ paddle.c
+ paddleTest.c
+ paddle.h
+ )
+
+artoolkit_example_glut(paddle srcs)
\ No newline at end of file
Added: branches/hartmut-pre-2_8/artoolkit/examples/paddleDemo/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/examples/paddleDemo/CMakeLists.txt (rev 0)
+++ branches/hartmut-pre-2_8/artoolkit/examples/paddleDemo/CMakeLists.txt 2008-08-21 03:45:42 UTC (rev 290)
@@ -0,0 +1,12 @@
+
+set(srcs
+ command_sub.c
+ paddle.c
+ paddleDemo.c
+ util.c
+ command_sub.h
+ paddle.h
+ util.h
+ )
+
+artoolkit_example_glut(paddleDemo srcs)
\ No newline at end of file
Added: branches/hartmut-pre-2_8/artoolkit/examples/paddleInteraction/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/examples/paddleInteraction/CMakeLists.txt (rev 0)
+++ branches/hartmut-pre-2_8/artoolkit/examples/paddleInteraction/CMakeLists.txt 2008-08-21 03:45:42 UTC (rev 290)
@@ -0,0 +1,8 @@
+
+set(srcs
+ paddle.c
+ paddleInteractionTest.c
+ paddle.h
+ )
+
+artoolkit_example_glut(paddleInteraction srcs)
\ No newline at end of file
Added: branches/hartmut-pre-2_8/artoolkit/examples/range/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/examples/range/CMakeLists.txt (rev 0)
+++ branches/hartmut-pre-2_8/artoolkit/examples/range/CMakeLists.txt 2008-08-21 03:45:42 UTC (rev 290)
@@ -0,0 +1,6 @@
+
+set(srcs
+ rangeTest.c
+ )
+
+artoolkit_example_glut(rangeTest srcs)
\ No newline at end of file
Added: branches/hartmut-pre-2_8/artoolkit/examples/relation/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/examples/relation/CMakeLists.txt (rev 0)
+++ branches/hartmut-pre-2_8/artoolkit/examples/relation/CMakeLists.txt 2008-08-21 03:45:42 UTC (rev 290)
@@ -0,0 +1,6 @@
+
+set(srcs
+ relationTest.c
+ )
+
+artoolkit_example_glut(relationTest srcs)
\ No newline at end of file
Added: branches/hartmut-pre-2_8/artoolkit/examples/simple/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/examples/simple/CMakeLists.txt (rev 0)
+++ branches/hartmut-pre-2_8/artoolkit/examples/simple/CMakeLists.txt 2008-08-21 03:45:42 UTC (rev 290)
@@ -0,0 +1,6 @@
+
+set(srcs
+ simpleTest.c
+ )
+
+artoolkit_example_glut(simpleTest srcs)
\ No newline at end of file
Added: branches/hartmut-pre-2_8/artoolkit/examples/simple2/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/examples/simple2/CMakeLists.txt (rev 0)
+++ branches/hartmut-pre-2_8/artoolkit/examples/simple2/CMakeLists.txt 2008-08-21 03:45:42 UTC (rev 290)
@@ -0,0 +1,6 @@
+
+set(srcs
+ simpleTest2.c
+ )
+
+artoolkit_example_glut(simpleTest2 srcs)
\ No newline at end of file
Modified: branches/hartmut-pre-2_8/artoolkit/examples/simpleLite/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/examples/simpleLite/CMakeLists.txt 2008-08-20 04:18:49 UTC (rev 289)
+++ branches/hartmut-pre-2_8/artoolkit/examples/simpleLite/CMakeLists.txt 2008-08-21 03:45:42 UTC (rev 290)
@@ -1,13 +1,6 @@
-set(EXE_NAME simpleLite)
-set(SRCS simpleLite.c)
+set(srcs
+ simpleLite.c
+ )
-include_directories(${OPENGL_INCLUDE_DIR} ${GLUT_INCLUDE_DIR})
-
-artoolkit_executable(${EXE_NAME} ${SRCS})
-
-message(STATUS "GLUT ${GLUT_LIBRARIES}")
-
-target_link_libraries(${EXE_NAME} AR ARgsub_lite ARvideo ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES})
-
-artoolkit_exe_install(${EXE_NAME})
+artoolkit_example_lite(simpleLite srcs)
Added: branches/hartmut-pre-2_8/artoolkit/examples/twoView/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/examples/twoView/CMakeLists.txt (rev 0)
+++ branches/hartmut-pre-2_8/artoolkit/examples/twoView/CMakeLists.txt 2008-08-21 03:45:42 UTC (rev 290)
@@ -0,0 +1,6 @@
+
+set(srcs
+ twoView.c
+ )
+
+artoolkit_example_lite(twoView srcs)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
