From Mathias Froehlich, moved optional config variables into include/osg/Config file that
is automatically created by cmake according to its own settings.
This commit is contained in:
@@ -14,6 +14,7 @@
|
||||
#ifndef OSG_BOUNDINGBOX
|
||||
#define OSG_BOUNDINGBOX 1
|
||||
|
||||
#include <osg/Config>
|
||||
#include <osg/Export>
|
||||
#include <osg/Vec3>
|
||||
#include <osg/Vec3d>
|
||||
@@ -31,12 +32,12 @@ class OSG_EXPORT BoundingBox
|
||||
{
|
||||
public:
|
||||
|
||||
#ifdef OSG_USE_DOUBLE_BOUNDINGBOX
|
||||
typedef Vec3d vec_type;
|
||||
typedef double value_type;
|
||||
#else
|
||||
#ifdef OSG_USE_FLOAT_BOUNDINGBOX
|
||||
typedef Vec3f vec_type;
|
||||
typedef float value_type;
|
||||
#else
|
||||
typedef Vec3d vec_type;
|
||||
typedef double value_type;
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
#ifndef OSG_BOUNDINGSPHERE
|
||||
#define OSG_BOUNDINGSPHERE 1
|
||||
|
||||
#include <osg/Config>
|
||||
#include <osg/Export>
|
||||
#include <osg/Vec3f>
|
||||
#include <osg/Vec3d>
|
||||
@@ -32,12 +33,12 @@ class OSG_EXPORT BoundingSphere
|
||||
{
|
||||
public:
|
||||
|
||||
#ifdef OSG_USE_DOUBLE_BOUNDINGSPHERE
|
||||
typedef Vec3d vec_type;
|
||||
typedef double value_type;
|
||||
#else
|
||||
#ifdef OSG_USE_FLOAT_BOUNDINGSPHERE
|
||||
typedef Vec3f vec_type;
|
||||
typedef float value_type;
|
||||
#else
|
||||
typedef Vec3d vec_type;
|
||||
typedef double value_type;
|
||||
#endif
|
||||
|
||||
vec_type _center;
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
#ifndef OSG_MATRIX
|
||||
#define OSG_MATRIX 1
|
||||
|
||||
#include <osg/Config>
|
||||
#include <osg/Matrixd>
|
||||
#include <osg/Matrixf>
|
||||
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
#ifndef OSG_PLANE
|
||||
#define OSG_PLANE 1
|
||||
|
||||
#include <osg/Config>
|
||||
#include <osg/Export>
|
||||
#include <osg/Vec3>
|
||||
#include <osg/Vec4>
|
||||
|
||||
Reference in New Issue
Block a user