Revision: 9106
http://playerstage.svn.sourceforge.net/playerstage/?rev=9106&view=rev
Author: thjc
Date: 2012-11-12 18:24:56 +0000 (Mon, 12 Nov 2012)
Log Message:
-----------
updates for artoolkipplus 2.2
Modified Paths:
--------------
code/player/trunk/server/drivers/blobfinder/artoolkitplus/CMakeLists.txt
code/player/trunk/server/drivers/blobfinder/artoolkitplus/artoolkitplus.cc
Modified:
code/player/trunk/server/drivers/blobfinder/artoolkitplus/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/blobfinder/artoolkitplus/CMakeLists.txt
2012-11-12 18:23:29 UTC (rev 9105)
+++ code/player/trunk/server/drivers/blobfinder/artoolkitplus/CMakeLists.txt
2012-11-12 18:24:56 UTC (rev 9106)
@@ -1,6 +1,6 @@
PLAYERDRIVER_OPTION (artoolkitplus build_artoolkitplus ON)
PLAYERDRIVER_REQUIRE_PKG (artoolkitplus build_artoolkitplus artoolkitplus
- artoolkitplus_includeDirs artoolkitplus_libDirs artoolkitplus_linkLibs
artoolkitplus_linkFlags artoolkitplus_cFlags >=2.1)
+ artoolkitplus_includeDirs artoolkitplus_libDirs artoolkitplus_linkLibs
artoolkitplus_linkFlags artoolkitplus_cFlags >=2.2)
PLAYERDRIVER_ADD_DRIVER (artoolkitplus build_artoolkitplus
INCLUDEDIRS ${artoolkitplus_includeDirs} LIBDIRS ${artoolkitplus_libDirs}
LINKLIBS ${artoolkitplus_linkLibs}
LINKFLAGS ${artoolkitplus_linkFlags} CFLAGS ${artoolkitplus_cFlags}
Modified:
code/player/trunk/server/drivers/blobfinder/artoolkitplus/artoolkitplus.cc
===================================================================
--- code/player/trunk/server/drivers/blobfinder/artoolkitplus/artoolkitplus.cc
2012-11-12 18:23:29 UTC (rev 9105)
+++ code/player/trunk/server/drivers/blobfinder/artoolkitplus/artoolkitplus.cc
2012-11-12 18:24:56 UTC (rev 9106)
@@ -79,24 +79,15 @@
#include <libplayercore/playercore.h>
-#include <ARToolKitPlus/TrackerSingleMarkerImpl.h>
+#include <ARToolKitPlus/TrackerSingleMarker.h>
#include <ARToolKitPlus/Camera.h>
#include <ARToolKitPlus/ar.h>
-#include <ARToolKitPlus/Logger.h>
#include "../../base/imagebase.h"
using namespace ARToolKitPlus;
-class MyLogger : public ARToolKitPlus::Logger
-{
- void artLog(const char* nStr)
- {
- printf(nStr);
- }
-};
-
// Driver for detecting laser retro-reflectors.
class ARToolkitPlusDriver : public ImageBase
{
@@ -116,7 +107,6 @@
ARToolKitPlus::Camera * DummyCam; //< the
camera
bool useBCH;
- MyLogger logger;
ARToolKitPlus::TrackerSingleMarker *tracker;
};
@@ -158,15 +148,10 @@
// - can load a maximum of 1 patterns
// - can detect a maximum of 8 patterns in one image
// - with an arbitrary default image size
- tracker = new ARToolKitPlus::TrackerSingleMarkerImpl<6,6,6, 1,
8>(LastFrameWidth,LastFrameHeight);
+ tracker = new
ARToolKitPlus::TrackerSingleMarker(LastFrameWidth,LastFrameHeight);
tracker->setPixelFormat(ARToolKitPlus::PIXEL_FORMAT_LUM);
-
- // set a logger so we can output error messages
- //
- tracker->setLogger(&logger);
-
if(!tracker->init(NULL, 1.0f, 1000.0f)) // load NULL camera
{
SetError(-1);
@@ -177,7 +162,7 @@
tracker->setUndistortionMode(ARToolKitPlus::UNDIST_NONE);
// setup a fake camera so we can set the width and height
- DummyCam = new CameraImpl;
+ DummyCam = new Camera;
memset(DummyCam->dist_factor,0,sizeof (DummyCam->dist_factor));
memset(DummyCam->mat,0,sizeof (DummyCam->mat));
DummyCam->changeFrameSize(LastFrameWidth,LastFrameHeight);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_nov
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
