root/OpenSceneGraph/trunk/include/osgPresentation/deprecated/PickEventHandler @ 13721

Revision 13721, 2.4 kB (checked in by robert, 9 hours ago)

From Jan Klimke, "i noticed, that there are a couple of additional flaws when building osg for Mac OS X 10.10 Yosemite.

The mac os sdk version is recognized by the current CMAKE script as 10.1 instead of 10.10 since it cuts the version string from the 4th place. I introduced a more reliable version checking based on splitting the returned version code into MAJOR MINOR and PATCH parts and reassemble the OSG sdk version afterwards.

I replaced the existing CMake code against the following (returning now version 10.10 as expected):

# Determine the canonical name of the selected Platform SDK

EXECUTE_PROCESS(COMMAND "/usr/bin/sw_vers" "-productVersion"

OUTPUT_VARIABLE OSG_OSX_SDK_NAME
OUTPUT_STRIP_TRAILING_WHITESPACE)

STRING(REPLACE "." ";" MACOS_VERSION_LIST ${OSG_OSX_SDK_NAME})
LIST(GET MACOS_VERSION_LIST 0 MACOS_VERSION_MAJOR)
LIST(GET MACOS_VERSION_LIST 1 MACOS_VERSION_MINOR)
LIST(GET MACOS_VERSION_LIST 2 MACOS_VERSION_PATCH)

SET(OSG_OSX_SDK_NAME "macosx${MACOS_VERSION_MAJOR}.${MACOS_VERSION_MINOR}")

Also i added the check for the new Version to some more find scripts.

Additionally the nil object in Objective C now seems to be equivalent with a null_ptr that cannot be passed as GLInt anymore. So i switched this in the PixelBufferCocoa?.mm to pass a zero instead of nil.
"

  • Property svn:eol-style set to native
  • Property svn:keywords set to Author Date Id Revision
Line 
1/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield
2 *
3 * This software is open source and may be redistributed and/or modified under
4 * the terms of the GNU General Public License (GPL) version 2.0.
5 * The full license is in LICENSE.txt file included with this distribution,.
6 *
7 * This software is distributed in the hope that it will be useful,
8 * but WITHOUT ANY WARRANTY; without even the implied warranty of
9 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
10 * include LICENSE.txt for more details.
11*/
12
13#ifndef PICKEVENTHANDLER
14#define PICKEVENTHANDLER 1
15
16#include <osg/StateSet>
17#include <osg/Point>
18
19#include <osgGA/GUIEventHandler>
20
21#include <osgPresentation/deprecated/SlideEventHandler>
22
23namespace osgPresentation
24{
25
26class OSGPRESENTATION_EXPORT PickEventHandler : public osgGA::GUIEventHandler
27{
28    public:
29
30        PickEventHandler(osgPresentation::Operation operation, const JumpData& jumpData=JumpData());
31        PickEventHandler(const std::string& str, osgPresentation::Operation operation, const JumpData& jumpData=JumpData());
32        PickEventHandler(const osgPresentation::KeyPosition& keyPos, const JumpData& jumpData=JumpData());
33
34        void setOperation(osgPresentation::Operation operation) { _operation = operation; }
35        osgPresentation::Operation getOperation() const { return _operation; }
36
37        void setCommand(const std::string& str) { _command = str; }
38        const std::string& getCommand() const { return _command; }
39
40        void setKeyPosition(const osgPresentation::KeyPosition& keyPos) { _keyPos = keyPos; }
41        const osgPresentation::KeyPosition&  getKeyPosition() const { return _keyPos; }
42
43        void setJumpData(const JumpData& jumpData) { _jumpData = jumpData; }
44        const JumpData& getJumpData() const { return _jumpData; }
45
46        virtual bool handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIActionAdapter& aa, osg::Object* object, osg::NodeVisitor* nv);
47
48        virtual void accept(osgGA::GUIEventHandlerVisitor& v);
49
50        virtual void getUsage(osg::ApplicationUsage& usage) const;
51
52        void doOperation();
53
54        std::string                         _command;
55        osgPresentation::KeyPosition        _keyPos;
56        osgPresentation::Operation          _operation;
57
58        JumpData                            _jumpData;
59        std::set<osg::Drawable*>            _drawablesOnPush;
60
61};
62
63}
64
65#endif
Note: See TracBrowser for help on using the browser.