From 16ba0a2fa157c836b54123f976fdcc65b2c549a7 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Sat, 10 Mar 2007 11:38:26 +0000 Subject: [PATCH] Updated wrappers --- src/osgWrappers/osg/GNUmakefile | 1 + src/osgWrappers/osgManipulator/Dragger.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/osgWrappers/osg/GNUmakefile b/src/osgWrappers/osg/GNUmakefile index 231390baa..e21fc4075 100644 --- a/src/osgWrappers/osg/GNUmakefile +++ b/src/osgWrappers/osg/GNUmakefile @@ -118,6 +118,7 @@ CXXFILES =\ TextureCubeMap.cpp\ TextureRectangle.cpp\ Timer.cpp\ + TransferFunction.cpp\ Transform.cpp\ Uniform.cpp\ Vec2.cpp\ diff --git a/src/osgWrappers/osgManipulator/Dragger.cpp b/src/osgWrappers/osgManipulator/Dragger.cpp index 2ebb36551..5b85666c9 100644 --- a/src/osgWrappers/osgManipulator/Dragger.cpp +++ b/src/osgWrappers/osgManipulator/Dragger.cpp @@ -247,9 +247,9 @@ BEGIN_VALUE_REFLECTOR(osgManipulator::PointerInfo) __void__addIntersection__C5_osg_NodePath_R1__osg_Vec3, "", ""); - I_Method2(void, setMousePosition, IN, int, pixel_x, IN, int, pixel_y, + I_Method2(void, setMousePosition, IN, float, pixel_x, IN, float, pixel_y, Properties::NON_VIRTUAL, - __void__setMousePosition__int__int, + __void__setMousePosition__float__float, "", ""); I_SimpleProperty(osg::Camera *, Camera, @@ -261,8 +261,8 @@ BEGIN_VALUE_REFLECTOR(osgManipulator::PointerInfo) I_SimpleProperty(const osg::Matrix &, ViewMatrix, __C5_osg_Matrix_R1__getViewMatrix, 0); - I_PublicMemberProperty(int, _pixel_x); - I_PublicMemberProperty(int, _pixel_y); + I_PublicMemberProperty(float, _pixel_x); + I_PublicMemberProperty(float, _pixel_y); I_PublicMemberProperty(osg::Camera *, _camera); I_PublicMemberProperty(osgManipulator::PointerInfo::IntersectionList, _hitList); I_PublicMemberProperty(osgManipulator::PointerInfo::IntersectionList::iterator, _hitIter);