Changeset 40

Timestamp:

04/01/07 15:41:36 (2 years ago)

Author:

astraw

Message:

compiles on Mac OS X using boost 1.33.1

Files:

• trunk/pyosg/BUILD_BOOST_ON_OSX.txt (added)
• trunk/pyosg/MANIFEST.in (modified) (1 diff)
• trunk/pyosg/Producer/Camera.cpp (modified) (4 diffs)
• trunk/pyosg/README (modified) (3 diffs)
• trunk/pyosg/modules.py (modified) (1 diff)
• trunk/pyosg/osgProducer/Viewer.cpp (modified) (3 diffs)
• trunk/pyosg/setup.py (modified) (2 diffs)

trunk/pyosg/MANIFEST.in

@@ -1 +1 @@
-include setup*.py
-include SConstruct
-include Jamfile
-include Jamrules
-recursive-include scons *.py
-recursive-include include *.hpp
-include include/osgScript/Export

trunk/pyosg/Producer/Camera.cpp

@@ -96 +96 @@
-};
-
-
+
-void Camera_addPreCullCallback(Producer::Camera * self, PyObject * cb)
-{
@@ -168 +168 @@
-    }
-}
+*/
-
-tuple getProjectionRectangle(Producer::Camera * self)
@@ -385 +386 @@
-        .def("advance", &Producer::Camera::advance)
-        .def("sync", &Producer::Camera::sync)
-
+
-        .def("addPreCullCallback",
-            &Camera_addPreCullCallback)
@@ -397 +398 @@
-        .def("addPostDrawCallback",
-            &Camera_addPostDrawCallback)
+      */
-        .def("cancel", &Producer::Camera::cancel)
-        .def("run", &Producer::Camera::run)

trunk/pyosg/README

@@ -2 +2 @@
-
-= Welcome to PyOSG =
+
+A Python wrapper for [http://openscenegraph.org OpenSceneGraph]
-
-Given:
@@ -15 +17 @@
-
-As I am not able to devote much time to maintaining PyOSG, I ask the community for any and all help with this site and the source -- I will happily grant commit access to either if to anyone with more than a trivial patch.
+
+= News =
+
+ * 2007-04-01 PyOSG (trunk in svn repository) now compiles against OSG
+   1.0, 1.1, and 1.2 on linux and Mac OS X. I'm still having trouble
+   getting it running on Mac OS X (boost::python issues), but
+   hopefully the worst is behind us and Windows support can be added
+   relatively painlessly.
-
-= Development =
@@ -35 +45 @@
- * Miguel Escriva has been implementing bindings that use the new osgIntrospection features: [http://mescriva.okode.com/svn/osgPython/trunk svn repository] [http://mescriva.okode.com/svn/osgPython/trunk/examples/viewer.py viewer example]
-
+= Building notes =
-
-
+
+
+
+

trunk/pyosg/modules.py

@@ -10 +10 @@
-    'osgProducer',
-    'osgSim',
-(temporarily) until it works
+until someone can get the Python wrapper to work
-    'osgUtil',
-    ]

trunk/pyosg/osgProducer/Viewer.cpp

@@ -52 +52 @@
-    void setUpViewer_2(osgProducer::Viewer::ViewerOptions options) { osgProducer::Viewer::setUpViewer(options); }
-
+  /*
-    unsigned int addCameraManipulator(PyObject * cm)
-    {
@@ -66 +67 @@
-        }
-    }
-
+
-        /** compute, from normalized mouse coords, for all Cameras, intersections with the specified subgraph.*/
-        bool computeIntersections_1(float x,float y,unsigned int cameraNum,osg::Node *node,osgUtil::IntersectVisitor::HitList& hits,osg::Node::NodeMask traversalMask)
@@ -159 +160 @@
-        .def("getUsage", 
-            &Viewer::getUsage)
-
+
-        .def("addCameraManipulator", 
-            &Viewer::addCameraManipulator)
+      */
-        .def("selectCameraManipulator", 
-            &Viewer::selectCameraManipulator)

trunk/pyosg/setup.py

@@ -55 +55 @@
-    DistributionMetadata.download_url = None
-
+define_macros=[('VERSION','"'+__version__+'"')]
+library_dirs = []
+extra_link_args = []
+libraries=['OpenThreads','Producer']+modules.ext_modules
+libraries.append('osgText') # currently not being built
+
+data_files = []
+
+if sys.platform == 'darwin':
+##     data_files = [
+##         ('/usr/local/lib', ['/usr/local/lib/libboost_python-' + boost_version_default + '.dylib'])
+##         ]
+    if 'osgSound' in modules.ext_modules:
+        data_files.append( ('/usr/local/lib', ['/usr/local/lib/libfmodex.dylib']) )
+    package_data = {}
+    #define_macros.append( ('__USE_OSX_CGL_IMPLEMENTATION__',None ) ) # prevent building OSG glx version
+    define_macros.append( ('__USE_OSX_AGL_IMPLEMENTATION__',None ) ) # prevent building OSG glx version
+    library_dirs.append( os.path.join(sys.prefix,'lib') )
+    
+    for lib in libraries:
+        extra_link_args.append('-framework')
+        extra_link_args.append(lib)
+    libraries=[] # overwrite
+    
+elif sys.platform == 'win32':
+    data_files.extend([
+        ('.' , [boost_root_default + '\\lib\\' + 'boost_python-vc71-mt-' + boost_version_default + '.dll'])
+        ])
+    if 'osgSound' in modules.ext_modules:
+        data_files.append( ('.', ['\\gideon\\bin\\fmodex.dll']) )
+        data_files.append( ('.', ['\\gideon\\bin\\osgsound.dll']) )
+    package_data = {}
+else:
+    package_data = {}
+
+libraries.insert(0,'boost_python')
+
-extensions = []
-for libname in modules.ext_modules:
@@ -65 +102 @@
-                                cppfiles,
-                                include_dirs=['include'],
-
-
+
+
+
+
+
-
-
-if sys.platform == 'darwin':
-    data_files = [
-        ('/usr/local/lib', ['/usr/local/lib/libboost_python-' + boost_version_default + '.dylib'])
-        ]
-    if 'osgSound' in modules.ext_modules:
-        data_files.append( ('/usr/local/lib', ['/usr/local/lib/libfmodex.dylib']) )
-    package_data = {}
-elif sys.platform == 'win32':
-    data_files = [
-        ('.' , [boost_root_default + '\\lib\\' + 'boost_python-vc71-mt-' + boost_version_default + '.dll'])
-        ]
-    if 'osgSound' in modules.ext_modules:
-        data_files.append( ('.', ['\\gideon\\bin\\fmodex.dll']) )
-        data_files.append( ('.', ['\\gideon\\bin\\osgsound.dll']) )
-    package_data = {}
-else:
-    data_files = []
-    package_data = {}
-
-scriptfiles = filter(isfile, glob('applications/*'))