Hi Jeremy,

These will be in shortly; osgCairo is done, the osgPango patch was
harder because I had an ungodly amount of changes in the works. :)

I just updated. Most changes are in, but I think you missed the last patch I sent for osgPango (which was in addition to the first one I sent Sunday night). Here it is again - nothing really complicated, but it makes osgpangoanimation and osgpangoguiviewer build against the osgWidget/osgAnimation branch.

Thanks,

J-S
--
______________________________________________________
Jean-Sebastien Guay    [EMAIL PROTECTED]
                               http://www.cm-labs.com/
                        http://whitestar02.webhop.org/
Index: examples/osgpangoanimation/CMakeLists.txt
===================================================================
--- examples/osgpangoanimation/CMakeLists.txt   (revision 25)
+++ examples/osgpangoanimation/CMakeLists.txt   (working copy)
@@ -4,7 +4,10 @@
 # current project, but we need to add the postfix for the other libs.
 LINK_LIBRARIES(osgPango
                debug     OpenThreads${CMAKE_DEBUG_POSTFIX}
-               optimized OpenThreads)
+               optimized OpenThreads
+               debug     osgGA${CMAKE_DEBUG_POSTFIX}
+               optimized osgGA
+)
 
 ADD_EXECUTABLE(osgpangoanimation osgpangoanimation.cpp)
 
Index: examples/osgpangoanimation/osgpangoanimation.cpp
===================================================================
--- examples/osgpangoanimation/osgpangoanimation.cpp    (revision 25)
+++ examples/osgpangoanimation/osgpangoanimation.cpp    (working copy)
@@ -9,6 +9,8 @@
 #include <osgAnimation/EaseMotion>
 #include <osgPango/Text>
 
+#include <stdlib.h>
+
 // const unsigned int WINDOW_WIDTH  = 720;
 // const unsigned int WINDOW_HEIGHT = 480;
 
@@ -56,7 +58,7 @@
                                
                                _motions[i] = MyMotion(0, duration, 3.14, 
osgAnimation::Motion::LOOP);
                                
-                               float offset = (random() * 1.0 / (1.0 * 
RAND_MAX)) * duration;
+                               float offset = (rand() * 1.0 / (1.0 * 
RAND_MAX)) * duration;
                                
                                _motions[i].setTime(offset);
                        }
@@ -141,8 +143,8 @@
        const osg::Vec2& size = t->getSize();
 
        t->setMatrix(osg::Matrix::translate(
-               round((WINDOW_WIDTH - size.x()) / 2.0f),
-               size.y() + round((WINDOW_HEIGHT - size.y()) / 2.0f),
+        osg::round((WINDOW_WIDTH - size.x()) / 2.0f),
+        size.y() + osg::round((WINDOW_HEIGHT - size.y()) / 2.0f),
                0.0f
        ));
 
@@ -154,7 +156,7 @@
 
        camera->addChild(t);
 
-       viewer.setUpViewInWindow(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT);
+       viewer.setUpViewInWindow(50, 50, WINDOW_WIDTH, WINDOW_HEIGHT);
        viewer.setSceneData(camera);
        viewer.getCamera()->setClearColor(osg::Vec4(0.2f, 0.2f, 0.2f, 1.0f));
 
Index: examples/osgpangoguiviewer/CMakeLists.txt
===================================================================
--- examples/osgpangoguiviewer/CMakeLists.txt   (revision 25)
+++ examples/osgpangoguiviewer/CMakeLists.txt   (working copy)
@@ -4,7 +4,10 @@
 # current project, but we need to add the postfix for the other libs.
 LINK_LIBRARIES(osgPango
                debug     OpenThreads${CMAKE_DEBUG_POSTFIX}
-               optimized OpenThreads)
+               optimized OpenThreads
+               debug     osgDB${CMAKE_DEBUG_POSTFIX}
+               optimized osgDB
+)
 
 ADD_EXECUTABLE(osgpangoguiviewer osgpangoguiviewer.cpp)
 
_______________________________________________
osg-users mailing list
osg-users@lists.openscenegraph.org
http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org

Reply via email to