Changeset 7154

Show
Ignore:
Timestamp:
07/24/07 16:02:53
Author:
robert
Message:

From Alexandre Amalric, Fox example

From Robert Osfield, CMake build support for FOX example

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • OpenSceneGraph/trunk/CMakeLists.txt

    r7100 r7154  
    142142FIND_PACKAGE(GLUT) 
    143143FIND_PACKAGE(SDL) 
     144FIND_PACKAGE(FOX) 
    144145FIND_PACKAGE(Inventor) 
    145146FIND_PACKAGE(Jasper) 

  • OpenSceneGraph/trunk/examples/CMakeLists.txt

    r7025 r7154  
    106106    ENDIF(SDL_FOUND) 
    107107 
     108    IF   (FOX_FOUND) 
     109        ADD_SUBDIRECTORY(osgviewerFOX) 
     110    ENDIF(FOX_FOUND) 
     111 
    108112    IF   (wxWidgets_FOUND) 
    109113        ADD_SUBDIRECTORY(osgviewerWX) 

  • OpenSceneGraph/trunk/include/osgTerrain/Locator

    r7101 r7154  
    9898    public: 
    9999 
    100         CartesianLocator(double originX, double originY, double lengthX, double lengthY, double height = 0.0f, double heightScale =  
    101 1.0f);  
     100        CartesianLocator(double originX, double originY, double lengthX, double lengthY, double height = 0.0f, double heightScale = 1.0f);  
    102101 
    103102        void setExtents(double originX, double originY, double lengthX, double lengthY, double height = 0.0f, double heightScale = 1.0f);  

  • OpenSceneGraph/trunk/src/osgTerrain/Locator.cpp

    r7101 r7154  
    135135CartesianLocator::CartesianLocator(double originX, double originY, double lengthX, double lengthY, double height, double heightScale) 
    136136{ 
    137     setExtents(originX, originY, lengthY, lengthY, height, heightScale); 
     137    setExtents(originX, originY, lengthX, lengthY, height, heightScale); 
    138138} 
    139139