Fixed build for windows systems
This commit is contained in:
parent
b9ebf06188
commit
49564acc3c
21 changed files with 32 additions and 22 deletions
|
@ -6,7 +6,7 @@
|
|||
namespace paysages {
|
||||
namespace basics {
|
||||
|
||||
class Color
|
||||
class BASICSSHARED_EXPORT Color
|
||||
{
|
||||
public:
|
||||
Color();
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
namespace paysages {
|
||||
namespace basics {
|
||||
|
||||
class Geometry
|
||||
class BASICSSHARED_EXPORT Geometry
|
||||
{
|
||||
public:
|
||||
static double get2DAngle(double x, double y);
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
#include <cmath>
|
||||
#include "PackStream.h"
|
||||
#include "Vector3.h"
|
||||
|
||||
Matrix4::Matrix4(bool identity)
|
||||
{
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
|
||||
#include "basics_global.h"
|
||||
|
||||
#include "Vector3.h"
|
||||
#ifdef QT_GUI_LIB
|
||||
#include <QMatrix4x4>
|
||||
#endif
|
||||
|
|
|
@ -5,15 +5,13 @@
|
|||
|
||||
#include "Vector3.h"
|
||||
|
||||
namespace paysages
|
||||
{
|
||||
namespace basics
|
||||
{
|
||||
namespace paysages {
|
||||
namespace basics {
|
||||
|
||||
/*!
|
||||
* \brief A segment in 3D space (mainly useful for rays).
|
||||
*/
|
||||
class SpaceSegment
|
||||
class BASICSSHARED_EXPORT SpaceSegment
|
||||
{
|
||||
public:
|
||||
SpaceSegment(const Vector3& start, const Vector3& end);
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
namespace paysages {
|
||||
namespace basics {
|
||||
|
||||
class Texture2D
|
||||
class BASICSSHARED_EXPORT Texture2D
|
||||
{
|
||||
public:
|
||||
Texture2D(int xsize, int ysize);
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
namespace paysages {
|
||||
namespace basics {
|
||||
|
||||
class Texture3D
|
||||
class BASICSSHARED_EXPORT Texture3D
|
||||
{
|
||||
public:
|
||||
Texture3D(int xsize, int ysize, int zsize);
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
namespace paysages {
|
||||
namespace basics {
|
||||
|
||||
class Texture4D
|
||||
class BASICSSHARED_EXPORT Texture4D
|
||||
{
|
||||
public:
|
||||
Texture4D(int xsize, int ysize, int zsize, int wsize);
|
||||
|
|
|
@ -29,4 +29,14 @@ namespace basics {
|
|||
}
|
||||
using namespace paysages::basics;
|
||||
|
||||
#ifndef M_PI
|
||||
#define M_PI 3.14159265358979323846
|
||||
#endif
|
||||
#ifndef M_PI_2
|
||||
#define M_PI_2 1.57079632679489661923
|
||||
#endif
|
||||
#ifndef M_PI_4
|
||||
#define M_PI_4 0.78539816339744830962
|
||||
#endif
|
||||
|
||||
#endif // BASICS_GLOBAL_H
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
namespace paysages {
|
||||
namespace definition {
|
||||
|
||||
class AtmosphereDefinition : public BaseDefinition
|
||||
class DEFINITIONSHARED_EXPORT AtmosphereDefinition : public BaseDefinition
|
||||
{
|
||||
public:
|
||||
typedef struct
|
||||
|
|
|
@ -19,7 +19,7 @@ typedef struct
|
|||
double zfar;
|
||||
} CameraPerspective;
|
||||
|
||||
class BASICSSHARED_EXPORT CameraDefinition: public BaseDefinition
|
||||
class DEFINITIONSHARED_EXPORT CameraDefinition: public BaseDefinition
|
||||
{
|
||||
public:
|
||||
CameraDefinition();
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
namespace paysages {
|
||||
namespace definition {
|
||||
|
||||
class WaterDefinition: public BaseDefinition
|
||||
class DEFINITIONSHARED_EXPORT WaterDefinition: public BaseDefinition
|
||||
{
|
||||
public:
|
||||
WaterDefinition(BaseDefinition* parent);
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
namespace paysages {
|
||||
namespace preview {
|
||||
|
||||
class AtmosphereColorPreviewRenderer:public Base2dPreviewRenderer
|
||||
class PREVIEWSHARED_EXPORT AtmosphereColorPreviewRenderer:public Base2dPreviewRenderer
|
||||
{
|
||||
public:
|
||||
AtmosphereColorPreviewRenderer(AtmosphereDefinition* definition, double heading);
|
||||
|
|
|
@ -28,7 +28,7 @@ public:
|
|||
bool value;
|
||||
};
|
||||
|
||||
class BasePreview : public DrawingWidget
|
||||
class PREVIEWSHARED_EXPORT BasePreview : public DrawingWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
|
|
|
@ -11,7 +11,7 @@ class QPainter;
|
|||
namespace paysages {
|
||||
namespace preview {
|
||||
|
||||
class DrawingWidget : public QWidget
|
||||
class PREVIEWSHARED_EXPORT DrawingWidget : public QWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
|
|
|
@ -9,7 +9,7 @@ class QImage;
|
|||
namespace paysages {
|
||||
namespace preview {
|
||||
|
||||
class PreviewOsd
|
||||
class PREVIEWSHARED_EXPORT PreviewOsd
|
||||
{
|
||||
public:
|
||||
PreviewOsd();
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
namespace paysages {
|
||||
namespace preview {
|
||||
|
||||
class PreviewOsdItem:public QImage
|
||||
class PREVIEWSHARED_EXPORT PreviewOsdItem:public QImage
|
||||
{
|
||||
public:
|
||||
PreviewOsdItem(int width, int height);
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
namespace paysages {
|
||||
namespace preview {
|
||||
|
||||
class TerrainShapePreviewRenderer : public Base2dPreviewRenderer
|
||||
class PREVIEWSHARED_EXPORT TerrainShapePreviewRenderer : public Base2dPreviewRenderer
|
||||
{
|
||||
public:
|
||||
explicit TerrainShapePreviewRenderer(TerrainDefinition* terrain);
|
||||
|
|
|
@ -11,7 +11,7 @@ namespace software {
|
|||
/*!
|
||||
* \brief Abstract class for all cloud models (cirrus, cumulus...).
|
||||
*/
|
||||
class BaseCloudsModel
|
||||
class SOFTWARESHARED_EXPORT BaseCloudsModel
|
||||
{
|
||||
public:
|
||||
BaseCloudsModel(CloudLayerDefinition *layer);
|
||||
|
|
|
@ -9,7 +9,7 @@ namespace system {
|
|||
/*!
|
||||
* Pool to handle a group of threads doing the same task.
|
||||
*/
|
||||
class ParallelPool
|
||||
class SYSTEMSHARED_EXPORT ParallelPool
|
||||
{
|
||||
public:
|
||||
ParallelPool();
|
||||
|
|
|
@ -1,7 +1,9 @@
|
|||
#ifndef SYSTEM_GLOBAL_H
|
||||
#define SYSTEM_GLOBAL_H
|
||||
|
||||
#ifndef __MINGW32__
|
||||
#define PAYSAGES_USE_INLINING 1
|
||||
#endif
|
||||
|
||||
#include <QtCore/qglobal.h>
|
||||
#if defined(SYSTEM_LIBRARY)
|
||||
|
|
Loading…
Reference in a new issue