Skip to content

Fix dll linkage on mingw64 #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kingscallop wants to merge 1 commit into
base: spark2
Choose a base branch
from
Open

Fix dll linkage on mingw64 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions include/Core/SPK_Emitter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,13 @@ namespace SPK
*
* @param active : true to activate this emitter, false to deactivate it
*/
void setActive(bool active);
inline void setActive(bool active);

/**
* @brief Tells whether this emitter is active or not
* @return true if this emitter is active, false if is is inactive
*/
bool isActive() const;
inline bool isActive() const;

//////////
// Tank //
Expand All @@ -82,7 +82,7 @@ namespace SPK
*
* @param tank : the initial number of particles in this emitters's tank
*/
void setTank(int tank);
inline void setTank(int tank);

/**
* @brief Sets the min and max number of particles in this emitter's tank
Expand All @@ -100,25 +100,25 @@ namespace SPK
* @brief Gets the current number of particles in this emitter's tank
* @return the current number of particles in this emitters's tank
*/
int getCurrentTank() const;
inline int getCurrentTank() const;

/**
* @brief Gets the minimum initial number of particles in this emitter's tank
* @return the minimum initial number of particles in this emitters's tank
*/
int getMinTank() const;
inline int getMinTank() const;

/**
* @brief Gets the maximum initial number of particles in this emitter's tank
* @return the maximum initial number of particles in this emitters's tank
*/
int getMaxTank() const;
inline int getMaxTank() const;

/**
* @brief Resets the current tank
* The current tank is reevaluated between the min and max tank
*/
void resetTank();
inline void resetTank();

//////////
// Flow //
Expand All @@ -140,7 +140,7 @@ namespace SPK
* @brief Gets the flow of this emitter
* @return the flow of this emitter
*/
float getFlow() const;
inline float getFlow() const;

///////////
// Force //
Expand All @@ -163,13 +163,13 @@ namespace SPK
* @brief Gets the minimum force of this emitter
* @return the minimum force of this emitter
*/
float getForceMin() const;
inline float getForceMin() const;

/**
* @brief Gets the maximum force of this emitter
* @return the maximum force of this emitter
*/
float getForceMax() const;
inline float getForceMax() const;

//////////
// Zone //
Expand All @@ -183,22 +183,22 @@ namespace SPK
* @param zone : the zone of this emitter
* @param full : true to generate particles in the whole Zone, false to generate particles only at the zone's borders.
*/
void setZone(const Ref<Zone>& zone, bool full);
inline void setZone(const Ref<Zone>& zone, bool full);

void setZone(const Ref<Zone>& zone);
void setUseFullZone(bool f);
inline void setUseFullZone(bool f);

/**
* @brief Gets the zone of this emitter
* @return the zone of this emitter
*/
const Ref<Zone>& getZone() const;
inline const Ref<Zone>& getZone() const;

/**
* @brief Tells whether this emitter emits in the whole Zone or only at its borders
* @return true if this emitter emits in the whole Zone, false if it is only at its borders
*/
bool isFullZone() const;
inline bool isFullZone() const;

virtual Ref<SPKObject> findByName(const std::string& name);

Expand Down Expand Up @@ -245,8 +245,8 @@ namespace SPK

void emit(Particle& particle) const;

size_t updateTankFromTime(float deltaTime);
size_t updateTankFromNb(size_t nb);
inline size_t updateTankFromTime(float deltaTime);
inline size_t updateTankFromNb(size_t nb);

