diff --git a/CMakeLists.txt b/CMakeLists.txt index 36645d218..e2e675a88 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,10 @@ find_package(ignition-cmake2 2.14.0 REQUIRED) #============================================================================ # Set up the project #============================================================================ -ign_configure_project(VERSION_SUFFIX) +ign_configure_project( + REPLACE_IGNITION_INCLUDE_PATH gz/rendering + VERSION_SUFFIX pre1 +) #============================================================================ # Set project-specific options diff --git a/examples/actor_animation/GlutWindow.cc b/examples/actor_animation/GlutWindow.cc index 8e5a589b3..deab60a2e 100644 --- a/examples/actor_animation/GlutWindow.cc +++ b/examples/actor_animation/GlutWindow.cc @@ -164,7 +164,7 @@ void handleMouse() 2.0 * g_mouse.x / static_cast(rayCamera->ImageWidth()) - 1.0; double ny = 1.0 - 2.0 * g_mouse.y / static_cast(rayCamera->ImageHeight()); - g_rayQuery->SetFromCamera(rayCamera, ignition::math::Vector2d(nx, ny)); + g_rayQuery->SetFromCamera(rayCamera, gz::math::Vector2d(nx, ny)); g_target = g_rayQuery->ClosestPoint(); if (!g_target) { @@ -194,7 +194,7 @@ void handleMouse() if (g_mouse.motionDirty) { g_mouse.motionDirty = false; - auto drag = ignition::math::Vector2d(g_mouse.dragX, g_mouse.dragY); + auto drag = gz::math::Vector2d(g_mouse.dragX, g_mouse.dragY); // left mouse button pan if (g_mouse.button == GLUT_LEFT_BUTTON && g_mouse.state == GLUT_DOWN) @@ -239,10 +239,10 @@ void handleMouse() ////////////////////////////////////////////////// void updatePose(double _time) { - std::map animFrames; + std::map animFrames; animFrames = g_skelAnim->PoseAt(_time, true); - std::map skinFrames; + std::map skinFrames; for (auto pair : animFrames) { @@ -250,7 +250,7 @@ void updatePose(double _time) auto animTf = pair.second; std::string skinName = g_skel->NodeNameAnimToSkin(g_animIdx, animName); - ignition::math::Matrix4d skinTf = + gz::math::Matrix4d skinTf = g_skel->AlignTranslation(g_animIdx, animName) * animTf * g_skel->AlignRotation(g_animIdx, animName); diff --git a/examples/actor_animation/GlutWindow.hh b/examples/actor_animation/GlutWindow.hh index 319b224d7..c6246f113 100644 --- a/examples/actor_animation/GlutWindow.hh +++ b/examples/actor_animation/GlutWindow.hh @@ -14,15 +14,15 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_EXAMPLES_ACTOR_ANIMATION_GLUTWINDOW_HH_ -#define IGNITION_RENDERING_EXAMPLES_ACTOR_ANIMATION_GLUTWINDOW_HH_ +#ifndef GZ_RENDERING_EXAMPLES_ACTOR_ANIMATION_GLUTWINDOW_HH_ +#define GZ_RENDERING_EXAMPLES_ACTOR_ANIMATION_GLUTWINDOW_HH_ #include #include "ignition/rendering/RenderTypes.hh" #include "ignition/common/graphics/Types.hh" -namespace ir = ignition::rendering; -namespace ic = ignition::common; +namespace ir = gz::rendering; +namespace ic = gz::common; /// \brief Run the demo and render the scene from the cameras /// \param[in] _cameras Cameras in the scene diff --git a/examples/actor_animation/Main.cc b/examples/actor_animation/Main.cc index bdbc2e789..acee916a9 100644 --- a/examples/actor_animation/Main.cc +++ b/examples/actor_animation/Main.cc @@ -36,7 +36,7 @@ #include "example_config.hh" #include "GlutWindow.hh" -using namespace ignition; +using namespace gz; using namespace rendering; const std::string RESOURCE_PATH = diff --git a/examples/camera_tracking/GlutWindow.cc b/examples/camera_tracking/GlutWindow.cc index e127a528a..60241e02d 100644 --- a/examples/camera_tracking/GlutWindow.cc +++ b/examples/camera_tracking/GlutWindow.cc @@ -92,8 +92,8 @@ struct mouseButton struct mouseButton g_mouse; std::mutex g_mouseMutex; -ignition::math::Vector3d g_trackOffset(1.0, 0, 0); -ignition::math::Vector3d g_followOffset(-3, 0, 3); +gz::math::Vector3d g_trackOffset(1.0, 0, 0); +gz::math::Vector3d g_followOffset(-3, 0, 3); ////////////////////////////////////////////////// @@ -158,7 +158,7 @@ void handleMouse() 2.0 * g_mouse.x / static_cast(rayCamera->ImageWidth()) - 1.0; double ny = 1.0 - 2.0 * g_mouse.y / static_cast(rayCamera->ImageHeight()); - g_rayQuery->SetFromCamera(rayCamera, ignition::math::Vector2d(nx, ny)); + g_rayQuery->SetFromCamera(rayCamera, gz::math::Vector2d(nx, ny)); g_target = g_rayQuery->ClosestPoint(); if (!g_target) { @@ -188,7 +188,7 @@ void handleMouse() if (g_mouse.motionDirty) { g_mouse.motionDirty = false; - auto drag = ignition::math::Vector2d(g_mouse.dragX, g_mouse.dragY); + auto drag = gz::math::Vector2d(g_mouse.dragX, g_mouse.dragY); // left mouse button pan if (g_mouse.button == GLUT_LEFT_BUTTON && g_mouse.state == GLUT_DOWN) @@ -296,21 +296,21 @@ void keyboardCB(unsigned char _key, int, int) if (_key == 'w' || _key == 'W') { node->SetWorldPosition(node->WorldPosition() + - node->WorldRotation() * ignition::math::Vector3d(posIncr, 0, 0)); + node->WorldRotation() * gz::math::Vector3d(posIncr, 0, 0)); } else if (_key == 's' || _key == 'S') { node->SetWorldPosition(node->WorldPosition() + - node->WorldRotation() * ignition::math::Vector3d(-posIncr, 0, 0)); + node->WorldRotation() * gz::math::Vector3d(-posIncr, 0, 0)); } else if (_key == 'a' || _key == 'A') { - node->SetWorldRotation(ignition::math::Quaterniond(0, 0, + node->SetWorldRotation(gz::math::Quaterniond(0, 0, node->WorldRotation().Yaw() + yawIncr)); } else if (_key == 'd' || _key == 'D') { - node->SetWorldRotation(ignition::math::Quaterniond(0, 0, + node->SetWorldRotation(gz::math::Quaterniond(0, 0, node->WorldRotation().Yaw() - yawIncr)); } } @@ -394,14 +394,14 @@ void keyboardCB(unsigned char _key, int, int) if (_key == 't' || _key == 'T') { double trackPGain = 0.005; - double p = ignition::math::equal(cam->TrackPGain(), 1.0) ? + double p = gz::math::equal(cam->TrackPGain(), 1.0) ? trackPGain : 1.0; cam->SetTrackPGain(p); } else if (_key == 'f' || _key == 'F') { double followPGain = 0.01; - double p = ignition::math::equal(cam->FollowPGain(), 1.0) ? + double p = gz::math::equal(cam->FollowPGain(), 1.0) ? followPGain : 1.0; cam->SetFollowPGain(p); } diff --git a/examples/camera_tracking/GlutWindow.hh b/examples/camera_tracking/GlutWindow.hh index 6396104d8..bf378309a 100644 --- a/examples/camera_tracking/GlutWindow.hh +++ b/examples/camera_tracking/GlutWindow.hh @@ -14,13 +14,13 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_EXAMPLES_CAMERA_TRACKING_GLUTWINDOW_HH_ -#define IGNITION_RENDERING_EXAMPLES_CAMERA_TRACKING_GLUTWINDOW_HH_ +#ifndef GZ_RENDERING_EXAMPLES_CAMERA_TRACKING_GLUTWINDOW_HH_ +#define GZ_RENDERING_EXAMPLES_CAMERA_TRACKING_GLUTWINDOW_HH_ #include #include -namespace ir = ignition::rendering; +namespace ir = gz::rendering; /// \brief Run the demo and render the scene from the cameras /// \param[in] _cameras Cameras in the scene diff --git a/examples/camera_tracking/Main.cc b/examples/camera_tracking/Main.cc index 5b7335812..584462605 100644 --- a/examples/camera_tracking/Main.cc +++ b/examples/camera_tracking/Main.cc @@ -31,7 +31,7 @@ #include #include "GlutWindow.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/examples/custom_scene_viewer/DemoWindow.cc b/examples/custom_scene_viewer/DemoWindow.cc index 9cb9c645b..acb1223e1 100644 --- a/examples/custom_scene_viewer/DemoWindow.cc +++ b/examples/custom_scene_viewer/DemoWindow.cc @@ -40,7 +40,7 @@ #define KEY_ESC 27 #define KEY_TAB 9 -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/examples/custom_scene_viewer/DemoWindow.hh b/examples/custom_scene_viewer/DemoWindow.hh index 46ddacf82..2c9696032 100644 --- a/examples/custom_scene_viewer/DemoWindow.hh +++ b/examples/custom_scene_viewer/DemoWindow.hh @@ -14,12 +14,12 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_DEMOWINDOW_HH_ -#define IGNITION_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_DEMOWINDOW_HH_ +#ifndef GZ_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_DEMOWINDOW_HH_ +#define GZ_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_DEMOWINDOW_HH_ #include "TestTypes.hh" -namespace ir = ignition::rendering; +namespace ir = gz::rendering; /// \brief Run the demo /// \param[in] _Pointer to demo diff --git a/examples/custom_scene_viewer/ManualSceneDemo.cc b/examples/custom_scene_viewer/ManualSceneDemo.cc index 0678f87ba..97e9c0c49 100644 --- a/examples/custom_scene_viewer/ManualSceneDemo.cc +++ b/examples/custom_scene_viewer/ManualSceneDemo.cc @@ -20,7 +20,7 @@ #include "SceneBuilder.hh" #include "DemoWindow.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/examples/custom_scene_viewer/ManualSceneDemo.hh b/examples/custom_scene_viewer/ManualSceneDemo.hh index 57942d90c..cc84d15ae 100644 --- a/examples/custom_scene_viewer/ManualSceneDemo.hh +++ b/examples/custom_scene_viewer/ManualSceneDemo.hh @@ -14,14 +14,14 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_MANUALSCENEDEMO_HH_ -#define IGNITION_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_MANUALSCENEDEMO_HH_ +#ifndef GZ_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_MANUALSCENEDEMO_HH_ +#define GZ_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_MANUALSCENEDEMO_HH_ #include #include #include "TestTypes.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/examples/custom_scene_viewer/SceneBuilder.cc b/examples/custom_scene_viewer/SceneBuilder.cc index a8482becd..c7a318ef2 100644 --- a/examples/custom_scene_viewer/SceneBuilder.cc +++ b/examples/custom_scene_viewer/SceneBuilder.cc @@ -18,7 +18,7 @@ #include "example_config.hh" #include "SceneBuilder.hh" -using namespace ignition; +using namespace gz; using namespace rendering; const std::string RESOURCE_PATH = std::string(PROJECT_BINARY_PATH) + "/media"; diff --git a/examples/custom_scene_viewer/SceneBuilder.hh b/examples/custom_scene_viewer/SceneBuilder.hh index 9901b9c1e..8674336fa 100644 --- a/examples/custom_scene_viewer/SceneBuilder.hh +++ b/examples/custom_scene_viewer/SceneBuilder.hh @@ -14,13 +14,13 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_SCENEBUILDER_HH_ -#define IGNITION_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_SCENEBUILDER_HH_ +#ifndef GZ_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_SCENEBUILDER_HH_ +#define GZ_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_SCENEBUILDER_HH_ #include #include "TestTypes.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/examples/custom_scene_viewer/TestTypes.hh b/examples/custom_scene_viewer/TestTypes.hh index 92c62a468..d8bc04e18 100644 --- a/examples/custom_scene_viewer/TestTypes.hh +++ b/examples/custom_scene_viewer/TestTypes.hh @@ -14,13 +14,13 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_TESTYPES_HH_ -#define IGNITION_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_TESTYPES_HH_ +#ifndef GZ_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_TESTYPES_HH_ +#define GZ_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_TESTYPES_HH_ #include #include -namespace ignition +namespace gz { namespace rendering { diff --git a/examples/custom_shaders/custom_shaders.cc b/examples/custom_shaders/custom_shaders.cc index de2145914..d76743864 100644 --- a/examples/custom_shaders/custom_shaders.cc +++ b/examples/custom_shaders/custom_shaders.cc @@ -20,9 +20,9 @@ #include "example_config.hh" -void BuildScene(ignition::rendering::ScenePtr _scene); +void BuildScene(gz::rendering::ScenePtr _scene); -void PresentImage(ignition::rendering::ImagePtr _image, +void PresentImage(gz::rendering::ImagePtr _image, const std::string &_name); @@ -42,15 +42,15 @@ const std::string fragment_shader_file = "fragment_shader.glsl"; ////////////////////////////////////////////////// int main() { - // Initialize ignition::rendering - auto *engine = ignition::rendering::engine("ogre"); + // Initialize gz::rendering + auto *engine = gz::rendering::engine("ogre"); if (!engine) { std::cerr << "Failed to load ogre\n"; return 1; } // Create a scene and add stuff to it - ignition::rendering::ScenePtr scene = engine->CreateScene("scene"); + gz::rendering::ScenePtr scene = engine->CreateScene("scene"); if (!scene) { std::cerr << "Failed to create scene." << std::endl; @@ -58,28 +58,28 @@ int main() } BuildScene(scene); - ignition::rendering::VisualPtr root = scene->RootVisual(); + gz::rendering::VisualPtr root = scene->RootVisual(); // Create a camera - ignition::rendering::CameraPtr camera; + gz::rendering::CameraPtr camera; camera = scene->CreateCamera("example_custom_shaders"); camera->SetImageWidth(width); camera->SetImageHeight(height); camera->SetHFOV(1.05); camera->SetAntiAliasing(2); camera->SetAspectRatio(width / height); - camera->SetImageFormat(ignition::rendering::PF_R8G8B8); + camera->SetImageFormat(gz::rendering::PF_R8G8B8); root->AddChild(camera); // Create a camera for depth image - ignition::rendering::CameraPtr depthCamera; + gz::rendering::CameraPtr depthCamera; depthCamera = scene->CreateCamera("example_custom_shaders_depth"); depthCamera->SetImageWidth(width); depthCamera->SetImageHeight(height); depthCamera->SetHFOV(1.05); depthCamera->SetAntiAliasing(2); depthCamera->SetAspectRatio(width / height); - depthCamera->SetImageFormat(ignition::rendering::PF_R8G8B8); + depthCamera->SetImageFormat(gz::rendering::PF_R8G8B8); root->AddChild(depthCamera); // Render to an in-memory image @@ -94,23 +94,23 @@ int main() IGN_RENDERING_RESOURCE_PATH; // path to look for vertex and fragment shader parameters - std::string depth_vertex_shader_path = ignition::common::joinPaths( + std::string depth_vertex_shader_path = gz::common::joinPaths( resourcePath, "ogre", "media", "materials", "programs", depth_vertex_shader_file); - std::string depth_fragment_shader_path = ignition::common::joinPaths( + std::string depth_fragment_shader_path = gz::common::joinPaths( resourcePath, "ogre", "media", "materials", "programs", depth_fragment_shader_file); - ignition::rendering::MaterialPtr depthMat = scene->CreateMaterial(); + gz::rendering::MaterialPtr depthMat = scene->CreateMaterial(); depthMat->SetVertexShader(depth_vertex_shader_path); depthMat->SetFragmentShader(depth_fragment_shader_path); depthCamera->SetMaterial(depthMat); - ignition::rendering::ImagePtr image = - std::make_shared(camera->CreateImage()); - ignition::rendering::ImagePtr depthImage = - std::make_shared(depthCamera->CreateImage()); + gz::rendering::ImagePtr image = + std::make_shared(camera->CreateImage()); + gz::rendering::ImagePtr depthImage = + std::make_shared(depthCamera->CreateImage()); depthCamera->Capture(*depthImage); PresentImage(depthImage, "depth.png"); @@ -121,14 +121,14 @@ int main() } ////////////////////////////////////////////////// -void PresentImage(ignition::rendering::ImagePtr _image, +void PresentImage(gz::rendering::ImagePtr _image, const std::string &_name) { // Present the data unsigned char *data = _image->Data(); - ignition::common::Image image; - image.SetFromData(data, width, height, ignition::common::Image::RGB_INT8); + gz::common::Image image; + image.SetFromData(data, width, height, gz::common::Image::RGB_INT8); image.SavePNG(_name); @@ -136,14 +136,14 @@ void PresentImage(ignition::rendering::ImagePtr _image, } ////////////////////////////////////////////////// -void BuildScene(ignition::rendering::ScenePtr _scene) +void BuildScene(gz::rendering::ScenePtr _scene) { // initialize _scene _scene->SetAmbientLight(0.3, 0.3, 0.3); - ignition::rendering::VisualPtr root = _scene->RootVisual(); + gz::rendering::VisualPtr root = _scene->RootVisual(); // create directional light - ignition::rendering::DirectionalLightPtr light0 = + gz::rendering::DirectionalLightPtr light0 = _scene->CreateDirectionalLight(); light0->SetDirection(-0.5, 0.5, -1); light0->SetDiffuseColor(0.5, 0.5, 0.5); @@ -151,14 +151,14 @@ void BuildScene(ignition::rendering::ScenePtr _scene) root->AddChild(light0); // create white material - ignition::rendering::MaterialPtr grey = _scene->CreateMaterial(); + gz::rendering::MaterialPtr grey = _scene->CreateMaterial(); grey->SetAmbient(0.5, 0.5, 0.5); grey->SetDiffuse(0.8, 0.8, 0.8); grey->SetReceiveShadows(true); grey->SetReflectivity(0); // create plane visual - ignition::rendering::VisualPtr plane = _scene->CreateVisual(); + gz::rendering::VisualPtr plane = _scene->CreateVisual(); auto geom = _scene->CreatePlane(); plane->AddGeometry(geom); plane->SetLocalScale(5, 8, 1); @@ -173,20 +173,20 @@ void BuildScene(ignition::rendering::ScenePtr _scene) IGN_RENDERING_RESOURCE_PATH; // path to look for vertex and fragment shader parameters - std::string vertex_shader_path = ignition::common::joinPaths( + std::string vertex_shader_path = gz::common::joinPaths( resourcePath, "ogre", "media", "materials", "programs", vertex_shader_file); - std::string fragment_shader_path = ignition::common::joinPaths( + std::string fragment_shader_path = gz::common::joinPaths( resourcePath, "ogre", "media", "materials", "programs", fragment_shader_file); - ignition::rendering::MaterialPtr shader = _scene->CreateMaterial(); + gz::rendering::MaterialPtr shader = _scene->CreateMaterial(); shader->SetVertexShader(vertex_shader_path); shader->SetFragmentShader(fragment_shader_path); // create box visual - ignition::rendering::VisualPtr box = _scene->CreateVisual(); + gz::rendering::VisualPtr box = _scene->CreateVisual(); box->AddGeometry(_scene->CreateBox()); box->SetOrigin(0.0, 0.5, 0.0); box->SetLocalPosition(3, 0, 0); diff --git a/examples/gazebo_scene_viewer/CameraWindow.cc b/examples/gazebo_scene_viewer/CameraWindow.cc index 8f97d4e1b..6ffb0547b 100644 --- a/examples/gazebo_scene_viewer/CameraWindow.cc +++ b/examples/gazebo_scene_viewer/CameraWindow.cc @@ -124,8 +124,8 @@ void GlutIdle() } #endif - ignition::rendering::SceneManager* manager = - ignition::rendering::SceneManager::Instance(); + gz::rendering::SceneManager* manager = + gz::rendering::SceneManager::Instance(); manager->UpdateScenes(); diff --git a/examples/gazebo_scene_viewer/CameraWindow.hh b/examples/gazebo_scene_viewer/CameraWindow.hh index e751aad19..efed62246 100644 --- a/examples/gazebo_scene_viewer/CameraWindow.hh +++ b/examples/gazebo_scene_viewer/CameraWindow.hh @@ -14,13 +14,13 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_EXAMPLES_CAMERAWINDOW_HH_ -#define IGNITION_RENDERING_EXAMPLES_CAMERAWINDOW_HH_ +#ifndef GZ_RENDERING_EXAMPLES_CAMERAWINDOW_HH_ +#define GZ_RENDERING_EXAMPLES_CAMERAWINDOW_HH_ #include #include "ignition/rendering/RenderTypes.hh" -namespace gz = ignition::rendering; +namespace gz = gz::rendering; void GlutRun(std::vector _cameras); diff --git a/examples/gazebo_scene_viewer/GazeboDemo.cc b/examples/gazebo_scene_viewer/GazeboDemo.cc index 98dbe304d..c99752b18 100644 --- a/examples/gazebo_scene_viewer/GazeboDemo.cc +++ b/examples/gazebo_scene_viewer/GazeboDemo.cc @@ -23,14 +23,14 @@ #include "CameraWindow.hh" #include "SceneManager.hh" -using namespace ignition; +using namespace gz; using namespace rendering; void Connect() { - gazebo::common::Console::SetQuiet(false); - gazebo::transport::init(); - gazebo::transport::run(); + sim::common::Console::SetQuiet(false); + sim::transport::init(); + sim::transport::run(); SceneManager* manager = SceneManager::Instance(); manager->Load(); diff --git a/examples/gazebo_scene_viewer/GazeboWorldDemo.cc b/examples/gazebo_scene_viewer/GazeboWorldDemo.cc index 32f7a095e..b0679c42c 100644 --- a/examples/gazebo_scene_viewer/GazeboWorldDemo.cc +++ b/examples/gazebo_scene_viewer/GazeboWorldDemo.cc @@ -23,14 +23,14 @@ #include "CameraWindow.hh" #include "SceneManager.hh" -using namespace ignition; +using namespace gz; using namespace rendering; void Connect() { common::Console::SetVerbosity(4); - gazebo::transport::init(); - gazebo::transport::run(); + sim::transport::init(); + sim::transport::run(); SceneManager* manager = SceneManager::Instance(); manager->Load(); diff --git a/examples/gazebo_scene_viewer/SceneManager.cc b/examples/gazebo_scene_viewer/SceneManager.cc index 2494fb0b8..bcbadf44f 100644 --- a/examples/gazebo_scene_viewer/SceneManager.cc +++ b/examples/gazebo_scene_viewer/SceneManager.cc @@ -24,7 +24,7 @@ #include "SceneManager.hh" #include "SceneManagerPrivate.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// @@ -166,17 +166,17 @@ void SceneManagerPrivate::Load() void SceneManagerPrivate::Init() { // listen for pre-render events - this->preRenderConn = gazebo::event::Events::ConnectPreRender( + this->preRenderConn = sim::event::Events::ConnectPreRender( std::bind(&SceneManagerPrivate::UpdateScenes, this)); // setup transport communication node - this->transportNode = gazebo::transport::NodePtr( - new gazebo::transport::Node()); + this->transportNode = sim::transport::NodePtr( + new sim::transport::Node()); this->transportNode->Init(); // create publisher for sending scene request this->requestPub = - this->transportNode->Advertise("~/request"); + this->transportNode->Advertise("~/request"); // listen for deletion requests this->requestSub = this->transportNode->Subscribe("~/request", @@ -364,7 +364,7 @@ void SceneManagerPrivate::UpdateScenes() ////////////////////////////////////////////////// void SceneManagerPrivate::SendSceneRequest() { - gazebo::msgs::Request *request = gazebo::msgs::CreateRequest("scene_info"); + sim::msgs::Request *request = sim::msgs::CreateRequest("scene_info"); this->sceneRequestId = request->id(); this->requestPub->Publish(*request); } @@ -871,33 +871,33 @@ void SubSceneManager::ClearMessages() } ////////////////////////////////////////////////// -void SubSceneManager::ProcessLight(const gazebo::msgs::Light &_lightMsg) +void SubSceneManager::ProcessLight(const sim::msgs::Light &_lightMsg) { // TODO(anyone): get parent when protobuf message is updated this->ProcessLight(_lightMsg, this->activeScene->RootVisual()); } ////////////////////////////////////////////////// -void SubSceneManager::ProcessLight(const gazebo::msgs::Light &_lightMsg, +void SubSceneManager::ProcessLight(const sim::msgs::Light &_lightMsg, VisualPtr _parent) { // check if type specified if (_lightMsg.has_type()) { - gazebo::msgs::Light::LightType type = _lightMsg.type(); + sim::msgs::Light::LightType type = _lightMsg.type(); // determine light type switch (_lightMsg.type()) { - case gazebo::msgs::Light::POINT: + case sim::msgs::Light::POINT: this->ProcessPointLight(_lightMsg, _parent); return; - case gazebo::msgs::Light::SPOT: + case sim::msgs::Light::SPOT: this->ProcessSpotLight(_lightMsg, _parent); return; - case gazebo::msgs::Light::DIRECTIONAL: + case sim::msgs::Light::DIRECTIONAL: this->ProcessDirectionalLight(_lightMsg, _parent); return; @@ -915,7 +915,7 @@ void SubSceneManager::ProcessLight(const gazebo::msgs::Light &_lightMsg, ////////////////////////////////////////////////// void SubSceneManager::ProcessDirectionalLight( - const gazebo::msgs::Light &_lightMsg, VisualPtr _parent) + const sim::msgs::Light &_lightMsg, VisualPtr _parent) { DirectionalLightPtr light = this->DirectionalLight(_lightMsg, _parent); if (light) this->ProcessDirectionalLightImpl(_lightMsg, light); @@ -923,12 +923,12 @@ void SubSceneManager::ProcessDirectionalLight( ////////////////////////////////////////////////// void SubSceneManager::ProcessDirectionalLightImpl( - const gazebo::msgs::Light &_lightMsg, DirectionalLightPtr _light) + const sim::msgs::Light &_lightMsg, DirectionalLightPtr _light) { // set direction if available if (_lightMsg.has_direction()) { - const gazebo::msgs::Vector3d &dirMsg = _lightMsg.direction(); + const sim::msgs::Vector3d &dirMsg = _lightMsg.direction(); _light->SetDirection(SubSceneManager::Convert(dirMsg)); } @@ -938,7 +938,7 @@ void SubSceneManager::ProcessDirectionalLightImpl( ////////////////////////////////////////////////// DirectionalLightPtr SubSceneManager::DirectionalLight( - const gazebo::msgs::Light &_lightMsg, VisualPtr _parent) + const sim::msgs::Light &_lightMsg, VisualPtr _parent) { // find existing light with name std::string name = _lightMsg.name(); @@ -959,14 +959,14 @@ DirectionalLightPtr SubSceneManager::DirectionalLight( ////////////////////////////////////////////////// DirectionalLightPtr SubSceneManager::CreateDirectionalLight( - const gazebo::msgs::Light &_lightMsg) + const sim::msgs::Light &_lightMsg) { std::string name = _lightMsg.name(); return this->activeScene->CreateDirectionalLight(name); } ////////////////////////////////////////////////// -void SubSceneManager::ProcessPointLight(const gazebo::msgs::Light &_lightMsg, +void SubSceneManager::ProcessPointLight(const sim::msgs::Light &_lightMsg, VisualPtr _parent) { PointLightPtr light = this->PointLight(_lightMsg, _parent); @@ -975,7 +975,7 @@ void SubSceneManager::ProcessPointLight(const gazebo::msgs::Light &_lightMsg, ////////////////////////////////////////////////// void SubSceneManager::ProcessPointLightImpl( - const gazebo::msgs::Light &_lightMsg, PointLightPtr _light) + const sim::msgs::Light &_lightMsg, PointLightPtr _light) { // process general light information this->ProcessLightImpl(_lightMsg, _light); @@ -983,7 +983,7 @@ void SubSceneManager::ProcessPointLightImpl( ////////////////////////////////////////////////// PointLightPtr SubSceneManager::PointLight( - const gazebo::msgs::Light &_lightMsg, VisualPtr _parent) + const sim::msgs::Light &_lightMsg, VisualPtr _parent) { // find existing light with name std::string name = _lightMsg.name(); @@ -1003,14 +1003,14 @@ PointLightPtr SubSceneManager::PointLight( ////////////////////////////////////////////////// PointLightPtr SubSceneManager::CreatePointLight( - const gazebo::msgs::Light &_lightMsg) + const sim::msgs::Light &_lightMsg) { std::string name = _lightMsg.name(); return this->activeScene->CreatePointLight(name); } ////////////////////////////////////////////////// -void SubSceneManager::ProcessSpotLight(const gazebo::msgs::Light &_lightMsg, +void SubSceneManager::ProcessSpotLight(const sim::msgs::Light &_lightMsg, VisualPtr _parent) { SpotLightPtr light = this->SpotLight(_lightMsg, _parent); @@ -1019,12 +1019,12 @@ void SubSceneManager::ProcessSpotLight(const gazebo::msgs::Light &_lightMsg, ////////////////////////////////////////////////// void SubSceneManager::ProcessSpotLightImpl( - const gazebo::msgs::Light &_lightMsg, SpotLightPtr _light) + const sim::msgs::Light &_lightMsg, SpotLightPtr _light) { // set direction if available if (_lightMsg.has_direction()) { - const gazebo::msgs::Vector3d &dirMsg = _lightMsg.direction(); + const sim::msgs::Vector3d &dirMsg = _lightMsg.direction(); _light->SetDirection(SubSceneManager::Convert(dirMsg)); } @@ -1054,7 +1054,7 @@ void SubSceneManager::ProcessSpotLightImpl( } ////////////////////////////////////////////////// -SpotLightPtr SubSceneManager::SpotLight(const gazebo::msgs::Light &_lightMsg, +SpotLightPtr SubSceneManager::SpotLight(const sim::msgs::Light &_lightMsg, VisualPtr _parent) { // find existing light with name @@ -1075,14 +1075,14 @@ SpotLightPtr SubSceneManager::SpotLight(const gazebo::msgs::Light &_lightMsg, ////////////////////////////////////////////////// SpotLightPtr SubSceneManager::CreateSpotLight( - const gazebo::msgs::Light &_lightMsg) + const sim::msgs::Light &_lightMsg) { std::string name = _lightMsg.name(); return this->activeScene->CreateSpotLight(name); } ////////////////////////////////////////////////// -void SubSceneManager::ProcessLightImpl(const gazebo::msgs::Light &_lightMsg, +void SubSceneManager::ProcessLightImpl(const sim::msgs::Light &_lightMsg, LightPtr _light) { // set pose if available @@ -1094,14 +1094,14 @@ void SubSceneManager::ProcessLightImpl(const gazebo::msgs::Light &_lightMsg, // set diffuse if available if (_lightMsg.has_diffuse()) { - const gazebo::msgs::Color &colorMsg = _lightMsg.diffuse(); + const sim::msgs::Color &colorMsg = _lightMsg.diffuse(); _light->SetDiffuseColor(SubSceneManager::Convert(colorMsg)); } // set specular if available if (_lightMsg.has_specular()) { - const gazebo::msgs::Color &colorMsg = _lightMsg.specular(); + const sim::msgs::Color &colorMsg = _lightMsg.specular(); _light->SetSpecularColor(SubSceneManager::Convert(colorMsg)); } @@ -1142,14 +1142,14 @@ void SubSceneManager::ProcessLightImpl(const gazebo::msgs::Light &_lightMsg, } ////////////////////////////////////////////////// -void SubSceneManager::ProcessSensor(const gazebo::msgs::Sensor &_sensorMsg) +void SubSceneManager::ProcessSensor(const sim::msgs::Sensor &_sensorMsg) { VisualPtr parent = this->Parent(_sensorMsg.parent()); this->ProcessSensor(_sensorMsg, parent); } ////////////////////////////////////////////////// -void SubSceneManager::ProcessSensor(const gazebo::msgs::Sensor &_sensorMsg, +void SubSceneManager::ProcessSensor(const sim::msgs::Sensor &_sensorMsg, VisualPtr _parent) { // TODO(anyone): process all types @@ -1161,7 +1161,7 @@ void SubSceneManager::ProcessSensor(const gazebo::msgs::Sensor &_sensorMsg, } ////////////////////////////////////////////////// -void SubSceneManager::ProcessCamera(const gazebo::msgs::Sensor &_sensorMsg, +void SubSceneManager::ProcessCamera(const sim::msgs::Sensor &_sensorMsg, VisualPtr _parent) { CameraPtr camera = this->Camera(_sensorMsg, _parent); @@ -1170,7 +1170,7 @@ void SubSceneManager::ProcessCamera(const gazebo::msgs::Sensor &_sensorMsg, } ////////////////////////////////////////////////// -CameraPtr SubSceneManager::Camera(const gazebo::msgs::Sensor &_sensorMsg, +CameraPtr SubSceneManager::Camera(const sim::msgs::Sensor &_sensorMsg, VisualPtr _parent) { // find existing camera with name @@ -1189,7 +1189,7 @@ CameraPtr SubSceneManager::Camera(const gazebo::msgs::Sensor &_sensorMsg, } ////////////////////////////////////////////////// -CameraPtr SubSceneManager::CreateCamera(const gazebo::msgs::Sensor &_sensorMsg) +CameraPtr SubSceneManager::CreateCamera(const sim::msgs::Sensor &_sensorMsg) { bool hasId = _sensorMsg.has_id(); unsigned int id = _sensorMsg.id(); @@ -1201,14 +1201,14 @@ CameraPtr SubSceneManager::CreateCamera(const gazebo::msgs::Sensor &_sensorMsg) } ////////////////////////////////////////////////// -void SubSceneManager::ProcessModel(const gazebo::msgs::Model &_modelMsg) +void SubSceneManager::ProcessModel(const sim::msgs::Model &_modelMsg) { VisualPtr parent = this->activeScene->RootVisual(); this->ProcessModel(_modelMsg, parent); } ////////////////////////////////////////////////// -void SubSceneManager::ProcessModel(const gazebo::msgs::Model &_modelMsg, +void SubSceneManager::ProcessModel(const sim::msgs::Model &_modelMsg, VisualPtr _parent) { VisualPtr model = this->Model(_modelMsg, _parent); @@ -1228,14 +1228,14 @@ void SubSceneManager::ProcessModel(const gazebo::msgs::Model &_modelMsg, // process each sensor in joint for (int i = 0; i < _modelMsg.joint_size(); ++i) { - const gazebo::msgs::Joint &joint = _modelMsg.joint(i); + const sim::msgs::Joint &joint = _modelMsg.joint(i); this->ProcessJoint(joint, model); } // process each sensor in link for (int i = 0; i < _modelMsg.link_size(); ++i) { - const gazebo::msgs::Link &link = _modelMsg.link(i); + const sim::msgs::Link &link = _modelMsg.link(i); this->ProcessLink(link, model); } @@ -1243,13 +1243,13 @@ void SubSceneManager::ProcessModel(const gazebo::msgs::Model &_modelMsg, // always skip first empty visual for (int i = 1; i < _modelMsg.visual_size(); ++i) { - const gazebo::msgs::Visual &visual = _modelMsg.visual(i); + const sim::msgs::Visual &visual = _modelMsg.visual(i); this->ProcessVisual(visual, model); } } ////////////////////////////////////////////////// -VisualPtr SubSceneManager::Model(const gazebo::msgs::Model &_modelMsg, +VisualPtr SubSceneManager::Model(const sim::msgs::Model &_modelMsg, VisualPtr _parent) { bool hasId = _modelMsg.has_id(); @@ -1259,14 +1259,14 @@ VisualPtr SubSceneManager::Model(const gazebo::msgs::Model &_modelMsg, } ////////////////////////////////////////////////// -void SubSceneManager::ProcessJoint(const gazebo::msgs::Joint &_jointMsg) +void SubSceneManager::ProcessJoint(const sim::msgs::Joint &_jointMsg) { VisualPtr parent = this->Parent(_jointMsg.parent()); this->ProcessJoint(_jointMsg, parent); } ////////////////////////////////////////////////// -void SubSceneManager::ProcessJoint(const gazebo::msgs::Joint &_jointMsg, +void SubSceneManager::ProcessJoint(const sim::msgs::Joint &_jointMsg, VisualPtr _parent) { VisualPtr joint = this->Joint(_jointMsg, _parent); @@ -1280,13 +1280,13 @@ void SubSceneManager::ProcessJoint(const gazebo::msgs::Joint &_jointMsg, // process each sensor in joint for (int i = 0; i < _jointMsg.sensor_size(); ++i) { - const gazebo::msgs::Sensor &sensor = _jointMsg.sensor(i); + const sim::msgs::Sensor &sensor = _jointMsg.sensor(i); this->ProcessSensor(sensor, joint); } } ////////////////////////////////////////////////// -VisualPtr SubSceneManager::Joint(const gazebo::msgs::Joint &_jointMsg, +VisualPtr SubSceneManager::Joint(const sim::msgs::Joint &_jointMsg, VisualPtr _parent) { bool hasId = _jointMsg.has_id(); @@ -1296,14 +1296,14 @@ VisualPtr SubSceneManager::Joint(const gazebo::msgs::Joint &_jointMsg, } ////////////////////////////////////////////////// -void SubSceneManager::ProcessVisual(const gazebo::msgs::Visual &_visualMsg) +void SubSceneManager::ProcessVisual(const sim::msgs::Visual &_visualMsg) { VisualPtr parent = this->Parent(_visualMsg.parent_name()); this->ProcessVisual(_visualMsg, parent); } ////////////////////////////////////////////////// -void SubSceneManager::ProcessVisual(const gazebo::msgs::Visual &_visualMsg, +void SubSceneManager::ProcessVisual(const sim::msgs::Visual &_visualMsg, VisualPtr _parent) { VisualPtr visual = this->Visual(_visualMsg, _parent); @@ -1333,14 +1333,14 @@ void SubSceneManager::ProcessVisual(const gazebo::msgs::Visual &_visualMsg, // set material if available if (_visualMsg.has_material()) { - const gazebo::msgs::Material matMsg = _visualMsg.material(); + const sim::msgs::Material matMsg = _visualMsg.material(); MaterialPtr material = this->CreateMaterial(matMsg); visual->SetMaterial(material); } } ////////////////////////////////////////////////// -VisualPtr SubSceneManager::Visual(const gazebo::msgs::Visual &_visualMsg, +VisualPtr SubSceneManager::Visual(const sim::msgs::Visual &_visualMsg, VisualPtr _parent) { bool hasId = _visualMsg.has_id(); @@ -1350,7 +1350,7 @@ VisualPtr SubSceneManager::Visual(const gazebo::msgs::Visual &_visualMsg, } ////////////////////////////////////////////////// -void SubSceneManager::ProcessLink(const gazebo::msgs::Link &_linkMsg, +void SubSceneManager::ProcessLink(const sim::msgs::Link &_linkMsg, VisualPtr _parent) { VisualPtr link = this->Link(_linkMsg, _parent); @@ -1365,20 +1365,20 @@ void SubSceneManager::ProcessLink(const gazebo::msgs::Link &_linkMsg, // always skip first empty visual for (int i = 1; i < _linkMsg.visual_size(); ++i) { - const gazebo::msgs::Visual &visual = _linkMsg.visual(i); + const sim::msgs::Visual &visual = _linkMsg.visual(i); this->ProcessVisual(visual, link); } // process each sensor in link for (int i = 0; i < _linkMsg.sensor_size(); ++i) { - const gazebo::msgs::Sensor &sensor = _linkMsg.sensor(i); + const sim::msgs::Sensor &sensor = _linkMsg.sensor(i); this->ProcessSensor(sensor, link); } } ////////////////////////////////////////////////// -VisualPtr SubSceneManager::Link(const gazebo::msgs::Link &_linkMsg, +VisualPtr SubSceneManager::Link(const sim::msgs::Link &_linkMsg, VisualPtr _parent) { bool hasId = _linkMsg.has_id(); @@ -1415,7 +1415,7 @@ VisualPtr SubSceneManager::CreateVisual(bool _hasId, unsigned int _id, ////////////////////////////////////////////////// void SubSceneManager::ProcessGeometry( - const gazebo::msgs::Geometry &_geometryMsg, VisualPtr _parent) + const sim::msgs::Geometry &_geometryMsg, VisualPtr _parent) { GeomType geomType = _geometryMsg.type(); GeomFunc geomFunc = this->geomFunctions[geomType]; @@ -1426,30 +1426,30 @@ void SubSceneManager::ProcessGeometry( { ignerr << "Unsupported geometry type: " << geomType << std::endl; ignwarn << "Using empty geometry instead" << std::endl; - geomFunc = this->geomFunctions[gazebo::msgs::Geometry::EMPTY]; + geomFunc = this->geomFunctions[sim::msgs::Geometry::EMPTY]; } (this->*geomFunc)(_geometryMsg, _parent); } ////////////////////////////////////////////////// -void SubSceneManager::ProcessBox(const gazebo::msgs::Geometry &_geometryMsg, +void SubSceneManager::ProcessBox(const sim::msgs::Geometry &_geometryMsg, VisualPtr _parent) { GeometryPtr box = this->activeScene->CreateBox(); - const gazebo::msgs::BoxGeom &boxMsg = _geometryMsg.box(); - const gazebo::msgs::Vector3d sizeMsg = boxMsg.size(); + const sim::msgs::BoxGeom &boxMsg = _geometryMsg.box(); + const sim::msgs::Vector3d sizeMsg = boxMsg.size(); _parent->SetLocalScale(SubSceneManager::Convert(sizeMsg)); _parent->AddGeometry(box); } ////////////////////////////////////////////////// void SubSceneManager::ProcessCone( - const gazebo::msgs::Geometry &/*_geometryMsg*/, VisualPtr _parent) + const sim::msgs::Geometry &/*_geometryMsg*/, VisualPtr _parent) { // TODO(anyone): needs protobuf msg GeometryPtr cone = this->activeScene->CreateCone(); - // const gazebo::msgs::ConeGeom &coneMsg = _geometryMsg.cone(); + // const sim::msgs::ConeGeom &coneMsg = _geometryMsg.cone(); // double x = coneMsg.radius(); // double y = coneMsg.radius(); // double z = coneMsg.length(); @@ -1459,10 +1459,10 @@ void SubSceneManager::ProcessCone( ////////////////////////////////////////////////// void SubSceneManager::ProcessCylinder( - const gazebo::msgs::Geometry &_geometryMsg, VisualPtr _parent) + const sim::msgs::Geometry &_geometryMsg, VisualPtr _parent) { GeometryPtr cylinder = this->activeScene->CreateCylinder(); - const gazebo::msgs::CylinderGeom &cylinderMsg = _geometryMsg.cylinder(); + const sim::msgs::CylinderGeom &cylinderMsg = _geometryMsg.cylinder(); double x = 2 * cylinderMsg.radius(); double y = 2 * cylinderMsg.radius(); double z = cylinderMsg.length(); @@ -1471,16 +1471,16 @@ void SubSceneManager::ProcessCylinder( } ////////////////////////////////////////////////// -void SubSceneManager::ProcessEmpty(const gazebo::msgs::Geometry&, VisualPtr) +void SubSceneManager::ProcessEmpty(const sim::msgs::Geometry&, VisualPtr) { // do nothing } ////////////////////////////////////////////////// -void SubSceneManager::ProcessMesh(const gazebo::msgs::Geometry &_geometryMsg, +void SubSceneManager::ProcessMesh(const sim::msgs::Geometry &_geometryMsg, VisualPtr _parent) { - const gazebo::msgs::MeshGeom &meshMsg = _geometryMsg.mesh(); + const sim::msgs::MeshGeom &meshMsg = _geometryMsg.mesh(); // if the model contains model:// try to find the meshes in ~/.gazebo std::list modelPaths; @@ -1537,7 +1537,7 @@ void SubSceneManager::ProcessMesh(const gazebo::msgs::Geometry &_geometryMsg, // set scale if available if (meshMsg.has_scale()) { - const gazebo::msgs::Vector3d scaleMsg = meshMsg.scale(); + const sim::msgs::Vector3d scaleMsg = meshMsg.scale(); _parent->SetLocalScale(SubSceneManager::Convert(scaleMsg)); } @@ -1546,30 +1546,30 @@ void SubSceneManager::ProcessMesh(const gazebo::msgs::Geometry &_geometryMsg, } ////////////////////////////////////////////////// -void SubSceneManager::ProcessPlane(const gazebo::msgs::Geometry &_geometryMsg, +void SubSceneManager::ProcessPlane(const sim::msgs::Geometry &_geometryMsg, VisualPtr _parent) { // TODO(anyone): handle plane normal GeometryPtr plane = this->activeScene->CreatePlane(); - const gazebo::msgs::PlaneGeom &planeMsg = _geometryMsg.plane(); - const gazebo::msgs::Vector2d planeSize = planeMsg.size(); + const sim::msgs::PlaneGeom &planeMsg = _geometryMsg.plane(); + const sim::msgs::Vector2d planeSize = planeMsg.size(); _parent->SetLocalScale(planeSize.x(), planeSize.y(), 1); _parent->AddGeometry(plane); } ////////////////////////////////////////////////// -void SubSceneManager::ProcessSphere(const gazebo::msgs::Geometry &_geometryMsg, +void SubSceneManager::ProcessSphere(const sim::msgs::Geometry &_geometryMsg, VisualPtr _parent) { GeometryPtr sphere = this->activeScene->CreateSphere(); - const gazebo::msgs::SphereGeom &sphereMsg = _geometryMsg.sphere(); + const sim::msgs::SphereGeom &sphereMsg = _geometryMsg.sphere(); _parent->SetLocalScale(2 * sphereMsg.radius()); _parent->AddGeometry(sphere); } ////////////////////////////////////////////////// MaterialPtr SubSceneManager::CreateMaterial( - const gazebo::msgs::Material &_materialMsg) + const sim::msgs::Material &_materialMsg) { MaterialPtr material = this->activeScene->CreateMaterial(); @@ -1580,7 +1580,7 @@ MaterialPtr SubSceneManager::CreateMaterial( // set ambient if available if (_materialMsg.has_ambient()) { - gazebo::msgs::Color msg = _materialMsg.ambient(); + sim::msgs::Color msg = _materialMsg.ambient(); math::Color ambient(msg.r(), msg.g(), msg.b(), msg.a()); material->SetAmbient(ambient); } @@ -1588,7 +1588,7 @@ MaterialPtr SubSceneManager::CreateMaterial( // set diffuse if available if (_materialMsg.has_diffuse()) { - gazebo::msgs::Color msg = _materialMsg.diffuse(); + sim::msgs::Color msg = _materialMsg.diffuse(); math::Color diffuse(msg.r(), msg.g(), msg.b(), msg.a()); material->SetDiffuse(diffuse); } @@ -1596,7 +1596,7 @@ MaterialPtr SubSceneManager::CreateMaterial( // set specular if available if (_materialMsg.has_specular()) { - gazebo::msgs::Color msg = _materialMsg.specular(); + sim::msgs::Color msg = _materialMsg.specular(); math::Color specular(msg.r(), msg.g(), msg.b(), msg.a()); material->SetSpecular(specular); } @@ -1604,7 +1604,7 @@ MaterialPtr SubSceneManager::CreateMaterial( // set emissive if available if (_materialMsg.has_emissive()) { - gazebo::msgs::Color msg = _materialMsg.emissive(); + sim::msgs::Color msg = _materialMsg.emissive(); math::Color emissive(msg.r(), msg.g(), msg.b(), msg.a()); material->SetEmissive(emissive); } @@ -1626,7 +1626,7 @@ MaterialPtr SubSceneManager::CreateMaterial( // set shader-type if available if (_materialMsg.has_shader_type()) { - gazebo::msgs::Material::ShaderType shader_type = + sim::msgs::Material::ShaderType shader_type = _materialMsg.shader_type(); ShaderType type = SubSceneManager::Convert(shader_type); material->SetShaderType(type); @@ -1638,7 +1638,7 @@ MaterialPtr SubSceneManager::CreateMaterial( } ////////////////////////////////////////////////// -void SubSceneManager::ProcessPose(const gazebo::msgs::Pose &_poseMsg) +void SubSceneManager::ProcessPose(const sim::msgs::Pose &_poseMsg) { std::string name = _poseMsg.name(); NodePtr node = this->activeScene->NodeByName(name); @@ -1647,7 +1647,7 @@ void SubSceneManager::ProcessPose(const gazebo::msgs::Pose &_poseMsg) ////////////////////////////////////////////////// void SubSceneManager::SetPose(NodePtr _node, - const gazebo::msgs::Pose &_poseMsg) + const sim::msgs::Pose &_poseMsg) { math::Pose3d pose = SubSceneManager::Convert(_poseMsg); _node->SetLocalPose(pose); @@ -1655,7 +1655,7 @@ void SubSceneManager::SetPose(NodePtr _node, ////////////////////////////////////////////////// void SubSceneManager::SetScale(VisualPtr _visual, - const gazebo::msgs::Vector3d &_scaleMsg) + const sim::msgs::Vector3d &_scaleMsg) { math::Vector3d scale = SubSceneManager::Convert(_scaleMsg); _visual->SetLocalScale(scale); @@ -1696,7 +1696,7 @@ void SubSceneManager::ProcessRemoval(const std::string &_name) } ////////////////////////////////////////////////// -math::Color SubSceneManager::Convert(const gazebo::msgs::Color &_colorMsg) +math::Color SubSceneManager::Convert(const sim::msgs::Color &_colorMsg) { math::Color color; color.R() = _colorMsg.r(); @@ -1707,21 +1707,21 @@ math::Color SubSceneManager::Convert(const gazebo::msgs::Color &_colorMsg) } ////////////////////////////////////////////////// -math::Pose3d SubSceneManager::Convert(const gazebo::msgs::Pose &_poseMsg) +math::Pose3d SubSceneManager::Convert(const sim::msgs::Pose &_poseMsg) { math::Pose3d pose; - const gazebo::msgs::Vector3d &posMsg = _poseMsg.position(); + const sim::msgs::Vector3d &posMsg = _poseMsg.position(); pose.Pos() = SubSceneManager::Convert(posMsg); - const gazebo::msgs::Quaternion &rotMsg = _poseMsg.orientation(); + const sim::msgs::Quaternion &rotMsg = _poseMsg.orientation(); pose.Rot() = SubSceneManager::Convert(rotMsg); return pose; } ////////////////////////////////////////////////// -math::Vector3d SubSceneManager::Convert(const gazebo::msgs::Vector3d &_vecMsg) +math::Vector3d SubSceneManager::Convert(const sim::msgs::Vector3d &_vecMsg) { math::Vector3d vec; vec.X(_vecMsg.x()); @@ -1732,7 +1732,7 @@ math::Vector3d SubSceneManager::Convert(const gazebo::msgs::Vector3d &_vecMsg) ////////////////////////////////////////////////// math::Quaterniond SubSceneManager::Convert( - const gazebo::msgs::Quaternion &_quatMsg) + const sim::msgs::Quaternion &_quatMsg) { math::Quaterniond quat; quat.W(_quatMsg.w()); @@ -1743,20 +1743,20 @@ math::Quaterniond SubSceneManager::Convert( } ////////////////////////////////////////////////// -ShaderType SubSceneManager::Convert(gazebo::msgs::Material::ShaderType _type) +ShaderType SubSceneManager::Convert(sim::msgs::Material::ShaderType _type) { switch (_type) { - case gazebo::msgs::Material::VERTEX: + case sim::msgs::Material::VERTEX: return ST_VERTEX; - case gazebo::msgs::Material::PIXEL: + case sim::msgs::Material::PIXEL: return ST_PIXEL; - case gazebo::msgs::Material::NORMAL_MAP_OBJECT_SPACE: + case sim::msgs::Material::NORMAL_MAP_OBJECT_SPACE: return ST_NORM_OBJ; - case gazebo::msgs::Material::NORMAL_MAP_TANGENT_SPACE: + case sim::msgs::Material::NORMAL_MAP_TANGENT_SPACE: return ST_NORM_TAN; default: @@ -1767,26 +1767,26 @@ ShaderType SubSceneManager::Convert(gazebo::msgs::Material::ShaderType _type) ////////////////////////////////////////////////// void SubSceneManager::CreateGeometryFunctionMap() { - this->geomFunctions[gazebo::msgs::Geometry::BOX] = + this->geomFunctions[sim::msgs::Geometry::BOX] = &SubSceneManager::ProcessBox; // TODO(anyone): enable when cone protobuf msg created - // this->geomFunctions[gazebo::msgs::Geometry::CONE] = + // this->geomFunctions[sim::msgs::Geometry::CONE] = // &SubSceneManager::ProcessCone; - this->geomFunctions[gazebo::msgs::Geometry::CYLINDER] = + this->geomFunctions[sim::msgs::Geometry::CYLINDER] = &SubSceneManager::ProcessCylinder; - this->geomFunctions[gazebo::msgs::Geometry::EMPTY] = + this->geomFunctions[sim::msgs::Geometry::EMPTY] = &SubSceneManager::ProcessEmpty; - this->geomFunctions[gazebo::msgs::Geometry::MESH] = + this->geomFunctions[sim::msgs::Geometry::MESH] = &SubSceneManager::ProcessMesh; - this->geomFunctions[gazebo::msgs::Geometry::PLANE] = + this->geomFunctions[sim::msgs::Geometry::PLANE] = &SubSceneManager::ProcessPlane; - this->geomFunctions[gazebo::msgs::Geometry::SPHERE] = + this->geomFunctions[sim::msgs::Geometry::SPHERE] = &SubSceneManager::ProcessSphere; } @@ -1812,7 +1812,7 @@ void CurrentSceneManager::OnPoseUpdate(::ConstPosesStampedPtr &_posesMsg) for (int i = 0; i < _posesMsg->pose_size(); ++i) { // replace into pose map - gazebo::msgs::Pose pose = _posesMsg->pose(i); + sim::msgs::Pose pose = _posesMsg->pose(i); std::string name = pose.name(); this->poseMsgs[name] = pose; } @@ -1945,7 +1945,7 @@ void NewSceneManager::ProcessScene() // process ambient if available if (this->sceneMsg.has_ambient()) { - gazebo::msgs::Color colorMsg = this->sceneMsg.ambient(); + sim::msgs::Color colorMsg = this->sceneMsg.ambient(); math::Color color(colorMsg.r(), colorMsg.g(), colorMsg.b()); this->activeScene->SetAmbientLight(color); } @@ -1953,7 +1953,7 @@ void NewSceneManager::ProcessScene() // process background if available if (this->sceneMsg.has_background()) { - gazebo::msgs::Color colorMsg = this->sceneMsg.background(); + sim::msgs::Color colorMsg = this->sceneMsg.background(); math::Color color(colorMsg.r(), colorMsg.g(), colorMsg.b()); this->activeScene->SetBackgroundColor(color); } @@ -1961,14 +1961,14 @@ void NewSceneManager::ProcessScene() // process each scene light for (int i = 0; i < this->sceneMsg.light_size(); ++i) { - gazebo::msgs::Light lightMsg = this->sceneMsg.light(i); + sim::msgs::Light lightMsg = this->sceneMsg.light(i); this->ProcessLight(lightMsg, this->activeScene->RootVisual()); } // process each scene model for (int i = 0; i < this->sceneMsg.model_size(); ++i) { - gazebo::msgs::Model modelMsg = this->sceneMsg.model(i); + sim::msgs::Model modelMsg = this->sceneMsg.model(i); this->ProcessModel(modelMsg, this->activeScene->RootVisual()); } } @@ -2040,7 +2040,7 @@ void NewSceneManager::ProcessPoses() } ////////////////////////////////////////////////// -void NewSceneManager::ProcessPoses(const gazebo::msgs::PosesStamped &_posesMsg) +void NewSceneManager::ProcessPoses(const sim::msgs::PosesStamped &_posesMsg) { // record pose timestamp int sec = _posesMsg.time().sec(); @@ -2050,7 +2050,7 @@ void NewSceneManager::ProcessPoses(const gazebo::msgs::PosesStamped &_posesMsg) // process each pose in list for (int i = 0; i < _posesMsg.pose_size(); ++i) { - gazebo::msgs::Pose poseMsg = _posesMsg.pose(i); + sim::msgs::Pose poseMsg = _posesMsg.pose(i); this->ProcessPose(poseMsg); } } diff --git a/examples/gazebo_scene_viewer/SceneManager.hh b/examples/gazebo_scene_viewer/SceneManager.hh index b60a0723a..1c74d14fe 100644 --- a/examples/gazebo_scene_viewer/SceneManager.hh +++ b/examples/gazebo_scene_viewer/SceneManager.hh @@ -30,7 +30,7 @@ #include #include "ignition/rendering/RenderTypes.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/examples/gazebo_scene_viewer/SceneManagerPrivate.hh b/examples/gazebo_scene_viewer/SceneManagerPrivate.hh index 7c1d0fdbc..78c7bc487 100644 --- a/examples/gazebo_scene_viewer/SceneManagerPrivate.hh +++ b/examples/gazebo_scene_viewer/SceneManagerPrivate.hh @@ -30,7 +30,7 @@ #include "ignition/rendering/ShaderType.hh" #include "gazebo/transport/Node.hh" -namespace ignition +namespace gz { namespace rendering { @@ -114,27 +114,27 @@ namespace ignition private: NewSceneManager *newSceneManager; - private: gazebo::transport::NodePtr transportNode; + private: sim::transport::NodePtr transportNode; - private: gazebo::transport::PublisherPtr requestPub; + private: sim::transport::PublisherPtr requestPub; - private: gazebo::transport::SubscriberPtr requestSub; + private: sim::transport::SubscriberPtr requestSub; - private: gazebo::transport::SubscriberPtr responseSub; + private: sim::transport::SubscriberPtr responseSub; - private: gazebo::transport::SubscriberPtr lightSub; + private: sim::transport::SubscriberPtr lightSub; - private: gazebo::transport::SubscriberPtr modelSub; + private: sim::transport::SubscriberPtr modelSub; - private: gazebo::transport::SubscriberPtr jointSub; + private: sim::transport::SubscriberPtr jointSub; - private: gazebo::transport::SubscriberPtr visualSub; + private: sim::transport::SubscriberPtr visualSub; - private: gazebo::transport::SubscriberPtr sensorSub; + private: sim::transport::SubscriberPtr sensorSub; - private: gazebo::transport::SubscriberPtr poseSub; + private: sim::transport::SubscriberPtr poseSub; - private: gazebo::event::ConnectionPtr preRenderConn; + private: sim::event::ConnectionPtr preRenderConn; private: int sceneRequestId; @@ -149,10 +149,10 @@ namespace ignition class SubSceneManager { - protected: typedef gazebo::msgs::Geometry::Type GeomType; + protected: typedef sim::msgs::Geometry::Type GeomType; protected: typedef void (SubSceneManager::*GeomFunc) - (const gazebo::msgs::Geometry&, VisualPtr); + (const sim::msgs::Geometry&, VisualPtr); public: SubSceneManager(); @@ -209,104 +209,104 @@ namespace ignition protected: virtual void ProcessLights() = 0; protected: virtual void ProcessLight( - const gazebo::msgs::Light &_lightMsg); + const sim::msgs::Light &_lightMsg); public: virtual void ProcessLight( - const gazebo::msgs::Light &_lightMsg, VisualPtr _parent); + const sim::msgs::Light &_lightMsg, VisualPtr _parent); protected: virtual void ProcessDirectionalLight( - const gazebo::msgs::Light &_lightMsg, VisualPtr _parent); + const sim::msgs::Light &_lightMsg, VisualPtr _parent); protected: virtual void ProcessDirectionalLightImpl( - const gazebo::msgs::Light &_lightMsg, DirectionalLightPtr _light); + const sim::msgs::Light &_lightMsg, DirectionalLightPtr _light); protected: virtual DirectionalLightPtr DirectionalLight( - const gazebo::msgs::Light &_lightMsg, VisualPtr _parent); + const sim::msgs::Light &_lightMsg, VisualPtr _parent); protected: virtual DirectionalLightPtr CreateDirectionalLight( - const gazebo::msgs::Light &_lightMsg); + const sim::msgs::Light &_lightMsg); protected: virtual void ProcessPointLight( - const gazebo::msgs::Light &_lightMsg, VisualPtr _parent); + const sim::msgs::Light &_lightMsg, VisualPtr _parent); protected: virtual void ProcessPointLightImpl( - const gazebo::msgs::Light &_lightMsg, PointLightPtr _light); + const sim::msgs::Light &_lightMsg, PointLightPtr _light); protected: virtual PointLightPtr PointLight( - const gazebo::msgs::Light &_lightMsg, VisualPtr _parent); + const sim::msgs::Light &_lightMsg, VisualPtr _parent); protected: virtual PointLightPtr CreatePointLight( - const gazebo::msgs::Light &_lightMsg); + const sim::msgs::Light &_lightMsg); protected: virtual void ProcessSpotLight( - const gazebo::msgs::Light &_lightMsg, VisualPtr _parent); + const sim::msgs::Light &_lightMsg, VisualPtr _parent); protected: virtual void ProcessSpotLightImpl( - const gazebo::msgs::Light &_lightMsg, SpotLightPtr _light); + const sim::msgs::Light &_lightMsg, SpotLightPtr _light); protected: virtual SpotLightPtr SpotLight( - const gazebo::msgs::Light &_lightMsg, VisualPtr _parent); + const sim::msgs::Light &_lightMsg, VisualPtr _parent); protected: virtual SpotLightPtr CreateSpotLight( - const gazebo::msgs::Light &_lightMsg); + const sim::msgs::Light &_lightMsg); protected: virtual void ProcessLightImpl( - const gazebo::msgs::Light &_lightMsg, LightPtr _light); + const sim::msgs::Light &_lightMsg, LightPtr _light); protected: virtual void ProcessSensors() = 0; protected: virtual void ProcessSensor( - const gazebo::msgs::Sensor &_sensorMsg); + const sim::msgs::Sensor &_sensorMsg); protected: virtual void ProcessSensor( - const gazebo::msgs::Sensor &_sensorMsg, VisualPtr _parent); + const sim::msgs::Sensor &_sensorMsg, VisualPtr _parent); protected: virtual void ProcessCamera( - const gazebo::msgs::Sensor &_sensorMsg, VisualPtr _parent); + const sim::msgs::Sensor &_sensorMsg, VisualPtr _parent); protected: virtual CameraPtr Camera( - const gazebo::msgs::Sensor &_sensorMsg, VisualPtr _parent); + const sim::msgs::Sensor &_sensorMsg, VisualPtr _parent); protected: virtual CameraPtr CreateCamera( - const gazebo::msgs::Sensor &_sensorMsg); + const sim::msgs::Sensor &_sensorMsg); protected: virtual void ProcessModels() = 0; protected: virtual void ProcessModel( - const gazebo::msgs::Model &_modelMsg); + const sim::msgs::Model &_modelMsg); protected: virtual void ProcessModel( - const gazebo::msgs::Model &_modelMsg, VisualPtr _parent); + const sim::msgs::Model &_modelMsg, VisualPtr _parent); - protected: virtual VisualPtr Model(const gazebo::msgs::Model &_modelMsg, + protected: virtual VisualPtr Model(const sim::msgs::Model &_modelMsg, VisualPtr _parent); protected: virtual void ProcessJoints() = 0; protected: virtual void ProcessJoint( - const gazebo::msgs::Joint &_jointMsg); + const sim::msgs::Joint &_jointMsg); protected: virtual void ProcessJoint( - const gazebo::msgs::Joint &_jointMsg, VisualPtr _parent); + const sim::msgs::Joint &_jointMsg, VisualPtr _parent); - protected: virtual VisualPtr Joint(const gazebo::msgs::Joint &_jointMsg, + protected: virtual VisualPtr Joint(const sim::msgs::Joint &_jointMsg, VisualPtr _parent); protected: virtual void ProcessVisuals() = 0; protected: virtual void ProcessVisual( - const gazebo::msgs::Visual &_visualMsg); + const sim::msgs::Visual &_visualMsg); protected: virtual void ProcessVisual( - const gazebo::msgs::Visual &_visualMsg, VisualPtr _parent); + const sim::msgs::Visual &_visualMsg, VisualPtr _parent); protected: virtual VisualPtr Visual( - const gazebo::msgs::Visual &_visualMsg, VisualPtr _parent); + const sim::msgs::Visual &_visualMsg, VisualPtr _parent); - protected: virtual void ProcessLink(const gazebo::msgs::Link &_linkMsg, + protected: virtual void ProcessLink(const sim::msgs::Link &_linkMsg, VisualPtr _parent); - protected: virtual VisualPtr Link(const gazebo::msgs::Link &_linkMsg, + protected: virtual VisualPtr Link(const sim::msgs::Link &_linkMsg, VisualPtr _parent); protected: virtual VisualPtr Visual(bool _hasId, unsigned int _id, @@ -316,41 +316,41 @@ namespace ignition const std::string &_name); protected: virtual void ProcessGeometry( - const gazebo::msgs::Geometry &_geometryMsg, VisualPtr _parent); + const sim::msgs::Geometry &_geometryMsg, VisualPtr _parent); protected: virtual void ProcessBox( - const gazebo::msgs::Geometry &_geometryMsg, VisualPtr _parent); + const sim::msgs::Geometry &_geometryMsg, VisualPtr _parent); protected: virtual void ProcessCone( - const gazebo::msgs::Geometry &_geometryMsg, VisualPtr _parent); + const sim::msgs::Geometry &_geometryMsg, VisualPtr _parent); protected: virtual void ProcessCylinder( - const gazebo::msgs::Geometry &_geometryMsg, VisualPtr _parent); + const sim::msgs::Geometry &_geometryMsg, VisualPtr _parent); protected: virtual void ProcessEmpty( - const gazebo::msgs::Geometry &_geometryMsg, VisualPtr _parent); + const sim::msgs::Geometry &_geometryMsg, VisualPtr _parent); protected: virtual void ProcessMesh( - const gazebo::msgs::Geometry &_geometryMsg, VisualPtr _parent); + const sim::msgs::Geometry &_geometryMsg, VisualPtr _parent); protected: virtual void ProcessPlane( - const gazebo::msgs::Geometry &_geometryMsg, VisualPtr _parent); + const sim::msgs::Geometry &_geometryMsg, VisualPtr _parent); protected: virtual void ProcessSphere( - const gazebo::msgs::Geometry &_geometryMsg, VisualPtr _parent); + const sim::msgs::Geometry &_geometryMsg, VisualPtr _parent); protected: virtual MaterialPtr CreateMaterial( - const gazebo::msgs::Material &_materialMsg); + const sim::msgs::Material &_materialMsg); protected: virtual void ProcessPoses() = 0; - protected: virtual void ProcessPose(const gazebo::msgs::Pose &_poseMsg); + protected: virtual void ProcessPose(const sim::msgs::Pose &_poseMsg); protected: virtual void SetPose(NodePtr _node, - const gazebo::msgs::Pose &_poseMsg); + const sim::msgs::Pose &_poseMsg); protected: virtual void SetScale(VisualPtr _visual, - const gazebo::msgs::Vector3d &_scaleMsg); + const sim::msgs::Vector3d &_scaleMsg); protected: virtual void ProcessRemovals() = 0; @@ -359,19 +359,19 @@ namespace ignition protected: virtual VisualPtr Parent(const std::string &_name); protected: static math::Color Convert( - const gazebo::msgs::Color &_colorMsg); + const sim::msgs::Color &_colorMsg); protected: static math::Pose3d Convert( - const gazebo::msgs::Pose &_poseMsg); + const sim::msgs::Pose &_poseMsg); protected: static math::Vector3d Convert( - const gazebo::msgs::Vector3d &_vecMsg); + const sim::msgs::Vector3d &_vecMsg); protected: static math::Quaterniond Convert( - const gazebo::msgs::Quaternion &_quatMsg); + const sim::msgs::Quaternion &_quatMsg); protected: static ShaderType Convert( - gazebo::msgs::Material::ShaderType _type); + sim::msgs::Material::ShaderType _type); private: void CreateGeometryFunctionMap(); @@ -381,15 +381,15 @@ namespace ignition protected: common::Time timePosesReceived; - protected: std::vector lightMsgs; + protected: std::vector lightMsgs; - protected: std::vector modelMsgs; + protected: std::vector modelMsgs; - protected: std::vector jointMsgs; + protected: std::vector jointMsgs; - protected: std::vector visualMsgs; + protected: std::vector visualMsgs; - protected: std::vector sensorMsgs; + protected: std::vector sensorMsgs; protected: std::vector approvedRemovals; @@ -421,7 +421,7 @@ namespace ignition protected: virtual void ProcessRemovals(); - private: std::map poseMsgs; + private: std::map poseMsgs; }; class NewSceneManager : @@ -454,15 +454,15 @@ namespace ignition protected: virtual void ProcessPoses(); protected: virtual void ProcessPoses( - const gazebo::msgs::PosesStamped &_posesMsg); + const sim::msgs::PosesStamped &_posesMsg); protected: virtual void ProcessRemovals(); protected: bool sceneReceived; - protected: gazebo::msgs::Scene sceneMsg; + protected: sim::msgs::Scene sceneMsg; - private: std::vector posesMsgs; + private: std::vector posesMsgs; }; } } diff --git a/examples/hello_world_plugin/HelloWorldPlugin.cc b/examples/hello_world_plugin/HelloWorldPlugin.cc index 361b43e3f..16da69265 100644 --- a/examples/hello_world_plugin/HelloWorldPlugin.cc +++ b/examples/hello_world_plugin/HelloWorldPlugin.cc @@ -27,8 +27,8 @@ namespace mock { /// \brief The render engine class which implements a render engine. class HelloWorldRenderEngine : - public virtual ignition::rendering::BaseRenderEngine, - public ignition::common::SingletonT + public virtual gz::rendering::BaseRenderEngine, + public gz::common::SingletonT { // Documentation Inherited. public: virtual bool IsEnabled() const override @@ -59,7 +59,7 @@ namespace mock /// \brief Get a pointer to the list of scenes managed by the render /// engine. /// \return list of scenes - protected: virtual ignition::rendering::SceneStorePtr Scenes() + protected: virtual gz::rendering::SceneStorePtr Scenes() const override { return nullptr; @@ -68,7 +68,7 @@ namespace mock /// \brief Create a scene. /// \param[in] _id Unique scene Id /// \parampin] _name Name of scene - protected: virtual ignition::rendering::ScenePtr + protected: virtual gz::rendering::ScenePtr CreateSceneImpl(unsigned int _id, const std::string &_name) override { @@ -76,12 +76,12 @@ namespace mock } /// \brief Singelton setup. - private: friend class ignition::common::SingletonT; + private: friend class gz::common::SingletonT; }; /// \brief Plugin for loading the HelloWorld render engine. class HelloWorldPlugin : - public ignition::rendering::RenderEnginePlugin + public gz::rendering::RenderEnginePlugin { /// \brief Get the name of the render engine loaded by this plugin. /// \return Name of render engine @@ -92,7 +92,7 @@ namespace mock /// \brief Get a pointer to the render engine loaded by this plugin. /// \return Render engine instance - public: ignition::rendering::RenderEngine *Engine() const override + public: gz::rendering::RenderEngine *Engine() const override { return HelloWorldRenderEngine::Instance(); } @@ -101,4 +101,4 @@ namespace mock // Register this plugin IGNITION_ADD_PLUGIN(mock::HelloWorldPlugin, - ignition::rendering::RenderEnginePlugin) + gz::rendering::RenderEnginePlugin) diff --git a/examples/mesh_viewer/GlutWindow.cc b/examples/mesh_viewer/GlutWindow.cc index d6eccb28d..534c963ee 100644 --- a/examples/mesh_viewer/GlutWindow.cc +++ b/examples/mesh_viewer/GlutWindow.cc @@ -151,7 +151,7 @@ void handleMouse() 2.0 * g_mouse.x / static_cast(rayCamera->ImageWidth()) - 1.0; double ny = 1.0 - 2.0 * g_mouse.y / static_cast(rayCamera->ImageHeight()); - g_rayQuery->SetFromCamera(rayCamera, ignition::math::Vector2d(nx, ny)); + g_rayQuery->SetFromCamera(rayCamera, gz::math::Vector2d(nx, ny)); g_target = g_rayQuery->ClosestPoint(); if (!g_target) { @@ -181,7 +181,7 @@ void handleMouse() if (g_mouse.motionDirty) { g_mouse.motionDirty = false; - auto drag = ignition::math::Vector2d(g_mouse.dragX, g_mouse.dragY); + auto drag = gz::math::Vector2d(g_mouse.dragX, g_mouse.dragY); // left mouse button pan if (g_mouse.button == GLUT_LEFT_BUTTON && g_mouse.state == GLUT_DOWN) diff --git a/examples/mesh_viewer/GlutWindow.hh b/examples/mesh_viewer/GlutWindow.hh index 6f410018a..51846dcaa 100644 --- a/examples/mesh_viewer/GlutWindow.hh +++ b/examples/mesh_viewer/GlutWindow.hh @@ -14,13 +14,13 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_EXAMPLES_MESH_VIEWER_GLUTWINDOW_HH_ -#define IGNITION_RENDERING_EXAMPLES_MESH_VIEWER_GLUTWINDOW_HH_ +#ifndef GZ_RENDERING_EXAMPLES_MESH_VIEWER_GLUTWINDOW_HH_ +#define GZ_RENDERING_EXAMPLES_MESH_VIEWER_GLUTWINDOW_HH_ #include #include "ignition/rendering/RenderTypes.hh" -namespace ir = ignition::rendering; +namespace ir = gz::rendering; /// \brief Run the demo and render the scene from the cameras /// \param[in] _cameras Cameras in the scene diff --git a/examples/mesh_viewer/Main.cc b/examples/mesh_viewer/Main.cc index 6b96e1fb6..96d68adb2 100644 --- a/examples/mesh_viewer/Main.cc +++ b/examples/mesh_viewer/Main.cc @@ -34,7 +34,7 @@ #include "example_config.hh" #include "GlutWindow.hh" -using namespace ignition; +using namespace gz; using namespace rendering; const std::string RESOURCE_PATH = diff --git a/examples/mouse_picking/GlutWindow.cc b/examples/mouse_picking/GlutWindow.cc index 1cb83339e..e761943b4 100644 --- a/examples/mouse_picking/GlutWindow.cc +++ b/examples/mouse_picking/GlutWindow.cc @@ -118,7 +118,7 @@ void handleMouse() { // Get visual using Selection Buffer from Camera ir::VisualPtr visual1; - ignition::math::Vector2i mousePosI(g_mouse.x, g_mouse.y); + gz::math::Vector2i mousePosI(g_mouse.x, g_mouse.y); visual1 = rayCamera->VisualAt(mousePosI); if (visual1) { diff --git a/examples/mouse_picking/GlutWindow.hh b/examples/mouse_picking/GlutWindow.hh index e81c7d1b1..51ee13205 100644 --- a/examples/mouse_picking/GlutWindow.hh +++ b/examples/mouse_picking/GlutWindow.hh @@ -14,13 +14,13 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_EXAMPLES_MOUSE_PICKING_GLUTWINDOW_HH_ -#define IGNITION_RENDERING_EXAMPLES_MOUSE_PICKING_GLUTWINDOW_HH_ +#ifndef GZ_RENDERING_EXAMPLES_MOUSE_PICKING_GLUTWINDOW_HH_ +#define GZ_RENDERING_EXAMPLES_MOUSE_PICKING_GLUTWINDOW_HH_ #include #include "ignition/rendering/RenderTypes.hh" -namespace ir = ignition::rendering; +namespace ir = gz::rendering; void run(std::vector _cameras); diff --git a/examples/mouse_picking/Main.cc b/examples/mouse_picking/Main.cc index 5b9db3e5b..4eacdab1e 100644 --- a/examples/mouse_picking/Main.cc +++ b/examples/mouse_picking/Main.cc @@ -32,7 +32,7 @@ #include "GlutWindow.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/examples/ogre2_demo/GlutWindow.cc b/examples/ogre2_demo/GlutWindow.cc index cf40952bc..e4488dfab 100644 --- a/examples/ogre2_demo/GlutWindow.cc +++ b/examples/ogre2_demo/GlutWindow.cc @@ -154,7 +154,7 @@ void handleMouse() { // Get visual using Selection Buffer from Camera ir::VisualPtr visual; - ignition::math::Vector2i mousePos(g_mouse.x, g_mouse.y); + gz::math::Vector2i mousePos(g_mouse.x, g_mouse.y); visual = rayCamera->VisualAt(mousePos); if (visual) { @@ -174,7 +174,7 @@ void handleMouse() 2.0 * g_mouse.x / static_cast(rayCamera->ImageWidth()) - 1.0; double ny = 1.0 - 2.0 * g_mouse.y / static_cast(rayCamera->ImageHeight()); - g_rayQuery->SetFromCamera(rayCamera, ignition::math::Vector2d(nx, ny)); + g_rayQuery->SetFromCamera(rayCamera, gz::math::Vector2d(nx, ny)); g_target = g_rayQuery->ClosestPoint(); if (!g_target) { @@ -204,7 +204,7 @@ void handleMouse() if (g_mouse.motionDirty) { g_mouse.motionDirty = false; - auto drag = ignition::math::Vector2d(g_mouse.dragX, g_mouse.dragY); + auto drag = gz::math::Vector2d(g_mouse.dragX, g_mouse.dragY); // left mouse button pan if (g_mouse.button == GLUT_LEFT_BUTTON && g_mouse.state == GLUT_DOWN) @@ -281,8 +281,8 @@ void displayCB() glutSwapBuffers(); // Uncomment to print FPS - // static ignition::common::Time previous; - // auto now = ignition::common::Time::SystemTime(); + // static gz::common::Time previous; + // auto now = gz::common::Time::SystemTime(); // std::cerr << (now - previous).Double() << std::endl; // previous = now; } diff --git a/examples/ogre2_demo/GlutWindow.hh b/examples/ogre2_demo/GlutWindow.hh index 1942a287e..fc0095d9b 100644 --- a/examples/ogre2_demo/GlutWindow.hh +++ b/examples/ogre2_demo/GlutWindow.hh @@ -14,13 +14,13 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_EXAMPLES_OGRE2_DEMO_GLUTWINDOW_HH_ -#define IGNITION_RENDERING_EXAMPLES_OGRE2_DEMO_GLUTWINDOW_HH_ +#ifndef GZ_RENDERING_EXAMPLES_OGRE2_DEMO_GLUTWINDOW_HH_ +#define GZ_RENDERING_EXAMPLES_OGRE2_DEMO_GLUTWINDOW_HH_ #include #include "ignition/rendering/RenderTypes.hh" -namespace ir = ignition::rendering; +namespace ir = gz::rendering; /// \brief Run the demo and render the scene from the cameras /// \param[in] _cameras Cameras in the scene diff --git a/examples/ogre2_demo/Main.cc b/examples/ogre2_demo/Main.cc index f64cf63a9..ee5a25a8c 100644 --- a/examples/ogre2_demo/Main.cc +++ b/examples/ogre2_demo/Main.cc @@ -34,7 +34,7 @@ #include "example_config.hh" #include "GlutWindow.hh" -using namespace ignition; +using namespace gz; using namespace rendering; diff --git a/examples/render_pass/GlutWindow.hh b/examples/render_pass/GlutWindow.hh index b1610206c..7463724c9 100644 --- a/examples/render_pass/GlutWindow.hh +++ b/examples/render_pass/GlutWindow.hh @@ -14,13 +14,13 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_EXAMPLES_SIMPLE_DEMO_GLUTWINDOW_HH_ -#define IGNITION_RENDERING_EXAMPLES_SIMPLE_DEMO_GLUTWINDOW_HH_ +#ifndef GZ_RENDERING_EXAMPLES_SIMPLE_DEMO_GLUTWINDOW_HH_ +#define GZ_RENDERING_EXAMPLES_SIMPLE_DEMO_GLUTWINDOW_HH_ #include #include "ignition/rendering/RenderTypes.hh" -namespace ir = ignition::rendering; +namespace ir = gz::rendering; /// \brief Run the demo and render the scene from the cameras /// \param[in] _cameras Cameras in the scene diff --git a/examples/render_pass/Main.cc b/examples/render_pass/Main.cc index d12feab6d..d344451ef 100644 --- a/examples/render_pass/Main.cc +++ b/examples/render_pass/Main.cc @@ -32,7 +32,7 @@ #include "GlutWindow.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/examples/simple_demo/GlutWindow.hh b/examples/simple_demo/GlutWindow.hh index 9dc770201..9cd7b4758 100644 --- a/examples/simple_demo/GlutWindow.hh +++ b/examples/simple_demo/GlutWindow.hh @@ -14,13 +14,13 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_EXAMPLES_SIMPLE_DEMO_GLUTWINDOW_HH_ -#define IGNITION_RENDERING_EXAMPLES_SIMPLE_DEMO_GLUTWINDOW_HH_ +#ifndef GZ_RENDERING_EXAMPLES_SIMPLE_DEMO_GLUTWINDOW_HH_ +#define GZ_RENDERING_EXAMPLES_SIMPLE_DEMO_GLUTWINDOW_HH_ #include #include "ignition/rendering/RenderTypes.hh" -namespace ir = ignition::rendering; +namespace ir = gz::rendering; /// \brief Run the demo and render the scene from the cameras /// \param[in] _cameras Cameras in the scene diff --git a/examples/simple_demo/Main.cc b/examples/simple_demo/Main.cc index 09358186e..d9996ef01 100644 --- a/examples/simple_demo/Main.cc +++ b/examples/simple_demo/Main.cc @@ -32,7 +32,7 @@ #include "GlutWindow.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/examples/text_geom/GlutWindow.hh b/examples/text_geom/GlutWindow.hh index 070bdfdbd..a8598e5b8 100644 --- a/examples/text_geom/GlutWindow.hh +++ b/examples/text_geom/GlutWindow.hh @@ -14,13 +14,13 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_EXAMPLES_SIMPLE_DEMO_GLUTWINDOW_HH_ -#define IGNITION_RENDERING_EXAMPLES_SIMPLE_DEMO_GLUTWINDOW_HH_ +#ifndef GZ_RENDERING_EXAMPLES_SIMPLE_DEMO_GLUTWINDOW_HH_ +#define GZ_RENDERING_EXAMPLES_SIMPLE_DEMO_GLUTWINDOW_HH_ #include #include "ignition/rendering/RenderTypes.hh" -namespace ir = ignition::rendering; +namespace ir = gz::rendering; /// \brief Run the demo and render the scene from the cameras /// \param[in] _cameras Cameras in the scene diff --git a/examples/text_geom/Main.cc b/examples/text_geom/Main.cc index 9e07e3b70..68b572038 100644 --- a/examples/text_geom/Main.cc +++ b/examples/text_geom/Main.cc @@ -32,7 +32,7 @@ #include "GlutWindow.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/examples/thermal_camera/GlutWindow.cc b/examples/thermal_camera/GlutWindow.cc index cee056897..92333c441 100644 --- a/examples/thermal_camera/GlutWindow.cc +++ b/examples/thermal_camera/GlutWindow.cc @@ -50,7 +50,7 @@ std::vector g_cameras; ir::CameraPtr g_camera; unsigned int g_cameraIndex = 0; ir::ImagePtr g_image; -ignition::common::ConnectionPtr g_connection; +gz::common::ConnectionPtr g_connection; bool g_initContext = false; @@ -88,7 +88,7 @@ void OnNewThermalFrame(const uint16_t *_scan, // convert temperature to grayscale image double range = static_cast(max - min); - if (ignition::math::equal(range, 0.0)) + if (gz::math::equal(range, 0.0)) range = 1.0; unsigned char *data = g_image->Data(); for (unsigned int i = 0; i < _height; ++i) diff --git a/examples/thermal_camera/GlutWindow.hh b/examples/thermal_camera/GlutWindow.hh index ad5fb3bb1..cb173329e 100644 --- a/examples/thermal_camera/GlutWindow.hh +++ b/examples/thermal_camera/GlutWindow.hh @@ -14,13 +14,13 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_EXAMPLES_THERMAL_CAMERA_GLUTWINDOW_HH_ -#define IGNITION_RENDERING_EXAMPLES_THERMAL_CAMERA_GLUTWINDOW_HH_ +#ifndef GZ_RENDERING_EXAMPLES_THERMAL_CAMERA_GLUTWINDOW_HH_ +#define GZ_RENDERING_EXAMPLES_THERMAL_CAMERA_GLUTWINDOW_HH_ #include #include "ignition/rendering/RenderTypes.hh" -namespace ir = ignition::rendering; +namespace ir = gz::rendering; /// \brief Run the demo and render the scene from the cameras /// \param[in] _cameras Cameras in the scene diff --git a/examples/thermal_camera/Main.cc b/examples/thermal_camera/Main.cc index 064e81d9c..b6a63397c 100644 --- a/examples/thermal_camera/Main.cc +++ b/examples/thermal_camera/Main.cc @@ -34,7 +34,7 @@ #include "example_config.hh" #include "GlutWindow.hh" -using namespace ignition; +using namespace gz; using namespace rendering; const std::string RESOURCE_PATH = diff --git a/examples/transform_control/GlutWindow.cc b/examples/transform_control/GlutWindow.cc index 3331cf226..5b431b6cc 100644 --- a/examples/transform_control/GlutWindow.cc +++ b/examples/transform_control/GlutWindow.cc @@ -168,14 +168,14 @@ void handleTransform() if (g_mouse.state == GLUT_DOWN) { // get the visual at mouse position - ignition::math::Vector2i mousePos(g_mouse.x, g_mouse.y); + gz::math::Vector2i mousePos(g_mouse.x, g_mouse.y); ir::VisualPtr visual = rayCamera->VisualAt(mousePos); if (visual) { // check if the visual is an axis in the gizmo visual - ignition::math::Vector3d axis = + gz::math::Vector3d axis = g_transformControl.AxisById(visual->Id()); - if (axis != ignition::math::Vector3d::Zero) + if (axis != gz::math::Vector3d::Zero) { // start the transform process g_transformControl.SetActiveAxis(axis); @@ -207,23 +207,23 @@ void handleTransform() double ny = 1.0 - 2.0 * g_mouse.y / imageHeight; double nxEnd = 2.0 * g_mouse.motionX / imageWidth - 1.0; double nyEnd = 1.0 - 2.0 * g_mouse.motionY / imageHeight; - ignition::math::Vector2d start(nx, ny); - ignition::math::Vector2d end(nxEnd, nyEnd); + gz::math::Vector2d start(nx, ny); + gz::math::Vector2d end(nxEnd, nyEnd); // get the currect active axis - ignition::math::Vector3d axis = g_transformControl.ActiveAxis(); + gz::math::Vector3d axis = g_transformControl.ActiveAxis(); // compute 3d transformation from 2d mouse movement if (g_transformControl.Mode() == ir::TransformMode::TM_TRANSLATION) { - ignition::math::Vector3d distance = + gz::math::Vector3d distance = g_transformControl.TranslationFrom2d(axis, start, end); g_transformControl.Translate(distance); g_mouse.motionDirty = false; } else if (g_transformControl.Mode() == ir::TransformMode::TM_ROTATION) { - ignition::math::Quaterniond rotation = + gz::math::Quaterniond rotation = g_transformControl.RotationFrom2d(axis, start, end); g_transformControl.Rotate(rotation); g_mouse.motionDirty = false; @@ -231,7 +231,7 @@ void handleTransform() else if (g_transformControl.Mode() == ir::TransformMode::TM_SCALE) { // note: scaling is limited to local space - ignition::math::Vector3d scale = + gz::math::Vector3d scale = g_transformControl.ScaleFrom2d(axis, start, end); g_transformControl.Scale(scale); g_mouse.motionDirty = false; @@ -263,7 +263,7 @@ void handleMouse() 2.0 * g_mouse.x / static_cast(rayCamera->ImageWidth()) - 1.0; double ny = 1.0 - 2.0 * g_mouse.y / static_cast(rayCamera->ImageHeight()); - g_rayQuery->SetFromCamera(rayCamera, ignition::math::Vector2d(nx, ny)); + g_rayQuery->SetFromCamera(rayCamera, gz::math::Vector2d(nx, ny)); g_target = g_rayQuery->ClosestPoint(); if (!g_target) { @@ -293,7 +293,7 @@ void handleMouse() if (g_mouse.motionDirty) { g_mouse.motionDirty = false; - auto drag = ignition::math::Vector2d(g_mouse.dragX, g_mouse.dragY); + auto drag = gz::math::Vector2d(g_mouse.dragX, g_mouse.dragY); // left mouse button pan if (g_mouse.button == GLUT_LEFT_BUTTON && g_mouse.state == GLUT_DOWN) diff --git a/examples/transform_control/GlutWindow.hh b/examples/transform_control/GlutWindow.hh index b55523c6b..932463d4b 100644 --- a/examples/transform_control/GlutWindow.hh +++ b/examples/transform_control/GlutWindow.hh @@ -14,13 +14,13 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_EXAMPLES_TRANSFORMCONTROL_GLUTWINDOW_HH_ -#define IGNITION_RENDERING_EXAMPLES_TRANSFORMCONTROL_GLUTWINDOW_HH_ +#ifndef GZ_RENDERING_EXAMPLES_TRANSFORMCONTROL_GLUTWINDOW_HH_ +#define GZ_RENDERING_EXAMPLES_TRANSFORMCONTROL_GLUTWINDOW_HH_ #include #include "ignition/rendering/RenderTypes.hh" -namespace ir = ignition::rendering; +namespace ir = gz::rendering; /// \brief Run the demo and render the scene from the cameras /// \param[in] _cameras Cameras in the scene diff --git a/examples/transform_control/Main.cc b/examples/transform_control/Main.cc index 61b1a5634..3db1542fb 100644 --- a/examples/transform_control/Main.cc +++ b/examples/transform_control/Main.cc @@ -32,7 +32,7 @@ #include "GlutWindow.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/examples/view_control/GlutWindow.cc b/examples/view_control/GlutWindow.cc index c074783f6..ab03f03df 100644 --- a/examples/view_control/GlutWindow.cc +++ b/examples/view_control/GlutWindow.cc @@ -151,7 +151,7 @@ void handleMouse() 2.0 * g_mouse.x / static_cast(rayCamera->ImageWidth()) - 1.0; double ny = 1.0 - 2.0 * g_mouse.y / static_cast(rayCamera->ImageHeight()); - g_rayQuery->SetFromCamera(rayCamera, ignition::math::Vector2d(nx, ny)); + g_rayQuery->SetFromCamera(rayCamera, gz::math::Vector2d(nx, ny)); g_target = g_rayQuery->ClosestPoint(); if (!g_target) { @@ -181,7 +181,7 @@ void handleMouse() if (g_mouse.motionDirty) { g_mouse.motionDirty = false; - auto drag = ignition::math::Vector2d(g_mouse.dragX, g_mouse.dragY); + auto drag = gz::math::Vector2d(g_mouse.dragX, g_mouse.dragY); // left mouse button pan if (g_mouse.button == GLUT_LEFT_BUTTON && g_mouse.state == GLUT_DOWN) diff --git a/examples/view_control/GlutWindow.hh b/examples/view_control/GlutWindow.hh index 9bb9c368c..8798c0568 100644 --- a/examples/view_control/GlutWindow.hh +++ b/examples/view_control/GlutWindow.hh @@ -14,16 +14,16 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_EXAMPLES_VIEW_CONTROL_GLUTWINDOW_HH_ -#define IGNITION_RENDERING_EXAMPLES_VIEW_CONTROL_GLUTWINDOW_HH_ +#ifndef GZ_RENDERING_EXAMPLES_VIEW_CONTROL_GLUTWINDOW_HH_ +#define GZ_RENDERING_EXAMPLES_VIEW_CONTROL_GLUTWINDOW_HH_ #include #include "ignition/rendering/RenderTypes.hh" -namespace ir = ignition::rendering; +namespace ir = gz::rendering; /// \brief Run the demo and render the scene from the cameras /// \param[in] _cameras Cameras in the scene -void run(std::vector _cameras); +void run(std::vector _cameras); #endif diff --git a/examples/view_control/Main.cc b/examples/view_control/Main.cc index 8b87c373c..dc39bc0b6 100644 --- a/examples/view_control/Main.cc +++ b/examples/view_control/Main.cc @@ -31,7 +31,7 @@ #include #include "GlutWindow.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 25ec89762..4b2bdd7bb 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -1 +1,2 @@ -add_subdirectory(ignition) +add_subdirectory(gz) +install(DIRECTORY ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL}) diff --git a/include/gz/rendering/ArrowVisual.hh b/include/gz/rendering/ArrowVisual.hh index 1b38de0f4..b6ee07c1d 100644 --- a/include/gz/rendering/ArrowVisual.hh +++ b/include/gz/rendering/ArrowVisual.hh @@ -14,13 +14,13 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_ARROWVISUAL_HH_ -#define IGNITION_RENDERING_ARROWVISUAL_HH_ +#ifndef GZ_RENDERING_ARROWVISUAL_HH_ +#define GZ_RENDERING_ARROWVISUAL_HH_ #include "ignition/rendering/config.hh" #include "ignition/rendering/CompositeVisual.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/AxisVisual.hh b/include/gz/rendering/AxisVisual.hh index 52595e4aa..1626c3879 100644 --- a/include/gz/rendering/AxisVisual.hh +++ b/include/gz/rendering/AxisVisual.hh @@ -14,13 +14,13 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_AXISVISUAL_HH_ -#define IGNITION_RENDERING_AXISVISUAL_HH_ +#ifndef GZ_RENDERING_AXISVISUAL_HH_ +#define GZ_RENDERING_AXISVISUAL_HH_ #include "ignition/rendering/config.hh" #include "ignition/rendering/CompositeVisual.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/Camera.hh b/include/gz/rendering/Camera.hh index a34cd28d1..876a66307 100644 --- a/include/gz/rendering/Camera.hh +++ b/include/gz/rendering/Camera.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_CAMERA_HH_ -#define IGNITION_RENDERING_CAMERA_HH_ +#ifndef GZ_RENDERING_CAMERA_HH_ +#define GZ_RENDERING_CAMERA_HH_ #include @@ -29,7 +29,7 @@ #include "ignition/rendering/Scene.hh" -namespace ignition +namespace gz { namespace rendering { @@ -137,7 +137,7 @@ namespace ignition /// \brief Get the visual for a given mouse position /// param[in] _mousePos mouse position // \return visual for that position, null if no visual was found - public: virtual VisualPtr VisualAt(const ignition::math::Vector2i + public: virtual VisualPtr VisualAt(const gz::math::Vector2i &_mousePos) = 0; /// \brief Renders a new frame. diff --git a/include/gz/rendering/CompositeVisual.hh b/include/gz/rendering/CompositeVisual.hh index ff7f1fbc1..78db8d54c 100644 --- a/include/gz/rendering/CompositeVisual.hh +++ b/include/gz/rendering/CompositeVisual.hh @@ -14,13 +14,13 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_COMPOSITEVISUAL_HH_ -#define IGNITION_RENDERING_COMPOSITEVISUAL_HH_ +#ifndef GZ_RENDERING_COMPOSITEVISUAL_HH_ +#define GZ_RENDERING_COMPOSITEVISUAL_HH_ #include "ignition/rendering/config.hh" #include "ignition/rendering/Visual.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/DepthCamera.hh b/include/gz/rendering/DepthCamera.hh index a70795458..2c14851b9 100644 --- a/include/gz/rendering/DepthCamera.hh +++ b/include/gz/rendering/DepthCamera.hh @@ -14,15 +14,15 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_DEPTHCAMERA_HH_ -#define IGNITION_RENDERING_DEPTHCAMERA_HH_ +#ifndef GZ_RENDERING_DEPTHCAMERA_HH_ +#define GZ_RENDERING_DEPTHCAMERA_HH_ #include #include #include "ignition/rendering/Camera.hh" -namespace ignition +namespace gz { namespace rendering { @@ -51,7 +51,7 @@ namespace ignition /// \brief Connect to the new depth image signal /// \param[in] _subscriber Subscriber callback function /// \return Pointer to the new Connection. This must be kept in scope - public: virtual ignition::common::ConnectionPtr ConnectNewDepthFrame( + public: virtual gz::common::ConnectionPtr ConnectNewDepthFrame( std::function _subscriber) = 0; @@ -71,7 +71,7 @@ namespace ignition /// _depth Point cloud image depth /// _format Point cloud image format /// \return Pointer to the new Connection. This must be kept in scope - public: virtual ignition::common::ConnectionPtr ConnectNewRgbPointCloud( + public: virtual gz::common::ConnectionPtr ConnectNewRgbPointCloud( std::function _subscriber) = 0; diff --git a/include/gz/rendering/GaussianNoisePass.hh b/include/gz/rendering/GaussianNoisePass.hh index efb3cc7f8..7e8f54944 100644 --- a/include/gz/rendering/GaussianNoisePass.hh +++ b/include/gz/rendering/GaussianNoisePass.hh @@ -14,15 +14,15 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_GAUSSIANNOISEPASS_HH_ -#define IGNITION_RENDERING_GAUSSIANNOISEPASS_HH_ +#ifndef GZ_RENDERING_GAUSSIANNOISEPASS_HH_ +#define GZ_RENDERING_GAUSSIANNOISEPASS_HH_ #include #include "ignition/rendering/config.hh" #include "ignition/rendering/Export.hh" #include "ignition/rendering/RenderPass.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/Geometry.hh b/include/gz/rendering/Geometry.hh index 02037ebd7..bc92fbbd3 100644 --- a/include/gz/rendering/Geometry.hh +++ b/include/gz/rendering/Geometry.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_GEOMETRY_HH_ -#define IGNITION_RENDERING_GEOMETRY_HH_ +#ifndef GZ_RENDERING_GEOMETRY_HH_ +#define GZ_RENDERING_GEOMETRY_HH_ #include #include "ignition/rendering/config.hh" @@ -23,7 +23,7 @@ #include "ignition/rendering/Object.hh" #include "ignition/rendering/Export.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/GizmoVisual.hh b/include/gz/rendering/GizmoVisual.hh index ed50a664f..c401241ee 100644 --- a/include/gz/rendering/GizmoVisual.hh +++ b/include/gz/rendering/GizmoVisual.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_GIZMOVISUAL_HH_ -#define IGNITION_RENDERING_GIZMOVISUAL_HH_ +#ifndef GZ_RENDERING_GIZMOVISUAL_HH_ +#define GZ_RENDERING_GIZMOVISUAL_HH_ #include "ignition/rendering/config.hh" #include "ignition/rendering/CompositeVisual.hh" @@ -23,7 +23,7 @@ #include "ignition/rendering/Export.hh" #include "ignition/rendering/TransformType.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/GpuRays.hh b/include/gz/rendering/GpuRays.hh index 0d0e8f6dd..546cdf528 100644 --- a/include/gz/rendering/GpuRays.hh +++ b/include/gz/rendering/GpuRays.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_GPURAYS_HH_ -#define IGNITION_RENDERING_GPURAYS_HH_ +#ifndef GZ_RENDERING_GPURAYS_HH_ +#define GZ_RENDERING_GPURAYS_HH_ #include @@ -26,7 +26,7 @@ #include "ignition/rendering/Scene.hh" #include "ignition/rendering/Camera.hh" -namespace ignition +namespace gz { namespace rendering { @@ -106,14 +106,14 @@ namespace ignition /// \brief Get minimal horizontal angle value // \return minimal horizontal angle value - public: virtual ignition::math::Angle AngleMin() const = 0; + public: virtual gz::math::Angle AngleMin() const = 0; /// \brief Set minimal horizontal angle value public: virtual void SetAngleMin(double _angle) = 0; /// \brief Get maximal horizontal angle value // \return maximal horizontal angle value - public: virtual ignition::math::Angle AngleMax() const = 0; + public: virtual gz::math::Angle AngleMax() const = 0; /// \brief Set maximal horizontal angle value public: virtual void SetAngleMax(double _angle) = 0; @@ -142,14 +142,14 @@ namespace ignition /// \brief Get minimal vertical angle value // \return minimal vertical angle value - public: virtual ignition::math::Angle VerticalAngleMin() const = 0; + public: virtual gz::math::Angle VerticalAngleMin() const = 0; /// \brief Set minimal vertical angle value public: virtual void SetVerticalAngleMin(const double _angle) = 0; /// \brief Get maximal vertical angle value // \return maximal vertical angle value - public: virtual ignition::math::Angle VerticalAngleMax() const = 0; + public: virtual gz::math::Angle VerticalAngleMax() const = 0; /// \brief Set maximal vertical angle value // \return minimal vertical angle value diff --git a/include/gz/rendering/Grid.hh b/include/gz/rendering/Grid.hh index e4f95969d..fa8177961 100644 --- a/include/gz/rendering/Grid.hh +++ b/include/gz/rendering/Grid.hh @@ -14,15 +14,15 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_GRID_HH_ -#define IGNITION_RENDERING_GRID_HH_ +#ifndef GZ_RENDERING_GRID_HH_ +#define GZ_RENDERING_GRID_HH_ #include #include "ignition/rendering/config.hh" #include "ignition/rendering/Geometry.hh" #include "ignition/rendering/Object.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/Image.hh b/include/gz/rendering/Image.hh index 27c85e732..26c3ffe71 100644 --- a/include/gz/rendering/Image.hh +++ b/include/gz/rendering/Image.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_IMAGE_HH_ -#define IGNITION_RENDERING_IMAGE_HH_ +#ifndef GZ_RENDERING_IMAGE_HH_ +#define GZ_RENDERING_IMAGE_HH_ #include @@ -25,7 +25,7 @@ #include "ignition/rendering/PixelFormat.hh" #include "ignition/rendering/Export.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/Light.hh b/include/gz/rendering/Light.hh index 1cd0b943e..7864ec850 100644 --- a/include/gz/rendering/Light.hh +++ b/include/gz/rendering/Light.hh @@ -14,14 +14,14 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_LIGHT_HH_ -#define IGNITION_RENDERING_LIGHT_HH_ +#ifndef GZ_RENDERING_LIGHT_HH_ +#define GZ_RENDERING_LIGHT_HH_ #include "ignition/math/Color.hh" #include "ignition/rendering/config.hh" #include "ignition/rendering/Node.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/Marker.hh b/include/gz/rendering/Marker.hh index ae42e3939..46275698d 100644 --- a/include/gz/rendering/Marker.hh +++ b/include/gz/rendering/Marker.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_MARKER_HH_ -#define IGNITION_RENDERING_MARKER_HH_ +#ifndef GZ_RENDERING_MARKER_HH_ +#define GZ_RENDERING_MARKER_HH_ #include #include @@ -25,7 +25,7 @@ #include "ignition/rendering/Object.hh" #include "ignition/rendering/RenderTypes.hh" -namespace ignition +namespace gz { namespace rendering { @@ -99,11 +99,11 @@ namespace ignition /// \brief Set the render type of this Marker /// \param[in] _markerType The desired render type public: virtual void SetType( - const ignition::rendering::MarkerType _markerType) = 0; + const gz::rendering::MarkerType _markerType) = 0; /// \brief Get the render type of this Marker /// \return The render type of the marker - public: virtual ignition::rendering::MarkerType Type() const = 0; + public: virtual gz::rendering::MarkerType Type() const = 0; /// \brief Clear the points of the marker, if applicable public: virtual void ClearPoints() = 0; @@ -115,19 +115,19 @@ namespace ignition /// \param[in] _color The color the point is set to public: virtual void AddPoint(double _x, double _y, double _z, - const ignition::math::Color &_color) = 0; + const gz::math::Color &_color) = 0; /// \brief Add a point with its respective color to the marker /// \param[in] _pt A vector containing the position of the point /// \param[in] _color The color the point is set to - public: virtual void AddPoint(const ignition::math::Vector3d &_pt, - const ignition::math::Color &_color) = 0; + public: virtual void AddPoint(const gz::math::Vector3d &_pt, + const gz::math::Color &_color) = 0; /// \brief Set an existing point's vector /// \param[in] _index The index of the point /// \param[in] _value The new positional vector of the point public: virtual void SetPoint(unsigned int _index, - const ignition::math::Vector3d &_value) = 0; + const gz::math::Vector3d &_value) = 0; }; } } diff --git a/include/gz/rendering/Material.hh b/include/gz/rendering/Material.hh index 114dc6a08..8d9ebec6e 100644 --- a/include/gz/rendering/Material.hh +++ b/include/gz/rendering/Material.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_MATERIAL_HH_ -#define IGNITION_RENDERING_MATERIAL_HH_ +#ifndef GZ_RENDERING_MATERIAL_HH_ +#define GZ_RENDERING_MATERIAL_HH_ #include #include @@ -26,7 +26,7 @@ #include "ignition/rendering/ShaderType.hh" #include "ignition/rendering/Export.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/Mesh.hh b/include/gz/rendering/Mesh.hh index 59c194b93..d5e5cf054 100644 --- a/include/gz/rendering/Mesh.hh +++ b/include/gz/rendering/Mesh.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_MESH_HH_ -#define IGNITION_RENDERING_MESH_HH_ +#ifndef GZ_RENDERING_MESH_HH_ +#define GZ_RENDERING_MESH_HH_ #include #include @@ -24,7 +24,7 @@ #include "ignition/rendering/Geometry.hh" #include "ignition/rendering/Object.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/MeshDescriptor.hh b/include/gz/rendering/MeshDescriptor.hh index e7b9f9831..cbdfec95b 100644 --- a/include/gz/rendering/MeshDescriptor.hh +++ b/include/gz/rendering/MeshDescriptor.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_MESHDESCRIPTOR_HH_ -#define IGNITION_RENDERING_MESHDESCRIPTOR_HH_ +#ifndef GZ_RENDERING_MESHDESCRIPTOR_HH_ +#define GZ_RENDERING_MESHDESCRIPTOR_HH_ #include @@ -24,7 +24,7 @@ #include "ignition/rendering/config.hh" #include "ignition/rendering/Export.hh" -namespace ignition +namespace gz { namespace common { @@ -32,7 +32,7 @@ namespace ignition } } -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/MoveToHelper.hh b/include/gz/rendering/MoveToHelper.hh index d14f9da1a..59254fead 100644 --- a/include/gz/rendering/MoveToHelper.hh +++ b/include/gz/rendering/MoveToHelper.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_MOVETOHELPER_HH_ -#define IGNITION_RENDERING_MOVETOHELPER_HH_ +#ifndef GZ_RENDERING_MOVETOHELPER_HH_ +#define GZ_RENDERING_MOVETOHELPER_HH_ #include @@ -27,7 +27,7 @@ #include "ignition/rendering/Camera.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/Node.hh b/include/gz/rendering/Node.hh index 4ec5da2e1..fdadb96f1 100644 --- a/include/gz/rendering/Node.hh +++ b/include/gz/rendering/Node.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_NODE_HH_ -#define IGNITION_RENDERING_NODE_HH_ +#ifndef GZ_RENDERING_NODE_HH_ +#define GZ_RENDERING_NODE_HH_ #include #include @@ -26,7 +26,7 @@ #include "ignition/rendering/Object.hh" #include "ignition/rendering/Export.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/Object.hh b/include/gz/rendering/Object.hh index 45ce3e894..5a6c1753b 100644 --- a/include/gz/rendering/Object.hh +++ b/include/gz/rendering/Object.hh @@ -14,15 +14,15 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OBJECT_HH_ -#define IGNITION_RENDERING_OBJECT_HH_ +#ifndef GZ_RENDERING_OBJECT_HH_ +#define GZ_RENDERING_OBJECT_HH_ #include #include "ignition/rendering/config.hh" #include "ignition/rendering/RenderTypes.hh" #include "ignition/rendering/Export.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/OrbitViewController.hh b/include/gz/rendering/OrbitViewController.hh index e1443405e..1a9ac34b3 100644 --- a/include/gz/rendering/OrbitViewController.hh +++ b/include/gz/rendering/OrbitViewController.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_ORBITVIEWCONTROLLER_HH_ -#define IGNITION_RENDERING_ORBITVIEWCONTROLLER_HH_ +#ifndef GZ_RENDERING_ORBITVIEWCONTROLLER_HH_ +#define GZ_RENDERING_ORBITVIEWCONTROLLER_HH_ #include @@ -27,7 +27,7 @@ #include "ignition/rendering/Camera.hh" #include "ignition/rendering/ViewController.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/PixelFormat.hh b/include/gz/rendering/PixelFormat.hh index cf0832092..5bde4d9fd 100644 --- a/include/gz/rendering/PixelFormat.hh +++ b/include/gz/rendering/PixelFormat.hh @@ -14,14 +14,14 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_PIXELFORMAT_HH_ -#define IGNITION_RENDERING_PIXELFORMAT_HH_ +#ifndef GZ_RENDERING_PIXELFORMAT_HH_ +#define GZ_RENDERING_PIXELFORMAT_HH_ #include #include "ignition/rendering/config.hh" #include "ignition/rendering/Export.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/RayQuery.hh b/include/gz/rendering/RayQuery.hh index b1402075e..8fc96172c 100644 --- a/include/gz/rendering/RayQuery.hh +++ b/include/gz/rendering/RayQuery.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_RAYQUERY_HH_ -#define IGNITION_RENDERING_RAYQUERY_HH_ +#ifndef GZ_RENDERING_RAYQUERY_HH_ +#define GZ_RENDERING_RAYQUERY_HH_ #include #include @@ -25,7 +25,7 @@ #include "ignition/rendering/Scene.hh" #include "ignition/rendering/Visual.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/RenderEngine.hh b/include/gz/rendering/RenderEngine.hh index a40dc44e6..8832197f2 100644 --- a/include/gz/rendering/RenderEngine.hh +++ b/include/gz/rendering/RenderEngine.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_RENDERENGINE_HH_ -#define IGNITION_RENDERING_RENDERENGINE_HH_ +#ifndef GZ_RENDERING_RENDERENGINE_HH_ +#define GZ_RENDERING_RENDERENGINE_HH_ #include #include @@ -23,7 +23,7 @@ #include "ignition/rendering/RenderTypes.hh" #include "ignition/rendering/Export.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/RenderEngineManager.hh b/include/gz/rendering/RenderEngineManager.hh index d0d797b20..aecd08441 100644 --- a/include/gz/rendering/RenderEngineManager.hh +++ b/include/gz/rendering/RenderEngineManager.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_RENDERENGINEMANAGER_HH_ -#define IGNITION_RENDERING_RENDERENGINEMANAGER_HH_ +#ifndef GZ_RENDERING_RENDERENGINEMANAGER_HH_ +#define GZ_RENDERING_RENDERENGINEMANAGER_HH_ #include #include @@ -27,7 +27,7 @@ #include "ignition/rendering/config.hh" #include "ignition/rendering/Export.hh" -namespace ignition +namespace gz { namespace rendering { @@ -141,7 +141,7 @@ namespace ignition IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING /// \brief required SingletonT friendship - private: friend class ignition::common::SingletonT; + private: friend class gz::common::SingletonT; }; } } diff --git a/include/gz/rendering/RenderEnginePlugin.hh b/include/gz/rendering/RenderEnginePlugin.hh index c64c9558f..bc3a76e86 100644 --- a/include/gz/rendering/RenderEnginePlugin.hh +++ b/include/gz/rendering/RenderEnginePlugin.hh @@ -15,8 +15,8 @@ * */ -#ifndef IGNITION_RENDERING_RENDERENGINEPLUGIN_HH_ -#define IGNITION_RENDERING_RENDERENGINEPLUGIN_HH_ +#ifndef GZ_RENDERING_RENDERENGINEPLUGIN_HH_ +#define GZ_RENDERING_RENDERENGINEPLUGIN_HH_ #include #include @@ -26,7 +26,7 @@ #include "ignition/rendering/config.hh" #include "ignition/rendering/Export.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/RenderPass.hh b/include/gz/rendering/RenderPass.hh index 6d9b611f4..7b71c2146 100644 --- a/include/gz/rendering/RenderPass.hh +++ b/include/gz/rendering/RenderPass.hh @@ -14,14 +14,14 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_RENDERPASS_HH_ -#define IGNITION_RENDERING_RENDERPASS_HH_ +#ifndef GZ_RENDERING_RENDERPASS_HH_ +#define GZ_RENDERING_RENDERPASS_HH_ #include "ignition/rendering/config.hh" #include "ignition/rendering/Object.hh" #include "ignition/rendering/Export.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/RenderPassSystem.hh b/include/gz/rendering/RenderPassSystem.hh index 3bcb5466c..b7c157604 100644 --- a/include/gz/rendering/RenderPassSystem.hh +++ b/include/gz/rendering/RenderPassSystem.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_RENDERPASSSYSTEM_HH_ -#define IGNITION_RENDERING_RENDERPASSSYSTEM_HH_ +#ifndef GZ_RENDERING_RENDERPASSSYSTEM_HH_ +#define GZ_RENDERING_RENDERPASSSYSTEM_HH_ #include #include @@ -29,7 +29,7 @@ #include "ignition/rendering/RenderPass.hh" #include "ignition/rendering/RenderTypes.hh" -namespace ignition +namespace gz { namespace rendering { @@ -93,11 +93,11 @@ namespace ignition /// /// Use this macro to register render pass with the render pass factory. #define IGN_RENDERING_REGISTER_RENDER_PASS(classname, interface) \ - class classname##Factory : public ignition::rendering::RenderPassFactory \ + class classname##Factory : public gz::rendering::RenderPassFactory \ { \ public: classname##Factory() \ { \ - ignition::rendering::RenderPassSystem::Register( \ + gz::rendering::RenderPassSystem::Register( \ typeid(interface).name(), this); \ } \ public: RenderPass *New() const override \ diff --git a/include/gz/rendering/RenderTarget.hh b/include/gz/rendering/RenderTarget.hh index 271e0b406..4d52c6aa9 100644 --- a/include/gz/rendering/RenderTarget.hh +++ b/include/gz/rendering/RenderTarget.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_RENDERTARGET_HH_ -#define IGNITION_RENDERING_RENDERTARGET_HH_ +#ifndef GZ_RENDERING_RENDERTARGET_HH_ +#define GZ_RENDERING_RENDERTARGET_HH_ #include @@ -26,7 +26,7 @@ #include "ignition/rendering/Image.hh" #include "ignition/rendering/Object.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/RenderTypes.hh b/include/gz/rendering/RenderTypes.hh index 44c106181..65523a7e3 100644 --- a/include/gz/rendering/RenderTypes.hh +++ b/include/gz/rendering/RenderTypes.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_RENDERTYPES_HH_ -#define IGNITION_RENDERING_RENDERTYPES_HH_ +#ifndef GZ_RENDERING_RENDERTYPES_HH_ +#define GZ_RENDERING_RENDERTYPES_HH_ #include #include @@ -37,7 +37,7 @@ /// \brief Render visuals that are selectable mask. #define IGN_VISIBILITY_SELECTABLE 0x00000002 -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/RenderingIface.hh b/include/gz/rendering/RenderingIface.hh index b48fae4d9..c42219d11 100644 --- a/include/gz/rendering/RenderingIface.hh +++ b/include/gz/rendering/RenderingIface.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_RENDERINGIFACE_HH_ -#define IGNITION_RENDERING_RENDERINGIFACE_HH_ +#ifndef GZ_RENDERING_RENDERINGIFACE_HH_ +#define GZ_RENDERING_RENDERINGIFACE_HH_ #include #include @@ -26,7 +26,7 @@ #include "ignition/rendering/Export.hh" #include "ignition/rendering/RenderTypes.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/Scene.hh b/include/gz/rendering/Scene.hh index bbe71a31f..3aeb44cfe 100644 --- a/include/gz/rendering/Scene.hh +++ b/include/gz/rendering/Scene.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_SCENE_HH_ -#define IGNITION_RENDERING_SCENE_HH_ +#ifndef GZ_RENDERING_SCENE_HH_ +#define GZ_RENDERING_SCENE_HH_ #include #include @@ -33,7 +33,7 @@ #include "ignition/rendering/Storage.hh" #include "ignition/rendering/Export.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/Sensor.hh b/include/gz/rendering/Sensor.hh index 373b2c9bf..f985a89a2 100644 --- a/include/gz/rendering/Sensor.hh +++ b/include/gz/rendering/Sensor.hh @@ -14,13 +14,13 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_SENSOR_HH_ -#define IGNITION_RENDERING_SENSOR_HH_ +#ifndef GZ_RENDERING_SENSOR_HH_ +#define GZ_RENDERING_SENSOR_HH_ #include "ignition/rendering/config.hh" #include "ignition/rendering/Node.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/ShaderParam.hh b/include/gz/rendering/ShaderParam.hh index eb9abb0c2..658e0eb77 100644 --- a/include/gz/rendering/ShaderParam.hh +++ b/include/gz/rendering/ShaderParam.hh @@ -15,8 +15,8 @@ * */ -#ifndef IGNITION_RENDERING_SHADERPARAM_HH_ -#define IGNITION_RENDERING_SHADERPARAM_HH_ +#ifndef GZ_RENDERING_SHADERPARAM_HH_ +#define GZ_RENDERING_SHADERPARAM_HH_ #include #include @@ -26,7 +26,7 @@ #include "ignition/rendering/config.hh" #include "ignition/rendering/Export.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/ShaderParams.hh b/include/gz/rendering/ShaderParams.hh index adc4a17f5..9b9ad9bc8 100644 --- a/include/gz/rendering/ShaderParams.hh +++ b/include/gz/rendering/ShaderParams.hh @@ -15,8 +15,8 @@ * */ -#ifndef IGNITION_RENDERING_SHADERPARAMS_HH_ -#define IGNITION_RENDERING_SHADERPARAMS_HH_ +#ifndef GZ_RENDERING_SHADERPARAMS_HH_ +#define GZ_RENDERING_SHADERPARAMS_HH_ #include #include @@ -25,7 +25,7 @@ #include "ignition/rendering/Export.hh" #include "ignition/rendering/ShaderParam.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/ShaderType.hh b/include/gz/rendering/ShaderType.hh index a0e55e509..82c595cbb 100644 --- a/include/gz/rendering/ShaderType.hh +++ b/include/gz/rendering/ShaderType.hh @@ -14,14 +14,14 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_SHADERTYPE_HH_ -#define IGNITION_RENDERING_SHADERTYPE_HH_ +#ifndef GZ_RENDERING_SHADERTYPE_HH_ +#define GZ_RENDERING_SHADERTYPE_HH_ #include #include "ignition/rendering/config.hh" #include "ignition/rendering/Export.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/Storage.hh b/include/gz/rendering/Storage.hh index 653269932..31cdb5bc9 100644 --- a/include/gz/rendering/Storage.hh +++ b/include/gz/rendering/Storage.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_STORAGE_HH_ -#define IGNITION_RENDERING_STORAGE_HH_ +#ifndef GZ_RENDERING_STORAGE_HH_ +#define GZ_RENDERING_STORAGE_HH_ #include #include @@ -36,7 +36,7 @@ #undef DestroyAll #endif -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/Text.hh b/include/gz/rendering/Text.hh index bcd7d91e2..cf6c468a4 100644 --- a/include/gz/rendering/Text.hh +++ b/include/gz/rendering/Text.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_TEXT_HH_ -#define IGNITION_RENDERING_TEXT_HH_ +#ifndef GZ_RENDERING_TEXT_HH_ +#define GZ_RENDERING_TEXT_HH_ #include @@ -26,7 +26,7 @@ #include "ignition/rendering/Geometry.hh" #include "ignition/rendering/Object.hh" -namespace ignition +namespace gz { namespace rendering { @@ -91,12 +91,12 @@ namespace ignition /// \brief Set the text color. /// \param[in] _color Text color. /// \sa Color() - public: virtual void SetColor(const ignition::math::Color &_color) = 0; + public: virtual void SetColor(const gz::math::Color &_color) = 0; /// \brief Get the text color. /// \return Text color. /// \sa SetColor() - public: virtual ignition::math::Color Color() const = 0; + public: virtual gz::math::Color Color() const = 0; /// \brief Set the height of the character in meters. /// \param[in] _height Height of the characters. @@ -155,7 +155,7 @@ namespace ignition /// \brief Get the axis aligned bounding box of the text. /// \return The axis aligned bounding box. - public: virtual ignition::math::AxisAlignedBox AABB() const = 0; + public: virtual gz::math::AxisAlignedBox AABB() const = 0; }; } } diff --git a/include/gz/rendering/ThermalCamera.hh b/include/gz/rendering/ThermalCamera.hh index 643fed05a..b058de3bb 100644 --- a/include/gz/rendering/ThermalCamera.hh +++ b/include/gz/rendering/ThermalCamera.hh @@ -14,13 +14,13 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_THERMALCAMERA_HH_ -#define IGNITION_RENDERING_THERMALCAMERA_HH_ +#ifndef GZ_RENDERING_THERMALCAMERA_HH_ +#define GZ_RENDERING_THERMALCAMERA_HH_ #include #include "ignition/rendering/Camera.hh" -namespace ignition +namespace gz { namespace rendering { @@ -115,7 +115,7 @@ namespace ignition /// \param[in] _subscriber Subscriber callback function. The callback /// function arguments are: /// \return Pointer to the new Connection. This must be kept in scope - public: virtual ignition::common::ConnectionPtr ConnectNewThermalFrame( + public: virtual gz::common::ConnectionPtr ConnectNewThermalFrame( std::function _subscriber) = 0; }; diff --git a/include/gz/rendering/TransformController.hh b/include/gz/rendering/TransformController.hh index 8f0be4f8c..93ce9ba19 100644 --- a/include/gz/rendering/TransformController.hh +++ b/include/gz/rendering/TransformController.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_TRANSFORMCONTROLLER_HH_ -#define IGNITION_RENDERING_TRANSFORMCONTROLLER_HH_ +#ifndef GZ_RENDERING_TRANSFORMCONTROLLER_HH_ +#define GZ_RENDERING_TRANSFORMCONTROLLER_HH_ #include @@ -30,7 +30,7 @@ #include "ignition/rendering/GizmoVisual.hh" #include "ignition/rendering/TransformType.hh" -namespace ignition +namespace gz { namespace rendering { @@ -134,8 +134,8 @@ namespace ignition /// \param[in] _sensitivity Sensitivity of point snapping, in terms of a /// percentage of the interval. /// \return Snapped 3D point. - public: static ignition::math::Vector3d SnapPoint( - const ignition::math::Vector3d &_point, const double _interval = 1.0, + public: static gz::math::Vector3d SnapPoint( + const gz::math::Vector3d &_point, const double _interval = 1.0, const double _sensitivity = 0.4); /// \brief Start the transform process. To be used with helper functions diff --git a/include/gz/rendering/TransformType.hh b/include/gz/rendering/TransformType.hh index faf1f66d5..d25dbf76f 100644 --- a/include/gz/rendering/TransformType.hh +++ b/include/gz/rendering/TransformType.hh @@ -15,15 +15,15 @@ * */ -#ifndef IGNITION_RENDERING_TRANSFORMTYPE_HH_ -#define IGNITION_RENDERING_TRANSFORMTYPE_HH_ +#ifndef GZ_RENDERING_TRANSFORMTYPE_HH_ +#define GZ_RENDERING_TRANSFORMTYPE_HH_ #include #include "ignition/rendering/config.hh" #include "ignition/rendering/Export.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/Utils.hh b/include/gz/rendering/Utils.hh index 5f87a3ea5..ec1439370 100644 --- a/include/gz/rendering/Utils.hh +++ b/include/gz/rendering/Utils.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_UTILS_HH_ -#define IGNITION_RENDERING_UTILS_HH_ +#ifndef GZ_RENDERING_UTILS_HH_ +#define GZ_RENDERING_UTILS_HH_ #include #include @@ -27,7 +27,7 @@ #include "ignition/rendering/RayQuery.hh" -namespace ignition +namespace gz { /// \brief Rendering classes and function useful in robot applications. namespace rendering diff --git a/include/gz/rendering/ViewController.hh b/include/gz/rendering/ViewController.hh index d0b7e5161..fe4dff405 100644 --- a/include/gz/rendering/ViewController.hh +++ b/include/gz/rendering/ViewController.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_VIEWCONTROLLER_HH_ -#define IGNITION_RENDERING_VIEWCONTROLLER_HH_ +#ifndef GZ_RENDERING_VIEWCONTROLLER_HH_ +#define GZ_RENDERING_VIEWCONTROLLER_HH_ #include #include @@ -23,7 +23,7 @@ #include "ignition/rendering/config.hh" #include "ignition/rendering/Camera.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/Visual.hh b/include/gz/rendering/Visual.hh index 12838afa4..45f3f9c32 100644 --- a/include/gz/rendering/Visual.hh +++ b/include/gz/rendering/Visual.hh @@ -14,15 +14,15 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_VISUAL_HH_ -#define IGNITION_RENDERING_VISUAL_HH_ +#ifndef GZ_RENDERING_VISUAL_HH_ +#define GZ_RENDERING_VISUAL_HH_ #include #include #include "ignition/rendering/config.hh" #include "ignition/rendering/Node.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/base/BaseArrowVisual.hh b/include/gz/rendering/base/BaseArrowVisual.hh index dd198804c..104d1d0e6 100644 --- a/include/gz/rendering/base/BaseArrowVisual.hh +++ b/include/gz/rendering/base/BaseArrowVisual.hh @@ -14,13 +14,13 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_BASE_BASEARROWVISUAL_HH_ -#define IGNITION_RENDERING_BASE_BASEARROWVISUAL_HH_ +#ifndef GZ_RENDERING_BASE_BASEARROWVISUAL_HH_ +#define GZ_RENDERING_BASE_BASEARROWVISUAL_HH_ #include "ignition/rendering/ArrowVisual.hh" #include "ignition/rendering/Scene.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/base/BaseAxisVisual.hh b/include/gz/rendering/base/BaseAxisVisual.hh index 486971236..9534e52f3 100644 --- a/include/gz/rendering/base/BaseAxisVisual.hh +++ b/include/gz/rendering/base/BaseAxisVisual.hh @@ -14,14 +14,14 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_BASE_BASEAXISVISUAL_HH_ -#define IGNITION_RENDERING_BASE_BASEAXISVISUAL_HH_ +#ifndef GZ_RENDERING_BASE_BASEAXISVISUAL_HH_ +#define GZ_RENDERING_BASE_BASEAXISVISUAL_HH_ #include "ignition/rendering/AxisVisual.hh" #include "ignition/rendering/ArrowVisual.hh" #include "ignition/rendering/Scene.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/base/BaseCamera.hh b/include/gz/rendering/base/BaseCamera.hh index 9f28c43db..824a3ef17 100644 --- a/include/gz/rendering/base/BaseCamera.hh +++ b/include/gz/rendering/base/BaseCamera.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_BASE_BASECAMERA_HH_ -#define IGNITION_RENDERING_BASE_BASECAMERA_HH_ +#ifndef GZ_RENDERING_BASE_BASECAMERA_HH_ +#define GZ_RENDERING_BASE_BASECAMERA_HH_ #include @@ -32,7 +32,7 @@ #include "ignition/rendering/Scene.hh" #include "ignition/rendering/base/BaseRenderTarget.hh" -namespace ignition +namespace gz { namespace rendering { @@ -105,7 +105,7 @@ namespace ignition public: virtual RenderWindowPtr CreateRenderWindow() override; // Documentation inherited. - public: virtual VisualPtr VisualAt(const ignition::math::Vector2i + public: virtual VisualPtr VisualAt(const gz::math::Vector2i &_mousePos) override; // Documentation inherited. @@ -531,7 +531,7 @@ namespace ignition ////////////////////////////////////////////////// template - VisualPtr BaseCamera::VisualAt(const ignition::math::Vector2i + VisualPtr BaseCamera::VisualAt(const gz::math::Vector2i &/*_mousePos*/) { ignerr << "VisualAt not implemented for the render engine" << std::endl; diff --git a/include/gz/rendering/base/BaseDepthCamera.hh b/include/gz/rendering/base/BaseDepthCamera.hh index 1372ac69e..3f1d29b95 100644 --- a/include/gz/rendering/base/BaseDepthCamera.hh +++ b/include/gz/rendering/base/BaseDepthCamera.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_BASE_BASEDEPTHCAMERA_HH_ -#define IGNITION_RENDERING_BASE_BASEDEPTHCAMERA_HH_ +#ifndef GZ_RENDERING_BASE_BASEDEPTHCAMERA_HH_ +#define GZ_RENDERING_BASE_BASEDEPTHCAMERA_HH_ #include @@ -24,7 +24,7 @@ #include "ignition/rendering/base/BaseCamera.hh" #include "ignition/rendering/DepthCamera.hh" -namespace ignition +namespace gz { namespace rendering { @@ -43,11 +43,11 @@ namespace ignition public: virtual const float *DepthData() const; - public: virtual ignition::common::ConnectionPtr ConnectNewDepthFrame( + public: virtual gz::common::ConnectionPtr ConnectNewDepthFrame( std::function _subscriber); - public: virtual ignition::common::ConnectionPtr ConnectNewRGBPointCloud( + public: virtual gz::common::ConnectionPtr ConnectNewRGBPointCloud( std::function _subscriber); }; @@ -79,7 +79,7 @@ namespace ignition ////////////////////////////////////////////////// template - ignition::common::ConnectionPtr BaseDepthCamera::ConnectNewDepthFrame( + gz::common::ConnectionPtr BaseDepthCamera::ConnectNewDepthFrame( std::function) { @@ -88,7 +88,7 @@ namespace ignition ////////////////////////////////////////////////// template - ignition::common::ConnectionPtr BaseDepthCamera::ConnectNewRGBPointCloud( + gz::common::ConnectionPtr BaseDepthCamera::ConnectNewRGBPointCloud( std::function) { diff --git a/include/gz/rendering/base/BaseGaussianNoisePass.hh b/include/gz/rendering/base/BaseGaussianNoisePass.hh index 03e03930b..cb0bcc549 100644 --- a/include/gz/rendering/base/BaseGaussianNoisePass.hh +++ b/include/gz/rendering/base/BaseGaussianNoisePass.hh @@ -14,15 +14,15 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_BASE_BASEGAUSSIANNOISEPASS_HH_ -#define IGNITION_RENDERING_BASE_BASEGAUSSIANNOISEPASS_HH_ +#ifndef GZ_RENDERING_BASE_BASEGAUSSIANNOISEPASS_HH_ +#define GZ_RENDERING_BASE_BASEGAUSSIANNOISEPASS_HH_ #include #include #include "ignition/rendering/GaussianNoisePass.hh" -namespace ignition +namespace gz { namespace rendering { @@ -155,11 +155,11 @@ namespace ignition void BaseGaussianNoisePass::SampleBias() { this->bias = - ignition::math::Rand::DblNormal(this->biasMean, this->biasStdDev); + gz::math::Rand::DblNormal(this->biasMean, this->biasStdDev); // With equal probability, we pick a negative bias (by convention, // rateBiasMean should be positive, though it would work fine if // negative). - if (ignition::math::Rand::DblUniform() < 0.5) + if (gz::math::Rand::DblUniform() < 0.5) this->bias = -this->bias; } } diff --git a/include/gz/rendering/base/BaseGeometry.hh b/include/gz/rendering/base/BaseGeometry.hh index 6460f52dd..4a8dd8831 100644 --- a/include/gz/rendering/base/BaseGeometry.hh +++ b/include/gz/rendering/base/BaseGeometry.hh @@ -14,14 +14,14 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_BASE_BASEGEOMETRY_HH_ -#define IGNITION_RENDERING_BASE_BASEGEOMETRY_HH_ +#ifndef GZ_RENDERING_BASE_BASEGEOMETRY_HH_ +#define GZ_RENDERING_BASE_BASEGEOMETRY_HH_ #include #include "ignition/rendering/Geometry.hh" #include "ignition/rendering/Scene.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/base/BaseGizmoVisual.hh b/include/gz/rendering/base/BaseGizmoVisual.hh index c517f861f..0f10a04a4 100644 --- a/include/gz/rendering/base/BaseGizmoVisual.hh +++ b/include/gz/rendering/base/BaseGizmoVisual.hh @@ -15,8 +15,8 @@ * */ -#ifndef IGNITION_RENDERING_BASE_BASEGIZMOVISUAL_HH_ -#define IGNITION_RENDERING_BASE_BASEGIZMOVISUAL_HH_ +#ifndef GZ_RENDERING_BASE_BASEGIZMOVISUAL_HH_ +#define GZ_RENDERING_BASE_BASEGIZMOVISUAL_HH_ #include #include @@ -29,7 +29,7 @@ #include "ignition/rendering/Camera.hh" #include "ignition/rendering/GizmoVisual.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/base/BaseGpuRays.hh b/include/gz/rendering/base/BaseGpuRays.hh index 81589af62..d83cfe132 100644 --- a/include/gz/rendering/base/BaseGpuRays.hh +++ b/include/gz/rendering/base/BaseGpuRays.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_BASE_BASEGPURAYS_HH_ -#define IGNITION_RENDERING_BASE_BASEGPURAYS_HH_ +#ifndef GZ_RENDERING_BASE_BASEGPURAYS_HH_ +#define GZ_RENDERING_BASE_BASEGPURAYS_HH_ #include @@ -32,7 +32,7 @@ #include "ignition/rendering/RenderTypes.hh" -namespace ignition +namespace gz { namespace rendering { @@ -95,13 +95,13 @@ namespace ignition const double _rayCountRatio) override; // Documentation inherited. - public: virtual ignition::math::Angle AngleMin() const override; + public: virtual gz::math::Angle AngleMin() const override; // Documentation inherited. public: virtual void SetAngleMin(double _angle) override; // Documentation inherited. - public: virtual ignition::math::Angle AngleMax() const override; + public: virtual gz::math::Angle AngleMax() const override; // Documentation inherited. public: virtual void SetAngleMax(double _angle) override; @@ -125,13 +125,13 @@ namespace ignition public: virtual int VerticalRangeCount() const override; // Documentation inherited. - public: virtual ignition::math::Angle VerticalAngleMin() const override; + public: virtual gz::math::Angle VerticalAngleMin() const override; // Documentation inherited. public: virtual void SetVerticalAngleMin(const double _angle) override; // Documentation inherited. - public: virtual ignition::math::Angle VerticalAngleMax() const override; + public: virtual gz::math::Angle VerticalAngleMax() const override; // Documentation inherited. public: virtual void SetVerticalAngleMax(const double _angle) override; @@ -140,10 +140,10 @@ namespace ignition public: virtual unsigned int Channels() const override; /// \brief maximum value used for data outside sensor range - public: float dataMaxVal = ignition::math::INF_D; + public: float dataMaxVal = gz::math::INF_D; /// \brief minimum value used for data outside sensor range - public: float dataMinVal = -ignition::math::INF_D; + public: float dataMinVal = -gz::math::INF_D; /// \brief True if data values are clamped to camera clip distances, // false if data outside of camera range is +/- inf @@ -231,8 +231,8 @@ namespace ignition } else { - this->dataMinVal = -ignition::math::INF_D; - this->dataMaxVal = ignition::math::INF_D; + this->dataMinVal = -gz::math::INF_D; + this->dataMaxVal = gz::math::INF_D; } } @@ -246,7 +246,7 @@ namespace ignition ////////////////////////////////////////////////// template - ignition::common::ConnectionPtr BaseGpuRays::ConnectNewGpuRaysFrame( + gz::common::ConnectionPtr BaseGpuRays::ConnectNewGpuRaysFrame( std::function) { @@ -304,7 +304,7 @@ namespace ignition template ////////////////////////////////////////////////// - ignition::math::Angle BaseGpuRays::AngleMin() const + gz::math::Angle BaseGpuRays::AngleMin() const { return this->minAngle; } @@ -318,7 +318,7 @@ namespace ignition template ////////////////////////////////////////////////// - ignition::math::Angle BaseGpuRays::AngleMax() const + gz::math::Angle BaseGpuRays::AngleMax() const { return this->maxAngle; } @@ -374,7 +374,7 @@ namespace ignition template ////////////////////////////////////////////////// - ignition::math::Angle BaseGpuRays::VerticalAngleMin() const + gz::math::Angle BaseGpuRays::VerticalAngleMin() const { return this->vMinAngle; } @@ -388,7 +388,7 @@ namespace ignition template ////////////////////////////////////////////////// - ignition::math::Angle BaseGpuRays::VerticalAngleMax() const + gz::math::Angle BaseGpuRays::VerticalAngleMax() const { return this->vMaxAngle; } diff --git a/include/gz/rendering/base/BaseGrid.hh b/include/gz/rendering/base/BaseGrid.hh index 26aabc464..5557c683b 100644 --- a/include/gz/rendering/base/BaseGrid.hh +++ b/include/gz/rendering/base/BaseGrid.hh @@ -14,14 +14,14 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_BASE_BASEGRID_HH_ -#define IGNITION_RENDERING_BASE_BASEGRID_HH_ +#ifndef GZ_RENDERING_BASE_BASEGRID_HH_ +#define GZ_RENDERING_BASE_BASEGRID_HH_ #include #include "ignition/rendering/Grid.hh" #include "ignition/rendering/base/BaseObject.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/base/BaseLight.hh b/include/gz/rendering/base/BaseLight.hh index 0994a75ea..d69c6deb4 100644 --- a/include/gz/rendering/base/BaseLight.hh +++ b/include/gz/rendering/base/BaseLight.hh @@ -14,12 +14,12 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_BASE_BASELIGHT_HH_ -#define IGNITION_RENDERING_BASE_BASELIGHT_HH_ +#ifndef GZ_RENDERING_BASE_BASELIGHT_HH_ +#define GZ_RENDERING_BASE_BASELIGHT_HH_ #include "ignition/rendering/Light.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/base/BaseMarker.hh b/include/gz/rendering/base/BaseMarker.hh index 7f5f83d2a..ceccef017 100644 --- a/include/gz/rendering/base/BaseMarker.hh +++ b/include/gz/rendering/base/BaseMarker.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_BASEMARKER_HH_ -#define IGNITION_RENDERING_BASEMARKER_HH_ +#ifndef GZ_RENDERING_BASEMARKER_HH_ +#define GZ_RENDERING_BASEMARKER_HH_ #include @@ -23,7 +23,7 @@ #include "ignition/rendering/base/BaseObject.hh" #include "ignition/rendering/base/BaseRenderTypes.hh" -namespace ignition +namespace gz { namespace rendering { @@ -72,15 +72,15 @@ namespace ignition // Documentation inherited public: virtual void AddPoint(double _x, double _y, double _z, - const ignition::math::Color &_color) override; + const gz::math::Color &_color) override; // Documentation inherited - public: virtual void AddPoint(const ignition::math::Vector3d &_pt, - const ignition::math::Color &_color) override; + public: virtual void AddPoint(const gz::math::Vector3d &_pt, + const gz::math::Color &_color) override; // Documentation inherited public: virtual void SetPoint(unsigned int _index, - const ignition::math::Vector3d &_value) override; + const gz::math::Vector3d &_value) override; /// \brief Life time of a marker IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING @@ -96,7 +96,7 @@ namespace ignition /// \brief Marker type protected: MarkerType markerType = - ignition::rendering::MarkerType::MT_NONE; + gz::rendering::MarkerType::MT_NONE; }; ///////////////////////////////////////////////// @@ -182,8 +182,8 @@ namespace ignition ///////////////////////////////////////////////// template - void BaseMarker::AddPoint(const ignition::math::Vector3d &, - const ignition::math::Color &) + void BaseMarker::AddPoint(const gz::math::Vector3d &, + const gz::math::Color &) { // no op } @@ -191,15 +191,15 @@ namespace ignition ///////////////////////////////////////////////// template void BaseMarker::AddPoint(double _x, double _y, double _z, - const ignition::math::Color &_color) + const gz::math::Color &_color) { - this->AddPoint(ignition::math::Vector3d(_x, _y, _z), _color); + this->AddPoint(gz::math::Vector3d(_x, _y, _z), _color); } ///////////////////////////////////////////////// template void BaseMarker::SetPoint(unsigned int, - const ignition::math::Vector3d &) + const gz::math::Vector3d &) { // no op } diff --git a/include/gz/rendering/base/BaseMaterial.hh b/include/gz/rendering/base/BaseMaterial.hh index c6c2861e5..07aaa0659 100644 --- a/include/gz/rendering/base/BaseMaterial.hh +++ b/include/gz/rendering/base/BaseMaterial.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_BASE_BASEMATERIAL_HH_ -#define IGNITION_RENDERING_BASE_BASEMATERIAL_HH_ +#ifndef GZ_RENDERING_BASE_BASEMATERIAL_HH_ +#define GZ_RENDERING_BASE_BASEMATERIAL_HH_ #include @@ -25,7 +25,7 @@ #include "ignition/rendering/Scene.hh" #include "ignition/rendering/ShaderType.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/base/BaseMesh.hh b/include/gz/rendering/base/BaseMesh.hh index c8b4d5808..37a00173c 100644 --- a/include/gz/rendering/base/BaseMesh.hh +++ b/include/gz/rendering/base/BaseMesh.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_BASE_BASEMESH_HH_ -#define IGNITION_RENDERING_BASE_BASEMESH_HH_ +#ifndef GZ_RENDERING_BASE_BASEMESH_HH_ +#define GZ_RENDERING_BASE_BASEMESH_HH_ #include #include @@ -23,7 +23,7 @@ #include "ignition/rendering/Storage.hh" #include "ignition/rendering/base/BaseObject.hh" -namespace ignition +namespace gz { namespace rendering { @@ -154,7 +154,7 @@ namespace ignition std::map BaseMesh::SkeletonLocalTransforms() const { - std::map tmpMap; + std::map tmpMap; return tmpMap; } diff --git a/include/gz/rendering/base/BaseNode.hh b/include/gz/rendering/base/BaseNode.hh index eb76ba456..a4a4de12b 100644 --- a/include/gz/rendering/base/BaseNode.hh +++ b/include/gz/rendering/base/BaseNode.hh @@ -14,15 +14,15 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_BASE_BASENODE_HH_ -#define IGNITION_RENDERING_BASE_BASENODE_HH_ +#ifndef GZ_RENDERING_BASE_BASENODE_HH_ +#define GZ_RENDERING_BASE_BASENODE_HH_ #include #include "ignition/rendering/Node.hh" #include "ignition/rendering/Storage.hh" #include "ignition/rendering/base/BaseStorage.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/base/BaseObject.hh b/include/gz/rendering/base/BaseObject.hh index 73f670ddf..fdfd6bd5d 100644 --- a/include/gz/rendering/base/BaseObject.hh +++ b/include/gz/rendering/base/BaseObject.hh @@ -14,15 +14,15 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_BASE_BASEOBJECT_HH_ -#define IGNITION_RENDERING_BASE_BASEOBJECT_HH_ +#ifndef GZ_RENDERING_BASE_BASEOBJECT_HH_ +#define GZ_RENDERING_BASE_BASEOBJECT_HH_ #include #include #include #include "ignition/rendering/Object.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/base/BaseRayQuery.hh b/include/gz/rendering/base/BaseRayQuery.hh index efef2bdee..9ac5a9ced 100644 --- a/include/gz/rendering/base/BaseRayQuery.hh +++ b/include/gz/rendering/base/BaseRayQuery.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_BASE_BASERAYQUERY_HH_ -#define IGNITION_RENDERING_BASE_BASERAYQUERY_HH_ +#ifndef GZ_RENDERING_BASE_BASERAYQUERY_HH_ +#define GZ_RENDERING_BASE_BASERAYQUERY_HH_ #include #include @@ -23,7 +23,7 @@ #include "ignition/rendering/RayQuery.hh" #include "ignition/rendering/Scene.hh" -namespace ignition +namespace gz { namespace rendering { @@ -90,7 +90,7 @@ namespace ignition ////////////////////////////////////////////////// template - ignition::math::Vector3d BaseRayQuery::Origin() const + gz::math::Vector3d BaseRayQuery::Origin() const { return this->origin; } @@ -104,7 +104,7 @@ namespace ignition ////////////////////////////////////////////////// template - ignition::math::Vector3d BaseRayQuery::Direction() const + gz::math::Vector3d BaseRayQuery::Direction() const { return this->direction; } @@ -112,7 +112,7 @@ namespace ignition ////////////////////////////////////////////////// template void BaseRayQuery::SetFromCamera(const CameraPtr &_camera, - const ignition::math::Vector2d &_coord) + const gz::math::Vector2d &_coord) { math::Matrix4d projectionMatrix = _camera->ProjectionMatrix(); math::Matrix4d viewMatrix = _camera->ViewMatrix(); diff --git a/include/gz/rendering/base/BaseRenderEngine.hh b/include/gz/rendering/base/BaseRenderEngine.hh index c41fb03a5..713b6d8fa 100644 --- a/include/gz/rendering/base/BaseRenderEngine.hh +++ b/include/gz/rendering/base/BaseRenderEngine.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_BASE_BASERENDERENGINE_HH_ -#define IGNITION_RENDERING_BASE_BASERENDERENGINE_HH_ +#ifndef GZ_RENDERING_BASE_BASERENDERENGINE_HH_ +#define GZ_RENDERING_BASE_BASERENDERENGINE_HH_ #include #include @@ -24,7 +24,7 @@ #include "ignition/rendering/RenderEngine.hh" #include "ignition/rendering/Storage.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/base/BaseRenderPass.hh b/include/gz/rendering/base/BaseRenderPass.hh index 347cdc211..9ace46114 100644 --- a/include/gz/rendering/base/BaseRenderPass.hh +++ b/include/gz/rendering/base/BaseRenderPass.hh @@ -14,13 +14,13 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_BASE_BASERENDERPASS_HH_ -#define IGNITION_RENDERING_BASE_BASERENDERPASS_HH_ +#ifndef GZ_RENDERING_BASE_BASERENDERPASS_HH_ +#define GZ_RENDERING_BASE_BASERENDERPASS_HH_ #include #include "ignition/rendering/RenderPass.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/base/BaseRenderTarget.hh b/include/gz/rendering/base/BaseRenderTarget.hh index c0c795c79..b853bbc3e 100644 --- a/include/gz/rendering/base/BaseRenderTarget.hh +++ b/include/gz/rendering/base/BaseRenderTarget.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_BASE_BASERENDERTARGET_HH_ -#define IGNITION_RENDERING_BASE_BASERENDERTARGET_HH_ +#ifndef GZ_RENDERING_BASE_BASERENDERTARGET_HH_ +#define GZ_RENDERING_BASE_BASERENDERTARGET_HH_ #include #include @@ -25,7 +25,7 @@ #include "ignition/rendering/Scene.hh" #include "ignition/rendering/base/BaseRenderTypes.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/base/BaseRenderTypes.hh b/include/gz/rendering/base/BaseRenderTypes.hh index ebc1004cb..7c863aaad 100644 --- a/include/gz/rendering/base/BaseRenderTypes.hh +++ b/include/gz/rendering/base/BaseRenderTypes.hh @@ -14,14 +14,14 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_BASE_BASERENDERTYPES_HH_ -#define IGNITION_RENDERING_BASE_BASERENDERTYPES_HH_ +#ifndef GZ_RENDERING_BASE_BASERENDERTYPES_HH_ +#define GZ_RENDERING_BASE_BASERENDERTYPES_HH_ #include #include "ignition/rendering/RenderTypes.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/base/BaseScene.hh b/include/gz/rendering/base/BaseScene.hh index 41da6508f..eaaca02b7 100644 --- a/include/gz/rendering/base/BaseScene.hh +++ b/include/gz/rendering/base/BaseScene.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_BASE_BASESCENE_HH_ -#define IGNITION_RENDERING_BASE_BASESCENE_HH_ +#ifndef GZ_RENDERING_BASE_BASESCENE_HH_ +#define GZ_RENDERING_BASE_BASESCENE_HH_ #include #include @@ -28,7 +28,7 @@ #include "ignition/rendering/Scene.hh" #include "ignition/rendering/base/BaseRenderTypes.hh" -namespace ignition +namespace gz { namespace rendering { @@ -195,7 +195,7 @@ namespace ignition // Documentation inherited public: virtual VisualPtr VisualAt(const CameraPtr &_camera, - const ignition::math::Vector2i &_mousePos) override; + const gz::math::Vector2i &_mousePos) override; // Documentation inherited. public: virtual void DestroyVisual(VisualPtr _visual, diff --git a/include/gz/rendering/base/BaseSensor.hh b/include/gz/rendering/base/BaseSensor.hh index 416251f48..8acc45944 100644 --- a/include/gz/rendering/base/BaseSensor.hh +++ b/include/gz/rendering/base/BaseSensor.hh @@ -14,12 +14,12 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_BASE_BASESENSOR_HH_ -#define IGNITION_RENDERING_BASE_BASESENSOR_HH_ +#ifndef GZ_RENDERING_BASE_BASESENSOR_HH_ +#define GZ_RENDERING_BASE_BASESENSOR_HH_ #include "ignition/rendering/Sensor.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/base/BaseStorage.hh b/include/gz/rendering/base/BaseStorage.hh index c3068d8c9..90f63a7cb 100644 --- a/include/gz/rendering/base/BaseStorage.hh +++ b/include/gz/rendering/base/BaseStorage.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_BASE_BASESTORAGE_HH_ -#define IGNITION_RENDERING_BASE_BASESTORAGE_HH_ +#ifndef GZ_RENDERING_BASE_BASESTORAGE_HH_ +#define GZ_RENDERING_BASE_BASESTORAGE_HH_ #include #include @@ -27,7 +27,7 @@ #include "ignition/rendering/Storage.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/include/gz/rendering/base/BaseText.hh b/include/gz/rendering/base/BaseText.hh index 349848032..ab7f81a61 100644 --- a/include/gz/rendering/base/BaseText.hh +++ b/include/gz/rendering/base/BaseText.hh @@ -14,14 +14,14 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_BASE_BASETEXT_HH_ -#define IGNITION_RENDERING_BASE_BASETEXT_HH_ +#ifndef GZ_RENDERING_BASE_BASETEXT_HH_ +#define GZ_RENDERING_BASE_BASETEXT_HH_ #include #include "ignition/rendering/Text.hh" #include "ignition/rendering/base/BaseObject.hh" -namespace ignition +namespace gz { namespace rendering { @@ -58,11 +58,11 @@ namespace ignition public: virtual std::string TextString() const override; // Documentation inherited. - public: virtual void SetColor(const ignition::math::Color &_color) + public: virtual void SetColor(const gz::math::Color &_color) override; // Documentation inherited. - public: virtual ignition::math::Color Color() const override; + public: virtual gz::math::Color Color() const override; // Documentation inherited. public: virtual void SetCharHeight(const float _height) override; @@ -98,7 +98,7 @@ namespace ignition public: virtual bool ShowOnTop() const override; // Documentation inherited. - public: virtual ignition::math::AxisAlignedBox AABB() const override; + public: virtual gz::math::AxisAlignedBox AABB() const override; /// \brief Font name, such as "Liberation Sans" protected: std::string fontName = "Liberation Sans"; @@ -107,7 +107,7 @@ namespace ignition protected: std::string text; /// \brief Text color - protected: ignition::math::Color color = ignition::math::Color::White; + protected: gz::math::Color color = gz::math::Color::White; /// \brief Character height in meters protected: float charHeight = 1.0; @@ -179,14 +179,14 @@ namespace ignition ////////////////////////////////////////////////// template - ignition::math::Color BaseText::Color() const + gz::math::Color BaseText::Color() const { return this->color; } ////////////////////////////////////////////////// template - void BaseText::SetColor(const ignition::math::Color &_color) + void BaseText::SetColor(const gz::math::Color &_color) { this->color = _color; this->textDirty = true; @@ -278,7 +278,7 @@ namespace ignition ////////////////////////////////////////////////// template - ignition::math::AxisAlignedBox BaseText::AABB() const + gz::math::AxisAlignedBox BaseText::AABB() const { math::AxisAlignedBox box; return box; diff --git a/include/gz/rendering/base/BaseThermalCamera.hh b/include/gz/rendering/base/BaseThermalCamera.hh index a061a371b..8b9526b4b 100644 --- a/include/gz/rendering/base/BaseThermalCamera.hh +++ b/include/gz/rendering/base/BaseThermalCamera.hh @@ -14,15 +14,15 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_BASE_BASETHERMALCAMERA_HH_ -#define IGNITION_RENDERING_BASE_BASETHERMALCAMERA_HH_ +#ifndef GZ_RENDERING_BASE_BASETHERMALCAMERA_HH_ +#define GZ_RENDERING_BASE_BASETHERMALCAMERA_HH_ #include #include "ignition/rendering/base/BaseCamera.hh" #include "ignition/rendering/ThermalCamera.hh" -namespace ignition +namespace gz { namespace rendering { @@ -78,7 +78,7 @@ namespace ignition public: virtual void SetHeatSourceTemperatureRange(float _range) override; // Documentation inherted. - public: virtual ignition::common::ConnectionPtr ConnectNewThermalFrame( + public: virtual gz::common::ConnectionPtr ConnectNewThermalFrame( std::function _subscriber) override; @@ -89,10 +89,10 @@ namespace ignition protected: float ambientRange = 0.0f; /// \brief Minimum temperature - protected: float minTemp = -ignition::math::INF_F; + protected: float minTemp = -gz::math::INF_F; /// \brief Maximum temperature - protected: float maxTemp = ignition::math::INF_F; + protected: float maxTemp = gz::math::INF_F; /// \brief Linear resolution. Defaults to 10mK. protected: float resolution = 0.01f; diff --git a/include/gz/rendering/base/BaseVisual.hh b/include/gz/rendering/base/BaseVisual.hh index c16f09db2..c1f6b7265 100644 --- a/include/gz/rendering/base/BaseVisual.hh +++ b/include/gz/rendering/base/BaseVisual.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_BASE_BASEVISUAL_HH_ -#define IGNITION_RENDERING_BASE_BASEVISUAL_HH_ +#ifndef GZ_RENDERING_BASE_BASEVISUAL_HH_ +#define GZ_RENDERING_BASE_BASEVISUAL_HH_ #include #include @@ -25,7 +25,7 @@ #include "ignition/rendering/RenderEngine.hh" #include "ignition/rendering/base/BaseStorage.hh" -namespace ignition +namespace gz { namespace rendering { @@ -234,7 +234,7 @@ namespace ignition _material = (_unique && count > 0) ? _material->Clone() : _material; auto children_ = - std::dynamic_pointer_cast>( + std::dynamic_pointer_cast>( this->Children()); if (!children_) { @@ -294,7 +294,7 @@ namespace ignition void BaseVisual::PreRenderChildren() { auto children_ = - std::dynamic_pointer_cast>( + std::dynamic_pointer_cast>( this->Children()); if (!children_) { diff --git a/include/ignition/rendering.hh b/include/ignition/rendering.hh new file mode 100644 index 000000000..c7494084f --- /dev/null +++ b/include/ignition/rendering.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/ArrowVisual.hh b/include/ignition/rendering/ArrowVisual.hh new file mode 100644 index 000000000..b8fb951af --- /dev/null +++ b/include/ignition/rendering/ArrowVisual.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/AxisVisual.hh b/include/ignition/rendering/AxisVisual.hh new file mode 100644 index 000000000..58a952c7c --- /dev/null +++ b/include/ignition/rendering/AxisVisual.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/Camera.hh b/include/ignition/rendering/Camera.hh new file mode 100644 index 000000000..009827525 --- /dev/null +++ b/include/ignition/rendering/Camera.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/CompositeVisual.hh b/include/ignition/rendering/CompositeVisual.hh new file mode 100644 index 000000000..e64586d0a --- /dev/null +++ b/include/ignition/rendering/CompositeVisual.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/DepthCamera.hh b/include/ignition/rendering/DepthCamera.hh new file mode 100644 index 000000000..ee904b7d1 --- /dev/null +++ b/include/ignition/rendering/DepthCamera.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/Export.hh b/include/ignition/rendering/Export.hh new file mode 100644 index 000000000..d6119ebf2 --- /dev/null +++ b/include/ignition/rendering/Export.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/GaussianNoisePass.hh b/include/ignition/rendering/GaussianNoisePass.hh new file mode 100644 index 000000000..6e296ef88 --- /dev/null +++ b/include/ignition/rendering/GaussianNoisePass.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/Geometry.hh b/include/ignition/rendering/Geometry.hh new file mode 100644 index 000000000..185a2afe3 --- /dev/null +++ b/include/ignition/rendering/Geometry.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/GizmoVisual.hh b/include/ignition/rendering/GizmoVisual.hh new file mode 100644 index 000000000..040a54a40 --- /dev/null +++ b/include/ignition/rendering/GizmoVisual.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/GpuRays.hh b/include/ignition/rendering/GpuRays.hh new file mode 100644 index 000000000..2ac4b0b29 --- /dev/null +++ b/include/ignition/rendering/GpuRays.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/Grid.hh b/include/ignition/rendering/Grid.hh new file mode 100644 index 000000000..4f77236cc --- /dev/null +++ b/include/ignition/rendering/Grid.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/Image.hh b/include/ignition/rendering/Image.hh new file mode 100644 index 000000000..c618e023a --- /dev/null +++ b/include/ignition/rendering/Image.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/Light.hh b/include/ignition/rendering/Light.hh new file mode 100644 index 000000000..9e884a192 --- /dev/null +++ b/include/ignition/rendering/Light.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/Marker.hh b/include/ignition/rendering/Marker.hh new file mode 100644 index 000000000..662658c4a --- /dev/null +++ b/include/ignition/rendering/Marker.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/Material.hh b/include/ignition/rendering/Material.hh new file mode 100644 index 000000000..ea472d9ba --- /dev/null +++ b/include/ignition/rendering/Material.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/Mesh.hh b/include/ignition/rendering/Mesh.hh new file mode 100644 index 000000000..83406d35f --- /dev/null +++ b/include/ignition/rendering/Mesh.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/MeshDescriptor.hh b/include/ignition/rendering/MeshDescriptor.hh new file mode 100644 index 000000000..f22291457 --- /dev/null +++ b/include/ignition/rendering/MeshDescriptor.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/MoveToHelper.hh b/include/ignition/rendering/MoveToHelper.hh new file mode 100644 index 000000000..7fb4bab57 --- /dev/null +++ b/include/ignition/rendering/MoveToHelper.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/Node.hh b/include/ignition/rendering/Node.hh new file mode 100644 index 000000000..f9defde3b --- /dev/null +++ b/include/ignition/rendering/Node.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/Object.hh b/include/ignition/rendering/Object.hh new file mode 100644 index 000000000..a3a6bcac7 --- /dev/null +++ b/include/ignition/rendering/Object.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/OrbitViewController.hh b/include/ignition/rendering/OrbitViewController.hh new file mode 100644 index 000000000..d464bddb2 --- /dev/null +++ b/include/ignition/rendering/OrbitViewController.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/PixelFormat.hh b/include/ignition/rendering/PixelFormat.hh new file mode 100644 index 000000000..d01a8eb86 --- /dev/null +++ b/include/ignition/rendering/PixelFormat.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/RayQuery.hh b/include/ignition/rendering/RayQuery.hh new file mode 100644 index 000000000..b4c6174f9 --- /dev/null +++ b/include/ignition/rendering/RayQuery.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/RenderEngine.hh b/include/ignition/rendering/RenderEngine.hh new file mode 100644 index 000000000..e76cf64ba --- /dev/null +++ b/include/ignition/rendering/RenderEngine.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/RenderEngineManager.hh b/include/ignition/rendering/RenderEngineManager.hh new file mode 100644 index 000000000..162ba7f0b --- /dev/null +++ b/include/ignition/rendering/RenderEngineManager.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/RenderEnginePlugin.hh b/include/ignition/rendering/RenderEnginePlugin.hh new file mode 100644 index 000000000..cdb9d5a3e --- /dev/null +++ b/include/ignition/rendering/RenderEnginePlugin.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/RenderPass.hh b/include/ignition/rendering/RenderPass.hh new file mode 100644 index 000000000..41028ee1a --- /dev/null +++ b/include/ignition/rendering/RenderPass.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/RenderPassSystem.hh b/include/ignition/rendering/RenderPassSystem.hh new file mode 100644 index 000000000..a45a54c08 --- /dev/null +++ b/include/ignition/rendering/RenderPassSystem.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/RenderTarget.hh b/include/ignition/rendering/RenderTarget.hh new file mode 100644 index 000000000..00b7b0f6a --- /dev/null +++ b/include/ignition/rendering/RenderTarget.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/RenderTypes.hh b/include/ignition/rendering/RenderTypes.hh new file mode 100644 index 000000000..7a3a038b4 --- /dev/null +++ b/include/ignition/rendering/RenderTypes.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/RenderingIface.hh b/include/ignition/rendering/RenderingIface.hh new file mode 100644 index 000000000..ab8fd158e --- /dev/null +++ b/include/ignition/rendering/RenderingIface.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/Scene.hh b/include/ignition/rendering/Scene.hh new file mode 100644 index 000000000..210d489e4 --- /dev/null +++ b/include/ignition/rendering/Scene.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/Sensor.hh b/include/ignition/rendering/Sensor.hh new file mode 100644 index 000000000..91c77a516 --- /dev/null +++ b/include/ignition/rendering/Sensor.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/ShaderParam.hh b/include/ignition/rendering/ShaderParam.hh new file mode 100644 index 000000000..c4cb1ab8c --- /dev/null +++ b/include/ignition/rendering/ShaderParam.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/ShaderParams.hh b/include/ignition/rendering/ShaderParams.hh new file mode 100644 index 000000000..cf358abe5 --- /dev/null +++ b/include/ignition/rendering/ShaderParams.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/ShaderType.hh b/include/ignition/rendering/ShaderType.hh new file mode 100644 index 000000000..43013005b --- /dev/null +++ b/include/ignition/rendering/ShaderType.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/Storage.hh b/include/ignition/rendering/Storage.hh new file mode 100644 index 000000000..9fdeb0b9c --- /dev/null +++ b/include/ignition/rendering/Storage.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/Text.hh b/include/ignition/rendering/Text.hh new file mode 100644 index 000000000..be58413fc --- /dev/null +++ b/include/ignition/rendering/Text.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/ThermalCamera.hh b/include/ignition/rendering/ThermalCamera.hh new file mode 100644 index 000000000..8e7a4b5b2 --- /dev/null +++ b/include/ignition/rendering/ThermalCamera.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/TransformController.hh b/include/ignition/rendering/TransformController.hh new file mode 100644 index 000000000..7b40c38a1 --- /dev/null +++ b/include/ignition/rendering/TransformController.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/TransformType.hh b/include/ignition/rendering/TransformType.hh new file mode 100644 index 000000000..cdf69c53d --- /dev/null +++ b/include/ignition/rendering/TransformType.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/Utils.hh b/include/ignition/rendering/Utils.hh new file mode 100644 index 000000000..78bcf3746 --- /dev/null +++ b/include/ignition/rendering/Utils.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/ViewController.hh b/include/ignition/rendering/ViewController.hh new file mode 100644 index 000000000..8fd982496 --- /dev/null +++ b/include/ignition/rendering/ViewController.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/Visual.hh b/include/ignition/rendering/Visual.hh new file mode 100644 index 000000000..0ac2c26ab --- /dev/null +++ b/include/ignition/rendering/Visual.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/base/BaseArrowVisual.hh b/include/ignition/rendering/base/BaseArrowVisual.hh new file mode 100644 index 000000000..0c5e64329 --- /dev/null +++ b/include/ignition/rendering/base/BaseArrowVisual.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/base/BaseAxisVisual.hh b/include/ignition/rendering/base/BaseAxisVisual.hh new file mode 100644 index 000000000..706e8b0c2 --- /dev/null +++ b/include/ignition/rendering/base/BaseAxisVisual.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/base/BaseCamera.hh b/include/ignition/rendering/base/BaseCamera.hh new file mode 100644 index 000000000..75d1fe0b6 --- /dev/null +++ b/include/ignition/rendering/base/BaseCamera.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/base/BaseDepthCamera.hh b/include/ignition/rendering/base/BaseDepthCamera.hh new file mode 100644 index 000000000..dc4993072 --- /dev/null +++ b/include/ignition/rendering/base/BaseDepthCamera.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/base/BaseGaussianNoisePass.hh b/include/ignition/rendering/base/BaseGaussianNoisePass.hh new file mode 100644 index 000000000..b8fd713db --- /dev/null +++ b/include/ignition/rendering/base/BaseGaussianNoisePass.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/base/BaseGeometry.hh b/include/ignition/rendering/base/BaseGeometry.hh new file mode 100644 index 000000000..1ce00859c --- /dev/null +++ b/include/ignition/rendering/base/BaseGeometry.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/base/BaseGizmoVisual.hh b/include/ignition/rendering/base/BaseGizmoVisual.hh new file mode 100644 index 000000000..9ea5f4cdc --- /dev/null +++ b/include/ignition/rendering/base/BaseGizmoVisual.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/base/BaseGpuRays.hh b/include/ignition/rendering/base/BaseGpuRays.hh new file mode 100644 index 000000000..c4d48806b --- /dev/null +++ b/include/ignition/rendering/base/BaseGpuRays.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/base/BaseGrid.hh b/include/ignition/rendering/base/BaseGrid.hh new file mode 100644 index 000000000..9b6de6e41 --- /dev/null +++ b/include/ignition/rendering/base/BaseGrid.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/base/BaseLight.hh b/include/ignition/rendering/base/BaseLight.hh new file mode 100644 index 000000000..4aab8ac8c --- /dev/null +++ b/include/ignition/rendering/base/BaseLight.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/base/BaseMarker.hh b/include/ignition/rendering/base/BaseMarker.hh new file mode 100644 index 000000000..bcff5773d --- /dev/null +++ b/include/ignition/rendering/base/BaseMarker.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/base/BaseMaterial.hh b/include/ignition/rendering/base/BaseMaterial.hh new file mode 100644 index 000000000..449fbe372 --- /dev/null +++ b/include/ignition/rendering/base/BaseMaterial.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/base/BaseMesh.hh b/include/ignition/rendering/base/BaseMesh.hh new file mode 100644 index 000000000..f2faa8de0 --- /dev/null +++ b/include/ignition/rendering/base/BaseMesh.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/base/BaseNode.hh b/include/ignition/rendering/base/BaseNode.hh new file mode 100644 index 000000000..7737eed80 --- /dev/null +++ b/include/ignition/rendering/base/BaseNode.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/base/BaseObject.hh b/include/ignition/rendering/base/BaseObject.hh new file mode 100644 index 000000000..1ce9353b5 --- /dev/null +++ b/include/ignition/rendering/base/BaseObject.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/base/BaseRayQuery.hh b/include/ignition/rendering/base/BaseRayQuery.hh new file mode 100644 index 000000000..0d1b88803 --- /dev/null +++ b/include/ignition/rendering/base/BaseRayQuery.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/base/BaseRenderEngine.hh b/include/ignition/rendering/base/BaseRenderEngine.hh new file mode 100644 index 000000000..0202704c4 --- /dev/null +++ b/include/ignition/rendering/base/BaseRenderEngine.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/base/BaseRenderPass.hh b/include/ignition/rendering/base/BaseRenderPass.hh new file mode 100644 index 000000000..b758dfe90 --- /dev/null +++ b/include/ignition/rendering/base/BaseRenderPass.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/base/BaseRenderTarget.hh b/include/ignition/rendering/base/BaseRenderTarget.hh new file mode 100644 index 000000000..546ad2f48 --- /dev/null +++ b/include/ignition/rendering/base/BaseRenderTarget.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/base/BaseRenderTypes.hh b/include/ignition/rendering/base/BaseRenderTypes.hh new file mode 100644 index 000000000..578bc4af8 --- /dev/null +++ b/include/ignition/rendering/base/BaseRenderTypes.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/base/BaseScene.hh b/include/ignition/rendering/base/BaseScene.hh new file mode 100644 index 000000000..a27964e73 --- /dev/null +++ b/include/ignition/rendering/base/BaseScene.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/base/BaseSensor.hh b/include/ignition/rendering/base/BaseSensor.hh new file mode 100644 index 000000000..0f41bad9e --- /dev/null +++ b/include/ignition/rendering/base/BaseSensor.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/base/BaseStorage.hh b/include/ignition/rendering/base/BaseStorage.hh new file mode 100644 index 000000000..97ddef866 --- /dev/null +++ b/include/ignition/rendering/base/BaseStorage.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/base/BaseText.hh b/include/ignition/rendering/base/BaseText.hh new file mode 100644 index 000000000..10be4ecd5 --- /dev/null +++ b/include/ignition/rendering/base/BaseText.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/base/BaseThermalCamera.hh b/include/ignition/rendering/base/BaseThermalCamera.hh new file mode 100644 index 000000000..5c1699e4f --- /dev/null +++ b/include/ignition/rendering/base/BaseThermalCamera.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/base/BaseVisual.hh b/include/ignition/rendering/base/BaseVisual.hh new file mode 100644 index 000000000..e03cd87b9 --- /dev/null +++ b/include/ignition/rendering/base/BaseVisual.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/rendering/config.hh b/include/ignition/rendering/config.hh new file mode 100644 index 000000000..73cd9b22e --- /dev/null +++ b/include/ignition/rendering/config.hh @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#ifndef IGNITION_RENDERING__CONFIG_HH_ +#define IGNITION_RENDERING__CONFIG_HH_ + +#include + +/* Version number */ +// #define IGNITION_RENDERING_MAJOR_VERSION GZ_RENDERING_MAJOR_VERSION +// #define IGNITION_RENDERING_MINOR_VERSION GZ_RENDERING_MINOR_VERSION +// #define IGNITION_RENDERING_PATCH_VERSION GZ_RENDERING_PATCH_VERSION + +// #define IGNITION_RENDERING_VERSION GZ_RENDERING_VERSION +// #define IGNITION_RENDERING_VERSION_FULL GZ_RENDERING_VERSION_FULL + +// #define IGNITION_RENDERING_VERSION_NAMESPACE GZ_RENDERING_VERSION_NAMESPACE + +// #define IGNITION_RENDERING_VERSION_HEADER GZ_RENDERING_VERSION_HEADER + +// #define IGN_RENDERING_RESOURCE_PATH GZ_RENDERING_RESOURCE_PATH + +// #define IGNITION_RENDERING_ENGINE_INSTALL_DIR GZ_RENDERING_ENGINE_INSTALL_DIR + +/* #undef BUILD_TYPE_PROFILE */ +/* #undef BUILD_TYPE_DEBUG */ +/* #undef BUILD_TYPE_RELEASE */ +// #define HAVE_OGRE 1 +/* #undef HAVE_OGRE2 */ +/* #undef HAVE_OPTIX */ +/* #undef HAVE_GAZEBO */ +/* #undef INCLUDE_RTSHADER */ + +namespace gz +{ +} + +namespace ignition +{ + using namespace gz; +} + + +#endif diff --git a/ogre/include/CMakeLists.txt b/ogre/include/CMakeLists.txt index 297e254ff..a7479f53e 100644 --- a/ogre/include/CMakeLists.txt +++ b/ogre/include/CMakeLists.txt @@ -1 +1,2 @@ -add_subdirectory(ignition/rendering) +add_subdirectory(gz/rendering) +install(DIRECTORY ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL}) diff --git a/ogre/include/gz/rendering/ogre/OgreArrowVisual.hh b/ogre/include/gz/rendering/ogre/OgreArrowVisual.hh index 5e1bb8687..4d7287fa2 100644 --- a/ogre/include/gz/rendering/ogre/OgreArrowVisual.hh +++ b/ogre/include/gz/rendering/ogre/OgreArrowVisual.hh @@ -14,13 +14,13 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE_OGREARROWVISUAL_HH_ -#define IGNITION_RENDERING_OGRE_OGREARROWVISUAL_HH_ +#ifndef GZ_RENDERING_OGRE_OGREARROWVISUAL_HH_ +#define GZ_RENDERING_OGRE_OGREARROWVISUAL_HH_ #include "ignition/rendering/base/BaseArrowVisual.hh" #include "ignition/rendering/ogre/OgreVisual.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre/include/gz/rendering/ogre/OgreAxisVisual.hh b/ogre/include/gz/rendering/ogre/OgreAxisVisual.hh index 2dc439ae1..ad8b5b1fd 100644 --- a/ogre/include/gz/rendering/ogre/OgreAxisVisual.hh +++ b/ogre/include/gz/rendering/ogre/OgreAxisVisual.hh @@ -14,13 +14,13 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE_OGREAXISVISUAL_HH_ -#define IGNITION_RENDERING_OGRE_OGREAXISVISUAL_HH_ +#ifndef GZ_RENDERING_OGRE_OGREAXISVISUAL_HH_ +#define GZ_RENDERING_OGRE_OGREAXISVISUAL_HH_ #include "ignition/rendering/base/BaseAxisVisual.hh" #include "ignition/rendering/ogre/OgreVisual.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre/include/gz/rendering/ogre/OgreCamera.hh b/ogre/include/gz/rendering/ogre/OgreCamera.hh index a648ece20..4f22c9342 100644 --- a/ogre/include/gz/rendering/ogre/OgreCamera.hh +++ b/ogre/include/gz/rendering/ogre/OgreCamera.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE_OGRECAMERA_HH_ -#define IGNITION_RENDERING_OGRE_OGRECAMERA_HH_ +#ifndef GZ_RENDERING_OGRE_OGRECAMERA_HH_ +#define GZ_RENDERING_OGRE_OGRECAMERA_HH_ #include @@ -29,7 +29,7 @@ namespace Ogre class Camera; } -namespace ignition +namespace gz { namespace rendering { @@ -93,7 +93,7 @@ namespace ignition public: double FarClip() const; // Documentation inherited - public: virtual VisualPtr VisualAt(const ignition::math::Vector2i + public: virtual VisualPtr VisualAt(const gz::math::Vector2i &_mousePos) override; // Documentation Inherited. diff --git a/ogre/include/gz/rendering/ogre/OgreConversions.hh b/ogre/include/gz/rendering/ogre/OgreConversions.hh index 0bb3b632e..99657fafd 100644 --- a/ogre/include/gz/rendering/ogre/OgreConversions.hh +++ b/ogre/include/gz/rendering/ogre/OgreConversions.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE_OGRECONVERSIONS_HH_ -#define IGNITION_RENDERING_OGRE_OGRECONVERSIONS_HH_ +#ifndef GZ_RENDERING_OGRE_OGRECONVERSIONS_HH_ +#define GZ_RENDERING_OGRE_OGRECONVERSIONS_HH_ #include #include @@ -26,7 +26,7 @@ #include "ignition/rendering/ogre/OgreIncludes.hh" #include "ignition/rendering/ogre/Export.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre/include/gz/rendering/ogre/OgreDepthCamera.hh b/ogre/include/gz/rendering/ogre/OgreDepthCamera.hh index c989136ca..d73ff4a3e 100644 --- a/ogre/include/gz/rendering/ogre/OgreDepthCamera.hh +++ b/ogre/include/gz/rendering/ogre/OgreDepthCamera.hh @@ -15,8 +15,8 @@ * */ -#ifndef IGNITION_RENDERING_OGRE_OGREDEPTHCAMERA_HH_ -#define IGNITION_RENDERING_OGRE_OGREDEPTHCAMERA_HH_ +#ifndef GZ_RENDERING_OGRE_OGREDEPTHCAMERA_HH_ +#define GZ_RENDERING_OGRE_OGREDEPTHCAMERA_HH_ #ifdef _WIN32 // Ensure that Winsock2.h is included before Windows.h, which can get @@ -49,7 +49,7 @@ namespace Ogre class Viewport; } -namespace ignition +namespace gz { namespace rendering { @@ -87,14 +87,14 @@ namespace ignition /// \brief Connect a to the new depth image signal /// \param[in] _subscriber Subscriber callback function /// \return Pointer to the new Connection. This must be kept in scope - public: virtual ignition::common::ConnectionPtr ConnectNewDepthFrame( + public: virtual gz::common::ConnectionPtr ConnectNewDepthFrame( std::function _subscriber) override; /// \brief Connect a to the new rgb point cloud signal /// \param[in] _subscriber Subscriber callback function /// \return Pointer to the new Connection. This must be kept in scope - public: virtual ignition::common::ConnectionPtr ConnectNewRgbPointCloud( + public: virtual gz::common::ConnectionPtr ConnectNewRgbPointCloud( std::function _subscriber) override; diff --git a/ogre/include/gz/rendering/ogre/OgreDynamicLines.hh b/ogre/include/gz/rendering/ogre/OgreDynamicLines.hh index 09dc6f265..c23c610d7 100644 --- a/ogre/include/gz/rendering/ogre/OgreDynamicLines.hh +++ b/ogre/include/gz/rendering/ogre/OgreDynamicLines.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE_OGREDYNAMICLINES_HH_ -#define IGNITION_RENDERING_OGRE_OGREDYNAMICLINES_HH_ +#ifndef GZ_RENDERING_OGRE_OGREDYNAMICLINES_HH_ +#define GZ_RENDERING_OGRE_OGREDYNAMICLINES_HH_ #include #include @@ -26,7 +26,7 @@ #include "ignition/rendering/ogre/OgreConversions.hh" #include "ignition/rendering/ogre/OgreDynamicRenderable.hh" -namespace ignition +namespace gz { namespace rendering { @@ -50,39 +50,39 @@ namespace ignition public: virtual ~OgreDynamicLines(); /// \brief Add a point to the point list - /// \param[in] _pt ignition::math::Vector3d point - /// \param[in] _color ignition::math::Color Point color - public: void AddPoint(const ignition::math::Vector3d &_pt, - const ignition::math::Color &_color = ignition::math::Color::White); + /// \param[in] _pt gz::math::Vector3d point + /// \param[in] _color gz::math::Color Point color + public: void AddPoint(const gz::math::Vector3d &_pt, + const gz::math::Color &_color = gz::math::Color::White); /// \brief Add a point to the point list. /// \param[in] _x X position /// \param[in] _y Y position /// \param[in] _z Z position - /// \param[in] _color ignition::math::Color Point color + /// \param[in] _color gz::math::Color Point color public: void AddPoint(const double _x, const double _y, const double _z, - const ignition::math::Color &_color = ignition::math::Color::White); + const gz::math::Color &_color = gz::math::Color::White); /// \brief Change the location of an existing point in the point list /// \param[in] _index Index of the point to set - /// \param[in] _value ignition::math::Vector3d value to set the point to + /// \param[in] _value gz::math::Vector3d value to set the point to public: void SetPoint(unsigned int _index, - const ignition::math::Vector3d &_value); + const gz::math::Vector3d &_value); /// \brief Change the color of an existing point in the point list /// \param[in] _index Index of the point to set - /// \param[in] _color ignition::math::Color Pixelcolor color to set the + /// \param[in] _color gz::math::Color Pixelcolor color to set the /// point to public: void SetColor(unsigned int _index, - const ignition::math::Color &_color); + const gz::math::Color &_color); /// \brief Return the location of an existing point in the point list /// \param[in] _index Number of the point to return - /// \return ignition::math::Vector3d value of the point. A vector of - /// [ignition::math::INF_D, ignition::math::INF_D, ignition::math::INF_D] + /// \return gz::math::Vector3d value of the point. A vector of + /// [gz::math::INF_D, gz::math::INF_D, gz::math::INF_D] /// is returned when then the _index is out of bounds. - /// ignition::math::INF_D==std::numeric_limits::infinity() - public: ignition::math::Vector3d Point(unsigned int _index) const; + /// gz::math::INF_D==std::numeric_limits::infinity() + public: gz::math::Vector3d Point(unsigned int _index) const; /// \brief Return the total number of points in the point list /// \return Number of points diff --git a/ogre/include/gz/rendering/ogre/OgreDynamicRenderable.hh b/ogre/include/gz/rendering/ogre/OgreDynamicRenderable.hh index f27132405..6f5efc53a 100644 --- a/ogre/include/gz/rendering/ogre/OgreDynamicRenderable.hh +++ b/ogre/include/gz/rendering/ogre/OgreDynamicRenderable.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE_OGREDYNAMICRENDERABLE_HH_ -#define IGNITION_RENDERING_OGRE_OGREDYNAMICRENDERABLE_HH_ +#ifndef GZ_RENDERING_OGRE_OGREDYNAMICRENDERABLE_HH_ +#define GZ_RENDERING_OGRE_OGREDYNAMICRENDERABLE_HH_ #include #include "ignition/rendering/ogre/Export.hh" @@ -23,7 +23,7 @@ #include "ignition/rendering/ogre/OgreRenderTypes.hh" #include "ignition/rendering/Marker.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre/include/gz/rendering/ogre/OgreGaussianNoisePass.hh b/ogre/include/gz/rendering/ogre/OgreGaussianNoisePass.hh index 93c5ddee3..fb1fc2f0a 100644 --- a/ogre/include/gz/rendering/ogre/OgreGaussianNoisePass.hh +++ b/ogre/include/gz/rendering/ogre/OgreGaussianNoisePass.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE_OGREGAUSSIANNOISEPASS_HH_ -#define IGNITION_RENDERING_OGRE_OGREGAUSSIANNOISEPASS_HH_ +#ifndef GZ_RENDERING_OGRE_OGREGAUSSIANNOISEPASS_HH_ +#define GZ_RENDERING_OGRE_OGREGAUSSIANNOISEPASS_HH_ #include @@ -26,7 +26,7 @@ #include "ignition/rendering/ogre/OgreRenderPass.hh" #include "ignition/rendering/ogre/Export.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre/include/gz/rendering/ogre/OgreGeometry.hh b/ogre/include/gz/rendering/ogre/OgreGeometry.hh index 2700d3c97..616d4d5e6 100644 --- a/ogre/include/gz/rendering/ogre/OgreGeometry.hh +++ b/ogre/include/gz/rendering/ogre/OgreGeometry.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE_OGREGEOMETRY_HH_ -#define IGNITION_RENDERING_OGRE_OGREGEOMETRY_HH_ +#ifndef GZ_RENDERING_OGRE_OGREGEOMETRY_HH_ +#define GZ_RENDERING_OGRE_OGREGEOMETRY_HH_ #include @@ -27,7 +27,7 @@ namespace Ogre class MovableObject; } -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre/include/gz/rendering/ogre/OgreGizmoVisual.hh b/ogre/include/gz/rendering/ogre/OgreGizmoVisual.hh index 2fdb75e52..c7b8c3afb 100644 --- a/ogre/include/gz/rendering/ogre/OgreGizmoVisual.hh +++ b/ogre/include/gz/rendering/ogre/OgreGizmoVisual.hh @@ -14,13 +14,13 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE_OGREGIZMOVISUAL_HH_ -#define IGNITION_RENDERING_OGRE_OGREGIZMOVISUAL_HH_ +#ifndef GZ_RENDERING_OGRE_OGREGIZMOVISUAL_HH_ +#define GZ_RENDERING_OGRE_OGREGIZMOVISUAL_HH_ #include "ignition/rendering/base/BaseGizmoVisual.hh" #include "ignition/rendering/ogre/OgreVisual.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre/include/gz/rendering/ogre/OgreGpuRays.hh b/ogre/include/gz/rendering/ogre/OgreGpuRays.hh index fa39bee88..7ca231de0 100644 --- a/ogre/include/gz/rendering/ogre/OgreGpuRays.hh +++ b/ogre/include/gz/rendering/ogre/OgreGpuRays.hh @@ -15,8 +15,8 @@ * */ -#ifndef IGNITION_RENDERING_OGRE_OGREGPURAYS_HH_ -#define IGNITION_RENDERING_OGRE_OGREGPURAYS_HH_ +#ifndef GZ_RENDERING_OGRE_OGREGPURAYS_HH_ +#define GZ_RENDERING_OGRE_OGREGPURAYS_HH_ #include #include @@ -41,7 +41,7 @@ #include #endif -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre/include/gz/rendering/ogre/OgreGrid.hh b/ogre/include/gz/rendering/ogre/OgreGrid.hh index b6f188b56..ae52285c5 100644 --- a/ogre/include/gz/rendering/ogre/OgreGrid.hh +++ b/ogre/include/gz/rendering/ogre/OgreGrid.hh @@ -15,8 +15,8 @@ * */ -#ifndef IGNITION_RENDERING_OGRE_OGREGRID_HH_ -#define IGNITION_RENDERING_OGRE_OGREGRID_HH_ +#ifndef GZ_RENDERING_OGRE_OGREGRID_HH_ +#define GZ_RENDERING_OGRE_OGREGRID_HH_ #include #include "ignition/rendering/base/BaseGrid.hh" @@ -28,7 +28,7 @@ namespace Ogre class MovableObject; } -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre/include/gz/rendering/ogre/OgreIncludes.hh b/ogre/include/gz/rendering/ogre/OgreIncludes.hh index 66d504980..1e7dc45a4 100644 --- a/ogre/include/gz/rendering/ogre/OgreIncludes.hh +++ b/ogre/include/gz/rendering/ogre/OgreIncludes.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE_OGREINCLUDES_HH_ -#define IGNITION_RENDERING_OGRE_OGREINCLUDES_HH_ +#ifndef GZ_RENDERING_OGRE_OGREINCLUDES_HH_ +#define GZ_RENDERING_OGRE_OGREINCLUDES_HH_ // This disables warning messages for OGRE #ifndef _MSC_VER diff --git a/ogre/include/gz/rendering/ogre/OgreLight.hh b/ogre/include/gz/rendering/ogre/OgreLight.hh index d8db210b1..35ce9bd26 100644 --- a/ogre/include/gz/rendering/ogre/OgreLight.hh +++ b/ogre/include/gz/rendering/ogre/OgreLight.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE_OGRELIGHT_HH_ -#define IGNITION_RENDERING_OGRE_OGRELIGHT_HH_ +#ifndef GZ_RENDERING_OGRE_OGRELIGHT_HH_ +#define GZ_RENDERING_OGRE_OGRELIGHT_HH_ #include "ignition/rendering/base/BaseLight.hh" #include "ignition/rendering/ogre/OgreNode.hh" @@ -26,7 +26,7 @@ namespace Ogre class Light; } -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre/include/gz/rendering/ogre/OgreMarker.hh b/ogre/include/gz/rendering/ogre/OgreMarker.hh index ef98c16c9..fed13cf1c 100644 --- a/ogre/include/gz/rendering/ogre/OgreMarker.hh +++ b/ogre/include/gz/rendering/ogre/OgreMarker.hh @@ -15,15 +15,15 @@ * */ -#ifndef IGNITION_RENDERING_OGRE_OGREMARKER_HH_ -#define IGNITION_RENDERING_OGRE_OGREMARKER_HH_ +#ifndef GZ_RENDERING_OGRE_OGREMARKER_HH_ +#define GZ_RENDERING_OGRE_OGREMARKER_HH_ #include #include "ignition/rendering/base/BaseMarker.hh" #include "ignition/rendering/ogre/OgreGeometry.hh" #include "ignition/rendering/ogre/OgreIncludes.hh" -namespace ignition +namespace gz { namespace rendering { @@ -63,11 +63,11 @@ namespace ignition // Documentation inherited public: virtual void SetPoint(unsigned int _index, - const ignition::math::Vector3d &_value) override; + const gz::math::Vector3d &_value) override; // Documentation inherited - public: virtual void AddPoint(const ignition::math::Vector3d &_pt, - const ignition::math::Color &_color) override; + public: virtual void AddPoint(const gz::math::Vector3d &_pt, + const gz::math::Color &_color) override; // Documentation inherited public: virtual void ClearPoints() override; diff --git a/ogre/include/gz/rendering/ogre/OgreMaterial.hh b/ogre/include/gz/rendering/ogre/OgreMaterial.hh index d9cffa5e2..c63c33883 100644 --- a/ogre/include/gz/rendering/ogre/OgreMaterial.hh +++ b/ogre/include/gz/rendering/ogre/OgreMaterial.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE_OGREMATERIAL_HH_ -#define IGNITION_RENDERING_OGRE_OGREMATERIAL_HH_ +#ifndef GZ_RENDERING_OGRE_OGREMATERIAL_HH_ +#define GZ_RENDERING_OGRE_OGREMATERIAL_HH_ #include @@ -25,7 +25,7 @@ #include "ignition/rendering/ogre/OgreObject.hh" #include "ignition/rendering/ogre/OgreIncludes.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre/include/gz/rendering/ogre/OgreMaterialSwitcher.hh b/ogre/include/gz/rendering/ogre/OgreMaterialSwitcher.hh index b893dd058..c9aa6210b 100644 --- a/ogre/include/gz/rendering/ogre/OgreMaterialSwitcher.hh +++ b/ogre/include/gz/rendering/ogre/OgreMaterialSwitcher.hh @@ -15,8 +15,8 @@ * */ -#ifndef IGNITION_RENDERING_OGRE_OGREMATERIALSWITCHER_HH_ -#define IGNITION_RENDERING_OGRE_OGREMATERIALSWITCHER_HH_ +#ifndef GZ_RENDERING_OGRE_OGREMATERIALSWITCHER_HH_ +#define GZ_RENDERING_OGRE_OGREMATERIALSWITCHER_HH_ #include #include @@ -28,7 +28,7 @@ #include "ignition/rendering/ogre/OgreIncludes.hh" #include "ignition/rendering/ogre/OgreRenderTypes.hh" -namespace ignition +namespace gz { namespace rendering { @@ -60,7 +60,7 @@ namespace ignition /// \brief Get the entity with a specific color /// \param[in] _color The entity's color. public: std::string EntityName( - const ignition::math::Color &_color) const; + const gz::math::Color &_color) const; /// \brief Reset the color value incrementor public: void Reset(); @@ -93,7 +93,7 @@ namespace ignition const Ogre::RenderTargetEvent &_evt); /// \brief Current unique color value - private: ignition::math::Color currentColor; + private: gz::math::Color currentColor; /// \brief last entity assigned an unique color value private: std::string lastEntity; diff --git a/ogre/include/gz/rendering/ogre/OgreMesh.hh b/ogre/include/gz/rendering/ogre/OgreMesh.hh index cb4b50998..e537a4bd1 100644 --- a/ogre/include/gz/rendering/ogre/OgreMesh.hh +++ b/ogre/include/gz/rendering/ogre/OgreMesh.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE_OGREMESH_HH_ -#define IGNITION_RENDERING_OGRE_OGREMESH_HH_ +#ifndef GZ_RENDERING_OGRE_OGREMESH_HH_ +#define GZ_RENDERING_OGRE_OGREMESH_HH_ #include #include @@ -31,7 +31,7 @@ namespace Ogre class SubEntity; } -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre/include/gz/rendering/ogre/OgreMeshFactory.hh b/ogre/include/gz/rendering/ogre/OgreMeshFactory.hh index ceecd1916..2b3a3aaf3 100644 --- a/ogre/include/gz/rendering/ogre/OgreMeshFactory.hh +++ b/ogre/include/gz/rendering/ogre/OgreMeshFactory.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE_OGREMESHFACTORY_HH_ -#define IGNITION_RENDERING_OGRE_OGREMESHFACTORY_HH_ +#ifndef GZ_RENDERING_OGRE_OGREMESHFACTORY_HH_ +#define GZ_RENDERING_OGRE_OGREMESHFACTORY_HH_ #include #include @@ -29,7 +29,7 @@ namespace Ogre class Entity; } -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre/include/gz/rendering/ogre/OgreNode.hh b/ogre/include/gz/rendering/ogre/OgreNode.hh index a68e5a12f..c1d409d4d 100644 --- a/ogre/include/gz/rendering/ogre/OgreNode.hh +++ b/ogre/include/gz/rendering/ogre/OgreNode.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE_OGRENODE_HH_ -#define IGNITION_RENDERING_OGRE_OGRENODE_HH_ +#ifndef GZ_RENDERING_OGRE_OGRENODE_HH_ +#define GZ_RENDERING_OGRE_OGRENODE_HH_ #include @@ -28,7 +28,7 @@ namespace Ogre class SceneNode; } -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre/include/gz/rendering/ogre/OgreObject.hh b/ogre/include/gz/rendering/ogre/OgreObject.hh index e8d691516..4495ae2f2 100644 --- a/ogre/include/gz/rendering/ogre/OgreObject.hh +++ b/ogre/include/gz/rendering/ogre/OgreObject.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE_OGREOBJECT_HH_ -#define IGNITION_RENDERING_OGRE_OGREOBJECT_HH_ +#ifndef GZ_RENDERING_OGRE_OGREOBJECT_HH_ +#define GZ_RENDERING_OGRE_OGREOBJECT_HH_ #include @@ -23,7 +23,7 @@ #include "ignition/rendering/ogre/OgreRenderTypes.hh" #include "ignition/rendering/ogre/Export.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre/include/gz/rendering/ogre/OgreRTShaderSystem.hh b/ogre/include/gz/rendering/ogre/OgreRTShaderSystem.hh index 56450b8fc..f04d5b01f 100644 --- a/ogre/include/gz/rendering/ogre/OgreRTShaderSystem.hh +++ b/ogre/include/gz/rendering/ogre/OgreRTShaderSystem.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE_OGRERTSHADERSYSTEM_HH_ -#define IGNITION_RENDERING_OGRE_OGRERTSHADERSYSTEM_HH_ +#ifndef GZ_RENDERING_OGRE_OGRERTSHADERSYSTEM_HH_ +#define GZ_RENDERING_OGRE_OGRERTSHADERSYSTEM_HH_ #include #include @@ -25,7 +25,7 @@ #include "ignition/rendering/ogre/OgreRenderTypes.hh" #include "ignition/rendering/ogre/Export.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre/include/gz/rendering/ogre/OgreRayQuery.hh b/ogre/include/gz/rendering/ogre/OgreRayQuery.hh index 9d766082e..66675f598 100644 --- a/ogre/include/gz/rendering/ogre/OgreRayQuery.hh +++ b/ogre/include/gz/rendering/ogre/OgreRayQuery.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE_OGRERAYQUERY_HH_ -#define IGNITION_RENDERING_OGRE_OGRERAYQUERY_HH_ +#ifndef GZ_RENDERING_OGRE_OGRERAYQUERY_HH_ +#define GZ_RENDERING_OGRE_OGRERAYQUERY_HH_ #include @@ -24,7 +24,7 @@ #include "ignition/rendering/ogre/OgreObject.hh" #include "ignition/rendering/ogre/OgreRenderTypes.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre/include/gz/rendering/ogre/OgreRenderEngine.hh b/ogre/include/gz/rendering/ogre/OgreRenderEngine.hh index 6003fbc3b..bba6b23cd 100644 --- a/ogre/include/gz/rendering/ogre/OgreRenderEngine.hh +++ b/ogre/include/gz/rendering/ogre/OgreRenderEngine.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE_OGRERENDERENGINE_HH_ -#define IGNITION_RENDERING_OGRE_OGRERENDERENGINE_HH_ +#ifndef GZ_RENDERING_OGRE_OGRERENDERENGINE_HH_ +#define GZ_RENDERING_OGRE_OGRERENDERENGINE_HH_ #include #include @@ -37,7 +37,7 @@ namespace Ogre class Root; } -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre/include/gz/rendering/ogre/OgreRenderPass.hh b/ogre/include/gz/rendering/ogre/OgreRenderPass.hh index cbfe312e9..4c1412a0f 100644 --- a/ogre/include/gz/rendering/ogre/OgreRenderPass.hh +++ b/ogre/include/gz/rendering/ogre/OgreRenderPass.hh @@ -14,15 +14,15 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE_OGRERENDERPASS_HH_ -#define IGNITION_RENDERING_OGRE_OGRERENDERPASS_HH_ +#ifndef GZ_RENDERING_OGRE_OGRERENDERPASS_HH_ +#define GZ_RENDERING_OGRE_OGRERENDERPASS_HH_ #include "ignition/rendering/base/BaseRenderPass.hh" #include "ignition/rendering/ogre/Export.hh" #include "ignition/rendering/ogre/OgreIncludes.hh" #include "ignition/rendering/ogre/OgreObject.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre/include/gz/rendering/ogre/OgreRenderTarget.hh b/ogre/include/gz/rendering/ogre/OgreRenderTarget.hh index 26d18064f..bf53e618b 100644 --- a/ogre/include/gz/rendering/ogre/OgreRenderTarget.hh +++ b/ogre/include/gz/rendering/ogre/OgreRenderTarget.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE_OGRERENDERTARGET_HH_ -#define IGNITION_RENDERING_OGRE_OGRERENDERTARGET_HH_ +#ifndef GZ_RENDERING_OGRE_OGRERENDERTARGET_HH_ +#define GZ_RENDERING_OGRE_OGRERENDERTARGET_HH_ #include @@ -33,7 +33,7 @@ namespace Ogre class Texture; } -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre/include/gz/rendering/ogre/OgreRenderTargetMaterial.hh b/ogre/include/gz/rendering/ogre/OgreRenderTargetMaterial.hh index e738438e8..eabf3d951 100644 --- a/ogre/include/gz/rendering/ogre/OgreRenderTargetMaterial.hh +++ b/ogre/include/gz/rendering/ogre/OgreRenderTargetMaterial.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE_OGRRENDERTARGETMATERIAL_HH_ -#define IGNITION_RENDERING_OGRE_OGRRENDERTARGETMATERIAL_HH_ +#ifndef GZ_RENDERING_OGRE_OGRRENDERTARGETMATERIAL_HH_ +#define GZ_RENDERING_OGRE_OGRRENDERTARGETMATERIAL_HH_ #include @@ -31,7 +31,7 @@ #pragma warning(disable:4275) #endif -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre/include/gz/rendering/ogre/OgreRenderTypes.hh b/ogre/include/gz/rendering/ogre/OgreRenderTypes.hh index 7a29b2169..cdd44e988 100644 --- a/ogre/include/gz/rendering/ogre/OgreRenderTypes.hh +++ b/ogre/include/gz/rendering/ogre/OgreRenderTypes.hh @@ -14,13 +14,13 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE_OGRERENDERTYPES_HH_ -#define IGNITION_RENDERING_OGRE_OGRERENDERTYPES_HH_ +#ifndef GZ_RENDERING_OGRE_OGRERENDERTYPES_HH_ +#define GZ_RENDERING_OGRE_OGRERENDERTYPES_HH_ #include #include "ignition/rendering/base/BaseRenderTypes.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre/include/gz/rendering/ogre/OgreScene.hh b/ogre/include/gz/rendering/ogre/OgreScene.hh index 9f9ada4e6..11d94e405 100644 --- a/ogre/include/gz/rendering/ogre/OgreScene.hh +++ b/ogre/include/gz/rendering/ogre/OgreScene.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE_OGRESCENE_HH_ -#define IGNITION_RENDERING_OGRE_OGRESCENE_HH_ +#ifndef GZ_RENDERING_OGRE_OGRESCENE_HH_ +#define GZ_RENDERING_OGRE_OGRESCENE_HH_ #include #include @@ -30,7 +30,7 @@ namespace Ogre class SceneManager; } -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre/include/gz/rendering/ogre/OgreSelectionBuffer.hh b/ogre/include/gz/rendering/ogre/OgreSelectionBuffer.hh index 51c76af25..88ca27e85 100644 --- a/ogre/include/gz/rendering/ogre/OgreSelectionBuffer.hh +++ b/ogre/include/gz/rendering/ogre/OgreSelectionBuffer.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE_OGRESELECTIONBUFFER_HH_ -#define IGNITION_RENDERING_OGRE_OGRESELECTIONBUFFER_HH_ +#ifndef GZ_RENDERING_OGRE_OGRESELECTIONBUFFER_HH_ +#define GZ_RENDERING_OGRE_OGRESELECTIONBUFFER_HH_ #include #include @@ -30,7 +30,7 @@ namespace Ogre class SceneManager; } -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre/include/gz/rendering/ogre/OgreSensor.hh b/ogre/include/gz/rendering/ogre/OgreSensor.hh index 6f4e6f3c1..96ccbbee9 100644 --- a/ogre/include/gz/rendering/ogre/OgreSensor.hh +++ b/ogre/include/gz/rendering/ogre/OgreSensor.hh @@ -14,13 +14,13 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE_OGRESENSOR_HH_ -#define IGNITION_RENDERING_OGRE_OGRESENSOR_HH_ +#ifndef GZ_RENDERING_OGRE_OGRESENSOR_HH_ +#define GZ_RENDERING_OGRE_OGRESENSOR_HH_ #include "ignition/rendering/base/BaseSensor.hh" #include "ignition/rendering/ogre/OgreNode.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre/include/gz/rendering/ogre/OgreStorage.hh b/ogre/include/gz/rendering/ogre/OgreStorage.hh index bd113c1fb..577ea0128 100644 --- a/ogre/include/gz/rendering/ogre/OgreStorage.hh +++ b/ogre/include/gz/rendering/ogre/OgreStorage.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE_OGRESTORAGE_HH_ -#define IGNITION_RENDERING_OGRE_OGRESTORAGE_HH_ +#ifndef GZ_RENDERING_OGRE_OGRESTORAGE_HH_ +#define GZ_RENDERING_OGRE_OGRESTORAGE_HH_ #include #include "ignition/rendering/base/BaseStorage.hh" @@ -29,7 +29,7 @@ #include "ignition/rendering/ogre/OgreSensor.hh" #include "ignition/rendering/ogre/OgreVisual.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre/include/gz/rendering/ogre/OgreText.hh b/ogre/include/gz/rendering/ogre/OgreText.hh index 61511d5a0..b73cc31e1 100644 --- a/ogre/include/gz/rendering/ogre/OgreText.hh +++ b/ogre/include/gz/rendering/ogre/OgreText.hh @@ -15,8 +15,8 @@ * */ -#ifndef IGNITION_RENDERING_OGRE_OGRETEXT_HH_ -#define IGNITION_RENDERING_OGRE_OGRETEXT_HH_ +#ifndef GZ_RENDERING_OGRE_OGRETEXT_HH_ +#define GZ_RENDERING_OGRE_OGRETEXT_HH_ #include #include @@ -29,7 +29,7 @@ #include "ignition/rendering/ogre/OgreIncludes.hh" #include "ignition/rendering/ogre/Export.hh" -namespace ignition +namespace gz { namespace rendering { @@ -71,7 +71,7 @@ namespace ignition public: virtual void SetTextString(const std::string &_text) override; // Documentation inherited. - public: virtual void SetColor(const ignition::math::Color &_color) + public: virtual void SetColor(const gz::math::Color &_color) override; // Documentation inherited. @@ -91,7 +91,7 @@ namespace ignition public: virtual void SetShowOnTop(const bool _onTop) override; // Documentation inherited. - public: virtual ignition::math::AxisAlignedBox AABB() const override; + public: virtual gz::math::AxisAlignedBox AABB() const override; /// \brief Set material to text geometry. /// \param[in] _material Ogre material. diff --git a/ogre/include/gz/rendering/ogre/OgreThermalCamera.hh b/ogre/include/gz/rendering/ogre/OgreThermalCamera.hh index 35e763aff..f89a402ce 100644 --- a/ogre/include/gz/rendering/ogre/OgreThermalCamera.hh +++ b/ogre/include/gz/rendering/ogre/OgreThermalCamera.hh @@ -15,8 +15,8 @@ * */ -#ifndef IGNITION_RENDERING_OGRE_OGRETHERMALCAMERA_HH_ -#define IGNITION_RENDERING_OGRE_OGRETHERMALCAMERA_HH_ +#ifndef GZ_RENDERING_OGRE_OGRETHERMALCAMERA_HH_ +#define GZ_RENDERING_OGRE_OGRETHERMALCAMERA_HH_ #ifdef _WIN32 // Ensure that Winsock2.h is included before Windows.h, which can get @@ -47,7 +47,7 @@ namespace Ogre class Camera; } -namespace ignition +namespace gz { namespace rendering { @@ -81,7 +81,7 @@ namespace ignition /// \brief Connect to the new thermal image signal /// \param[in] _subscriber Subscriber callback function /// \return Pointer to the new Connection. This must be kept in scope - public: virtual ignition::common::ConnectionPtr ConnectNewThermalFrame( + public: virtual gz::common::ConnectionPtr ConnectNewThermalFrame( std::function _subscriber) override; diff --git a/ogre/include/gz/rendering/ogre/OgreVisual.hh b/ogre/include/gz/rendering/ogre/OgreVisual.hh index 228137b67..71757d9d3 100644 --- a/ogre/include/gz/rendering/ogre/OgreVisual.hh +++ b/ogre/include/gz/rendering/ogre/OgreVisual.hh @@ -14,14 +14,14 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE_OGREVISUAL_HH_ -#define IGNITION_RENDERING_OGRE_OGREVISUAL_HH_ +#ifndef GZ_RENDERING_OGRE_OGREVISUAL_HH_ +#define GZ_RENDERING_OGRE_OGREVISUAL_HH_ #include "ignition/rendering/base/BaseVisual.hh" #include "ignition/rendering/ogre/OgreNode.hh" #include "ignition/rendering/ogre/OgreRenderTypes.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre/include/ignition/rendering/ogre.hh b/ogre/include/ignition/rendering/ogre.hh new file mode 100644 index 000000000..4e6486152 --- /dev/null +++ b/ogre/include/ignition/rendering/ogre.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre/include/ignition/rendering/ogre/Export.hh b/ogre/include/ignition/rendering/ogre/Export.hh new file mode 100644 index 000000000..e47fd1851 --- /dev/null +++ b/ogre/include/ignition/rendering/ogre/Export.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre/include/ignition/rendering/ogre/OgreArrowVisual.hh b/ogre/include/ignition/rendering/ogre/OgreArrowVisual.hh new file mode 100644 index 000000000..90e1bca8e --- /dev/null +++ b/ogre/include/ignition/rendering/ogre/OgreArrowVisual.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre/include/ignition/rendering/ogre/OgreAxisVisual.hh b/ogre/include/ignition/rendering/ogre/OgreAxisVisual.hh new file mode 100644 index 000000000..4cfcbd33a --- /dev/null +++ b/ogre/include/ignition/rendering/ogre/OgreAxisVisual.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre/include/ignition/rendering/ogre/OgreCamera.hh b/ogre/include/ignition/rendering/ogre/OgreCamera.hh new file mode 100644 index 000000000..6e81e2112 --- /dev/null +++ b/ogre/include/ignition/rendering/ogre/OgreCamera.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre/include/ignition/rendering/ogre/OgreConversions.hh b/ogre/include/ignition/rendering/ogre/OgreConversions.hh new file mode 100644 index 000000000..88adfcdaa --- /dev/null +++ b/ogre/include/ignition/rendering/ogre/OgreConversions.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre/include/ignition/rendering/ogre/OgreDepthCamera.hh b/ogre/include/ignition/rendering/ogre/OgreDepthCamera.hh new file mode 100644 index 000000000..879bc7296 --- /dev/null +++ b/ogre/include/ignition/rendering/ogre/OgreDepthCamera.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre/include/ignition/rendering/ogre/OgreDynamicLines.hh b/ogre/include/ignition/rendering/ogre/OgreDynamicLines.hh new file mode 100644 index 000000000..1f909473b --- /dev/null +++ b/ogre/include/ignition/rendering/ogre/OgreDynamicLines.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre/include/ignition/rendering/ogre/OgreDynamicRenderable.hh b/ogre/include/ignition/rendering/ogre/OgreDynamicRenderable.hh new file mode 100644 index 000000000..3c800846e --- /dev/null +++ b/ogre/include/ignition/rendering/ogre/OgreDynamicRenderable.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre/include/ignition/rendering/ogre/OgreGaussianNoisePass.hh b/ogre/include/ignition/rendering/ogre/OgreGaussianNoisePass.hh new file mode 100644 index 000000000..35c88ee26 --- /dev/null +++ b/ogre/include/ignition/rendering/ogre/OgreGaussianNoisePass.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre/include/ignition/rendering/ogre/OgreGeometry.hh b/ogre/include/ignition/rendering/ogre/OgreGeometry.hh new file mode 100644 index 000000000..263043a72 --- /dev/null +++ b/ogre/include/ignition/rendering/ogre/OgreGeometry.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre/include/ignition/rendering/ogre/OgreGizmoVisual.hh b/ogre/include/ignition/rendering/ogre/OgreGizmoVisual.hh new file mode 100644 index 000000000..6ecdbe616 --- /dev/null +++ b/ogre/include/ignition/rendering/ogre/OgreGizmoVisual.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre/include/ignition/rendering/ogre/OgreGpuRays.hh b/ogre/include/ignition/rendering/ogre/OgreGpuRays.hh new file mode 100644 index 000000000..3a7cfcc2b --- /dev/null +++ b/ogre/include/ignition/rendering/ogre/OgreGpuRays.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre/include/ignition/rendering/ogre/OgreGrid.hh b/ogre/include/ignition/rendering/ogre/OgreGrid.hh new file mode 100644 index 000000000..13e5c30cb --- /dev/null +++ b/ogre/include/ignition/rendering/ogre/OgreGrid.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre/include/ignition/rendering/ogre/OgreIncludes.hh b/ogre/include/ignition/rendering/ogre/OgreIncludes.hh new file mode 100644 index 000000000..4cbddfd32 --- /dev/null +++ b/ogre/include/ignition/rendering/ogre/OgreIncludes.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre/include/ignition/rendering/ogre/OgreLight.hh b/ogre/include/ignition/rendering/ogre/OgreLight.hh new file mode 100644 index 000000000..50f9315f1 --- /dev/null +++ b/ogre/include/ignition/rendering/ogre/OgreLight.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre/include/ignition/rendering/ogre/OgreMarker.hh b/ogre/include/ignition/rendering/ogre/OgreMarker.hh new file mode 100644 index 000000000..2eb74ea3f --- /dev/null +++ b/ogre/include/ignition/rendering/ogre/OgreMarker.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre/include/ignition/rendering/ogre/OgreMaterial.hh b/ogre/include/ignition/rendering/ogre/OgreMaterial.hh new file mode 100644 index 000000000..8cbfc0fce --- /dev/null +++ b/ogre/include/ignition/rendering/ogre/OgreMaterial.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre/include/ignition/rendering/ogre/OgreMaterialSwitcher.hh b/ogre/include/ignition/rendering/ogre/OgreMaterialSwitcher.hh new file mode 100644 index 000000000..239381654 --- /dev/null +++ b/ogre/include/ignition/rendering/ogre/OgreMaterialSwitcher.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre/include/ignition/rendering/ogre/OgreMesh.hh b/ogre/include/ignition/rendering/ogre/OgreMesh.hh new file mode 100644 index 000000000..157be78c8 --- /dev/null +++ b/ogre/include/ignition/rendering/ogre/OgreMesh.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre/include/ignition/rendering/ogre/OgreMeshFactory.hh b/ogre/include/ignition/rendering/ogre/OgreMeshFactory.hh new file mode 100644 index 000000000..9427ded93 --- /dev/null +++ b/ogre/include/ignition/rendering/ogre/OgreMeshFactory.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre/include/ignition/rendering/ogre/OgreNode.hh b/ogre/include/ignition/rendering/ogre/OgreNode.hh new file mode 100644 index 000000000..1a912d5ec --- /dev/null +++ b/ogre/include/ignition/rendering/ogre/OgreNode.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre/include/ignition/rendering/ogre/OgreObject.hh b/ogre/include/ignition/rendering/ogre/OgreObject.hh new file mode 100644 index 000000000..475e12b5a --- /dev/null +++ b/ogre/include/ignition/rendering/ogre/OgreObject.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre/include/ignition/rendering/ogre/OgreRTShaderSystem.hh b/ogre/include/ignition/rendering/ogre/OgreRTShaderSystem.hh new file mode 100644 index 000000000..06d2a35ad --- /dev/null +++ b/ogre/include/ignition/rendering/ogre/OgreRTShaderSystem.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre/include/ignition/rendering/ogre/OgreRayQuery.hh b/ogre/include/ignition/rendering/ogre/OgreRayQuery.hh new file mode 100644 index 000000000..9b8060d87 --- /dev/null +++ b/ogre/include/ignition/rendering/ogre/OgreRayQuery.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre/include/ignition/rendering/ogre/OgreRenderEngine.hh b/ogre/include/ignition/rendering/ogre/OgreRenderEngine.hh new file mode 100644 index 000000000..8ada49d91 --- /dev/null +++ b/ogre/include/ignition/rendering/ogre/OgreRenderEngine.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre/include/ignition/rendering/ogre/OgreRenderPass.hh b/ogre/include/ignition/rendering/ogre/OgreRenderPass.hh new file mode 100644 index 000000000..8499a6950 --- /dev/null +++ b/ogre/include/ignition/rendering/ogre/OgreRenderPass.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre/include/ignition/rendering/ogre/OgreRenderTarget.hh b/ogre/include/ignition/rendering/ogre/OgreRenderTarget.hh new file mode 100644 index 000000000..19c800a2f --- /dev/null +++ b/ogre/include/ignition/rendering/ogre/OgreRenderTarget.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre/include/ignition/rendering/ogre/OgreRenderTargetMaterial.hh b/ogre/include/ignition/rendering/ogre/OgreRenderTargetMaterial.hh new file mode 100644 index 000000000..e2dceb240 --- /dev/null +++ b/ogre/include/ignition/rendering/ogre/OgreRenderTargetMaterial.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre/include/ignition/rendering/ogre/OgreRenderTypes.hh b/ogre/include/ignition/rendering/ogre/OgreRenderTypes.hh new file mode 100644 index 000000000..a7984f454 --- /dev/null +++ b/ogre/include/ignition/rendering/ogre/OgreRenderTypes.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre/include/ignition/rendering/ogre/OgreScene.hh b/ogre/include/ignition/rendering/ogre/OgreScene.hh new file mode 100644 index 000000000..57d7e3386 --- /dev/null +++ b/ogre/include/ignition/rendering/ogre/OgreScene.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre/include/ignition/rendering/ogre/OgreSelectionBuffer.hh b/ogre/include/ignition/rendering/ogre/OgreSelectionBuffer.hh new file mode 100644 index 000000000..1368dace4 --- /dev/null +++ b/ogre/include/ignition/rendering/ogre/OgreSelectionBuffer.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre/include/ignition/rendering/ogre/OgreSensor.hh b/ogre/include/ignition/rendering/ogre/OgreSensor.hh new file mode 100644 index 000000000..4bb39d0b8 --- /dev/null +++ b/ogre/include/ignition/rendering/ogre/OgreSensor.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre/include/ignition/rendering/ogre/OgreStorage.hh b/ogre/include/ignition/rendering/ogre/OgreStorage.hh new file mode 100644 index 000000000..4dcf7e553 --- /dev/null +++ b/ogre/include/ignition/rendering/ogre/OgreStorage.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre/include/ignition/rendering/ogre/OgreText.hh b/ogre/include/ignition/rendering/ogre/OgreText.hh new file mode 100644 index 000000000..6bca24fdf --- /dev/null +++ b/ogre/include/ignition/rendering/ogre/OgreText.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre/include/ignition/rendering/ogre/OgreThermalCamera.hh b/ogre/include/ignition/rendering/ogre/OgreThermalCamera.hh new file mode 100644 index 000000000..ee3696e49 --- /dev/null +++ b/ogre/include/ignition/rendering/ogre/OgreThermalCamera.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre/include/ignition/rendering/ogre/OgreVisual.hh b/ogre/include/ignition/rendering/ogre/OgreVisual.hh new file mode 100644 index 000000000..97b23807e --- /dev/null +++ b/ogre/include/ignition/rendering/ogre/OgreVisual.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre/src/OgreArrowVisual.cc b/ogre/src/OgreArrowVisual.cc index d32693a05..51f83e9f8 100644 --- a/ogre/src/OgreArrowVisual.cc +++ b/ogre/src/OgreArrowVisual.cc @@ -16,7 +16,7 @@ */ #include "ignition/rendering/ogre/OgreArrowVisual.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre/src/OgreAxisVisual.cc b/ogre/src/OgreAxisVisual.cc index 22e98e888..3bf4f12fc 100644 --- a/ogre/src/OgreAxisVisual.cc +++ b/ogre/src/OgreAxisVisual.cc @@ -16,7 +16,7 @@ */ #include "ignition/rendering/ogre/OgreAxisVisual.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre/src/OgreCamera.cc b/ogre/src/OgreCamera.cc index e6fa9f78b..818503664 100644 --- a/ogre/src/OgreCamera.cc +++ b/ogre/src/OgreCamera.cc @@ -24,7 +24,7 @@ #include "ignition/rendering/ogre/OgreSelectionBuffer.hh" #include "ignition/rendering/Utils.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre/src/OgreConversions.cc b/ogre/src/OgreConversions.cc index e03e5ea4e..710459834 100644 --- a/ogre/src/OgreConversions.cc +++ b/ogre/src/OgreConversions.cc @@ -16,7 +16,7 @@ */ #include "ignition/rendering/ogre/OgreConversions.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre/src/OgreDepthCamera.cc b/ogre/src/OgreDepthCamera.cc index 44b937986..e2cc77fc1 100644 --- a/ogre/src/OgreDepthCamera.cc +++ b/ogre/src/OgreDepthCamera.cc @@ -28,7 +28,7 @@ /// \internal /// \brief Private data for the OgreDepthCamera class -class ignition::rendering::OgreDepthCameraPrivate +class gz::rendering::OgreDepthCameraPrivate { /// \brief The depth buffer public: float *depthBuffer = nullptr; @@ -58,23 +58,23 @@ class ignition::rendering::OgreDepthCameraPrivate public: bool outputPoints = false; /// \brief maximum value used for data outside sensor range - public: float dataMaxVal = ignition::math::INF_D; + public: float dataMaxVal = gz::math::INF_D; /// \brief minimum value used for data outside sensor range - public: float dataMinVal = -ignition::math::INF_D; + public: float dataMinVal = -gz::math::INF_D; /// \brief Event used to signal rgb point cloud data - public: ignition::common::EventT newRgbPointCloud; /// \brief Event used to signal depth data - public: ignition::common::EventT newDepthFrame; }; -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre/src/OgreDynamicLines.cc b/ogre/src/OgreDynamicLines.cc index 0c3b7be18..3284eb388 100644 --- a/ogre/src/OgreDynamicLines.cc +++ b/ogre/src/OgreDynamicLines.cc @@ -23,14 +23,14 @@ #include "ignition/common/Console.hh" #include "ignition/rendering/ogre/OgreDynamicLines.hh" -using namespace ignition; +using namespace gz; using namespace rendering; enum {POSITION_BINDING, TEXCOORD_BINDING}; /// \brief Private implementation -class ignition::rendering::OgreDynamicLinesPrivate +class gz::rendering::OgreDynamicLinesPrivate { /// \brief list of colors at each point public: std::vector colors; diff --git a/ogre/src/OgreDynamicRenderable.cc b/ogre/src/OgreDynamicRenderable.cc index cca6792da..727913050 100644 --- a/ogre/src/OgreDynamicRenderable.cc +++ b/ogre/src/OgreDynamicRenderable.cc @@ -18,7 +18,7 @@ #include "ignition/common/Console.hh" #include "ignition/rendering/ogre/OgreDynamicRenderable.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre/src/OgreGaussianNoisePass.cc b/ogre/src/OgreGaussianNoisePass.cc index 082c89f18..55017aaa8 100644 --- a/ogre/src/OgreGaussianNoisePass.cc +++ b/ogre/src/OgreGaussianNoisePass.cc @@ -22,7 +22,7 @@ #include "ignition/rendering/ogre/OgreIncludes.hh" #include "ignition/rendering/ogre/OgreGaussianNoisePass.hh" -namespace ignition +namespace gz { namespace rendering { @@ -55,9 +55,9 @@ namespace ignition // Sample three values within the range [0,1.0] and set them for use in // the fragment shader, which will interpret them as offsets from (0,0) // to use when computing pseudo-random values. - Ogre::Vector3 offsets(ignition::math::Rand::DblUniform(0.0, 1.0), - ignition::math::Rand::DblUniform(0.0, 1.0), - ignition::math::Rand::DblUniform(0.0, 1.0)); + Ogre::Vector3 offsets(gz::math::Rand::DblUniform(0.0, 1.0), + gz::math::Rand::DblUniform(0.0, 1.0), + gz::math::Rand::DblUniform(0.0, 1.0)); // These calls are setting parameters that are declared in two places: // 1. media/materials/scripts/gaussian_noise.material, in // fragment_program GaussianNoiseFS @@ -89,7 +89,7 @@ namespace ignition } } -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre/src/OgreGeometry.cc b/ogre/src/OgreGeometry.cc index 821967c35..7c57aa2ca 100644 --- a/ogre/src/OgreGeometry.cc +++ b/ogre/src/OgreGeometry.cc @@ -19,7 +19,7 @@ #include "ignition/rendering/ogre/OgreScene.hh" #include "ignition/rendering/ogre/OgreVisual.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre/src/OgreGizmoVisual.cc b/ogre/src/OgreGizmoVisual.cc index 8cbfc67ff..8d42bb7ab 100644 --- a/ogre/src/OgreGizmoVisual.cc +++ b/ogre/src/OgreGizmoVisual.cc @@ -16,7 +16,7 @@ */ #include "ignition/rendering/ogre/OgreGizmoVisual.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre/src/OgreGpuRays.cc b/ogre/src/OgreGpuRays.cc index 56bbd907b..17bfaedaa 100644 --- a/ogre/src/OgreGpuRays.cc +++ b/ogre/src/OgreGpuRays.cc @@ -29,7 +29,7 @@ /// \internal /// \brief Private data for the OgreGpuRays class -class ignition::rendering::OgreGpuRaysPrivate +class gz::rendering::OgreGpuRaysPrivate { /// \brief Event triggered when new gpu rays range data are available. /// \param[in] _frame New frame containing raw gpu rays data. @@ -37,7 +37,7 @@ class ignition::rendering::OgreGpuRaysPrivate /// \param[in] _height Height of frame. /// \param[in] _channels Number of channels /// \param[in] _format Format of frame. - public: ignition::common::EventT newGpuRaysFrame; @@ -126,7 +126,7 @@ class ignition::rendering::OgreGpuRaysPrivate public: unsigned int cameraCount = 1; }; -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre/src/OgreGrid.cc b/ogre/src/OgreGrid.cc index 168ab96ea..d4b01b8fe 100644 --- a/ogre/src/OgreGrid.cc +++ b/ogre/src/OgreGrid.cc @@ -21,7 +21,7 @@ #include "ignition/rendering/ogre/OgreMaterial.hh" #include "ignition/rendering/ogre/OgreScene.hh" -class ignition::rendering::OgreGridPrivate +class gz::rendering::OgreGridPrivate { /// \brief Grid materal public: OgreMaterialPtr material; @@ -30,7 +30,7 @@ class ignition::rendering::OgreGridPrivate public: Ogre::ManualObject *manualObject = nullptr; }; -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre/src/OgreLight.cc b/ogre/src/OgreLight.cc index 6022de883..3c9953d66 100644 --- a/ogre/src/OgreLight.cc +++ b/ogre/src/OgreLight.cc @@ -23,7 +23,7 @@ #include "ignition/rendering/ogre/OgreIncludes.hh" #include "ignition/rendering/ogre/OgreScene.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre/src/OgreMarker.cc b/ogre/src/OgreMarker.cc index 43de0a0bc..340f0024d 100644 --- a/ogre/src/OgreMarker.cc +++ b/ogre/src/OgreMarker.cc @@ -23,7 +23,7 @@ #include "ignition/rendering/ogre/OgreMesh.hh" #include "ignition/rendering/ogre/OgreScene.hh" -class ignition::rendering::OgreMarkerPrivate +class gz::rendering::OgreMarkerPrivate { /// \brief Marker material public: OgreMaterialPtr material = nullptr; @@ -35,7 +35,7 @@ class ignition::rendering::OgreMarkerPrivate public: OgreMeshPtr mesh = nullptr; }; -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre/src/OgreMaterial.cc b/ogre/src/OgreMaterial.cc index 29eb8a821..881d0052d 100644 --- a/ogre/src/OgreMaterial.cc +++ b/ogre/src/OgreMaterial.cc @@ -25,7 +25,7 @@ #include "ignition/rendering/ogre/OgreRTShaderSystem.hh" #include "ignition/rendering/ogre/OgreScene.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre/src/OgreMaterialSwitcher.cc b/ogre/src/OgreMaterialSwitcher.cc index f7b692534..1b2f903c9 100644 --- a/ogre/src/OgreMaterialSwitcher.cc +++ b/ogre/src/OgreMaterialSwitcher.cc @@ -20,7 +20,7 @@ #include "ignition/rendering/ogre/OgreMaterialSwitcher.hh" #include "ignition/rendering/RenderTypes.hh" -using namespace ignition; +using namespace gz; using namespace rendering; diff --git a/ogre/src/OgreMesh.cc b/ogre/src/OgreMesh.cc index 213ff3e9c..741fca8fd 100644 --- a/ogre/src/OgreMesh.cc +++ b/ogre/src/OgreMesh.cc @@ -23,7 +23,7 @@ #include "ignition/rendering/ogre/OgreStorage.hh" #include "ignition/rendering/ogre/OgreRTShaderSystem.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre/src/OgreMeshFactory.cc b/ogre/src/OgreMeshFactory.cc index 365eef9bc..0fa331b77 100644 --- a/ogre/src/OgreMeshFactory.cc +++ b/ogre/src/OgreMeshFactory.cc @@ -33,7 +33,7 @@ #include "ignition/rendering/ogre/OgreStorage.hh" #include "ignition/rendering/ogre/OgreIncludes.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre/src/OgreNode.cc b/ogre/src/OgreNode.cc index 2a3196549..9b1c40651 100644 --- a/ogre/src/OgreNode.cc +++ b/ogre/src/OgreNode.cc @@ -23,7 +23,7 @@ #include "ignition/rendering/ogre/OgreScene.hh" #include "ignition/rendering/ogre/OgreStorage.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre/src/OgreObject.cc b/ogre/src/OgreObject.cc index 2b2fed8b7..cea595082 100644 --- a/ogre/src/OgreObject.cc +++ b/ogre/src/OgreObject.cc @@ -18,7 +18,7 @@ #include "ignition/rendering/ogre/OgreScene.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre/src/OgreRTShaderSystem.cc b/ogre/src/OgreRTShaderSystem.cc index 5be5d2e1b..6cfd11d20 100644 --- a/ogre/src/OgreRTShaderSystem.cc +++ b/ogre/src/OgreRTShaderSystem.cc @@ -35,7 +35,7 @@ #include "ignition/rendering/ogre/OgreMesh.hh" #include "ignition/rendering/ogre/OgreRTShaderSystem.hh" -class ignition::rendering::OgreRTShaderSystemPrivate +class gz::rendering::OgreRTShaderSystemPrivate { /// \brief The shader generator. public: Ogre::RTShader::ShaderGenerator *shaderGenerator = nullptr; @@ -72,7 +72,7 @@ class ignition::rendering::OgreRTShaderSystemPrivate public: bool resetShadows = false; }; -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre/src/OgreRayQuery.cc b/ogre/src/OgreRayQuery.cc index e5e54b117..171f99af9 100644 --- a/ogre/src/OgreRayQuery.cc +++ b/ogre/src/OgreRayQuery.cc @@ -25,13 +25,13 @@ #include "ignition/rendering/ogre/OgreRayQuery.hh" #include "ignition/rendering/ogre/OgreScene.hh" -class ignition::rendering::OgreRayQueryPrivate +class gz::rendering::OgreRayQueryPrivate { /// \brief Ogre ray scene query object for computing intersection. public: Ogre::RaySceneQuery *rayQuery = nullptr; }; -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre/src/OgreRenderEngine.cc b/ogre/src/OgreRenderEngine.cc index 3279710a5..319a29a93 100644 --- a/ogre/src/OgreRenderEngine.cc +++ b/ogre/src/OgreRenderEngine.cc @@ -44,7 +44,7 @@ #include "ignition/rendering/ogre/OgreScene.hh" #include "ignition/rendering/ogre/OgreStorage.hh" -class ignition::rendering::OgreRenderEnginePrivate +class gz::rendering::OgreRenderEnginePrivate { #if !defined(__APPLE__) && !defined(_WIN32) public: XVisualInfo *dummyVisual = nullptr; @@ -54,7 +54,7 @@ class ignition::rendering::OgreRenderEnginePrivate public: std::vector fsaaLevels; }; -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre/src/OgreRenderPass.cc b/ogre/src/OgreRenderPass.cc index ce36cd804..81608df6b 100644 --- a/ogre/src/OgreRenderPass.cc +++ b/ogre/src/OgreRenderPass.cc @@ -17,7 +17,7 @@ #include "ignition/rendering/ogre/OgreRenderPass.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre/src/OgreRenderTarget.cc b/ogre/src/OgreRenderTarget.cc index c482fb6ac..fc1c98043 100644 --- a/ogre/src/OgreRenderTarget.cc +++ b/ogre/src/OgreRenderTarget.cc @@ -47,7 +47,7 @@ #include "ignition/rendering/ogre/OgreCamera.hh" #include "ignition/rendering/ogre/OgreIncludes.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre/src/OgreRenderTargetMaterial.cc b/ogre/src/OgreRenderTargetMaterial.cc index b3f9ed84b..509ae2fda 100644 --- a/ogre/src/OgreRenderTargetMaterial.cc +++ b/ogre/src/OgreRenderTargetMaterial.cc @@ -18,7 +18,7 @@ #include "ignition/rendering/ogre/OgreScene.hh" #include "ignition/rendering/ogre/OgreRenderTargetMaterial.hh" -using namespace ignition::rendering; +using namespace gz::rendering; ////////////////////////////////////////////////// diff --git a/ogre/src/OgreScene.cc b/ogre/src/OgreScene.cc index 094576830..b557312d6 100644 --- a/ogre/src/OgreScene.cc +++ b/ogre/src/OgreScene.cc @@ -40,7 +40,7 @@ #include "ignition/rendering/ogre/OgreThermalCamera.hh" #include "ignition/rendering/ogre/OgreVisual.hh" -namespace ignition +namespace gz { namespace rendering { @@ -119,7 +119,7 @@ namespace ignition } } -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre/src/OgreSelectionBuffer.cc b/ogre/src/OgreSelectionBuffer.cc index 09a41083b..ded4b4d2e 100644 --- a/ogre/src/OgreSelectionBuffer.cc +++ b/ogre/src/OgreSelectionBuffer.cc @@ -24,10 +24,10 @@ #include "ignition/rendering/ogre/OgreMaterialSwitcher.hh" #include "ignition/rendering/ogre/OgreSelectionBuffer.hh" -using namespace ignition; +using namespace gz; using namespace rendering; -class ignition::rendering::OgreSelectionBufferPrivate +class gz::rendering::OgreSelectionBufferPrivate { /// \brief This is a material listener and a RenderTargetListener. /// The material switcher is applied to only the selection camera diff --git a/ogre/src/OgreSensor.cc b/ogre/src/OgreSensor.cc index 58c965834..27e342334 100644 --- a/ogre/src/OgreSensor.cc +++ b/ogre/src/OgreSensor.cc @@ -16,7 +16,7 @@ */ #include "ignition/rendering/ogre/OgreSensor.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre/src/OgreText.cc b/ogre/src/OgreText.cc index 1d2841a44..0fe8da5f3 100644 --- a/ogre/src/OgreText.cc +++ b/ogre/src/OgreText.cc @@ -30,7 +30,7 @@ #define POS_TEX_BINDING 0 #define COLOUR_BINDING 1 -class ignition::rendering::OgreMovableText +class gz::rendering::OgreMovableText : public Ogre::MovableObject, public Ogre::Renderable { /// \brief Constructor @@ -50,7 +50,7 @@ class ignition::rendering::OgreMovableText /// \brief Set the text color. /// \param[in] _color Text color. - public: void SetColor(const ignition::math::Color &_color); + public: void SetColor(const gz::math::Color &_color); /// \brief Set the height of the character in meters. /// \param[in] _height Height of the characters. @@ -77,7 +77,7 @@ class ignition::rendering::OgreMovableText /// \brief Get the axis aligned bounding box of the text. /// \return The axis aligned bounding box. - public: ignition::math::AxisAlignedBox AABB() const; + public: gz::math::AxisAlignedBox AABB() const; /// \brief Setup the geometry based on input text string. public: void SetupGeometry(); @@ -187,7 +187,7 @@ class ignition::rendering::OgreMovableText private: std::string text; /// \brief Text color - private: ignition::math::Color color; + private: gz::math::Color color; /// \brief Character height in meters private: float charHeight = 0.0; @@ -210,7 +210,7 @@ class ignition::rendering::OgreMovableText }; /// \brief Private data for the OgreText class. -class ignition::rendering::OgreTextPrivate +class gz::rendering::OgreTextPrivate { /// \brief Text materal public: OgreMaterialPtr material; @@ -219,7 +219,7 @@ class ignition::rendering::OgreTextPrivate public: std::unique_ptr ogreObj; }; -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre/src/OgreThermalCamera.cc b/ogre/src/OgreThermalCamera.cc index 84d6a76f8..52ba8d338 100644 --- a/ogre/src/OgreThermalCamera.cc +++ b/ogre/src/OgreThermalCamera.cc @@ -31,7 +31,7 @@ #include "ignition/rendering/ogre/OgreMaterial.hh" #include "ignition/rendering/ogre/OgreVisual.hh" -namespace ignition +namespace gz { namespace rendering { @@ -90,7 +90,7 @@ class OgreThermalCameraMaterialSwitcher : public Ogre::RenderTargetListener, /// \internal /// \brief Private data for the OgreThermalCamera class -class ignition::rendering::OgreThermalCameraPrivate +class gz::rendering::OgreThermalCameraPrivate { /// \brief The thermal material public: Ogre::MaterialPtr thermalMaterial; @@ -123,7 +123,7 @@ class ignition::rendering::OgreThermalCameraPrivate public: uint16_t dataMinVal = 0u; /// \brief Event used to signal thermal image data - public: ignition::common::EventT newThermalFrame; @@ -132,7 +132,7 @@ class ignition::rendering::OgreThermalCameraPrivate thermalMaterialSwitcher; }; -using namespace ignition; +using namespace gz; using namespace rendering; diff --git a/ogre/src/OgreVisual.cc b/ogre/src/OgreVisual.cc index 8f5fdfe09..e9f6308a1 100644 --- a/ogre/src/OgreVisual.cc +++ b/ogre/src/OgreVisual.cc @@ -21,7 +21,7 @@ #include "ignition/rendering/ogre/OgreConversions.hh" #include "ignition/rendering/ogre/OgreStorage.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre2/include/CMakeLists.txt b/ogre2/include/CMakeLists.txt index 297e254ff..a7479f53e 100644 --- a/ogre2/include/CMakeLists.txt +++ b/ogre2/include/CMakeLists.txt @@ -1 +1,2 @@ -add_subdirectory(ignition/rendering) +add_subdirectory(gz/rendering) +install(DIRECTORY ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL}) diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2Camera.hh b/ogre2/include/gz/rendering/ogre2/Ogre2Camera.hh index 41052fee5..44534d6d1 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2Camera.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2Camera.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE2_OGRE2CAMERA_HH_ -#define IGNITION_RENDERING_OGRE2_OGRE2CAMERA_HH_ +#ifndef GZ_RENDERING_OGRE2_OGRE2CAMERA_HH_ +#define GZ_RENDERING_OGRE2_OGRE2CAMERA_HH_ #include "ignition/rendering/base/BaseCamera.hh" #include "ignition/rendering/ogre2/Ogre2RenderTypes.hh" @@ -26,7 +26,7 @@ namespace Ogre class Camera; } -namespace ignition +namespace gz { namespace rendering { @@ -83,7 +83,7 @@ namespace ignition public: virtual math::Matrix4d ViewMatrix() const override; // Documentation inherited - public: virtual VisualPtr VisualAt(const ignition::math::Vector2i + public: virtual VisualPtr VisualAt(const gz::math::Vector2i &_mousePos) override; // Documentation Inherited. diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2Conversions.hh b/ogre2/include/gz/rendering/ogre2/Ogre2Conversions.hh index dc9d4fed5..d2a620255 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2Conversions.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2Conversions.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE2_OGRE2CONVERSIONS_HH_ -#define IGNITION_RENDERING_OGRE2_OGRE2CONVERSIONS_HH_ +#ifndef GZ_RENDERING_OGRE2_OGRE2CONVERSIONS_HH_ +#define GZ_RENDERING_OGRE2_OGRE2CONVERSIONS_HH_ #include #include @@ -27,7 +27,7 @@ #include "ignition/rendering/ogre2/Ogre2Includes.hh" #include "ignition/rendering/ogre2/Export.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2DepthCamera.hh b/ogre2/include/gz/rendering/ogre2/Ogre2DepthCamera.hh index 7a31f1ad9..379c97c5f 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2DepthCamera.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2DepthCamera.hh @@ -15,8 +15,8 @@ * */ -#ifndef IGNITION_RENDERING_OGRE2_OGRE2DEPTHCAMERA_HH_ -#define IGNITION_RENDERING_OGRE2_OGRE2DEPTHCAMERA_HH_ +#ifndef GZ_RENDERING_OGRE2_OGRE2DEPTHCAMERA_HH_ +#define GZ_RENDERING_OGRE2_OGRE2DEPTHCAMERA_HH_ #ifdef _WIN32 // Ensure that Winsock2.h is included before Windows.h, which can get @@ -42,7 +42,7 @@ namespace Ogre class Viewport; } -namespace ignition +namespace gz { namespace rendering { @@ -87,14 +87,14 @@ namespace ignition /// \brief Connect a to the new depth image signal /// \param[in] _subscriber Subscriber callback function /// \return Pointer to the new Connection. This must be kept in scope - public: virtual ignition::common::ConnectionPtr ConnectNewDepthFrame( + public: virtual gz::common::ConnectionPtr ConnectNewDepthFrame( std::function _subscriber) override; /// \brief Connect a to the new rgb point cloud signal /// \param[in] _subscriber Subscriber callback function /// \return Pointer to the new Connection. This must be kept in scope - public: virtual ignition::common::ConnectionPtr ConnectNewRgbPointCloud( + public: virtual gz::common::ConnectionPtr ConnectNewRgbPointCloud( std::function _subscriber) override; diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2DynamicRenderable.hh b/ogre2/include/gz/rendering/ogre2/Ogre2DynamicRenderable.hh index e348538e7..8229e9f89 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2DynamicRenderable.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2DynamicRenderable.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE2_OGRE2DYNAMICRENDERABLE_HH_ -#define IGNITION_RENDERING_OGRE2_OGRE2DYNAMICRENDERABLE_HH_ +#ifndef GZ_RENDERING_OGRE2_OGRE2DYNAMICRENDERABLE_HH_ +#define GZ_RENDERING_OGRE2_OGRE2DYNAMICRENDERABLE_HH_ #include #include @@ -26,7 +26,7 @@ #include "ignition/rendering/ogre2/Ogre2RenderTypes.hh" #include "ignition/rendering/Marker.hh" -namespace ignition +namespace gz { namespace rendering { @@ -64,10 +64,10 @@ namespace ignition public: Ogre::MovableObject *OgreObject() const; /// \brief Add a point to the point list - /// \param[in] _pt ignition::math::Vector3d point - /// \param[in] _color ignition::math::Color Point color - public: void AddPoint(const ignition::math::Vector3d &_pt, - const ignition::math::Color &_color = ignition::math::Color::White); + /// \param[in] _pt gz::math::Vector3d point + /// \param[in] _color gz::math::Color Point color + public: void AddPoint(const gz::math::Vector3d &_pt, + const gz::math::Color &_color = gz::math::Color::White); /// \brief Add a point to the point list. /// \param[in] _x X position @@ -75,27 +75,27 @@ namespace ignition /// \param[in] _z Z position /// \param[in] _color Point color public: void AddPoint(const double _x, const double _y, const double _z, - const ignition::math::Color &_color = ignition::math::Color::White); + const gz::math::Color &_color = gz::math::Color::White); /// \brief Change the location of an existing point in the point list /// \param[in] _index Index of the point to set /// \param[in] _value Position of the point public: void SetPoint(unsigned int _index, - const ignition::math::Vector3d &_value); + const gz::math::Vector3d &_value); /// \brief Change the color of an existing point in the point list /// \param[in] _index Index of the point to set /// \param[in] _color color to set the point to public: void SetColor(unsigned int _index, - const ignition::math::Color &_color); + const gz::math::Color &_color); /// \brief Return the position of an existing point in the point list /// \param[in] _index Get the point at this index /// \return position of point. A vector of - /// [ignition::math::INF_D, ignition::math::INF_D, ignition::math::INF_D] + /// [gz::math::INF_D, gz::math::INF_D, gz::math::INF_D] /// is returned when then the _index is out of bounds. - /// ignition::math::INF_D==std::numeric_limits::infinity() - public: ignition::math::Vector3d Point(unsigned int _index) const; + /// gz::math::INF_D==std::numeric_limits::infinity() + public: gz::math::Vector3d Point(unsigned int _index) const; /// \brief Return the total number of points in the point list /// \return Number of points diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2GaussianNoisePass.hh b/ogre2/include/gz/rendering/ogre2/Ogre2GaussianNoisePass.hh index e708c5725..3de6971a2 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2GaussianNoisePass.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2GaussianNoisePass.hh @@ -14,15 +14,15 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE2_OGRE2GAUSSIANNOISEPASS_HH_ -#define IGNITION_RENDERING_OGRE2_OGRE2GAUSSIANNOISEPASS_HH_ +#ifndef GZ_RENDERING_OGRE2_OGRE2GAUSSIANNOISEPASS_HH_ +#define GZ_RENDERING_OGRE2_OGRE2GAUSSIANNOISEPASS_HH_ #include "ignition/rendering/base/BaseGaussianNoisePass.hh" #include "ignition/rendering/ogre2/Ogre2Includes.hh" #include "ignition/rendering/ogre2/Ogre2RenderPass.hh" #include "ignition/rendering/ogre2/Export.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2Geometry.hh b/ogre2/include/gz/rendering/ogre2/Ogre2Geometry.hh index fbea7edf5..c503b1f5c 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2Geometry.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2Geometry.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE2_OGRE2GEOMETRY_HH_ -#define IGNITION_RENDERING_OGRE2_OGRE2GEOMETRY_HH_ +#ifndef GZ_RENDERING_OGRE2_OGRE2GEOMETRY_HH_ +#define GZ_RENDERING_OGRE2_OGRE2GEOMETRY_HH_ #include "ignition/rendering/base/BaseGeometry.hh" #include "ignition/rendering/ogre2/Ogre2Object.hh" @@ -25,7 +25,7 @@ namespace Ogre class MovableObject; } -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2GizmoVisual.hh b/ogre2/include/gz/rendering/ogre2/Ogre2GizmoVisual.hh index daf85011d..944f1214f 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2GizmoVisual.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2GizmoVisual.hh @@ -14,13 +14,13 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE2_OGRE2GIZMOVISUAL_HH_ -#define IGNITION_RENDERING_OGRE2_OGRE2GIZMOVISUAL_HH_ +#ifndef GZ_RENDERING_OGRE2_OGRE2GIZMOVISUAL_HH_ +#define GZ_RENDERING_OGRE2_OGRE2GIZMOVISUAL_HH_ #include "ignition/rendering/base/BaseGizmoVisual.hh" #include "ignition/rendering/ogre2/Ogre2Visual.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2GpuRays.hh b/ogre2/include/gz/rendering/ogre2/Ogre2GpuRays.hh index 58506ed56..61613e03f 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2GpuRays.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2GpuRays.hh @@ -15,8 +15,8 @@ * */ -#ifndef IGNITION_RENDERING_OGRE2_OGRE2GPURAYS_HH_ -#define IGNITION_RENDERING_OGRE2_OGRE2GPURAYS_HH_ +#ifndef GZ_RENDERING_OGRE2_OGRE2GPURAYS_HH_ +#define GZ_RENDERING_OGRE2_OGRE2GPURAYS_HH_ #include #include @@ -41,7 +41,7 @@ namespace Ogre class Viewport; } -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2Grid.hh b/ogre2/include/gz/rendering/ogre2/Ogre2Grid.hh index b7f8b4d8f..4c474cf0b 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2Grid.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2Grid.hh @@ -15,8 +15,8 @@ * */ -#ifndef IGNITION_RENDERING_OGRE2_OGRE2GRID_HH_ -#define IGNITION_RENDERING_OGRE2_OGRE2GRID_HH_ +#ifndef GZ_RENDERING_OGRE2_OGRE2GRID_HH_ +#define GZ_RENDERING_OGRE2_OGRE2GRID_HH_ #include #include "ignition/rendering/base/BaseGrid.hh" @@ -28,7 +28,7 @@ namespace Ogre class MovableObject; } -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2Includes.hh b/ogre2/include/gz/rendering/ogre2/Ogre2Includes.hh index 6bda4fe64..0319a04da 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2Includes.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2Includes.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE2_OGRE2INCLUDES_HH_ -#define IGNITION_RENDERING_OGRE2_OGRE2INCLUDES_HH_ +#ifndef GZ_RENDERING_OGRE2_OGRE2INCLUDES_HH_ +#define GZ_RENDERING_OGRE2_OGRE2INCLUDES_HH_ // This disables warning messages for OGRE #ifndef _MSC_VER diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2Light.hh b/ogre2/include/gz/rendering/ogre2/Ogre2Light.hh index b7f641eb0..3c24f68b7 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2Light.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2Light.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE2_OGRE2LIGHT_HH_ -#define IGNITION_RENDERING_OGRE2_OGRE2LIGHT_HH_ +#ifndef GZ_RENDERING_OGRE2_OGRE2LIGHT_HH_ +#define GZ_RENDERING_OGRE2_OGRE2LIGHT_HH_ #include "ignition/rendering/base/BaseLight.hh" #include "ignition/rendering/ogre2/Ogre2Node.hh" @@ -26,7 +26,7 @@ namespace Ogre class Light; } -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2Marker.hh b/ogre2/include/gz/rendering/ogre2/Ogre2Marker.hh index fb1ce3f27..bea5cf0da 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2Marker.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2Marker.hh @@ -15,15 +15,15 @@ * */ -#ifndef IGNITION_RENDERING_OGRE2_OGREMARKER_HH_ -#define IGNITION_RENDERING_OGRE2_OGREMARKER_HH_ +#ifndef GZ_RENDERING_OGRE2_OGREMARKER_HH_ +#define GZ_RENDERING_OGRE2_OGREMARKER_HH_ #include #include "ignition/rendering/base/BaseMarker.hh" #include "ignition/rendering/ogre2/Ogre2Geometry.hh" #include "ignition/rendering/ogre2/Ogre2Includes.hh" -namespace ignition +namespace gz { namespace rendering { @@ -63,11 +63,11 @@ namespace ignition // Documentation inherited public: virtual void SetPoint(unsigned int _index, - const ignition::math::Vector3d &_value) override; + const gz::math::Vector3d &_value) override; // Documentation inherited - public: virtual void AddPoint(const ignition::math::Vector3d &_pt, - const ignition::math::Color &_color) override; + public: virtual void AddPoint(const gz::math::Vector3d &_pt, + const gz::math::Color &_color) override; // Documentation inherited public: virtual void ClearPoints() override; diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2Material.hh b/ogre2/include/gz/rendering/ogre2/Ogre2Material.hh index 3b8c0b2c2..8366944e4 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2Material.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2Material.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE2_OGRE2MATERIAL_HH_ -#define IGNITION_RENDERING_OGRE2_OGRE2MATERIAL_HH_ +#ifndef GZ_RENDERING_OGRE2_OGRE2MATERIAL_HH_ +#define GZ_RENDERING_OGRE2_OGRE2MATERIAL_HH_ #include @@ -23,7 +23,7 @@ #include "ignition/rendering/ogre2/Ogre2Object.hh" #include "ignition/rendering/ogre2/Ogre2Includes.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2MaterialSwitcher.hh b/ogre2/include/gz/rendering/ogre2/Ogre2MaterialSwitcher.hh index de8471190..6881026e6 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2MaterialSwitcher.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2MaterialSwitcher.hh @@ -15,8 +15,8 @@ * */ -#ifndef IGNITION_RENDERING_OGRE2_OGRE2MATERIALSWITCHER_HH_ -#define IGNITION_RENDERING_OGRE2_OGRE2MATERIALSWITCHER_HH_ +#ifndef GZ_RENDERING_OGRE2_OGRE2MATERIALSWITCHER_HH_ +#define GZ_RENDERING_OGRE2_OGRE2MATERIALSWITCHER_HH_ #include #include @@ -27,7 +27,7 @@ #include "ignition/rendering/ogre2/Ogre2Includes.hh" #include "ignition/rendering/ogre2/Ogre2RenderTypes.hh" -namespace ignition +namespace gz { namespace rendering { @@ -49,7 +49,7 @@ namespace ignition /// \brief Get the entity with a specific color /// \param[in] _color The entity's color. public: std::string EntityName( - const ignition::math::Color &_color) const; + const gz::math::Color &_color) const; /// \brief Reset the color value incrementor public: void Reset(); @@ -67,7 +67,7 @@ namespace ignition const Ogre::RenderTargetEvent &_evt); /// \brief Current unique color value - private: ignition::math::Color currentColor; + private: gz::math::Color currentColor; /// \brief Color dictionary that maps the unique color value to /// renderable name diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2Mesh.hh b/ogre2/include/gz/rendering/ogre2/Ogre2Mesh.hh index 9900a3f17..fac4adde4 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2Mesh.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2Mesh.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE2_OGRE2MESH_HH_ -#define IGNITION_RENDERING_OGRE2_OGRE2MESH_HH_ +#ifndef GZ_RENDERING_OGRE2_OGRE2MESH_HH_ +#define GZ_RENDERING_OGRE2_OGRE2MESH_HH_ #include #include @@ -31,7 +31,7 @@ namespace Ogre class SubItem; } -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2MeshFactory.hh b/ogre2/include/gz/rendering/ogre2/Ogre2MeshFactory.hh index 98af92317..19b19fbe2 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2MeshFactory.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2MeshFactory.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE2_OGRE2MESHFACTORY_HH_ -#define IGNITION_RENDERING_OGRE2_OGRE2MESHFACTORY_HH_ +#ifndef GZ_RENDERING_OGRE2_OGRE2MESHFACTORY_HH_ +#define GZ_RENDERING_OGRE2_OGRE2MESHFACTORY_HH_ #include #include @@ -31,7 +31,7 @@ namespace Ogre class Item; } -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2Node.hh b/ogre2/include/gz/rendering/ogre2/Ogre2Node.hh index 5a6be9005..ff48fe18c 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2Node.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2Node.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE2_OGRE2NODE_HH_ -#define IGNITION_RENDERING_OGRE2_OGRE2NODE_HH_ +#ifndef GZ_RENDERING_OGRE2_OGRE2NODE_HH_ +#define GZ_RENDERING_OGRE2_OGRE2NODE_HH_ #include "ignition/rendering/base/BaseNode.hh" #include "ignition/rendering/ogre2/Ogre2RenderTypes.hh" @@ -26,7 +26,7 @@ namespace Ogre class SceneNode; } -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2Object.hh b/ogre2/include/gz/rendering/ogre2/Ogre2Object.hh index 1efe6b1eb..d33afe2e8 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2Object.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2Object.hh @@ -14,15 +14,15 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE2_OGRE2OBJECT_HH_ -#define IGNITION_RENDERING_OGRE2_OGRE2OBJECT_HH_ +#ifndef GZ_RENDERING_OGRE2_OGRE2OBJECT_HH_ +#define GZ_RENDERING_OGRE2_OGRE2OBJECT_HH_ #include "ignition/rendering/config.hh" #include "ignition/rendering/base/BaseObject.hh" #include "ignition/rendering/ogre2/Ogre2RenderTypes.hh" #include "ignition/rendering/ogre2/Export.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2RayQuery.hh b/ogre2/include/gz/rendering/ogre2/Ogre2RayQuery.hh index 96a1e9f44..c122df283 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2RayQuery.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2RayQuery.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE2_OGRE2RAYQUERY_HH_ -#define IGNITION_RENDERING_OGRE2_OGRE2RAYQUERY_HH_ +#ifndef GZ_RENDERING_OGRE2_OGRE2RAYQUERY_HH_ +#define GZ_RENDERING_OGRE2_OGRE2RAYQUERY_HH_ #include @@ -24,7 +24,7 @@ #include "ignition/rendering/ogre2/Ogre2Object.hh" #include "ignition/rendering/ogre2/Ogre2RenderTypes.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2RenderEngine.hh b/ogre2/include/gz/rendering/ogre2/Ogre2RenderEngine.hh index c6f212e7a..f7a888706 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2RenderEngine.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2RenderEngine.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE2_OGRE2RENDERENGINE_HH_ -#define IGNITION_RENDERING_OGRE2_OGRE2RENDERENGINE_HH_ +#ifndef GZ_RENDERING_OGRE2_OGRE2RENDERENGINE_HH_ +#define GZ_RENDERING_OGRE2_OGRE2RENDERENGINE_HH_ #include #include @@ -40,7 +40,7 @@ namespace Ogre } } -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2RenderPass.hh b/ogre2/include/gz/rendering/ogre2/Ogre2RenderPass.hh index f54f67db1..409ae4870 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2RenderPass.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2RenderPass.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE2_OGRE2RENDERPASS_HH_ -#define IGNITION_RENDERING_OGRE2_OGRE2RENDERPASS_HH_ +#ifndef GZ_RENDERING_OGRE2_OGRE2RENDERPASS_HH_ +#define GZ_RENDERING_OGRE2_OGRE2RENDERPASS_HH_ #include @@ -24,7 +24,7 @@ #include "ignition/rendering/ogre2/Ogre2Includes.hh" #include "ignition/rendering/ogre2/Ogre2Object.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2RenderTarget.hh b/ogre2/include/gz/rendering/ogre2/Ogre2RenderTarget.hh index 60970d203..ff3fc36fe 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2RenderTarget.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2RenderTarget.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE2_OGRE2RENDERTARGET_HH_ -#define IGNITION_RENDERING_OGRE2_OGRE2RENDERTARGET_HH_ +#ifndef GZ_RENDERING_OGRE2_OGRE2RENDERTARGET_HH_ +#define GZ_RENDERING_OGRE2_OGRE2RENDERTARGET_HH_ #include #include @@ -34,7 +34,7 @@ namespace Ogre class Texture; } -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2RenderTargetMaterial.hh b/ogre2/include/gz/rendering/ogre2/Ogre2RenderTargetMaterial.hh index 4f5eb1369..8b389879e 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2RenderTargetMaterial.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2RenderTargetMaterial.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE2_OGRE2RENDERTARGETMATERIAL_HH_ -#define IGNITION_RENDERING_OGRE2_OGRE2RENDERTARGETMATERIAL_HH_ +#ifndef GZ_RENDERING_OGRE2_OGRE2RENDERTARGETMATERIAL_HH_ +#define GZ_RENDERING_OGRE2_OGRE2RENDERTARGETMATERIAL_HH_ #include @@ -23,7 +23,7 @@ #include "ignition/rendering/ogre2/Ogre2Includes.hh" #include "ignition/rendering/ogre2/Export.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2RenderTypes.hh b/ogre2/include/gz/rendering/ogre2/Ogre2RenderTypes.hh index 225598eb8..7fa15f6b9 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2RenderTypes.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2RenderTypes.hh @@ -14,15 +14,15 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE2_OGRE2RENDERTYPES_HH_ -#define IGNITION_RENDERING_OGRE2_OGRE2RENDERTYPES_HH_ +#ifndef GZ_RENDERING_OGRE2_OGRE2RENDERTYPES_HH_ +#define GZ_RENDERING_OGRE2_OGRE2RENDERTYPES_HH_ #include #include "ignition/rendering/config.hh" #include "ignition/rendering/base/BaseRenderTypes.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2Scene.hh b/ogre2/include/gz/rendering/ogre2/Ogre2Scene.hh index a6dbe26cd..a6cd407b6 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2Scene.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2Scene.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE2_OGRE2SCENE_HH_ -#define IGNITION_RENDERING_OGRE2_OGRE2SCENE_HH_ +#ifndef GZ_RENDERING_OGRE2_OGRE2SCENE_HH_ +#define GZ_RENDERING_OGRE2_OGRE2SCENE_HH_ #include @@ -31,7 +31,7 @@ namespace Ogre class SceneManager; } -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2SelectionBuffer.hh b/ogre2/include/gz/rendering/ogre2/Ogre2SelectionBuffer.hh index 0afec5482..03d6ce564 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2SelectionBuffer.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2SelectionBuffer.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE2_OGRE2SELECTIONBUFFER_HH_ -#define IGNITION_RENDERING_OGRE2_OGRE2SELECTIONBUFFER_HH_ +#ifndef GZ_RENDERING_OGRE2_OGRE2SELECTIONBUFFER_HH_ +#define GZ_RENDERING_OGRE2_OGRE2SELECTIONBUFFER_HH_ #include #include @@ -30,7 +30,7 @@ namespace Ogre class SceneManager; } -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2Sensor.hh b/ogre2/include/gz/rendering/ogre2/Ogre2Sensor.hh index 47b7da64d..a0f457198 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2Sensor.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2Sensor.hh @@ -14,13 +14,13 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE2_OGRE2SENSOR_HH_ -#define IGNITION_RENDERING_OGRE2_OGRE2SENSOR_HH_ +#ifndef GZ_RENDERING_OGRE2_OGRE2SENSOR_HH_ +#define GZ_RENDERING_OGRE2_OGRE2SENSOR_HH_ #include "ignition/rendering/base/BaseSensor.hh" #include "ignition/rendering/ogre2/Ogre2Node.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2Storage.hh b/ogre2/include/gz/rendering/ogre2/Ogre2Storage.hh index 318cf7da5..34a8e6150 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2Storage.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2Storage.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE2_OGRE2STORAGE_HH_ -#define IGNITION_RENDERING_OGRE2_OGRE2STORAGE_HH_ +#ifndef GZ_RENDERING_OGRE2_OGRE2STORAGE_HH_ +#define GZ_RENDERING_OGRE2_OGRE2STORAGE_HH_ #include @@ -28,7 +28,7 @@ #include "ignition/rendering/ogre2/Ogre2Scene.hh" #include "ignition/rendering/ogre2/Ogre2Visual.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2ThermalCamera.hh b/ogre2/include/gz/rendering/ogre2/Ogre2ThermalCamera.hh index bbdfc4f21..4f87e7f05 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2ThermalCamera.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2ThermalCamera.hh @@ -15,8 +15,8 @@ * */ -#ifndef IGNITION_RENDERING_OGRE2_OGRE2THERMALCAMERA_HH_ -#define IGNITION_RENDERING_OGRE2_OGRE2THERMALCAMERA_HH_ +#ifndef GZ_RENDERING_OGRE2_OGRE2THERMALCAMERA_HH_ +#define GZ_RENDERING_OGRE2_OGRE2THERMALCAMERA_HH_ #ifdef _WIN32 // Ensure that Winsock2.h is included before Windows.h, which can get @@ -43,7 +43,7 @@ namespace Ogre class Viewport; } -namespace ignition +namespace gz { namespace rendering { @@ -77,7 +77,7 @@ namespace ignition /// \brief Connect to the new thermal image event /// \param[in] _subscriber Subscriber callback function /// \return Pointer to the new Connection. This must be kept in scope - public: virtual ignition::common::ConnectionPtr ConnectNewThermalFrame( + public: virtual gz::common::ConnectionPtr ConnectNewThermalFrame( std::function _subscriber) override; diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2Visual.hh b/ogre2/include/gz/rendering/ogre2/Ogre2Visual.hh index 94a8779fe..d527e7650 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2Visual.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2Visual.hh @@ -14,14 +14,14 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OGRE2_OGRE2VISUAL_HH_ -#define IGNITION_RENDERING_OGRE2_OGRE2VISUAL_HH_ +#ifndef GZ_RENDERING_OGRE2_OGRE2VISUAL_HH_ +#define GZ_RENDERING_OGRE2_OGRE2VISUAL_HH_ #include "ignition/rendering/base/BaseVisual.hh" #include "ignition/rendering/ogre2/Ogre2Node.hh" #include "ignition/rendering/ogre2/Ogre2RenderTypes.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/ogre2/include/ignition/rendering/ogre2.hh b/ogre2/include/ignition/rendering/ogre2.hh new file mode 100644 index 000000000..d1fc687de --- /dev/null +++ b/ogre2/include/ignition/rendering/ogre2.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre2/include/ignition/rendering/ogre2/Ogre2Camera.hh b/ogre2/include/ignition/rendering/ogre2/Ogre2Camera.hh new file mode 100644 index 000000000..c4f5bfede --- /dev/null +++ b/ogre2/include/ignition/rendering/ogre2/Ogre2Camera.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre2/include/ignition/rendering/ogre2/Ogre2Conversions.hh b/ogre2/include/ignition/rendering/ogre2/Ogre2Conversions.hh new file mode 100644 index 000000000..9a53f0a7e --- /dev/null +++ b/ogre2/include/ignition/rendering/ogre2/Ogre2Conversions.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre2/include/ignition/rendering/ogre2/Ogre2DepthCamera.hh b/ogre2/include/ignition/rendering/ogre2/Ogre2DepthCamera.hh new file mode 100644 index 000000000..a82872719 --- /dev/null +++ b/ogre2/include/ignition/rendering/ogre2/Ogre2DepthCamera.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre2/include/ignition/rendering/ogre2/Ogre2DynamicRenderable.hh b/ogre2/include/ignition/rendering/ogre2/Ogre2DynamicRenderable.hh new file mode 100644 index 000000000..53e199aff --- /dev/null +++ b/ogre2/include/ignition/rendering/ogre2/Ogre2DynamicRenderable.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre2/include/ignition/rendering/ogre2/Ogre2GaussianNoisePass.hh b/ogre2/include/ignition/rendering/ogre2/Ogre2GaussianNoisePass.hh new file mode 100644 index 000000000..50ddf972a --- /dev/null +++ b/ogre2/include/ignition/rendering/ogre2/Ogre2GaussianNoisePass.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre2/include/ignition/rendering/ogre2/Ogre2Geometry.hh b/ogre2/include/ignition/rendering/ogre2/Ogre2Geometry.hh new file mode 100644 index 000000000..8951eb047 --- /dev/null +++ b/ogre2/include/ignition/rendering/ogre2/Ogre2Geometry.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre2/include/ignition/rendering/ogre2/Ogre2GizmoVisual.hh b/ogre2/include/ignition/rendering/ogre2/Ogre2GizmoVisual.hh new file mode 100644 index 000000000..b082ccdc7 --- /dev/null +++ b/ogre2/include/ignition/rendering/ogre2/Ogre2GizmoVisual.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre2/include/ignition/rendering/ogre2/Ogre2GpuRays.hh b/ogre2/include/ignition/rendering/ogre2/Ogre2GpuRays.hh new file mode 100644 index 000000000..b524a3744 --- /dev/null +++ b/ogre2/include/ignition/rendering/ogre2/Ogre2GpuRays.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre2/include/ignition/rendering/ogre2/Ogre2Grid.hh b/ogre2/include/ignition/rendering/ogre2/Ogre2Grid.hh new file mode 100644 index 000000000..81e386ec3 --- /dev/null +++ b/ogre2/include/ignition/rendering/ogre2/Ogre2Grid.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre2/include/ignition/rendering/ogre2/Ogre2Includes.hh b/ogre2/include/ignition/rendering/ogre2/Ogre2Includes.hh new file mode 100644 index 000000000..06eb4d78e --- /dev/null +++ b/ogre2/include/ignition/rendering/ogre2/Ogre2Includes.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre2/include/ignition/rendering/ogre2/Ogre2Light.hh b/ogre2/include/ignition/rendering/ogre2/Ogre2Light.hh new file mode 100644 index 000000000..f8b328717 --- /dev/null +++ b/ogre2/include/ignition/rendering/ogre2/Ogre2Light.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre2/include/ignition/rendering/ogre2/Ogre2Marker.hh b/ogre2/include/ignition/rendering/ogre2/Ogre2Marker.hh new file mode 100644 index 000000000..ecfb2ce75 --- /dev/null +++ b/ogre2/include/ignition/rendering/ogre2/Ogre2Marker.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre2/include/ignition/rendering/ogre2/Ogre2Material.hh b/ogre2/include/ignition/rendering/ogre2/Ogre2Material.hh new file mode 100644 index 000000000..23f14cb05 --- /dev/null +++ b/ogre2/include/ignition/rendering/ogre2/Ogre2Material.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre2/include/ignition/rendering/ogre2/Ogre2MaterialSwitcher.hh b/ogre2/include/ignition/rendering/ogre2/Ogre2MaterialSwitcher.hh new file mode 100644 index 000000000..4cced0f3d --- /dev/null +++ b/ogre2/include/ignition/rendering/ogre2/Ogre2MaterialSwitcher.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre2/include/ignition/rendering/ogre2/Ogre2Mesh.hh b/ogre2/include/ignition/rendering/ogre2/Ogre2Mesh.hh new file mode 100644 index 000000000..7c1ae35fa --- /dev/null +++ b/ogre2/include/ignition/rendering/ogre2/Ogre2Mesh.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre2/include/ignition/rendering/ogre2/Ogre2MeshFactory.hh b/ogre2/include/ignition/rendering/ogre2/Ogre2MeshFactory.hh new file mode 100644 index 000000000..51202d304 --- /dev/null +++ b/ogre2/include/ignition/rendering/ogre2/Ogre2MeshFactory.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre2/include/ignition/rendering/ogre2/Ogre2Node.hh b/ogre2/include/ignition/rendering/ogre2/Ogre2Node.hh new file mode 100644 index 000000000..2553e4f60 --- /dev/null +++ b/ogre2/include/ignition/rendering/ogre2/Ogre2Node.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre2/include/ignition/rendering/ogre2/Ogre2Object.hh b/ogre2/include/ignition/rendering/ogre2/Ogre2Object.hh new file mode 100644 index 000000000..dd261d565 --- /dev/null +++ b/ogre2/include/ignition/rendering/ogre2/Ogre2Object.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre2/include/ignition/rendering/ogre2/Ogre2RayQuery.hh b/ogre2/include/ignition/rendering/ogre2/Ogre2RayQuery.hh new file mode 100644 index 000000000..3ce9ed7df --- /dev/null +++ b/ogre2/include/ignition/rendering/ogre2/Ogre2RayQuery.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre2/include/ignition/rendering/ogre2/Ogre2RenderEngine.hh b/ogre2/include/ignition/rendering/ogre2/Ogre2RenderEngine.hh new file mode 100644 index 000000000..79ac0655c --- /dev/null +++ b/ogre2/include/ignition/rendering/ogre2/Ogre2RenderEngine.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre2/include/ignition/rendering/ogre2/Ogre2RenderPass.hh b/ogre2/include/ignition/rendering/ogre2/Ogre2RenderPass.hh new file mode 100644 index 000000000..2f07a5006 --- /dev/null +++ b/ogre2/include/ignition/rendering/ogre2/Ogre2RenderPass.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre2/include/ignition/rendering/ogre2/Ogre2RenderTarget.hh b/ogre2/include/ignition/rendering/ogre2/Ogre2RenderTarget.hh new file mode 100644 index 000000000..1842e0ff1 --- /dev/null +++ b/ogre2/include/ignition/rendering/ogre2/Ogre2RenderTarget.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre2/include/ignition/rendering/ogre2/Ogre2RenderTargetMaterial.hh b/ogre2/include/ignition/rendering/ogre2/Ogre2RenderTargetMaterial.hh new file mode 100644 index 000000000..49cf9ca38 --- /dev/null +++ b/ogre2/include/ignition/rendering/ogre2/Ogre2RenderTargetMaterial.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre2/include/ignition/rendering/ogre2/Ogre2RenderTypes.hh b/ogre2/include/ignition/rendering/ogre2/Ogre2RenderTypes.hh new file mode 100644 index 000000000..fca4ffa0c --- /dev/null +++ b/ogre2/include/ignition/rendering/ogre2/Ogre2RenderTypes.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre2/include/ignition/rendering/ogre2/Ogre2Scene.hh b/ogre2/include/ignition/rendering/ogre2/Ogre2Scene.hh new file mode 100644 index 000000000..efc13e0b2 --- /dev/null +++ b/ogre2/include/ignition/rendering/ogre2/Ogre2Scene.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre2/include/ignition/rendering/ogre2/Ogre2SelectionBuffer.hh b/ogre2/include/ignition/rendering/ogre2/Ogre2SelectionBuffer.hh new file mode 100644 index 000000000..7ae7df2c9 --- /dev/null +++ b/ogre2/include/ignition/rendering/ogre2/Ogre2SelectionBuffer.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre2/include/ignition/rendering/ogre2/Ogre2Sensor.hh b/ogre2/include/ignition/rendering/ogre2/Ogre2Sensor.hh new file mode 100644 index 000000000..7bdae889b --- /dev/null +++ b/ogre2/include/ignition/rendering/ogre2/Ogre2Sensor.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre2/include/ignition/rendering/ogre2/Ogre2Storage.hh b/ogre2/include/ignition/rendering/ogre2/Ogre2Storage.hh new file mode 100644 index 000000000..b5a1da7b8 --- /dev/null +++ b/ogre2/include/ignition/rendering/ogre2/Ogre2Storage.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre2/include/ignition/rendering/ogre2/Ogre2ThermalCamera.hh b/ogre2/include/ignition/rendering/ogre2/Ogre2ThermalCamera.hh new file mode 100644 index 000000000..9f2377831 --- /dev/null +++ b/ogre2/include/ignition/rendering/ogre2/Ogre2ThermalCamera.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre2/include/ignition/rendering/ogre2/Ogre2Visual.hh b/ogre2/include/ignition/rendering/ogre2/Ogre2Visual.hh new file mode 100644 index 000000000..82e2f07e5 --- /dev/null +++ b/ogre2/include/ignition/rendering/ogre2/Ogre2Visual.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/ogre2/src/Ogre2Camera.cc b/ogre2/src/Ogre2Camera.cc index fb5ba3777..cc82ccd9e 100644 --- a/ogre2/src/Ogre2Camera.cc +++ b/ogre2/src/Ogre2Camera.cc @@ -24,7 +24,7 @@ #include "ignition/rendering/ogre2/Ogre2SelectionBuffer.hh" #include "ignition/rendering/Utils.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre2/src/Ogre2Conversions.cc b/ogre2/src/Ogre2Conversions.cc index 6ba9e2a7e..401bd9189 100644 --- a/ogre2/src/Ogre2Conversions.cc +++ b/ogre2/src/Ogre2Conversions.cc @@ -16,7 +16,7 @@ */ #include "ignition/rendering/ogre2/Ogre2Conversions.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre2/src/Ogre2DepthCamera.cc b/ogre2/src/Ogre2DepthCamera.cc index e95153a5b..96db35575 100644 --- a/ogre2/src/Ogre2DepthCamera.cc +++ b/ogre2/src/Ogre2DepthCamera.cc @@ -38,7 +38,7 @@ #include "ignition/rendering/ogre2/Ogre2Sensor.hh" -namespace ignition +namespace gz { namespace rendering { @@ -72,7 +72,7 @@ class Ogre2DepthGaussianNoisePass : public Ogre2GaussianNoisePass /// \internal /// \brief Private data for the Ogre2DepthCamera class -class ignition::rendering::Ogre2DepthCameraPrivate +class gz::rendering::Ogre2DepthCameraPrivate { /// \brief The depth buffer public: float *depthBuffer = nullptr; @@ -84,10 +84,10 @@ class ignition::rendering::Ogre2DepthCameraPrivate public: float *pointCloudImage = nullptr; /// \brief maximum value used for data outside sensor range - public: float dataMaxVal = ignition::math::INF_D; + public: float dataMaxVal = gz::math::INF_D; /// \brief minimum value used for data outside sensor range - public: float dataMinVal = -ignition::math::INF_D; + public: float dataMinVal = -gz::math::INF_D; /// \brief 1st pass compositor workspace definition public: std::string ogreCompositorWorkspaceDef; @@ -120,17 +120,17 @@ class ignition::rendering::Ogre2DepthCameraPrivate public: bool renderPassDirty = false; /// \brief Event used to signal rgb point cloud data - public: ignition::common::EventT newRgbPointCloud; /// \brief Event used to signal depth data - public: ignition::common::EventT newDepthFrame; }; -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre2/src/Ogre2DynamicRenderable.cc b/ogre2/src/Ogre2DynamicRenderable.cc index 312adf0e0..30a6c6c54 100644 --- a/ogre2/src/Ogre2DynamicRenderable.cc +++ b/ogre2/src/Ogre2DynamicRenderable.cc @@ -33,13 +33,13 @@ #include "ignition/rendering/ogre2/Ogre2Scene.hh" /// \brief Private implementation -class ignition::rendering::Ogre2DynamicRenderablePrivate +class gz::rendering::Ogre2DynamicRenderablePrivate { /// \brief list of colors at each point - public: std::vector colors; + public: std::vector colors; /// \brief List of vertices for the mesh - public: std::vector vertices; + public: std::vector vertices; /// \brief Used to indicate if the lines require an update public: bool dirty = false; @@ -80,7 +80,7 @@ class ignition::rendering::Ogre2DynamicRenderablePrivate }; -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre2/src/Ogre2GaussianNoisePass.cc b/ogre2/src/Ogre2GaussianNoisePass.cc index 92f22f653..09ef2ce52 100644 --- a/ogre2/src/Ogre2GaussianNoisePass.cc +++ b/ogre2/src/Ogre2GaussianNoisePass.cc @@ -23,7 +23,7 @@ #include "ignition/rendering/ogre2/Ogre2GaussianNoisePass.hh" #include "ignition/rendering/ogre2/Ogre2RenderEngine.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre2/src/Ogre2Geometry.cc b/ogre2/src/Ogre2Geometry.cc index 007b1f7e4..513147977 100644 --- a/ogre2/src/Ogre2Geometry.cc +++ b/ogre2/src/Ogre2Geometry.cc @@ -19,7 +19,7 @@ #include "ignition/rendering/ogre2/Ogre2Scene.hh" #include "ignition/rendering/ogre2/Ogre2Visual.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre2/src/Ogre2GizmoVisual.cc b/ogre2/src/Ogre2GizmoVisual.cc index 5c7b2eba7..22f04c825 100644 --- a/ogre2/src/Ogre2GizmoVisual.cc +++ b/ogre2/src/Ogre2GizmoVisual.cc @@ -16,7 +16,7 @@ */ #include "ignition/rendering/ogre2/Ogre2GizmoVisual.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre2/src/Ogre2GpuRays.cc b/ogre2/src/Ogre2GpuRays.cc index 3a44eefd6..e99fc4675 100644 --- a/ogre2/src/Ogre2GpuRays.cc +++ b/ogre2/src/Ogre2GpuRays.cc @@ -33,7 +33,7 @@ #include "ignition/rendering/ogre2/Ogre2Sensor.hh" #include "ignition/rendering/ogre2/Ogre2Visual.hh" -namespace ignition +namespace gz { namespace rendering { @@ -83,7 +83,7 @@ class Ogre2LaserRetroMaterialSwitcher : public Ogre::RenderTargetListener /// \internal /// \brief Private data for the Ogre2GpuRays class -class ignition::rendering::Ogre2GpuRaysPrivate +class gz::rendering::Ogre2GpuRaysPrivate { /// \brief Event triggered when new gpu rays range data are available. /// \param[in] _frame New frame containing raw gpu rays data. @@ -91,7 +91,7 @@ class ignition::rendering::Ogre2GpuRaysPrivate /// \param[in] _height Height of frame. /// \param[in] _channel Number of channels /// \param[in] _format Format of frame. - public: ignition::common::EventT newGpuRaysFrame; @@ -164,7 +164,7 @@ class ignition::rendering::Ogre2GpuRaysPrivate laserRetroMaterialSwitcher[6]; }; -using namespace ignition; +using namespace gz; using namespace rendering; diff --git a/ogre2/src/Ogre2Grid.cc b/ogre2/src/Ogre2Grid.cc index 08493253a..4ee54d3d1 100644 --- a/ogre2/src/Ogre2Grid.cc +++ b/ogre2/src/Ogre2Grid.cc @@ -22,10 +22,10 @@ #include "ignition/rendering/ogre2/Ogre2Scene.hh" #include "ignition/rendering/ogre2/Ogre2DynamicRenderable.hh" -using namespace ignition; +using namespace gz; using namespace rendering; -class ignition::rendering::Ogre2GridPrivate +class gz::rendering::Ogre2GridPrivate { /// \brief Grid materal public: Ogre2MaterialPtr material; diff --git a/ogre2/src/Ogre2Light.cc b/ogre2/src/Ogre2Light.cc index 6e0295663..d323563fb 100644 --- a/ogre2/src/Ogre2Light.cc +++ b/ogre2/src/Ogre2Light.cc @@ -23,7 +23,7 @@ #include "ignition/rendering/ogre2/Ogre2Includes.hh" #include "ignition/rendering/ogre2/Ogre2Scene.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre2/src/Ogre2Marker.cc b/ogre2/src/Ogre2Marker.cc index 0f95fa7db..77f86dbd7 100644 --- a/ogre2/src/Ogre2Marker.cc +++ b/ogre2/src/Ogre2Marker.cc @@ -24,7 +24,7 @@ #include "ignition/rendering/ogre2/Ogre2Scene.hh" #include "ignition/rendering/ogre2/Ogre2Visual.hh" -class ignition::rendering::Ogre2MarkerPrivate +class gz::rendering::Ogre2MarkerPrivate { /// \brief Marker material public: Ogre2MaterialPtr material = nullptr; @@ -40,7 +40,7 @@ class ignition::rendering::Ogre2MarkerPrivate public: std::shared_ptr dynamicRenderable; }; -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre2/src/Ogre2Material.cc b/ogre2/src/Ogre2Material.cc index 9dd6fca0d..9f6884f52 100644 --- a/ogre2/src/Ogre2Material.cc +++ b/ogre2/src/Ogre2Material.cc @@ -35,7 +35,7 @@ #include "ignition/rendering/ogre2/Ogre2RenderEngine.hh" #include "ignition/rendering/ogre2/Ogre2Scene.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre2/src/Ogre2MaterialSwitcher.cc b/ogre2/src/Ogre2MaterialSwitcher.cc index 3e454826c..3daa0c24a 100644 --- a/ogre2/src/Ogre2MaterialSwitcher.cc +++ b/ogre2/src/Ogre2MaterialSwitcher.cc @@ -21,7 +21,7 @@ #include "ignition/rendering/ogre2/Ogre2Scene.hh" #include "ignition/rendering/RenderTypes.hh" -using namespace ignition; +using namespace gz; using namespace rendering; diff --git a/ogre2/src/Ogre2Mesh.cc b/ogre2/src/Ogre2Mesh.cc index 563254060..f57595514 100644 --- a/ogre2/src/Ogre2Mesh.cc +++ b/ogre2/src/Ogre2Mesh.cc @@ -33,7 +33,7 @@ #include "ignition/rendering/ogre2/Ogre2Material.hh" #include "ignition/rendering/ogre2/Ogre2Storage.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre2/src/Ogre2MeshFactory.cc b/ogre2/src/Ogre2MeshFactory.cc index 4ac753df7..31ded5b8e 100644 --- a/ogre2/src/Ogre2MeshFactory.cc +++ b/ogre2/src/Ogre2MeshFactory.cc @@ -34,7 +34,7 @@ #include "ignition/rendering/ogre2/Ogre2Scene.hh" #include "ignition/rendering/ogre2/Ogre2Storage.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre2/src/Ogre2Node.cc b/ogre2/src/Ogre2Node.cc index e8b919469..1c711869c 100644 --- a/ogre2/src/Ogre2Node.cc +++ b/ogre2/src/Ogre2Node.cc @@ -23,7 +23,7 @@ #include "ignition/rendering/ogre2/Ogre2Scene.hh" #include "ignition/rendering/ogre2/Ogre2Storage.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre2/src/Ogre2Object.cc b/ogre2/src/Ogre2Object.cc index 35db61317..9db4fc91c 100644 --- a/ogre2/src/Ogre2Object.cc +++ b/ogre2/src/Ogre2Object.cc @@ -19,7 +19,7 @@ #include "ignition/rendering/ogre2/Ogre2Object.hh" #include "ignition/rendering/ogre2/Ogre2Scene.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre2/src/Ogre2RayQuery.cc b/ogre2/src/Ogre2RayQuery.cc index 553a113c7..7ef9a4cd9 100644 --- a/ogre2/src/Ogre2RayQuery.cc +++ b/ogre2/src/Ogre2RayQuery.cc @@ -27,13 +27,13 @@ #include "ignition/rendering/ogre2/Ogre2Scene.hh" /// \brief Private data class for Ogre2RayQuery -class ignition::rendering::Ogre2RayQueryPrivate +class gz::rendering::Ogre2RayQueryPrivate { /// \brief Ogre ray scene query object for computing intersection. public: Ogre::RaySceneQuery *rayQuery = nullptr; }; -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre2/src/Ogre2RenderEngine.cc b/ogre2/src/Ogre2RenderEngine.cc index 970df9f74..2126ffe66 100644 --- a/ogre2/src/Ogre2RenderEngine.cc +++ b/ogre2/src/Ogre2RenderEngine.cc @@ -41,7 +41,7 @@ #include "ignition/rendering/ogre2/Ogre2Storage.hh" -class ignition::rendering::Ogre2RenderEnginePrivate +class gz::rendering::Ogre2RenderEnginePrivate { #if !defined(__APPLE__) && !defined(_WIN32) public: XVisualInfo *dummyVisual = nullptr; @@ -51,7 +51,7 @@ class ignition::rendering::Ogre2RenderEnginePrivate public: std::vector fsaaLevels; }; -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre2/src/Ogre2RenderPass.cc b/ogre2/src/Ogre2RenderPass.cc index e7add222c..6c8043e44 100644 --- a/ogre2/src/Ogre2RenderPass.cc +++ b/ogre2/src/Ogre2RenderPass.cc @@ -17,7 +17,7 @@ #include "ignition/rendering/ogre2/Ogre2RenderPass.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre2/src/Ogre2RenderTarget.cc b/ogre2/src/Ogre2RenderTarget.cc index d49ae2a48..0dd1ca5f0 100644 --- a/ogre2/src/Ogre2RenderTarget.cc +++ b/ogre2/src/Ogre2RenderTarget.cc @@ -37,7 +37,7 @@ #include "ignition/rendering/ogre2/Ogre2RenderTarget.hh" #include "ignition/rendering/ogre2/Ogre2Scene.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre2/src/Ogre2RenderTargetMaterial.cc b/ogre2/src/Ogre2RenderTargetMaterial.cc index cfcd8c515..a6a7e235a 100644 --- a/ogre2/src/Ogre2RenderTargetMaterial.cc +++ b/ogre2/src/Ogre2RenderTargetMaterial.cc @@ -17,7 +17,7 @@ #include "ignition/rendering/ogre2/Ogre2RenderTargetMaterial.hh" -using namespace ignition::rendering; +using namespace gz::rendering; ////////////////////////////////////////////////// diff --git a/ogre2/src/Ogre2Scene.cc b/ogre2/src/Ogre2Scene.cc index 5b631f897..bdfb93669 100644 --- a/ogre2/src/Ogre2Scene.cc +++ b/ogre2/src/Ogre2Scene.cc @@ -38,7 +38,7 @@ #include "ignition/rendering/ogre2/Ogre2ThermalCamera.hh" #include "ignition/rendering/ogre2/Ogre2Visual.hh" -using namespace ignition; +using namespace gz; using namespace rendering; // TODO(anyone) make this a member variable in ign-rendering4 diff --git a/ogre2/src/Ogre2SelectionBuffer.cc b/ogre2/src/Ogre2SelectionBuffer.cc index 6a0c5939b..2caa52bda 100644 --- a/ogre2/src/Ogre2SelectionBuffer.cc +++ b/ogre2/src/Ogre2SelectionBuffer.cc @@ -27,10 +27,10 @@ #include "ignition/rendering/ogre2/Ogre2Scene.hh" #include "ignition/rendering/ogre2/Ogre2SelectionBuffer.hh" -using namespace ignition; +using namespace gz; using namespace rendering; -class ignition::rendering::Ogre2SelectionBufferPrivate +class gz::rendering::Ogre2SelectionBufferPrivate { /// \brief This is a material listener and a RenderTargetListener. /// The material switcher is applied to only the selection camera diff --git a/ogre2/src/Ogre2Sensor.cc b/ogre2/src/Ogre2Sensor.cc index 7c919314b..48ab575d7 100644 --- a/ogre2/src/Ogre2Sensor.cc +++ b/ogre2/src/Ogre2Sensor.cc @@ -16,7 +16,7 @@ */ #include "ignition/rendering/ogre2/Ogre2Sensor.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre2/src/Ogre2ThermalCamera.cc b/ogre2/src/Ogre2ThermalCamera.cc index d31299bcb..3d158f91d 100644 --- a/ogre2/src/Ogre2ThermalCamera.cc +++ b/ogre2/src/Ogre2ThermalCamera.cc @@ -40,7 +40,7 @@ #include "ignition/rendering/ogre2/Ogre2ThermalCamera.hh" #include "ignition/rendering/ogre2/Ogre2Visual.hh" -namespace ignition +namespace gz { namespace rendering { @@ -90,7 +90,7 @@ class Ogre2ThermalCameraMaterialSwitcher : public Ogre::RenderTargetListener /// \internal /// \brief Private data for the Ogre2ThermalCamera class -class ignition::rendering::Ogre2ThermalCameraPrivate +class gz::rendering::Ogre2ThermalCameraPrivate { /// \brief The thermal buffer public: uint16_t *thermalBuffer = nullptr; @@ -123,7 +123,7 @@ class ignition::rendering::Ogre2ThermalCameraPrivate public: Ogre::MaterialPtr thermalMaterial; /// \brief Event used to signal thermal image data - public: ignition::common::EventT newThermalFrame; @@ -132,7 +132,7 @@ class ignition::rendering::Ogre2ThermalCameraPrivate thermalMaterialSwitcher = nullptr; }; -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/ogre2/src/Ogre2Visual.cc b/ogre2/src/Ogre2Visual.cc index fca7cc54d..8f36b543b 100644 --- a/ogre2/src/Ogre2Visual.cc +++ b/ogre2/src/Ogre2Visual.cc @@ -23,7 +23,7 @@ #include "ignition/rendering/ogre2/Ogre2Storage.hh" #include "ignition/rendering/ogre2/Ogre2Visual.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/optix/include/CMakeLists.txt b/optix/include/CMakeLists.txt index 297e254ff..a7479f53e 100644 --- a/optix/include/CMakeLists.txt +++ b/optix/include/CMakeLists.txt @@ -1 +1,2 @@ -add_subdirectory(ignition/rendering) +add_subdirectory(gz/rendering) +install(DIRECTORY ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL}) diff --git a/optix/include/gz/rendering/optix/OptixArrowVisual.hh b/optix/include/gz/rendering/optix/OptixArrowVisual.hh index e3e6d19d3..caecb3f7a 100644 --- a/optix/include/gz/rendering/optix/OptixArrowVisual.hh +++ b/optix/include/gz/rendering/optix/OptixArrowVisual.hh @@ -14,13 +14,13 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OPTIX_OPTIXARROWVISUAL_HH_ -#define IGNITION_RENDERING_OPTIX_OPTIXARROWVISUAL_HH_ +#ifndef GZ_RENDERING_OPTIX_OPTIXARROWVISUAL_HH_ +#define GZ_RENDERING_OPTIX_OPTIXARROWVISUAL_HH_ #include "ignition/rendering/base/BaseArrowVisual.hh" #include "ignition/rendering/optix/OptixVisual.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/optix/include/gz/rendering/optix/OptixAxisVisual.hh b/optix/include/gz/rendering/optix/OptixAxisVisual.hh index a4b47bca2..170fbed40 100644 --- a/optix/include/gz/rendering/optix/OptixAxisVisual.hh +++ b/optix/include/gz/rendering/optix/OptixAxisVisual.hh @@ -14,13 +14,13 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OPTIX_OPTIXAXISVISUAL_HH_ -#define IGNITION_RENDERING_OPTIX_OPTIXAXISVISUAL_HH_ +#ifndef GZ_RENDERING_OPTIX_OPTIXAXISVISUAL_HH_ +#define GZ_RENDERING_OPTIX_OPTIXAXISVISUAL_HH_ #include "ignition/rendering/base/BaseAxisVisual.hh" #include "ignition/rendering/optix/OptixVisual.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/optix/include/gz/rendering/optix/OptixBox.hh b/optix/include/gz/rendering/optix/OptixBox.hh index 6073bdf97..ad2d420ea 100644 --- a/optix/include/gz/rendering/optix/OptixBox.hh +++ b/optix/include/gz/rendering/optix/OptixBox.hh @@ -14,12 +14,12 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OPTIX_OPTIXBOX_HH_ -#define IGNITION_RENDERING_OPTIX_OPTIXBOX_HH_ +#ifndef GZ_RENDERING_OPTIX_OPTIXBOX_HH_ +#define GZ_RENDERING_OPTIX_OPTIXBOX_HH_ #include "ignition/rendering/optix/OptixPrimitive.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/optix/include/gz/rendering/optix/OptixCamera.hh b/optix/include/gz/rendering/optix/OptixCamera.hh index 5a02e6c12..5d5cecc7f 100644 --- a/optix/include/gz/rendering/optix/OptixCamera.hh +++ b/optix/include/gz/rendering/optix/OptixCamera.hh @@ -14,15 +14,15 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OPTIX_OPTIXCAMERA_HH_ -#define IGNITION_RENDERING_OPTIX_OPTIXCAMERA_HH_ +#ifndef GZ_RENDERING_OPTIX_OPTIXCAMERA_HH_ +#define GZ_RENDERING_OPTIX_OPTIXCAMERA_HH_ #include #include "ignition/rendering/base/BaseCamera.hh" #include "ignition/rendering/optix/OptixRenderTypes.hh" #include "ignition/rendering/optix/OptixSensor.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/optix/include/gz/rendering/optix/OptixCone.hh b/optix/include/gz/rendering/optix/OptixCone.hh index 35a78afab..cee6d1656 100644 --- a/optix/include/gz/rendering/optix/OptixCone.hh +++ b/optix/include/gz/rendering/optix/OptixCone.hh @@ -14,12 +14,12 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OPTIX_OPTIXCONE_HH_ -#define IGNITION_RENDERING_OPTIX_OPTIXCONE_HH_ +#ifndef GZ_RENDERING_OPTIX_OPTIXCONE_HH_ +#define GZ_RENDERING_OPTIX_OPTIXCONE_HH_ #include "ignition/rendering/optix/OptixPrimitive.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/optix/include/gz/rendering/optix/OptixConversions.hh b/optix/include/gz/rendering/optix/OptixConversions.hh index 646dbee82..01da68de6 100644 --- a/optix/include/gz/rendering/optix/OptixConversions.hh +++ b/optix/include/gz/rendering/optix/OptixConversions.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OPTIX_OPTIXCONVERSIONS_HH_ -#define IGNITION_RENDERING_OPTIX_OPTIXCONVERSIONS_HH_ +#ifndef GZ_RENDERING_OPTIX_OPTIXCONVERSIONS_HH_ +#define GZ_RENDERING_OPTIX_OPTIXCONVERSIONS_HH_ #include #include @@ -25,7 +25,7 @@ #include "ignition/rendering/optix/OptixIncludes.hh" #include "ignition/rendering/optix/Export.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/optix/include/gz/rendering/optix/OptixCylinder.hh b/optix/include/gz/rendering/optix/OptixCylinder.hh index f04d6591d..d59746733 100644 --- a/optix/include/gz/rendering/optix/OptixCylinder.hh +++ b/optix/include/gz/rendering/optix/OptixCylinder.hh @@ -14,12 +14,12 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OPTIX_OPTIXCYLINDER_HH_ -#define IGNITION_RENDERING_OPTIX_OPTIXCYLINDER_HH_ +#ifndef GZ_RENDERING_OPTIX_OPTIXCYLINDER_HH_ +#define GZ_RENDERING_OPTIX_OPTIXCYLINDER_HH_ #include "ignition/rendering/optix/OptixPrimitive.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/optix/include/gz/rendering/optix/OptixGeometry.hh b/optix/include/gz/rendering/optix/OptixGeometry.hh index 579a1c6c5..143fa5fe2 100644 --- a/optix/include/gz/rendering/optix/OptixGeometry.hh +++ b/optix/include/gz/rendering/optix/OptixGeometry.hh @@ -14,14 +14,14 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OPTIX_OPTIXGEOMETRY_HH_ -#define IGNITION_RENDERING_OPTIX_OPTIXGEOMETRY_HH_ +#ifndef GZ_RENDERING_OPTIX_OPTIXGEOMETRY_HH_ +#define GZ_RENDERING_OPTIX_OPTIXGEOMETRY_HH_ #include "ignition/rendering/base/BaseGeometry.hh" #include "ignition/rendering/optix/OptixIncludes.hh" #include "ignition/rendering/optix/OptixObject.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/optix/include/gz/rendering/optix/OptixGrid.hh b/optix/include/gz/rendering/optix/OptixGrid.hh index ded3af240..5145d7de3 100644 --- a/optix/include/gz/rendering/optix/OptixGrid.hh +++ b/optix/include/gz/rendering/optix/OptixGrid.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OPTIX_OPTIXGRID_HH_ -#define IGNITION_RENDERING_OPTIX_OPTIXGRID_HH_ +#ifndef GZ_RENDERING_OPTIX_OPTIXGRID_HH_ +#define GZ_RENDERING_OPTIX_OPTIXGRID_HH_ #include #include @@ -24,7 +24,7 @@ #include "ignition/rendering/optix/OptixObject.hh" #include "ignition/rendering/optix/OptixRenderTypes.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/optix/include/gz/rendering/optix/OptixIncludes.hh b/optix/include/gz/rendering/optix/OptixIncludes.hh index 2966aa3ce..001c7d1ee 100644 --- a/optix/include/gz/rendering/optix/OptixIncludes.hh +++ b/optix/include/gz/rendering/optix/OptixIncludes.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OPTIX_OPTIXINCLUDES_HH_ -#define IGNITION_RENDERING_OPTIX_OPTIXINCLUDES_HH_ +#ifndef GZ_RENDERING_OPTIX_OPTIXINCLUDES_HH_ +#define GZ_RENDERING_OPTIX_OPTIXINCLUDES_HH_ // #include #include diff --git a/optix/include/gz/rendering/optix/OptixLight.hh b/optix/include/gz/rendering/optix/OptixLight.hh index 39fb91efa..d1f782468 100644 --- a/optix/include/gz/rendering/optix/OptixLight.hh +++ b/optix/include/gz/rendering/optix/OptixLight.hh @@ -14,15 +14,15 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OPTIX_OPTIXLIGHT_HH_ -#define IGNITION_RENDERING_OPTIX_OPTIXLIGHT_HH_ +#ifndef GZ_RENDERING_OPTIX_OPTIXLIGHT_HH_ +#define GZ_RENDERING_OPTIX_OPTIXLIGHT_HH_ #include "ignition/rendering/base/BaseLight.hh" #include "ignition/rendering/optix/OptixNode.hh" #include "ignition/rendering/optix/OptixIncludes.hh" #include "ignition/rendering/optix/OptixLightTypes.hh" -namespace ignition +namespace gz { namespace rendering { @@ -35,15 +35,15 @@ namespace ignition public: virtual ~OptixLight(); - public: virtual ignition::math::Color DiffuseColor() const; + public: virtual gz::math::Color DiffuseColor() const; public: virtual void SetDiffuseColor( - const ignition::math::Color &_color); + const gz::math::Color &_color); - public: virtual ignition::math::Color SpecularColor() const; + public: virtual gz::math::Color SpecularColor() const; public: virtual void SetSpecularColor( - const ignition::math::Color &_color); + const gz::math::Color &_color); public: virtual double AttenuationConstant() const; @@ -81,9 +81,9 @@ namespace ignition public: virtual ~OptixDirectionalLight(); - public: virtual ignition::math::Vector3d Direction() const; + public: virtual gz::math::Vector3d Direction() const; - public: virtual void SetDirection(const ignition::math::Vector3d &_dir); + public: virtual void SetDirection(const gz::math::Vector3d &_dir); public: virtual OptixDirectionalLightData Data() const; @@ -129,17 +129,17 @@ namespace ignition public: virtual ~OptixSpotLight(); - public: virtual ignition::math::Vector3d Direction() const; + public: virtual gz::math::Vector3d Direction() const; - public: virtual void SetDirection(const ignition::math::Vector3d &_dir); + public: virtual void SetDirection(const gz::math::Vector3d &_dir); - public: virtual ignition::math::Angle InnerAngle() const; + public: virtual gz::math::Angle InnerAngle() const; - public: virtual void SetInnerAngle(const ignition::math::Angle &_angle); + public: virtual void SetInnerAngle(const gz::math::Angle &_angle); - public: virtual ignition::math::Angle OuterAngle() const; + public: virtual gz::math::Angle OuterAngle() const; - public: virtual void SetOuterAngle(const ignition::math::Angle &_angle); + public: virtual void SetOuterAngle(const gz::math::Angle &_angle); public: virtual double Falloff() const; diff --git a/optix/include/gz/rendering/optix/OptixLightManager.hh b/optix/include/gz/rendering/optix/OptixLightManager.hh index 312c66843..d6d5c3113 100644 --- a/optix/include/gz/rendering/optix/OptixLightManager.hh +++ b/optix/include/gz/rendering/optix/OptixLightManager.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OPTIX_OPTIXLIGHTMANAGER_HH_ -#define IGNITION_RENDERING_OPTIX_OPTIXLIGHTMANAGER_HH_ +#ifndef GZ_RENDERING_OPTIX_OPTIXLIGHTMANAGER_HH_ +#define GZ_RENDERING_OPTIX_OPTIXLIGHTMANAGER_HH_ #include #include @@ -25,7 +25,7 @@ #include "ignition/rendering/optix/OptixIncludes.hh" #include "ignition/rendering/optix/Export.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/optix/include/gz/rendering/optix/OptixLightTypes.hh b/optix/include/gz/rendering/optix/OptixLightTypes.hh index b150ad0f8..bbcba606d 100644 --- a/optix/include/gz/rendering/optix/OptixLightTypes.hh +++ b/optix/include/gz/rendering/optix/OptixLightTypes.hh @@ -14,13 +14,13 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OPTIX_OPTIXLIGHTTYPES_HH_ -#define IGNITION_RENDERING_OPTIX_OPTIXLIGHTTYPES_HH_ +#ifndef GZ_RENDERING_OPTIX_OPTIXLIGHTTYPES_HH_ +#define GZ_RENDERING_OPTIX_OPTIXLIGHTTYPES_HH_ #include #ifndef __CUDA_ARCH__ -namespace ignition +namespace gz { namespace rendering { diff --git a/optix/include/gz/rendering/optix/OptixMaterial.hh b/optix/include/gz/rendering/optix/OptixMaterial.hh index 0c2605a2f..17c30d0a4 100644 --- a/optix/include/gz/rendering/optix/OptixMaterial.hh +++ b/optix/include/gz/rendering/optix/OptixMaterial.hh @@ -14,15 +14,15 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OPTIX_OPTIXMATERIAL_HH_ -#define IGNITION_RENDERING_OPTIX_OPTIXMATERIAL_HH_ +#ifndef GZ_RENDERING_OPTIX_OPTIXMATERIAL_HH_ +#define GZ_RENDERING_OPTIX_OPTIXMATERIAL_HH_ #include #include "ignition/rendering/base/BaseMaterial.hh" #include "ignition/rendering/optix/OptixObject.hh" #include "ignition/rendering/optix/OptixIncludes.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/optix/include/gz/rendering/optix/OptixMesh.hh b/optix/include/gz/rendering/optix/OptixMesh.hh index 778ab54e5..4252e2233 100644 --- a/optix/include/gz/rendering/optix/OptixMesh.hh +++ b/optix/include/gz/rendering/optix/OptixMesh.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OPTIX_OPTIXMESH_HH_ -#define IGNITION_RENDERING_OPTIX_OPTIXMESH_HH_ +#ifndef GZ_RENDERING_OPTIX_OPTIXMESH_HH_ +#define GZ_RENDERING_OPTIX_OPTIXMESH_HH_ #include #include @@ -24,7 +24,7 @@ #include "ignition/rendering/optix/OptixObject.hh" #include "ignition/rendering/optix/OptixRenderTypes.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/optix/include/gz/rendering/optix/OptixMeshFactory.hh b/optix/include/gz/rendering/optix/OptixMeshFactory.hh index 4bbe206c1..9d7c5e5e6 100644 --- a/optix/include/gz/rendering/optix/OptixMeshFactory.hh +++ b/optix/include/gz/rendering/optix/OptixMeshFactory.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OPTIX_OPTIXMESHFACTORY_HH_ -#define IGNITION_RENDERING_OPTIX_OPTIXMESHFACTORY_HH_ +#ifndef GZ_RENDERING_OPTIX_OPTIXMESHFACTORY_HH_ +#define GZ_RENDERING_OPTIX_OPTIXMESHFACTORY_HH_ #include #include @@ -26,7 +26,7 @@ #include "ignition/rendering/optix/OptixMesh.hh" #include "ignition/rendering/optix/OptixIncludes.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/optix/include/gz/rendering/optix/OptixNode.hh b/optix/include/gz/rendering/optix/OptixNode.hh index 56efc518b..7cec33ce9 100644 --- a/optix/include/gz/rendering/optix/OptixNode.hh +++ b/optix/include/gz/rendering/optix/OptixNode.hh @@ -14,15 +14,15 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OPTIX_OPTIXNODE_HH_ -#define IGNITION_RENDERING_OPTIX_OPTIXNODE_HH_ +#ifndef GZ_RENDERING_OPTIX_OPTIXNODE_HH_ +#define GZ_RENDERING_OPTIX_OPTIXNODE_HH_ #include "ignition/rendering/base/BaseNode.hh" #include "ignition/rendering/optix/OptixIncludes.hh" #include "ignition/rendering/optix/OptixRenderTypes.hh" #include "ignition/rendering/optix/OptixObject.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/optix/include/gz/rendering/optix/OptixObject.hh b/optix/include/gz/rendering/optix/OptixObject.hh index a7ba45572..b292c3bf1 100644 --- a/optix/include/gz/rendering/optix/OptixObject.hh +++ b/optix/include/gz/rendering/optix/OptixObject.hh @@ -14,14 +14,14 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OPTIX_OPTIXOBJECT_HH_ -#define IGNITION_RENDERING_OPTIX_OPTIXOBJECT_HH_ +#ifndef GZ_RENDERING_OPTIX_OPTIXOBJECT_HH_ +#define GZ_RENDERING_OPTIX_OPTIXOBJECT_HH_ #include "ignition/rendering/base/BaseObject.hh" #include "ignition/rendering/optix/OptixRenderTypes.hh" #include "ignition/rendering/optix/Export.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/optix/include/gz/rendering/optix/OptixPrimitive.hh b/optix/include/gz/rendering/optix/OptixPrimitive.hh index 0e0ff3f5b..1e1ca647f 100644 --- a/optix/include/gz/rendering/optix/OptixPrimitive.hh +++ b/optix/include/gz/rendering/optix/OptixPrimitive.hh @@ -14,13 +14,13 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OPTIX_OPTIXPRIMITIVE_HH_ -#define IGNITION_RENDERING_OPTIX_OPTIXPRIMITIVE_HH_ +#ifndef GZ_RENDERING_OPTIX_OPTIXPRIMITIVE_HH_ +#define GZ_RENDERING_OPTIX_OPTIXPRIMITIVE_HH_ #include #include "ignition/rendering/optix/OptixGeometry.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/optix/include/gz/rendering/optix/OptixRayTypes.hh b/optix/include/gz/rendering/optix/OptixRayTypes.hh index bcfc9d966..bd696a2fa 100644 --- a/optix/include/gz/rendering/optix/OptixRayTypes.hh +++ b/optix/include/gz/rendering/optix/OptixRayTypes.hh @@ -14,13 +14,13 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OPTIX_OPTIXRAYTYPES_HH_ -#define IGNITION_RENDERING_OPTIX_OPTIXRAYTYPES_HH_ +#ifndef GZ_RENDERING_OPTIX_OPTIXRAYTYPES_HH_ +#define GZ_RENDERING_OPTIX_OPTIXRAYTYPES_HH_ #include #ifndef __CUDA_ARCH__ -namespace ignition +namespace gz { namespace rendering { diff --git a/optix/include/gz/rendering/optix/OptixRenderEngine.hh b/optix/include/gz/rendering/optix/OptixRenderEngine.hh index f823021f9..9c2637517 100644 --- a/optix/include/gz/rendering/optix/OptixRenderEngine.hh +++ b/optix/include/gz/rendering/optix/OptixRenderEngine.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OPTIX_OPTIXRENDERENGINE_HH_ -#define IGNITION_RENDERING_OPTIX_OPTIXRENDERENGINE_HH_ +#ifndef GZ_RENDERING_OPTIX_OPTIXRENDERENGINE_HH_ +#define GZ_RENDERING_OPTIX_OPTIXRENDERENGINE_HH_ #include #include @@ -25,7 +25,7 @@ #include "ignition/rendering/base/BaseRenderEngine.hh" #include "ignition/rendering/optix/OptixRenderTypes.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/optix/include/gz/rendering/optix/OptixRenderTarget.hh b/optix/include/gz/rendering/optix/OptixRenderTarget.hh index 23ae139b8..b5a3c8df0 100644 --- a/optix/include/gz/rendering/optix/OptixRenderTarget.hh +++ b/optix/include/gz/rendering/optix/OptixRenderTarget.hh @@ -14,15 +14,15 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OPTIX_OPTIXRENDERTARGET_HH_ -#define IGNITION_RENDERING_OPTIX_OPTIXRENDERTARGET_HH_ +#ifndef GZ_RENDERING_OPTIX_OPTIXRENDERTARGET_HH_ +#define GZ_RENDERING_OPTIX_OPTIXRENDERTARGET_HH_ #include "ignition/rendering/base/BaseRenderTarget.hh" #include "ignition/rendering/optix/OptixIncludes.hh" #include "ignition/rendering/optix/OptixRenderTypes.hh" #include "ignition/rendering/optix/OptixObject.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/optix/include/gz/rendering/optix/OptixRenderTypes.hh b/optix/include/gz/rendering/optix/OptixRenderTypes.hh index 6f876f2cb..81e46b005 100644 --- a/optix/include/gz/rendering/optix/OptixRenderTypes.hh +++ b/optix/include/gz/rendering/optix/OptixRenderTypes.hh @@ -14,12 +14,12 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OPTIX_OPTIXRENDERTYPES_HH_ -#define IGNITION_RENDERING_OPTIX_OPTIXRENDERTYPES_HH_ +#ifndef GZ_RENDERING_OPTIX_OPTIXRENDERTYPES_HH_ +#define GZ_RENDERING_OPTIX_OPTIXRENDERTYPES_HH_ #include "ignition/rendering/base/BaseRenderTypes.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/optix/include/gz/rendering/optix/OptixScene.hh b/optix/include/gz/rendering/optix/OptixScene.hh index 5b69b9fa8..13f51216e 100644 --- a/optix/include/gz/rendering/optix/OptixScene.hh +++ b/optix/include/gz/rendering/optix/OptixScene.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OPTIX_OPTIXSCENE_HH_ -#define IGNITION_RENDERING_OPTIX_OPTIXSCENE_HH_ +#ifndef GZ_RENDERING_OPTIX_OPTIXSCENE_HH_ +#define GZ_RENDERING_OPTIX_OPTIXSCENE_HH_ #include @@ -25,7 +25,7 @@ #include "ignition/rendering/optix/OptixIncludes.hh" #include "ignition/rendering/optix/Export.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/optix/include/gz/rendering/optix/OptixSensor.hh b/optix/include/gz/rendering/optix/OptixSensor.hh index 8804d5771..a0fa08a53 100644 --- a/optix/include/gz/rendering/optix/OptixSensor.hh +++ b/optix/include/gz/rendering/optix/OptixSensor.hh @@ -14,13 +14,13 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OPTIX_OPTIXSENSOR_HH_ -#define IGNITION_RENDERING_OPTIX_OPTIXSENSOR_HH_ +#ifndef GZ_RENDERING_OPTIX_OPTIXSENSOR_HH_ +#define GZ_RENDERING_OPTIX_OPTIXSENSOR_HH_ #include "ignition/rendering/base/BaseSensor.hh" #include "ignition/rendering/optix/OptixNode.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/optix/include/gz/rendering/optix/OptixSphere.hh b/optix/include/gz/rendering/optix/OptixSphere.hh index e7deb55f1..ede293733 100644 --- a/optix/include/gz/rendering/optix/OptixSphere.hh +++ b/optix/include/gz/rendering/optix/OptixSphere.hh @@ -14,12 +14,12 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OPTIX_OPTIXSPHERE_HH_ -#define IGNITION_RENDERING_OPTIX_OPTIXSPHERE_HH_ +#ifndef GZ_RENDERING_OPTIX_OPTIXSPHERE_HH_ +#define GZ_RENDERING_OPTIX_OPTIXSPHERE_HH_ #include "ignition/rendering/optix/OptixPrimitive.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/optix/include/gz/rendering/optix/OptixStorage.hh b/optix/include/gz/rendering/optix/OptixStorage.hh index f81983810..c861172d7 100644 --- a/optix/include/gz/rendering/optix/OptixStorage.hh +++ b/optix/include/gz/rendering/optix/OptixStorage.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OPTIX_OPTIXSTORAGE_HH_ -#define IGNITION_RENDERING_OPTIX_OPTIXSTORAGE_HH_ +#ifndef GZ_RENDERING_OPTIX_OPTIXSTORAGE_HH_ +#define GZ_RENDERING_OPTIX_OPTIXSTORAGE_HH_ #include "ignition/rendering/base/BaseStorage.hh" @@ -28,7 +28,7 @@ #include "ignition/rendering/optix/OptixSensor.hh" #include "ignition/rendering/optix/OptixVisual.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/optix/include/gz/rendering/optix/OptixTextureFactory.hh b/optix/include/gz/rendering/optix/OptixTextureFactory.hh index fa5f6cd86..6a766cf3d 100644 --- a/optix/include/gz/rendering/optix/OptixTextureFactory.hh +++ b/optix/include/gz/rendering/optix/OptixTextureFactory.hh @@ -14,15 +14,15 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OPTIX_OPTIXTEXTUREFACTORY_HH_ -#define IGNITION_RENDERING_OPTIX_OPTIXTEXTUREFACTORY_HH_ +#ifndef GZ_RENDERING_OPTIX_OPTIXTEXTUREFACTORY_HH_ +#define GZ_RENDERING_OPTIX_OPTIXTEXTUREFACTORY_HH_ #include #include "ignition/rendering/optix/OptixRenderTypes.hh" #include "ignition/rendering/optix/OptixIncludes.hh" #include "ignition/rendering/optix/Export.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/optix/include/gz/rendering/optix/OptixVisual.hh b/optix/include/gz/rendering/optix/OptixVisual.hh index 9b38dd8fe..c3e0b33ee 100644 --- a/optix/include/gz/rendering/optix/OptixVisual.hh +++ b/optix/include/gz/rendering/optix/OptixVisual.hh @@ -14,14 +14,14 @@ * limitations under the License. * */ -#ifndef IGNITION_RENDERING_OPTIX_OPTIXVISUAL_HH_ -#define IGNITION_RENDERING_OPTIX_OPTIXVISUAL_HH_ +#ifndef GZ_RENDERING_OPTIX_OPTIXVISUAL_HH_ +#define GZ_RENDERING_OPTIX_OPTIXVISUAL_HH_ #include "ignition/rendering/base/BaseVisual.hh" #include "ignition/rendering/optix/OptixNode.hh" #include "ignition/rendering/optix/OptixRenderTypes.hh" -namespace ignition +namespace gz { namespace rendering { diff --git a/optix/include/ignition/rendering/optix.hh b/optix/include/ignition/rendering/optix.hh new file mode 100644 index 000000000..130fc6f6d --- /dev/null +++ b/optix/include/ignition/rendering/optix.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/optix/include/ignition/rendering/optix/OptixArrowVisual.hh b/optix/include/ignition/rendering/optix/OptixArrowVisual.hh new file mode 100644 index 000000000..933329946 --- /dev/null +++ b/optix/include/ignition/rendering/optix/OptixArrowVisual.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/optix/include/ignition/rendering/optix/OptixAxisVisual.hh b/optix/include/ignition/rendering/optix/OptixAxisVisual.hh new file mode 100644 index 000000000..88ba6d763 --- /dev/null +++ b/optix/include/ignition/rendering/optix/OptixAxisVisual.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/optix/include/ignition/rendering/optix/OptixBox.hh b/optix/include/ignition/rendering/optix/OptixBox.hh new file mode 100644 index 000000000..b43db3020 --- /dev/null +++ b/optix/include/ignition/rendering/optix/OptixBox.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/optix/include/ignition/rendering/optix/OptixCamera.hh b/optix/include/ignition/rendering/optix/OptixCamera.hh new file mode 100644 index 000000000..5659c12e5 --- /dev/null +++ b/optix/include/ignition/rendering/optix/OptixCamera.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/optix/include/ignition/rendering/optix/OptixCone.hh b/optix/include/ignition/rendering/optix/OptixCone.hh new file mode 100644 index 000000000..f2d0e9bf1 --- /dev/null +++ b/optix/include/ignition/rendering/optix/OptixCone.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/optix/include/ignition/rendering/optix/OptixConversions.hh b/optix/include/ignition/rendering/optix/OptixConversions.hh new file mode 100644 index 000000000..cfc237f61 --- /dev/null +++ b/optix/include/ignition/rendering/optix/OptixConversions.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/optix/include/ignition/rendering/optix/OptixCylinder.hh b/optix/include/ignition/rendering/optix/OptixCylinder.hh new file mode 100644 index 000000000..c34683269 --- /dev/null +++ b/optix/include/ignition/rendering/optix/OptixCylinder.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/optix/include/ignition/rendering/optix/OptixGeometry.hh b/optix/include/ignition/rendering/optix/OptixGeometry.hh new file mode 100644 index 000000000..0757681dd --- /dev/null +++ b/optix/include/ignition/rendering/optix/OptixGeometry.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/optix/include/ignition/rendering/optix/OptixGrid.hh b/optix/include/ignition/rendering/optix/OptixGrid.hh new file mode 100644 index 000000000..4ff8ad710 --- /dev/null +++ b/optix/include/ignition/rendering/optix/OptixGrid.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/optix/include/ignition/rendering/optix/OptixIncludes.hh b/optix/include/ignition/rendering/optix/OptixIncludes.hh new file mode 100644 index 000000000..0d9bfc38f --- /dev/null +++ b/optix/include/ignition/rendering/optix/OptixIncludes.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/optix/include/ignition/rendering/optix/OptixLight.hh b/optix/include/ignition/rendering/optix/OptixLight.hh new file mode 100644 index 000000000..f323a078a --- /dev/null +++ b/optix/include/ignition/rendering/optix/OptixLight.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/optix/include/ignition/rendering/optix/OptixLightManager.hh b/optix/include/ignition/rendering/optix/OptixLightManager.hh new file mode 100644 index 000000000..e0dc46dad --- /dev/null +++ b/optix/include/ignition/rendering/optix/OptixLightManager.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/optix/include/ignition/rendering/optix/OptixLightTypes.hh b/optix/include/ignition/rendering/optix/OptixLightTypes.hh new file mode 100644 index 000000000..bb2b1dc2e --- /dev/null +++ b/optix/include/ignition/rendering/optix/OptixLightTypes.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/optix/include/ignition/rendering/optix/OptixMaterial.hh b/optix/include/ignition/rendering/optix/OptixMaterial.hh new file mode 100644 index 000000000..0a17cad23 --- /dev/null +++ b/optix/include/ignition/rendering/optix/OptixMaterial.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/optix/include/ignition/rendering/optix/OptixMesh.hh b/optix/include/ignition/rendering/optix/OptixMesh.hh new file mode 100644 index 000000000..615bcdfba --- /dev/null +++ b/optix/include/ignition/rendering/optix/OptixMesh.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/optix/include/ignition/rendering/optix/OptixMeshFactory.hh b/optix/include/ignition/rendering/optix/OptixMeshFactory.hh new file mode 100644 index 000000000..4ef7d2847 --- /dev/null +++ b/optix/include/ignition/rendering/optix/OptixMeshFactory.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/optix/include/ignition/rendering/optix/OptixNode.hh b/optix/include/ignition/rendering/optix/OptixNode.hh new file mode 100644 index 000000000..313f68011 --- /dev/null +++ b/optix/include/ignition/rendering/optix/OptixNode.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/optix/include/ignition/rendering/optix/OptixObject.hh b/optix/include/ignition/rendering/optix/OptixObject.hh new file mode 100644 index 000000000..f39eb1b2d --- /dev/null +++ b/optix/include/ignition/rendering/optix/OptixObject.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/optix/include/ignition/rendering/optix/OptixPrimitive.hh b/optix/include/ignition/rendering/optix/OptixPrimitive.hh new file mode 100644 index 000000000..7a729f4e4 --- /dev/null +++ b/optix/include/ignition/rendering/optix/OptixPrimitive.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/optix/include/ignition/rendering/optix/OptixRayTypes.hh b/optix/include/ignition/rendering/optix/OptixRayTypes.hh new file mode 100644 index 000000000..e82e5f651 --- /dev/null +++ b/optix/include/ignition/rendering/optix/OptixRayTypes.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/optix/include/ignition/rendering/optix/OptixRenderEngine.hh b/optix/include/ignition/rendering/optix/OptixRenderEngine.hh new file mode 100644 index 000000000..5f3b3ea56 --- /dev/null +++ b/optix/include/ignition/rendering/optix/OptixRenderEngine.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/optix/include/ignition/rendering/optix/OptixRenderTarget.hh b/optix/include/ignition/rendering/optix/OptixRenderTarget.hh new file mode 100644 index 000000000..78c4a22a8 --- /dev/null +++ b/optix/include/ignition/rendering/optix/OptixRenderTarget.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/optix/include/ignition/rendering/optix/OptixRenderTypes.hh b/optix/include/ignition/rendering/optix/OptixRenderTypes.hh new file mode 100644 index 000000000..5135414b5 --- /dev/null +++ b/optix/include/ignition/rendering/optix/OptixRenderTypes.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/optix/include/ignition/rendering/optix/OptixScene.hh b/optix/include/ignition/rendering/optix/OptixScene.hh new file mode 100644 index 000000000..8f7c7e061 --- /dev/null +++ b/optix/include/ignition/rendering/optix/OptixScene.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/optix/include/ignition/rendering/optix/OptixSensor.hh b/optix/include/ignition/rendering/optix/OptixSensor.hh new file mode 100644 index 000000000..b296f55b5 --- /dev/null +++ b/optix/include/ignition/rendering/optix/OptixSensor.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/optix/include/ignition/rendering/optix/OptixSphere.hh b/optix/include/ignition/rendering/optix/OptixSphere.hh new file mode 100644 index 000000000..5fefd0c50 --- /dev/null +++ b/optix/include/ignition/rendering/optix/OptixSphere.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/optix/include/ignition/rendering/optix/OptixStorage.hh b/optix/include/ignition/rendering/optix/OptixStorage.hh new file mode 100644 index 000000000..02dc0ab8d --- /dev/null +++ b/optix/include/ignition/rendering/optix/OptixStorage.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/optix/include/ignition/rendering/optix/OptixTextureFactory.hh b/optix/include/ignition/rendering/optix/OptixTextureFactory.hh new file mode 100644 index 000000000..266b65ad7 --- /dev/null +++ b/optix/include/ignition/rendering/optix/OptixTextureFactory.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/optix/include/ignition/rendering/optix/OptixVisual.hh b/optix/include/ignition/rendering/optix/OptixVisual.hh new file mode 100644 index 000000000..7ed4d7380 --- /dev/null +++ b/optix/include/ignition/rendering/optix/OptixVisual.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/optix/src/OptixArrowVisual.cc b/optix/src/OptixArrowVisual.cc index 107b24f17..9b2ccb8cd 100644 --- a/optix/src/OptixArrowVisual.cc +++ b/optix/src/OptixArrowVisual.cc @@ -16,7 +16,7 @@ */ #include "ignition/rendering/optix/OptixArrowVisual.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/optix/src/OptixAxisVisual.cc b/optix/src/OptixAxisVisual.cc index e3b6d9f62..0cd7cd8c7 100644 --- a/optix/src/OptixAxisVisual.cc +++ b/optix/src/OptixAxisVisual.cc @@ -16,7 +16,7 @@ */ #include "ignition/rendering/optix/OptixAxisVisual.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/optix/src/OptixBox.cc b/optix/src/OptixBox.cc index 0138980c1..08a851c34 100644 --- a/optix/src/OptixBox.cc +++ b/optix/src/OptixBox.cc @@ -16,7 +16,7 @@ */ #include "ignition/rendering/optix/OptixBox.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/optix/src/OptixCamera.cc b/optix/src/OptixCamera.cc index caf345b39..61711fbca 100644 --- a/optix/src/OptixCamera.cc +++ b/optix/src/OptixCamera.cc @@ -21,7 +21,7 @@ #include "ignition/rendering/optix/OptixRenderTarget.hh" #include "ignition/rendering/optix/OptixScene.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/optix/src/OptixCone.cc b/optix/src/OptixCone.cc index 6ab546321..c63447009 100644 --- a/optix/src/OptixCone.cc +++ b/optix/src/OptixCone.cc @@ -16,7 +16,7 @@ */ #include "ignition/rendering/optix/OptixCone.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/optix/src/OptixConversions.cc b/optix/src/OptixConversions.cc index 27fa476ce..df8f84bd8 100644 --- a/optix/src/OptixConversions.cc +++ b/optix/src/OptixConversions.cc @@ -16,7 +16,7 @@ */ #include "ignition/rendering/optix/OptixConversions.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/optix/src/OptixCylinder.cc b/optix/src/OptixCylinder.cc index 69a0939e9..183363f1a 100644 --- a/optix/src/OptixCylinder.cc +++ b/optix/src/OptixCylinder.cc @@ -16,7 +16,7 @@ */ #include "ignition/rendering/optix/OptixCylinder.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/optix/src/OptixGeometry.cc b/optix/src/OptixGeometry.cc index 03721eea4..9213ad7e0 100644 --- a/optix/src/OptixGeometry.cc +++ b/optix/src/OptixGeometry.cc @@ -20,7 +20,7 @@ #include "ignition/rendering/optix/OptixScene.hh" #include "ignition/rendering/optix/OptixVisual.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/optix/src/OptixGrid.cc b/optix/src/OptixGrid.cc index 6d2c438bb..f965e60c7 100644 --- a/optix/src/OptixGrid.cc +++ b/optix/src/OptixGrid.cc @@ -19,7 +19,7 @@ #include "ignition/rendering/optix/OptixIncludes.hh" #include "ignition/rendering/optix/OptixVisual.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/optix/src/OptixLight.cc b/optix/src/OptixLight.cc index ab759dad6..bd61f693c 100644 --- a/optix/src/OptixLight.cc +++ b/optix/src/OptixLight.cc @@ -21,7 +21,7 @@ #include "ignition/rendering/optix/OptixIncludes.hh" #include "ignition/rendering/optix/OptixScene.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/optix/src/OptixLightManager.cc b/optix/src/OptixLightManager.cc index a7ee354af..7f13d379b 100644 --- a/optix/src/OptixLightManager.cc +++ b/optix/src/OptixLightManager.cc @@ -20,7 +20,7 @@ #include "ignition/rendering/optix/OptixScene.hh" #include "ignition/rendering/optix/OptixVisual.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/optix/src/OptixMaterial.cc b/optix/src/OptixMaterial.cc index a9b0561c8..623bfb11b 100644 --- a/optix/src/OptixMaterial.cc +++ b/optix/src/OptixMaterial.cc @@ -21,7 +21,7 @@ #include "ignition/rendering/optix/OptixScene.hh" #include "ignition/rendering/optix/OptixTextureFactory.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/optix/src/OptixMesh.cc b/optix/src/OptixMesh.cc index 8e0e0aa6b..fc1ffb902 100644 --- a/optix/src/OptixMesh.cc +++ b/optix/src/OptixMesh.cc @@ -22,7 +22,7 @@ #include "ignition/rendering/optix/OptixMaterial.hh" #include "ignition/rendering/optix/OptixStorage.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/optix/src/OptixMeshFactory.cc b/optix/src/OptixMeshFactory.cc index 8788a3f2c..24068845b 100644 --- a/optix/src/OptixMeshFactory.cc +++ b/optix/src/OptixMeshFactory.cc @@ -22,7 +22,7 @@ #include "ignition/rendering/optix/OptixMesh.hh" #include "ignition/rendering/optix/OptixStorage.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/optix/src/OptixNode.cc b/optix/src/OptixNode.cc index 9cbea0566..c18be5e6a 100644 --- a/optix/src/OptixNode.cc +++ b/optix/src/OptixNode.cc @@ -20,7 +20,7 @@ #include "ignition/rendering/optix/OptixScene.hh" #include "ignition/rendering/optix/OptixStorage.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/optix/src/OptixObject.cc b/optix/src/OptixObject.cc index d30572cd9..b45584c51 100644 --- a/optix/src/OptixObject.cc +++ b/optix/src/OptixObject.cc @@ -18,7 +18,7 @@ #include "ignition/rendering/optix/OptixScene.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/optix/src/OptixPrimitive.cc b/optix/src/OptixPrimitive.cc index 82eec6b7c..d2cc35ebf 100644 --- a/optix/src/OptixPrimitive.cc +++ b/optix/src/OptixPrimitive.cc @@ -21,7 +21,7 @@ #include "ignition/rendering/optix/OptixMaterial.hh" #include "ignition/rendering/optix/OptixScene.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/optix/src/OptixRenderEngine.cc b/optix/src/OptixRenderEngine.cc index 5c2d5e45e..4b8031bd8 100644 --- a/optix/src/OptixRenderEngine.cc +++ b/optix/src/OptixRenderEngine.cc @@ -25,7 +25,7 @@ #include "ignition/rendering/optix/OptixStorage.hh" #include "ignition/rendering/optix/OptixRenderEngine.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/optix/src/OptixRenderTarget.cc b/optix/src/OptixRenderTarget.cc index 890d31958..46d6083b0 100644 --- a/optix/src/OptixRenderTarget.cc +++ b/optix/src/OptixRenderTarget.cc @@ -22,7 +22,7 @@ #include "ignition/rendering/optix/OptixConversions.hh" #include "ignition/rendering/optix/OptixScene.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/optix/src/OptixScene.cc b/optix/src/OptixScene.cc index d7e97063c..aea89fd12 100644 --- a/optix/src/OptixScene.cc +++ b/optix/src/OptixScene.cc @@ -33,7 +33,7 @@ #include "ignition/rendering/optix/OptixStorage.hh" #include "ignition/rendering/optix/OptixVisual.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/optix/src/OptixSensor.cc b/optix/src/OptixSensor.cc index 59d3d69bf..a7c16c3fc 100644 --- a/optix/src/OptixSensor.cc +++ b/optix/src/OptixSensor.cc @@ -16,7 +16,7 @@ */ #include "ignition/rendering/optix/OptixSensor.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/optix/src/OptixSphere.cc b/optix/src/OptixSphere.cc index da64723db..95c9918b7 100644 --- a/optix/src/OptixSphere.cc +++ b/optix/src/OptixSphere.cc @@ -16,7 +16,7 @@ */ #include "ignition/rendering/optix/OptixSphere.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/optix/src/OptixTextureFactory.cc b/optix/src/OptixTextureFactory.cc index 29b369d1f..160406d21 100644 --- a/optix/src/OptixTextureFactory.cc +++ b/optix/src/OptixTextureFactory.cc @@ -21,7 +21,7 @@ #include "ignition/rendering/optix/OptixTextureFactory.hh" #include "ignition/rendering/optix/OptixScene.hh" -using namespace ignition; +using namespace gz; using namespace rendering; // TODO: clone texture sampler, reuse texture buffers diff --git a/optix/src/OptixVisual.cc b/optix/src/OptixVisual.cc index 3596a1551..e0312b80c 100644 --- a/optix/src/OptixVisual.cc +++ b/optix/src/OptixVisual.cc @@ -21,7 +21,7 @@ #include "ignition/rendering/optix/OptixConversions.hh" #include "ignition/rendering/optix/OptixStorage.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/src/Camera_TEST.cc b/src/Camera_TEST.cc index 85809497b..945422786 100644 --- a/src/Camera_TEST.cc +++ b/src/Camera_TEST.cc @@ -27,7 +27,7 @@ #include "ignition/rendering/RenderPassSystem.hh" #include "ignition/rendering/Scene.hh" -using namespace ignition; +using namespace gz; using namespace rendering; class CameraTest : public testing::Test, diff --git a/src/GaussianNoisePass.cc b/src/GaussianNoisePass.cc index 9fed44dbc..a87e00d1f 100644 --- a/src/GaussianNoisePass.cc +++ b/src/GaussianNoisePass.cc @@ -18,7 +18,7 @@ #include "ignition/rendering/GaussianNoisePass.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/src/GaussianNoisePass_TEST.cc b/src/GaussianNoisePass_TEST.cc index 51d362ab8..7f6515d47 100644 --- a/src/GaussianNoisePass_TEST.cc +++ b/src/GaussianNoisePass_TEST.cc @@ -26,7 +26,7 @@ #include "ignition/rendering/RenderingIface.hh" #include "ignition/rendering/RenderPassSystem.hh" -using namespace ignition; +using namespace gz; using namespace rendering; class GaussianNoisePassTest : public testing::Test, diff --git a/src/GizmoVisual_TEST.cc b/src/GizmoVisual_TEST.cc index 12e13a935..0005b61fd 100644 --- a/src/GizmoVisual_TEST.cc +++ b/src/GizmoVisual_TEST.cc @@ -27,7 +27,7 @@ #include "ignition/rendering/RenderingIface.hh" #include "ignition/rendering/Scene.hh" -using namespace ignition; +using namespace gz; using namespace rendering; class GizmoVisualTest : public testing::Test, diff --git a/src/Grid_TEST.cc b/src/Grid_TEST.cc index bbb21e8ff..61937b904 100644 --- a/src/Grid_TEST.cc +++ b/src/Grid_TEST.cc @@ -25,7 +25,7 @@ #include "ignition/rendering/Grid.hh" #include "ignition/rendering/Scene.hh" -using namespace ignition; +using namespace gz; using namespace rendering; class GridTest : public testing::Test, diff --git a/src/Image.cc b/src/Image.cc index a2ad9cc43..a94f040cc 100644 --- a/src/Image.cc +++ b/src/Image.cc @@ -16,7 +16,7 @@ */ #include "ignition/rendering/Image.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/src/Light_TEST.cc b/src/Light_TEST.cc index 4001636aa..c101e4ace 100644 --- a/src/Light_TEST.cc +++ b/src/Light_TEST.cc @@ -25,7 +25,7 @@ #include "ignition/rendering/RenderingIface.hh" #include "ignition/rendering/Scene.hh" -using namespace ignition; +using namespace gz; using namespace rendering; class LightTest : public testing::Test, diff --git a/src/Marker.cc b/src/Marker.cc index d83c181df..805882f34 100644 --- a/src/Marker.cc +++ b/src/Marker.cc @@ -18,7 +18,7 @@ #include "ignition/rendering/Marker.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/src/Marker_TEST.cc b/src/Marker_TEST.cc index 857b3cf94..0254f373a 100644 --- a/src/Marker_TEST.cc +++ b/src/Marker_TEST.cc @@ -24,7 +24,7 @@ #include "ignition/rendering/Marker.hh" #include "ignition/rendering/Scene.hh" -using namespace ignition; +using namespace gz; using namespace rendering; using namespace std::chrono_literals; diff --git a/src/Material_TEST.cc b/src/Material_TEST.cc index 097827bbb..79a5ef926 100644 --- a/src/Material_TEST.cc +++ b/src/Material_TEST.cc @@ -30,7 +30,7 @@ #include "ignition/rendering/ShaderType.hh" #include "ignition/rendering/Scene.hh" -using namespace ignition; +using namespace gz; using namespace rendering; class MaterialTest : public testing::Test, diff --git a/src/MeshDescriptor.cc b/src/MeshDescriptor.cc index f1a9d0690..4aa9d57b0 100644 --- a/src/MeshDescriptor.cc +++ b/src/MeshDescriptor.cc @@ -21,7 +21,7 @@ #include "ignition/rendering/MeshDescriptor.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/src/MeshDescriptor_TEST.cc b/src/MeshDescriptor_TEST.cc index 7a41e8aba..b32c4a660 100644 --- a/src/MeshDescriptor_TEST.cc +++ b/src/MeshDescriptor_TEST.cc @@ -29,7 +29,7 @@ #include "ignition/rendering/RenderingIface.hh" #include "ignition/rendering/Scene.hh" -using namespace ignition; +using namespace gz; using namespace rendering; class MeshDescriptorTest : public testing::Test, diff --git a/src/Mesh_TEST.cc b/src/Mesh_TEST.cc index 2bd47c369..49fb9ab94 100644 --- a/src/Mesh_TEST.cc +++ b/src/Mesh_TEST.cc @@ -27,7 +27,7 @@ #include "ignition/rendering/RenderingIface.hh" #include "ignition/rendering/Scene.hh" -using namespace ignition; +using namespace gz; using namespace rendering; class MeshTest : public testing::Test, diff --git a/src/MoveToHelper.cc b/src/MoveToHelper.cc index f5467b9fe..46997e8e4 100644 --- a/src/MoveToHelper.cc +++ b/src/MoveToHelper.cc @@ -25,7 +25,7 @@ #include "ignition/rendering/Camera.hh" -class ignition::rendering::MoveToHelperPrivate +class gz::rendering::MoveToHelperPrivate { /// \brief Pose animation object public: std::unique_ptr poseAnim; @@ -40,7 +40,7 @@ class ignition::rendering::MoveToHelperPrivate public: math::Pose3d initCameraPose; }; -using namespace ignition; +using namespace gz; using namespace rendering; //////////////////////////////////////////////// diff --git a/src/MoveToHelper_TEST.cc b/src/MoveToHelper_TEST.cc index 75cb8d28a..96252cdd3 100644 --- a/src/MoveToHelper_TEST.cc +++ b/src/MoveToHelper_TEST.cc @@ -27,7 +27,7 @@ #include "ignition/rendering/RenderingIface.hh" #include "ignition/rendering/Scene.hh" -using namespace ignition; +using namespace gz; using namespace rendering; class MoveToHelperTest : public testing::Test, diff --git a/src/Node_TEST.cc b/src/Node_TEST.cc index 8bea71c14..6016b320f 100644 --- a/src/Node_TEST.cc +++ b/src/Node_TEST.cc @@ -28,7 +28,7 @@ #include "ignition/rendering/Scene.hh" #include "ignition/rendering/Visual.hh" -using namespace ignition; +using namespace gz; using namespace rendering; class NodeTest : public testing::Test, diff --git a/src/OrbitViewController.cc b/src/OrbitViewController.cc index 794b9586a..fd20ba7ee 100644 --- a/src/OrbitViewController.cc +++ b/src/OrbitViewController.cc @@ -21,7 +21,7 @@ #include "ignition/rendering/Scene.hh" #include "ignition/rendering/Visual.hh" -class ignition::rendering::OrbitViewControllerPrivate +class gz::rendering::OrbitViewControllerPrivate { /// \brief Pointer to camera public: CameraPtr camera; @@ -38,7 +38,7 @@ class ignition::rendering::OrbitViewControllerPrivate public: double NormalizePitch(double _pitch); }; -using namespace ignition; +using namespace gz; using namespace rendering; static const float PITCH_LIMIT_LOW = -static_cast(IGN_PI)*0.5f + 0.001f; diff --git a/src/OrbitViewController_TEST.cc b/src/OrbitViewController_TEST.cc index 1d06777de..ee660c98a 100644 --- a/src/OrbitViewController_TEST.cc +++ b/src/OrbitViewController_TEST.cc @@ -26,7 +26,7 @@ #include "ignition/rendering/RenderingIface.hh" #include "ignition/rendering/Scene.hh" -using namespace ignition; +using namespace gz; using namespace rendering; class OrbitViewControllerTest : public testing::Test, diff --git a/src/PixelFormat.cc b/src/PixelFormat.cc index 1d42c0531..ab253f4e1 100644 --- a/src/PixelFormat.cc +++ b/src/PixelFormat.cc @@ -19,7 +19,7 @@ #include "ignition/rendering/PixelFormat.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/src/PixelFormat_TEST.cc b/src/PixelFormat_TEST.cc index ab95b89b2..589f7e944 100644 --- a/src/PixelFormat_TEST.cc +++ b/src/PixelFormat_TEST.cc @@ -21,7 +21,7 @@ #include "ignition/rendering/PixelFormat.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ///////////////////////////////////////////////// diff --git a/src/RayQuery_TEST.cc b/src/RayQuery_TEST.cc index a7608648c..1768493f1 100644 --- a/src/RayQuery_TEST.cc +++ b/src/RayQuery_TEST.cc @@ -27,7 +27,7 @@ #include "ignition/rendering/RenderingIface.hh" #include "ignition/rendering/Scene.hh" -using namespace ignition; +using namespace gz; using namespace rendering; class RayQueryTest : public testing::Test, diff --git a/src/RenderEngineManager.cc b/src/RenderEngineManager.cc index 04883baf5..d926ec998 100644 --- a/src/RenderEngineManager.cc +++ b/src/RenderEngineManager.cc @@ -36,11 +36,11 @@ struct EngineInfo std::string name; /// \brief The pointer to the render engine. - ignition::rendering::RenderEngine *engine; + gz::rendering::RenderEngine *engine; }; /// \brief Private implementation of the RenderEngineManager class. -class ignition::rendering::RenderEngineManagerPrivate +class gz::rendering::RenderEngineManagerPrivate { /// \brief EngineMap that maps engine name to an engine pointer. typedef std::map EngineMap; @@ -93,7 +93,7 @@ class ignition::rendering::RenderEngineManagerPrivate public: std::map enginePlugins; /// \brief Plugin loader for managing render engine plugin libraries. - public: ignition::plugin::Loader pluginLoader; + public: gz::plugin::Loader pluginLoader; /// \brief List which holds paths to look for engine plugins. public: std::list pluginPaths; @@ -102,7 +102,7 @@ class ignition::rendering::RenderEngineManagerPrivate public: std::recursive_mutex enginesMutex; }; -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/src/RenderEnginePlugin.cc b/src/RenderEnginePlugin.cc index e14d7aa06..192226270 100644 --- a/src/RenderEnginePlugin.cc +++ b/src/RenderEnginePlugin.cc @@ -17,11 +17,11 @@ #include "ignition/rendering/RenderEnginePlugin.hh" -class ignition::rendering::RenderEnginePluginPrivate +class gz::rendering::RenderEnginePluginPrivate { }; -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/src/RenderEngine_TEST.cc b/src/RenderEngine_TEST.cc index 9842de19b..182e5586d 100644 --- a/src/RenderEngine_TEST.cc +++ b/src/RenderEngine_TEST.cc @@ -25,7 +25,7 @@ #include "ignition/rendering/Scene.hh" #include "ignition/rendering/RenderEngine.hh" -using namespace ignition; +using namespace gz; using namespace rendering; class RenderEngineTest : public testing::Test, diff --git a/src/RenderPassSystem.cc b/src/RenderPassSystem.cc index 5d4116d39..a1f24599f 100644 --- a/src/RenderPassSystem.cc +++ b/src/RenderPassSystem.cc @@ -19,11 +19,11 @@ #include "ignition/rendering/RenderPassSystem.hh" -using namespace ignition; +using namespace gz; using namespace rendering; /// \brief Private implementation of the RenderPassSystem class -class ignition::rendering::RenderPassSystemPrivate +class gz::rendering::RenderPassSystemPrivate { }; diff --git a/src/RenderPassSystem_TEST.cc b/src/RenderPassSystem_TEST.cc index 4443b154a..ddad4947e 100644 --- a/src/RenderPassSystem_TEST.cc +++ b/src/RenderPassSystem_TEST.cc @@ -25,7 +25,7 @@ #include "ignition/rendering/RenderingIface.hh" #include "ignition/rendering/RenderPassSystem.hh" -using namespace ignition; +using namespace gz; using namespace rendering; class RenderPassSystemTest : public testing::Test, diff --git a/src/RenderTarget_TEST.cc b/src/RenderTarget_TEST.cc index dae01de4a..55134dd14 100644 --- a/src/RenderTarget_TEST.cc +++ b/src/RenderTarget_TEST.cc @@ -29,7 +29,7 @@ #include "ignition/rendering/RenderTarget.hh" #include "ignition/rendering/Scene.hh" -using namespace ignition; +using namespace gz; using namespace rendering; class RenderTargetTest : public testing::Test, diff --git a/src/RenderingIface.cc b/src/RenderingIface.cc index b4b586670..dd8ebf266 100644 --- a/src/RenderingIface.cc +++ b/src/RenderingIface.cc @@ -22,7 +22,7 @@ #include "ignition/rendering/RenderEngineManager.hh" #include "ignition/rendering/Scene.hh" -namespace ignition +namespace gz { namespace rendering { @@ -129,7 +129,7 @@ void setPluginPaths(const std::list &_paths) ////////////////////////////////////////////////// ScenePtr sceneFromFirstRenderEngine() { - auto loadedEngNames = ignition::rendering::loadedEngines(); + auto loadedEngNames = gz::rendering::loadedEngines(); if (loadedEngNames.empty()) { igndbg << "No rendering engine is loaded yet" << std::endl; @@ -143,7 +143,7 @@ ScenePtr sceneFromFirstRenderEngine() << "Using engine [" << engineName << "]" << std::endl; } - auto engine = ignition::rendering::engine(engineName); + auto engine = gz::rendering::engine(engineName); if (!engine) { ignerr << "Internal error: failed to load engine [" << engineName diff --git a/src/RenderingIface_TEST.cc b/src/RenderingIface_TEST.cc index 999ff536d..7d2f9deb3 100644 --- a/src/RenderingIface_TEST.cc +++ b/src/RenderingIface_TEST.cc @@ -25,7 +25,7 @@ #include "ignition/rendering/RenderEngine.hh" #include "ignition/rendering/RenderingIface.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ///////////////////////////////////////////////// diff --git a/src/Scene_TEST.cc b/src/Scene_TEST.cc index edbdae43c..98497353a 100644 --- a/src/Scene_TEST.cc +++ b/src/Scene_TEST.cc @@ -25,7 +25,7 @@ #include "ignition/rendering/RenderingIface.hh" #include "ignition/rendering/Scene.hh" -using namespace ignition; +using namespace gz; using namespace rendering; class SceneTest : public testing::Test, diff --git a/src/ShaderParam.cc b/src/ShaderParam.cc index a4c7c6f80..bce4a6d78 100644 --- a/src/ShaderParam.cc +++ b/src/ShaderParam.cc @@ -17,10 +17,10 @@ #include "ignition/rendering/ShaderParam.hh" -using namespace ignition::rendering; +using namespace gz::rendering; -class ignition::rendering::ShaderParamPrivate +class gz::rendering::ShaderParamPrivate { /// \brief Type of parameter held public: ShaderParam::ParamType type = ShaderParam::PARAM_NONE; diff --git a/src/ShaderParam_TEST.cc b/src/ShaderParam_TEST.cc index 7965f976b..b9ea83809 100644 --- a/src/ShaderParam_TEST.cc +++ b/src/ShaderParam_TEST.cc @@ -19,7 +19,7 @@ #include "ignition/rendering/ShaderParam.hh" -using namespace ignition::rendering; +using namespace gz::rendering; ///////////////////////////////////////////////// diff --git a/src/ShaderParams.cc b/src/ShaderParams.cc index 3f59c08cb..be0fa3ea3 100644 --- a/src/ShaderParams.cc +++ b/src/ShaderParams.cc @@ -19,10 +19,10 @@ #include -using namespace ignition::rendering; +using namespace gz::rendering; -class ignition::rendering::ShaderParamsPrivate +class gz::rendering::ShaderParamsPrivate { /// \brief collection of parameters public: std::unordered_map parameters; @@ -32,7 +32,7 @@ class ignition::rendering::ShaderParamsPrivate }; -class ignition::rendering::ShaderParams::IteratorPrivate +class gz::rendering::ShaderParams::IteratorPrivate { /// \brief Iterator from the map in ShaderParamsPrivate public: std::unordered_map::const_iterator iter; diff --git a/src/ShaderParams_TEST.cc b/src/ShaderParams_TEST.cc index f8f9dfb7e..ffb35ffed 100644 --- a/src/ShaderParams_TEST.cc +++ b/src/ShaderParams_TEST.cc @@ -19,7 +19,7 @@ #include "ignition/rendering/ShaderParams.hh" -using namespace ignition::rendering; +using namespace gz::rendering; ///////////////////////////////////////////////// diff --git a/src/ShaderType.cc b/src/ShaderType.cc index 5b175a3b3..f9511f297 100644 --- a/src/ShaderType.cc +++ b/src/ShaderType.cc @@ -19,7 +19,7 @@ #include "ignition/rendering/ShaderType.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/src/Text_TEST.cc b/src/Text_TEST.cc index 63f44f396..f0d10604b 100644 --- a/src/Text_TEST.cc +++ b/src/Text_TEST.cc @@ -24,7 +24,7 @@ #include "ignition/rendering/Text.hh" #include "ignition/rendering/Scene.hh" -using namespace ignition; +using namespace gz; using namespace rendering; class TextTest : public testing::Test, diff --git a/src/ThermalCamera_TEST.cc b/src/ThermalCamera_TEST.cc index 29a57724a..3263c1af3 100644 --- a/src/ThermalCamera_TEST.cc +++ b/src/ThermalCamera_TEST.cc @@ -25,7 +25,7 @@ #include "ignition/rendering/RenderingIface.hh" #include "ignition/rendering/Scene.hh" -using namespace ignition; +using namespace gz; using namespace rendering; class ThermalCameraTest : public testing::Test, diff --git a/src/TransformController.cc b/src/TransformController.cc index 03ba26385..2782b14da 100644 --- a/src/TransformController.cc +++ b/src/TransformController.cc @@ -25,7 +25,7 @@ #include "ignition/rendering/TransformController.hh" /// \brief Private data class for TransformController -class ignition::rendering::TransformControllerPrivate +class gz::rendering::TransformControllerPrivate { /// \brief Gizmo visual that provides translation, rotation, and scale /// tandles for transformation @@ -48,21 +48,21 @@ class ignition::rendering::TransformControllerPrivate public: RayQueryPtr ray; /// \brief Current active axis of transformation - public: ignition::math::Vector3d axis; + public: gz::math::Vector3d axis; /// \brief Flag to indicate that transfomation is in progress. public: bool active = false; /// \brief Initial pose of the node being transformed. /// This is set in Start(); - public: ignition::math::Pose3d nodeStartPose; + public: gz::math::Pose3d nodeStartPose; /// \brief Initial scale of the node being transformed. /// This is set in Start(); - public: ignition::math::Vector3d nodeStartScale; + public: gz::math::Vector3d nodeStartScale; }; -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/src/TransformController_TEST.cc b/src/TransformController_TEST.cc index 6cc937308..c59c76b94 100644 --- a/src/TransformController_TEST.cc +++ b/src/TransformController_TEST.cc @@ -27,7 +27,7 @@ #include "ignition/rendering/Scene.hh" #include "ignition/rendering/TransformController.hh" -using namespace ignition; +using namespace gz; using namespace rendering; class TransformControllerTest : public testing::Test, diff --git a/src/Utils.cc b/src/Utils.cc index cd6de8286..b918fe5fc 100644 --- a/src/Utils.cc +++ b/src/Utils.cc @@ -28,7 +28,7 @@ #include "ignition/rendering/RayQuery.hh" #include "ignition/rendering/Utils.hh" -namespace ignition +namespace gz { namespace rendering { @@ -91,7 +91,7 @@ math::Vector3d screenToPlane( _rayQuery->SetFromCamera( _camera, math::Vector2d(nx, ny)); - ignition::math::Planed plane(ignition::math::Vector3d(0, 0, 1), offset); + gz::math::Planed plane(gz::math::Vector3d(0, 0, 1), offset); math::Vector3d origin = _rayQuery->Origin(); math::Vector3d direction = _rayQuery->Direction(); diff --git a/src/Utils_TEST.cc b/src/Utils_TEST.cc index 43e3a1e7c..8519817eb 100644 --- a/src/Utils_TEST.cc +++ b/src/Utils_TEST.cc @@ -27,7 +27,7 @@ #include "test_config.h" // NOLINT(build/include) -using namespace ignition; +using namespace gz; using namespace rendering; class UtilTest : public testing::Test, diff --git a/src/Visual_TEST.cc b/src/Visual_TEST.cc index 2234d112a..6427be7fb 100644 --- a/src/Visual_TEST.cc +++ b/src/Visual_TEST.cc @@ -28,7 +28,7 @@ #include "ignition/rendering/Scene.hh" #include "ignition/rendering/Visual.hh" -using namespace ignition; +using namespace gz; using namespace rendering; class VisualTest : public testing::Test, diff --git a/src/base/BaseObject.cc b/src/base/BaseObject.cc index d27bcaa67..f70b47a94 100644 --- a/src/base/BaseObject.cc +++ b/src/base/BaseObject.cc @@ -16,7 +16,7 @@ */ #include "ignition/rendering/base/BaseObject.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/src/base/BaseRenderEngine.cc b/src/base/BaseRenderEngine.cc index 5a0c26cca..f6121f9ea 100644 --- a/src/base/BaseRenderEngine.cc +++ b/src/base/BaseRenderEngine.cc @@ -20,7 +20,7 @@ #include "ignition/rendering/RenderPassSystem.hh" #include "ignition/rendering/base/BaseRenderEngine.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/src/base/BaseScene.cc b/src/base/BaseScene.cc index da781814b..f03a54b85 100644 --- a/src/base/BaseScene.cc +++ b/src/base/BaseScene.cc @@ -40,7 +40,7 @@ #include "ignition/rendering/base/BaseStorage.hh" #include "ignition/rendering/base/BaseScene.hh" -using namespace ignition; +using namespace gz; using namespace rendering; ////////////////////////////////////////////////// diff --git a/test/integration/camera.cc b/test/integration/camera.cc index 6763dcba5..892addc54 100644 --- a/test/integration/camera.cc +++ b/test/integration/camera.cc @@ -26,7 +26,7 @@ #include "ignition/rendering/RenderingIface.hh" #include "ignition/rendering/Scene.hh" -using namespace ignition; +using namespace gz; using namespace rendering; class CameraTest: public testing::Test, diff --git a/test/integration/deprecated_TEST.cc b/test/integration/deprecated_TEST.cc new file mode 100644 index 000000000..c38c5ad83 --- /dev/null +++ b/test/integration/deprecated_TEST.cc @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * +*/ + +#include +#include + +///////////////////////////////////////////////// +// Make sure the ignition namespace still works +TEST(Deprecated, IgnitionNamespace) +{ + ignition::camera::Camera camera; +} diff --git a/test/integration/depth_camera.cc b/test/integration/depth_camera.cc index 38a1388b4..174cd6f10 100644 --- a/test/integration/depth_camera.cc +++ b/test/integration/depth_camera.cc @@ -71,7 +71,7 @@ void DepthCameraTest::DepthCameraBoxes( double aspectRatio_ = imgWidth_/imgHeight_; double unitBoxSize = 1.0; - ignition::math::Vector3d boxPosition(1.8, 0.0, 0.0); + gz::math::Vector3d boxPosition(1.8, 0.0, 0.0); // Optix is not supported if (_renderEngine.compare("optix") == 0) @@ -82,7 +82,7 @@ void DepthCameraTest::DepthCameraBoxes( } // Setup ign-rendering with an empty scene - auto *engine = ignition::rendering::engine(_renderEngine); + auto *engine = gz::rendering::engine(_renderEngine); if (!engine) { igndbg << "Engine '" << _renderEngine @@ -90,23 +90,23 @@ void DepthCameraTest::DepthCameraBoxes( return; } - ignition::rendering::ScenePtr scene = engine->CreateScene("scene"); + gz::rendering::ScenePtr scene = engine->CreateScene("scene"); // red background scene->SetBackgroundColor(1.0, 0.0, 0.0); // Create an scene with a box in it scene->SetAmbientLight(1.0, 1.0, 1.0); - ignition::rendering::VisualPtr root = scene->RootVisual(); + gz::rendering::VisualPtr root = scene->RootVisual(); // create blue material - ignition::rendering::MaterialPtr blue = scene->CreateMaterial(); + gz::rendering::MaterialPtr blue = scene->CreateMaterial(); blue->SetAmbient(0.0, 0.0, 1.0); blue->SetDiffuse(0.0, 0.0, 1.0); blue->SetSpecular(0.0, 0.0, 1.0); // create box visual - ignition::rendering::VisualPtr box = scene->CreateVisual(); + gz::rendering::VisualPtr box = scene->CreateVisual(); box->AddGeometry(scene->CreateBox()); box->SetOrigin(0.0, 0.0, 0.0); box->SetLocalPosition(boxPosition); @@ -122,8 +122,8 @@ void DepthCameraTest::DepthCameraBoxes( auto depthCamera = scene->CreateDepthCamera("DepthCamera"); ASSERT_NE(depthCamera, nullptr); - ignition::math::Pose3d testPose(ignition::math::Vector3d(0, 0, 0), - ignition::math::Quaterniond::Identity); + gz::math::Pose3d testPose(gz::math::Vector3d(0, 0, 0), + gz::math::Quaterniond::Identity); depthCamera->SetLocalPose(testPose); // Configure depth camera @@ -147,7 +147,7 @@ void DepthCameraTest::DepthCameraBoxes( // Set a callback on the camera sensor to get a depth camera frame float *scan = new float[imgHeight_ * imgWidth_]; - ignition::common::ConnectionPtr connection = + gz::common::ConnectionPtr connection = depthCamera->ConnectNewDepthFrame( std::bind(&::OnNewDepthFrame, scan, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, @@ -157,7 +157,7 @@ void DepthCameraTest::DepthCameraBoxes( unsigned int pointCloudChannelCount = 4u; float *pointCloudData = new float[ imgHeight_ * imgWidth_ * pointCloudChannelCount]; - ignition::common::ConnectionPtr connection2 = + gz::common::ConnectionPtr connection2 = depthCamera->ConnectNewRgbPointCloud( std::bind(&::OnNewRgbPointCloud, pointCloudData, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, @@ -189,8 +189,8 @@ void DepthCameraTest::DepthCameraBoxes( * (depthCamera->ImageWidth() * pointCloudChannelCount) - pointCloudChannelCount; - float minVal = -ignition::math::INF_D; - float maxVal = ignition::math::INF_D; + float minVal = -gz::math::INF_D; + float maxVal = gz::math::INF_D; // Verify Depth // Depth sensor should see box in the middle of the image @@ -289,7 +289,7 @@ void DepthCameraTest::DepthCameraBoxes( } // Check that for a box really close it returns it is not seen - ignition::math::Vector3d boxPositionNear( + gz::math::Vector3d boxPositionNear( unitBoxSize * 0.5 + nearDist * 0.5, 0.0, 0.0); box->SetLocalPosition(boxPositionNear); @@ -345,7 +345,7 @@ void DepthCameraTest::DepthCameraBoxes( } // Check that for a box really far it returns max val - ignition::math::Vector3d boxPositionFar( + gz::math::Vector3d boxPositionFar( unitBoxSize * 0.5 + farDist * 1.5, 0.0, 0.0); box->SetLocalPosition(boxPositionFar); @@ -403,7 +403,7 @@ void DepthCameraTest::DepthCameraBoxes( } // Check that the depth values for a box do not warp. - ignition::math::Vector3d boxPositionFillFrame( + gz::math::Vector3d boxPositionFillFrame( unitBoxSize * 0.5 + 0.2, 0.0, 0.0); box->SetLocalPosition(boxPositionFillFrame); @@ -468,7 +468,7 @@ void DepthCameraTest::DepthCameraBoxes( } engine->DestroyScene(scene); - ignition::rendering::unloadEngine(engine->Name()); + gz::rendering::unloadEngine(engine->Name()); } TEST_P(DepthCameraTest, DepthCameraBoxes) @@ -477,7 +477,7 @@ TEST_P(DepthCameraTest, DepthCameraBoxes) } INSTANTIATE_TEST_CASE_P(DepthCamera, DepthCameraTest, - RENDER_ENGINE_VALUES, ignition::rendering::PrintToStringParam()); + RENDER_ENGINE_VALUES, gz::rendering::PrintToStringParam()); ////////////////////////////////////////////////// int main(int argc, char **argv) diff --git a/test/integration/gpu_rays.cc b/test/integration/gpu_rays.cc index a2b3946e5..ff21fd473 100644 --- a/test/integration/gpu_rays.cc +++ b/test/integration/gpu_rays.cc @@ -36,7 +36,7 @@ #define WAIT_TIME 0.02 -using namespace ignition; +using namespace gz; using namespace rendering; void OnNewGpuRaysFrame(float *_scanDest, const float *_scan, diff --git a/test/integration/render_pass.cc b/test/integration/render_pass.cc index abee56692..476121dfe 100644 --- a/test/integration/render_pass.cc +++ b/test/integration/render_pass.cc @@ -45,7 +45,7 @@ void OnNewRgbPointCloud(float *_scanDest, const float *_scan, memcpy(_scanDest, _scan, size * sizeof(f)); g_pointCloudCounter++; } -using namespace ignition; +using namespace gz; using namespace rendering; class RenderPassTest: public testing::Test, diff --git a/test/integration/scene.cc b/test/integration/scene.cc index ab0a631ce..e95fd23b5 100644 --- a/test/integration/scene.cc +++ b/test/integration/scene.cc @@ -26,7 +26,7 @@ #include "ignition/rendering/RenderingIface.hh" #include "ignition/rendering/Scene.hh" -using namespace ignition; +using namespace gz; using namespace rendering; class SceneTest: public testing::Test, diff --git a/test/integration/shadows.cc b/test/integration/shadows.cc index 40dd10d16..c28e0dbd2 100644 --- a/test/integration/shadows.cc +++ b/test/integration/shadows.cc @@ -29,7 +29,7 @@ #include "ignition/rendering/RenderingIface.hh" #include "ignition/rendering/Scene.hh" -using namespace ignition; +using namespace gz; using namespace rendering; class ShadowsTest: public testing::Test, diff --git a/test/integration/thermal_camera.cc b/test/integration/thermal_camera.cc index 08ebb92a1..60b6725e4 100644 --- a/test/integration/thermal_camera.cc +++ b/test/integration/thermal_camera.cc @@ -59,7 +59,7 @@ class ThermalCameraTest: public testing::Test, // Documentation inherited protected: void SetUp() override { - ignition::common::Console::SetVerbosity(4); + gz::common::Console::SetVerbosity(4); } }; @@ -72,7 +72,7 @@ void ThermalCameraTest::ThermalCameraBoxes( double aspectRatio = imgWidth/imgHeight; double unitBoxSize = 1.0; - ignition::math::Vector3d boxPosition(1.8, 0.0, 0.0); + gz::math::Vector3d boxPosition(1.8, 0.0, 0.0); // Optix is not supported if (_renderEngine.compare("optix") == 0) @@ -83,7 +83,7 @@ void ThermalCameraTest::ThermalCameraBoxes( } // Setup ign-rendering with an empty scene - auto *engine = ignition::rendering::engine(_renderEngine); + auto *engine = gz::rendering::engine(_renderEngine); if (!engine) { igndbg << "Engine '" << _renderEngine @@ -91,17 +91,17 @@ void ThermalCameraTest::ThermalCameraBoxes( return; } - ignition::rendering::ScenePtr scene = engine->CreateScene("scene"); + gz::rendering::ScenePtr scene = engine->CreateScene("scene"); // red background scene->SetBackgroundColor(1.0, 0.0, 0.0); // Create an scene with a box in it scene->SetAmbientLight(1.0, 1.0, 1.0); - ignition::rendering::VisualPtr root = scene->RootVisual(); + gz::rendering::VisualPtr root = scene->RootVisual(); // create box visual - ignition::rendering::VisualPtr box = scene->CreateVisual(); + gz::rendering::VisualPtr box = scene->CreateVisual(); box->AddGeometry(scene->CreateBox()); box->SetOrigin(0.0, 0.0, 0.0); box->SetLocalPosition(boxPosition); @@ -123,8 +123,8 @@ void ThermalCameraTest::ThermalCameraBoxes( auto thermalCamera = scene->CreateThermalCamera("ThermalCamera"); ASSERT_NE(thermalCamera, nullptr); - ignition::math::Pose3d testPose(ignition::math::Vector3d(0, 0, 0), - ignition::math::Quaterniond::Identity); + gz::math::Pose3d testPose(gz::math::Vector3d(0, 0, 0), + gz::math::Quaterniond::Identity); thermalCamera->SetLocalPose(testPose); // Configure thermal camera @@ -160,7 +160,7 @@ void ThermalCameraTest::ThermalCameraBoxes( // Set a callback on the camera sensor to get a thermal camera frame uint16_t *thermalData = new uint16_t[imgHeight * imgWidth]; - ignition::common::ConnectionPtr connection = + gz::common::ConnectionPtr connection = thermalCamera->ConnectNewThermalFrame( std::bind(&::OnNewThermalFrame, thermalData, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, @@ -189,7 +189,7 @@ void ThermalCameraTest::ThermalCameraBoxes( // move box in front of near clip plane and verify the thermal // image returns all box temperature values - ignition::math::Vector3d boxPositionNear( + gz::math::Vector3d boxPositionNear( unitBoxSize * 0.5 + nearDist * 0.5, 0.0, 0.0); box->SetLocalPosition(boxPositionNear); thermalCamera->Update(); @@ -209,7 +209,7 @@ void ThermalCameraTest::ThermalCameraBoxes( // move box beyond far clip plane and verify the thermal // image returns all ambient temperature values - ignition::math::Vector3d boxPositionFar( + gz::math::Vector3d boxPositionFar( unitBoxSize * 0.5 + farDist * 1.5, 0.0, 0.0); box->SetLocalPosition(boxPositionFar); thermalCamera->Update(); @@ -230,7 +230,7 @@ void ThermalCameraTest::ThermalCameraBoxes( } engine->DestroyScene(scene); - ignition::rendering::unloadEngine(engine->Name()); + gz::rendering::unloadEngine(engine->Name()); } TEST_P(ThermalCameraTest, ThermalCameraBoxes) @@ -239,7 +239,7 @@ TEST_P(ThermalCameraTest, ThermalCameraBoxes) } INSTANTIATE_TEST_CASE_P(ThermalCamera, ThermalCameraTest, - RENDER_ENGINE_VALUES, ignition::rendering::PrintToStringParam()); + RENDER_ENGINE_VALUES, gz::rendering::PrintToStringParam()); ////////////////////////////////////////////////// int main(int argc, char **argv) diff --git a/test/performance/scene_factory.cc b/test/performance/scene_factory.cc index 99f8aff31..7c4705a42 100644 --- a/test/performance/scene_factory.cc +++ b/test/performance/scene_factory.cc @@ -30,7 +30,7 @@ #include "ignition/rendering/RenderingIface.hh" #include "ignition/rendering/Scene.hh" -using namespace ignition; +using namespace gz; using namespace rendering; diff --git a/test/test_config.h.in b/test/test_config.h.in index b78b67897..1f01b4dc4 100644 --- a/test/test_config.h.in +++ b/test/test_config.h.in @@ -1,5 +1,5 @@ -#ifndef IGNITION_RENDERING_TEST_CONFIG_HH_ -#define IGNITION_RENDERING_TEST_CONFIG_HH_ +#ifndef GZ_RENDERING_TEST_CONFIG_HH_ +#define GZ_RENDERING_TEST_CONFIG_HH_ #define PROJECT_SOURCE_PATH "${PROJECT_SOURCE_DIR}" #define PROJECT_BUILD_PATH "${PROJECT_BINARY_DIR}" @@ -7,14 +7,14 @@ /// \brief Helper macro to instantiate gtest for different engines #define RENDER_ENGINE_VALUES ::testing::ValuesIn(\ - ignition::rendering::TestValues()) + gz::rendering::TestValues()) static const std::vector kRenderEngineTestValues{"ogre2", "optix"}; #include #include -namespace ignition +namespace gz { namespace rendering { diff --git a/tutorials/03_rendering_plugins.md b/tutorials/03_rendering_plugins.md index 6ede6dfca..feafbd78b 100644 --- a/tutorials/03_rendering_plugins.md +++ b/tutorials/03_rendering_plugins.md @@ -4,7 +4,7 @@ This is an introduction to different rendering engines and how they are integrat ## Ignition Rendering -The \ref ignition::rendering "Ignition Rendering" library integrates external rendering engines into the Ignition Simulation eco-system. +The \ref gz::rendering "Ignition Rendering" library integrates external rendering engines into the Ignition Simulation eco-system. It allows users to select from multiple supported rendering engines based on their simulation needs. Its plugin interface loads rendering engines at runtime. It is also possible to integrate your own selected rendering engine by writing a compatible plugin interface. @@ -14,11 +14,11 @@ It is also possible to integrate your own selected rendering engine by writing a A mocked example of a custom rendering engine plugin can be found [here](https://github.com/ignitionrobotics/ign-rendering/tree/ign-rendering3/examples/hello_world_plugin). In order to make your own custom rendering engine, this example is a good starting point. There are a few key things which will need to be done in order for a custom rendering engine to function: - * A singleton Render Engine class which implements the pure virtual functions in [`ignition::rendering::BaseRenderEngine`](https://github.com/ignitionrobotics/ign-rendering/blob/main/include/ignition/rendering/base/BaseRenderEngine.hh). - * A plugin class which implements the pure virtual functions in [`ignition::rendering::RenderEnginePlugin`](https://github.com/ignitionrobotics/ign-rendering/blob/main/include/ignition/rendering/RenderEnginePlugin.hh) + * A singleton Render Engine class which implements the pure virtual functions in [`gz::rendering::BaseRenderEngine`](https://github.com/ignitionrobotics/ign-rendering/blob/main/include/ignition/rendering/base/BaseRenderEngine.hh). + * A plugin class which implements the pure virtual functions in [`gz::rendering::RenderEnginePlugin`](https://github.com/ignitionrobotics/ign-rendering/blob/main/include/ignition/rendering/RenderEnginePlugin.hh) * Registering the plugin, this line can be seen at the bottom of the [`HelloWorldPlugin`](https://github.com/ignitionrobotics/ign-rendering/tree/ign-rendering3/examples/hello_world_plugin/HelloWorldPlugin.cc) example -Finally, for your custom rendering engine to actually have any functionality and at minimum, display something in a window, you will need to implement your own `Scene` and `Camera` classes, which inherit from and implement the pure virtual functions of [`ignition::rendering::Scene`](https://github.com/ignitionrobotics/ign-rendering/blob/ign-rendering3/include/ignition/rendering/Scene.hh) and [`ignition::rendering::Camera`](https://github.com/ignitionrobotics/ign-rendering/blob/ign-rendering3/include/ignition/rendering/Camera.hh), respectively. The mocked example simply returns `nullptr` for its `CreateSceneImpl(...)` function, so it may be useful to look at the current `Scene` implementations for the other rendering engines within `ignition::rendering` such as [`OGRE`](https://github.com/ignitionrobotics/ign-rendering/blob/ign-rendering3/ogre/src/OgreScene.cc) or [`OGRE2`](https://github.com/ignitionrobotics/ign-rendering/blob/ign-rendering3/ogre2/src/Ogre2Scene.cc). Likewise, it may be helpful to look at the `Camera` implementations from [`OGRE`](https://github.com/ignitionrobotics/ign-rendering/blob/ign-rendering3/ogre/src/OgreCamera.cc) and [`OGRE2`](https://github.com/ignitionrobotics/ign-rendering/blob/ign-rendering3/ogre2/src/Ogre2Camera.cc) +Finally, for your custom rendering engine to actually have any functionality and at minimum, display something in a window, you will need to implement your own `Scene` and `Camera` classes, which inherit from and implement the pure virtual functions of [`gz::rendering::Scene`](https://github.com/ignitionrobotics/ign-rendering/blob/ign-rendering3/include/ignition/rendering/Scene.hh) and [`gz::rendering::Camera`](https://github.com/ignitionrobotics/ign-rendering/blob/ign-rendering3/include/ignition/rendering/Camera.hh), respectively. The mocked example simply returns `nullptr` for its `CreateSceneImpl(...)` function, so it may be useful to look at the current `Scene` implementations for the other rendering engines within `ignition::rendering` such as [`OGRE`](https://github.com/ignitionrobotics/ign-rendering/blob/ign-rendering3/ogre/src/OgreScene.cc) or [`OGRE2`](https://github.com/ignitionrobotics/ign-rendering/blob/ign-rendering3/ogre2/src/Ogre2Scene.cc). Likewise, it may be helpful to look at the `Camera` implementations from [`OGRE`](https://github.com/ignitionrobotics/ign-rendering/blob/ign-rendering3/ogre/src/OgreCamera.cc) and [`OGRE2`](https://github.com/ignitionrobotics/ign-rendering/blob/ign-rendering3/ogre2/src/Ogre2Camera.cc) #### Building and Running Your Rendering Engine Plugin with Ignition Gazebo