Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed missing virtual function #5

Open
wants to merge 1 commit into
base: unstable
Choose a base branch
from
Open

Fixed missing virtual function #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions Source/XnDeviceSensorV2/XnSensorDepthGenerator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ XnSensorDepthGenerator::~XnSensorDepthGenerator()
XnStatus XnSensorDepthGenerator::Init()
{
XnStatus nRetVal = XN_STATUS_OK;

nRetVal = XnSensorMapGenerator::Init();
XN_IS_STATUS_OK(nRetVal);

const XnChar* aProps[] =
const XnChar* aProps[] =
{
XN_STREAM_PROPERTY_ZERO_PLANE_DISTANCE,
XN_STREAM_PROPERTY_ZERO_PLANE_PIXEL_SIZE,
Expand Down Expand Up @@ -180,7 +180,7 @@ XnStatus XnSensorDepthGenerator::GetUserPosition(XnUInt32 nIndex, XnBoundingBox3

XnStatus XnSensorDepthGenerator::RegisterToUserPositionChange(XnModuleStateChangedHandler handler, void* pCookie, XnCallbackHandle& hCallback)
{
const XnChar* aProps[] =
const XnChar* aProps[] =
{
XN_STREAM_PROPERTY_AGC_BIN,
NULL
Expand Down Expand Up @@ -244,6 +244,11 @@ XnStatus XnSensorDepthGenerator::SetViewPoint(xn::ProductionNode& OtherNode)
}
}

XnStatus XnSensorDepthGenerator::GetPixelCoordinatesInViewPoint(xn::ProductionNode& other, XnUInt32 x, XnUInt32 y, XnUInt32& altX, XnUInt32& altY)
{
return 0;
}

XnStatus XnSensorDepthGenerator::ResetViewPoint()
{
return SetIntProperty(XN_STREAM_PROPERTY_REGISTRATION, FALSE);
Expand All @@ -259,7 +264,7 @@ XnBool XnSensorDepthGenerator::IsViewPointAs(xn::ProductionNode& OtherNode)

XnStatus XnSensorDepthGenerator::RegisterToViewPointChange(XnModuleStateChangedHandler handler, void* pCookie, XnCallbackHandle& hCallback)
{
const XnChar* aProps[] =
const XnChar* aProps[] =
{
XN_STREAM_PROPERTY_REGISTRATION,
NULL
Expand Down Expand Up @@ -306,7 +311,7 @@ XnBool XnSensorDepthGenerator::IsFrameSyncedWith(xn::ProductionNode& OtherNode)

XnStatus XnSensorDepthGenerator::RegisterToFrameSyncChange(XnModuleStateChangedHandler handler, void* pCookie, XnCallbackHandle& hCallback)
{
const XnChar* aProps[] =
const XnChar* aProps[] =
{
XN_MODULE_PROPERTY_FRAME_SYNC,
NULL
Expand Down
9 changes: 5 additions & 4 deletions Source/XnDeviceSensorV2/XnSensorDepthGenerator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
#pragma warning (push)
#pragma warning (disable: 4250)

class XnSensorDepthGenerator :
public XnSensorMapGenerator,
class XnSensorDepthGenerator :
public XnSensorMapGenerator,
virtual public xn::ModuleDepthGenerator,
virtual public xn::ModuleUserPositionInterface,
virtual public xn::ModuleAlternativeViewPointInterface,
Expand Down Expand Up @@ -68,6 +68,7 @@ class XnSensorDepthGenerator :
xn::ModuleAlternativeViewPointInterface* GetAlternativeViewPointInterface() { return this; }
XnBool IsViewPointSupported(xn::ProductionNode& OtherNode);
XnStatus SetViewPoint(xn::ProductionNode& OtherNode);
XnStatus GetPixelCoordinatesInViewPoint(xn::ProductionNode& other, XnUInt32 x, XnUInt32 y, XnUInt32& altX, XnUInt32& altY);
XnStatus ResetViewPoint();
XnBool IsViewPointAs(xn::ProductionNode& OtherNode);
XnStatus RegisterToViewPointChange(XnModuleStateChangedHandler handler, void* pCookie, XnCallbackHandle& hCallback);
Expand All @@ -83,7 +84,7 @@ class XnSensorDepthGenerator :

protected:
virtual void FilterProperties(XnActualPropertiesHash* pHash);

private:
XnStatus UpdateRealWorldTranslationData();
XnBool IsSensorImageNode(xn::ProductionNode& Other);
Expand All @@ -106,4 +107,4 @@ class XnExportedSensorDepthGenerator : public XnExportedSensorGenerator

#pragma warning (pop)

#endif // __XN_SENSOR_DEPTH_GENERATOR_H__
#endif // __XN_SENSOR_DEPTH_GENERATOR_H__