/**
* @brief Gives the particle an initial velocity
Expand Down
102 changes: 51 additions & 51 deletions include/Core/SPK_Group.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,38 +58,38 @@ namespace SPK

public :

static Ref<Group> create(size_t capacity = 100);
inline static Ref<Group> create(size_t capacity = 100);
~Group();

bool isInitialized() const;
inline bool isInitialized() const;

void setLifeTime(float minLife,float maxLife);
void setImmortal(bool immortal);
void setStill(bool still);
inline void setImmortal(bool immortal);
inline void setStill(bool still);

void setColorInterpolator(const Ref<ColorInterpolator>& interpolator);
const Ref<ColorInterpolator>& getColorInterpolator() const;
inline const Ref<ColorInterpolator>& getColorInterpolator() const;

void setParamInterpolator(Param param,const Ref<FloatInterpolator>& interpolator);
const Ref<FloatInterpolator>& getParamInterpolator(Param param) const;

void setScaleInterpolator(const Ref<FloatInterpolator>& interpolator);
void setMassInterpolator(const Ref<FloatInterpolator>& interpolator);
void setAngleInterpolator(const Ref<FloatInterpolator>& interpolator);
void setTextureIndexInterpolator(const Ref<FloatInterpolator>& interpolator);
void setRotationSpeedInterpolator(const Ref<FloatInterpolator>& interpolator);
const Ref<FloatInterpolator>& getScaleInterpolator() const;
const Ref<FloatInterpolator>& getMassInterpolator() const;
const Ref<FloatInterpolator>& getAngleInterpolator() const;
const Ref<FloatInterpolator>& getTextureIndexInterpolator() const;
const Ref<FloatInterpolator>& getRotationSpeedInterpolator() const;

float getMinLifeTime() const;
float getMaxLifeTime() const;
bool isImmortal() const;
bool isStill() const;

bool isEnabled(Param param) const;
inline const Ref<FloatInterpolator>& getParamInterpolator(Param param) const;

inline void setScaleInterpolator(const Ref<FloatInterpolator>& interpolator);
inline void setMassInterpolator(const Ref<FloatInterpolator>& interpolator);
inline void setAngleInterpolator(const Ref<FloatInterpolator>& interpolator);
inline void setTextureIndexInterpolator(const Ref<FloatInterpolator>& interpolator);
inline void setRotationSpeedInterpolator(const Ref<FloatInterpolator>& interpolator);
inline const Ref<FloatInterpolator>& getScaleInterpolator() const;
inline const Ref<FloatInterpolator>& getMassInterpolator() const;
inline const Ref<FloatInterpolator>& getAngleInterpolator() const;
inline const Ref<FloatInterpolator>& getTextureIndexInterpolator() const;
inline const Ref<FloatInterpolator>& getRotationSpeedInterpolator() const;

inline float getMinLifeTime() const;
inline float getMaxLifeTime() const;
inline bool isImmortal() const;
inline bool isStill() const;

inline bool isEnabled(Param param) const;

size_t getNbParticles() const;
size_t getCapacity() const;
Expand All @@ -102,35 +102,35 @@ namespace SPK

void addEmitter(const Ref<Emitter>& emitter);
void removeEmitter(const Ref<Emitter>& emitter);
void removeAllEmitters();
const Ref<Emitter>& getEmitter(size_t index) const;
size_t getNbEmitters() const;
inline void removeAllEmitters();
inline const Ref<Emitter>& getEmitter(size_t index) const;
inline size_t getNbEmitters() const;

void addModifier(const Ref<Modifier>& modifier);
void removeModifier(const Ref<Modifier>& modifier);
void removeAllModifiers();
const Ref<Modifier>& getModifier(size_t index) const;
size_t getNbModifiers() const;
inline const Ref<Modifier>& getModifier(size_t index) const;
inline size_t getNbModifiers() const;

void setRenderer(const Ref<Renderer>& renderer);
const Ref<Renderer>& getRenderer() const;
inline const Ref<Renderer>& getRenderer() const;

void enableDistanceComputation(bool distanceComputation);
bool isDistanceComputationEnabled() const;
inline void enableDistanceComputation(bool distanceComputation);
inline bool isDistanceComputationEnabled() const;

void enableSorting(bool sorting);
bool isSortingEnabled() const;
inline void enableSorting(bool sorting);
inline bool isSortingEnabled() const;

const void* getColorAddress() const;
const void* getPositionAddress() const;
const void* getVelocityAddress() const;
const void* getParamAddress(Param param) const;
inline const void* getColorAddress() const;
inline const void* getPositionAddress() const;
inline const void* getVelocityAddress() const;
inline const void* getParamAddress(Param param) const;

void setRadius(float radius);
inline void setRadius(float radius);
void setGraphicalRadius(float radius);
void setPhysicalRadius(float radius);
float getGraphicalRadius() const;
float getPhysicalRadius() const;
inline float getGraphicalRadius() const;
inline float getPhysicalRadius() const;

/**
* @brief Gets a Vector3D holding the minimum coordinates of the AABB of the Group.
Expand All @@ -139,7 +139,7 @@ namespace SPK
*
* @return a Vector3D holding the minimum coordinates of the AABB of the Group
*/
const Vector3D& getAABBMin() const;
inline const Vector3D& getAABBMin() const;

/**
* @brief Gets a Vector3D holding the maximum coordinates of the AABB of the Group.
Expand All @@ -148,7 +148,7 @@ namespace SPK
*
* @return a Vector3D holding the maximum coordinates of the AABB of the Group
*/
const Vector3D& getAABBMax() const;
inline const Vector3D& getAABBMax() const;

