Commit 38dc2990 authored by Armin Erraji's avatar Armin Erraji

Merge remote-tracking branch 'remotes/origin/develop' into ma_2018/erraji

parents a36a23c3 4b0864c5
......@@ -689,7 +689,7 @@ void CEngineImpl::GetCombinedDiffractionGradientVisualization( ITAGeo::Halfedge:
int iFromReceiverOrder = pVisMesh->property( tDiffractionFaceProp, hFace ).iFromReceiverDiffractionOrder;
int iCombinedOrder = iFromSourceOrder + iFromReceiverOrder;
auto pVisMaterial = std::make_shared< ITAGeo::CVisualizationMaterial >();
auto pVisMaterial = std::make_shared< ITAGeo::Material::CVisualizationMaterial >();
if( iFromSourceOrder == DIFFRACTION_ORDER_INF || iFromReceiverOrder == DIFFRACTION_ORDER_INF )
{
pVisMaterial->SetBlack(); // dark side
......@@ -730,7 +730,7 @@ void CEngineImpl::GetFromSourceDiffractionGradientVisualization(Halfedge::CMeshM
pVisMesh->property( tDiffractionFaceProp, hFace ) = m_pGeoModel->GetMesh()->pTopLevelMesh->property( tDiffractionFaceProp, hFace );
int iFromSourceOrder = pVisMesh->property( tDiffractionFaceProp, hFace ).iFromSourceDiffractionOrder;
auto pVisMaterial = std::make_shared< ITAGeo::CVisualizationMaterial >();
auto pVisMaterial = std::make_shared< ITAGeo::Material::CVisualizationMaterial >();
if( iFromSourceOrder == DIFFRACTION_ORDER_INF )
{
pVisMaterial->SetWhite();
......@@ -764,7 +764,7 @@ void CEngineImpl::GetFromTargetDiffractionGradientVisualization(Halfedge::CMeshM
pVisMesh->property( tDiffractionFaceProp, hFace ) = m_pGeoModel->GetMesh()->pTopLevelMesh->property( tDiffractionFaceProp, hFace );
int iFromReceiverOrder = pVisMesh->property( tDiffractionFaceProp, hFace ).iFromReceiverDiffractionOrder;
auto pVisMaterial = std::make_shared< ITAGeo::CVisualizationMaterial >();
auto pVisMaterial = std::make_shared< ITAGeo::Material::CVisualizationMaterial >();
if( iFromReceiverOrder == DIFFRACTION_ORDER_INF )
{
pVisMaterial->SetWhite();
......
......@@ -326,7 +326,7 @@ bool CEngine::AudibilityTest( CImageNode* pSource, std::shared_ptr< ITAGeo::CPro
}
auto pR = std::make_shared< ITAGeo::CSpecularReflection >( v3CurrentSpecularReflectionPoint );
pR->pAcousticMaterial = nullptr; // @todo jst: get from Mesh
pR->pMaterial = nullptr; // @todo jst: get from Mesh
oPath[ iAnchorIdx-- ] = pR;
pCurrentImageNode = pCurrentImageNode->pParent;
......
......@@ -43,10 +43,10 @@ int main( int iNumInArgs, char* pcInArgs[] )
if( iNumInArgs > 1 )
sInFile = string( pcInArgs[ 1 ] );
CMaterialDirectory oMaterialDir( "./" );
auto pMaterialDirectory = std::make_shared< Material::CDirectory >( "./" );
SketchUp::CModel oGeoModel;
oGeoModel.SetMaterialManager( &oMaterialDir );
oGeoModel.SetMaterialManager( pMaterialDirectory );
if( oGeoModel.Load(sSubFolder + sInFile ) )
{
cout << "Succesffully loaded '" << sInFile << "'" << endl;
......
......@@ -48,12 +48,12 @@ int main( int iNumInArgs, char* pcInArgs[] )
if( iNumInArgs > 1 )
sInFile = string( pcInArgs[ 1 ] );
CMaterialDirectory oMaterialDir( "./" );
auto pMaterialDirectory = std::make_shared< Material::CDirectory >( "./" );
SketchUp::CModel oGeoModel;
ITAGeo::Urban::CModel oUrbanModel;
oUrbanModel.SetMaterialManager( &oMaterialDir );
oUrbanModel.SetMaterialManager( pMaterialDirectory );
if (oUrbanModel.Load(sSUFolder + sInFile + ".skp"))
......
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