添加沥青路面图片

autodeploy.sh

@@ -87,6 +87,7 @@ fi
 
 cp ./sh/BaiDuMap.html ./deploy/app/
 cp ./sh/car.png ./deploy/app/
+cp ./sh/asphalt.jpg ./deploy/app/
 
 echo ""
 echo "***************"

build_partial.sh

@@ -79,3 +79,4 @@ fi
 
 #cp ./sh/BaiDuMap.html ./deploy/app/
 #cp ./sh/car.png ./deploy/app/
+#cp ./sh/asphalt.jpg ./deploy/app/

src/ui/ui_osgviewer/main.cpp

@@ -792,8 +792,8 @@ int main(int argcx, char** argvx)
 			viewer->GetNodeMaskBit(viewer::NodeMask::NODE_MASK_OSI_POINTS) ? "on" : "off");
 
          SetupADCIVCar(viewer);
-//         SetupRadar(viewer);
-         SetupLidar(viewer);
+         SetupRadar(viewer);
+//         SetupLidar(viewer);
 //         viewer->AddBackModel(osg::Vec3(0.5, 0.5, 0.5),"");
 //         gtestRadar = viewer->AddRadarModel(osg::Vec3(0.5, 0.5, 0.5),"");
 //         gtestRadar = viewer->AddEntityModel(carModelsFiles_[0], osg::Vec3(0.5, 0.5, 0.5),

src/ui/ui_osgviewer/viewer.cpp

@@ -825,7 +825,7 @@ Viewer::Viewer(roadmanager::OpenDrive* odrManager, const char* modelFilename, co
 	envTx_->setNodeMask(NodeMask::NODE_MASK_ENV_MODEL);
 	rootnode_->addChild(envTx_);
 
-	ClearNodeMaskBits(NodeMask::NODE_MASK_TRAILS); // hide trails per default
+    ClearNodeMaskBits(NodeMask::NODE_MASK_TRAILS); // hide trails per default
 	ClearNodeMaskBits(NodeMask::NODE_MASK_OSI_LINES);
 	ClearNodeMaskBits(NodeMask::NODE_MASK_OSI_POINTS);
 	ClearNodeMaskBits(NodeMask::NODE_MASK_OBJECT_SENSORS);
@@ -886,23 +886,23 @@ Viewer::Viewer(roadmanager::OpenDrive* odrManager, const char* modelFilename, co
 		}
 	}
 
-	if (environment_ == 0)
-	{
-		if (odrManager->GetNumOfRoads() > 0)
-		{
-			// No visual model of the road network loaded 
-			// Generate a simplistic 3D model based on OpenDRIVE content
-			LOG("No scenegraph 3D model loaded. Generating a simplistic one...");
+    if (environment_ == 0)
+    {
+        if (odrManager->GetNumOfRoads() > 0)
+        {
+            // No visual model of the road network loaded
+            // Generate a simplistic 3D model based on OpenDRIVE content
+            LOG("No scenegraph 3D model loaded. Generating a simplistic one...");
 
-			roadGeom = new RoadGeom(odrManager);
-			environment_ = roadGeom->root_;
-			envTx_->addChild(environment_);
+            roadGeom = new RoadGeom(odrManager);
+            environment_ = roadGeom->root_;
+            envTx_->addChild(environment_);
 
-			// Since the generated 3D model is based on OSI features, let's hide those
-			ClearNodeMaskBits(NodeMask::NODE_MASK_ODR_FEATURES);
-			ClearNodeMaskBits(NodeMask::NODE_MASK_OSI_LINES);
-		}
-	}
+            // Since the generated 3D model is based on OSI features, let's hide those
+            ClearNodeMaskBits(NodeMask::NODE_MASK_ODR_FEATURES);
+            ClearNodeMaskBits(NodeMask::NODE_MASK_OSI_LINES);
+        }
+    }
 
     if (odrManager->GetNumOfRoads() > 0 && !CreateRoadLines(odrManager))
     {
@@ -1870,6 +1870,7 @@ bool Viewer::CreateRoadLines(roadmanager::OpenDrive* od)
 					
 					osiPoints_->addChild(osi_geom);
 
+
 					if (lane->GetId() == 0)
 					{
 						lineWidth->setWidth(4.0f);