diff --git a/OpenRoadEd/Osg/OSGRecordsHelpers.cpp b/OpenRoadEd/Osg/OSGRecordsHelpers.cpp index d3f58fcf602b449f9390c91a91908b2295873ab9..fb88956e30c1a903c089dc7833d2251a2802cdf1 100644 --- a/OpenRoadEd/Osg/OSGRecordsHelpers.cpp +++ b/OpenRoadEd/Osg/OSGRecordsHelpers.cpp @@ -563,6 +563,7 @@ osg::ref_ptr<osg::MatrixTransform> OSGRecordsHelpers::AddParkingHelper(Object *o x-=object->GetT()*sin(hdg); y+=object->GetT()*cos(hdg); + //matrix->setMatrix(osg::Matrix::rotate(osg::inRadians(hdg+object->GetHeading()-M_PI_2), osg::Vec3(0.0, 0.0, 1.0)) * matrix->setMatrix(osg::Matrix::rotate(osg::inRadians(hdg+object->GetHeading()), osg::Vec3(0.0, 0.0, 1.0)) * osg::Matrix::translate(osg::Vec3(x,y,elevation+object->GetZOffset())) ); matrix->addChild(parkingGeode); @@ -701,6 +702,7 @@ osg::ref_ptr<osg::MatrixTransform> OSGRecordsHelpers::AddSignalHelper(Signal *si else icon_name << ".jpg"; iconName=icon_name.str(); + std::cout << icon_name.str() << std::endl; osg::Image *billboardIconImage=convert_resource(iconName); if (!billboardIconImage) { @@ -733,7 +735,7 @@ osg::ref_ptr<osg::MatrixTransform> OSGRecordsHelpers::AddSignalHelper(Signal *si heading=hdg+3.14159; if(heading>2*3.14159) heading-=2*3.14159; - matrix->setMatrix( osg::Matrix::rotate(osg::inRadians(heading-M_PI_2), osg::Vec3(0.0, 0.0, 1.0)) * + matrix->setMatrix(osg::Matrix::rotate(osg::inRadians(heading-M_PI_2), osg::Vec3(0.0, 0.0, 1.0)) * osg::Matrix::translate(osg::Vec3(x,y,elevation+ROADMARK_ELEVATION_SHIFT+mVerticalOffset+signal->GetZOffset()))); if(signal->GetOrientation()!="none") diff --git a/OpenRoadEd/Qt/SettingsWidgets/SettingsRoadSignal.cpp b/OpenRoadEd/Qt/SettingsWidgets/SettingsRoadSignal.cpp index a80f0037083787710abf02903244515a694704f4..b6cb89222b78ff363bc29a8a73d3a08f3355c6fd 100644 --- a/OpenRoadEd/Qt/SettingsWidgets/SettingsRoadSignal.cpp +++ b/OpenRoadEd/Qt/SettingsWidgets/SettingsRoadSignal.cpp @@ -65,13 +65,19 @@ SettingsRoadSignal::SettingsRoadSignal(OpenDrive *openDrive) mTypeMap["road works"]="123"; mType->insertItem(13,tr("max vel")); mTypeMap["max vel"]="274"; - mType->insertItem(14,tr("semaphore")); + mType->insertItem(14,tr("end prohibitions")); + mTypeMap["end prohibitions"]="282"; + mType->insertItem(15,tr("prohibited_left")); + mTypeMap["prohibited_left"]="214_10"; + mType->insertItem(16,tr("prohibited_right")); + mTypeMap["prohibited_right"]="214"; + mType->insertItem(17,tr("semaphore")); mTypeMap["semaphore"]="1000001"; - mType->insertItem(15,tr("generic_loc")); + mType->insertItem(18,tr("generic_loc")); mTypeMap["generic_loc"]="1000"; - mType->insertItem(16,tr("global_loc")); + mType->insertItem(19,tr("global_loc")); mTypeMap["global_loc"]="1001"; - mType->insertItem(17,tr("unkown")); + mType->insertItem(20,tr("unkown")); mTypeMap["unknown"]="???"; mSubType = new QLineEdit; mValue = new QLineEdit; @@ -198,14 +204,20 @@ void SettingsRoadSignal::LoadData(Signal *signal) mType->setCurrentIndex(12); else if(signal->GetType()=="274") mType->setCurrentIndex(13); - else if(signal->GetType()=="1000001") + else if(signal->GetType()=="282") mType->setCurrentIndex(14); - else if(signal->GetType()=="1000") + else if(signal->GetType()=="214_10") mType->setCurrentIndex(15); - else if(signal->GetType()=="1001") + else if(signal->GetType()=="214") mType->setCurrentIndex(16); - else + else if(signal->GetType()=="1000001") mType->setCurrentIndex(17); + else if(signal->GetType()=="1000") + mType->setCurrentIndex(18); + else if(signal->GetType()=="1001") + mType->setCurrentIndex(19); + else + mType->setCurrentIndex(20); mSubType->setText(signal->GetSubType().c_str()); mValue->setText(QString("%1").arg(signal->GetValue())); diff --git a/Resources/Billboards/214.jpg b/Resources/Billboards/214.jpg new file mode 100644 index 0000000000000000000000000000000000000000..3c69041015fbafa5bfde0e4c0cdd751a8c73b9e8 Binary files /dev/null and b/Resources/Billboards/214.jpg differ diff --git a/Resources/Billboards/214_10.jpg b/Resources/Billboards/214_10.jpg new file mode 100644 index 0000000000000000000000000000000000000000..d3678bd966725d8bd21104cab0e6eb48d2b780d5 Binary files /dev/null and b/Resources/Billboards/214_10.jpg differ diff --git a/Resources/Billboards/282.jpg b/Resources/Billboards/282.jpg new file mode 100644 index 0000000000000000000000000000000000000000..5c27fd3ad3949fe6c9d8ce30b78a9f71fb7ba916 Binary files /dev/null and b/Resources/Billboards/282.jpg differ diff --git a/Resources/resources.qrc b/Resources/resources.qrc index 57cc6947e1467b9b3c0347dfdf494060520e750a..33ca50374e5c50b8a82e8d0a6c9a99c2820be796 100644 --- a/Resources/resources.qrc +++ b/Resources/resources.qrc @@ -1,5 +1,8 @@ <!DOCTYPE RCC><RCC version="1.0"> <qresource> + <file>Billboards/282.jpg</file> + <file>Billboards/214.jpg</file> + <file>Billboards/214_10.jpg</file> <file>Billboards/1000001.jpg</file> <file>Billboards/1000.jpg</file> <file>Billboards/1001.jpg</file>