///////////////////
// Add Particles //
Expand Down Expand Up @@ -176,7 +176,7 @@ namespace SPK
* @param position : the position where the Particles will be added
* @param velocity : the velocity of the Particles
*/
void addParticles(unsigned int nb,const Vector3D& position,const Vector3D& velocity);
inline void addParticles(unsigned int nb,const Vector3D& position,const Vector3D& velocity);

/**
* @brief Adds some Particles to this Group
Expand Down Expand Up @@ -292,7 +292,7 @@ namespace SPK

void flushBufferedParticles();

Ref<System> getSystem() const;
inline Ref<System> getSystem() const;

/////////////
// Actions //
Expand All @@ -303,10 +303,10 @@ namespace SPK
*
*/
void setBirthAction(const Ref<Action>& action);
const Ref<Action>& getBirthAction() const;
inline const Ref<Action>& getBirthAction() const;

void setDeathAction(const Ref<Action>& action);
const Ref<Action>& getDeathAction() const;
inline const Ref<Action>& getDeathAction() const;

//////////////////////
// Advanced methods //
Expand Down Expand Up @@ -334,25 +334,25 @@ namespace SPK
* @brief Gets the data set used by the interpolator of the given parameter
* @return the data set or NULL if the interpolator does not use data set or does not exist
*/
DataSet* getParamInterpolatorDataSet(Param param);
inline DataSet* getParamInterpolatorDataSet(Param param);

/**
* @brief Gets the data set used by the color interpolator
* @return the data set or NULL if the color interpolator does not use data set or does not exist
*/
DataSet* getColorInterpolatorDataSet();
inline DataSet* getColorInterpolatorDataSet();

/**
* @brief Gets the data set used by the renderer
* @return the data set or NULL if the renderer does not use data set or does not exist
*/
DataSet* getRendererDataSet();
inline DataSet* getRendererDataSet();

/**
* @brief Gets the render buffer
* @return the render buffer or NULL if the group does not use a render buffer
*/
RenderBuffer* getRenderBuffer();
inline RenderBuffer* getRenderBuffer();

/**
* @brief Gets the octree
Expand Down
18 changes: 9 additions & 9 deletions include/Core/SPK_Logger.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ namespace SPK
*
* @param enabled : true to enable the logger, false to disable it
*/
void setEnabled(bool enabled);
inline void setEnabled(bool enabled);

/**
* @brief Sets the priority level of the logger
Expand All @@ -169,7 +169,7 @@ namespace SPK
*
* @param priorityLevel : the priority level of the logger
*/
void setPriorityLevel(LogPriority priorityLevel);
inline void setPriorityLevel(LogPriority priorityLevel);

/**
* @brief Sets the inner stream of the logger
Expand All @@ -179,7 +179,7 @@ namespace SPK
*
* @param stream : the inner stream of the logger
*/
void setStream(std::ostream& stream);
inline void setStream(std::ostream& stream);

/**
* @brief Sets the prefix flag of the logger
Expand All @@ -190,7 +190,7 @@ namespace SPK
*
* @param prefixFlag : the prefix flag of the logger
*/
void setPrefixFlag(int prefixFlag);
inline void setPrefixFlag(int prefixFlag);

/////////////
// Getters //
Expand All @@ -200,13 +200,13 @@ namespace SPK
* @brief Tells whether the logger is enabled or not
* @return true if the logger is enabled, false if it is disabled
*/
bool isEnabled() const;
inline bool isEnabled() const;

/**
* @brief Gets the priority level of the logger
* @return the priority level of the logger
*/
LogPriority getPriorityLevel() const;
inline LogPriority getPriorityLevel() const;

/**
* @brief Gets the stream of the logger
Expand All @@ -226,7 +226,7 @@ namespace SPK
* @brief Gets the prefix flag of the logger
* @return the prefix flag of the logger
*/
int getPrefixFlag() const;
inline int getPrefixFlag() const;

///////////////
// Interface //
Expand All @@ -241,10 +241,10 @@ namespace SPK
* @param priority : the priority level of the entry
* @param entry : the entry to log in
*/
void addEntry(LogPriority priority,const std::string& entry);
inline void addEntry(LogPriority priority,const std::string& entry);

/** @brief Flushes the logger (Immediately appends pending entries to the inner stream) */
void flush();
inline void flush();

//////////////////
// Nested class //
Expand Down
Loading