Skip to content

Commit 43b5e40

Browse files
methylDragonmethylDragon
committed
Add redirection headers
Signed-off-by: methylDragon <[email protected]>
1 parent 9ef2da1 commit 43b5e40

File tree

523 files changed

+4480
-1178
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

523 files changed

+4480
-1178
lines changed

‎CMakeLists.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@ find_package(ignition-cmake2 2.14.0 REQUIRED)
1414
#============================================================================
1515
# Set up the project
1616
#============================================================================
17-
ign_configure_project(VERSION_SUFFIX)
17+
ign_configure_project(
18+
REPLACE_IGNITION_INCLUDE_PATH gz/rendering
19+
VERSION_SUFFIX pre1
20+
)
1821

1922
#============================================================================
2023
# Set project-specific options

‎examples/actor_animation/GlutWindow.cc

+5-5
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ void handleMouse()
164164
2.0 * g_mouse.x / static_cast<double>(rayCamera->ImageWidth()) - 1.0;
165165
double ny = 1.0 -
166166
2.0 * g_mouse.y / static_cast<double>(rayCamera->ImageHeight());
167-
g_rayQuery->SetFromCamera(rayCamera, ignition::math::Vector2d(nx, ny));
167+
g_rayQuery->SetFromCamera(rayCamera, gz::math::Vector2d(nx, ny));
168168
g_target = g_rayQuery->ClosestPoint();
169169
if (!g_target)
170170
{
@@ -194,7 +194,7 @@ void handleMouse()
194194
if (g_mouse.motionDirty)
195195
{
196196
g_mouse.motionDirty = false;
197-
auto drag = ignition::math::Vector2d(g_mouse.dragX, g_mouse.dragY);
197+
auto drag = gz::math::Vector2d(g_mouse.dragX, g_mouse.dragY);
198198

199199
// left mouse button pan
200200
if (g_mouse.button == GLUT_LEFT_BUTTON && g_mouse.state == GLUT_DOWN)
@@ -239,18 +239,18 @@ void handleMouse()
239239
//////////////////////////////////////////////////
240240
void updatePose(double _time)
241241
{
242-
std::map<std::string, ignition::math::Matrix4d> animFrames;
242+
std::map<std::string, gz::math::Matrix4d> animFrames;
243243
animFrames = g_skelAnim->PoseAt(_time, true);
244244

245-
std::map<std::string, ignition::math::Matrix4d> skinFrames;
245+
std::map<std::string, gz::math::Matrix4d> skinFrames;
246246

247247
for (auto pair : animFrames)
248248
{
249249
std::string animName = pair.first;
250250
auto animTf = pair.second;
251251

252252
std::string skinName = g_skel->NodeNameAnimToSkin(g_animIdx, animName);
253-
ignition::math::Matrix4d skinTf =
253+
gz::math::Matrix4d skinTf =
254254
g_skel->AlignTranslation(g_animIdx, animName)
255255
* animTf * g_skel->AlignRotation(g_animIdx, animName);
256256

‎examples/actor_animation/GlutWindow.hh

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
* limitations under the License.
1515
*
1616
*/
17-
#ifndef IGNITION_RENDERING_EXAMPLES_ACTOR_ANIMATION_GLUTWINDOW_HH_
18-
#define IGNITION_RENDERING_EXAMPLES_ACTOR_ANIMATION_GLUTWINDOW_HH_
17+
#ifndef GZ_RENDERING_EXAMPLES_ACTOR_ANIMATION_GLUTWINDOW_HH_
18+
#define GZ_RENDERING_EXAMPLES_ACTOR_ANIMATION_GLUTWINDOW_HH_
1919

2020
#include <vector>
2121
#include "ignition/rendering/RenderTypes.hh"
2222
#include "ignition/common/graphics/Types.hh"
2323

24-
namespace ir = ignition::rendering;
25-
namespace ic = ignition::common;
24+
namespace ir = gz::rendering;
25+
namespace ic = gz::common;
2626

2727
/// \brief Run the demo and render the scene from the cameras
2828
/// \param[in] _cameras Cameras in the scene

‎examples/actor_animation/Main.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#include "example_config.hh"
3737
#include "GlutWindow.hh"
3838

39-
using namespace ignition;
39+
using namespace gz;
4040
using namespace rendering;
4141

4242
const std::string RESOURCE_PATH =

‎examples/camera_tracking/GlutWindow.cc

+10-10
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ struct mouseButton
9292
struct mouseButton g_mouse;
9393
std::mutex g_mouseMutex;
9494

95-
ignition::math::Vector3d g_trackOffset(1.0, 0, 0);
96-
ignition::math::Vector3d g_followOffset(-3, 0, 3);
95+
gz::math::Vector3d g_trackOffset(1.0, 0, 0);
96+
gz::math::Vector3d g_followOffset(-3, 0, 3);
9797

9898

9999
//////////////////////////////////////////////////
@@ -158,7 +158,7 @@ void handleMouse()
158158
2.0 * g_mouse.x / static_cast<double>(rayCamera->ImageWidth()) - 1.0;
159159
double ny = 1.0 -
160160
2.0 * g_mouse.y / static_cast<double>(rayCamera->ImageHeight());
161-
g_rayQuery->SetFromCamera(rayCamera, ignition::math::Vector2d(nx, ny));
161+
g_rayQuery->SetFromCamera(rayCamera, gz::math::Vector2d(nx, ny));
162162
g_target = g_rayQuery->ClosestPoint();
163163
if (!g_target)
164164
{
@@ -188,7 +188,7 @@ void handleMouse()
188188
if (g_mouse.motionDirty)
189189
{
190190
g_mouse.motionDirty = false;
191-
auto drag = ignition::math::Vector2d(g_mouse.dragX, g_mouse.dragY);
191+
auto drag = gz::math::Vector2d(g_mouse.dragX, g_mouse.dragY);
192192

193193
// left mouse button pan
194194
if (g_mouse.button == GLUT_LEFT_BUTTON && g_mouse.state == GLUT_DOWN)
@@ -296,21 +296,21 @@ void keyboardCB(unsigned char _key, int, int)
296296
if (_key == 'w' || _key == 'W')
297297
{
298298
node->SetWorldPosition(node->WorldPosition() +
299-
node->WorldRotation() * ignition::math::Vector3d(posIncr, 0, 0));
299+
node->WorldRotation() * gz::math::Vector3d(posIncr, 0, 0));
300300
}
301301
else if (_key == 's' || _key == 'S')
302302
{
303303
node->SetWorldPosition(node->WorldPosition() +
304-
node->WorldRotation() * ignition::math::Vector3d(-posIncr, 0, 0));
304+
node->WorldRotation() * gz::math::Vector3d(-posIncr, 0, 0));
305305
}
306306
else if (_key == 'a' || _key == 'A')
307307
{
308-
node->SetWorldRotation(ignition::math::Quaterniond(0, 0,
308+
node->SetWorldRotation(gz::math::Quaterniond(0, 0,
309309
node->WorldRotation().Yaw() + yawIncr));
310310
}
311311
else if (_key == 'd' || _key == 'D')
312312
{
313-
node->SetWorldRotation(ignition::math::Quaterniond(0, 0,
313+
node->SetWorldRotation(gz::math::Quaterniond(0, 0,
314314
node->WorldRotation().Yaw() - yawIncr));
315315
}
316316
}
@@ -394,14 +394,14 @@ void keyboardCB(unsigned char _key, int, int)
394394
if (_key == 't' || _key == 'T')
395395
{
396396
double trackPGain = 0.005;
397-
double p = ignition::math::equal(cam->TrackPGain(), 1.0) ?
397+
double p = gz::math::equal(cam->TrackPGain(), 1.0) ?
398398
trackPGain : 1.0;
399399
cam->SetTrackPGain(p);
400400
}
401401
else if (_key == 'f' || _key == 'F')
402402
{
403403
double followPGain = 0.01;
404-
double p = ignition::math::equal(cam->FollowPGain(), 1.0) ?
404+
double p = gz::math::equal(cam->FollowPGain(), 1.0) ?
405405
followPGain : 1.0;
406406
cam->SetFollowPGain(p);
407407
}

‎examples/camera_tracking/GlutWindow.hh

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
* limitations under the License.
1515
*
1616
*/
17-
#ifndef IGNITION_RENDERING_EXAMPLES_CAMERA_TRACKING_GLUTWINDOW_HH_
18-
#define IGNITION_RENDERING_EXAMPLES_CAMERA_TRACKING_GLUTWINDOW_HH_
17+
#ifndef GZ_RENDERING_EXAMPLES_CAMERA_TRACKING_GLUTWINDOW_HH_
18+
#define GZ_RENDERING_EXAMPLES_CAMERA_TRACKING_GLUTWINDOW_HH_
1919

2020
#include <vector>
2121
#include <ignition/rendering/RenderTypes.hh>
2222

23-
namespace ir = ignition::rendering;
23+
namespace ir = gz::rendering;
2424

2525
/// \brief Run the demo and render the scene from the cameras
2626
/// \param[in] _cameras Cameras in the scene

‎examples/camera_tracking/Main.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include <ignition/rendering.hh>
3232
#include "GlutWindow.hh"
3333

34-
using namespace ignition;
34+
using namespace gz;
3535
using namespace rendering;
3636

3737
//////////////////////////////////////////////////

‎examples/custom_scene_viewer/DemoWindow.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
#define KEY_ESC 27
4141
#define KEY_TAB 9
4242

43-
using namespace ignition;
43+
using namespace gz;
4444
using namespace rendering;
4545

4646
//////////////////////////////////////////////////

‎examples/custom_scene_viewer/DemoWindow.hh

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
* limitations under the License.
1515
*
1616
*/
17-
#ifndef IGNITION_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_DEMOWINDOW_HH_
18-
#define IGNITION_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_DEMOWINDOW_HH_
17+
#ifndef GZ_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_DEMOWINDOW_HH_
18+
#define GZ_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_DEMOWINDOW_HH_
1919

2020
#include "TestTypes.hh"
2121

22-
namespace ir = ignition::rendering;
22+
namespace ir = gz::rendering;
2323

2424
/// \brief Run the demo
2525
/// \param[in] _Pointer to demo

‎examples/custom_scene_viewer/ManualSceneDemo.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "SceneBuilder.hh"
2121
#include "DemoWindow.hh"
2222

23-
using namespace ignition;
23+
using namespace gz;
2424
using namespace rendering;
2525

2626
//////////////////////////////////////////////////

‎examples/custom_scene_viewer/ManualSceneDemo.hh

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
* limitations under the License.
1515
*
1616
*/
17-
#ifndef IGNITION_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_MANUALSCENEDEMO_HH_
18-
#define IGNITION_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_MANUALSCENEDEMO_HH_
17+
#ifndef GZ_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_MANUALSCENEDEMO_HH_
18+
#define GZ_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_MANUALSCENEDEMO_HH_
1919

2020
#include <string>
2121
#include <ignition/rendering.hh>
2222
#include "TestTypes.hh"
2323

24-
namespace ignition
24+
namespace gz
2525
{
2626
namespace rendering
2727
{

‎examples/custom_scene_viewer/SceneBuilder.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include "example_config.hh"
1919
#include "SceneBuilder.hh"
2020

21-
using namespace ignition;
21+
using namespace gz;
2222
using namespace rendering;
2323

2424
const std::string RESOURCE_PATH = std::string(PROJECT_BINARY_PATH) + "/media";

‎examples/custom_scene_viewer/SceneBuilder.hh

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
* limitations under the License.
1515
*
1616
*/
17-
#ifndef IGNITION_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_SCENEBUILDER_HH_
18-
#define IGNITION_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_SCENEBUILDER_HH_
17+
#ifndef GZ_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_SCENEBUILDER_HH_
18+
#define GZ_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_SCENEBUILDER_HH_
1919

2020
#include <string>
2121
#include "TestTypes.hh"
2222

23-
namespace ignition
23+
namespace gz
2424
{
2525
namespace rendering
2626
{

‎examples/custom_scene_viewer/TestTypes.hh

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
* limitations under the License.
1515
*
1616
*/
17-
#ifndef IGNITION_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_TESTYPES_HH_
18-
#define IGNITION_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_TESTYPES_HH_
17+
#ifndef GZ_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_TESTYPES_HH_
18+
#define GZ_RENDERING_EXAMPLES_CUSTOM_SCENE_VIEWER_TESTYPES_HH_
1919

2020
#include <vector>
2121
#include <ignition/rendering.hh>
2222

23-
namespace ignition
23+
namespace gz
2424
{
2525
namespace rendering
2626
{

0 commit comments

Comments
 (0)