Show
Ignore:
Timestamp:
11/28/08 15:35:33 (5 years ago)
Author:
robert
Message:

From Jeremy Moles, updates to osgWidget

Merged my Robert Osfield from OpenSceneGraph-osgWidget-dev.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/include/osgWidget/Util

    r9008 r9287  
    1212*/ 
    1313 
    14 // -*-c++-*- osgWidget - Code by: Jeremy Moles (cubicool) 2007-2008 
    15 // $Id: Util 59 2008-05-15 20:55:31Z cubicool $ 
     14// Code by: Jeremy Moles (cubicool) 2007-2008 
    1615 
    1716#ifndef OSGWIDGET_UTIL 
    1817#define OSGWIDGET_UTIL 
    1918 
    20 #include <ctype.h> 
     19#include <cctype> 
    2120#include <algorithm> 
    2221#include <sstream> 
     
    7271OSGWIDGET_EXPORT std::string  getFilePath        (const std::string&); 
    7372OSGWIDGET_EXPORT std::string  generateRandomName (const std::string&); 
    74  
    75 OSGWIDGET_EXPORT osg::Matrix  createInvertedYOrthoProjectionMatrix (matrix_type, matrix_type); 
    76 OSGWIDGET_EXPORT osg::Camera* createOrthoCamera                    (matrix_type, matrix_type); 
    77 OSGWIDGET_EXPORT osg::Camera* createInvertedYOrthoCamera           (matrix_type, matrix_type); 
     73OSGWIDGET_EXPORT osg::Camera* createOrthoCamera  (matrix_type, matrix_type); 
    7874 
    7975// This function sets up our basic example framework, and optionally sets some root 
    8076// scene data. 
    81 OSGWIDGET_EXPORT int createExample(osgViewer::Viewer&, WindowManager*, osg::Node* = 0); 
    82  
    83 // This function works like the above routine, except creates an additional "outside" 
    84 // view for looking at your 2D scene. 
    85 // TODO: Fix this! 
    86 OSGWIDGET_EXPORT int createCompositeExample( 
    87     osgViewer::CompositeViewer&, 
    88     osgViewer::View*, 
    89     WindowManager*, 
    90     osg::Node* = 0 
    91 ); 
    92  
    93 OSGWIDGET_EXPORT bool writeWindowManagerNode(WindowManager*); 
     77OSGWIDGET_EXPORT int  createExample          (osgViewer::Viewer&, WindowManager*, osg::Node* = 0); 
     78OSGWIDGET_EXPORT bool writeWindowManagerNode (WindowManager*); 
    9479 
    9580}