Changeset 6704

Show
Ignore:
Timestamp:
05/20/07 13:45:09 (5 years ago)
Author:
robert
Message:

Added support for SG_USE_FLOAT_MATRIX and OSG_USE_FLOAT_PLANE in CMake build and
include/osg/Matrix and include/osg/Plane.

Location:
OpenSceneGraph/trunk
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • OpenSceneGraph/trunk/CMakeLists.txt

    r6702 r6704  
    109109######################################################################################################## 
    110110 
     111OPTION(OSG_USE_FLOAT_MATRIX "Set to ON to build OpenSceneGraph with float matrix instead of double." OFF) 
     112MARK_AS_ADVANCED(OSG_USE_FLOAT_MATRIX) 
     113IF(OSG_USE_FLOAT_MATRIX)         
     114    ADD_DEFINITIONS(-DOSG_USE_FLOAT_MATRIX) 
     115ENDIF(OSG_USE_FLOAT_MATRIX)         
     116 
     117OPTION(OSG_USE_FLOAT_PLANE "Set to ON to build OpenSceneGraph with float matrix instead of double." OFF) 
     118MARK_AS_ADVANCED(OSG_USE_FLOAT_PLANE) 
     119IF(OSG_USE_FLOAT_PLANE)         
     120    ADD_DEFINITIONS(-DOSG_USE_FLOAT_PLANE) 
     121ENDIF(OSG_USE_FLOAT_PLANE)         
    111122 
    112123 

  • OpenSceneGraph/trunk/include/osg/Matrix

    r5328 r6704  
    1818#include <osg/Matrixf> 
    1919 
    20 #define OSG_USE_DOUBLE_MATRICES 1 
    21  
    2220namespace osg { 
    2321 
    24 #ifdef OSG_USE_DOUBLE_MATRICES 
     22#ifdef OSG_USE_FLOAT_MATRIX 
     23    typedef Matrixf Matrix; 
     24    typedef RefMatrixf RefMatrix; 
     25#else 
    2526    typedef Matrixd Matrix; 
    2627    typedef RefMatrixd RefMatrix; 
    27 #else 
    28     typedef Matrixf Matrix; 
    29     typedef RefMatrixf RefMatrix; 
    30  
    3128#endif 
    3229 

  • OpenSceneGraph/trunk/include/osg/Plane

    r6700 r6704  
    2424#include <vector> 
    2525 
    26 #define OSG_USE_DOUBLE_PLANE 1 
    27  
    2826namespace osg { 
    2927 
    … …  
    3432    public: 
    3533 
    36 #ifdef OSG_USE_DOUBLE_PLANE 
     34#ifdef OSG_USE_FLOAT_PLANE 
     35        /** Type of Plane class.*/ 
     36        typedef float value_type; 
     37        typedef Vec3f Vec3_type; 
     38        typedef Vec4f Vec4_type; 
     39#else 
    3740        /** Type of Plane class.*/ 
    3841        typedef double value_type; 
    3942        typedef Vec3d Vec3_type; 
    4043        typedef Vec4d Vec4_type; 
    41 #else 
    42         /** Type of Plane class.*/ 
    43         typedef float value_type; 
    44         typedef Vec3f Vec3_type; 
    45         typedef Vec4f Vec4_type; 
    4644#endif 
    4745