Skip to content

Commit

Permalink
Merge branch 'ign-rendering6' into fix_selection_resize
Browse files Browse the repository at this point in the history
  • Loading branch information
@iche033
iche033 committed Nov 30, 2021
2 parents 4739072 + 8e7b7fb commit dc985f5
Show file tree
Hide file tree
Showing 74 changed files with 2,595 additions and 84 deletions.
18 changes: 16 additions & 2 deletions examples/actor_animation/Main.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,10 +156,11 @@ void buildScene(ScenePtr _scene, std::vector<VisualPtr> &_visuals,

//////////////////////////////////////////////////
CameraPtr createCamera(const std::string &_engineName,
const std::map<std::string, std::string>& _params,
std::vector<VisualPtr> &_visuals, common::SkeletonPtr &_skel)
{
// create and populate scene
RenderEngine *engine = rendering::engine(_engineName);
RenderEngine *engine = rendering::engine(_engineName, _params);
if (!engine)
{
ignwarn << "Engine '" << _engineName
Expand Down Expand Up @@ -187,6 +188,12 @@ int main(int _argc, char** _argv)
ogreEngineName = _argv[1];
}

GraphicsAPI graphicsApi = GraphicsAPI::OPENGL;
if (_argc > 2)
{
graphicsApi = GraphicsAPIUtils::Set(std::string(_argv[2]));
}

common::Console::SetVerbosity(4);
std::vector<std::string> engineNames;
std::vector<CameraPtr> cameras;
Expand All @@ -201,7 +208,14 @@ int main(int _argc, char** _argv)
std::cout << "Starting engine [" << engineName << "]" << std::endl;
try
{
CameraPtr camera = createCamera(engineName, visuals, skel);
std::map<std::string, std::string> params;
if (engineName.compare("ogre2") == 0
&& graphicsApi == GraphicsAPI::METAL)
{
params["metal"] = "1";
}

CameraPtr camera = createCamera(engineName, params, visuals, skel);
if (camera)
{
cameras.push_back(camera);
Expand Down
20 changes: 17 additions & 3 deletions examples/camera_tracking/Main.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,11 @@ NodePtr createMainNode(ScenePtr _scene)
}

//////////////////////////////////////////////////
CameraPtr createCamera(const std::string &_engineName)
CameraPtr createCamera(const std::string &_engineName,
const std::map<std::string, std::string>& _params)
{
// create and populate scene
RenderEngine *engine = rendering::engine(_engineName);
RenderEngine *engine = rendering::engine(_engineName, _params);
if (!engine)
{
std::cout << "Engine '" << _engineName
Expand Down Expand Up @@ -126,6 +127,12 @@ int main(int _argc, char** _argv)
ogreEngineName = _argv[1];
}

GraphicsAPI graphicsApi = GraphicsAPI::OPENGL;
if (_argc > 2)
{
graphicsApi = GraphicsAPIUtils::Set(std::string(_argv[2]));
}

common::Console::SetVerbosity(4);
std::vector<std::string> engineNames;
std::vector<CameraPtr> cameras;
Expand All @@ -138,7 +145,14 @@ int main(int _argc, char** _argv)
{
try
{
CameraPtr camera = createCamera(engineName);
std::map<std::string, std::string> params;
if (engineName.compare("ogre2") == 0
&& graphicsApi == GraphicsAPI::METAL)
{
params["metal"] = "1";
}

CameraPtr camera = createCamera(engineName, params);
if (camera)
{
cameras.push_back(camera);
Expand Down
20 changes: 17 additions & 3 deletions examples/custom_scene_viewer/ManualSceneDemo.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,10 @@ unsigned int ManualSceneDemo::CameraCount() const
}

//////////////////////////////////////////////////
void ManualSceneDemo::AddCamera(const std::string &_engineName)
void ManualSceneDemo::AddCamera(const std::string &_engineName,
const std::map<std::string, std::string>& _params)
{
RenderEngine *engine = rendering::engine(_engineName);
RenderEngine *engine = rendering::engine(_engineName, _params);
if (!engine)
{
std::cout << "Engine '" << _engineName
Expand Down Expand Up @@ -191,6 +192,19 @@ int main(int _argc, char** _argv)
ogreEngineName = _argv[1];
}

GraphicsAPI graphicsApi = GraphicsAPI::OPENGL;
if (_argc > 2)
{
graphicsApi = GraphicsAPIUtils::Set(std::string(_argv[2]));
}

std::map<std::string, std::string> params;
if (ogreEngineName.compare("ogre2") == 0
&& graphicsApi == GraphicsAPI::METAL)
{
params["metal"] = "1";
}

common::Console::SetVerbosity(4);
//! [add scenes]
ManualSceneDemoPtr sceneDemo(new ManualSceneDemo);
Expand All @@ -208,7 +222,7 @@ int main(int _argc, char** _argv)
sceneDemo->AddScene(SceneBuilderPtr(new ShadowSceneBuilder(4)));
sceneDemo->AddScene(SceneBuilderPtr(new ShadowSceneBuilder(5)));
//! [add scenes]
sceneDemo->AddCamera(ogreEngineName);
sceneDemo->AddCamera(ogreEngineName, params);
sceneDemo->AddCamera("optix");
sceneDemo->Run();
return 0;
Expand Down
4 changes: 3 additions & 1 deletion examples/custom_scene_viewer/ManualSceneDemo.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#ifndef IGNITION_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_MANUALSCENEDEMO_HH_
#define IGNITION_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_MANUALSCENEDEMO_HH_

#include <map>
#include <string>
#include <ignition/rendering.hh>
#include "TestTypes.hh"
Expand Down Expand Up @@ -46,7 +47,8 @@ namespace ignition

public: virtual unsigned int CameraCount() const;

public: virtual void AddCamera(const std::string &_engineName);
public: virtual void AddCamera(const std::string &_engineName,
const std::map<std::string, std::string>& _params = {});

public: virtual void PrevCamera();

Expand Down
9 changes: 5 additions & 4 deletions examples/depth_camera/Main.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,17 +154,18 @@ int main(int _argc, char** _argv)
engineName = _argv[1];
}

bool useMetalRenderSystem{false};
if (_argc > 2 && std::string(_argv[2]).compare("metal") == 0)
GraphicsAPI graphicsApi = GraphicsAPI::OPENGL;
if (_argc > 2)
{
useMetalRenderSystem = true;
graphicsApi = GraphicsAPIUtils::Set(std::string(_argv[2]));
}

common::Console::SetVerbosity(4);
try
{
std::map<std::string, std::string> params;
if (engineName.compare("ogre2") == 0 && useMetalRenderSystem)
if (engineName.compare("ogre2") == 0
&& graphicsApi == GraphicsAPI::METAL)
{
params["metal"] = "1";
}
Expand Down
20 changes: 17 additions & 3 deletions examples/heightmap/Main.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,10 +192,11 @@ void buildScene(ScenePtr _scene)
}

//////////////////////////////////////////////////
CameraPtr createCamera(const std::string &_engineName)
CameraPtr createCamera(const std::string &_engineName,
const std::map<std::string, std::string>& _params)
{
// create and populate scene
RenderEngine *engine = rendering::engine(_engineName);
RenderEngine *engine = rendering::engine(_engineName, _params);
if (!engine)
{
ignwarn << "Engine '" << _engineName
Expand Down Expand Up @@ -227,13 +228,26 @@ int main(int _argc, char** _argv)
ogreEngineName = _argv[1];
}

GraphicsAPI graphicsApi = GraphicsAPI::OPENGL;
if (_argc > 2)
{
graphicsApi = GraphicsAPIUtils::Set(std::string(_argv[2]));
}

engineNames.push_back(ogreEngineName);

for (auto engineName : engineNames)
{
try
{
CameraPtr camera = createCamera(engineName);
std::map<std::string, std::string> params;
if (engineName.compare("ogre2") == 0
&& graphicsApi == GraphicsAPI::METAL)
{
params["metal"] = "1";
}

CameraPtr camera = createCamera(engineName, params);
if (camera)
{
cameras.push_back(camera);
Expand Down
20 changes: 17 additions & 3 deletions examples/lidar_visual/Main.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,10 +240,11 @@ LidarVisualPtr createLidar(ScenePtr _scene)
}

//////////////////////////////////////////////////
CameraPtr createCamera(const std::string &_engineName)
CameraPtr createCamera(const std::string &_engineName,
const std::map<std::string, std::string>& _params)
{
// create and populate scene
RenderEngine *engine = rendering::engine(_engineName);
RenderEngine *engine = rendering::engine(_engineName, _params);
if (!engine)
{
ignwarn << "Engine '" << _engineName
Expand Down Expand Up @@ -271,6 +272,12 @@ int main(int _argc, char** _argv)
ogreEngineName = _argv[1];
}

GraphicsAPI graphicsApi = GraphicsAPI::OPENGL;
if (_argc > 2)
{
graphicsApi = GraphicsAPIUtils::Set(std::string(_argv[2]));
}

common::Console::SetVerbosity(4);
std::vector<std::string> engineNames;
std::vector<CameraPtr> cameras;
Expand All @@ -284,7 +291,14 @@ int main(int _argc, char** _argv)
std::cout << "Starting engine [" << engineName << "]" << std::endl;
try
{
CameraPtr camera = createCamera(engineName);
std::map<std::string, std::string> params;
if (engineName.compare("ogre2") == 0
&& graphicsApi == GraphicsAPI::METAL)
{
params["metal"] = "1";
}

CameraPtr camera = createCamera(engineName, params);
if (camera)
{
cameras.push_back(camera);
Expand Down
20 changes: 17 additions & 3 deletions examples/mesh_viewer/Main.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,11 @@ void buildScene(ScenePtr _scene)
}

//////////////////////////////////////////////////
CameraPtr createCamera(const std::string &_engineName)
CameraPtr createCamera(const std::string &_engineName,
const std::map<std::string, std::string>& _params)
{
// create and populate scene
RenderEngine *engine = rendering::engine(_engineName);
RenderEngine *engine = rendering::engine(_engineName, _params);
if (!engine)
{
ignwarn << "Engine '" << _engineName
Expand Down Expand Up @@ -131,6 +132,12 @@ int main(int _argc, char** _argv)
ogreEngineName = _argv[1];
}

GraphicsAPI graphicsApi = GraphicsAPI::OPENGL;
if (_argc > 2)
{
graphicsApi = GraphicsAPIUtils::Set(std::string(_argv[2]));
}

common::Console::SetVerbosity(4);
std::vector<std::string> engineNames;
std::vector<CameraPtr> cameras;
Expand All @@ -142,7 +149,14 @@ int main(int _argc, char** _argv)
{
try
{
CameraPtr camera = createCamera(engineName);
std::map<std::string, std::string> params;
if (engineName.compare("ogre2") == 0
&& graphicsApi == GraphicsAPI::METAL)
{
params["metal"] = "1";
}

CameraPtr camera = createCamera(engineName, params);
if (camera)
{
cameras.push_back(camera);
Expand Down
20 changes: 17 additions & 3 deletions examples/mouse_picking/Main.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,11 @@ void buildScene(ScenePtr _scene)
root->AddChild(camera);
}

CameraPtr createCamera(const std::string &_engineName)
CameraPtr createCamera(const std::string &_engineName,
const std::map<std::string, std::string>& _params)
{
// create and populate scene
RenderEngine *engine = rendering::engine(_engineName);
RenderEngine *engine = rendering::engine(_engineName, _params);
if (!engine)
{
std::cout << "Engine '" << _engineName
Expand All @@ -134,6 +135,12 @@ int main(int _argc, char** _argv)
ogreEngineName = _argv[1];
}

GraphicsAPI graphicsApi = GraphicsAPI::OPENGL;
if (_argc > 2)
{
graphicsApi = GraphicsAPIUtils::Set(std::string(_argv[2]));
}

common::Console::SetVerbosity(4);
std::vector<std::string> engineNames;
std::vector<CameraPtr> cameras;
Expand All @@ -145,7 +152,14 @@ int main(int _argc, char** _argv)
{
try
{
CameraPtr camera = createCamera(engineName);
std::map<std::string, std::string> params;
if (engineName.compare("ogre2") == 0
&& graphicsApi == GraphicsAPI::METAL)
{
params["metal"] = "1";
}

CameraPtr camera = createCamera(engineName, params);
if (camera)
{
cameras.push_back(camera);
Expand Down
20 changes: 17 additions & 3 deletions examples/ogre2_demo/Main.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -274,10 +274,11 @@ void buildScene(ScenePtr _scene)
}

//////////////////////////////////////////////////
CameraPtr createCamera(const std::string &_engineName)
CameraPtr createCamera(const std::string &_engineName,
const std::map<std::string, std::string>& _params)
{
// create and populate scene
RenderEngine *engine = rendering::engine(_engineName);
RenderEngine *engine = rendering::engine(_engineName, _params);
if (!engine)
{
std::cout << "Engine '" << _engineName
Expand Down Expand Up @@ -316,12 +317,25 @@ int main(int _argc, char** _argv)
std::vector<std::string> engineNames;
std::vector<CameraPtr> cameras;

GraphicsAPI graphicsApi = GraphicsAPI::OPENGL;
if (_argc > 2)
{
graphicsApi = GraphicsAPIUtils::Set(std::string(_argv[2]));
}

engineNames.push_back("ogre2");
for (auto engineName : engineNames)
{
try
{
CameraPtr camera = createCamera(engineName);
std::map<std::string, std::string> params;
if (engineName.compare("ogre2") == 0
&& graphicsApi == GraphicsAPI::METAL)
{
params["metal"] = "1";
}

CameraPtr camera = createCamera(engineName, params);
if (camera)
{
cameras.push_back(camera);
Expand Down
Loading

0 comments on commit dc985f5

Please sign in to comment.