Commit a511f433 authored by Jonas Stienen's avatar Jonas Stienen
Browse files

Adding some missing static build definitions

parent 6f4b9206
......@@ -32,6 +32,10 @@ else( )
add_definitions( -DITA_PROPAGATION_PATH_SIM_STATIC )
endif( )
if( ITA_GEOMETRICAL_ACOUSTICS_BUILD_STATIC )
add_definitions( -DITA_GEO_STATIC )
endif( )
if( ITA_CORE_LIBS_BUILD_STATIC )
add_definitions( -DITA_BASE_STATIC )
endif( )
......
#ifndef INCLUDE_WATCHER_COMBINED_PROPAGATION_ENGINE
#define INCLUDE_WATCHER_COMBINED_PROPAGATION_ENGINE
#include<ITAPropagationPathSim/CombinedModel/PropagationShapes.h>
#include <ITAPropagationPathSim/Definitions.h>
#include <ITAPropagationPathSim/CombinedModel/PropagationShapes.h>
#include <ITAPropagationPathSim/CombinedModel/RTree.h>
// ITA includes
......@@ -130,8 +130,8 @@ namespace ITAPropagationPathSim
vector<CPropagationShapeShared> m_vpPropagationTree; //!< Vector of all propagation shapes (as well as its children) visible to the emitter
vector<CPropagationShapeShared> m_vpPropagationCandidates; //!< Vector of all propagation shape visible to the emitter with each one pointing to up to one child with the last one visible to the sensor
shared_ptr< CPropagationAnchor > m_pOriginEntity; //!< Pointer to (geometrical) origin entity (can acoustically also be a sensor, if reciprocally used)
shared_ptr< CPropagationAnchor > m_pTargetEntity; //!< Pointer to (geometrical) target entity (can acoustically also be an emitter, if reciprocally used)
shared_ptr< ITAGeo::CPropagationAnchor > m_pOriginEntity; //!< Pointer to (geometrical) origin entity (can acoustically also be a sensor, if reciprocally used)
shared_ptr< ITAGeo::CPropagationAnchor > m_pTargetEntity; //!< Pointer to (geometrical) target entity (can acoustically also be an emitter, if reciprocally used)
float GetMaxPropagationRange() const;
bool GetMaxPropagationRangeValid() const;
......@@ -140,7 +140,7 @@ namespace ITAPropagationPathSim
bool CanPointIlluminateFace( const VistaVector3D & v3Point, const string & sMeshModelName, CITAMesh::FaceHandle hFace );
bool CanPointIlluminateEdge( const VistaVector3D & v3Point, CPropagationEdgeShared & pPropagationEdge, const bool& bTestIntersection = false );
bool IsPathVisible( const VistaVector3D & v3StartPoint, const VistaVector3D & v3EndPoint );
void CanEdgeIlluminateFace( bool& bCanEdgeIlluminateFaceOut, ITAPropagationPathSim::CombinedModel::CPropagationFaceShared & pPropagationFace, ITAPropagationPathSim::CombinedModel::CPropagationEdgeShared & pPropagationEdge );
void CanEdgeIlluminateFace( bool& bCanEdgeIlluminateFaceOut, CPropagationFaceShared & pPropagationFace, CPropagationEdgeShared & pPropagationEdge );
void CanFaceIlluminateEdge( bool& bCanFaceIlluminateEdgeOut, CPropagationFaceShared& pPropagationFace, CPropagationEdgeShared & pPropagationEdge );
void CanFaceIlluminateFace( bool& bCanFaceIlluminateFaceOut, CPropagationFaceShared& pPropagationFaceStart, CPropagationFaceShared & pPropagationFaceEnd );
void CanEdgeIlluminateEdge( bool& bCanEdgeIlluminateEdgeOut, CPropagationEdgeShared& pPropagationEdgeStart, CPropagationEdgeShared & pPropagationEdgeEnd, const bool& bTestIntersection = false );
......
......@@ -44,7 +44,7 @@ namespace ITAPropagationPathSim
Undefined = 2
};
class CPropagationShape
class ITA_PROPAGATION_PATH_SIM_API CPropagationShape
{
public:
//---Public member variables-----------------------------------------------------------------------
......@@ -120,7 +120,7 @@ namespace ITAPropagationPathSim
};
class CPropagationFace : public CPropagationShape
class ITA_PROPAGATION_PATH_SIM_API CPropagationFace : public CPropagationShape
{
public:
//---Public member variables--------------------------------------------------------------------
......@@ -152,7 +152,7 @@ namespace ITAPropagationPathSim
};
class CPropagationEdge : public CPropagationShape
class ITA_PROPAGATION_PATH_SIM_API CPropagationEdge : public CPropagationShape
{
public:
//---Public member variables-------------------------------------------------------------------------
......
Markdown is supported
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