Commit a36a23c3 authored by Armin Erraji's avatar Armin Erraji

Small changes in CombinatedModelTest and inverting of faces in SimpleRoom.skp.

parent a763c07d
......@@ -84,7 +84,7 @@ void ITAPropagationPathSim::CombinatedModel::CPathEngine::ConstructPropagationPa
if (pPropagationList == nullptr)
iCounter++;
}
std::cout << iCounter << " times nullptr after aperture points calced\n";
std::cout << iCounter << " times nullptr after aperture points calculated\n";
//Thereafter, with the constructed aperture points, construct the image apertures as secondary image sources
//for the faces after each edge
......@@ -96,7 +96,7 @@ void ITAPropagationPathSim::CombinatedModel::CPathEngine::ConstructPropagationPa
if (pPropagationList == nullptr)
iCounter++;
}
std::cout << iCounter << " times nullptr after image aperture calced\n";
std::cout << iCounter << " times nullptr after image aperture calculated\n";
//Construct the intersection points of the reflections
Reflection::ConstructPointsOfReflection(m_vpPropagationLists, m_pSensor);
......@@ -107,7 +107,7 @@ void ITAPropagationPathSim::CombinatedModel::CPathEngine::ConstructPropagationPa
if (pPropagationList == nullptr)
iCounter++;
}
std::cout << iCounter << " times nullptr after points of reflection calced\n";
std::cout << iCounter << " times nullptr after points of reflection calculated\n";
//Convert pPropagationShapes to pPropagationAnchors
ConvertShapeListsToPropagationPaths(oPaths);
......
......@@ -40,6 +40,7 @@ int main( int iNumInArgs, char* pcInArgs[] )
//string sInFile = "NonSimpleRoom - Outside.skp";
string sInFile = "SimpleUrbanEnvironment.skp";
sInFile = "SimpleRoom.skp";
if( iNumInArgs > 1 )
sInFile = string( pcInArgs[ 1 ] );
......@@ -107,15 +108,19 @@ int main( int iNumInArgs, char* pcInArgs[] )
pMeshModelList->FilterVisiblePaths(oPathListAll, oPathListVisible);
//Add emitter and sensor to visualization
oGeoModel.AddEmitterVisualization(*pEmitter, "Emitter A");
oGeoModel.AddSensorVisualization(*pSensor, "Sensor A");
for (auto path : oPathListVisible)
{
oGeoModel.AddPropagationPathVisualization(path, "Propagation_Paths");
string sPathName = "Propagation_Paths_order_" + std::to_string((long) path.size() - 2 );
oGeoModel.AddPropagationPathVisualization(path, sPathName);
}
oGeoModel.Store(sSubFolder +"SimpleImageModelTest_"+ sInFile);
oGeoModel.Store(sSubFolder +"CombinatedModelTest_"+ sInFile);
return 0;
}
B໿SketchUp Model೿{18.0.16975}联뵾䭋煦鮻莚ÿ퉱居￿ 噃牥楳湯慍ー￾䌉䄀爀挀䌀甀爀瘀攀̀＀￾䌊䄀琀琀爀椀戀甀琀攀＀￾䌓䄀琀琀爀椀戀甀琀攀䌀漀渀琀愀椀渀攀爀＀￾䌏䄀琀琀爀椀戀甀琀攀一愀洀攀搀Ā＀￾䌐䈀愀挀欀最爀漀甀渀搀䤀洀愀最攀਀＀￾䌇䌀愀洀攀爀愀Ԁ＀￾䌊䌀漀洀瀀漀渀攀渀琀଀＀￾䌒䌀漀洀瀀漀渀攀渀琀䈀攀栀愀瘀椀漀爀Ԁ＀￾䌔䌀漀洀瀀漀渀攀渀琀䐀攀昀椀渀椀琀椀漀渀଀＀￾䌒䌀漀洀瀀漀渀攀渀琀䤀渀猀琀愀渀挀攀؀＀￾䌕䌀漀渀猀琀爀甀挀琀椀漀渀䜀攀漀洀攀琀爀礀＀￾䌑䌀漀渀猀琀爀甀挀琀椀漀渀䰀椀渀攀Ā＀￾䌒䌀漀渀猀琀爀甀挀琀椀漀渀倀漀椀渀琀＀￾䌆䌀甀爀瘀攀Ѐ＀￾䌏䐀攀昀椀渀椀琀椀漀渀䰀椀猀琀＀￾䌄䐀椀戀̀＀￾䌊䐀椀洀攀渀猀椀漀渀Ā＀￾䌐䐀椀洀攀渀猀椀漀渀䰀椀渀攀愀爀؀＀￾䌐䐀椀洀攀渀猀椀漀渀刀愀搀椀愀氀Ȁ＀￾䌏䐀椀洀攀渀猀椀漀渀匀琀礀氀攀Ѐ＀￾䌏䐀爀愀眀椀渀最䔀氀攀洀攀渀琀ऀ＀￾䌅䔀搀最攀Ȁ＀￾䌈䔀搀最攀唀猀攀Ā＀￾䌇䔀渀琀椀琀礀Ԁ＀￾䌅䘀愀挀攀̀＀￾䌒䘀愀挀攀吀攀砀琀甀爀攀䌀漀漀爀搀猀Ѐ＀￾䌌䘀漀渀琀䴀愀渀愀最攀爀＀￾䌆䜀爀漀甀瀀Ā＀￾䌆䤀洀愀最攀Ā＀￾䌆䰀愀礀攀爀Ȁ＀￾䌍䰀愀礀攀爀䴀愀渀愀最攀爀Ѐ＀￾䌅䰀漀漀瀀Ā＀￾䌉䴀愀琀攀爀椀愀氀ఀ＀￾䌐䴀愀琀攀爀椀愀氀䴀愀渀愀最攀爀Ѐ＀￾䌉倀愀最攀䰀椀猀琀Ā＀￾䌋倀漀氀礀氀椀渀攀㌀搀＀￾䌍刀攀氀愀琀椀漀渀猀栀椀瀀＀￾䌐刀攀氀愀琀椀漀渀猀栀椀瀀䴀愀瀀＀￾䌑刀攀渀搀攀爀椀渀最伀瀀琀椀漀渀猀─＀￾䌋匀挀栀攀洀愀䘀椀氀攀Ā＀￾䌑匀挀栀攀洀愀䘀椀氀琀攀爀䘀椀氀攀＀￾䌎匀挀栀攀洀愀娀椀瀀䘀椀氀攀Ā＀￾䌍匀攀挀琀椀漀渀倀氀愀渀攀̀＀￾䌋匀栀愀搀漀眀䤀渀昀漀܀＀￾䌇匀欀䘀漀渀琀Ā＀￾䌉匀欀攀琀挀栀䌀匀＀￾䌎匀欀攀琀挀栀唀瀀䴀漀搀攀氀ᰀ＀￾䌍匀欀攀琀挀栀唀瀀倀愀最攀Ā＀￾䌉匀欀瀀匀琀礀氀攀Ā＀￾䌐匀欀瀀匀琀礀氀攀䴀愀渀愀最攀爀Ȁ＀￾䌅吀攀砀琀ऀ＀￾䌊吀攀砀琀匀琀礀氀攀Ԁ＀￾䌈吀攀砀琀甀爀攀؀＀￾䌊吀栀甀洀戀渀愀椀氀Ā＀￾䌇嘀攀爀琀攀砀＀￾䌉嘀椀攀眀倀愀最攀ఀ＀￾䌊圀愀琀攀爀洀愀爀欀Ā＀￾䌑圀愀琀攀爀洀愀爀欀䴀愀渀愀最攀爀Ȁ＀￾䔒渀搀ⴀ伀昀ⴀ嘀攀爀猀椀漀渀ⴀ䴀愀瀀Ā뀀Ȁ+＀ϿЀ䌀楄Ѣ嘀褀乐േᨊ
......
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