Commit 9a824f9b authored by Jan Möbius's avatar Jan Möbius
Browse files

Missing DLL Export and windows incompatibility


git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@12567 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 00f64d0b
......@@ -52,8 +52,9 @@
#include <qpushbutton.h>
#include <qcolor.h>
#include "../Config/ACGDefines.hh"
class QtColorChooserButton: public QPushButton {
class ACGDLLEXPORT QtColorChooserButton: public QPushButton {
Q_OBJECT
Q_PROPERTY(QColor color READ color WRITE setColor)
......
......@@ -47,12 +47,12 @@
namespace ACG {
const float ColorGenerator::defaultSaturation_ = 1.0f;
const float ColorGenerator::defaultValue_ = 1.0f;
#define DEFAULT_SATURATION 1.0f
#define DEFAULT_VALUE 1.0f
ColorGenerator::ColorGenerator(float _alpha, float _baseHue) :
currentSubdiv_(2), currentIt_(0), currentTriadIt_(0),
alpha_(_alpha), baseHue_(_baseHue) {
alpha_(_alpha), baseHue_(_baseHue),defaultSaturation_(DEFAULT_SATURATION),defaultValue_(DEFAULT_VALUE) {
}
static inline float wrap01(float v) {
......
......@@ -44,6 +44,7 @@
#define COLORGENERATOR_HH_
#include <ACG/Math/VectorT.hh>
#include "../Config/ACGDefines.hh"
namespace ACG {
......@@ -54,7 +55,7 @@ namespace ACG {
* Note that it intentionally behaves totally deterministic. (Because
* reproducibility rocks.)
*/
class ColorGenerator {
class ACGDLLEXPORT ColorGenerator {
public:
/**
* Constructor
......@@ -111,7 +112,7 @@ class ColorGenerator {
float alpha_;
float baseHue_;
static const float defaultSaturation_, defaultValue_;
const float defaultSaturation_, defaultValue_;
};
} /* namespace ACG */
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment